From 7c62f95ce7e2668fff7c09e8de1b2a56e4863cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Thu, 15 Mar 2012 13:45:20 +0800 Subject: [PATCH] add ibatis parameters support --- .../dialect/oracle/parser/OracleLexer.java | 2 +- .../com/alibaba/druid/sql/parser/Lexer.java | 5 ++- .../sql/oracle/OracleIbatisSelectTest.java | 41 +++++++++++++++++++ .../sql/oracle/OracleIbatisSelectTest1.java | 41 +++++++++++++++++++ 4 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java index cfb4936e37..795b4a18d9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java @@ -162,7 +162,7 @@ public class OracleLexer extends Lexer { return; } - if (ch != ':') { + if (ch != ':' && ch != '#') { throw new SQLParseException("illegal variable"); } diff --git a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java index 504dfc55e7..f4c84b98a7 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java @@ -277,6 +277,9 @@ public class Lexer { } } return; + case '#': + scanVariable(); + return; case '.': scanChar(); if (isDigit(ch)) { @@ -551,7 +554,7 @@ public class Lexer { public void scanVariable() { final char first = ch; - if (ch != '@' && ch != ':') { + if (ch != '@' && ch != ':' && ch != '#') { throw new SQLParseException("illegal variable"); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java new file mode 100644 index 0000000000..f93b1a5b16 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java @@ -0,0 +1,41 @@ +package com.alibaba.druid.bvt.sql.oracle; + +import java.util.List; + +import junit.framework.Assert; + +import com.alibaba.druid.sql.OracleTest; +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; + +public class OracleIbatisSelectTest extends OracleTest { + + public void test_0() throws Exception { + String sql = "SELECT * FROM T WHERE F1 = #id# "; + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); + statemen.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.assertTrue(visitor.getTables().containsKey(new TableStat.Name("T"))); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(2, visitor.getColumns().size()); + +// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); + } + +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java new file mode 100644 index 0000000000..61d0f2781e --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java @@ -0,0 +1,41 @@ +package com.alibaba.druid.bvt.sql.oracle; + +import java.util.List; + +import junit.framework.Assert; + +import com.alibaba.druid.sql.OracleTest; +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; + +public class OracleIbatisSelectTest1 extends OracleTest { + + public void test_0() throws Exception { + String sql = "SELECT * FROM T WHERE F1 = $id$"; + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); + statemen.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.assertTrue(visitor.getTables().containsKey(new TableStat.Name("T"))); + + Assert.assertEquals(1, visitor.getTables().size()); + //Assert.assertEquals(2, visitor.getColumns().size()); + +// Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); + } + +}