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

Avoid AVs by referring to DBObject.Connection instead of MainForm.ActiveConnection, which is nil for milliseconds when the tree focused node changes. Fixes issue #2418.

Browse Source
This commit is contained in:
Ansgar Becker
2011-05-30 17:21:25 +00:00
parent 0c16da99ea
commit c8cfc39c99
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/table_editor.pas
View File

@@ -256,9 +256,9 @@ var
begin
inherited;
FLoaded := False;
comboEngine.Items := MainForm.ActiveConnection.TableEngines;
comboEngine.ItemIndex := comboEngine.Items.IndexOf(MainForm.ActiveConnection.TableEngineDefault);
comboCollation.Items := MainForm.ActiveConnection.CollationList;
comboEngine.Items := DBObject.Connection.TableEngines;
comboEngine.ItemIndex := comboEngine.Items.IndexOf(DBObject.Connection.TableEngineDefault);
comboCollation.Items := DBObject.Connection.CollationList;
listColumns.BeginUpdate;
FColumns.Clear;
btnClearIndexesClick(Self);
@@ -283,7 +283,7 @@ begin
// Creating new table
editName.Text := '';
if DBObject.Connection.Parameters.NetTypeGroup = ngMySQL then
comboCollation.ItemIndex := comboCollation.Items.IndexOf(MainForm.ActiveConnection.GetVar('SHOW VARIABLES LIKE ''collation_database''', 1));
comboCollation.ItemIndex := comboCollation.Items.IndexOf(DBObject.Connection.GetVar('SHOW VARIABLES LIKE ''collation_database''', 1));
PageControlMain.ActivePage := tabBasic;
end else begin
// Editing existing table
@@ -323,7 +323,7 @@ begin
memoUnionTables.Lines.Clear;
rx.Expression := '\bCOMMENT=''((.+)[^''])''';
if rx.Exec(DBObject.CreateCode) then
memoComment.Lines.Text := MainForm.ActiveConnection.UnescapeString(rx.Match[1])
memoComment.Lines.Text := DBObject.Connection.UnescapeString(rx.Match[1])
else
memoComment.Lines.Clear;
DBObject.Connection.ParseTableStructure(DBObject.CreateCode, FColumns, FKeys, FForeignKeys);
@@ -378,7 +378,7 @@ begin
Batch := ComposeAlterStatement;
try
for Query in Batch do
MainForm.ActiveConnection.Query(Query.SQL);
DBObject.Connection.Query(Query.SQL);
tabALTERcode.TabVisible := DBObject.Name <> '';
if chkCharsetConvert.Checked then begin
// Autoadjust column collations