opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #977: Support -l/--library command line parameter, and provide short parameters for sslprivatekey, sslcacertificate, sslcertificate, sslcipher and cleartextenabled

Browse Source
This commit is contained in:
Ansgar Becker
2020-04-09 14:55:01 +02:00
parent 221196c274
commit f11a81e3b5
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/apphelpers.pas
View File

@ -2542,7 +2542,7 @@ end;
procedure ParseCommandLine(CommandLine: String; var ConnectionParams: TConnectionParameters; var FileNames: TStringList); procedure ParseCommandLine(CommandLine: String; var ConnectionParams: TConnectionParameters; var FileNames: TStringList);
var var
rx: TRegExpr; rx: TRegExpr;
ExeName, SessName, Host, User, Pass, Socket, ExeName, SessName, Host, Lib, User, Pass, Socket,
SSLPrivateKey, SSLCACertificate, SSLCertificate, SSLCipher: String; SSLPrivateKey, SSLCACertificate, SSLCertificate, SSLCipher: String;
Port, NetType, WindowsAuth, WantSSL, CleartextPluginEnabled: Integer; Port, NetType, WindowsAuth, WantSSL, CleartextPluginEnabled: Integer;
AbsentFiles: TStringList; AbsentFiles: TStringList;
@ -2607,17 +2607,18 @@ begin
// Enables the user to log into a session with a different, non-stored user: -dSession -uSomeOther // Enables the user to log into a session with a different, non-stored user: -dSession -uSomeOther
NetType := StrToIntDef(GetParamValue('n', 'nettype'), 0); NetType := StrToIntDef(GetParamValue('n', 'nettype'), 0);
Host := GetParamValue('h', 'host'); Host := GetParamValue('h', 'host');
Lib := GetParamValue('l', 'library');
User := GetParamValue('u', 'user'); User := GetParamValue('u', 'user');
Pass := GetParamValue('p', 'password'); Pass := GetParamValue('p', 'password');
CleartextPluginEnabled := StrToIntDef(GetParamValue('cleartextenabled', 'cleartextenabled'), -1); CleartextPluginEnabled := StrToIntDef(GetParamValue('cte', 'cleartextenabled'), -1);
Socket := GetParamValue('S', 'socket'); Socket := GetParamValue('S', 'socket');
Port := StrToIntDef(GetParamValue('P', 'port'), 0); Port := StrToIntDef(GetParamValue('P', 'port'), 0);
WindowsAuth := StrToIntDef(GetParamValue('W', 'winauth'), -1); WindowsAuth := StrToIntDef(GetParamValue('W', 'winauth'), -1);
WantSSL := StrToIntDef(GetParamValue('ssl', 'ssl'), -1); WantSSL := StrToIntDef(GetParamValue('ssl', 'ssl'), -1);
SSLPrivateKey := GetParamValue('sslprivatekey', 'sslprivatekey'); SSLPrivateKey := GetParamValue('sslpk', 'sslprivatekey');
SSLCACertificate := GetParamValue('sslcacertificate', 'sslcacertificate'); SSLCACertificate := GetParamValue('sslca', 'sslcacertificate');
SSLCertificate := GetParamValue('sslcertificate', 'sslcertificate'); SSLCertificate := GetParamValue('sslcert', 'sslcertificate');
SSLCipher := GetParamValue('sslcipher', 'sslcipher'); SSLCipher := GetParamValue('sslcip', 'sslcipher');
// Leave out support for startup script, seems reasonable for command line connecting // Leave out support for startup script, seems reasonable for command line connecting
if (Host <> '') or (User <> '') or (Pass <> '') or (Port <> 0) or (Socket <> '') then begin if (Host <> '') or (User <> '') or (Pass <> '') or (Port <> 0) or (Socket <> '') then begin
@ -2631,9 +2632,9 @@ begin
except except
ConnectionParams.NetType := ntMySQL_TCPIP; ConnectionParams.NetType := ntMySQL_TCPIP;
end; end;
// Otherwise default libmariadb.dll would be used for PG and other types
ConnectionParams.LibraryOrProvider := ConnectionParams.DefaultLibrary;
if Host <> '' then ConnectionParams.Hostname := Host; if Host <> '' then ConnectionParams.Hostname := Host;
if Lib <> '' then ConnectionParams.LibraryOrProvider := Lib;
if ConnectionParams.LibraryOrProvider.IsEmpty then ConnectionParams.LibraryOrProvider := ConnectionParams.DefaultLibrary;
if User <> '' then ConnectionParams.Username := User; if User <> '' then ConnectionParams.Username := User;
if Pass <> '' then ConnectionParams.Password := Pass; if Pass <> '' then ConnectionParams.Password := Pass;
if CleartextPluginEnabled in [0,1] then if CleartextPluginEnabled in [0,1] then