opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #1169: fix usage of first created driver link for all later Interbase/Firebird connections, as we support different libraries

Browse Source
This commit is contained in:
Ansgar Becker
2022-03-10 06:58:46 +01:00
parent 0e8d77bbba
commit f106dfcd48
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/connections.pas
View File

@@ -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;

46
source/dbconnection.pas
View File

@@ -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?