paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-23 02:29:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

* SQL-parser now handles sub-selects correctly

Browse Source 
git-svn-id: trunk@5029 -
This commit is contained in:
joost 2006-10-26 21:33:07 +00:00
parent 2450f5a778
commit d7d1591472
1 changed files with 17 additions and 1 deletions

18
fcl/db/sqldb/sqldb.pp
View File

@ -859,6 +859,7 @@ Var
ParsePart : TParsePart;
StrLength : Integer;
EndOfComment : Boolean;
BracketCount : Integer;
begin
PSQL:=Pchar(ASQL);
@ -877,8 +878,23 @@ begin
EndOfComment := SkipComments(CurrentP);
if EndOfcomment then dec(currentp);
if EndOfComment and (ParsePart = ppStart) then PhraseP := CurrentP;
// skip everything between bracket, since it could be a sub-select, and
// further nothing between brackets could be interesting for the parser.
if currentp^='(' then
begin
inc(currentp);
BracketCount := 0;
while (currentp^ <> #0) and ((currentp^ <> ')') or (BracketCount > 0 )) do
begin
if currentp^ = '(' then inc(bracketcount)
else if currentp^ = ')' then dec(bracketcount);
inc(currentp);
end;
EndOfComment := True;
end;
if EndOfComment or (CurrentP^ in [' ',#13,#10,#9,#0,'(',')',';']) then
if EndOfComment or (CurrentP^ in [' ',#13,#10,#9,#0,';']) then
begin
if (CurrentP-PhraseP > 0) or (CurrentP^ in [';',#0]) then
begin