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

Remove handling of crashed tables - there is no difference to normal tables in the way we handle them.

Browse Source
This commit is contained in:
Ansgar Becker
2009-12-19 21:25:59 +00:00
parent 62764fa5e3
commit 7272ba3bc3
6 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/const.inc
View File

@ -243,8 +243,6 @@ const
ICONINDEX_TABLE_HIGHLIGHT = 71;
ICONINDEX_VIEW = 81;
ICONINDEX_VIEW_HIGHLIGHT = 82;
ICONINDEX_CRASHED_TABLE_HIGHLIGHT = -1;
ICONINDEX_CRASHED_TABLE = -1;
ICONINDEX_STOREDPROCEDURE = 119;
ICONINDEX_STOREDFUNCTION = 35;
ICONINDEX_TRIGGER = 137;

2
source/createdatabase.pas
View File

@ -237,7 +237,7 @@ begin
ObjectsInNewDb := nil; // Silence compiler warning
// Warn if there are tables with same names in new db
for i:=0 to ObjectsInOldDb.Count-1 do begin
if not (ObjectsInOldDb[i].NodeType in [lntTable, lntCrashedTable, lntView]) then
if not (ObjectsInOldDb[i].NodeType in [lntTable, lntView]) then
Raise Exception.Create('Database "'+modifyDB+'" contains stored routine(s), which cannot be moved.');
if Assigned(ObjectsInNewDb) then begin
for j:=0 to ObjectsInNewDb.Count-1 do begin

29
source/main.pas
View File

@ -1793,10 +1793,10 @@ begin
Act := Sender as TAction;
InDBTree := (Act.ActionComponent is TMenuItem)
and (TPopupMenu((Act.ActionComponent as TMenuItem).GetParentMenu).PopupComponent = DBTree);
if InDBTree and (SelectedTable.NodeType in [lntTable, lntCrashedTable, lntView]) then
if InDBTree and (SelectedTable.NodeType in [lntTable, lntView]) then
TableToolsDialog.SelectedTables.Text := SelectedTable.Text
else if not InDBTree then
TableToolsDialog.SelectedTables := GetVTCaptions(ListTables, True, 0, [lntTable, lntCrashedTable, lntView])
TableToolsDialog.SelectedTables := GetVTCaptions(ListTables, True, 0, [lntTable, lntView])
else
TableToolsDialog.SelectedTables.Clear;
if Sender = actMaintenance then
@ -2210,7 +2210,7 @@ begin
end;
Exit;
end;
lntTable, lntCrashedTable: Tables.Add(SelectedTable.Text);
lntTable: Tables.Add(SelectedTable.Text);
lntView: Views.Add(SelectedTable.Text);
lntProcedure: Procedures.Add(SelectedTable.Text);
lntFunction: Functions.Add(SelectedTable.Text);
@ -2219,7 +2219,6 @@ begin
end else begin
// Invoked from database tab
Tables := GetVTCaptions(ListTables, True, 0, [lntTable]);
Tables.AddStrings(GetVTCaptions(ListTables, True, 0, [lntCrashedTable]));
Views := GetVTCaptions(ListTables, True, 0, [lntView]);
Procedures := GetVTCaptions(ListTables, True, 0, [lntProcedure]);
Functions := GetVTCaptions(ListTables, True, 0, [lntFunction]);
@ -3549,7 +3548,6 @@ begin
// Find icon
case Obj.NodeType of
lntTable: img := ICONINDEX_TABLE;
lntCrashedTable: img := ICONINDEX_CRASHED_TABLE;
lntView: img := ICONINDEX_VIEW;
lntProcedure: img := ICONINDEX_STOREDPROCEDURE;
lntFunction: img := ICONINDEX_STOREDFUNCTION;
@ -3935,7 +3933,6 @@ var
begin
case Obj.NodeType of
lntTable: Icon := ICONINDEX_TABLE;
lntCrashedTable: Icon := ICONINDEX_CRASHED_TABLE;
lntFunction: Icon := ICONINDEX_STOREDFUNCTION;
lntProcedure: Icon := ICONINDEX_STOREDPROCEDURE;
lntView: Icon := ICONINDEX_VIEW;
@ -4478,8 +4475,8 @@ begin
actCreateView.Enabled := L in [1,2];
actCreateRoutine.Enabled := L in [1,2];
actDropObjects.Enabled := L in [1,2];
actCopyTable.Enabled := HasFocus and (GetFocusedTreeNodeType in [lntTable, lntCrashedTable, lntView]);
actEmptyTables.Enabled := HasFocus and (GetFocusedTreeNodeType in [lntTable, lntCrashedTable, lntView]);
actCopyTable.Enabled := HasFocus and (GetFocusedTreeNodeType in [lntTable, lntView]);
actEmptyTables.Enabled := HasFocus and (GetFocusedTreeNodeType in [lntTable, lntView]);
actEditObject.Enabled := L > 0;
// Show certain items which are valid only here
menuTreeExpandAll.Visible := True;
@ -4496,7 +4493,7 @@ begin
actEmptyTables.Enabled := False;
if HasFocus then begin
NodeData := ListTables.GetNodeData(ListTables.FocusedNode);
actEmptyTables.Enabled := NodeData.NodeType in [lntTable, lntCrashedTable, lntView];
actEmptyTables.Enabled := NodeData.NodeType in [lntTable, lntView];
end;
actEditObject.Enabled := HasFocus;
// Show certain items which are valid only here
@ -5847,10 +5844,6 @@ begin
if Kind = ikSelected then
ImageIndex := ICONINDEX_VIEW_HIGHLIGHT
else ImageIndex := ICONINDEX_VIEW;
lntCrashedTable:
if Kind = ikSelected then
ImageIndex := ICONINDEX_CRASHED_TABLE_HIGHLIGHT
else ImageIndex := ICONINDEX_CRASHED_TABLE;
lntProcedure:
ImageIndex := ICONINDEX_STOREDPROCEDURE;
lntFunction:
@ -5988,13 +5981,13 @@ begin
Connection.Database := newDb;
newDbObject := SelectedTable.Text;
tabEditor.TabVisible := True;
tabData.TabVisible := SelectedTable.NodeType in [lntTable, lntCrashedTable, lntView];
tabData.TabVisible := SelectedTable.NodeType in [lntTable, lntView];
SelectedTableColumns.Clear;
SelectedTableKeys.Clear;
SelectedTableForeignKeys.Clear;
try
case SelectedTable.NodeType of
lntTable, lntCrashedTable: begin
lntTable: begin
SelectedTableCreateStatement := Connection.GetVar('SHOW CREATE TABLE '+Mainform.mask(SelectedTable.Text), 1);
ParseTableStructure(SelectedTableCreateStatement, SelectedTableColumns, SelectedTableKeys, SelectedTableForeignKeys);
end;
@ -7957,7 +7950,7 @@ function TMainForm.PlaceObjectEditor(Which: TListNodeType): TDBObjectEditor;
begin
// Place the relevant editor frame onto the editor tab, hide all others
Result := nil;
if (not (Which in [lntTable, lntCrashedTable])) and Assigned(TableEditor) then
if (not (Which in [lntTable])) and Assigned(TableEditor) then
FreeAndNil(TableEditor);
if (Which <> lntView) and Assigned(ViewEditor) then
FreeAndNil(ViewEditor);
@ -7965,7 +7958,7 @@ begin
FreeAndNil(RoutineEditor);
if (Which <> lntTrigger) and Assigned(TriggerEditor) then
FreeAndNil(TriggerEditor);
if Which in [lntTable, lntCrashedTable] then begin
if Which in [lntTable] then begin
if not Assigned(TableEditor) then
TableEditor := TfrmTableEditor.Create(tabEditor);
Result := TableEditor;
@ -8047,7 +8040,7 @@ begin
end;
end;
lntTable, lntCrashedTable: begin
lntTable: begin
PlaceObjectEditor(SelectedTable.NodeType);
TableEditor.Init(SelectedTable.Text);
end;

2
source/mysql_connection.pas
View File

@ -9,7 +9,7 @@ uses
type
{ TDBObjectList and friends }
TListNodeType = (lntNone, lntDb, lntTable, lntCrashedTable, lntView, lntFunction, lntProcedure, lntTrigger, lntColumn);
TListNodeType = (lntNone, lntDb, lntTable, lntView, lntFunction, lntProcedure, lntTrigger, lntColumn);
TListNodeTypes = Set of TListNodeType;
TDBObject = class
Name, Database, Engine, Comment, RowFormat, CreateOptions, Collation, ObjType: WideString;

4
source/tabletools.pas
View File

@ -388,7 +388,7 @@ begin
2: begin
DBObjects := Mainform.Connection.GetDBObjects(Mainform.Databases[ParentNode.Index]);
// No checkbox for stored routines
if not (DBObjects[Node.Index].NodeType in [lntTable, lntCrashedTable, lntView]) then
if not (DBObjects[Node.Index].NodeType in [lntTable, lntView]) then
Node.CheckType := ctNone
end;
end;
@ -990,7 +990,7 @@ begin
end;
case DBObj.NodeType of
lntTable, lntCrashedTable: begin
lntTable: begin
// Table data
if comboExportData.Text = DATA_NO then begin
Output(CRLF+'# Data exporting was unselected.'+CRLF, False, True, True, False, False);

2
source/trigger_editor.pas
View File

@ -87,7 +87,7 @@ begin
DBObjects := Mainform.Connection.GetDBObjects(Mainform.ActiveDatabase);
comboTable.Items.Clear;
for i:=0 to DBObjects.Count-1 do begin
if DBObjects[i].NodeType in [lntTable, lntCrashedTable] then
if DBObjects[i].NodeType in [lntTable] then
comboTable.Items.Add(DBObjects[i].Name);
end;
if comboTable.Items.Count > 0 then