Fix panic while the query with order by Timestamp keyword

AfterShip · Jul 24, 2024 · b56bd6f · b56bd6f
1 parent 2d5d5a4
commit b56bd6f
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 1 deletion.
diff --git a/parser/parser_column.go b/parser/parser_column.go
@@ -298,7 +298,7 @@ func (p *Parser) parseColumnExpr(pos Pos) (Expr, error) { //nolint:funlen
 		if err != nil {
 			return nil, err
 		}
-		if nextToken.Kind == TokenString {
+		if nextToken != nil && nextToken.Kind == TokenString {
 			return p.parseString(pos)
 		}
 		return p.parseIdentOrFunction(pos)

diff --git a/parser/testdata/query/format/select_order_by_timestamp.sql b/parser/testdata/query/format/select_order_by_timestamp.sql
@@ -0,0 +1,10 @@
+-- Origin SQL:
+SELECT Timestamp FROM events ORDER BY Timestamp;
+
+-- Format SQL:
+
+SELECT 
+  Timestamp
+FROM
+  events
+ORDER BY Timestamp;
diff --git a/parser/testdata/query/output/select_order_by_timestamp.sql.golden.json b/parser/testdata/query/output/select_order_by_timestamp.sql.golden.json
@@ -0,0 +1,74 @@
+[
+  {
+    "SelectPos": 0,
+    "StatementEnd": 47,
+    "With": null,
+    "Top": null,
+    "SelectColumns": {
+      "ListPos": 7,
+      "ListEnd": 16,
+      "HasDistinct": false,
+      "Items": [
+        {
+          "Name": "Timestamp",
+          "QuoteType": 1,
+          "NamePos": 7,
+          "NameEnd": 16
+        }
+      ]
+    },
+    "From": {
+      "FromPos": 17,
+      "Expr": {
+        "Table": {
+          "TablePos": 22,
+          "TableEnd": 28,
+          "Alias": null,
+          "Expr": {
+            "Database": null,
+            "Table": {
+              "Name": "events",
+              "QuoteType": 1,
+              "NamePos": 22,
+              "NameEnd": 28
+            }
+          },
+          "HasFinal": false
+        },
+        "StatementEnd": 28,
+        "SampleRatio": null,
+        "HasFinal": false
+      }
+    },
+    "ArrayJoin": null,
+    "Window": null,
+    "Prewhere": null,
+    "Where": null,
+    "GroupBy": null,
+    "WithTotal": false,
+    "Having": null,
+    "OrderBy": {
+      "OrderPos": 29,
+      "ListEnd": 47,
+      "Items": [
+        {
+          "OrderPos": 29,
+          "Expr": {
+            "Name": "Timestamp",
+            "QuoteType": 1,
+            "NamePos": 38,
+            "NameEnd": 47
+          },
+          "Direction": "None"
+        }
+      ]
+    },
+    "LimitBy": null,
+    "Limit": null,
+    "Settings": null,
+    "Format": null,
+    "UnionAll": null,
+    "UnionDistinct": null,
+    "Except": null
+  }
+]
diff --git a/parser/testdata/query/select_order_by_timestamp.sql b/parser/testdata/query/select_order_by_timestamp.sql
@@ -0,0 +1 @@
+SELECT Timestamp FROM events ORDER BY Timestamp;