From 6090353994d08706da0bc89f0431a41b62ed48a2 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 14 May 2011 15:46:16 +0000 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=B5=8B=E8=AF=95=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E6=B5=8B=E8=AF=95=E4=B8=AD=E5=8F=91=E7=8E=B0=E7=9A=84?= =?UTF-8?q?MySqlParser=E7=9A=84=E9=97=AE=E9=A2=98?= 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@84 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../mysql/ast/expr/MySqlBooleanExpr.java | 4 + .../dialect/mysql/parser/MySqlExprParser.java | 17 ++++ .../sql/dialect/mysql/parser/MySqlLexer.java | 84 +++++++++++++++++++ .../alibaba/druid/sql/parser/Keywords.java | 2 +- .../druid/bvt/mock/MockExecuteTest.java | 14 ++++ 5 files changed, 120 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java index cabb48ae27..161323e90a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java @@ -28,6 +28,10 @@ public class MySqlBooleanExpr extends SQLLiteralExpr implements MySqlExpr { public MySqlBooleanExpr(){ } + + public MySqlBooleanExpr(boolean value){ + this.value = value; + } public boolean getValue() { return value; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java index 370b831de8..23984daa6c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java @@ -25,6 +25,7 @@ import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlBinaryExpr; +import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlBooleanExpr; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlCharExpr; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlExtractExpr; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlIntervalExpr; @@ -87,6 +88,22 @@ public class MySqlExprParser extends SQLExprParser { return super.notRationalRest(expr); } + public SQLExpr primary() throws ParserException { + final Token tok = lexer.token(); + + switch (tok) { + case TRUE: + lexer.nextToken(); + return primaryRest(new MySqlBooleanExpr(true)); + case FALSE: + lexer.nextToken(); + return primaryRest(new MySqlBooleanExpr(false)); + default: + return super.primary(); + } + + } + public final SQLExpr primaryRest(SQLExpr expr) throws ParserException { if (expr == null) { throw new IllegalArgumentException("expr"); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java index 0e1eeae30c..7b2b054d59 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java @@ -20,18 +20,102 @@ import static com.alibaba.druid.sql.parser.CharTypes.isIdentifierChar; import static com.alibaba.druid.sql.parser.LayoutCharacters.EOI; import static com.alibaba.druid.sql.parser.Token.LITERAL_CHARS; +import java.util.HashMap; +import java.util.Map; + +import com.alibaba.druid.sql.parser.Keywords; import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.SQLParseException; import com.alibaba.druid.sql.parser.Token; public class MySqlLexer extends Lexer { + public final static Keywords DEFAULT_MYSQL_KEYWORDS; + + static { + Map map = new HashMap(); + map.put("EXISTS", Token.EXISTS); + map.put("THEN", Token.THEN); + map.put("AS", Token.AS); + map.put("GROUP", Token.GROUP); + map.put("BY", Token.BY); + map.put("HAVING", Token.HAVING); + map.put("DELETE", Token.DELETE); + map.put("ORDER", Token.ORDER); + map.put("INDEX", Token.INDEX); + map.put("FOR", Token.FOR); + map.put("SCHEMA", Token.SCHEMA); + map.put("FOREIGN", Token.FOREIGN); + map.put("REFERENCE", Token.REFERENCE); + map.put("REFERENCES", Token.REFERENCES); + map.put("CHECK", Token.CHECK); + map.put("PRIMARY", Token.PRIMARY); + map.put("KEY", Token.KEY); + map.put("CONSTRAINT", Token.CONSTRAINT); + map.put("DEFAULT", Token.DEFAULT); + map.put("VIEW", Token.VIEW); + map.put("CREATE", Token.CREATE); + map.put("VALUES", Token.VALUES); + map.put("ALTER", Token.ALTER); + map.put("TABLE", Token.TABLE); + map.put("DROP", Token.DROP); + map.put("SET", Token.SET); + map.put("INTO", Token.INTO); + map.put("UPDATE", Token.UPDATE); + map.put("NULL", Token.NULL); + map.put("IS", Token.IS); + map.put("NOT", Token.NOT); + map.put("SELECT", Token.SELECT); + map.put("INSERT", Token.INSERT); + map.put("FROM", Token.FROM); + map.put("WHERE", Token.WHERE); + map.put("AND", Token.AND); + map.put("OR", Token.OR); + map.put("XOR", Token.XOR); + map.put("DISTINCT", Token.DISTINCT); + map.put("UNIQUE", Token.UNIQUE); + map.put("ALL", Token.ALL); + map.put("UNION", Token.UNION); + map.put("INTERSECT", Token.INTERSECT); + map.put("MINUS", Token.MINUS); + map.put("INNER", Token.INNER); + map.put("LEFT", Token.LEFT); + map.put("RIGHT", Token.RIGHT); + map.put("FULL", Token.FULL); + map.put("ON", Token.ON); + map.put("OUTER", Token.OUTER); + map.put("JOIN", Token.JOIN); + map.put("NEW", Token.NEW); + map.put("CASE", Token.CASE); + map.put("WHEN", Token.WHEN); + map.put("END", Token.END); + map.put("WHEN", Token.WHEN); + map.put("ELSE", Token.ELSE); + map.put("EXISTS", Token.EXISTS); + map.put("CAST", Token.CAST); + map.put("IN", Token.IN); + map.put("ASC", Token.ASC); + map.put("DESC", Token.DESC); + map.put("LIKE", Token.LIKE); + map.put("ESCAPE", Token.ESCAPE); + map.put("BETWEEN", Token.BETWEEN); + map.put("INTERVAL", Token.INTERVAL); + map.put("LOCK", Token.LOCK); + map.put("SOME", Token.SOME); + map.put("ANY", Token.ANY); + map.put("TRUE", Token.TRUE); + map.put("FALSE", Token.FALSE); + + DEFAULT_MYSQL_KEYWORDS = new Keywords(map); + } public MySqlLexer(char[] input, int inputLength){ super(input, inputLength); + super.keywods = DEFAULT_MYSQL_KEYWORDS; } public MySqlLexer(String input){ super(input); + super.keywods = DEFAULT_MYSQL_KEYWORDS; } public void scanIdentifier() { diff --git a/src/main/java/com/alibaba/druid/sql/parser/Keywords.java b/src/main/java/com/alibaba/druid/sql/parser/Keywords.java index 2377a4f129..d23f20b1c6 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Keywords.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Keywords.java @@ -25,7 +25,7 @@ public class Keywords { private final Map keywords; - public static Keywords DEFAULT_KEYWORDS; + public final static Keywords DEFAULT_KEYWORDS; static { Map map = new HashMap(); diff --git a/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java b/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java index 30ead3ea1f..bdfb2dff5e 100644 --- a/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java @@ -91,4 +91,18 @@ public class MockExecuteTest extends TestCase { stmt.close(); conn.close(); } + + public void test_6() throws Exception { + Connection conn = DriverManager.getConnection("jdbc:mock:"); + Statement stmt = conn.createStatement(); + + ResultSet rs = stmt.executeQuery("SELECT false FROM DUAL"); + Assert.assertTrue(rs.next()); + Assert.assertEquals(false, rs.getBoolean(1)); + + rs.close(); + + stmt.close(); + conn.close(); + } }