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

Follow up to rev 1307: Also analyse table names in JOIN clauses for proposal pulldown.

Browse Source 
Example: SELECT * FROM tab1 t1 LEFT JOIN tab2 AS t2 WHERE t2.[PULLDOWN!]
This commit is contained in:
Ansgar Becker
2008-03-31 17:57:04 +00:00
parent a9a6d36cd6
commit 28634e67b3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/childwin.pas
View File

@@ -3124,7 +3124,7 @@ procedure TMDIChild.SynCompletionProposal1Execute(Kind: SynCompletionType;
var
i,j : Integer;
tn, child : TTreeNode;
sql : String;
sql, TableClauses: String;
Tables : TStringList;
tablename : String;
rx : TRegExpr;
@@ -3189,11 +3189,14 @@ begin
rx.ModifierI := True;
rx.Expression := '\b(FROM|INTO|UPDATE)\s+(.+)(WHERE|HAVING|ORDER|GROUP)?';
if rx.Exec(sql) then begin
Tables := TStringList.Create;
TableClauses := rx.Match[2];
// Ensure tables in JOIN clause(s) are splitted by comma
TableClauses := StringReplace(TableClauses, 'JOIN', ',', [rfReplaceAll, rfIgnoreCase]);
// Split table clauses by commas
Tables := TStringList.Create;
Tables.Delimiter := ',';
Tables.StrictDelimiter := true;
Tables.DelimitedText := rx.Match[2];
Tables.DelimitedText := TableClauses;
rx.Expression := '([^\s]+)(\s+(AS\s+)?([^\s]+))?';
for i := 0 to Tables.Count - 1 do begin
// If the just typed word equals the alias of this table or the