修改部分命名

src/parser.y

@@ -115,7 +115,7 @@ sql_statement: create_table_stmt NEWLINE {cJSON_AddItemToArray(jroot, $1);}
 create_table_stmt: CREATE TABLE IDENTIFIER
 	{
 		cJSON* node = cJSON_CreateObject();
-		cJSON_AddStringToObject(node, "type", "create_table");
+		cJSON_AddStringToObject(node, "type", "create_stmt");
 		cJSON_AddStringToObject(node, "table_name", $3);
 		cJSON_AddItemToObject(node, "cols", cJSON_CreateArray());
 		$$ = node;
@@ -124,7 +124,7 @@ create_table_stmt: CREATE TABLE IDENTIFIER
 
 create_table_stmt: CREATE TABLE IDENTIFIER '(' create_col_list ')' {
 		cJSON* node = cJSON_CreateObject();
-		cJSON_AddStringToObject(node, "type", "create_table");
+		cJSON_AddStringToObject(node, "type", "create_stmt");
 		cJSON_AddStringToObject(node, "table_name", $3);
 		cJSON_AddItemToObject(node, "cols", $5);
 		$$ = node;
@@ -170,7 +170,7 @@ data_type: INT_T
 
 insert_stmt: INSERT INTO IDENTIFIER VALUES '(' insert_list ')' {
 		cJSON* node = cJSON_CreateObject();
-		cJSON_AddStringToObject(node, "type", "insert");
+		cJSON_AddStringToObject(node, "type", "insert_stmt");
 		cJSON_AddStringToObject(node, "table_name", $3);
 		cJSON_AddItemToObject(node, "values", $6);
 		$$=node;
@@ -195,7 +195,7 @@ data_value: INT_V {SIMPLE_TYPE_VALUE_OBJECT($$, int, Number, $1);}
 
 update_stmt: UPDATE IDENTIFIER SET update_list WHERE where_expr {
 		cJSON* node = cJSON_CreateObject();
-		cJSON_AddStringToObject(node, "type", "update");
+		cJSON_AddStringToObject(node, "type", "update_stmt");
 		cJSON_AddStringToObject(node, "table_name", $2);
 		cJSON_AddItemToObject(node, "set", $4);
 		cJSON_AddItemToObject(node, "where", $6);
@@ -364,7 +364,7 @@ bin_contains_op: IN {$$ = "包含于";}
 
 delete_stmt: DELETE FROM IDENTIFIER op_where_expr {
 		cJSON* node = cJSON_CreateObject();
-		cJSON_AddStringToObject(node, "type", "delete");
+		cJSON_AddStringToObject(node, "type", "delete_stmt");
 		cJSON_AddStringToObject(node, "table_name", $3);
 		cJSON_AddItemToObject(node, "where", $4);
 		$$=node;
@@ -383,7 +383,7 @@ op_join: {$$ = NULL;}
 
 select_stmt: SELECT select_items FROM IDENTIFIER op_join op_where_expr {
 		cJSON* node = cJSON_CreateObject();
-		cJSON_AddStringToObject(node, "type", "select");
+		cJSON_AddStringToObject(node, "type", "select_stmt");
 		cJSON_AddItemToObject(node, "select_cols", $2);
 		cJSON_AddStringToObject(node, "table_name", $4);
 		if ($5 != NULL) {
@@ -427,7 +427,7 @@ select_item: single_expr {
 
 drop_stmt: DROP TABLE IDENTIFIER {
 		cJSON* node = cJSON_CreateObject();
-		cJSON_AddStringToObject(node, "type", "drop_table");
+		cJSON_AddStringToObject(node, "type", "drop_stmt");
 		cJSON_AddStringToObject(node, "table_name", $3);
 		$$=node;
 	}

tests_config.py

@@ -1,10 +1,10 @@
 sql_parser_tests = [
-    ("create table asd;", [{"type": "create_table", "table_name": "asd", "cols": []}]),
+    ("create table asd;", [{"type": "create_stmt", "table_name": "asd", "cols": []}]),
     (
         "create table tb (col1 INT, col2 string, col3 FLOAT);",
         [
             {
-                "type": "create_table",
+                "type": "create_stmt",
                 "table_name": "tb",
                 "cols": [
                     {
@@ -38,7 +38,7 @@ sql_parser_tests = [
     """,
         [
             {
-                "type": "create_table",
+                "type": "create_stmt",
                 "table_name": "tb1",
                 "cols": [
                     {
@@ -67,7 +67,7 @@ sql_parser_tests = [
         """,
         [
             {
-                "type": "create_table",
+                "type": "create_stmt",
                 "table_name": "tb2",
                 "cols": [
                     {
@@ -96,7 +96,7 @@ sql_parser_tests = [
         """insert into tb1 values (1, 'foo');""",
         [
             {
-                "type": "insert",
+                "type": "insert_stmt",
                 "table_name": "tb1",
                 "values": [
                     {"type": "int", "value": 1},
@@ -109,7 +109,7 @@ sql_parser_tests = [
         """insert into tb1 values (2, 'foo', 'zxc', 1234.234);""",
         [
             {
-                "type": "insert",
+                "type": "insert_stmt",
                 "table_name": "tb1",
                 "values": [
                     {"type": "int", "value": 2},
@@ -124,7 +124,7 @@ sql_parser_tests = [
         "update tb1 set col1=3, col4=4 where col1=2 and col2=4;",
         [
             {
-                "type": "update",
+                "type": "update_stmt",
                 "table_name": "tb1",
                 "set": [
                     {
@@ -158,7 +158,7 @@ sql_parser_tests = [
         "update tb1 set col1=3, col4=4 where not not not col1=2 and col2=4 or col3=col2;",
         [
             {
-                "type": "update",
+                "type": "update_stmt",
                 "table_name": "tb1",
                 "set": [
                     {
@@ -209,7 +209,7 @@ sql_parser_tests = [
         "delete from tb1 where c1 = 1 and c2= 3 or c3=3;",
         [
             {
-                "type": "delete",
+                "type": "delete_stmt",
                 "table_name": "tb1",
                 "where": {
                     "type": "或",
@@ -239,7 +239,7 @@ sql_parser_tests = [
         "delete from tb1 where c1 = 1 and (c2= 3 or c3=3) or (c4='asd');",
         [
             {
-                "type": "delete",
+                "type": "delete_stmt",
                 "table_name": "tb1",
                 "where": {
                     "type": "或",
@@ -277,7 +277,7 @@ sql_parser_tests = [
         "select * from t2;",
         [
             {
-                "type": "select",
+                "type": "select_stmt",
                 "select_cols": [{"type": "select_all_column"}],
                 "table_name": "t2",
                 "where": {},
@@ -288,7 +288,7 @@ sql_parser_tests = [
         "select c2 as t from t2 where col1>2;",
         [
             {
-                "type": "select",
+                "type": "select_stmt",
                 "select_cols": [
                     {
                         "type": "select_column",
@@ -309,7 +309,7 @@ sql_parser_tests = [
         """SELECT Sname FROM Student WHERE Sno IN (1,2) and c in (3, 4, 5);""",
         [
             {
-                "type": "select",
+                "type": "select_stmt",
                 "select_cols": [
                     {
                         "type": "select_column",
@@ -351,7 +351,7 @@ sql_parser_tests = [
         """,
         [
             {
-                "type": "select",
+                "type": "select_stmt",
                 "select_cols": [
                     {
                         "type": "select_column",
@@ -367,7 +367,7 @@ sql_parser_tests = [
                     "type": "包含于",
                     "left": {"type": "identifier", "value": "Sno"},
                     "right": {
-                        "type": "select",
+                        "type": "select_stmt",
                         "select_cols": [
                             {
                                 "type": "select_column",
@@ -398,7 +398,7 @@ sql_parser_tests = [
         """,
         [
             {
-                "type": "select",
+                "type": "select_stmt",
                 "select_cols": [
                     {
                         "type": "select_column",
@@ -440,7 +440,7 @@ sql_parser_tests = [
         """,
         [
             {
-                "type": "select",
+                "type": "select_stmt",
                 "select_cols": [
                     {
                         "type": "select_column",
@@ -485,7 +485,7 @@ sql_parser_tests = [
             }
         ],
     ),
-    ('drop table t1;', [{"type": "drop_table", "table_name": "t1"}]),
+    ('drop table t1;', [{"type": "drop_stmt", "table_name": "t1"}]),
 ]
 
 sql_checker_tests = [