From f106dfcd48e1778f56ac73394126a2b3d71c388d Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Thu, 10 Mar 2022 06:58:46 +0100
Subject: [PATCH] Issue #1169: fix usage of first created driver link for all
 later Interbase/Firebird connections, as we support different libraries

---
 source/connections.pas  |  2 +-
 source/dbconnection.pas | 46 +++++++++++++++++++++++++++--------------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/source/connections.pas b/source/connections.pas
index a08758d0..5f7e49fc 100644
--- a/source/connections.pas
+++ b/source/connections.pas
@@ -1435,7 +1435,7 @@ begin
       editUsername.Enabled := lblUsername.Enabled;
       lblPassword.Enabled := lblUsername.Enabled;
       editPassword.Enabled := lblUsername.Enabled;
-      lblPort.Enabled := Params.NetType in [ntMySQL_TCPIP, ntMySQL_SSHtunnel, ntMySQL_ProxySQLAdmin, ntMSSQL_TCPIP, ntPgSQL_TCPIP, ntPgSQL_SSHtunnel, ntInterbase_TCPIP];
+      lblPort.Enabled := Params.NetType in [ntMySQL_TCPIP, ntMySQL_SSHtunnel, ntMySQL_ProxySQLAdmin, ntMSSQL_TCPIP, ntPgSQL_TCPIP, ntPgSQL_SSHtunnel, ntInterbase_TCPIP, ntFirebird_TCPIP];
       editPort.Enabled := lblPort.Enabled;
       updownPort.Enabled := lblPort.Enabled;
       chkCompressed.Enabled := Params.IsAnyMySQL;
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index 70ef19e3..28b991bb 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -755,16 +755,16 @@ type
   end;
 
   TInterbaseRawResults = Array of TFDQuery;
+  TIbDrivers = TDictionary<String, TFDPhysIBDriverLink>;
+  TFbDrivers = TDictionary<String, TFDPhysFBDriverLink>;
   TInterbaseConnection = class(TDBConnection)
     private
       FFDHandle: TFDConnection;
       FLastError: String;
       FLastErrorCode: Integer;
-      //FLib: TSQLiteLib;
       FLastRawResults: TInterbaseRawResults;
-      //FMainDbName: UTF8String;
-      class var FIbDriver: TFDPhysIBDriverLink;
-      class var FFbDriver: TFDPhysFBDriverLink;
+      class var FIbDrivers: TIbDrivers;
+      class var FFbDrivers: TFbDrivers;
       procedure SetActive(Value: Boolean); override;
       procedure DoBeforeConnect; override;
       function GetThreadId: Int64; override;
@@ -778,7 +778,6 @@ type
     public
       constructor Create(AOwner: TComponent); override;
       destructor Destroy; override;
-      //property Lib: TSQLiteLib read FLib;
       procedure Query(SQL: String; DoStoreResult: Boolean=False; LogCategory: TDBLogCategory=lcSQL); override;
       function Ping(Reconnect: Boolean): Boolean; override;
       function GetCreateCode(Obj: TDBObject): String; override;
@@ -2876,7 +2875,9 @@ end;
 
 procedure TInterbaseConnection.SetActive(Value: Boolean);
 var
-  tmpdb: String;
+  tmpdb, DriverId: String;
+  IbDriver: TFDPhysIBDriverLink;
+  FbDriver: TFDPhysFBDriverLink;
 begin
   if Value then begin
     DoBeforeConnect;
@@ -2887,21 +2888,34 @@ begin
     FFDHandle.LoginPrompt := False;
 
     // Create virtual Interbase or Firebird driver id, once
+    DriverId := Parameters.LibraryOrProvider;
     if Parameters.IsInterbase then begin
-      if not Assigned(FIbDriver) then begin
-        FIbDriver := TFDPhysIBDriverLink.Create(Owner);
-        FIbDriver.VendorLib := Parameters.LibraryOrProvider;
-        FIbDriver.DriverID := Parameters.LibraryOrProvider;
+      if not Assigned(FIbDrivers) then begin
+        FIbDrivers := TIbDrivers.Create;
       end;
-      FFDHandle.Params.Values['DriverID'] := FIbDriver.DriverID;
+      if not FIbDrivers.ContainsKey(DriverId) then begin
+        Log(lcInfo, 'Creating virtual driver id with '+Parameters.LibraryOrProvider);
+        IbDriver := TFDPhysIBDriverLink.Create(Owner);
+        IbDriver.VendorLib := Parameters.LibraryOrProvider;
+        IbDriver.DriverID := DriverId;
+        FIbDrivers.Add(DriverId, IbDriver);
+      end;
+      FIbDrivers.TryGetValue(DriverId, IbDriver);
+      FFDHandle.Params.Values['DriverID'] := IbDriver.DriverID;
     end
     else if Parameters.IsFirebird then begin
-      if not Assigned(FFbDriver) then begin
-        FFbDriver := TFDPhysFBDriverLink.Create(Owner);
-        FFbDriver.VendorLib := Parameters.LibraryOrProvider;
-        FFbDriver.DriverID := Parameters.LibraryOrProvider;
+      if not Assigned(FFbDrivers) then begin
+        FFbDrivers := TFbDrivers.Create;
       end;
-      FFDHandle.Params.Values['DriverID'] := FFbDriver.DriverID;
+      if not FFbDrivers.ContainsKey(DriverId) then begin
+        Log(lcInfo, 'Creating virtual driver id link with '+Parameters.LibraryOrProvider);
+        FbDriver := TFDPhysFBDriverLink.Create(Owner);
+        FbDriver.VendorLib := Parameters.LibraryOrProvider;
+        FbDriver.DriverID := DriverId;
+        FFbDrivers.Add(DriverId, FbDriver);
+      end;
+      FFbDrivers.TryGetValue(DriverId, FbDriver);
+      FFDHandle.Params.Values['DriverID'] := FbDriver.DriverID;
     end;
 
     // TCP/IP or local?