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

String enclosing char must not be counted when previous char was a backslash. Fixes issue #1964.

Browse Source
This commit is contained in:
Ansgar Becker
2010-05-26 23:19:54 +00:00
parent 9984bf0236
commit f3a9265775
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/helpers.pas
View File

@@ -366,7 +366,7 @@ var
i, AllLen, DelimLen, DelimStart, LastLeftOffset, RightOffset, LastNewLineOffset: Integer;
c, n: Char;
Delim, DelimTest, QueryTest: String;
InString, InComment, InBigComment: Boolean;
InString, InComment, InBigComment, InEscape: Boolean;
Marker: TSQLSentence;
rx: TRegExpr;
const
@@ -381,6 +381,7 @@ begin
InString := False; // Loop in "enclosed string" or `identifier`
InComment := False; // Loop in one-line comment (# or --)
InBigComment := False; // Loop in /* multi-line */ or /*! condictional comment */
InEscape := False; // Previous char was backslash
DelimLen := Length(Delim);
Result := TSQLBatch.Create;
rx := TRegExpr.Create;
@@ -401,7 +402,7 @@ begin
InBigComment := True;
if InBigComment and (not InComment) and (not InString) and (c + n = '*/') then
InBigComment := False;
if CharInSet(c, StringEnclosers) then
if (not InEscape) and CharInSet(c, StringEnclosers) then
InString := not InString;
if (CharInSet(c, NewLines) and (not CharInSet(n, NewLines))) or (i = 1) then begin
InComment := False;
@@ -413,6 +414,10 @@ begin
continue;
end;
end;
if not InEscape then
InEscape := c = '\'
else
InEscape := False;
// Prepare delimiter test string
if (not InComment) and (not InString) and (not InBigComment) then begin