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

Suppress error dialog when user lacks privilege for SHOW CREATE DATABASE. See http://www.heidisql.com/forum.php?t=8862

Browse Source
This commit is contained in:
Ansgar Becker
2011-07-12 17:55:19 +00:00
parent 3824e552fe
commit ef23060601
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/loaddata.pas
View File

@ -168,13 +168,18 @@ begin
Charset := MainForm.GetCharsetByEncoding(Encoding); Charset := MainForm.GetCharsetByEncoding(Encoding);
// Detect db charset // Detect db charset
DefCharset := 'Let server/database decide'; DefCharset := 'Let server/database decide';
dbcreate := FConnection.GetVar('SHOW CREATE DATABASE '+FConnection.QuoteIdent(comboDatabase.Text), 1); try
rx := TRegExpr.Create; dbcreate := FConnection.GetVar('SHOW CREATE DATABASE '+FConnection.QuoteIdent(comboDatabase.Text), 1);
rx.ModifierG := True; rx := TRegExpr.Create;
rx.Expression := 'CHARACTER SET (\w+)'; rx.ModifierG := True;
if rx.Exec(dbcreate) then rx.Expression := 'CHARACTER SET (\w+)';
DefCharset := DefCharset + ' ('+rx.Match[1]+')'; if rx.Exec(dbcreate) then
comboEncoding.Items.Add(DefCharset); DefCharset := DefCharset + ' ('+rx.Match[1]+')';
comboEncoding.Items.Add(DefCharset);
except
// Supress error dialog when user does not have privs for above SHOW query
// see http://www.heidisql.com/forum.php?t=8862
end;
CharsetTable := FConnection.CharsetTable; CharsetTable := FConnection.CharsetTable;
CharsetTable.First; CharsetTable.First;
while not CharsetTable.Eof do begin while not CharsetTable.Eof do begin