Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

sql parser refactor.

Browse Source
This commit is contained in:
wenshao
2017-06-10 15:58:52 +08:00
parent 5434b65260
commit a318ebae29
17 changed files with 394 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest13.java
+61
View File
@@ -0,0 +1,61 @@
/*
* Copyright 1999-2017 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.druid.bvt.sql.mysql.create;
import com.alibaba.druid.sql.MysqlTest;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
import com.alibaba.druid.util.JdbcConstants;
import org.apache.ibatis.jdbc.SQL;
import java.util.List;
public class MySqlCreateProcedureTest13 extends MysqlTest {
public void test_0() throws Exception {
String sql = "create procedure foo(param1 int unsigned) contains sql begin select param1; end";
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
SQLStatement stmt = statementList.get(0);
// print(statementList);
assertEquals(1, statementList.size());
System.out.println(SQLUtils.toMySqlString(stmt));
assertEquals("CREATE PROCEDURE foo (\n" +
"\tparam1 int UNSIGNED\n" +
")\n" +
"CONTAINS SQL\n" +
"BEGIN\n" +
"\tSELECT param1;\n" +
"END", SQLUtils.toMySqlString(stmt));
SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL);
stmt.accept(visitor);
// System.out.println("Tables : " + visitor.getTables());
// System.out.println("fields : " + visitor.getColumns());
// System.out.println("coditions : " + visitor.getConditions());
// System.out.println("orderBy : " + visitor.getOrderByColumns());
assertEquals(0, visitor.getTables().size());
assertEquals(0, visitor.getColumns().size());
assertEquals(0, visitor.getConditions().size());
}
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest14.java
+63
View File
@@ -0,0 +1,63 @@
/*
* Copyright 1999-2017 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.druid.bvt.sql.mysql.create;
import com.alibaba.druid.sql.MysqlTest;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
import com.alibaba.druid.util.JdbcConstants;
import java.util.List;
public class MySqlCreateProcedureTest14 extends MysqlTest {
public void test_0() throws Exception {
String sql = "CREATE DEFINER = 'admin'@'localhost' PROCEDURE account_count()\n" +
"SQL SECURITY INVOKER\n" +
"BEGIN\n" +
" SELECT 'Number of accounts:', COUNT(*) FROM mysql.user;\n" +
"END;";
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
SQLStatement stmt = statementList.get(0);
// print(statementList);
assertEquals(1, statementList.size());
System.out.println(SQLUtils.toMySqlString(stmt));
assertEquals("CREATE PROCEDURE account_count ()\n" +
"SQL SECURITY INVOKER\n" +
"BEGIN\n" +
"\tSELECT 'Number of accounts:', COUNT(*)\n" +
"\tFROM mysql.user;\n" +
"END;", SQLUtils.toMySqlString(stmt));
SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL);
stmt.accept(visitor);
// System.out.println("Tables : " + visitor.getTables());
// System.out.println("fields : " + visitor.getColumns());
// System.out.println("coditions : " + visitor.getConditions());
// System.out.println("orderBy : " + visitor.getOrderByColumns());
assertEquals(1, visitor.getTables().size());
assertEquals(0, visitor.getColumns().size());
assertEquals(0, visitor.getConditions().size());
}
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java
+15 -12
View File
@@ -16,9 +16,12 @@
package com.alibaba.druid.bvt.sql.mysql.create;
import com.alibaba.druid.sql.MysqlTest;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
import com.alibaba.druid.util.JdbcConstants;
import org.junit.Assert;
import java.util.List;
@@ -55,24 +58,24 @@ public class MySqlCreateProcedureTest8 extends MysqlTest {
+" close cur_test;"
+" end if;"
+" end;";
MySqlStatementParser parser=new MySqlStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement statemen = statementList.get(0);
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
SQLStatement stmt = statementList.get(0);
System.out.println(SQLUtils.toSQLString(stmt, JdbcConstants.MYSQL));
// print(statementList);
Assert.assertEquals(1, statementList.size());
assertEquals(1, statementList.size());
MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
statemen.accept(visitor);
SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL);
stmt.accept(visitor);
// System.out.println("Tables : " + visitor.getTables());
// System.out.println("fields : " + visitor.getColumns());
System.out.println("Tables : " + visitor.getTables());
System.out.println("fields : " + visitor.getColumns());
// System.out.println("coditions : " + visitor.getConditions());
// System.out.println("orderBy : " + visitor.getOrderByColumns());
Assert.assertEquals(1, visitor.getTables().size());
Assert.assertEquals(3, visitor.getColumns().size());
Assert.assertEquals(0, visitor.getConditions().size());
assertEquals(2, visitor.getTables().size());
assertEquals(5, visitor.getColumns().size());
assertEquals(1, visitor.getConditions().size());
}
public void test_1() throws Exception {
src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java
+11 -9
View File
@@ -16,9 +16,11 @@
package com.alibaba.druid.bvt.sql.mysql.create;
import com.alibaba.druid.sql.MysqlTest;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
import com.alibaba.druid.util.JdbcConstants;
import org.junit.Assert;
import java.util.List;
@@ -106,20 +108,20 @@ public class MySqlCreateProcedureTest9 extends MysqlTest {
MySqlStatementParser parser=new MySqlStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement statemen = statementList.get(0);
// print(statementList);
Assert.assertEquals(1, statementList.size());
System.out.println(SQLUtils.toSQLString(statementList, JdbcConstants.MYSQL));
Assert.assertEquals(1, statementList.size());
MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
statemen.accept(visitor);
// System.out.println("Tables : " + visitor.getTables());
// System.out.println("fields : " + visitor.getColumns());
// System.out.println("coditions : " + visitor.getConditions());
// System.out.println("orderBy : " + visitor.getOrderByColumns());
System.out.println("Tables : " + visitor.getTables());
System.out.println("fields : " + visitor.getColumns());
System.out.println("coditions : " + visitor.getConditions());
System.out.println("orderBy : " + visitor.getOrderByColumns());
Assert.assertEquals(1, visitor.getTables().size());
Assert.assertEquals(3, visitor.getColumns().size());
Assert.assertEquals(0, visitor.getConditions().size());
Assert.assertEquals(2, visitor.getTables().size());
Assert.assertEquals(5, visitor.getColumns().size());
Assert.assertEquals(1, visitor.getConditions().size());
}
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest13.java
+2 -2
View File
@@ -80,8 +80,8 @@ public class OracleBlockTest13 extends OracleTest {
Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("emp_name")));
Assert.assertEquals(7, visitor.getColumns().size());
Assert.assertEquals(3, visitor.getConditions().size());
Assert.assertEquals(1, visitor.getRelationships().size());
Assert.assertEquals(2, visitor.getConditions().size());
Assert.assertEquals(0, visitor.getRelationships().size());
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary")));
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest14.java
+2 -2
View File
@@ -81,8 +81,8 @@ public class OracleBlockTest14 extends OracleTest {
Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("emp_name")));
Assert.assertEquals(7, visitor.getColumns().size());
Assert.assertEquals(3, visitor.getConditions().size());
Assert.assertEquals(1, visitor.getRelationships().size());
Assert.assertEquals(2, visitor.getConditions().size());
Assert.assertEquals(0, visitor.getRelationships().size());
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary")));
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest15.java
+2 -2
View File
@@ -81,8 +81,8 @@ public class OracleBlockTest15 extends OracleTest {
Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees")));
Assert.assertEquals(2, visitor.getColumns().size());
Assert.assertEquals(2, visitor.getConditions().size());
Assert.assertEquals(1, visitor.getRelationships().size());
Assert.assertEquals(1, visitor.getConditions().size());
Assert.assertEquals(0, visitor.getRelationships().size());
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary")));
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest18.java
+3 -3
View File
@@ -89,9 +89,9 @@ public class OracleBlockTest18 extends OracleTest {
assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees")));
assertEquals(5, visitor.getColumns().size());
assertEquals(2, visitor.getConditions().size());
assertEquals(1, visitor.getRelationships().size());
assertEquals(2, visitor.getColumns().size());
assertEquals(1, visitor.getConditions().size());
assertEquals(0, visitor.getRelationships().size());
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary")));
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest7.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class OracleBlockTest7 extends OracleTest {
Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees_temp")));
Assert.assertEquals(6, visitor.getColumns().size());
Assert.assertEquals(2, visitor.getConditions().size());
Assert.assertEquals(1, visitor.getConditions().size());
Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id")));
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest1.java
+2 -2
View File
@@ -71,8 +71,8 @@ public class OracleCreateProcedureTest1 extends OracleTest {
Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("dept_temp")));
// Assert.assertEquals(7, visitor.getColumns().size());
Assert.assertEquals(2, visitor.getConditions().size());
Assert.assertEquals(1, visitor.getRelationships().size());
Assert.assertEquals(1, visitor.getConditions().size());
Assert.assertEquals(0, visitor.getRelationships().size());
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary")));
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest2.java
+3 -3
View File
@@ -66,9 +66,9 @@ public class OracleCreateProcedureTest2 extends OracleTest {
Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("accounts")));
Assert.assertEquals(5, visitor.getColumns().size());
Assert.assertEquals(3, visitor.getConditions().size());
Assert.assertEquals(2, visitor.getRelationships().size());
Assert.assertEquals(3, visitor.getColumns().size());
Assert.assertEquals(1, visitor.getConditions().size());
Assert.assertEquals(0, visitor.getRelationships().size());
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary")));
}