Merge pull request #30 from project-tsurugi/wip/select-alias

fix derived column rule (enable omit `AS`).
project-tsurugi · Oct 2, 2023 · 7249eaa · 7249eaa
2 parents f8b65c5 + 29e11c2
commit 7249eaa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/parser/src/grammar/SqlParserRules.g4 b/parser/src/grammar/SqlParserRules.g4
@@ -106,7 +106,7 @@ selectSublist
     ;
 
 derivedColumn
-    : expression (K_AS columnName)?
+    : expression (K_AS? columnName)?
     ;
 
 tableExpression

diff --git a/parser/test/ParserQueryTest.cpp b/parser/test/ParserQueryTest.cpp
@@ -97,6 +97,17 @@ TEST_F(ParserQueryTest, select_projection_alias) {
     EXPECT_TRUE(equals(f.Name("C1"), c1v->name()));
 }
 
+TEST_F(ParserQueryTest, select_projection_alias_noas) {
+    auto select = parse_select("SELECT C1 x FROM TBL");
+    auto projection = dynamic_pointer_cast<ProjectionExpression>(select->source());
+    ASSERT_EQ(1U, projection->columns().size());
+
+    auto c1 = projection->columns()[0];
+    EXPECT_TRUE(equals(f.Name("x"), c1->alias()));
+    auto c1v = dynamic_pointer_cast<VariableReference>(c1->value());
+    EXPECT_TRUE(equals(f.Name("C1"), c1v->name()));
+}
+
 TEST_F(ParserQueryTest, select_projection_many) {
     auto select = parse_select("SELECT 1, 2, 3, 4, 5 FROM TBL");
     auto projection = dynamic_pointer_cast<ProjectionExpression>(select->source());