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

Allow reference table in foreign key tab to be from a different database. See comment #17 in issue #400 : http://code.google.com/p/heidisql/issues/detail?id=400#c17

Browse Source
This commit is contained in:
Ansgar Becker
2009-08-22 16:07:03 +00:00
parent eed0c7bbfb
commit c058039c40
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/main.pas
View File

@ -898,6 +898,7 @@ type
procedure ResetSelectedTableStuff; procedure ResetSelectedTableStuff;
procedure SetWindowCaption; procedure SetWindowCaption;
procedure OnMessageHandler(var Msg: TMsg; var Handled: Boolean); procedure OnMessageHandler(var Msg: TMsg; var Handled: Boolean);
function MaskMulti(str: WideString): WideString;
end; end;
@ -2132,6 +2133,21 @@ begin
end; end;
// Quote identifier, probably with multiple segments, e.g. db.table.column
function TMainform.MaskMulti(str: WideString): WideString;
var
Segments: TWideStringlist;
i: Integer;
begin
Segments := Explode('.', str);
Result := '';
for i:=0 to Segments.Count-1 do
Result := Result + mask(Segments[i]) + '.';
FreeAndNil(Segments);
Delete(Result, Length(Result), 1);
end;
procedure TMainForm.actExportSettingsExecute(Sender: TObject); procedure TMainForm.actExportSettingsExecute(Sender: TObject);
begin begin
// Export settings to .reg-file // Export settings to .reg-file

25
source/table_editor.pas
View File

@ -470,12 +470,12 @@ begin
// Detect foreign keys // Detect foreign keys
// CONSTRAINT `FK1` FOREIGN KEY (`which`) REFERENCES `fk1` (`id`) ON DELETE SET NULL ON UPDATE CASCADE // CONSTRAINT `FK1` FOREIGN KEY (`which`) REFERENCES `fk1` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
rx.Expression := '\s+CONSTRAINT\s+`([^`]+)`\sFOREIGN KEY\s+\(([^\)]+)\)\s+REFERENCES\s+`([^`]+)`\s\(([^\)]+)\)(\s+ON DELETE (RESTRICT|CASCADE|SET NULL|NO ACTION))?(\s+ON UPDATE (RESTRICT|CASCADE|SET NULL|NO ACTION))?'; rx.Expression := '\s+CONSTRAINT\s+`([^`]+)`\sFOREIGN KEY\s+\(([^\)]+)\)\s+REFERENCES\s+`([^\(]+)`\s\(([^\)]+)\)(\s+ON DELETE (RESTRICT|CASCADE|SET NULL|NO ACTION))?(\s+ON UPDATE (RESTRICT|CASCADE|SET NULL|NO ACTION))?';
if rx.Exec(CreateTable) then while true do begin if rx.Exec(CreateTable) then while true do begin
ForeignKey := TForeignKey.Create; ForeignKey := TForeignKey.Create;
ForeignKeys.Add(ForeignKey); ForeignKeys.Add(ForeignKey);
ForeignKey.KeyName := rx.Match[1]; ForeignKey.KeyName := rx.Match[1];
ForeignKey.ReferenceTable := rx.Match[3]; ForeignKey.ReferenceTable := WideStringReplace(rx.Match[3], '`', '', [rfReplaceAll]);
ExplodeQuotedList(rx.Match[2], ForeignKey.Columns); ExplodeQuotedList(rx.Match[2], ForeignKey.Columns);
ExplodeQuotedList(rx.Match[4], ForeignKey.ForeignColumns); ExplodeQuotedList(rx.Match[4], ForeignKey.ForeignColumns);
if rx.Match[6] <> '' then if rx.Match[6] <> '' then
@ -887,7 +887,7 @@ begin
for i:=0 to Key.Columns.Count-1 do for i:=0 to Key.Columns.Count-1 do
Result := Result + Mainform.mask(Key.Columns[i]) + ', '; Result := Result + Mainform.mask(Key.Columns[i]) + ', ';
if Key.Columns.Count > 0 then Delete(Result, Length(Result)-1, 2); if Key.Columns.Count > 0 then Delete(Result, Length(Result)-1, 2);
Result := Result + ') REFERENCES ' + Mainform.mask(Key.ReferenceTable) + ' ('; Result := Result + ') REFERENCES ' + Mainform.MaskMulti(Key.ReferenceTable) + ' (';
for i:=0 to Key.ForeignColumns.Count-1 do for i:=0 to Key.ForeignColumns.Count-1 do
Result := Result + Mainform.mask(Key.ForeignColumns[i]) + ', '; Result := Result + Mainform.mask(Key.ForeignColumns[i]) + ', ';
if Key.ForeignColumns.Count > 0 then Delete(Result, Length(Result)-1, 2); if Key.ForeignColumns.Count > 0 then Delete(Result, Length(Result)-1, 2);
@ -2000,7 +2000,6 @@ procedure TfrmTableEditor.listForeignKeysEditing(Sender: TBaseVirtualTree; Node:
Column: TColumnIndex; var Allowed: Boolean); Column: TColumnIndex; var Allowed: Boolean);
var var
Key: TForeignKey; Key: TForeignKey;
ds: TDataset;
begin begin
// Disallow editing foreign columns when no reference table was selected. // Disallow editing foreign columns when no reference table was selected.
// Also, check for existance of reference table and warn if it's missing. // Also, check for existance of reference table and warn if it's missing.
@ -2010,16 +2009,13 @@ begin
if Key.ReferenceTable = '' then if Key.ReferenceTable = '' then
MessageDlg('Please select a reference table before selecting foreign columns.', mtError, [mbOk], 0) MessageDlg('Please select a reference table before selecting foreign columns.', mtError, [mbOk], 0)
else begin else begin
ds := Mainform.FetchActiveDbTableList; try
while not ds.Eof do begin Mainform.GetVar('SELECT 1 FROM '+Mainform.MaskMulti(Key.ReferenceTable));
if ds.FieldByName(DBO_NAME).AsWideString = Key.ReferenceTable then begin Allowed := True;
Allowed := True; except
Break; // Leave Allowed = False
end;
ds.Next;
end;
if not Allowed then
MessageDlg('Reference table "'+Key.ReferenceTable+'" seems to be missing, broken or non-accessible.', mtError, [mbOk], 0) MessageDlg('Reference table "'+Key.ReferenceTable+'" seems to be missing, broken or non-accessible.', mtError, [mbOk], 0)
end;
end; end;
end else end else
Allowed := True; Allowed := True;
@ -2049,6 +2045,7 @@ begin
end; end;
2: begin 2: begin
EnumEditor := TEnumEditorLink.Create(VT); EnumEditor := TEnumEditorLink.Create(VT);
EnumEditor.AllowCustomText := True;
ds := Mainform.FetchActiveDbTableList; ds := Mainform.FetchActiveDbTableList;
while not ds.Eof do begin while not ds.Eof do begin
EnumEditor.ValueList.Add(ds.FieldByName(DBO_NAME).AsWideString); EnumEditor.ValueList.Add(ds.FieldByName(DBO_NAME).AsWideString);
@ -2059,7 +2056,7 @@ begin
3: begin 3: begin
Key := ForeignKeys[Node.Index] as TForeignKey; Key := ForeignKeys[Node.Index] as TForeignKey;
SetEditor := TSetEditorLink.Create(VT); SetEditor := TSetEditorLink.Create(VT);
SetEditor.ValueList := Mainform.GetCol('SHOW COLUMNS FROM '+Mainform.mask(Key.ReferenceTable)); SetEditor.ValueList := Mainform.GetCol('SHOW COLUMNS FROM '+Mainform.MaskMulti(Key.ReferenceTable));
EditLink := SetEditor; EditLink := SetEditor;
end; end;
4, 5: begin 4, 5: begin