opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-14 10:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix command line for Wine users by launching "$TERM -e path/to/mysql", see http://www.heidisql.com/forum.php?t=10158

Browse Source
This commit is contained in:
Ansgar Becker
2012-03-06 20:13:21 +00:00
parent 36d8e53333
commit ccca1bf982
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/main.pas
View File

@ -2767,16 +2767,23 @@ begin
ErrorDialog('You need to tell '+APPNAME+' where your MySQL binaries reside, in Tools > Preferences > Miscellaneous.'+
CRLF+CRLF+'Current setting is: '+CRLF+'"'+path+'"');
end else begin
p := '';
if FIsWine then begin
p := ' -e '+path+cmd;
path := '';
cmd := '$TERM';
end;
case Conn.Parameters.NetType of
ntMySQL_TCPIP: begin
p := ' --host="'+Conn.Parameters.Hostname+'" --port='+IntToStr(Conn.Parameters.Port);
p := p + ' --host="'+Conn.Parameters.Hostname+'" --port='+IntToStr(Conn.Parameters.Port);
if Conn.Parameters.WantSSL then
p := p + ' --ssl --ssl-key="'+Conn.Parameters.SSLPrivateKey+'" --ssl-cert="'+Conn.Parameters.SSLCertificate+'" --ssl-ca="'+Conn.Parameters.SSLCACertificate+'"';
end;
ntMySQL_NamedPipe:
p := ' --protocol=socket --socket="'+Conn.Parameters.Hostname+'"';
p := p + ' --protocol=socket --socket="'+Conn.Parameters.Hostname+'"';
ntMySQL_SSHtunnel:
p := ' --host="localhost" --port='+IntToStr(Conn.Parameters.SSHLocalPort);
p := p + ' --host="localhost" --port='+IntToStr(Conn.Parameters.SSHLocalPort);
end;
p := p + ' --user="'+Conn.Parameters.Username+'"';
@ -2788,8 +2795,9 @@ begin
p := p + ' --database="' + ActiveDatabase + '"';
rx := TRegExpr.Create;
rx.Expression := '(\-\-password\=")([^"]*)(")';
log := rx.Replace(p, '$1********$3', true);
LogSQL('Launching command line: '+path+cmd+log, lcInfo);
log := path + cmd + p;
log := rx.Replace(log, '$1********$3', true);
LogSQL('Launching command line: '+log, lcInfo);
rx.Free;
ShellExec(cmd, path, p);
end;