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 pull request

Browse Source
This commit is contained in:
wenshao
2014-01-13 20:29:27 +08:00
parent 4ee7cd9274 9880fb4b85
commit 2fa836aaed
26 changed files with 1675 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+17 -1
View File
@@ -1005,11 +1005,12 @@ public class SQLExprParser extends SQLParser {
SQLInListExpr inListExpr = new SQLInListExpr(expr);
if (lexer.token() == Token.LPAREN) {
lexer.nextToken();
exprList(inListExpr.getTargetList());
exprList(inListExpr.getTargetList(), inListExpr);
accept(Token.RPAREN);
expr = inListExpr;
} else {
SQLExpr itemExpr = primary();
itemExpr.setParent(inListExpr);
inListExpr.getTargetList().add(itemExpr);
}
@@ -1259,7 +1260,11 @@ public class SQLExprParser extends SQLParser {
accept(Token.LPAREN);
SQLInListExpr inListExpr = new SQLInListExpr(expr, true);
<<<<<<< HEAD
exprList(inListExpr.getTargetList());
=======
exprList(inListExpr.getTargetList(), inListExpr);
>>>>>>> 9880fb4b85feb38fc1093ea21be5253c1ba9c54a
expr = inListExpr;
accept(Token.RPAREN);
@@ -1339,6 +1344,13 @@ public class SQLExprParser extends SQLParser {
|| "varchar".equalsIgnoreCase(dataTypeName)
|| "nchar".equalsIgnoreCase(dataTypeName)
|| "nvarchar".equalsIgnoreCase(dataTypeName)
<<<<<<< HEAD
=======
|| "tinytext".equalsIgnoreCase(dataTypeName)
|| "text".equalsIgnoreCase(dataTypeName)
|| "mediumtext".equalsIgnoreCase(dataTypeName)
|| "longtext".equalsIgnoreCase(dataTypeName)
>>>>>>> 9880fb4b85feb38fc1093ea21be5253c1ba9c54a
//
;
}
@@ -1494,7 +1506,11 @@ public class SQLExprParser extends SQLParser {
column.getConstaints().add(check);
return parseColumnRest(column);
}
<<<<<<< HEAD
=======
>>>>>>> 9880fb4b85feb38fc1093ea21be5253c1ba9c54a
if (lexer.token() == Token.COMMENT) {
lexer.nextToken();
column.setComment(primary());