From 67e6e683942be2927dc29740ffc30ebc26c9dbdb Mon Sep 17 00:00:00 2001 From: Developer01 Date: Tue, 18 Feb 2025 11:00:39 +0100 Subject: [PATCH] MS Database SQL GDPicture angepasst --- Database/Adapters/MSSQLServer.vb | 12 +++++++++++- Database/My Project/AssemblyInfo.vb | 4 ++-- Database/Queries.vb | 3 ++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Database/Adapters/MSSQLServer.vb b/Database/Adapters/MSSQLServer.vb index d69a950f..0ec2564f 100644 --- a/Database/Adapters/MSSQLServer.vb +++ b/Database/Adapters/MSSQLServer.vb @@ -148,7 +148,17 @@ Public Class MSSQLServer Public Function GetConnectionStringForId(pConnectionId As Integer) As String Return Get_ConnectionStringforID(pConnectionId) End Function - + Public Function GetGDPictureString() As String + Using oConnection As SqlConnection = GetSQLConnection() + Dim oSQL = Queries.DD_ECM.ThirdPartyModules.GdPictureLicense + Dim oGDPicture = GetScalarValueWithConnectionObject(oSQL, oConnection) + If oGDPicture = String.Empty Then + oSQL = Queries.DD_ECM.ThirdPartyModules.GdPictureLicense_REGULAR + oGDPicture = GetScalarValueWithConnectionObject(oSQL, oConnection) + End If + Return oGDPicture + End Using + End Function Public Function Get_ConnectionStringforID(pConnectionId As Integer) As String Dim oConnectionString As String = String.Empty diff --git a/Database/My Project/AssemblyInfo.vb b/Database/My Project/AssemblyInfo.vb index 10e68531..b31b002d 100644 --- a/Database/My Project/AssemblyInfo.vb +++ b/Database/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Database/Queries.vb b/Database/Queries.vb index 86901b61..637d518b 100644 --- a/Database/Queries.vb +++ b/Database/Queries.vb @@ -1,7 +1,8 @@ Public Class Queries Public Class DD_ECM Public Class ThirdPartyModules - Public Const GdPictureLicense As String = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' AND ACTIVE = 1" + Public Const GdPictureLicense As String = "SELECT COALESCE(MAX(LICENSE),'') FROM TBDD_3RD_PARTY_MODULES WHERE ACTIVE = 1 AND NAME = 'GDPICTURE' AND [VERSION] = '11.2024'" + Public Const GdPictureLicense_REGULAR As String = "SELECT COALESCE(MAX(LICENSE),'') FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' AND ACTIVE = 1" End Class Public Class Connections