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

improved sql parser.

Browse Source
This commit is contained in:
wenshao
2017-05-31 15:14:05 +08:00
parent fd3da2613d
commit 969e878ca9
44 changed files with 684 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest11.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class MySqlCreateProcedureTest11 extends MysqlTest {
assertEquals(3, visitor.getTables().size());
assertEquals(3, visitor.getColumns().size());
assertEquals(2, visitor.getConditions().size());
assertEquals(0, visitor.getConditions().size());
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_10.java
+3 -3
View File
@@ -52,8 +52,8 @@ public class MySqlParameterizedOutputVisitorTest_10 extends TestCase {
stmt.accept(visitor);
}
System.out.println(visitor.getParameters());
/* Assert.assertEquals(2, visitor.getParameters().size());
Assert.assertEquals(3, visitor.getParameters().get(0));
Assert.assertEquals(4, visitor.getParameters().get(1));*/
/* Assert.assertEquals(2, visitor.getArguments().size());
Assert.assertEquals(3, visitor.getArguments().get(0));
Assert.assertEquals(4, visitor.getArguments().get(1));*/
}
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest18.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class OracleBlockTest18 extends OracleTest {
assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees")));
assertEquals(5, visitor.getColumns().size());
assertEquals(3, visitor.getConditions().size());
assertEquals(2, visitor.getConditions().size());
assertEquals(1, visitor.getRelationships().size());
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary")));
src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest19.java
+2 -2
View File
@@ -67,8 +67,8 @@ public class OracleBlockTest19 extends OracleTest {
// assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees")));
// assertEquals(5, visitor.getColumns().size());
// assertEquals(0, visitor.getConditions().size());
assertEquals(0, visitor.getColumns().size());
assertEquals(0, 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/OracleBlockTest20.java
+107
View File
@@ -0,0 +1,107 @@
/*
* 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.oracle.block;
import com.alibaba.druid.sql.OracleTest;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
import com.alibaba.druid.stat.TableStat;
import com.alibaba.druid.util.JdbcConstants;
import java.util.List;
public class OracleBlockTest20 extends OracleTest {
public void test_0() throws Exception {
String sql = "DECLARE\n" +
" sql_stmt VARCHAR2(200);\n" +
" plsql_block VARCHAR2(500);\n" +
" emp_id NUMBER(4) := 7566;\n" +
" salary NUMBER(7,2);\n" +
" dept_id NUMBER(2) := 50;\n" +
" dept_name VARCHAR2(14) := 'PERSONNEL';\n" +
" location VARCHAR2(13) := 'DALLAS';\n" +
" emp_rec emp%ROWTYPE;\n" +
"BEGIN\n" +
" EXECUTE IMMEDIATE 'CREATE TABLE bonus (id NUMBER, amt NUMBER)';\n" +
" sql_stmt := 'INSERT INTO dept VALUES (:1, :2, :3)';\n" +
" EXECUTE IMMEDIATE sql_stmt USING dept_id, dept_name, location;\n" +
" sql_stmt := 'SELECT * FROM emp WHERE empno = :id';\n" +
" EXECUTE IMMEDIATE sql_stmt INTO emp_rec USING emp_id;\n" +
" plsql_block := 'BEGIN emp_pkg.raise_salary(:id, :amt); END;';\n" +
" EXECUTE IMMEDIATE plsql_block USING 7788, 500;\n" +
" sql_stmt := 'UPDATE emp SET sal = 2000 WHERE empno = :1\n" +
" RETURNING sal INTO :2';\n" +
" EXECUTE IMMEDIATE sql_stmt USING emp_id RETURNING INTO salary;\n" +
" EXECUTE IMMEDIATE 'DELETE FROM dept WHERE deptno = :num'\n" +
" USING dept_id;\n" +
" EXECUTE IMMEDIATE 'ALTER SESSION SET SQL_TRACE TRUE';\n" +
"END;"; //
List<SQLStatement> stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE);
assertEquals(1, stmtList.size());
String result = SQLUtils.toOracleString(stmtList.get(0));
System.out.println(result);
assertEquals("DECLARE\n" +
"\tsql_stmt VARCHAR2(200);\n" +
"\tplsql_block VARCHAR2(500);\n" +
"\temp_id NUMBER(4) := 7566;\n" +
"\tsalary NUMBER(7, 2);\n" +
"\tdept_id NUMBER(2) := 50;\n" +
"\tdept_name VARCHAR2(14) := 'PERSONNEL';\n" +
"\tlocation VARCHAR2(13) := 'DALLAS';\n" +
"\temp_rec emp%ROWTYPE;\n" +
"BEGIN\n" +
"\tEXECUTE IMMEDIATE 'CREATE TABLE bonus (id NUMBER, amt NUMBER)';\n" +
"\tsql_stmt := 'INSERT INTO dept VALUES (:1, :2, :3)';\n" +
"\tEXECUTE IMMEDIATE sql_stmt USING dept_id, dept_name, location;\n" +
"\tsql_stmt := 'SELECT * FROM emp WHERE empno = :id';\n" +
"\tEXECUTE IMMEDIATE sql_stmt INTO emp_rec USING emp_id;\n" +
"\tplsql_block := 'BEGIN emp_pkg.raise_salary(:id, :amt); END;';\n" +
"\tEXECUTE IMMEDIATE plsql_block USING 7788, 500;\n" +
"\tsql_stmt := 'UPDATE emp SET sal = 2000 WHERE empno = :1\n" +
" RETURNING sal INTO :2';\n" +
"\tEXECUTE IMMEDIATE sql_stmt USING emp_id RETURNNING INTO salary;\n" +
"\tEXECUTE IMMEDIATE 'DELETE FROM dept WHERE deptno = :num' USING dept_id;\n" +
"\tEXECUTE IMMEDIATE 'ALTER SESSION SET SQL_TRACE TRUE';\n" +
"END;", result);
assertEquals(1, stmtList.size());
OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
for (SQLStatement statement : stmtList) {
statement.accept(visitor);
}
System.out.println("Tables : " + visitor.getTables());
System.out.println("fields : " + visitor.getColumns());
System.out.println("coditions : " + visitor.getConditions());
System.out.println("relationships : " + visitor.getRelationships());
System.out.println("orderBy : " + visitor.getOrderByColumns());
assertEquals(3, visitor.getTables().size());
assertTrue(visitor.getTables().containsKey(new TableStat.Name("bonus")));
assertEquals(6, visitor.getColumns().size());
assertEquals(2, visitor.getConditions().size());
assertEquals(0, visitor.getRelationships().size());
assertTrue(visitor.getColumns().contains(new TableStat.Column("bonus", "id")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest5.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class OracleBlockTest5 extends OracleTest {
Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("tab_ipay_out_order_ids")));
Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("ipay_contract")));
Assert.assertEquals(7, visitor.getColumns().size());
Assert.assertEquals(6, visitor.getColumns().size());
Assert.assertEquals(3, visitor.getConditions().size());
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "department_id")));
src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java
+99
View File
@@ -0,0 +1,99 @@
/*
* 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.oracle.select;
import com.alibaba.druid.sql.OracleTest;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
import org.junit.Assert;
import java.util.List;
public class OracleSelectTest62 extends OracleTest {
public void test_0() throws Exception {
String sql = //
"SELECT channel_desc, calendar_month_desc, co.country_id,\n" +
" TO_CHAR(sum(amount_sold) , '9,999,999,999') SALES$\n" +
" FROM sales, customers, times, channels, countries co\n" +
" WHERE sales.time_id=times.time_id \n" +
" AND sales.cust_id=customers.cust_id \n" +
" AND sales.channel_id= channels.channel_id \n" +
" AND customers.country_id = co.country_id\n" +
" AND channels.channel_desc IN ('Direct Sales', 'Internet') \n" +
" AND times.calendar_month_desc IN ('2000-09', '2000-10')\n" +
" AND co.country_iso_code IN ('UK', 'US')\n" +
" GROUP BY GROUPING SETS( \n" +
" (channel_desc, calendar_month_desc, co.country_id), \n" +
" (channel_desc, co.country_id), \n" +
" (calendar_month_desc, co.country_id) );"; //
OracleStatementParser parser = new OracleStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement stmt = statementList.get(0);
print(statementList);
Assert.assertEquals(1, statementList.size());
OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor();
stmt.accept(visitor);
System.out.println("Tables : " + visitor.getTables());
System.out.println("fields : " + visitor.getColumns());
System.out.println("coditions : " + visitor.getConditions());
System.out.println("relationships : " + visitor.getRelationships());
System.out.println("orderBy : " + visitor.getOrderByColumns());
Assert.assertEquals(5, visitor.getTables().size());
Assert.assertEquals(14, visitor.getColumns().size());
{
String text = SQLUtils.toOracleString(stmt);
assertEquals("SELECT channel_desc, calendar_month_desc, co.country_id, TO_CHAR(SUM(amount_sold), '9,999,999,999') AS SALES$\n" +
"FROM sales, customers, times, channels, countries co\n" +
"WHERE sales.time_id = times.time_id\n" +
"\tAND sales.cust_id = customers.cust_id\n" +
"\tAND sales.channel_id = channels.channel_id\n" +
"\tAND customers.country_id = co.country_id\n" +
"\tAND channels.channel_desc IN ('Direct Sales', 'Internet')\n" +
"\tAND times.calendar_month_desc IN ('2000-09', '2000-10')\n" +
"\tAND co.country_iso_code IN ('UK', 'US')\n" +
"GROUP BY GROUPING SETS ((channel_desc, calendar_month_desc, co.country_id), (channel_desc, co.country_id), (calendar_month_desc, co.country_id));", text);
}
{
String text = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION);
Assert.assertEquals("select channel_desc, calendar_month_desc, co.country_id, TO_CHAR(sum(amount_sold), '9,999,999,999') as SALES$\n" +
"from sales, customers, times, channels, countries co\n" +
"where sales.time_id = times.time_id\n" +
"\tand sales.cust_id = customers.cust_id\n" +
"\tand sales.channel_id = channels.channel_id\n" +
"\tand customers.country_id = co.country_id\n" +
"\tand channels.channel_desc in ('Direct Sales', 'Internet')\n" +
"\tand times.calendar_month_desc in ('2000-09', '2000-10')\n" +
"\tand co.country_iso_code in ('UK', 'US')\n" +
"group by grouping sets ((channel_desc, calendar_month_desc, co.country_id), (channel_desc, co.country_id), (calendar_month_desc, co.country_id));", text);
}
// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh")));
// Assert.assertTrue(visitor.getOrderByColumns().contains(new TableStat.Column("employees", "last_name")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleASTVisitorAdapterTest.java
+2 -2
View File
@@ -54,7 +54,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleAlterTablespaceAddDat
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleAlterTablespaceStatement;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleAlterTriggerStatement;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleAlterViewStatement;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleCommitStatement;
import com.alibaba.druid.sql.ast.statement.SQLCommitStatement;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleCreateDatabaseDbLinkStatement;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleCreateIndexStatement;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleCreateTableStatement;
@@ -185,7 +185,7 @@ public class OracleASTVisitorAdapterTest extends TestCase {
new OracleGotoStatement().accept(adapter);
new OracleLabelStatement().accept(adapter);
new SQLParameter().accept(adapter);
new OracleCommitStatement().accept(adapter);
new SQLCommitStatement().accept(adapter);
new OracleAlterTriggerStatement().accept(adapter);
new OracleAlterSynonymStatement().accept(adapter);
new AsOfSnapshotClause().accept(adapter);
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGBeginTest.java
+4 -8
View File
@@ -16,17 +16,13 @@
package com.alibaba.druid.bvt.sql.postgresql;
import com.alibaba.druid.sql.PGTest;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGBeginStatement;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGStartTransactionStatement;
public class PGBeginTest extends PGTest {
public void testBegin() throws Exception {
String sql = "begin;";
String expected = "BEGIN";
testParseSql(sql, expected, expected, PGBeginStatement.class);
sql = "start transaction;";
expected = "START TRANSACTION";
testParseSql(sql, expected, expected, PGBeginStatement.class);
String sql = "start transaction;";
String expected = "START TRANSACTION";
testParseSql(sql, expected, expected, PGStartTransactionStatement.class);
}
}
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommitTest.java
+2 -2
View File
@@ -16,12 +16,12 @@
package com.alibaba.druid.bvt.sql.postgresql;
import com.alibaba.druid.sql.PGTest;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGCommitStatement;
import com.alibaba.druid.sql.ast.statement.SQLCommitStatement;
public class PGCommitTest extends PGTest {
public void testCommit() throws Exception {
String sql = "commit;";
String expected = "COMMIT";
testParseSql(sql, expected, expected, PGCommitStatement.class);
testParseSql(sql, expected, expected, SQLCommitStatement.class);
}
}