sql parser: support "SELECT 'a' 'b'" syntax (MSSQL)

git-svn-id: trunk@46472 -

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

@@ -501,11 +501,11 @@ begin
       F:=TSQLSelectField(CreateElement(TSQLSelectField,AParent));
       AList.Add(F);
       F.Expression:=Expression;
-      If CurrentToken in [tsqlAs,Tsqlidentifier] then
+      If CurrentToken in [tsqlAs,Tsqlidentifier,tsqlString] then
         begin
         If currentToken=tsqlAs then
           GetNextToken;
-        Expect(tsqlIdentifier);
+        Expect([tsqlIdentifier,tsqlString]);
         F.AliasName:=CreateIdentifier(F,CurrentTokenString);
         GetNextToken;
         end;

packages/fcl-db/tests/tcparser.pas

@@ -419,6 +419,7 @@ type
     procedure TestSelectTwoFieldsThreeBracketTablesJoin;
     procedure TestSelectTableWithSchema;
     procedure TestSelectFieldWithSchema;
+    procedure TestSelectFieldAsStringLiteral;
     procedure TestSelectFirst;
     procedure TestSelectFirstSkip;
     procedure TestSelectTop;
@@ -3839,6 +3840,23 @@ begin
   AssertException(ESQLParser,@TestParseError);
 end;
 
+procedure TTestSelectParser.TestSelectFieldAsStringLiteral;
+
+Var
+  F : TSQLSelectField;
+  L : TSQLStringLiteral;
+
+begin
+  TestSelect('SELECT ''B'' ''C'''); // 'B' as 'C'
+  AssertEquals('One field',1,Select.Fields.Count);
+  F:=TSQLSelectField(CheckClass(Select.Fields[0],TSQLSelectField));
+  AssertNotNull('Have field expresssion,',F.Expression);
+  L:=TSQLStringLiteral(AssertLiteralExpr('Field is a literal',F.Expression,TSQLStringLiteral));
+  AssertEquals('Field literal is B','B',L.Value);
+  AssertEquals('Field alias is C','C',F.AliasName.Name);
+  AssertEquals('No table',0,Select.Tables.Count);
+end;
+
 procedure TTestSelectParser.TestSelectFieldWithSchema;
 
 Var