Merge pull request #20771 from taosdata/fix/main_bugfix_wxy

fix: column comment is not supported
taosdata · Apr 4, 2023 · c11b717 · c11b717
2 parents bac65d8 + 9b2a94f
commit c11b717
Show file tree

Hide file tree

Showing 4 changed files with 1,816 additions and 1,824 deletions.
diff --git a/include/common/ttokendef.h b/include/common/ttokendef.h
@@ -127,24 +127,24 @@
 #define TK_NK_EQ                109
 #define TK_USING                110
 #define TK_TAGS                 111
-#define TK_COMMENT              112
-#define TK_BOOL                 113
-#define TK_TINYINT              114
-#define TK_SMALLINT             115
-#define TK_INT                  116
-#define TK_INTEGER              117
-#define TK_BIGINT               118
-#define TK_FLOAT                119
-#define TK_DOUBLE               120
-#define TK_BINARY               121
-#define TK_NCHAR                122
-#define TK_UNSIGNED             123
-#define TK_JSON                 124
-#define TK_VARCHAR              125
-#define TK_MEDIUMBLOB           126
-#define TK_BLOB                 127
-#define TK_VARBINARY            128
-#define TK_DECIMAL              129
+#define TK_BOOL                 112
+#define TK_TINYINT              113
+#define TK_SMALLINT             114
+#define TK_INT                  115
+#define TK_INTEGER              116
+#define TK_BIGINT               117
+#define TK_FLOAT                118
+#define TK_DOUBLE               119
+#define TK_BINARY               120
+#define TK_NCHAR                121
+#define TK_UNSIGNED             122
+#define TK_JSON                 123
+#define TK_VARCHAR              124
+#define TK_MEDIUMBLOB           125
+#define TK_BLOB                 126
+#define TK_VARBINARY            127
+#define TK_DECIMAL              128
+#define TK_COMMENT              129
 #define TK_MAX_DELAY            130
 #define TK_WATERMARK            131
 #define TK_ROLLUP               132

diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
@@ -330,7 +330,7 @@ column_def_list(A) ::= column_def(B).
 column_def_list(A) ::= column_def_list(B) NK_COMMA column_def(C).                 { A = addNodeToList(pCxt, B, C); }
 
 column_def(A) ::= column_name(B) type_name(C).                                    { A = createColumnDefNode(pCxt, &B, C, NULL); }
-column_def(A) ::= column_name(B) type_name(C) COMMENT NK_STRING(D).               { A = createColumnDefNode(pCxt, &B, C, &D); }
+//column_def(A) ::= column_name(B) type_name(C) COMMENT NK_STRING(D).               { A = createColumnDefNode(pCxt, &B, C, &D); }
 
 %type type_name                                                                   { SDataType }
 %destructor type_name                                                             { }