From d86fb1d0308e0bcb566e435e159075f5bd5b1372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Fri, 6 May 2016 16:10:09 +0800 Subject: [PATCH] bug fixed oracle sql parser. fixed issue 1211. https://github.com/alibaba/druid/issues/1211 --- .../druid/sql/parser/SQLExprParser.java | 1 + .../bvt/sql/oracle/OracleInsertTest17.java | 65 +++++++++++++++++++ .../bvt/sql/oracle/OracleInsertTest18.java | 65 +++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest17.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest18.java diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index 4ee2caa4b7..5286aa9dc7 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -343,6 +343,7 @@ public class SQLExprParser extends SQLParser { case REPEAT: case TABLE: case TRUNCATE: + case EXCEPTION: sqlExpr = new SQLIdentifierExpr(lexer.stringVal()); lexer.nextToken(); break; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest17.java new file mode 100644 index 0000000000..dab7948b9e --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest17.java @@ -0,0 +1,65 @@ +/* + * Copyright 1999-2101 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; + +import java.util.List; + +import org.junit.Assert; + +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 com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.util.JdbcConstants; + +public class OracleInsertTest17 extends OracleTest { + + public void test_0() throws Exception { + String sql = "insert into sys_log(ID,EXCEPTION) values(?,?)"; + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + Assert.assertEquals("INSERT INTO sys_log" + + "\n\t(ID, EXCEPTION)" + + "\nVALUES" + + "\n(?, ?)",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + 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()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(2, visitor.getColumns().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("sys_log"))); + + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "ID"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "EXCEPTION"))); + } + +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest18.java new file mode 100644 index 0000000000..3c9a3ec89d --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest18.java @@ -0,0 +1,65 @@ +/* + * Copyright 1999-2101 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; + +import java.util.List; + +import org.junit.Assert; + +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 com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.util.JdbcConstants; + +public class OracleInsertTest18 extends OracleTest { + + public void test_0() throws Exception { + String sql = "insert into sys_log(ID,\"EXCEPTION\") values(?,?)"; + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + Assert.assertEquals("INSERT INTO sys_log" + + "\n\t(ID, \"EXCEPTION\")" + + "\nVALUES" + + "\n(?, ?)",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + 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()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(2, visitor.getColumns().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("sys_log"))); + + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "ID"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "EXCEPTION"))); + } + +}