From 9e105a68f2e7781ac042a902f6a984c84ca70cb3 Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 14 Jul 2017 15:48:49 +0800 Subject: [PATCH] bug fixed for oracle sql parser. --- .../oracle/parser/OracleStatementParser.java | 25 +++++-- .../sql/visitor/SQLASTOutputVisitor.java | 3 +- .../druid/bvt/sql/oracle/pl/Oracle_pl_2.java | 74 +++++++++++++++++++ 3 files changed, 93 insertions(+), 9 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_2.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java index 39b14f405e..76682ea2e2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java @@ -987,19 +987,28 @@ public class OracleStatementParser extends SQLStatementParser { public SQLStatement parseSet() { accept(Token.SET); - acceptIdentifier("TRANSACTION"); - OracleSetTransactionStatement stmt = new OracleSetTransactionStatement(); - - if (identifierEquals("READ")) { + if (identifierEquals("TRANSACTION")) { lexer.nextToken(); - acceptIdentifier("ONLY"); - stmt.setReadOnly(true); + + OracleSetTransactionStatement stmt = new OracleSetTransactionStatement(); + + if (identifierEquals("READ")) { + lexer.nextToken(); + acceptIdentifier("ONLY"); + stmt.setReadOnly(true); + } + + acceptIdentifier("NAME"); + + stmt.setName(this.exprParser.expr()); + return stmt; } - acceptIdentifier("NAME"); + SQLSetStatement stmt = new SQLSetStatement(getDbType()); + parseAssignItems(stmt.getItems(), stmt); - stmt.setName(this.exprParser.expr()); + stmt.putAttribute("parser.set", Boolean.TRUE); return stmt; } 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 c3d83d8a9c..b9e28d2b38 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -2170,7 +2170,8 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLSetStatement x) { - if (!JdbcConstants.ORACLE.equals(dbType)) { + boolean printSet = x.getAttribute("parser.set") == Boolean.TRUE || !JdbcConstants.ORACLE.equals(dbType); + if (printSet) { print0(ucase ? "SET " : "set "); } printAndAccept(x.getItems(), ", "); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_2.java new file mode 100644 index 0000000000..6a42a089d8 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_2.java @@ -0,0 +1,74 @@ +/* + * 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_2 extends OracleTest { + + public void test_0() throws Exception { + String sql = "BEGIN\n" + + " SET :id = sys.dbms_transaction.local_transaction_id;\n" + + "END;"; // + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); + assertEquals(1, statementList.size()); + SQLStatement stmt = statementList.get(0); + + 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("BEGIN\n" + + "\tSET :id := sys.dbms_transaction.local_transaction_id;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("begin\n" + + "\tset :id := sys.dbms_transaction.local_transaction_id;\n" + + "end;", // + output); + } + } +}