|
@@ -504,8 +504,8 @@ begin
|
|
GetNextToken;
|
|
GetNextToken;
|
|
end;
|
|
end;
|
|
end;
|
|
end;
|
|
- Expect([tsqlComma,tsqlFrom]);
|
|
|
|
- until (CurrentToken=tsqlFROM);
|
|
|
|
|
|
+ Expect([tsqlComma,tsqlFrom,tsqlEOF]);
|
|
|
|
+ until (CurrentToken in [tsqlFROM,tsqlEOF]);
|
|
end;
|
|
end;
|
|
|
|
|
|
procedure TSQLParser.ParseGroupBy(AParent: TSQLSelectStatement;
|
|
procedure TSQLParser.ParseGroupBy(AParent: TSQLSelectStatement;
|
|
@@ -719,6 +719,8 @@ begin
|
|
Result.TransactionName:=CreateIdentifier(Result,CurrentTokenString);
|
|
Result.TransactionName:=CreateIdentifier(Result,CurrentTokenString);
|
|
end;
|
|
end;
|
|
ParseSelectFieldList(Result,Result.Fields,sfSingleton in Flags);
|
|
ParseSelectFieldList(Result,Result.Fields,sfSingleton in Flags);
|
|
|
|
+ If CurrentToken=tsqlEOF then
|
|
|
|
+ Exit;
|
|
// On return, we are on the FROM keyword.
|
|
// On return, we are on the FROM keyword.
|
|
ParseFromClause(Result,Result.Tables);
|
|
ParseFromClause(Result,Result.Tables);
|
|
If CurrentToken=tsqlWhere then
|
|
If CurrentToken=tsqlWhere then
|