From 01ab972572c1cc00111e28e512ec746117bded08 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 13 May 2017 11:40:55 +0800 Subject: [PATCH] improved oracle pl/sql parser. --- ...l_open_for_1.java => Oracle_pl_for_1.java} | 2 +- ...l_open_for_2.java => Oracle_pl_for_2.java} | 2 +- ..._forall_0.java => Oracle_pl_forall_0.java} | 2 +- .../bvt/sql/oracle/pl/Oracle_pl_loop_0.java | 101 ++++++++++++++++++ .../bvt/sql/oracle/pl/Oracle_pl_loop_1.java | 95 ++++++++++++++++ 5 files changed, 199 insertions(+), 3 deletions(-) rename src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/{Oracle_pl_open_for_1.java => Oracle_pl_for_1.java} (96%) rename src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/{Oracle_pl_open_for_2.java => Oracle_pl_for_2.java} (95%) rename src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/{Oracle_pl_open_forall_0.java => Oracle_pl_forall_0.java} (95%) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_0.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_1.java diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_1.java similarity index 96% rename from src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_1.java rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_1.java index ddcfac39b1..bb14fbe018 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_1.java @@ -23,7 +23,7 @@ import com.alibaba.druid.util.JdbcConstants; import java.util.List; -public class Oracle_pl_open_for_1 extends OracleTest { +public class Oracle_pl_for_1 extends OracleTest { public void test_0() throws Exception { String sql = "DECLARE\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_2.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_2.java rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_2.java index 5943e80e80..6612c90b76 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_2.java @@ -23,7 +23,7 @@ import com.alibaba.druid.util.JdbcConstants; import java.util.List; -public class Oracle_pl_open_for_2 extends OracleTest { +public class Oracle_pl_for_2 extends OracleTest { public void test_0() throws Exception { String sql = "DROP TABLE employees_temp;\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_forall_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_forall_0.java similarity index 95% rename from src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_forall_0.java rename to src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_forall_0.java index e759ff7c84..960225a100 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_forall_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_forall_0.java @@ -23,7 +23,7 @@ import com.alibaba.druid.util.JdbcConstants; import java.util.List; -public class Oracle_pl_open_forall_0 extends OracleTest { +public class Oracle_pl_forall_0 extends OracleTest { public void test_0() throws Exception { String sql = "DROP TABLE employees_temp;\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_0.java new file mode 100644 index 0000000000..dbbab86bf4 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_0.java @@ -0,0 +1,101 @@ +/* + * 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.pl; + +import com.alibaba.druid.sql.OracleTest; +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 Oracle_pl_loop_0 extends OracleTest { + + public void test_0() throws Exception { + String sql = "DECLARE\n" + + " x NUMBER := 0;\n" + + "BEGIN\n" + + " LOOP\n" + + " DBMS_OUTPUT.PUT_LINE ('Inside loop: x = ' || TO_CHAR(x));\n" + + " x := x + 1;\n" + + " IF x > 3 THEN\n" + + " EXIT;\n" + + " END IF;\n" + + " END LOOP;\n" + + " -- After EXIT, control resumes here\n" + + " DBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + + "END;"; // + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); + assertEquals(1, statementList.size()); + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); + for (SQLStatement statement : statementList) { + 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(0, visitor.getTables().size()); + +// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); +// 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.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); + + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("DECLARE\n" + + "\tx NUMBER := 0;\n" + + "BEGIN\n" + + "\tLOOP\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + "\t\tx := x + 1;\n" + + "\t\tIF x > 3 THEN\n" + + "\t\t\tEXIT;\n" + + "\t\tEND IF;\n" + + "\tEND LOOP;\n" + + "\tDBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + + "END", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tx NUMBER := 0;\n" + + "begin\n" + + "\tloop\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + "\t\tx := x + 1;\n" + + "\t\tif x > 3 then\n" + + "\t\t\texit;\n" + + "\t\tend if;\n" + + "\tend loop;\n" + + "\tDBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + + "end", // + output); + } + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_1.java new file mode 100644 index 0000000000..8632829502 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_1.java @@ -0,0 +1,95 @@ +/* + * 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.pl; + +import com.alibaba.druid.sql.OracleTest; +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 Oracle_pl_loop_1 extends OracleTest { + + public void test_0() throws Exception { + String sql = "DECLARE\n" + + " x NUMBER := 0;\n" + + "BEGIN\n" + + " LOOP\n" + + " DBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + " x := x + 1; -- prevents infinite loop\n" + + " EXIT WHEN x > 3;\n" + + " END LOOP;\n" + + " -- After EXIT statement, control resumes here\n" + + " DBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + + "END;"; // + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); + assertEquals(1, statementList.size()); + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); + for (SQLStatement statement : statementList) { + 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(0, visitor.getTables().size()); + +// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); +// 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.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); + + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("DECLARE\n" + + "\tx NUMBER := 0;\n" + + "BEGIN\n" + + "\tLOOP\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + "\t\tx := x + 1;\n" + + "\t\tEXIT WHEN x > 3;\n" + + "\tEND LOOP;\n" + + "\tDBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + + "END", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tx NUMBER := 0;\n" + + "begin\n" + + "\tloop\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + "\t\tx := x + 1;\n" + + "\t\texit when x > 3;\n" + + "\tend loop;\n" + + "\tDBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + + "end", // + output); + } + } +}