From c3d771eb5ed6414b65312b1412e539a05d2be7a8 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Wed, 23 Dec 2009 13:42:46 +0000 Subject: [PATCH] Add object names of selected database to SynMemo highlighter. Broken in r2879. Fixes issue #1557 --- source/main.pas | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/source/main.pas b/source/main.pas index 6200d971..ef528b46 100644 --- a/source/main.pas +++ b/source/main.pas @@ -4806,16 +4806,24 @@ end; procedure TMainForm.SetSelectedDatabase(db: WideString); var n, f: PVirtualNode; + i: Integer; + DBObjects: TDBObjectList; + Tables: WideString; begin if db = '' then n := DBtree.GetFirst else n := FindDBNode(db); if Assigned(n) then begin - // Set focus to db node, if current focus is outside + // Set focus to db node, if current focus is outside f := DBtree.FocusedNode; if (not Assigned(f)) or (f.Parent <> n) then SelectNode(DBtree, n); + // Add object names to highlighter + DBObjects := Connection.GetDBObjects(db); + for i:=0 to DBObjects.Count-1 do + Tables := Tables + DBObjects[i].Name + CRLF; + SynSQLSyn1.TableNames.Text := Trim(Tables); end else raise Exception.Create('Database node ' + db + ' not found in tree.'); end;