fix: Remove identifier alias from count builtin function

DerekStride · Feb 18, 2023 · eac9da2 · eac9da2
1 parent d2f0f66
commit eac9da2
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 26 deletions.
diff --git a/grammar.js b/grammar.js
@@ -1355,7 +1355,7 @@ module.exports = grammar({
     ),
 
     count: $ => seq(
-      field('name', alias($.keyword_count, $.identifier)),
+      field('name', $.keyword_count),
       '(',
       $._aggregate_expression,
       ')',

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json
diff --git a/src/parser.c b/src/parser.c
diff --git a/test/corpus/functions.txt b/test/corpus/functions.txt
@@ -151,22 +151,22 @@ FROM table_a;
       (keyword_select)
       (select_expression
         (term
-          (count
-            (identifier)
+          value: (count
+            name: (keyword_count)
             (keyword_distinct)
-            (field
-              (identifier))
+            parameter: (field
+              name: (identifier))
             (order_by
               (keyword_order)
               (keyword_by)
               (order_target
                 (field
-                  (identifier))))))))
+                  name: (identifier))))))))
     (from
       (keyword_from)
       (relation
         (table_reference
-          (identifier))))))
+          name: (identifier))))))
 
 ================================================================================
 GROUP CONCAT

diff --git a/test/corpus/group_by.txt b/test/corpus/group_by.txt
@@ -19,7 +19,7 @@ HAVING other_id > 10;
             name: (identifier)))
         (term
           value: (count
-            name: (identifier)
+            name: (keyword_count)
             parameter: (field
               name: (identifier))))))
     (from
@@ -58,7 +58,7 @@ HAVING other_id > 10;
             name: (identifier)))
         (term
           value: (count
-            name: (identifier)
+            name: (keyword_count)
             parameter: (field
               name: (identifier))))))
     (from
@@ -99,7 +99,7 @@ HAVING other_id > 10;
             name: (identifier)))
         (term
           value: (count
-            name: (identifier)
+            name: (keyword_count)
             parameter: (field
               name: (identifier))))))
     (from
@@ -140,7 +140,7 @@ HAVING COUNT(*) = 2;
             name: (identifier)))
         (term
           value: (count
-            name: (identifier)
+            name: (keyword_count)
             parameter: (field
               name: (identifier))))))
     (from
@@ -156,6 +156,6 @@ HAVING COUNT(*) = 2;
         (keyword_having)
         (binary_expression
           left: (count
-            name: (identifier)
+            name: (keyword_count)
             parameter: (all_fields))
           right: (literal))))))
diff --git a/test/corpus/select.txt b/test/corpus/select.txt
@@ -468,7 +468,7 @@ FROM my_table;
       (select_expression
         (term
           value: (count
-            name: (identifier)
+            name: (keyword_count)
             (keyword_distinct)
             parameter: (field
               name: (identifier)))
@@ -721,7 +721,7 @@ FROM my_table;
       (select_expression
         (term
           value: (count
-            name: (identifier)
+            name: (keyword_count)
             (keyword_distinct)
             parameter: (list
               (field
@@ -747,7 +747,7 @@ FROM my_table;
       (select_expression
         (term
           value: (count
-            name: (identifier)
+            name: (keyword_count)
             parameter: (all_fields)))))
     (from
       (keyword_from)
@@ -770,7 +770,7 @@ FROM my_table;
       (select_expression
         (term
           value: (count
-            name: (identifier)
+            name: (keyword_count)
             (keyword_distinct)
             parameter: (field
               name: (identifier))))))