Ver Fonte

* fcl-db: cosmetic

git-svn-id: trunk@27856 -
reiniero há 11 anos atrás
pai
commit
c853c29c3c

+ 2 - 2
packages/fcl-db/src/sql/fpsqlparser.pas

@@ -2497,7 +2497,7 @@ begin
   try
   try
   {$ifdef debugexpr}  Writeln('Primitive ',TokenInfos[CurrentToken],': ',CurrentTokenString);{$endif debugexpr}
   {$ifdef debugexpr}  Writeln('Primitive ',TokenInfos[CurrentToken],': ',CurrentTokenString);{$endif debugexpr}
     Case CurrentToken of
     Case CurrentToken of
-      tsqlintegerNumber,
+      tsqlIntegerNumber,
       tsqlString,
       tsqlString,
       tsqlFloatNumber,
       tsqlFloatNumber,
       tsqlNull, // True and False belong here
       tsqlNull, // True and False belong here
@@ -2699,7 +2699,7 @@ begin
     Result:=D;
     Result:=D;
     end
     end
   else
   else
-    begin
+    begin //alter statement
     A:=Nil;
     A:=Nil;
     NN:=False;
     NN:=False;
     try
     try

+ 5 - 5
packages/fcl-db/src/sql/fpsqlscanner.pp

@@ -1,6 +1,6 @@
 {
 {
     This file is part of the Free Component Library
     This file is part of the Free Component Library
-    Copyright (c) 2010 by the Free Pascal development team
+    Copyright (c) 2010-2014 by the Free Pascal development team
 
 
     SQL source lexical scanner
     SQL source lexical scanner
 
 
@@ -71,9 +71,9 @@ type
 const
 const
   FirstKeyword = tsqlAll;
   FirstKeyword = tsqlAll;
   LastKeyWord = tsqlWhen;
   LastKeyWord = tsqlWhen;
-  sqlComparisons = [tsqleq,tsqlGE,tsqlLE,tsqlNE,tsqlGT,tsqlLT,tsqlIn, tsqlis,
-                    tsqlbetween,tsqlLike,tsqlContaining,tsqlStarting,tsqlnot];
-  sqlInvertableComparisons = [tsqlLike,tsqlContaining,tsqlStarting,tsqlin,tsqlis, tsqlbetween];
+  sqlComparisons = [tsqleq,tsqlGE,tsqlLE,tsqlNE,tsqlGT,tsqlLT,tsqlIn,tsqlIS,
+                    tsqlbetween,tsqlLike,tsqlContaining,tsqlStarting,tsqlNOT];
+  sqlInvertableComparisons = [tsqlLike,tsqlContaining,tsqlStarting,tsqlin,tsqlIS, tsqlbetween];
 
 
   // Strings that represent tokens in TSQLToken
   // Strings that represent tokens in TSQLToken
   TokenInfos: array[TSQLToken] of string = ('unknown',
   TokenInfos: array[TSQLToken] of string = ('unknown',
@@ -632,7 +632,7 @@ begin
     Move(TokenStart^,FCurTokenString[1],Len);
     Move(TokenStart^,FCurTokenString[1],Len);
   S:=UpperCase(FCurTokenString);
   S:=UpperCase(FCurTokenString);
   // Check if this is a keyword or identifier
   // Check if this is a keyword or identifier
-  // !!!: Optimize this!
+  // to do: Optimize this!
   If FKeyWords.Count=0 then
   If FKeyWords.Count=0 then
     BuildKeyWords;
     BuildKeyWords;
   P:=FKeyWords.Find(S);
   P:=FKeyWords.Find(S);

+ 1 - 1
packages/fcl-db/src/sql/fpsqltree.pp

@@ -4302,7 +4302,7 @@ end;
 function TSQLDatabaseFileInfo.GetAsSQL(Options: TSQLFormatOptions;
 function TSQLDatabaseFileInfo.GetAsSQL(Options: TSQLFormatOptions;
   AIndent: Integer): TSQLStringType;
   AIndent: Integer): TSQLStringType;
 begin
 begin
-  Result:=SQlKeyWord('FILE ',OPtions)+SQLFormatString(FileName,Options);
+  Result:=SQlKeyWord('FILE ',Options)+SQLFormatString(FileName,Options);
   If Length>0 then
   If Length>0 then
     Result:=Result+SQlKeyWord(' LENGTH ',Options)+IntToStr(Length)+SQlKeyWord(' PAGES',Options)
     Result:=Result+SQlKeyWord(' LENGTH ',Options)+IntToStr(Length)+SQlKeyWord(' PAGES',Options)
   else if (StartPage>0) then
   else if (StartPage>0) then