Improve test case

AfterShip · Mar 29, 2024 · c002ab7 · c002ab7
1 parent 79a3c35
commit c002ab7
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 26 deletions.
diff --git a/parser/ast.go b/parser/ast.go
@@ -584,7 +584,6 @@ func (p *ProjectionSelect) Accept(visitor ASTVisitor) error {
 
 type TableProjection struct {
 	ProjectionPos Pos
-	StatementEnd  Pos
 	Identifier    *NestedIdentifier
 	Select        *ProjectionSelect
 }
@@ -594,7 +593,7 @@ func (t *TableProjection) Pos() Pos {
 }
 
 func (t *TableProjection) End() Pos {
-	return t.StatementEnd
+	return t.Select.End()
 }
 
 func (t *TableProjection) String(level int) string {

diff --git a/parser/testdata/ddl/alter_table_add_projection.sql b/parser/testdata/ddl/alter_table_add_projection.sql
@@ -1 +1,3 @@
-ALTER TABLE visits_order ADD PROJECTION user_name_projection (SELECT * ORDER BY user_name);
+ALTER TABLE visits_order
+ADD PROJECTION  IF NOT EXISTS user_name_projection
+(SELECT * GROUP BY user_name ORDER BY user_name) AFTER a.user_id;
diff --git a/parser/testdata/ddl/format/alter_table_add_projection.sql b/parser/testdata/ddl/format/alter_table_add_projection.sql
@@ -1,8 +1,9 @@
 -- Origin SQL:
-ALTER TABLE visits_order ADD PROJECTION user_name_projection (SELECT * ORDER BY user_name);
+ALTER TABLE visits_order
+ADD PROJECTION  IF NOT EXISTS user_name_projection
+(SELECT * GROUP BY user_name ORDER BY user_name) AFTER a.user_id;
 
 
 -- Format SQL:
 ALTER TABLE visits_order
-ADD PROJECTION 
-  user_name_projection (SELECT * ORDER BY user_name);
+ADD PROJECTION IF NOT EXISTS user_name_projection (SELECT * GROUP BY user_name ORDER BY user_name) AFTER a.user_id;
diff --git a/parser/testdata/ddl/output/alter_table_add_projection.sql.golden.json b/parser/testdata/ddl/output/alter_table_add_projection.sql.golden.json
@@ -1,7 +1,7 @@
 [
   {
     "AlterPos": 0,
-    "StatementEnd": 0,
+    "StatementEnd": 140,
     "TableIdentifier": {
       "Database": null,
       "Table": {
@@ -15,57 +15,88 @@
     "AlterExprs": [
       {
         "AddPos": 25,
-        "StatementEnd": 0,
-        "IfNotExists": false,
+        "StatementEnd": 140,
+        "IfNotExists": true,
         "TableProjection": {
-          "ProjectionPos": 40,
-          "StatementEnd": 0,
+          "ProjectionPos": 55,
           "Identifier": {
             "Ident": {
               "Name": "user_name_projection",
               "QuoteType": 1,
-              "NamePos": 40,
-              "NameEnd": 60
+              "NamePos": 55,
+              "NameEnd": 75
             },
             "DotIdent": null
           },
           "Select": {
-            "LeftParenPos": 61,
-            "RightParenPos": 89,
+            "LeftParenPos": 76,
+            "RightParenPos": 123,
             "With": null,
             "SelectColumns": {
-              "ListPos": 69,
-              "ListEnd": 69,
+              "ListPos": 84,
+              "ListEnd": 84,
               "HasDistinct": false,
               "Items": [
                 {
                   "Name": "*",
                   "QuoteType": 0,
-                  "NamePos": 69,
-                  "NameEnd": 69
+                  "NamePos": 84,
+                  "NameEnd": 84
                 }
               ]
             },
-            "GroupBy": null,
+            "GroupBy": {
+              "GroupByPos": 86,
+              "AggregateType": "",
+              "Expr": {
+                "ListPos": 95,
+                "ListEnd": 104,
+                "HasDistinct": false,
+                "Items": [
+                  {
+                    "Name": "user_name",
+                    "QuoteType": 1,
+                    "NamePos": 95,
+                    "NameEnd": 104
+                  }
+                ]
+              },
+              "WithCube": false,
+              "WithRollup": false,
+              "WithTotals": false
+            },
             "OrderBy": {
-              "OrderByPos": 71,
+              "OrderByPos": 105,
               "Columns": {
-                "ListPos": 80,
-                "ListEnd": 89,
+                "ListPos": 114,
+                "ListEnd": 123,
                 "HasDistinct": false,
                 "Items": [
                   {
                     "Name": "user_name",
                     "QuoteType": 1,
-                    "NamePos": 80,
-                    "NameEnd": 89
+                    "NamePos": 114,
+                    "NameEnd": 123
                   }
                 ]
               }
             }
           }
         },
-        "After": null
+        "After": {
+          "Ident": {
+            "Name": "a",
+            "QuoteType": 1,
+            "NamePos": 131,
+            "NameEnd": 132
+          },
+          "DotIdent": {
+            "Name": "user_id",
+            "QuoteType": 1,
+            "NamePos": 133,
+            "NameEnd": 140
+          }
+        }
       }
     ]
   }