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

Fix detection of column names with backticks in them. Should have already been fixed in r4559. Fixes issue #2292, again.

Browse Source
This commit is contained in:
Ansgar Becker
2014-06-14 06:54:46 +00:00
parent 4fa5555fa5
commit cada6f0e5d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/dbconnection.pas
View File

@@ -4104,10 +4104,9 @@ begin
rx := TRegExpr.Create;
rx.ModifierS := False;
rx.ModifierM := True;
rx.Expression := '^\s+['+Quotes+']([^'+Quotes+']+)['+Quotes+']\s(\w+)';
rx.Expression := '^\s+['+Quotes+'](.+)['+Quotes+']\s(\w+)';
rxCol := TRegExpr.Create;
rxCol.ModifierI := True;
CreateTable := StringReplace(CreateTable, FQuoteChar+FQuoteChar, QuoteReplacement, [rfReplaceAll]);
if rx.Exec(CreateTable) then while true do begin
if not Assigned(Columns) then
break;
@@ -4124,8 +4123,8 @@ begin
Col := TTableColumn.Create(Self);
Columns.Add(Col);
Col.Name := DeQuoteIdent(rx.Match[1]);
Col.Name := StringReplace(Col.Name, QuoteReplacement, FQuoteChar, [rfReplaceAll]);
Col.Name := rx.Match[1];
Col.Name := StringReplace(Col.Name, FQuoteChar+FQuoteChar, FQuoteChar, [rfReplaceAll]);
Col.OldName := Col.Name;
Col.Status := esUntouched;
Col.LengthCustomized := False;