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

bug fix

Browse Source
This commit is contained in:
yakolee
2014-05-30 16:38:39 +08:00
parent 46589024f5
commit 47c7625247
4 changed files with 1 additions and 52 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
+1 -1
View File
@@ -250,7 +250,7 @@ public class MySqlExprParser extends SQLExprParser {
return primaryRest(expr);
}
} else if ("COLLATE".equalsIgnoreCase(lexer.stringVal()) && !(expr instanceof SQLIdentifierExpr)) {
} else if ("COLLATE".equalsIgnoreCase(lexer.stringVal())) {
lexer.nextToken();
if (lexer.token() == Token.EQ) {
src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
-5
View File
@@ -384,11 +384,6 @@ 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());
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
-10
View File
@@ -1371,17 +1371,7 @@ public class SQLExprParser extends SQLParser {
charType.setCollate(lexer.stringVal());
lexer.nextToken();
}
}else if(identifierEquals("COLLATE")){
lexer.nextToken();
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException();
}
charType.setCollate(lexer.stringVal());
lexer.nextToken();
}
return charType;
}