Merge pull request #22551 from taosdata/szhou/tags-after-distinct

fix: select distinct/all tags instead of select tags distinct
2023-08-25 11:21:01 +08:00 · 2023-08-25 11:21:01 +08:00 · 178e32fe08
parent abe97e1e21 d5db4b16ba
commit 178e32fe08
3 changed files with 1317 additions and 132 deletions
--- a/include/common/ttokendef.h
+++ b/include/common/ttokendef.h
@ -356,9 +356,6 @@
 #define TK_WAL                            338


-
-
-
 #define TK_NK_SPACE         600
 #define TK_NK_COMMENT       601
 #define TK_NK_ILLEGAL       602
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@ -1009,7 +1009,7 @@ join_type(A) ::= INNER.

 /************************************************ query_specification *************************************************/
 query_specification(A) ::=
-  SELECT hint_list(M) tag_mode_opt(N) set_quantifier_opt(B) select_list(C) from_clause_opt(D)
+  SELECT hint_list(M) set_quantifier_opt(B) tag_mode_opt(N) select_list(C) from_clause_opt(D)
  where_clause_opt(E) partition_by_clause_opt(F) range_opt(J) every_opt(K)
  fill_opt(L) twindow_clause_opt(G) group_by_clause_opt(H) having_clause_opt(I).  {
                                                                                    A = createSelectStmt(pCxt, B, C, D, M);
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c