parser: add AsName node for column aliases / column labels (#689)

Author: sbdchd

crates/squawk_parser/src/generated/syntax_kind.rs

@@ -4714,23 +4714,23 @@ fn opt_target_el(p: &mut Parser) -> Option<CompletedMarker> {
     Some(m.complete(p, TARGET))
 }
 
-fn opt_as_col_label(p: &mut Parser<'_>) -> bool {
+fn opt_as_col_label(p: &mut Parser<'_>) {
+    let m = p.start();
     if p.eat(AS_KW) {
         if p.at_ts(COL_LABEL_FIRST) {
             col_label(p);
-            true
+            m.complete(p, AS_NAME);
         } else {
             p.err_and_bump(&format!("expected column label, got {:?}", p.current()));
-            false
+            m.abandon(p);
         }
+    } else if p.at(FORMAT_KW) && p.nth_at(1, JSON_KW) {
+        m.abandon(p);
+    } else if p.at_ts(BARE_COL_LABEL_FIRST) {
+        col_label(p);
+        m.complete(p, AS_NAME);
     } else {
-        if p.at(FORMAT_KW) && p.nth_at(1, JSON_KW) {
-            return true;
-        }
-        if p.at_ts(BARE_COL_LABEL_FIRST) {
-            col_label(p);
-        }
-        true
+        m.abandon(p);
     }
 }
 

crates/squawk_parser/src/grammar.rs

@@ -253,10 +253,11 @@ SOURCE_FILE
                 LITERAL
                   STRING "'country'"
               WHITESPACE " "
-              AS_KW "as"
-              WHITESPACE " "
-              NAME
-                IDENT "\"country\""
+              AS_NAME
+                AS_KW "as"
+                WHITESPACE " "
+                NAME
+                  IDENT "\"country\""
         WHITESPACE " \n    "
         FROM_CLAUSE
           FROM_KW "from"

crates/squawk_parser/tests/snapshots/tests__create_materialized_view_ok.snap

@@ -52,10 +52,11 @@ SOURCE_FILE
               LITERAL
                 STRING "'Hello World'"
             WHITESPACE " "
-            AS_KW "AS"
-            WHITESPACE " "
-            NAME
-              IDENT "hello"
+            AS_NAME
+              AS_KW "AS"
+              WHITESPACE " "
+              NAME
+                IDENT "hello"
   SEMICOLON ";"
   WHITESPACE "\n\n"
   CREATE_VIEW
@@ -233,10 +234,11 @@ SOURCE_FILE
                     IDENT "country_code"
                 R_PAREN ")"
             WHITESPACE " "
-            AS_KW "AS"
-            WHITESPACE " "
-            NAME
-              IDENT "country"
+            AS_NAME
+              AS_KW "AS"
+              WHITESPACE " "
+              NAME
+                IDENT "country"
           COMMA ","
           WHITESPACE "\n           "
           TARGET
@@ -293,10 +295,11 @@ SOURCE_FILE
                         IDENT "id"
               R_PAREN ")"
             WHITESPACE " "
-            AS_KW "AS"
-            WHITESPACE " "
-            NAME
-              IDENT "avg_rating"
+            AS_NAME
+              AS_KW "AS"
+              WHITESPACE " "
+              NAME
+                IDENT "avg_rating"
       WHITESPACE "\n    "
       FROM_CLAUSE
         FROM_KW "FROM"

crates/squawk_parser/tests/snapshots/tests__create_view_ok.snap

@@ -308,10 +308,11 @@ SOURCE_FILE
                         IDENT "login_time"
                       R_PAREN ")"
                   WHITESPACE " "
-                  AS_KW "as"
-                  WHITESPACE " "
-                  NAME
-                    IDENT "last_login"
+                  AS_NAME
+                    AS_KW "as"
+                    WHITESPACE " "
+                    NAME
+                      IDENT "last_login"
             WHITESPACE "\n  "
             FROM_CLAUSE
               FROM_KW "from"

crates/squawk_parser/tests/snapshots/tests__delete_ok.snap

@@ -377,18 +377,20 @@ SOURCE_FILE
           NAME_REF
             IDENT "u"
           WHITESPACE " "
-          AS_KW "as"
-          WHITESPACE " "
-          NAME
-            IDENT "bar"
+          AS_NAME
+            AS_KW "as"
+            WHITESPACE " "
+            NAME
+              IDENT "bar"
         COMMA ","
         WHITESPACE " "
         TARGET
           NAME_REF
             IDENT "t"
           WHITESPACE " "
-          NAME
-            IDENT "b"
+          AS_NAME
+            NAME
+              IDENT "b"
         COMMA ","
         WHITESPACE " "
         TARGET