From 942421e0514ba7669b221a52eaba76f0438468a6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 8 Jul 2022 10:13:03 +0200 Subject: [PATCH] EDMI.API/DatabaseWithFallback: Fix empty connection string --- Modules.EDMIAPI/DatabaseWithFallback.vb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Modules.EDMIAPI/DatabaseWithFallback.vb b/Modules.EDMIAPI/DatabaseWithFallback.vb index de9053a9..771fdee7 100644 --- a/Modules.EDMIAPI/DatabaseWithFallback.vb +++ b/Modules.EDMIAPI/DatabaseWithFallback.vb @@ -345,7 +345,11 @@ Public Class DatabaseWithFallback Case Else Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId) - Return _DatabaseECM.GetDatatableWithConnection(pSQLCommand, oConnectionString) + If oConnectionString = String.Empty Then + Return _DatabaseECM.GetDatatable(pSQLCommand) + Else + Return _DatabaseECM.GetDatatableWithConnection(pSQLCommand, oConnectionString) + End If End Select Catch ex As Exception @@ -401,8 +405,11 @@ Public Class DatabaseWithFallback Case Else Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId) - Return _DatabaseECM.GetScalarValueWithConnection(pSQLCommand, oConnectionString) - + If oConnectionString = String.Empty Then + Return _DatabaseECM.GetScalarValue(pSQLCommand) + Else + Return _DatabaseECM.GetScalarValueWithConnection(pSQLCommand, oConnectionString) + End If End Select Catch ex As Exception _Logger.Error(ex) @@ -456,7 +463,11 @@ Public Class DatabaseWithFallback Case Else Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId) - Return _DatabaseECM.ExecuteNonQueryWithConnection(pSQLCommand, oConnectionString) + If oConnectionString = String.Empty Then + Return _DatabaseECM.ExecuteNonQuery(pSQLCommand) + Else + Return _DatabaseECM.ExecuteNonQueryWithConnection(pSQLCommand, oConnectionString) + End If End Select Catch ex As Exception