This commit is contained in:
2020-05-31 22:25:35 +02:00
parent 4a358d43fd
commit 083e666fbc
214 changed files with 14292 additions and 4117 deletions

View File

@@ -30,7 +30,13 @@ Public Class SQL
'Properties.Settings.Default.
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
Return My.MySettings.Default.FMZOLLConnectionString
Try
Return My.MySettings.Default.FMZOLLConnectionString
Catch ex As Exception
Return "Data Source=DEVELOPER\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;"
End Try
Else
Try
Return My.MySettings.Default.FMZOLL_PRODConnectionString
@@ -474,8 +480,8 @@ Public Class SQL
Return defaultReturn
End Function
Public Function getValueTxtBySqlVarList(ByVal sql As String, Optional conn_art As String = "SDL", Optional List As List(Of SQLVariable) = Nothing) As String
Dim s As String = ""
Public Function getValueTxtBySqlVarList(ByVal sql As String, Optional conn_art As String = "SDL", Optional List As List(Of SQLVariable) = Nothing, Optional defaultReturn As Object = "") As String
Dim s As String = defaultReturn
Try
'MsgBox("1")
Dim conn As New SqlConnection
@@ -515,7 +521,7 @@ Public Class SQL
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
'MsgBox("3")
Return ""
Return defaultReturn
End Function
Public Function doSQL(ByVal sql As String, Optional conn_art As String = "SDL", Optional showErr As Boolean = True, Optional list As List(Of MyListItem2) = Nothing, Optional conn As SqlConnection = Nothing) As Boolean