AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EDMI.API/DatabaseWithFallback: Fix empty connection string

Browse Source
This commit is contained in:
Jonathan Jenne 2022-07-08 10:13:03 +02:00
parent 914a3464d7
commit 942421e051
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Modules.EDMIAPI/DatabaseWithFallback.vb
View File

@ -345,7 +345,11 @@ Public Class DatabaseWithFallback
Case Else Case Else
Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId) 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 End Select
Catch ex As Exception Catch ex As Exception
@ -401,8 +405,11 @@ Public Class DatabaseWithFallback
Case Else Case Else
Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId) 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 End Select
Catch ex As Exception Catch ex As Exception
_Logger.Error(ex) _Logger.Error(ex)
@ -456,7 +463,11 @@ Public Class DatabaseWithFallback
Case Else Case Else
Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId) 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 End Select
Catch ex As Exception Catch ex As Exception