AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: AppStd:5fed0a42550e2ca21648a886551041aed247d2b8
Branches Tags
AppStd:master AppStd:upgrade-to-NET8-1 AppStd:Monorepo-Update-.NET-8 AppStd:Newest-GDPictureVersion AppStd:ZugferdService-Redesign
...
compare: AppStd:8d1221d802131f106944b3ffb5f5cb8c3c8c9741
Branches Tags
AppStd:master AppStd:upgrade-to-NET8-1 AppStd:Monorepo-Update-.NET-8 AppStd:Newest-GDPictureVersion AppStd:ZugferdService-Redesign

2 Commits
5fed0a4255 ... 8d1221d802

Author SHA1 Message Date
Jonathan Jenne
8d1221d802 Database: Version 2.1.2 2021-05-11 11:03:57 +02:00
Jonathan Jenne
40f0b50ae6 Database: Fix opening MSSQL connection twice 2021-05-11 11:02:08 +02:00
2 changed files with 4 additions and 6 deletions
Expand all files Collapse all files

6
Modules.Database/MSSQLServer.vb
View File

@@ -66,8 +66,6 @@ Public Class MSSQLServer
Public Function GetConnection() As SqlConnection Public Function GetConnection() As SqlConnection
Try Try
Dim oConnection = GetSQLConnection() Dim oConnection = GetSQLConnection()
OpenSQLConnection(oConnection)
Return oConnection Return oConnection
Catch ex As Exception Catch ex As Exception
_Logger.Error(ex) _Logger.Error(ex)
@@ -197,7 +195,7 @@ Public Class MSSQLServer
Private Function GetConnection(ConnectionString As String) As SqlConnection Private Function GetConnection(ConnectionString As String) As SqlConnection
Try Try
Dim oConnection As New SqlConnection(ConnectionString) Dim oConnection As New SqlConnection(ConnectionString)
OpenSQLConnection(oConnection) oConnection = OpenSQLConnection(oConnection)
Dim oMaskedConnectionString = MaskConnectionString(ConnectionString) Dim oMaskedConnectionString = MaskConnectionString(ConnectionString)
_Logger.Debug("The Following Connection is open: {0}", oMaskedConnectionString) _Logger.Debug("The Following Connection is open: {0}", oMaskedConnectionString)
@@ -340,7 +338,7 @@ Public Class MSSQLServer
Public Function GetScalarValue(SQLQuery As String) As Object Implements IDatabase.GetScalarValue Public Function GetScalarValue(SQLQuery As String) As Object Implements IDatabase.GetScalarValue
Using oConnection = GetSQLConnection() Using oConnection As SqlConnection = GetSQLConnection()
Return GetScalarValueWithConnectionObject(SQLQuery, oConnection) Return GetScalarValueWithConnectionObject(SQLQuery, oConnection)
End Using End Using
End Function End Function

4
Modules.Database/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.1.1.0")> <Assembly: AssemblyVersion("2.1.2.0")>
<Assembly: AssemblyFileVersion("2.1.1.0")> <Assembly: AssemblyFileVersion("2.1.2.0")>