Updates all aliases to identifier.symbol to match SQL grammar (#1152)

partiql-ast/src/main/kotlin/org/partiql/ast/helpers/ToLegacyAst.kt

@@ -700,7 +700,7 @@ private class AstTranslator(val metas: Map<String, MetaContainer>) : AstBaseVisi
     override fun visitSelectProjectItemExpression(node: Select.Project.Item.Expression, ctx: Ctx) =
         translate(node) { metas ->
             val expr = visitExpr(node.expr, ctx)
-            val alias = node.asAlias
+            val alias = node.asAlias?.symbol
             projectExpr(expr, alias, metas)
         }
 
@@ -718,9 +718,9 @@ private class AstTranslator(val metas: Map<String, MetaContainer>) : AstBaseVisi
     override fun visitFrom(node: From, ctx: Ctx) = super.visitFrom(node, ctx) as PartiqlAst.FromSource
     override fun visitFromValue(node: From.Value, ctx: Ctx) = translate(node) { metas ->
         val expr = visitExpr(node.expr, ctx)
-        val asAlias = node.asAlias
-        val atAlias = node.atAlias
-        val byAlias = node.byAlias
+        val asAlias = node.asAlias?.symbol
+        val atAlias = node.atAlias?.symbol
+        val byAlias = node.byAlias?.symbol
         when (node.type) {
             From.Value.Type.SCAN -> scan(expr, asAlias, atAlias, byAlias, metas)
             From.Value.Type.UNPIVOT -> unpivot(expr, asAlias, atAlias, byAlias, metas)
@@ -755,7 +755,7 @@ private class AstTranslator(val metas: Map<String, MetaContainer>) : AstBaseVisi
 
     override fun visitLetBinding(node: Let.Binding, ctx: Ctx) = translate(node) { metas ->
         val expr = visitExpr(node.expr, ctx)
-        val name = node.asAlias
+        val name = node.asAlias?.symbol
         letBinding(expr, name, metas)
     }
 
@@ -765,13 +765,13 @@ private class AstTranslator(val metas: Map<String, MetaContainer>) : AstBaseVisi
             GroupBy.Strategy.PARTIAL -> groupPartial()
         }
         val keyList = groupKeyList(node.keys.translate<PartiqlAst.GroupKey>(ctx))
-        val groupAsAlias = node.asAlias
+        val groupAsAlias = node.asAlias?.symbol
         groupBy(strategy, keyList, groupAsAlias, metas)
     }
 
     override fun visitGroupByKey(node: GroupBy.Key, ctx: Ctx) = translate(node) { metas ->
         val expr = visitExpr(node.expr, ctx)
-        val asAlias = node.asAlias
+        val asAlias = node.asAlias?.symbol
         groupKey(expr, asAlias, metas)
     }
 
@@ -911,7 +911,7 @@ private class AstTranslator(val metas: Map<String, MetaContainer>) : AstBaseVisi
 
     override fun visitStatementDMLInsert(node: Statement.DML.Insert, ctx: Ctx) = translate(node) { metas ->
         val target = visitIdentifier(node.target, ctx)
-        val asAlias = node.asAlias
+        val asAlias = node.asAlias?.symbol
         val values = visitExpr(node.values, ctx)
         val conflictAction = node.onConflict?.let { visitOnConflictAction(it.action, ctx) }
         val op = insert(target, asAlias, values, conflictAction)
@@ -935,7 +935,7 @@ private class AstTranslator(val metas: Map<String, MetaContainer>) : AstBaseVisi
 
     override fun visitStatementDMLUpsert(node: Statement.DML.Upsert, ctx: Ctx) = translate(node) { metas ->
         val target = visitIdentifier(node.target, ctx)
-        val asAlias = node.asAlias
+        val asAlias = node.asAlias?.symbol
         val values = visitExpr(node.values, ctx)
         val conflictAction = doUpdate(excluded())
         // UPSERT overloads legacy INSERT
@@ -945,7 +945,7 @@ private class AstTranslator(val metas: Map<String, MetaContainer>) : AstBaseVisi
 
     override fun visitStatementDMLReplace(node: Statement.DML.Replace, ctx: Ctx) = translate(node) { metas ->
         val target = visitIdentifier(node.target, ctx)
-        val asAlias = node.asAlias
+        val asAlias = node.asAlias?.symbol
         val values = visitExpr(node.values, ctx)
         val conflictAction = doReplace(excluded())
         // REPLACE overloads legacy INSERT
@@ -991,9 +991,9 @@ private class AstTranslator(val metas: Map<String, MetaContainer>) : AstBaseVisi
 
     override fun visitStatementDMLDeleteTarget(node: Statement.DML.Delete.Target, ctx: Ctx) = translate(node) { metas ->
         val path = visitPathUnpack(node.path, ctx)
-        val asAlias = node.asAlias
-        val atAlias = node.atAlias
-        val byAlias = node.byAlias
+        val asAlias = node.asAlias?.symbol
+        val atAlias = node.atAlias?.symbol
+        val byAlias = node.byAlias?.symbol
         scan(path, asAlias, atAlias, byAlias, metas)
     }
 
@@ -1041,7 +1041,7 @@ private class AstTranslator(val metas: Map<String, MetaContainer>) : AstBaseVisi
         ctx: Ctx,
     ) = translate(node) { metas ->
         val target = visitIdentifier(node.target, ctx)
-        val asAlias = node.asAlias
+        val asAlias = node.asAlias?.symbol
         val values = visitExpr(node.values, ctx)
         val conflictAction = node.onConflict?.let { visitOnConflictAction(it.action, ctx) }
         dmlOpList(insert(target, asAlias, values, conflictAction, metas))

partiql-ast/src/main/resources/partiql_ast.ion

@@ -18,7 +18,7 @@ statement::[
     insert::{
       target:       identifier,
       values:       expr,
-      as_alias:     optional::string,
+      as_alias:     optional::'.identifier.symbol',
       on_conflict:  optional::on_conflict,
     },
 
@@ -34,14 +34,14 @@ statement::[
     upsert::{
       target:   identifier,
       values:   expr,
-      as_alias: optional::string,
+      as_alias: optional::'.identifier.symbol',
     },
 
     // REPLACE INTO <target> [AS <alias>] <values>
     replace::{
       target:   identifier,
       values:   expr,
-      as_alias: optional::string,
+      as_alias: optional::'.identifier.symbol',
     },
 
     // UPDATE <target> SET <set clause list> WHERE <expr>
@@ -65,9 +65,9 @@ statement::[
     delete::{
       target: {
         path:     path,
-        as_alias: optional::string,
-        at_alias: optional::string,
-        by_alias: optional::string,
+        as_alias: optional::'.identifier.symbol',
+        at_alias: optional::'.identifier.symbol',
+        by_alias: optional::'.identifier.symbol',
       },
       where:      optional::expr,
       returning:  optional::returning,
@@ -84,7 +84,7 @@ statement::[
           insert::{
             target:       identifier,
             values:       expr,
-            as_alias:     optional::string,
+            as_alias:     optional::'.identifier.symbol',
             on_conflict:  optional::on_conflict,
           },
           insert_legacy::{
@@ -541,8 +541,8 @@ select::[
     setq:   optional::set_quantifier,
     _: [
       item::[
-        all::{ expr: expr },                                    // <expr>.*
-        expression::{ expr: expr, as_alias: optional::string }  // <expr> [as <identifier>]
+        all::{ expr: expr },                                                  // <expr>.*
+        expression::{ expr: expr, as_alias: optional::'.identifier.symbol' }  // <expr> [as <identifier>]
       ],
     ],
   },
@@ -567,9 +567,9 @@ from::[
   value::{
     expr:     expr,
     type:     [ SCAN, UNPIVOT ],
-    as_alias: optional::string,
-    at_alias: optional::string,
-    by_alias: optional::string,
+    as_alias: optional::'.identifier.symbol',
+    at_alias: optional::'.identifier.symbol',
+    by_alias: optional::'.identifier.symbol',
   },
 
   // TODO https://github.com/partiql/partiql-spec/issues/41
@@ -597,7 +597,7 @@ let::{
   _: [
     binding::{
       expr:     expr,
-      as_alias: string,
+      as_alias: '.identifier.symbol',
     },
   ],
 }
@@ -606,11 +606,11 @@ let::{
 group_by::{
   strategy: [ FULL, PARTIAL ],
   keys:     list::[key],
-  as_alias: optional::string,
+  as_alias: optional::'.identifier.symbol',
   _: [
     key::{
       expr:     expr,
-      as_alias: optional::string,
+      as_alias: optional::'.identifier.symbol',
     },
   ],
 }

partiql-ast/src/test/kotlin/org/partiql/ast/helpers/ToLegacyAstTest.kt

@@ -532,7 +532,7 @@ class ToLegacyAstTest {
                     }
                     items += selectProjectItemExpression {
                         expr = exprLit(int32Value(1))
-                        asAlias = "x"
+                        asAlias = id("x")
                     }
                 }
             },
@@ -558,9 +558,9 @@ class ToLegacyAstTest {
                 fromValue {
                     expr = NULL
                     type = From.Value.Type.SCAN
-                    asAlias = "a"
-                    atAlias = "b"
-                    byAlias = "c"
+                    asAlias = id("a")
+                    atAlias = id("b")
+                    byAlias = id("c")
                 }
             },
             expect("(unpivot (lit null) null null null)") {
@@ -573,9 +573,9 @@ class ToLegacyAstTest {
                 fromValue {
                     expr = NULL
                     type = From.Value.Type.UNPIVOT
-                    asAlias = "a"
-                    atAlias = "b"
-                    byAlias = "c"
+                    asAlias = id("a")
+                    atAlias = id("b")
+                    byAlias = id("c")
                 }
             },
             expect(
@@ -626,7 +626,7 @@ class ToLegacyAstTest {
                 let {
                     bindings += letBinding {
                         expr = NULL
-                        asAlias = "x"
+                        asAlias = id("x")
                     }
                 }
             },
@@ -644,7 +644,7 @@ class ToLegacyAstTest {
                 groupBy {
                     strategy = GroupBy.Strategy.FULL
                     keys += groupByKey(exprLit(stringValue("a")), null)
-                    keys += groupByKey(exprLit(stringValue("b")), "x")
+                    keys += groupByKey(exprLit(stringValue("b")), id("x"))
                 }
             },
             expect(
@@ -661,8 +661,8 @@ class ToLegacyAstTest {
                 groupBy {
                     strategy = GroupBy.Strategy.PARTIAL
                     keys += groupByKey(exprLit(stringValue("a")), null)
-                    keys += groupByKey(exprLit(stringValue("b")), "x")
-                    asAlias = "as"
+                    keys += groupByKey(exprLit(stringValue("b")), id("x"))
+                    asAlias = id("as")
                 }
             },
             expect(