From 5693b8f2e95ac26547e8389cb2b5d79f3848b049 Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 11 May 2017 07:17:57 +0800 Subject: [PATCH] improved oracle sql parser for pl/sql if. --- .../oracle/visitor/OracleOutputVisitor.java | 12 ++- .../sql/visitor/SQLASTOutputVisitor.java | 3 + .../bvt/sql/oracle/pl/Oracle_pl_if_0.java | 76 ++++++++++++++++ .../bvt/sql/oracle/pl/Oracle_pl_if_1.java | 81 +++++++++++++++++ .../bvt/sql/oracle/pl/Oracle_pl_if_2.java | 82 +++++++++++++++++ .../bvt/sql/oracle/pl/Oracle_pl_if_3.java | 89 +++++++++++++++++++ 6 files changed, 342 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_0.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_1.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_2.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_3.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java index a9431dee87..7eed2feaf4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java @@ -1977,8 +1977,18 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS @Override public boolean visit(SQLIfStatement x) { print0(ucase ? "IF " : "if "); + int lines = this.lines; + incrementIndent(); x.getCondition().accept(this); - print0(ucase ? " THEN" : " then"); + decrementIndent(); + + if (lines != this.lines) { + println(); + } else { + print(' '); + } + print0(ucase ? "THEN" : "then"); + incrementIndent(); println(); for (int i = 0, size = x.getStatements().size(); i < size; ++i) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index 5c4f671f83..9fe688b4b4 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -63,6 +63,8 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet protected boolean shardingSupport = false; + protected transient int lines = 0; + public SQLASTOutputVisitor(Appendable appender){ this.appender = appender; } @@ -283,6 +285,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet } print0("\n"); + lines++; printIndent(); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_0.java new file mode 100644 index 0000000000..6fd1fb3be5 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_0.java @@ -0,0 +1,76 @@ +/* + * 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_if_0 extends OracleTest { + + public void test_0() throws Exception { + String sql = "IF l_salary > 40000\n" + + "THEN\n" + + " give_bonus (l_employee_id,500);\n" + + "END IF;"; // + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); + SQLStatement stmt = statementList.get(0); + + 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.toOracleString(stmt); + assertEquals("IF l_salary > 40000 THEN\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "END IF", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("if l_salary > 40000 then\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "end if", // + output); + } + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_1.java new file mode 100644 index 0000000000..3fe5960471 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_1.java @@ -0,0 +1,81 @@ +/* + * 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_if_1 extends OracleTest { + + public void test_0() throws Exception { + String sql = "IF l_salary > 40000 OR l_salary \n" + + "IS NULL\n" + + "THEN\n" + + " give_bonus (l_employee_id,500);\n" + + "END IF;"; // + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); + SQLStatement stmt = statementList.get(0); + + 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.toOracleString(stmt); + assertEquals("IF l_salary > 40000\n" + + "\tOR l_salary IS NULL\n" + + "THEN\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "END IF", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("if l_salary > 40000\n" + + "\tor l_salary is null\n" + + "then\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "end if", // + output); + } + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_2.java new file mode 100644 index 0000000000..781f85fbd8 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_2.java @@ -0,0 +1,82 @@ +/* + * 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_if_2 extends OracleTest { + + public void test_0() throws Exception { + String sql = "IF l_salary <= 40000\n" + + "THEN\n" + + " give_bonus (l_employee_id, 0);\n" + + "ELSE\n" + + " give_bonus (l_employee_id, 500);\n" + + "END IF;"; // + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); + SQLStatement stmt = statementList.get(0); + + 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.toOracleString(stmt); + assertEquals("IF l_salary <= 40000 THEN\n" + + "\tgive_bonus(l_employee_id, 0);\n" + + "ELSE\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "END IF", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("if l_salary <= 40000 then\n" + + "\tgive_bonus(l_employee_id, 0);\n" + + "else\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "end if", // + output); + } + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_3.java new file mode 100644 index 0000000000..1c8700a916 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_3.java @@ -0,0 +1,89 @@ +/* + * 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_if_3 extends OracleTest { + + public void test_0() throws Exception { + String sql = "IF l_salary BETWEEN 10000 AND 20000\n" + + "THEN\n" + + " give_bonus(l_employee_id, 1000);\n" + + "ELSIF l_salary > 20000\n" + + "THEN\n" + + " give_bonus(l_employee_id, 500);\n" + + "ELSE\n" + + " give_bonus(l_employee_id, 0);\n" + + "END IF;"; // + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); + SQLStatement stmt = statementList.get(0); + + 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.toOracleString(stmt); + assertEquals("IF l_salary BETWEEN 10000 AND 20000 THEN\n" + + "\tgive_bonus(l_employee_id, 1000);\n" + + "ELSE IF l_salary > 20000 THEN\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "ELSE\n" + + "\tgive_bonus(l_employee_id, 0);\n" + + "END IF", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("if l_salary between 10000 and 20000 then\n" + + "\tgive_bonus(l_employee_id, 1000);\n" + + "else if l_salary > 20000 then\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "else\n" + + "\tgive_bonus(l_employee_id, 0);\n" + + "end if", // + output); + } + } +}