Merge pull request alibaba#495 from cutedemons/master

resolve conflict
zhaohaolin · Jan 14, 2014 · 48b158b · 48b158b
2 parents 505d62d + 57be02a
commit 48b158b
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
@@ -1260,11 +1260,7 @@ public SQLExpr notRationalRest(SQLExpr expr) {
             accept(Token.LPAREN);
 
             SQLInListExpr inListExpr = new SQLInListExpr(expr, true);
-<<<<<<< HEAD
-            exprList(inListExpr.getTargetList());
-=======
             exprList(inListExpr.getTargetList(), inListExpr);
->>>>>>> 9880fb4b85feb38fc1093ea21be5253c1ba9c54a
             expr = inListExpr;
 
             accept(Token.RPAREN);
@@ -1344,13 +1340,10 @@ protected boolean isCharType(String dataTypeName) {
                || "varchar".equalsIgnoreCase(dataTypeName)
                || "nchar".equalsIgnoreCase(dataTypeName)
                || "nvarchar".equalsIgnoreCase(dataTypeName)
-<<<<<<< HEAD
-=======
                || "tinytext".equalsIgnoreCase(dataTypeName)
                || "text".equalsIgnoreCase(dataTypeName)
                || "mediumtext".equalsIgnoreCase(dataTypeName)
                || "longtext".equalsIgnoreCase(dataTypeName)
->>>>>>> 9880fb4b85feb38fc1093ea21be5253c1ba9c54a
         //
         ;
     }
@@ -1506,11 +1499,7 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) {
             column.getConstaints().add(check);
             return parseColumnRest(column);
         }
-<<<<<<< HEAD
-
-=======
 
->>>>>>> 9880fb4b85feb38fc1093ea21be5253c1ba9c54a
         if (lexer.token() == Token.COMMENT) {
             lexer.nextToken();
             column.setComment(primary());