From 9aa627bb21ba7a397587dddd2f5a3865811c9d53 Mon Sep 17 00:00:00 2001 From: wenshao Date: Tue, 6 Aug 2013 00:17:07 +0800 Subject: [PATCH] improve sql parser for db2 --- .../db2/ast/stmt/DB2SelectQueryBlock.java | 16 ++++- .../dialect/db2/parser/DB2SelectParser.java | 20 +++++- .../dialect/db2/visitor/DB2OutputVisitor.java | 6 ++ .../druid/bvt/sql/db2/DB2SelectTest_2.java | 68 +++++++++++++++++++ 4 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_2.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2SelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2SelectQueryBlock.java index 94b4978589..f92c6f121e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2SelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2SelectQueryBlock.java @@ -23,7 +23,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class DB2SelectQueryBlock extends SQLSelectQueryBlock implements DB2Object { - private SQLExpr first; + private SQLExpr first; + + private Isolation isolation; public SQLExpr getFirst() { return first; @@ -54,4 +56,16 @@ public class DB2SelectQueryBlock extends SQLSelectQueryBlock implements DB2Objec } visitor.endVisit(this); } + + public Isolation getIsolation() { + return isolation; + } + + public void setIsolation(Isolation isolation) { + this.isolation = isolation; + } + + public static enum Isolation { + RR, RS, CS, UR + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java index 727b64634d..dd2f214ab6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java @@ -19,6 +19,8 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLSetQuantifier; import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock; +import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock.Isolation; +import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.sql.parser.SQLExprParser; import com.alibaba.druid.sql.parser.SQLSelectParser; import com.alibaba.druid.sql.parser.Token; @@ -74,7 +76,7 @@ public class DB2SelectParser extends SQLSelectParser { parseWhere(queryBlock); parseGroupBy(queryBlock); - + if (lexer.token() == Token.FETCH) { lexer.nextToken(); accept(Token.FIRST); @@ -86,6 +88,22 @@ public class DB2SelectParser extends SQLSelectParser { accept(Token.ONLY); } + if (lexer.token() == Token.WITH) { + lexer.nextToken(); + if (identifierEquals("RR")) { + queryBlock.setIsolation(Isolation.RR); + } else if (identifierEquals("RS")) { + queryBlock.setIsolation(Isolation.RS); + } else if (identifierEquals("CS")) { + queryBlock.setIsolation(Isolation.CS); + } else if (identifierEquals("UR")) { + queryBlock.setIsolation(Isolation.UR); + } else { + throw new ParserException("TODO"); + } + lexer.nextToken(); + } + return queryRest(queryBlock); } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java index a1c4ee79b4..bebd9d8520 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java @@ -36,6 +36,12 @@ public class DB2OutputVisitor extends SQLASTOutputVisitor implements DB2ASTVisit print(" ROWS ONLY"); } + if (x.getIsolation() != null) { + println(); + print("WITH "); + print(x.getIsolation().name()); + } + return false; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_2.java new file mode 100644 index 0000000000..b0f42d30a0 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_2.java @@ -0,0 +1,68 @@ +/* + * Copyright 1999-2011 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.db2; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.DB2Test; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; +import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.stat.TableStat.Column; +import com.alibaba.druid.util.JdbcConstants; + +public class DB2SelectTest_2 extends DB2Test { + + public void test_0() throws Exception { + String sql = "SELECT CTRYNUM, FMS_INSTANCE_CD FROM DBEFMSDR.FMSA_O_WW_CTRY_AG WHERE ACCT_YR=? WITH UR"; + + DB2StatementParser parser = new DB2StatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + DB2SchemaStatVisitor visitor = new DB2SchemaStatVisitor(); + stmt.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(3, visitor.getColumns().size()); + Assert.assertEquals(1, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("DBEFMSDR.FMSA_O_WW_CTRY_AG"))); + + Assert.assertTrue(visitor.getColumns().contains(new Column("DBEFMSDR.FMSA_O_WW_CTRY_AG", "CTRYNUM"))); + // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); + // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); + + String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); + Assert.assertEquals("SELECT CTRYNUM, FMS_INSTANCE_CD" // + + "\nFROM DBEFMSDR.FMSA_O_WW_CTRY_AG"// + + "\nWHERE ACCT_YR = ?"// + + "\nWITH UR", // + output); + } +}