merge serfer update

src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java

@@ -912,10 +912,10 @@ public class DruidPooledPreparedStatement extends DruidPooledStatement implement
 
         protected final MethodType methodType;
 
-        private final int          resultSetType;
-        private final int          resultSetConcurrency;
-        private final int          resultSetHoldability;
-        private final int          autoGeneratedKeys;
+        public final int           resultSetType;
+        public final int           resultSetConcurrency;
+        public final int           resultSetHoldability;
+        public final int           autoGeneratedKeys;
         private final int[]        columnIndexes;
         private final String[]     columnNames;
 

src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsExprParser.java

@@ -23,11 +23,8 @@ import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
 import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
 import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsUDTFSQLSelectItem;
-import com.alibaba.druid.sql.parser.EOFParserException;
-import com.alibaba.druid.sql.parser.Lexer;
-import com.alibaba.druid.sql.parser.ParserException;
-import com.alibaba.druid.sql.parser.SQLExprParser;
-import com.alibaba.druid.sql.parser.Token;
+import com.alibaba.druid.sql.parser.*;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class OdpsExprParser extends SQLExprParser {
 
@@ -43,7 +40,7 @@ public class OdpsExprParser extends SQLExprParser {
                                                      };
 
     public OdpsExprParser(Lexer lexer){
-        super(lexer);
+        super(lexer, JdbcConstants.ODPS);
 
         this.aggregateFunctions = AGGREGATE_FUNCTIONS;
     }
@@ -157,4 +154,9 @@ public class OdpsExprParser extends SQLExprParser {
         
         return super.equalityRest(expr);
     }
+
+    @Override
+    public OdpsSelectParser createSelectParser() {
+        return new OdpsSelectParser(this);
+    }
 }

src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java

@@ -415,7 +415,9 @@ public class SQLExprParser extends SQLParser {
                 }
                 break;
             case SELECT:
-                SQLQueryExpr queryExpr = new SQLQueryExpr(createSelectParser().select());
+                SQLQueryExpr queryExpr = new SQLQueryExpr(
+                        createSelectParser()
+                                .select());
                 sqlExpr = queryExpr;
                 break;
             case CAST: