From 135f56913d162ff3947324329de08e1a5cc81fec Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 19 May 2011 07:19:57 +0000 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=BC=BAParser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@134 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../oracle/parser/OracleExprParser.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java index 6a9d485ba2..79c9902779 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java @@ -28,17 +28,27 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectOrderByItem; 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.SQLSelectParser; import com.alibaba.druid.sql.parser.Token; public class OracleExprParser extends SQLExprParser { + + public boolean allowStringAdditive = false; - private static final String[] _aggregateFunctions = { "AVG", "CORR", "COVAR_POP", "COVAR_SAMP", "COUNT", "CUME_DIST", "DENSE_RANK", "FIRST", "FIRST_VALUE", - "LAG", "LAST", "LAST_VALUE", "LEAD", "MAX", "MIN", "NTILE", "PERCENT_RANK", "PERCENTILE_CONT", "PERCENTILE_DISC", "RANK", "RATIO_TO_REPORT", - "REGR_SLOPE", "REGR_INTERCEPT", "REGR_COUNT", "REGR_R2", "REGR_AVGX", "REGR_AVGY", "REGR_SXX", "REGR_SYY", "REGR_SXY", "ROW_NUMBER", "STDDEV", - "STDDEV_POP", "STDDEV_SAMP", "SUM", "VAR_POP", "VAR_SAMP", "VARIANCE" }; + /** + * @formatter:off + */ + private static final String[] _aggregateFunctions = { + "AVG", "CORR", "COVAR_POP", "COVAR_SAMP", "COUNT" + , "CUME_DIST", "DENSE_RANK", "FIRST", "FIRST_VALUE" + , "LAG", "LAST", "LAST_VALUE", "LEAD", "MAX" + , "MIN", "NTILE", "PERCENT_RANK", "PERCENTILE_CONT", "PERCENTILE_DISC" + , "RANK", "RATIO_TO_REPORT", "REGR_SLOPE", "REGR_INTERCEPT", "REGR_COUNT" + , "REGR_R2", "REGR_AVGX", "REGR_AVGY", "REGR_SXX", "REGR_SYY" + , "REGR_SXY", "ROW_NUMBER", "STDDEV", "STDDEV_POP", "STDDEV_SAMP" + , "SUM", "VAR_POP", "VAR_SAMP", "VARIANCE" + }; public OracleExprParser(Lexer lexer){ super(lexer);