Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
yakolee
2014-05-30 15:19:22 +08:00
parent a9f290abf2 1c917c0fc4
commit 46589024f5
5 changed files with 90 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
+4
View File
@@ -253,6 +253,10 @@ public class MySqlExprParser extends SQLExprParser {
} else if ("COLLATE".equalsIgnoreCase(lexer.stringVal()) && !(expr instanceof SQLIdentifierExpr)) {
lexer.nextToken();
if (lexer.token() == Token.EQ) {
lexer.nextToken();
}
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException("syntax error");
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
+5
View File
@@ -384,6 +384,11 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
print(" CHARACTER SET ");
print(x.getCharSetName());
}
if (x.getCollate() != null) {
print(" COLLATE ");
print(x.getCollate());
}
if (x.getCollate() != null) {
print(" COLLATE ");
print(x.getCollate());