From 7dc402e29d8a34160d8305a1683a0380de1a5094 Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 14 Oct 2011 07:53:18 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B5=8B=E8=AF=95=E5=8F=91?= =?UTF-8?q?=E7=8E=B0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@963 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../oracle/parser/OracleExprParser.java | 60 +++++++++---------- .../dialect/oracle/parser/OracleLexer.java | 1 + .../com/alibaba/druid/sql/parser/Token.java | 1 + .../druid/bvt/sql/oracle/OracleTest2.java | 26 ++++++++ 4 files changed, 58 insertions(+), 30 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java index bf424bf6a9..0ef015339c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java @@ -497,50 +497,50 @@ public class OracleExprParser extends SQLExprParser { lexer.nextToken(); - OracleIntervalType type = OracleIntervalType.valueOf(lexer.token().name); - interval.setType(type); + OracleIntervalType type = OracleIntervalType.valueOf(lexer.token().name); + interval.setType(type); + lexer.nextToken(); + + if (lexer.token() == Token.LPAREN) { + lexer.nextToken(); + if (lexer.token() != Token.LITERAL_INT) { + throw new ParserException("syntax error"); + } + interval.setPrecision(lexer.integerValue().intValue()); lexer.nextToken(); - if (lexer.token() == Token.LPAREN) { + if (lexer.token() == Token.COMMA) { lexer.nextToken(); if (lexer.token() != Token.LITERAL_INT) { throw new ParserException("syntax error"); } - interval.setPrecision(lexer.integerValue().intValue()); + interval.setFactionalSecondsPrecision(lexer.integerValue().intValue()); lexer.nextToken(); - - if (lexer.token() == Token.COMMA) { + } + accept(Token.RPAREN); + } + + if (lexer.token() == Token.TO) { + accept(Token.TO); + if (lexer.token() == Token.SECOND) { + lexer.nextToken(); + interval.setToType(OracleIntervalType.SECOND); + if (lexer.token() == Token.LPAREN) { lexer.nextToken(); if (lexer.token() != Token.LITERAL_INT) { throw new ParserException("syntax error"); } - interval.setFactionalSecondsPrecision(lexer.integerValue().intValue()); + interval.setToFactionalSecondsPrecision(lexer.integerValue().intValue()); lexer.nextToken(); + accept(Token.RPAREN); } - accept(Token.RPAREN); + } else { + interval.setToType(OracleIntervalType.MONTH); + lexer.nextToken(); } - - if (lexer.token() == Token.TO) { - accept(Token.TO); - if (lexer.token() == Token.SECOND) { - lexer.nextToken(); - interval.setToType(OracleIntervalType.SECOND); - if (lexer.token() == Token.LPAREN) { - lexer.nextToken(); - if (lexer.token() != Token.LITERAL_INT) { - throw new ParserException("syntax error"); - } - interval.setToFactionalSecondsPrecision(lexer.integerValue().intValue()); - lexer.nextToken(); - accept(Token.RPAREN); - } - } else { - interval.setToType(OracleIntervalType.MONTH); - lexer.nextToken(); - } - } - - return interval; + } + + return interval; } public SQLExpr relationalRest(SQLExpr expr) throws ParserException { 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 bf5ed181e3..8429ed0741 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 @@ -99,6 +99,7 @@ public class OracleLexer extends Lexer { map.put("DAY", Token.DAY); map.put("YEAR", Token.YEAR); map.put("MONTH", Token.MONTH); + map.put("MINUTE", Token.MINUTE); map.put("SECOND", Token.SECOND); map.put("TO", Token.TO); map.put("MODEL", Token.MODEL); diff --git a/src/main/java/com/alibaba/druid/sql/parser/Token.java b/src/main/java/com/alibaba/druid/sql/parser/Token.java index 61f155b47b..42c133d443 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Token.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Token.java @@ -110,6 +110,7 @@ public enum Token { DAY("DAY"), YEAR("YEAR"), MONTH("MONTH"), + MINUTE("MINUTE"), SECOND("SECOND"), TO("TO"), MODEL("MODEL"), diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java new file mode 100644 index 0000000000..13b96ef416 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java @@ -0,0 +1,26 @@ +package com.alibaba.druid.bvt.sql.oracle; + +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.test.TestUtils; + +import junit.framework.Assert; +import junit.framework.TestCase; + +public class OracleTest2 extends TestCase { + + public void test_isEmpty() throws Exception { + String sql = "SELECT NAME FROM V$ARCHIVED_LOG;"; + + String expect = "SELECT NAME\nFROM V$ARCHIVED_LOG;\n"; + + OracleStatementParser parser = new OracleStatementParser(sql); + SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); + + String text = TestUtils.output(stmt); + + Assert.assertEquals(expect, text); + + System.out.println(text); + } +}