From 0e05c3c1e688743753ab0f016990fae3e23eb7a5 Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 12 May 2011 03:02:32 +0000 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4=E8=AD=A6=E5=91=8A?= 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@24 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../oracle/ast/expr/OracleAnalyticWindowing.java | 1 + .../oracle/ast/expr/OracleArrayAccessExpr.java | 3 ++- .../sql/dialect/oracle/ast/expr/OracleDateExpr.java | 2 ++ .../oracle/ast/expr/OracleDatetimeLiteralExpr.java | 13 +++++++------ .../dialect/oracle/ast/expr/OracleDbLinkExpr.java | 5 +++-- .../dialect/oracle/ast/expr/OracleExtractExpr.java | 1 + .../ast/expr/OracleGroupComparisonCondition.java | 5 +++-- .../oracle/ast/expr/OracleGroupingSetsExpr.java | 3 ++- .../dialect/oracle/ast/expr/OracleIntervalExpr.java | 1 + .../dialect/oracle/ast/expr/OracleOuterExpr.java | 3 ++- .../oracle/ast/expr/OracleTableCollectionExpr.java | 5 +++-- .../oracle/ast/expr/OracleTimestampExpr.java | 5 +++-- .../oracle/ast/stmt/OracleSelectQueryBlock.java | 1 - 13 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalyticWindowing.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalyticWindowing.java index fa6873873e..8064951782 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalyticWindowing.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalyticWindowing.java @@ -20,6 +20,7 @@ import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; +@SuppressWarnings("serial") public class OracleAnalyticWindowing extends SQLObjectImpl { private Type type; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleArrayAccessExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleArrayAccessExpr.java index 8af8376d65..58c129b4fb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleArrayAccessExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleArrayAccessExpr.java @@ -25,8 +25,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleArrayAccessExpr extends SQLExprImpl { + private static final long serialVersionUID = 1L; private SQLExpr ownner; - private final List arguments = new ArrayList(); + private final List arguments = new ArrayList(); public OracleArrayAccessExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDateExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDateExpr.java index 273ff68de1..748b497c4e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDateExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDateExpr.java @@ -20,6 +20,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleDateExpr extends OracleDatetimeLiteralExpr { + private static final long serialVersionUID = 1L; + public OracleDateExpr(){ } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDatetimeLiteralExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDatetimeLiteralExpr.java index c2de897d09..b7b34e0bbc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDatetimeLiteralExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDatetimeLiteralExpr.java @@ -19,12 +19,13 @@ import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr; public abstract class OracleDatetimeLiteralExpr extends SQLLiteralExpr { - protected int year; - protected int month; - protected int dayOfMonth; - protected int hour; - protected int minute; - protected int second; + private static final long serialVersionUID = 1L; + protected int year; + protected int month; + protected int dayOfMonth; + protected int hour; + protected int minute; + protected int second; public OracleDatetimeLiteralExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java index a7a32449df..70df6f1d9c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java @@ -22,8 +22,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleDbLinkExpr extends SQLExprImpl { - private SQLExpr expr; - private String dbLink; + private static final long serialVersionUID = 1L; + private SQLExpr expr; + private String dbLink; public OracleDbLinkExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java index 68105b8879..5f6ef5f8df 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java @@ -22,6 +22,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleExtractExpr extends SQLExprImpl { + private static final long serialVersionUID = 1L; private OracleDateTimeUnit unit; private SQLExpr from; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupComparisonCondition.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupComparisonCondition.java index 03fec0b859..21ef86cb96 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupComparisonCondition.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupComparisonCondition.java @@ -26,10 +26,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleGroupComparisonCondition extends SQLExprImpl { - private final List exprList = new ArrayList(); + private static final long serialVersionUID = 1L; + private final List exprList = new ArrayList(); private SQLBinaryOperator operator; private OracleGroupComparator comparator; - private final List targetExprList = new ArrayList(); + private final List targetExprList = new ArrayList(); public OracleGroupComparisonCondition(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupingSetsExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupingSetsExpr.java index 4d8a3823b6..3baeadd3da 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupingSetsExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupingSetsExpr.java @@ -25,7 +25,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleGroupingSetsExpr extends SQLExprImpl { - private final List items = new ArrayList(); + private static final long serialVersionUID = 1L; + private final List items = new ArrayList(); public OracleGroupingSetsExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java index 4328dfaa03..40b6733d5f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java @@ -21,6 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleIntervalExpr extends SQLLiteralExpr { + private static final long serialVersionUID = 1L; private String value; private OracleIntervalType type; private Integer precision; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleOuterExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleOuterExpr.java index b57505acb8..bc81bfb9e1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleOuterExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleOuterExpr.java @@ -22,7 +22,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleOuterExpr extends SQLExprImpl { - private SQLExpr expr; + private static final long serialVersionUID = 1L; + private SQLExpr expr; public OracleOuterExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTableCollectionExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTableCollectionExpr.java index 264980faef..9cf8b2da4d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTableCollectionExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTableCollectionExpr.java @@ -22,8 +22,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleTableCollectionExpr extends SQLExprImpl { - private SQLExpr expr; - private boolean outer = false; + private static final long serialVersionUID = 1L; + private SQLExpr expr; + private boolean outer = false; public OracleTableCollectionExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java index e9ff946f73..33b93dfb65 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java @@ -20,8 +20,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleTimestampExpr extends OracleDatetimeLiteralExpr { - private int milliSecond; - private String timeZone; + private static final long serialVersionUID = 1L; + private int milliSecond; + private String timeZone; public OracleTimestampExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectQueryBlock.java index 025402c8f1..afe544789c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectQueryBlock.java @@ -21,7 +21,6 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLSetQuantifier; import com.alibaba.druid.sql.ast.statement.SQLSelectItem; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; -import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.dialect.oracle.ast.OracleHint; import com.alibaba.druid.sql.dialect.oracle.ast.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor;