170 supporting set statement (#177)

norton-yang · web-flow · commit c00345d0bb1b · 2022-09-30T16:47:30.000+08:00
* yml: assemble wget to one sh

* rule: set statement forward to L2.

* hsql: update version 2ebcb05

* yml: update ver.

* hsql: update ver.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -27,7 +27,7 @@ jobs:
 
       - name: update hsql
         run: |
-          wget https://github.com/DTC8/sql-parser/releases/download/hsql.plus-cb91252/hsql.plus-cb91252.tar.gz -O hsql.tar.gz
+          sh ${{github.workspace}}/script/download.sh
           tar -zxvf hsql.tar.gz
           cd hsql
           cp -rf include/ ${{github.workspace}}/src/libs/hsql/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ on:
 env:
   CC: gcc-4.9
   CXX: g++-4.9    
-  ver: dtc-v2.0.1-rc2
+  ver: dtc-v2.0.1-rc3
 
 jobs:
   build:
@@ -29,7 +29,7 @@ jobs:
 
       - name: update hsql
         run: |
-          wget https://github.com/DTC8/sql-parser/releases/download/hsql.plus-cb91252/hsql.plus-cb91252.tar.gz -O hsql.tar.gz
+          sh ${{github.workspace}}/script/download.sh
           tar -zxvf hsql.tar.gz
           cd hsql
           cp -rf include/ ${{github.workspace}}/src/libs/hsql/
diff --git a/.github/workflows/ubuntu-18.04&gcc-4.9.yml b/.github/workflows/ubuntu-18.04&gcc-4.9.yml
@@ -27,7 +27,7 @@ jobs:
 
     - name: update hsql
       run: |
-        wget https://github.com/DTC8/sql-parser/releases/download/hsql.plus-cb91252/hsql.plus-cb91252.tar.gz -O hsql.tar.gz
+        sh ${{github.workspace}}/script/download.sh
         tar -zxvf hsql.tar.gz
         cd hsql
         cp -rf include/ ${{github.workspace}}/src/libs/hsql/
diff --git a/.github/workflows/ubuntu-20.04&gcc-4.9.yml b/.github/workflows/ubuntu-20.04&gcc-4.9.yml
@@ -27,7 +27,7 @@ jobs:
 
     - name: update hsql
       run: |
-        wget https://github.com/DTC8/sql-parser/releases/download/hsql.plus-cb91252/hsql.plus-cb91252.tar.gz -O hsql.tar.gz
+        sh ${{github.workspace}}/script/download.sh
         tar -zxvf hsql.tar.gz
         cd hsql
         cp -rf include/ ${{github.workspace}}/src/libs/hsql/
diff --git a/.github/workflows/ubuntu-latest&gcc-4.9.yml b/.github/workflows/ubuntu-latest&gcc-4.9.yml
@@ -27,7 +27,7 @@ jobs:
         
     - name: update hsql
       run: |
-        wget https://github.com/DTC8/sql-parser/releases/download/hsql.plus-cb91252/hsql.plus-cb91252.tar.gz -O hsql.tar.gz
+        sh ${{github.workspace}}/script/download.sh
         tar -zxvf hsql.tar.gz
         cd hsql
         cp -rf include/ ${{github.workspace}}/src/libs/hsql/
diff --git a/script/download.sh b/script/download.sh
@@ -0,0 +1 @@
+wget https://github.com/DTC8/sql-parser/releases/download/hsql.plus-daefd23/hsql.plus-daefd23.tar.gz -O hsql.tar.gz
diff --git a/script/hsql-update.sh b/script/hsql-update.sh
@@ -1,4 +1,4 @@
-wget https://github.com/DTC8/sql-parser/releases/download/hsql.plus-cb91252/hsql.plus-cb91252.tar.gz -O hsql.tar.gz
+sh download.sh
 tar -zxvf hsql.tar.gz
 cp -rf hsql/include/ ../src/libs/hsql/
 cp -f hsql/libs/libsqlparser.so ../src/libs/hsql/libs/libsqlparser.so
diff --git a/src/libs/hsql/include/parser/bison_parser.h b/src/libs/hsql/include/parser/bison_parser.h
@@ -283,6 +283,7 @@ union HSQL_STYPE
   hsql::SQLStatement* statement;
   hsql::TransactionStatement* transaction_stmt;
   hsql::UpdateStatement* update_stmt;
+  hsql::SetStatement* set_stmt;
 
   hsql::Alias* alias_t;
   hsql::AlterAction* alter_action_t;
@@ -323,7 +324,7 @@ union HSQL_STYPE
   hsql::RowLockMode lock_mode_t;
   hsql::RowLockWaitPolicy lock_wait_policy_t;
 
-#line 327 "bison_parser.h"
+#line 328 "bison_parser.h"
 
 };
 typedef union HSQL_STYPE HSQL_STYPE;
diff --git a/src/libs/hsql/include/sql/DeleteStatement.h b/src/libs/hsql/include/sql/DeleteStatement.h
@@ -2,6 +2,7 @@
 #define SQLPARSER_DELETE_STATEMENT_H
 
 #include "SQLStatement.h"
+#include "SelectStatement.h"
 
 // Note: Implementations of constructors and destructors can be found in statements.cpp.
 namespace hsql {
@@ -16,6 +17,7 @@ struct DeleteStatement : SQLStatement {
   char* schema;
   char* tableName;
   Expr* expr;
+  LimitDescription* limit;
 };
 
 }  // namespace hsql
diff --git a/src/libs/hsql/include/sql/Expr.h b/src/libs/hsql/include/sql/Expr.h
@@ -30,7 +30,8 @@ enum ExprType {
   kExprArray,
   kExprArrayIndex,
   kExprExtract,
-  kExprCast
+  kExprCast,
+  kExprEqual
 };
 
 // Operator types. These are important for expressions of type kExprOperator.
@@ -99,6 +100,7 @@ struct Expr {
   Expr* expr2;
   std::vector<Expr*>* exprList;
   SelectStatement* select;
+  DataType data_type;
   char* name;
   char* table;
   char* alias;
diff --git a/src/libs/hsql/include/sql/SQLStatement.h b/src/libs/hsql/include/sql/SQLStatement.h
@@ -21,7 +21,8 @@ enum StatementType {
   kStmtRename,
   kStmtAlter,
   kStmtShow,
-  kStmtTransaction
+  kStmtTransaction,
+  kStmtSet
 };
 
 // Base struct for every SQL statement
diff --git a/src/libs/hsql/include/sql/SetStatement.h b/src/libs/hsql/include/sql/SetStatement.h
@@ -0,0 +1,18 @@
+#ifndef SQLPARSER_SET_STATEMENT_H
+#define SQLPARSER_SET_STATEMENT_H
+
+#include "SQLStatement.h"
+#include "Expr.h"
+
+namespace hsql {
+
+struct SetStatement : SQLStatement {
+    SetStatement();
+    ~SetStatement();
+
+    Expr* equal_expr;
+};
+
+}// namespace hsql
+
+#endif
diff --git a/src/libs/hsql/include/sql/UpdateStatement.h b/src/libs/hsql/include/sql/UpdateStatement.h
@@ -2,6 +2,7 @@
 #define SQLPARSER_UPDATE_STATEMENT_H
 
 #include "SQLStatement.h"
+#include "SelectStatement.h"
 
 namespace hsql {
 
@@ -20,6 +21,7 @@ struct UpdateStatement : SQLStatement {
   TableRef* table;
   std::vector<UpdateClause*>* updates;
   Expr* where;
+  LimitDescription* limit;
 };
 
 }  // namespace hsql
diff --git a/src/libs/hsql/include/sql/statements.h b/src/libs/hsql/include/sql/statements.h
@@ -14,5 +14,6 @@
 #include "ShowStatement.h"
 #include "TransactionStatement.h"
 #include "UpdateStatement.h"
+#include "SetStatement.h"
 
 #endif  // SQLPARSER_STATEMENTS_H
diff --git a/src/libs/hsql/libs/libsqlparser.a b/src/libs/hsql/libs/libsqlparser.a
diff --git a/src/libs/hsql/libs/libsqlparser.so b/src/libs/hsql/libs/libsqlparser.so
diff --git a/src/rule/rule.cc b/src/rule/rule.cc
@@ -332,6 +332,17 @@ int is_ext_table(hsql::SQLParserResult* ast,const char* dbname)
     return -1;
 }
 
+bool is_set_with_ast(hsql::SQLParserResult* ast)
+{
+    int t = ast->getStatement(0)->type();
+    if(t == kStmtSet)
+    {
+        return true;
+    }
+
+    return false;
+}
+
 bool is_show_create_table_with_ast(hsql::SQLParserResult* ast)
 {
     int t = ast->getStatement(0)->type();
@@ -434,6 +445,9 @@ extern "C" int rule_sql_match(const char* szsql, const char* osql, const char* d
         return 3;
     }
 
+    if(is_set_with_ast(&sql_ast))
+        return 2;
+
     if(is_show_table_with_ast(&sql_ast))
     {
         if(exist_session_db(dbname))

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+wget https://github.com/DTC8/sql-parser/releases/download/hsql.plus-daefd23/hsql.plus-daefd23.tar.gz -O hsql.tar.gz`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-wget https://github.com/DTC8/sql-parser/releases/download/hsql.plus-cb91252/hsql.plus-cb91252.tar.gz -O hsql.tar.gz`
	`1`	`+sh download.sh`
`2`	`2`	`tar -zxvf hsql.tar.gz`
`3`	`3`	`cp -rf hsql/include/ ../src/libs/hsql/`
`4`	`4`	`cp -f hsql/libs/libsqlparser.so ../src/libs/hsql/libs/libsqlparser.so`