From a5c6636392f7a24b8d1a369771a609088a95765c Mon Sep 17 00:00:00 2001 From: yakolee Date: Thu, 8 May 2014 20:19:47 +0800 Subject: [PATCH] improve sql parser --- .../alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java | 2 +- .../com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ec4b3de137..fa1154fa10 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 @@ -250,7 +250,7 @@ public class MySqlExprParser extends SQLExprParser { return primaryRest(expr); } - } else if ("COLLATE".equalsIgnoreCase(lexer.stringVal())) { + } else if ("COLLATE".equalsIgnoreCase(lexer.stringVal()) && !(expr instanceof SQLIdentifierExpr)) { lexer.nextToken(); if (lexer.token() != Token.IDENTIFIER) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest.java index fbcb634cf5..071c4c8de0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest.java @@ -65,7 +65,7 @@ public class MySqlCreateTableTest extends MysqlTest { + " `create_time` datetime NOT NULL COMMENT '授权时间', " + " `invalid_time` datetime NOT NULL COMMENT '授权失效时间'," + " PRIMARY KEY (`auth_id`)" - + " ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='INS_EBAY_AUTH';"; + + " ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='INS_EBAY_AUTH'"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList();