From 6e5fb2e7df052b283e7a8ff3843cd238f3d064db Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 3 Aug 2013 15:45:40 +0800 Subject: [PATCH] improve sql parser --- .../alibaba/druid/sql/ast/SQLCommentHint.java | 4 +- .../druid/sql/ast/SQLDataTypeImpl.java | 4 +- .../alibaba/druid/sql/ast/SQLExprImpl.java | 2 - .../alibaba/druid/sql/ast/SQLObjectImpl.java | 5 +- .../com/alibaba/druid/sql/ast/SQLOrderBy.java | 5 +- .../com/alibaba/druid/sql/ast/SQLOver.java | 14 +- .../druid/sql/ast/SQLStatementImpl.java | 2 - .../druid/sql/ast/expr/SQLAllColumnExpr.java | 2 - .../druid/sql/ast/expr/SQLAllExpr.java | 3 +- .../druid/sql/ast/expr/SQLAnyExpr.java | 3 +- .../druid/sql/ast/expr/SQLCastExpr.java | 6 +- .../druid/sql/ast/expr/SQLCharExpr.java | 2 - .../sql/ast/expr/SQLCurrentOfCursorExpr.java | 4 +- .../druid/sql/ast/expr/SQLDefaultExpr.java | 2 - .../druid/sql/ast/expr/SQLHexExpr.java | 6 +- .../druid/sql/ast/expr/SQLIdentifierExpr.java | 6 +- .../druid/sql/ast/expr/SQLIntegerExpr.java | 4 +- .../druid/sql/ast/expr/SQLListExpr.java | 4 +- .../druid/sql/ast/expr/SQLNCharExpr.java | 2 - .../druid/sql/ast/expr/SQLNullExpr.java | 2 - .../druid/sql/ast/expr/SQLNumberExpr.java | 4 +- .../sql/ast/expr/SQLNumericLiteralExpr.java | 4 +- .../druid/sql/ast/expr/SQLPropertyExpr.java | 10 +- .../druid/sql/ast/expr/SQLSomeExpr.java | 3 +- .../sql/ast/expr/SQLTextLiteralExpr.java | 4 +- .../druid/sql/ast/expr/SQLVariantRefExpr.java | 8 +- .../sql/ast/statement/NotNullConstraint.java | 1 - .../ast/statement/SQLAlterTableAddColumn.java | 4 +- .../statement/SQLAlterTableAddForeignKey.java | 11 +- .../ast/statement/SQLAlterTableAddIndex.java | 4 +- .../statement/SQLAlterTableAddPrimaryKey.java | 3 +- .../statement/SQLAlterTableAlterColumn.java | 2 - .../SQLAlterTableDisableConstraint.java | 7 +- .../statement/SQLAlterTableDisableKeys.java | 2 - .../SQLAlterTableDropColumnItem.java | 3 +- .../SQLAlterTableDropConstraint.java | 7 +- .../statement/SQLAlterTableDropForeinKey.java | 4 +- .../ast/statement/SQLAlterTableDropIndex.java | 4 +- .../SQLAlterTableDropPrimaryKey.java | 2 - .../SQLAlterTableEnableConstraint.java | 7 +- .../statement/SQLAlterTableEnableKeys.java | 2 - .../statement/SQLAlterTableRenameColumn.java | 5 +- .../ast/statement/SQLAlterTableStatement.java | 6 +- .../sql/ast/statement/SQLAssignItem.java | 8 +- .../sql/ast/statement/SQLCallStatement.java | 4 +- .../ast/statement/SQLCharactorDataType.java | 1 - .../druid/sql/ast/statement/SQLCheck.java | 13 +- .../sql/ast/statement/SQLColumnCheck.java | 17 +- .../ast/statement/SQLColumnDefinition.java | 1 - .../ast/statement/SQLColumnPrimaryKey.java | 2 - .../ast/statement/SQLCommentStatement.java | 2 - .../sql/ast/statement/SQLConstaintImpl.java | 1 - .../statement/SQLCreateDatabaseStatement.java | 10 +- .../statement/SQLCreateIndexStatement.java | 7 +- .../statement/SQLCreateTableStatement.java | 1 - .../ast/statement/SQLCreateViewStatement.java | 5 +- .../sql/ast/statement/SQLDeleteStatement.java | 5 +- .../ast/statement/SQLDropIndexStatement.java | 4 +- .../ast/statement/SQLDropTableStatement.java | 8 +- .../ast/statement/SQLDropViewStatement.java | 8 +- .../druid/sql/ast/statement/SQLExprHint.java | 20 +- .../sql/ast/statement/SQLExprTableSource.java | 4 +- .../sql/ast/statement/SQLForeignKeyImpl.java | 7 +- .../sql/ast/statement/SQLInsertInto.java | 3 +- .../sql/ast/statement/SQLInsertStatement.java | 3 - .../sql/ast/statement/SQLJoinTableSource.java | 4 +- .../sql/ast/statement/SQLPrimaryKeyImpl.java | 1 - .../SQLReleaseSavePointStatement.java | 3 +- .../ast/statement/SQLRollbackStatement.java | 4 +- .../ast/statement/SQLSavePointStatement.java | 3 +- .../druid/sql/ast/statement/SQLSelect.java | 2 - .../ast/statement/SQLSelectGroupByClause.java | 4 +- .../sql/ast/statement/SQLSelectItem.java | 6 +- .../ast/statement/SQLSelectOrderByItem.java | 4 +- .../sql/ast/statement/SQLSelectQuery.java | 2 - .../ast/statement/SQLSelectQueryBlock.java | 4 +- .../sql/ast/statement/SQLSelectStatement.java | 4 +- .../sql/ast/statement/SQLSetStatement.java | 8 +- .../ast/statement/SQLSubqueryTableSource.java | 4 +- .../sql/ast/statement/SQLTableSourceImpl.java | 10 +- .../ast/statement/SQLTruncateStatement.java | 5 +- .../sql/ast/statement/SQLUnionQuery.java | 10 +- .../druid/sql/ast/statement/SQLUnique.java | 1 - .../sql/ast/statement/SQLUpdateSetItem.java | 6 +- .../sql/ast/statement/SQLUpdateStatement.java | 6 +- .../sql/ast/statement/SQLUseStatement.java | 3 +- .../ast/statement/SQLWithSubqueryClause.java | 9 +- .../db2/ast/stmt/DB2SelectQueryBlock.java | 7 +- .../mysql/ast/MySqlForceIndexHint.java | 2 - .../dialect/mysql/ast/MySqlForeignKey.java | 2 - .../mysql/ast/MySqlIgnoreIndexHint.java | 2 - .../dialect/mysql/ast/MySqlIndexHintImpl.java | 4 +- .../druid/sql/dialect/mysql/ast/MySqlKey.java | 1 - .../dialect/mysql/ast/MySqlObjectImpl.java | 2 - .../dialect/mysql/ast/MySqlPrimaryKey.java | 1 - .../sql/dialect/mysql/ast/MySqlUnique.java | 1 - .../dialect/mysql/ast/MySqlUseIndexHint.java | 2 - .../mysql/ast/expr/MySqlBinaryExpr.java | 4 +- .../mysql/ast/expr/MySqlBooleanExpr.java | 4 +- .../dialect/mysql/ast/expr/MySqlCharExpr.java | 8 +- .../dialect/mysql/ast/expr/MySqlExprImpl.java | 2 - .../mysql/ast/expr/MySqlExtractExpr.java | 2 - .../mysql/ast/expr/MySqlIntervalExpr.java | 2 - .../mysql/ast/expr/MySqlMatchAgainstExpr.java | 8 +- .../mysql/ast/expr/MySqlOutFileExpr.java | 19 +- .../dialect/mysql/ast/expr/MySqlUserName.java | 7 +- .../mysql/ast/statement/CobarShowStatus.java | 4 +- .../statement/MySqlAlterTableAddColumn.java | 10 +- .../statement/MySqlAlterTableAddIndex.java | 4 +- .../statement/MySqlAlterTableAddUnique.java | 4 +- .../MySqlAlterTableChangeColumn.java | 2 - .../statement/MySqlAlterTableCharacter.java | 6 +- .../MySqlAlterTableDiscardTablespace.java | 2 - .../MySqlAlterTableImportTablespace.java | 2 - .../MySqlAlterTableModifyColumn.java | 3 - .../ast/statement/MySqlAlterTableOption.java | 6 +- .../statement/MySqlAlterTableStatement.java | 4 +- .../ast/statement/MySqlBinlogStatement.java | 27 ++- .../ast/statement/MySqlCommitStatement.java | 8 +- .../statement/MySqlCreateIndexStatement.java | 7 +- .../statement/MySqlCreateTableStatement.java | 14 +- .../statement/MySqlCreateUserStatement.java | 14 +- .../ast/statement/MySqlDeleteStatement.java | 16 +- .../ast/statement/MySqlDescribeStatement.java | 4 +- .../statement/MySqlDropTableStatement.java | 7 +- .../mysql/ast/statement/MySqlDropUser.java | 4 +- .../ast/statement/MySqlDropViewStatement.java | 6 +- .../ast/statement/MySqlExecuteStatement.java | 4 +- .../ast/statement/MySqlHelpStatement.java | 4 +- .../ast/statement/MySqlInsertStatement.java | 2 - .../ast/statement/MySqlKillStatement.java | 48 ++--- .../MySqlLoadDataInFileStatement.java | 1 - .../ast/statement/MySqlLoadXmlStatement.java | 14 +- .../statement/MySqlLockTableStatement.java | 6 +- .../ast/statement/MySqlPartitionByHash.java | 8 +- .../ast/statement/MySqlPartitionByKey.java | 8 +- .../ast/statement/MySqlPartitionByList.java | 8 +- .../ast/statement/MySqlPartitionByRange.java | 8 +- .../statement/MySqlPartitioningClause.java | 1 - .../ast/statement/MySqlPartitioningDef.java | 1 - .../ast/statement/MySqlPrepareStatement.java | 5 +- .../statement/MySqlRenameTableStatement.java | 11 +- .../ast/statement/MySqlReplaceStatement.java | 18 +- .../ast/statement/MySqlResetStatement.java | 17 +- .../ast/statement/MySqlRollbackStatement.java | 8 +- .../statement/MySqlSQLColumnDefinition.java | 10 +- .../ast/statement/MySqlSelectGroupBy.java | 4 +- .../ast/statement/MySqlSelectQueryBlock.java | 1 - .../statement/MySqlSetCharSetStatement.java | 10 +- .../ast/statement/MySqlSetNamesStatement.java | 10 +- ...SetTransactionIsolationLevelStatement.java | 6 +- .../statement/MySqlShowAuthorsStatement.java | 3 - .../MySqlShowBinLogEventsStatement.java | 8 +- .../MySqlShowBinaryLogsStatement.java | 3 - .../MySqlShowCharacterSetStatement.java | 6 +- .../MySqlShowCollationStatement.java | 6 +- .../statement/MySqlShowColumnsStatement.java | 12 +- .../MySqlShowContributorsStatement.java | 3 - .../MySqlShowCreateDatabaseStatement.java | 4 +- .../MySqlShowCreateEventStatement.java | 4 +- .../MySqlShowCreateFunctionStatement.java | 4 +- .../MySqlShowCreateProcedureStatement.java | 4 +- .../MySqlShowCreateTableStatement.java | 4 +- .../MySqlShowCreateTriggerStatement.java | 4 +- .../MySqlShowCreateViewStatement.java | 4 +- .../MySqlShowDatabasesStatement.java | 8 +- .../statement/MySqlShowEngineStatement.java | 6 +- .../statement/MySqlShowEnginesStatement.java | 3 +- .../statement/MySqlShowErrorsStatement.java | 6 +- .../statement/MySqlShowEventsStatement.java | 8 +- .../MySqlShowFunctionCodeStatement.java | 4 +- .../MySqlShowFunctionStatusStatement.java | 6 +- .../statement/MySqlShowGrantsStatement.java | 4 +- .../statement/MySqlShowIndexesStatement.java | 6 +- .../ast/statement/MySqlShowKeysStatement.java | 6 +- .../MySqlShowMasterLogsStatement.java | 3 - .../MySqlShowMasterStatusStatement.java | 3 - .../MySqlShowOpenTablesStatement.java | 8 +- .../statement/MySqlShowPluginsStatement.java | 3 - .../MySqlShowPrivilegesStatement.java | 3 - .../MySqlShowProcedureCodeStatement.java | 4 +- .../MySqlShowProcedureStatusStatement.java | 6 +- .../MySqlShowProcessListStatement.java | 4 +- .../statement/MySqlShowProfileStatement.java | 8 +- .../statement/MySqlShowProfilesStatement.java | 2 - .../MySqlShowRelayLogEventsStatement.java | 8 +- .../MySqlShowSlaveHostsStatement.java | 2 - .../MySqlShowSlaveStatusStatement.java | 2 - .../ast/statement/MySqlShowStatement.java | 1 - .../statement/MySqlShowStatusStatement.java | 10 +- .../MySqlShowTableStatusStatement.java | 8 +- .../statement/MySqlShowTablesStatement.java | 10 +- .../statement/MySqlShowTriggersStatement.java | 8 +- .../statement/MySqlShowVariantsStatement.java | 10 +- .../statement/MySqlShowWarningsStatement.java | 6 +- .../MySqlStartTransactionStatement.java | 8 +- .../ast/statement/MySqlStatementImpl.java | 2 - .../mysql/ast/statement/MySqlTableIndex.java | 1 - .../mysql/ast/statement/MySqlUnionQuery.java | 4 +- .../statement/MySqlUnlockTablesStatement.java | 3 - .../ast/statement/MySqlUpdateStatement.java | 9 +- .../dialect/mysql/parser/MySqlExprParser.java | 1 + .../sql/dialect/mysql/parser/MySqlLexer.java | 1 + .../mysql/parser/MySqlStatementParser.java | 2 +- .../oracle/ast/OracleDataTypeIntervalDay.java | 2 - .../ast/OracleDataTypeIntervalYear.java | 2 - .../oracle/ast/OracleDataTypeTimestamp.java | 8 +- .../sql/dialect/oracle/ast/OracleOrderBy.java | 4 +- .../oracle/ast/OracleSQLObjectImpl.java | 2 - .../oracle/ast/clause/CycleClause.java | 4 +- .../ast/clause/FlashbackQueryClause.java | 20 +- .../oracle/ast/clause/GroupingSetExpr.java | 3 +- .../oracle/ast/clause/ModelClause.java | 30 +-- .../ast/clause/OracleErrorLoggingClause.java | 9 +- .../ast/clause/OracleLobStorageClause.java | 130 ++++++++++++ .../oracle/ast/clause/OracleParameter.java | 7 +- .../clause/OraclePartitionByRangeClause.java | 8 +- .../ast/clause/OracleRangeValuesClause.java | 6 +- .../ast/clause/OracleReturningClause.java | 6 +- .../ast/clause/OracleStorageClause.java | 73 ++++++- .../ast/clause/OracleWithSubqueryEntry.java | 7 +- .../ast/clause/PartitionExtensionClause.java | 4 +- .../oracle/ast/clause/SampleClause.java | 8 +- .../oracle/ast/clause/SearchClause.java | 2 - .../oracle/ast/expr/OracleAnalytic.java | 1 - .../ast/expr/OracleAnalyticWindowing.java | 1 - .../oracle/ast/expr/OracleArgumentExpr.java | 5 +- .../ast/expr/OracleBinaryDoubleExpr.java | 6 +- .../ast/expr/OracleBinaryFloatExpr.java | 8 +- .../oracle/ast/expr/OracleCursorExpr.java | 4 +- .../oracle/ast/expr/OracleDateExpr.java | 4 +- .../oracle/ast/expr/OracleDatetimeExpr.java | 6 +- .../oracle/ast/expr/OracleDbLinkExpr.java | 7 +- .../oracle/ast/expr/OracleExtractExpr.java | 1 - .../oracle/ast/expr/OracleIntervalExpr.java | 1 - .../oracle/ast/expr/OracleIsSetExpr.java | 4 +- .../oracle/ast/expr/OracleOuterExpr.java | 3 +- .../oracle/ast/expr/OracleRangeExpr.java | 6 +- .../oracle/ast/expr/OracleSizeExpr.java | 6 +- .../oracle/ast/expr/OracleSysdateExpr.java | 4 +- .../oracle/ast/expr/OracleTimestampExpr.java | 5 +- .../ast/stmt/OracleAlterIndexStatement.java | 19 +- .../stmt/OracleAlterProcedureStatement.java | 8 +- .../ast/stmt/OracleAlterSessionStatement.java | 4 +- .../ast/stmt/OracleAlterSynonymStatement.java | 8 +- .../stmt/OracleAlterTableAddConstaint.java | 4 +- .../stmt/OracleAlterTableDropPartition.java | 4 +- .../oracle/ast/stmt/OracleAlterTableItem.java | 2 - .../ast/stmt/OracleAlterTableModify.java | 4 +- .../stmt/OracleAlterTableMoveTablespace.java | 4 +- .../ast/stmt/OracleAlterTableRenameTo.java | 4 +- .../stmt/OracleAlterTableSplitPartition.java | 22 +- .../ast/stmt/OracleAlterTableStatement.java | 6 +- .../OracleAlterTableTruncatePartition.java | 4 +- .../OracleAlterTablespaceAddDataFile.java | 4 +- .../ast/stmt/OracleAlterTablespaceItem.java | 1 - .../stmt/OracleAlterTablespaceStatement.java | 2 - .../ast/stmt/OracleAlterTriggerStatement.java | 8 +- .../ast/stmt/OracleAlterViewStatement.java | 8 +- .../oracle/ast/stmt/OracleBlockStatement.java | 6 +- .../ast/stmt/OracleCommitStatement.java | 8 +- .../oracle/ast/stmt/OracleConstraint.java | 2 - .../ast/stmt/OracleConstraintState.java | 4 +- .../OracleCreateDatabaseDbLinkStatement.java | 18 +- .../ast/stmt/OracleCreateIndexStatement.java | 69 ++++++- .../stmt/OracleCreateProcedureStatement.java | 4 +- .../stmt/OracleCreateSequenceStatement.java | 15 +- .../ast/stmt/OracleCreateTableStatement.java | 12 +- .../oracle/ast/stmt/OracleDDLStatement.java | 1 - .../ast/stmt/OracleDeleteStatement.java | 9 +- .../stmt/OracleDropDatabaseLinkStatement.java | 6 +- .../ast/stmt/OracleDropSequenceStatement.java | 4 +- .../ast/stmt/OracleExceptionStatement.java | 6 +- .../oracle/ast/stmt/OracleExitStatement.java | 1 - .../ast/stmt/OracleExplainStatement.java | 8 +- .../oracle/ast/stmt/OracleExprStatement.java | 2 - .../oracle/ast/stmt/OracleFetchStatement.java | 6 +- .../ast/stmt/OracleFileSpecification.java | 10 +- .../oracle/ast/stmt/OracleForStatement.java | 4 +- .../oracle/ast/stmt/OracleGotoStatement.java | 4 +- .../oracle/ast/stmt/OracleGrantStatement.java | 2 - .../oracle/ast/stmt/OracleIfStatement.java | 14 +- .../ast/stmt/OracleInsertStatement.java | 4 +- .../oracle/ast/stmt/OracleLabelStatement.java | 4 +- .../ast/stmt/OracleLockTableStatement.java | 10 +- .../oracle/ast/stmt/OracleLoopStatement.java | 4 +- .../oracle/ast/stmt/OracleMergeStatement.java | 30 ++- .../ast/stmt/OracleMultiInsertStatement.java | 20 +- .../oracle/ast/stmt/OracleOrderByItem.java | 4 +- .../ast/stmt/OraclePLSQLCommitStatement.java | 2 - .../oracle/ast/stmt/OraclePrimaryKey.java | 4 +- .../ast/stmt/OracleSavePointStatement.java | 4 +- .../dialect/oracle/ast/stmt/OracleSelect.java | 2 - .../ast/stmt/OracleSelectForUpdate.java | 8 +- .../OracleSelectHierachicalQueryClause.java | 10 +- .../oracle/ast/stmt/OracleSelectJoin.java | 2 - .../oracle/ast/stmt/OracleSelectPivot.java | 14 +- .../ast/stmt/OracleSelectPivotBase.java | 4 +- .../ast/stmt/OracleSelectQueryBlock.java | 4 +- .../ast/stmt/OracleSelectRestriction.java | 8 +- .../stmt/OracleSelectSubqueryTableSource.java | 2 - .../ast/stmt/OracleSelectTableReference.java | 4 +- .../oracle/ast/stmt/OracleSelectUnPivot.java | 6 +- .../stmt/OracleSetTransactionStatement.java | 6 +- .../oracle/ast/stmt/OracleStatementImpl.java | 4 +- .../ast/stmt/OracleTruncateStatement.java | 4 +- .../ast/stmt/OracleUpdateStatement.java | 10 +- .../ast/stmt/OracleUsingIndexClause.java | 29 ++- .../parser/OracleCreateTableParser.java | 87 ++++---- .../oracle/parser/OracleExprParser.java | 190 ++++++++++++++++++ .../dialect/oracle/parser/OracleLexer.java | 18 ++ .../oracle/parser/OracleStatementParser.java | 29 ++- .../oracle/visitor/OracleASTVisitor.java | 5 + .../visitor/OracleASTVisitorAdapter.java | 11 + .../oracle/visitor/OracleOutputVisitor.java | 187 ++++++++++++++--- .../visitor/OracleSchemaStatVisitor.java | 11 + .../sql/dialect/postgresql/ast/PGOrderBy.java | 5 +- .../postgresql/ast/PGSQLObjectImpl.java | 2 - .../dialect/postgresql/ast/PGWithClause.java | 44 ++-- .../dialect/postgresql/ast/PGWithQuery.java | 3 +- .../postgresql/ast/expr/PGParameter.java | 6 +- .../ast/stmt/PGDeleteStatement.java | 11 +- .../ast/stmt/PGFunctionTableSource.java | 4 +- .../ast/stmt/PGInsertStatement.java | 6 +- .../ast/stmt/PGSelectQueryBlock.java | 29 +-- .../ast/stmt/PGSelectStatement.java | 3 +- .../ast/stmt/PGTruncateStatement.java | 10 +- .../ast/stmt/PGUpdateStatement.java | 10 +- .../ast/SQLServerColumnDefinition.java | 11 +- .../sqlserver/ast/SQLServerObjectImpl.java | 2 - .../sqlserver/ast/SQLServerSelect.java | 5 - .../ast/SQLServerSelectQueryBlock.java | 7 +- .../dialect/sqlserver/ast/SQLServerTop.java | 19 +- .../expr/SQLServerObjectReferenceExpr.java | 16 +- .../ast/stmt/SQLServerExecStatement.java | 1 - .../ast/stmt/SQLServerInsertStatement.java | 6 +- .../ast/stmt/SQLServerUpdateStatement.java | 8 +- .../alibaba/druid/sql/parser/SQLParser.java | 28 ++- .../com/alibaba/druid/sql/parser/Token.java | 16 ++ .../druid/bvt/sql/mysql/Binlog_Test.java | 3 +- .../sql/oracle/OracleCreateIndexTest3.java | 2 +- .../sql/oracle/OracleCreateIndexTest4.java | 62 ++++++ .../sql/oracle/OracleCreateTableTest18.java | 11 +- .../sql/oracle/OracleCreateTableTest19.java | 92 +++++++++ .../sql/oracle/OracleCreateTableTest20.java | 93 +++++++++ .../bvt/sql/oracle/OraclePivotClauseTest.java | 3 +- 346 files changed, 1700 insertions(+), 1436 deletions(-) create mode 100644 src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleLobStorageClause.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest4.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest19.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest20.java diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLCommentHint.java b/src/main/java/com/alibaba/druid/sql/ast/SQLCommentHint.java index 473ecdeac7..914ff34745 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLCommentHint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLCommentHint.java @@ -19,9 +19,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCommentHint extends SQLObjectImpl implements SQLHint { - private static final long serialVersionUID = 1L; - - private String text; + private String text; public SQLCommentHint(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java index 49a83c844d..7e7445a52d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java @@ -22,10 +22,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLDataTypeImpl extends SQLObjectImpl implements SQLDataType { - private static final long serialVersionUID = -2783296007802532452L; - protected String name; - protected final List arguments = new ArrayList(); + protected final List arguments = new ArrayList(); public SQLDataTypeImpl(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java index 041f2a8879..57a05f9b3b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java @@ -17,8 +17,6 @@ package com.alibaba.druid.sql.ast; public abstract class SQLExprImpl extends SQLObjectImpl implements SQLExpr { - private static final long serialVersionUID = 1278977287415092601L; - public SQLExprImpl(){ } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLObjectImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLObjectImpl.java index c315489307..82dc0a69d5 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLObjectImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLObjectImpl.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.sql.ast; -import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public abstract class SQLObjectImpl implements SQLObject, Serializable { - - private static final long serialVersionUID = 5569722716326763762L; +public abstract class SQLObjectImpl implements SQLObject { private SQLObject parent; diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java index 1ca107481a..ee345a2baf 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java @@ -21,7 +21,6 @@ import java.util.List; import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -@SuppressWarnings("serial") public class SQLOrderBy extends SQLObjectImpl { protected final List items = new ArrayList(); @@ -29,8 +28,8 @@ public class SQLOrderBy extends SQLObjectImpl { public SQLOrderBy(){ } - - public SQLOrderBy(SQLExpr expr) { + + public SQLOrderBy(SQLExpr expr){ SQLSelectOrderByItem item = new SQLSelectOrderByItem(expr); item.setParent(this); this.items.add(item); diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java b/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java index f793cc05ac..c333c9288c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java @@ -22,16 +22,14 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; */ public class SQLOver extends SQLObjectImpl { - private static final long serialVersionUID = 1L; - - protected final List partitionBy = new ArrayList(); + protected final List partitionBy = new ArrayList(); protected SQLOrderBy orderBy; - - public SQLOver() { - + + public SQLOver(){ + } - - public SQLOver(SQLOrderBy orderBy) { + + public SQLOver(SQLOrderBy orderBy){ this.setOrderBy(orderBy); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java index e800cb3d3a..3d6467ad04 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java @@ -20,8 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class SQLStatementImpl extends SQLObjectImpl implements SQLStatement { - private static final long serialVersionUID = 1L; - public SQLStatementImpl(){ } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllColumnExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllColumnExpr.java index 6e6b17aa06..7a4b313429 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllColumnExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllColumnExpr.java @@ -20,8 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAllColumnExpr extends SQLExprImpl { - private static final long serialVersionUID = 1L; - public SQLAllColumnExpr(){ } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllExpr.java index 2c96f52a16..8d72dc99a0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllExpr.java @@ -21,8 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAllExpr extends SQLExprImpl { - private static final long serialVersionUID = 1L; - public SQLSelect subQuery; + public SQLSelect subQuery; public SQLAllExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAnyExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAnyExpr.java index ec93a1b3aa..10495cfdee 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAnyExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAnyExpr.java @@ -21,8 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAnyExpr extends SQLExprImpl { - private static final long serialVersionUID = 1L; - public SQLSelect subQuery; + public SQLSelect subQuery; public SQLAnyExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java index 1249f54c13..27a9d8779b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java @@ -22,10 +22,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCastExpr extends SQLExprImpl { - private static final long serialVersionUID = 1L; - - private SQLExpr expr; - private SQLDataType dataType; + private SQLExpr expr; + private SQLDataType dataType; public SQLCastExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCharExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCharExpr.java index 4f765b34a8..5b8fd0dc65 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCharExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCharExpr.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCharExpr extends SQLTextLiteralExpr { - private static final long serialVersionUID = 1L; - public SQLCharExpr(){ } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCurrentOfCursorExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCurrentOfCursorExpr.java index 11b44e9c63..e2d9087d96 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCurrentOfCursorExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCurrentOfCursorExpr.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCurrentOfCursorExpr extends SQLExprImpl { - private static final long serialVersionUID = 1L; - - private SQLName cursorName; + private SQLName cursorName; public SQLCurrentOfCursorExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java index 8b22e51127..660a790882 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java @@ -20,8 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLDefaultExpr extends SQLExprImpl implements SQLLiteralExpr { - private static final long serialVersionUID = 1L; - @Override public boolean equals(Object o) { return o instanceof SQLDefaultExpr; diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLHexExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLHexExpr.java index af6545c54e..f7fca4af17 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLHexExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLHexExpr.java @@ -21,9 +21,7 @@ import com.alibaba.druid.util.HexBin; public class SQLHexExpr extends SQLExprImpl implements SQLLiteralExpr { - private static final long serialVersionUID = 1L; - - private final String hex; + private final String hex; public SQLHexExpr(String hex){ this.hex = hex; @@ -78,7 +76,7 @@ public class SQLHexExpr extends SQLExprImpl implements SQLLiteralExpr { } return true; } - + public byte[] toBytes() { return HexBin.decode(this.hex); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java index e8cb662198..3e1a9a368a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java @@ -21,11 +21,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLIdentifierExpr extends SQLExprImpl implements SQLName { - private static final long serialVersionUID = -4101240977289682659L; + private String name; - private String name; - - private transient String lowerName; + private transient String lowerName; public SQLIdentifierExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntegerExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntegerExpr.java index 7879c459c0..5838c6f230 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntegerExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntegerExpr.java @@ -19,9 +19,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLIntegerExpr extends SQLNumericLiteralExpr { - private static final long serialVersionUID = 1L; - - private Number number; + private Number number; public SQLIntegerExpr(Number number){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLListExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLListExpr.java index 7430f25d1a..f425ace5f8 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLListExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLListExpr.java @@ -24,9 +24,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLListExpr extends SQLExprImpl { - private static final long serialVersionUID = 1L; - - private final List items = new ArrayList(); + private final List items = new ArrayList(); public List getItems() { return items; diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNCharExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNCharExpr.java index 57c8bea9df..52500182c7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNCharExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNCharExpr.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLNCharExpr extends SQLTextLiteralExpr { - private static final long serialVersionUID = 1L; - public SQLNCharExpr(){ } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNullExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNullExpr.java index b90cb8ab47..5e0af25616 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNullExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNullExpr.java @@ -20,8 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLNullExpr extends SQLExprImpl implements SQLLiteralExpr { - private static final long serialVersionUID = 1L; - public SQLNullExpr(){ } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumberExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumberExpr.java index 3fc6927854..a901cd17d4 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumberExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumberExpr.java @@ -19,9 +19,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLNumberExpr extends SQLNumericLiteralExpr { - private static final long serialVersionUID = 1L; - - private Number number; + private Number number; public SQLNumberExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumericLiteralExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumericLiteralExpr.java index 1024e9e032..a372c0be29 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumericLiteralExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumericLiteralExpr.java @@ -19,13 +19,11 @@ import com.alibaba.druid.sql.ast.SQLExprImpl; public abstract class SQLNumericLiteralExpr extends SQLExprImpl implements SQLLiteralExpr { - private static final long serialVersionUID = 1L; - public SQLNumericLiteralExpr(){ } public abstract Number getNumber(); - + public abstract void setNumber(Number number); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java index 135ad4bc2a..07b256ab8a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java @@ -22,10 +22,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLPropertyExpr extends SQLExprImpl implements SQLName { - private static final long serialVersionUID = 1L; - - private SQLExpr owner; - private String name; + private SQLExpr owner; + private String name; public SQLPropertyExpr(SQLExpr owner, String name){ setOwner(owner); @@ -35,7 +33,7 @@ public class SQLPropertyExpr extends SQLExprImpl implements SQLName { public SQLPropertyExpr(){ } - + public String getSimleName() { return name; } @@ -50,7 +48,7 @@ public class SQLPropertyExpr extends SQLExprImpl implements SQLName { } this.owner = owner; } - + public String getName() { return this.name; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSomeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSomeExpr.java index 740b5a1f40..94649332fd 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSomeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSomeExpr.java @@ -21,8 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSomeExpr extends SQLExprImpl { - private static final long serialVersionUID = 1L; - public SQLSelect subQuery; + public SQLSelect subQuery; public SQLSomeExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTextLiteralExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTextLiteralExpr.java index 8b4bed1044..aaba09011b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTextLiteralExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTextLiteralExpr.java @@ -19,9 +19,7 @@ import com.alibaba.druid.sql.ast.SQLExprImpl; public abstract class SQLTextLiteralExpr extends SQLExprImpl implements SQLLiteralExpr { - private static final long serialVersionUID = 1L; - - protected String text; + protected String text; public SQLTextLiteralExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLVariantRefExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLVariantRefExpr.java index cf0b8e7481..8114e0e96d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLVariantRefExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLVariantRefExpr.java @@ -20,13 +20,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLVariantRefExpr extends SQLExprImpl { - private static final long serialVersionUID = 1L; + private String name; - private String name; + private boolean global = false; - private boolean global = false; - - private int index = -1; + private int index = -1; public SQLVariantRefExpr(String name){ this.name = name; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/NotNullConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/NotNullConstraint.java index b1d33b9f32..7f34d64301 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/NotNullConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/NotNullConstraint.java @@ -17,7 +17,6 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -@SuppressWarnings("serial") public class NotNullConstraint extends SQLConstaintImpl implements SQLColumnConstraint { public NotNullConstraint(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddColumn.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddColumn.java index e3082bc884..5f3075b517 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddColumn.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddColumn.java @@ -23,9 +23,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableAddColumn extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - - private List columns = new ArrayList(); + private List columns = new ArrayList(); @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddForeignKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddForeignKey.java index ce3c438c94..1567b64c4f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddForeignKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddForeignKey.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableAddForeignKey extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; private SQLForeignKeyConstraint foreignKey; - - public SQLAlterTableAddForeignKey() { - + + public SQLAlterTableAddForeignKey(){ + } - - public SQLAlterTableAddForeignKey(SQLForeignKeyConstraint foreignKey) { + + public SQLAlterTableAddForeignKey(SQLForeignKeyConstraint foreignKey){ this.foreignKey = foreignKey; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddIndex.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddIndex.java index 3d07f92617..f3253d8a54 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddIndex.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddIndex.java @@ -24,11 +24,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableAddIndex extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - private SQLName name; - private List items = new ArrayList(); + private List items = new ArrayList(); private String type; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddPrimaryKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddPrimaryKey.java index ca77487235..8ee80fbee2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddPrimaryKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddPrimaryKey.java @@ -20,8 +20,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableAddPrimaryKey extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - private SQLPrimaryKey primaryKey; + private SQLPrimaryKey primaryKey; public SQLPrimaryKey getPrimaryKey() { return primaryKey; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterColumn.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterColumn.java index a2c2de7ab9..3d5a5d7a14 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterColumn.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterColumn.java @@ -21,8 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableAlterColumn extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - private SQLColumnDefinition column; @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableConstraint.java index ecf8e214b8..3b6c8768be 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableConstraint.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDisableConstraint extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - - private SQLName constraintName; + private SQLName constraintName; @Override protected void accept0(SQLASTVisitor visitor) { @@ -33,15 +31,12 @@ public class SQLAlterTableDisableConstraint extends SQLObjectImpl implements SQL visitor.endVisit(this); } - public SQLName getConstraintName() { return constraintName; } - public void setConstraintName(SQLName constraintName) { this.constraintName = constraintName; } - } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableKeys.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableKeys.java index d526e09368..1a649e4cdb 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableKeys.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableKeys.java @@ -20,8 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDisableKeys extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - @Override protected void accept0(SQLASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropColumnItem.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropColumnItem.java index 22ad99112a..6cc4e87010 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropColumnItem.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropColumnItem.java @@ -24,8 +24,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDropColumnItem extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - private List columns = new ArrayList(); + private List columns = new ArrayList(); public SQLAlterTableDropColumnItem(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropConstraint.java index e5d259627c..0d7a91ed3e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropConstraint.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDropConstraint extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - - private SQLName constraintName; + private SQLName constraintName; @Override protected void accept0(SQLASTVisitor visitor) { @@ -33,15 +31,12 @@ public class SQLAlterTableDropConstraint extends SQLObjectImpl implements SQLAlt visitor.endVisit(this); } - public SQLName getConstraintName() { return constraintName; } - public void setConstraintName(SQLName constraintName) { this.constraintName = constraintName; } - } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeinKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeinKey.java index cc2603d069..c422b6b3aa 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeinKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeinKey.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDropForeinKey extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - - private SQLName indexName; + private SQLName indexName; public SQLName getIndexName() { return indexName; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropIndex.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropIndex.java index 2596dcf9bd..ff8db4c4f2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropIndex.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropIndex.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDropIndex extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - - private SQLName indexName; + private SQLName indexName; public SQLName getIndexName() { return indexName; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropPrimaryKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropPrimaryKey.java index 3c5617c17a..5e93b530ef 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropPrimaryKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropPrimaryKey.java @@ -20,8 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDropPrimaryKey extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - @Override protected void accept0(SQLASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableConstraint.java index 232abcb030..bc6e6eaac9 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableConstraint.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableEnableConstraint extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - - private SQLName constraintName; + private SQLName constraintName; @Override protected void accept0(SQLASTVisitor visitor) { @@ -33,15 +31,12 @@ public class SQLAlterTableEnableConstraint extends SQLObjectImpl implements SQLA visitor.endVisit(this); } - public SQLName getConstraintName() { return constraintName; } - public void setConstraintName(SQLName constraintName) { this.constraintName = constraintName; } - } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableKeys.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableKeys.java index af73924f05..54ac6e7ee2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableKeys.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableKeys.java @@ -20,8 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableEnableKeys extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - @Override protected void accept0(SQLASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRenameColumn.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRenameColumn.java index b73361dfb0..da635f5df8 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRenameColumn.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRenameColumn.java @@ -21,9 +21,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableRenameColumn extends SQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - private SQLName column; - private SQLName to; + private SQLName column; + private SQLName to; public SQLAlterTableRenameColumn(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableStatement.java index eb159a7b8c..dc87c8a4b1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableStatement.java @@ -24,10 +24,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableStatement extends SQLStatementImpl implements SQLDDLStatement { - private static final long serialVersionUID = 1L; - private SQLExprTableSource tableSource; - private List items = new ArrayList(); + private List items = new ArrayList(); public List getItems() { return items; @@ -55,7 +53,7 @@ public class SQLAlterTableStatement extends SQLStatementImpl implements SQLDDLSt public void setName(SQLName name) { this.setTableSource(new SQLExprTableSource(name)); } - + @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAssignItem.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAssignItem.java index 85b24d0b08..0ab238abf2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAssignItem.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAssignItem.java @@ -21,10 +21,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAssignItem extends SQLObjectImpl { - private static final long serialVersionUID = 1L; - - private SQLExpr target; - private SQLExpr value; + private SQLExpr target; + private SQLExpr value; public SQLAssignItem(){ } @@ -65,4 +63,4 @@ public class SQLAssignItem extends SQLObjectImpl { visitor.endVisit(this); } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCallStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCallStatement.java index cf22a16cd1..5d59620f1e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCallStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCallStatement.java @@ -25,11 +25,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCallStatement extends SQLStatementImpl { - private static final long serialVersionUID = 1L; - private SQLName procedureName; - private final List parameters = new ArrayList(); + private final List parameters = new ArrayList(); public SQLName getProcedureName() { return procedureName; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharactorDataType.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharactorDataType.java index 539a1aed3d..c02e8a126b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharactorDataType.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharactorDataType.java @@ -18,7 +18,6 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLDataTypeImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -@SuppressWarnings("serial") public class SQLCharactorDataType extends SQLDataTypeImpl { private String charSetName; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java index 6d16a5b991..4f28a6b100 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java @@ -20,15 +20,13 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCheck extends SQLConstaintImpl implements SQLTableElement { - private static final long serialVersionUID = 1L; + private SQLExpr expr; + + public SQLCheck(){ - private SQLExpr expr; - - public SQLCheck() { - } - - public SQLCheck(SQLExpr expr) { + + public SQLCheck(SQLExpr expr){ this.setExpr(expr); } @@ -52,5 +50,4 @@ public class SQLCheck extends SQLConstaintImpl implements SQLTableElement { visitor.endVisit(this); } - } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnCheck.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnCheck.java index ab5ece0c4f..082040079d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnCheck.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnCheck.java @@ -20,22 +20,20 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLColumnCheck extends SQLConstaintImpl implements SQLColumnConstraint { - private static final long serialVersionUID = 1L; - private SQLExpr expr; - - public SQLColumnCheck() { - + + public SQLColumnCheck(){ + } - - public SQLColumnCheck(SQLExpr expr) { + + public SQLColumnCheck(SQLExpr expr){ this.setExpr(expr); } - + public SQLExpr getExpr() { return expr; } - + public void setExpr(SQLExpr expr) { if (expr != null) { expr.setParent(this); @@ -43,7 +41,6 @@ public class SQLColumnCheck extends SQLConstaintImpl implements SQLColumnConstra this.expr = expr; } - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java index e508238337..9e355d76bb 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -@SuppressWarnings("serial") public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElement { protected SQLName name; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnPrimaryKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnPrimaryKey.java index 1379bcc78d..c4704eb3fe 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnPrimaryKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnPrimaryKey.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLColumnPrimaryKey extends SQLConstaintImpl implements SQLColumnConstraint { - private static final long serialVersionUID = 1L; - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCommentStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCommentStatement.java index 8deca13596..ed8eaf8547 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCommentStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCommentStatement.java @@ -22,8 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCommentStatement extends SQLObjectImpl implements SQLStatement { - private static final long serialVersionUID = 1L; - public static enum Type { TABLE, COLUMN } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstaintImpl.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstaintImpl.java index 537f59d590..8101565ea4 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstaintImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstaintImpl.java @@ -18,7 +18,6 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObjectImpl; -@SuppressWarnings("serial") public abstract class SQLConstaintImpl extends SQLObjectImpl implements SQLConstaint { private SQLName name; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateDatabaseStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateDatabaseStatement.java index af5ce5542d..2041161358 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateDatabaseStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateDatabaseStatement.java @@ -21,16 +21,14 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCreateDatabaseStatement extends SQLStatementImpl { - private static final long serialVersionUID = 1L; + private SQLName name; - private SQLName name; - - private String characterSet; - private String collate; + private String characterSet; + private String collate; public SQLCreateDatabaseStatement(){ } - + @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateIndexStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateIndexStatement.java index 4499ded86a..528d8a900b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateIndexStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateIndexStatement.java @@ -24,16 +24,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCreateIndexStatement extends SQLStatementImpl implements SQLDDLStatement { - /** - * - */ - private static final long serialVersionUID = 1L; - private SQLName name; private SQLTableSource table; - private List items = new ArrayList(); + private List items = new ArrayList(); private String type; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java index 6f87eb3353..8bfadbe879 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -@SuppressWarnings("serial") public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLStatement { protected Type type; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateViewStatement.java index b363021e90..e690faa82b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateViewStatement.java @@ -25,12 +25,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCreateViewStatement extends SQLStatementImpl implements SQLDDLStatement { - private static final long serialVersionUID = 1L; - private boolean orReplace = false; + private boolean orReplace = false; protected SQLName name; protected SQLSelect subQuery; - protected final List columns = new ArrayList(); + protected final List columns = new ArrayList(); private Level with; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java index 330f524444..83c8b59e85 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java @@ -23,9 +23,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLDeleteStatement extends SQLStatementImpl { - private static final long serialVersionUID = 1L; - protected SQLTableSource tableSource; - protected SQLExpr where; + protected SQLTableSource tableSource; + protected SQLExpr where; public SQLDeleteStatement(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropIndexStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropIndexStatement.java index 01dcd91c4f..870fa3d3d1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropIndexStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropIndexStatement.java @@ -21,8 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLDropIndexStatement extends SQLStatementImpl implements SQLDDLStatement { - private static final long serialVersionUID = 1L; - private SQLExpr indexName; private SQLExprTableSource tableName; @@ -41,7 +39,7 @@ public class SQLDropIndexStatement extends SQLStatementImpl implements SQLDDLSta public void setTableName(SQLExpr tableName) { this.setTableName(new SQLExprTableSource(tableName)); } - + public void setTableName(SQLExprTableSource tableName) { this.tableName = tableName; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableStatement.java index 1916a97723..fc20cfce7f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableStatement.java @@ -24,9 +24,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLDropTableStatement extends SQLStatementImpl implements SQLDDLStatement { - private static final long serialVersionUID = 1L; - - protected List tableSources = new ArrayList(); + protected List tableSources = new ArrayList(); public SQLDropTableStatement(){ @@ -51,11 +49,11 @@ public class SQLDropTableStatement extends SQLStatementImpl implements SQLDDLSta public void setName(SQLName name) { this.addTableSource(new SQLExprTableSource(name)); } - + public void addTableSource(SQLName name) { this.addTableSource(new SQLExprTableSource(name)); } - + public void addTableSource(SQLExprTableSource tableSource) { tableSources.add(tableSource); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropViewStatement.java index 2c740c565f..eeb2247eed 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropViewStatement.java @@ -24,9 +24,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLDropViewStatement extends SQLStatementImpl implements SQLDDLStatement { - private static final long serialVersionUID = 1L; - - protected List tableSources = new ArrayList(); + protected List tableSources = new ArrayList(); public SQLDropViewStatement(){ @@ -51,11 +49,11 @@ public class SQLDropViewStatement extends SQLStatementImpl implements SQLDDLStat public void setName(SQLName name) { this.addTableSource(new SQLExprTableSource(name)); } - + public void addTableSource(SQLName name) { this.addTableSource(new SQLExprTableSource(name)); } - + public void addTableSource(SQLExprTableSource tableSource) { tableSources.add(tableSource); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprHint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprHint.java index 4fa94d4a05..b0ca3a810c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprHint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprHint.java @@ -20,28 +20,27 @@ import com.alibaba.druid.sql.ast.SQLHint; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; - -@SuppressWarnings("serial") public class SQLExprHint extends SQLObjectImpl implements SQLHint { + private SQLExpr expr; - - public SQLExprHint() { - + + public SQLExprHint(){ + } - - public SQLExprHint(SQLExpr expr) { + + public SQLExprHint(SQLExpr expr){ this.setExpr(expr); } public SQLExpr getExpr() { return expr; } - + public void setExpr(SQLExpr expr) { if (expr != null) { expr.setParent(this); } - + this.expr = expr; } @@ -52,6 +51,5 @@ public class SQLExprHint extends SQLObjectImpl implements SQLHint { } visitor.endVisit(this); } - - + } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprTableSource.java index a8c3e7b4dd..eb0cbb76ad 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprTableSource.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLExprTableSource extends SQLTableSourceImpl { - private static final long serialVersionUID = 1L; - - protected SQLExpr expr; + protected SQLExpr expr; public SQLExprTableSource(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyImpl.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyImpl.java index 73db9f4b5d..76392918c3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyImpl.java @@ -22,10 +22,9 @@ import com.alibaba.druid.sql.ast.SQLName; public abstract class SQLForeignKeyImpl extends SQLConstaintImpl implements SQLForeignKeyConstraint { - private static final long serialVersionUID = 1L; - private SQLName referencedTableName; - private List referencingColumns = new ArrayList(); - private List referencedColumns = new ArrayList(); + private SQLName referencedTableName; + private List referencingColumns = new ArrayList(); + private List referencedColumns = new ArrayList(); @Override public List getReferencingColumns() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java index 6396ae3985..7f573bf2e7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.ast.statement.SQLInsertStatement.ValuesClause; public abstract class SQLInsertInto extends SQLObjectImpl { - private static final long serialVersionUID = 1L; protected SQLExprTableSource tableSource; - protected final List columns = new ArrayList(); + protected final List columns = new ArrayList(); protected ValuesClause values; protected SQLSelect query; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java index b22782d7cc..fc4ed2d06a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java @@ -25,8 +25,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLInsertStatement extends SQLInsertInto implements SQLStatement { - private static final long serialVersionUID = 1L; - public SQLInsertStatement(){ } @@ -45,7 +43,6 @@ public class SQLInsertStatement extends SQLInsertInto implements SQLStatement { public static class ValuesClause extends SQLObjectImpl { - private static final long serialVersionUID = 1L; private final List values; public ValuesClause(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java index 1af33c8274..19581e46f9 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java @@ -23,13 +23,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLJoinTableSource extends SQLTableSourceImpl { - private static final long serialVersionUID = 1L; - protected SQLTableSource left; protected JoinType joinType; protected SQLTableSource right; protected SQLExpr condition; - protected final List using = new ArrayList(); + protected final List using = new ArrayList(); public SQLJoinTableSource(String alias){ super(alias); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrimaryKeyImpl.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrimaryKeyImpl.java index 5784a6e08c..5d1fae6444 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrimaryKeyImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrimaryKeyImpl.java @@ -17,7 +17,6 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -@SuppressWarnings("serial") public class SQLPrimaryKeyImpl extends SQLUnique implements SQLPrimaryKey { @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReleaseSavePointStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReleaseSavePointStatement.java index a1ba1fba39..cc32aec00f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReleaseSavePointStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReleaseSavePointStatement.java @@ -21,8 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLReleaseSavePointStatement extends SQLStatementImpl { - private static final long serialVersionUID = 1L; - private SQLExpr name; + private SQLExpr name; public SQLExpr getName() { return name; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRollbackStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRollbackStatement.java index f212f911af..a805ab345f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRollbackStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRollbackStatement.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLRollbackStatement extends SQLStatementImpl { - private static final long serialVersionUID = 1L; - - private SQLName to; + private SQLName to; @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSavePointStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSavePointStatement.java index 67d11b1afd..c20412f354 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSavePointStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSavePointStatement.java @@ -21,8 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSavePointStatement extends SQLStatementImpl { - private static final long serialVersionUID = 1L; - private SQLExpr name; + private SQLExpr name; public SQLExpr getName() { return name; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java index 2239f68af9..6d221203d5 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java @@ -21,8 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSelect extends SQLObjectImpl { - private static final long serialVersionUID = 1L; - protected SQLWithSubqueryClause withSubQuery; protected SQLSelectQuery query; protected SQLOrderBy orderBy; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectGroupByClause.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectGroupByClause.java index be94c356b8..5836b52bf3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectGroupByClause.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectGroupByClause.java @@ -24,9 +24,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSelectGroupByClause extends SQLObjectImpl { - private static final long serialVersionUID = 1L; - - private final List items = new ArrayList(); + private final List items = new ArrayList(); private SQLExpr having; public SQLSelectGroupByClause(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectItem.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectItem.java index fe740dc152..cc0b916f11 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectItem.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectItem.java @@ -21,10 +21,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSelectItem extends SQLObjectImpl { - private static final long serialVersionUID = 1L; - - private SQLExpr expr; - private String alias; + private SQLExpr expr; + private String alias; public SQLSelectItem(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectOrderByItem.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectOrderByItem.java index a566b95bac..622bc800ce 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectOrderByItem.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectOrderByItem.java @@ -22,8 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSelectOrderByItem extends SQLObjectImpl { - private static final long serialVersionUID = 1L; - protected SQLExpr expr; protected String collate; protected SQLOrderingSpecification type; @@ -31,7 +29,7 @@ public class SQLSelectOrderByItem extends SQLObjectImpl { public SQLSelectOrderByItem(){ } - + public SQLSelectOrderByItem(SQLExpr expr){ this.setExpr(expr); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQuery.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQuery.java index 539e6e4c3f..8ccb07204d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQuery.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQuery.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.ast.SQLObjectImpl; public abstract class SQLSelectQuery extends SQLObjectImpl { - private static final long serialVersionUID = 1L; - public SQLSelectQuery(){ } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java index 5be303709b..28fef86cf1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java @@ -23,10 +23,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSelectQueryBlock extends SQLSelectQuery { - private static final long serialVersionUID = 1L; - protected int distionOption; - protected final List selectList = new ArrayList(); + protected final List selectList = new ArrayList(); protected SQLTableSource from; protected SQLExprTableSource into; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectStatement.java index 2541d9acdf..720f54cba5 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSelectStatement extends SQLStatementImpl { - private static final long serialVersionUID = 1L; - - protected SQLSelect select; + protected SQLSelect select; public SQLSelectStatement(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSetStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSetStatement.java index ee62b153b6..2f7074c2ec 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSetStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSetStatement.java @@ -24,14 +24,12 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSetStatement extends SQLStatementImpl { - private static final long serialVersionUID = 1L; - - private List items = new ArrayList(); + private List items = new ArrayList(); public SQLSetStatement(){ } - - public SQLSetStatement(SQLExpr target, SQLExpr value) { + + public SQLSetStatement(SQLExpr target, SQLExpr value){ this.items.add(new SQLAssignItem(target, value)); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubqueryTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubqueryTableSource.java index f0198e56de..022165c97b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubqueryTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubqueryTableSource.java @@ -19,9 +19,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSubqueryTableSource extends SQLTableSourceImpl { - private static final long serialVersionUID = 1L; - - protected SQLSelect select; + protected SQLSelect select; public SQLSubqueryTableSource(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSourceImpl.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSourceImpl.java index 70844c3707..b7d46d4813 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSourceImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSourceImpl.java @@ -23,11 +23,9 @@ import com.alibaba.druid.sql.ast.SQLObjectImpl; public abstract class SQLTableSourceImpl extends SQLObjectImpl implements SQLTableSource { - private static final long serialVersionUID = 1L; + protected String alias; - protected String alias; - - protected List hints; + protected List hints; public SQLTableSourceImpl(){ @@ -45,12 +43,12 @@ public abstract class SQLTableSourceImpl extends SQLObjectImpl implements SQLTab public void setAlias(String alias) { this.alias = alias; } - + public int getHintsSize() { if (hints == null) { return 0; } - + return hints.size(); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTruncateStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTruncateStatement.java index 2ba1b69b61..727dc89a42 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTruncateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTruncateStatement.java @@ -24,8 +24,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLTruncateStatement extends SQLStatementImpl { - private static final long serialVersionUID = 1L; - protected List tableSources = new ArrayList(2); + protected List tableSources = new ArrayList(2); public List getTableSources() { return tableSources; @@ -34,7 +33,7 @@ public class SQLTruncateStatement extends SQLStatementImpl { public void setTableSources(List tableSources) { this.tableSources = tableSources; } - + public void addTableSource(SQLName name) { SQLExprTableSource tableSource = new SQLExprTableSource(name); tableSource.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java index a7295d311e..86e32c6a45 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java @@ -20,12 +20,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLUnionQuery extends SQLSelectQuery { - private static final long serialVersionUID = 1L; - - private SQLSelectQuery left; - private SQLSelectQuery right; - private SQLUnionOperator operator = SQLUnionOperator.UNION; - private SQLOrderBy orderBy; + private SQLSelectQuery left; + private SQLSelectQuery right; + private SQLUnionOperator operator = SQLUnionOperator.UNION; + private SQLOrderBy orderBy; public SQLUnionOperator getOperator() { return operator; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnique.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnique.java index 305742af84..aaef227906 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnique.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnique.java @@ -21,7 +21,6 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -@SuppressWarnings("serial") public class SQLUnique extends SQLConstaintImpl implements SQLUniqueConstraint, SQLTableElement { private final List columns = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateSetItem.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateSetItem.java index a790976c06..01daddaefb 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateSetItem.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateSetItem.java @@ -21,10 +21,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLUpdateSetItem extends SQLObjectImpl { - private static final long serialVersionUID = 1L; - - private SQLExpr column; - private SQLExpr value; + private SQLExpr column; + private SQLExpr value; public SQLUpdateSetItem(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatement.java index 8590529c23..472de95dbe 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatement.java @@ -25,9 +25,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLUpdateStatement extends SQLStatementImpl { - private static final long serialVersionUID = 1L; - - protected final List items = new ArrayList(); + protected final List items = new ArrayList(); protected SQLExpr where; protected SQLTableSource tableSource; @@ -39,7 +37,7 @@ public class SQLUpdateStatement extends SQLStatementImpl { public SQLTableSource getTableSource() { return tableSource; } - + public void setTableSource(SQLExpr expr) { this.setTableSource(new SQLExprTableSource(expr)); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUseStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUseStatement.java index f2ca1e3f37..fa9527a69e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUseStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUseStatement.java @@ -22,8 +22,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLUseStatement extends SQLStatementImpl implements SQLStatement { - private static final long serialVersionUID = 1L; - private SQLName database; + private SQLName database; public SQLName getDatabase() { return database; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWithSubqueryClause.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWithSubqueryClause.java index b198529845..610afdecb7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWithSubqueryClause.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWithSubqueryClause.java @@ -25,10 +25,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLWithSubqueryClause extends SQLObjectImpl { - private static final long serialVersionUID = 1L; - private Boolean recursive; - private final List entries = new ArrayList(); + private final List entries = new ArrayList(); public List getEntries() { return entries; @@ -52,10 +50,9 @@ public class SQLWithSubqueryClause extends SQLObjectImpl { public static class Entry extends SQLObjectImpl { - private static final long serialVersionUID = 1L; protected SQLIdentifierExpr name; - protected final List columns = new ArrayList(); - protected SQLSelect subQuery; + protected final List columns = new ArrayList(); + protected SQLSelect subQuery; @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2SelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2SelectQueryBlock.java index cdcab5d47b..94b4978589 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2SelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2SelectQueryBlock.java @@ -23,9 +23,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class DB2SelectQueryBlock extends SQLSelectQueryBlock implements DB2Object { - private SQLExpr first; - - private static final long serialVersionUID = 1L; + private SQLExpr first; public SQLExpr getFirst() { return first; @@ -34,8 +32,7 @@ public class DB2SelectQueryBlock extends SQLSelectQueryBlock implements DB2Objec public void setFirst(SQLExpr first) { this.first = first; } - - + @Override protected void accept0(SQLASTVisitor visitor) { if (visitor instanceof DB2ASTVisitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlForceIndexHint.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlForceIndexHint.java index 38fcc8681f..1f5de2b189 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlForceIndexHint.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlForceIndexHint.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlForceIndexHint extends MySqlIndexHintImpl { - private static final long serialVersionUID = 1L; - @Override public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlForeignKey.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlForeignKey.java index 1250d1b158..57939bc5fb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlForeignKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlForeignKey.java @@ -23,8 +23,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlForeignKey extends SQLForeignKeyImpl implements SQLForeignKeyConstraint, SQLTableElement { - private static final long serialVersionUID = 1L; - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor instanceof MySqlASTVisitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlIgnoreIndexHint.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlIgnoreIndexHint.java index 82f8551891..ee053ba2ec 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlIgnoreIndexHint.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlIgnoreIndexHint.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlIgnoreIndexHint extends MySqlIndexHintImpl { - private static final long serialVersionUID = 1L; - @Override public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlIndexHintImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlIndexHintImpl.java index 7b3e5f3c74..32694caf93 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlIndexHintImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlIndexHintImpl.java @@ -23,11 +23,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public abstract class MySqlIndexHintImpl extends MySqlObjectImpl implements MySqlIndexHint { - private static final long serialVersionUID = 1L; - private MySqlIndexHint.Option option; - private List indexList = new ArrayList(); + private List indexList = new ArrayList(); @Override public abstract void accept0(MySqlASTVisitor visitor); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlKey.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlKey.java index ab589d8f6b..266e01e3c5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlKey.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.statement.SQLUniqueConstraint; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -@SuppressWarnings("serial") public class MySqlKey extends SQLUnique implements SQLUniqueConstraint, SQLTableConstaint { private String indexType; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlObjectImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlObjectImpl.java index bb8bc29121..322f5c7c69 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlObjectImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlObjectImpl.java @@ -21,8 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class MySqlObjectImpl extends SQLObjectImpl implements MySqlObject { - private static final long serialVersionUID = 1L; - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor instanceof MySqlASTVisitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlPrimaryKey.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlPrimaryKey.java index bb93a39fc6..5b75c9fbb5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlPrimaryKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlPrimaryKey.java @@ -18,7 +18,6 @@ package com.alibaba.druid.sql.dialect.mysql.ast; import com.alibaba.druid.sql.ast.statement.SQLPrimaryKey; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; -@SuppressWarnings("serial") public class MySqlPrimaryKey extends MySqlKey implements SQLPrimaryKey { public MySqlPrimaryKey(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlUnique.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlUnique.java index cb80911516..8cc7f7cc58 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlUnique.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlUnique.java @@ -18,7 +18,6 @@ package com.alibaba.druid.sql.dialect.mysql.ast; import com.alibaba.druid.sql.ast.statement.SQLPrimaryKey; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; -@SuppressWarnings("serial") public class MySqlUnique extends MySqlKey implements SQLPrimaryKey { public MySqlUnique(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlUseIndexHint.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlUseIndexHint.java index 9a4eeaf6cf..7da8bbbd29 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlUseIndexHint.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlUseIndexHint.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlUseIndexHint extends MySqlIndexHintImpl { - private static final long serialVersionUID = 1L; - @Override public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBinaryExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBinaryExpr.java index 6b848ca81a..11ac5046f2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBinaryExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBinaryExpr.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlBinaryExpr extends MySqlExprImpl implements MySqlExpr, SQLLiteralExpr { - private static final long serialVersionUID = 1L; - - private String value; + private String value; public MySqlBinaryExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java index 654b35ec47..ba26add238 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlBooleanExpr extends MySqlExprImpl implements MySqlExpr, SQLLiteralExpr { - private static final long serialVersionUID = 1L; - - private boolean value; + private boolean value; public MySqlBooleanExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlCharExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlCharExpr.java index 832eda9e59..29ebe4ef63 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlCharExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlCharExpr.java @@ -21,10 +21,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlCharExpr extends SQLCharExpr implements MySqlExpr { - private static final long serialVersionUID = 1L; - - private String charset; - private String collate; + private String charset; + private String collate; public MySqlCharExpr(){ @@ -63,7 +61,7 @@ public class MySqlCharExpr extends SQLCharExpr implements MySqlExpr { buf.append(collate); } } - + @Override protected void accept0(SQLASTVisitor visitor) { if (visitor instanceof MySqlASTVisitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlExprImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlExprImpl.java index 915b7e1d68..ab3a2948ff 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlExprImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlExprImpl.java @@ -20,6 +20,4 @@ import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl; public abstract class MySqlExprImpl extends MySqlObjectImpl implements SQLExpr { - private static final long serialVersionUID = 1L; - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlExtractExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlExtractExpr.java index a04e37407f..0c59ac6945 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlExtractExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlExtractExpr.java @@ -22,8 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlExtractExpr extends SQLExprImpl implements MySqlExpr { - private static final long serialVersionUID = 1L; - private SQLExpr value; private MySqlIntervalUnit unit; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlIntervalExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlIntervalExpr.java index 282f92d183..0702d9396e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlIntervalExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlIntervalExpr.java @@ -22,8 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlIntervalExpr extends SQLExprImpl implements MySqlExpr { - private static final long serialVersionUID = 1L; - private SQLExpr value; private MySqlIntervalUnit unit; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlMatchAgainstExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlMatchAgainstExpr.java index 7034de7b8a..58ca72e758 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlMatchAgainstExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlMatchAgainstExpr.java @@ -25,13 +25,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlMatchAgainstExpr extends SQLExprImpl implements MySqlExpr { - private static final long serialVersionUID = 1L; + private List columns = new ArrayList(); - private List columns = new ArrayList(); + private SQLExpr against; - private SQLExpr against; - - private SearchModifier searchModifier; + private SearchModifier searchModifier; public List getColumns() { return columns; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlOutFileExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlOutFileExpr.java index 2c637a024c..5a46bcbd90 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlOutFileExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlOutFileExpr.java @@ -22,19 +22,18 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlOutFileExpr extends MySqlObjectImpl implements SQLExpr { - private static final long serialVersionUID = 1L; - private SQLExpr file; - private String charset; + private SQLExpr file; + private String charset; - private SQLLiteralExpr columnsTerminatedBy; - private boolean columnsEnclosedOptionally = false; - private SQLLiteralExpr columnsEnclosedBy; - private SQLLiteralExpr columnsEscaped; + private SQLLiteralExpr columnsTerminatedBy; + private boolean columnsEnclosedOptionally = false; + private SQLLiteralExpr columnsEnclosedBy; + private SQLLiteralExpr columnsEscaped; - private SQLLiteralExpr linesStartingBy; - private SQLLiteralExpr linesTerminatedBy; + private SQLLiteralExpr linesStartingBy; + private SQLLiteralExpr linesTerminatedBy; - private SQLExpr ignoreLinesNumber; + private SQLExpr ignoreLinesNumber; public MySqlOutFileExpr(){ } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlUserName.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlUserName.java index 5b248b7084..2884903ac7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlUserName.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlUserName.java @@ -20,9 +20,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlUserName extends MySqlExprImpl implements SQLName { - private static final long serialVersionUID = 1L; - private String userName; - private String host; + private String userName; + private String host; public String getUserName() { return userName; @@ -49,7 +48,7 @@ public class MySqlUserName extends MySqlExprImpl implements SQLName { public String getSimleName() { return userName + '@' + host; } - + public String toString() { return getSimleName(); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/CobarShowStatus.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/CobarShowStatus.java index fb30b67b43..2c28b6e5a2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/CobarShowStatus.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/CobarShowStatus.java @@ -19,11 +19,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class CobarShowStatus extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); - + visitor.endVisit(this); } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAddColumn.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAddColumn.java index d191bc9411..9887c44dd4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAddColumn.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAddColumn.java @@ -23,12 +23,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlAlterTableAddColumn extends SQLAlterTableAddColumn implements MySqlObject { - private static final long serialVersionUID = 1L; + private SQLName firstColumn; + private SQLName afterColumn; - private SQLName firstColumn; - private SQLName afterColumn; - - private boolean first; + private boolean first; public SQLName getFirstColumn() { return firstColumn; @@ -66,7 +64,7 @@ public class MySqlAlterTableAddColumn extends SQLAlterTableAddColumn implements public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, getColumns()); - + acceptChild(visitor, firstColumn); acceptChild(visitor, afterColumn); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAddIndex.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAddIndex.java index 62beaae87c..4825a7c321 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAddIndex.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAddIndex.java @@ -23,9 +23,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlAlterTableAddIndex extends SQLAlterTableAddIndex implements SQLAlterTableItem, MySqlObject { - private static final long serialVersionUID = 1L; - - private String using; + private String using; public String getUsing() { return using; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAddUnique.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAddUnique.java index 0354e5e25a..7cfcf253a7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAddUnique.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAddUnique.java @@ -23,9 +23,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlAlterTableAddUnique extends SQLAlterTableAddIndex implements SQLAlterTableItem, MySqlObject { - private static final long serialVersionUID = 1L; - - private String using; + private String using; public String getUsing() { return using; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableChangeColumn.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableChangeColumn.java index 55fafc03f4..7fd3a22ba0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableChangeColumn.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableChangeColumn.java @@ -24,8 +24,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlAlterTableChangeColumn extends MySqlObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - private SQLName columnName; private SQLColumnDefinition newColumnDefinition; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableCharacter.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableCharacter.java index aafb4150be..78ef3de378 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableCharacter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableCharacter.java @@ -22,10 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlAlterTableCharacter extends MySqlObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - - private SQLExpr characterSet; - private SQLExpr collate; + private SQLExpr characterSet; + private SQLExpr collate; @Override public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableDiscardTablespace.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableDiscardTablespace.java index f8c5d2dc6e..36e6e014ba 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableDiscardTablespace.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableDiscardTablespace.java @@ -23,8 +23,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlAlterTableDiscardTablespace extends SQLAlterTableAddIndex implements SQLAlterTableItem, MySqlObject { - private static final long serialVersionUID = 1L; - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor instanceof MySqlASTVisitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableImportTablespace.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableImportTablespace.java index 6eaa054983..f3e86fa764 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableImportTablespace.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableImportTablespace.java @@ -23,8 +23,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlAlterTableImportTablespace extends SQLAlterTableAddIndex implements SQLAlterTableItem, MySqlObject { - private static final long serialVersionUID = 1L; - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor instanceof MySqlASTVisitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableModifyColumn.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableModifyColumn.java index 25044436e7..be91fb6dc9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableModifyColumn.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableModifyColumn.java @@ -23,9 +23,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlAlterTableModifyColumn extends MySqlObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - - private SQLColumnDefinition newColumnDefinition; private boolean first; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableOption.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableOption.java index 4ab8be82ec..fb7d39a79b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableOption.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableOption.java @@ -21,10 +21,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlAlterTableOption extends MySqlObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - - private String name; - private Object value; + private String name; + private Object value; public MySqlAlterTableOption(String name, Object value){ this.name = name; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableStatement.java index a37543edac..0a71410f8b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableStatement.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlAlterTableStatement extends SQLAlterTableStatement { - private static final long serialVersionUID = 1L; - - private boolean ignore = false; + private boolean ignore = false; @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlBinlogStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlBinlogStatement.java index 52a54fa530..c1555222af 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlBinlogStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlBinlogStatement.java @@ -19,22 +19,21 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlBinlogStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - private SQLExpr expr; + private SQLExpr expr; - public SQLExpr getExpr() { - return expr; - } + public SQLExpr getExpr() { + return expr; + } - public void setExpr(SQLExpr expr) { - this.expr = expr; - } + public void setExpr(SQLExpr expr) { + this.expr = expr; + } - public void accept0(MySqlASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, expr); - } - visitor.endVisit(this); - } + public void accept0(MySqlASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, expr); + } + visitor.endVisit(this); + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCommitStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCommitStatement.java index e142560b0e..fc8aaa1a22 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCommitStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCommitStatement.java @@ -19,12 +19,10 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlCommitStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; + private boolean work = false; - private boolean work = false; - - private Boolean chain; - private Boolean release; + private Boolean chain; + private Boolean release; public Boolean getChain() { return chain; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateIndexStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateIndexStatement.java index 9049e0d848..ba452386cf 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateIndexStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateIndexStatement.java @@ -21,12 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlCreateIndexStatement extends SQLCreateIndexStatement implements MySqlStatement { - /** - * - */ - private static final long serialVersionUID = 1L; - - private String using; + private String using; public String getUsing() { return using; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java index 2dbb45cbd4..7279975dfa 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java @@ -32,25 +32,23 @@ import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -@SuppressWarnings("serial") public class MySqlCreateTableStatement extends SQLCreateTableStatement implements MySqlStatement { - private boolean ifNotExiists = false; + private boolean ifNotExiists = false; - private Map tableOptions = new LinkedHashMap(); + private Map tableOptions = new LinkedHashMap(); - protected SQLSelect query; + protected SQLSelect query; - private SQLPartitioningClause partitioning; + private SQLPartitioningClause partitioning; - private List hints = new ArrayList(); + private List hints = new ArrayList(); - private SQLExprTableSource like; + private SQLExprTableSource like; public MySqlCreateTableStatement(){ } - public SQLExprTableSource getLike() { return like; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateUserStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateUserStatement.java index 34bbd6ef8f..1c92b5ee04 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateUserStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateUserStatement.java @@ -24,9 +24,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlCreateUserStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - - private List users = new ArrayList(2); + private List users = new ArrayList(2); public List getUsers() { return users; @@ -35,7 +33,7 @@ public class MySqlCreateUserStatement extends MySqlStatementImpl { public void setUsers(List users) { this.users = users; } - + @Override public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { @@ -46,11 +44,9 @@ public class MySqlCreateUserStatement extends MySqlStatementImpl { public static class UserSpecification extends MySqlObjectImpl { - private static final long serialVersionUID = 1L; - - private SQLExpr user; - private SQLExpr password; - private SQLExpr authPlugin; + private SQLExpr user; + private SQLExpr password; + private SQLExpr authPlugin; public SQLExpr getUser() { return user; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDeleteStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDeleteStatement.java index 6bd36dc1a7..213617d517 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDeleteStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDeleteStatement.java @@ -25,16 +25,14 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlDeleteStatement extends SQLDeleteStatement { - private static final long serialVersionUID = 1L; + private boolean lowPriority = false; + private boolean quick = false; + private boolean ignore = false; - private boolean lowPriority = false; - private boolean quick = false; - private boolean ignore = false; - - private SQLTableSource from; - private SQLTableSource using; - private SQLOrderBy orderBy; - private Limit limit; + private SQLTableSource from; + private SQLTableSource using; + private SQLOrderBy orderBy; + private Limit limit; public boolean isLowPriority() { return lowPriority; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDescribeStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDescribeStatement.java index 775f34fd95..4ff0490af1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDescribeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDescribeStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlDescribeStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - - private SQLName object; + private SQLName object; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDropTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDropTableStatement.java index 14bcf9bfae..0a45820eda 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDropTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDropTableStatement.java @@ -21,12 +21,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlDropTableStatement extends SQLDropTableStatement implements MySqlStatement { - private static final long serialVersionUID = 1L; - private boolean temporary = false; + private boolean temporary = false; - private boolean ifExists = false; + private boolean ifExists = false; - private String option; + private String option; @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDropUser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDropUser.java index 255ed56235..389472b8ed 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDropUser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDropUser.java @@ -23,9 +23,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlDropUser extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - - private List users = new ArrayList(2); + private List users = new ArrayList(2); public List getUsers() { return users; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDropViewStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDropViewStatement.java index 79bce618d9..4f93eb538e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDropViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDropViewStatement.java @@ -21,11 +21,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlDropViewStatement extends SQLDropViewStatement implements MySqlStatement { - private static final long serialVersionUID = 1L; + private boolean ifExists = false; - private boolean ifExists = false; - - private String option; + private String option; @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExecuteStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExecuteStatement.java index f367984927..ff5eefcd62 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExecuteStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExecuteStatement.java @@ -24,10 +24,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlExecuteStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - private SQLName statementName; - private final List parameters = new ArrayList(); + private final List parameters = new ArrayList(); public SQLName getStatementName() { return statementName; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlHelpStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlHelpStatement.java index f7361c8d55..24d281f52f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlHelpStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlHelpStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlHelpStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - - private SQLExpr content; + private SQLExpr content; public SQLExpr getContent() { return content; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlInsertStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlInsertStatement.java index 45e12af7ed..c4a62dbe3c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlInsertStatement.java @@ -26,8 +26,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlInsertStatement extends SQLInsertStatement { - private static final long serialVersionUID = 1L; - private boolean lowPriority = false; private boolean delayed = false; private boolean highPriority = false; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlKillStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlKillStatement.java index 554f69b574..4befc86e20 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlKillStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlKillStatement.java @@ -19,34 +19,34 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlKillStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - private Type type; - private SQLExpr threadId; - public static enum Type { - CONNECTION, QUERY - } + private Type type; + private SQLExpr threadId; - public Type getType() { - return type; - } + public static enum Type { + CONNECTION, QUERY + } - public void setType(Type type) { - this.type = type; - } + public Type getType() { + return type; + } - public SQLExpr getThreadId() { - return threadId; - } + public void setType(Type type) { + this.type = type; + } - public void setThreadId(SQLExpr threadId) { - this.threadId = threadId; - } + public SQLExpr getThreadId() { + return threadId; + } - public void accept0(MySqlASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, threadId); - } - visitor.endVisit(this); - } + public void setThreadId(SQLExpr threadId) { + this.threadId = threadId; + } + + public void accept0(MySqlASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, threadId); + } + visitor.endVisit(this); + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlLoadDataInFileStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlLoadDataInFileStatement.java index e161b74a54..9e0e36e891 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlLoadDataInFileStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlLoadDataInFileStatement.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlLoadDataInFileStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; private boolean lowPriority = false; private boolean concurrent = false; private boolean local = false; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlLoadXmlStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlLoadXmlStatement.java index 04bbccbd06..882a24dde8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlLoadXmlStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlLoadXmlStatement.java @@ -25,16 +25,14 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlLoadXmlStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - - private boolean lowPriority = false; - private boolean concurrent = false; - private boolean local = false; + private boolean lowPriority = false; + private boolean concurrent = false; + private boolean local = false; private SQLLiteralExpr fileName; - private boolean replicate = false; - private boolean ignore = false; + private boolean replicate = false; + private boolean ignore = false; private SQLName tableName; @@ -44,7 +42,7 @@ public class MySqlLoadXmlStatement extends MySqlStatementImpl { private SQLExpr ignoreLinesNumber; - private final List setList = new ArrayList(); + private final List setList = new ArrayList(); public SQLExpr getRowsIdentifiedBy() { return rowsIdentifiedBy; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlLockTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlLockTableStatement.java index bb1caec537..a0557f23fe 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlLockTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlLockTableStatement.java @@ -21,8 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlLockTableStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - private SQLExprTableSource tableSource; private LockType lockType; @@ -34,7 +32,7 @@ public class MySqlLockTableStatement extends MySqlStatementImpl { public void setTableSource(SQLExprTableSource tableSource) { this.tableSource = tableSource; } - + public void setTableSource(SQLName name) { this.tableSource = new SQLExprTableSource(name); } @@ -46,7 +44,7 @@ public class MySqlLockTableStatement extends MySqlStatementImpl { public void setLockType(LockType lockType) { this.lockType = lockType; } - + public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, tableSource); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByHash.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByHash.java index 6823c77dcb..d2b4d7a131 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByHash.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByHash.java @@ -20,13 +20,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlPartitionByHash extends MySqlPartitioningClause { - private static final long serialVersionUID = 1L; + private SQLExpr expr; - private SQLExpr expr; + private SQLExpr partitionCount; - private SQLExpr partitionCount; - - private boolean linear; + private boolean linear; @Override public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByKey.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByKey.java index 257ae1382e..c577b0be9d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByKey.java @@ -24,13 +24,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlPartitionByKey extends MySqlPartitioningClause { - private static final long serialVersionUID = 1L; + private List columns = new ArrayList(); - private List columns = new ArrayList(); + private SQLExpr partitionCount; - private SQLExpr partitionCount; - - private boolean linear; + private boolean linear; @Override public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByList.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByList.java index 2aff940a4f..31a92f1c3a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByList.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByList.java @@ -24,13 +24,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlPartitionByList extends MySqlPartitioningClause { - private static final long serialVersionUID = 1L; + private SQLExpr expr; - private SQLExpr expr; + private List columns = new ArrayList(); - private List columns = new ArrayList(); - - private SQLExpr partitionCount; + private SQLExpr partitionCount; @Override public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByRange.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByRange.java index 134a36b6d1..7f4c1f6947 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByRange.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitionByRange.java @@ -24,13 +24,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlPartitionByRange extends MySqlPartitioningClause { - private static final long serialVersionUID = 1L; + private SQLExpr expr; - private SQLExpr expr; + private List columns = new ArrayList(); - private List columns = new ArrayList(); - - private SQLExpr partitionCount; + private SQLExpr partitionCount; @Override public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitioningClause.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitioningClause.java index e8d06a10a8..5b00dab04b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitioningClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitioningClause.java @@ -21,7 +21,6 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLPartitioningClause; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl; -@SuppressWarnings("serial") public abstract class MySqlPartitioningClause extends MySqlObjectImpl implements SQLPartitioningClause { private List partitions = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitioningDef.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitioningDef.java index 1d6d3ca9dc..d2a0d84696 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitioningDef.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPartitioningDef.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; -@SuppressWarnings("serial") public class MySqlPartitioningDef extends MySqlObjectImpl { private SQLName name; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPrepareStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPrepareStatement.java index 6a175b4b40..51107b419f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPrepareStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlPrepareStatement.java @@ -21,9 +21,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlPrepareStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - private SQLName name; - private SQLExpr from; + private SQLName name; + private SQLExpr from; public MySqlPrepareStatement(){ } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRenameTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRenameTableStatement.java index ea159db6e4..251cd7ae4e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRenameTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRenameTableStatement.java @@ -24,9 +24,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlRenameTableStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - - private List items = new ArrayList(2); + private List items = new ArrayList(2); public List getItems() { return items; @@ -35,7 +33,7 @@ public class MySqlRenameTableStatement extends MySqlStatementImpl { public void setItems(List items) { this.items = items; } - + public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, items); @@ -45,9 +43,8 @@ public class MySqlRenameTableStatement extends MySqlStatementImpl { public static class Item extends MySqlObjectImpl { - private static final long serialVersionUID = 1L; - private SQLExpr name; - private SQLExpr to; + private SQLExpr name; + private SQLExpr to; public SQLExpr getName() { return name; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlReplaceStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlReplaceStatement.java index 1dcaff2bfc..48e1ee6f83 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlReplaceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlReplaceStatement.java @@ -27,32 +27,30 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlReplaceStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; + private boolean lowPriority = false; + private boolean delayed = false; - private boolean lowPriority = false; - private boolean delayed = false; - - private SQLExprTableSource tableSource; - private final List columns = new ArrayList(); - private List valuesList = new ArrayList(); + private SQLExprTableSource tableSource; + private final List columns = new ArrayList(); + private List valuesList = new ArrayList(); private SQLQueryExpr query; public SQLName getTableName() { if (tableSource == null) { return null; } - + return (SQLName) tableSource.getExpr(); } public void setTableName(SQLName tableName) { this.setTableSource(new SQLExprTableSource(tableName)); } - + public SQLExprTableSource getTableSource() { return tableSource; } - + public void setTableSource(SQLExprTableSource tableSource) { if (tableSource != null) { tableSource.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlResetStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlResetStatement.java index 84de942221..ecf39e3863 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlResetStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlResetStatement.java @@ -21,19 +21,18 @@ import java.util.List; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlResetStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - private List options = new ArrayList(); + private List options = new ArrayList(); - public List getOptions() { - return options; - } + public List getOptions() { + return options; + } - public void setOptions(List options) { - this.options = options; - } + public void setOptions(List options) { + this.options = options; + } - public void accept0(MySqlASTVisitor visitor) { + public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRollbackStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRollbackStatement.java index 8a94d88470..42f8ce470e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRollbackStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRollbackStatement.java @@ -22,12 +22,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlRollbackStatement extends SQLRollbackStatement implements MySqlStatement { - private static final long serialVersionUID = 1L; + private Boolean chain; + private Boolean release; - private Boolean chain; - private Boolean release; - - private SQLExpr force; + private SQLExpr force; public MySqlRollbackStatement(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSQLColumnDefinition.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSQLColumnDefinition.java index 2bcc2351ba..ec02b5c561 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSQLColumnDefinition.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSQLColumnDefinition.java @@ -20,13 +20,11 @@ import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; public class MySqlSQLColumnDefinition extends SQLColumnDefinition { - private static final long serialVersionUID = 1L; + private boolean autoIncrement = false; - private boolean autoIncrement = false; + private SQLExpr onUpdate; - private SQLExpr onUpdate; - - private SQLExpr storage; + private SQLExpr storage; public MySqlSQLColumnDefinition(){ @@ -48,12 +46,10 @@ public class MySqlSQLColumnDefinition extends SQLColumnDefinition { this.onUpdate = onUpdate; } - public SQLExpr getStorage() { return storage; } - public void setStorage(SQLExpr storage) { this.storage = storage; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectGroupBy.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectGroupBy.java index 0ad071bb13..a87b2f99b6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectGroupBy.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectGroupBy.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlSelectGroupBy extends SQLSelectGroupByClause { - private static final long serialVersionUID = 1L; - - private boolean rollUp = false; + private boolean rollUp = false; public boolean isRollUp() { return rollUp; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java index 64d1a21a08..ea1b1714b7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObject; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -@SuppressWarnings("serial") public class MySqlSelectQueryBlock extends SQLSelectQueryBlock implements MySqlObject { private boolean hignPriority; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetCharSetStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetCharSetStatement.java index 78cdfe1dd5..6071afeecb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetCharSetStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetCharSetStatement.java @@ -19,13 +19,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlSetCharSetStatement extends MySqlStatementImpl { - /** - * - */ - private static final long serialVersionUID = 1L; - private boolean isDefault = false; - private String charSet; - private String collate; + private boolean isDefault = false; + private String charSet; + private String collate; public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetNamesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetNamesStatement.java index 67fcd8710e..a4c0886ddf 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetNamesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetNamesStatement.java @@ -19,13 +19,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlSetNamesStatement extends MySqlStatementImpl { - /** - * - */ - private static final long serialVersionUID = 1L; - private boolean isDefault = false; - private String charSet; - private String collate; + private boolean isDefault = false; + private String charSet; + private String collate; public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetTransactionIsolationLevelStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetTransactionIsolationLevelStatement.java index 033f0c28cd..1761a02156 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetTransactionIsolationLevelStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetTransactionIsolationLevelStatement.java @@ -19,11 +19,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlSetTransactionIsolationLevelStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; + private Boolean global; - private Boolean global; - - private String level; + private String level; public String getLevel() { return level; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowAuthorsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowAuthorsStatement.java index 7b0fdaa673..99f86b0fc2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowAuthorsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowAuthorsStatement.java @@ -17,11 +17,8 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; - public class MySqlShowAuthorsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinLogEventsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinLogEventsStatement.java index 673d2e9fc4..8a4f6fb7b7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinLogEventsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinLogEventsStatement.java @@ -21,11 +21,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowBinLogEventsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr in; - private SQLExpr from; - private Limit limit; + private SQLExpr in; + private SQLExpr from; + private Limit limit; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinaryLogsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinaryLogsStatement.java index f18b3479e0..c8324056b1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinaryLogsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinaryLogsStatement.java @@ -17,11 +17,8 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; - public class MySqlShowBinaryLogsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCharacterSetStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCharacterSetStatement.java index 32137ca4c1..d94ad7b322 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCharacterSetStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCharacterSetStatement.java @@ -20,10 +20,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCharacterSetStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr where; - private SQLExpr pattern; + private SQLExpr where; + private SQLExpr pattern; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCollationStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCollationStatement.java index c6d56c8833..39f8cb4aac 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCollationStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCollationStatement.java @@ -20,10 +20,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCollationStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr where; - private SQLExpr pattern; + private SQLExpr where; + private SQLExpr pattern; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowColumnsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowColumnsStatement.java index 3fc96fa099..61405c32c9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowColumnsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowColumnsStatement.java @@ -23,14 +23,12 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowColumnsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; + private boolean full; - private boolean full; - - private SQLName table; - private SQLName database; - private SQLExpr like; - private SQLExpr where; + private SQLName table; + private SQLName database; + private SQLExpr like; + private SQLExpr where; public boolean isFull() { return full; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowContributorsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowContributorsStatement.java index 7163b9415f..3a879b3fbc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowContributorsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowContributorsStatement.java @@ -17,11 +17,8 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; - public class MySqlShowContributorsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateDatabaseStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateDatabaseStatement.java index 0b79f7facf..b2adecb539 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateDatabaseStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateDatabaseStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCreateDatabaseStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr database; + private SQLExpr database; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateEventStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateEventStatement.java index a2445e28d7..7bcfa1f677 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateEventStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateEventStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCreateEventStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr eventName; + private SQLExpr eventName; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateFunctionStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateFunctionStatement.java index 9442970ddf..0c0186d861 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateFunctionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateFunctionStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCreateFunctionStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr name; + private SQLExpr name; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateProcedureStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateProcedureStatement.java index 9b80c7b3fd..e5c7716a86 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateProcedureStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateProcedureStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCreateProcedureStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr name; + private SQLExpr name; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTableStatement.java index fdfe4407cb..2dada7a33f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTableStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCreateTableStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr name; + private SQLExpr name; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTriggerStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTriggerStatement.java index 2e9611c8cb..7f2beecbc0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTriggerStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTriggerStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCreateTriggerStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr name; + private SQLExpr name; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateViewStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateViewStatement.java index 5596f08ab0..9126b713ea 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateViewStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCreateViewStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr name; + private SQLExpr name; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatabasesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatabasesStatement.java index a48e64e8af..c4cab2e94c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatabasesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatabasesStatement.java @@ -21,11 +21,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowDatabasesStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLName database; - private SQLExpr like; - private SQLExpr where; + private SQLName database; + private SQLExpr like; + private SQLExpr where; public SQLName getDatabase() { return database; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEngineStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEngineStatement.java index b4cef94d1a..366d38887e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEngineStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEngineStatement.java @@ -20,10 +20,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowEngineStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr name; - private Option option; + private SQLExpr name; + private Option option; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEnginesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEnginesStatement.java index 37cfd208a8..3f4510c797 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEnginesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEnginesStatement.java @@ -19,8 +19,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowEnginesStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - private boolean storage = false; + private boolean storage = false; public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowErrorsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowErrorsStatement.java index 5ffa444e8f..319be85509 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowErrorsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowErrorsStatement.java @@ -20,10 +20,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowErrorsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private boolean count = false; - private Limit limit; + private boolean count = false; + private Limit limit; public boolean isCount() { return count; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEventsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEventsStatement.java index 3656d7bdde..179416d65e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEventsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEventsStatement.java @@ -20,11 +20,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowEventsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr schema; - private SQLExpr like; - private SQLExpr where; + private SQLExpr schema; + private SQLExpr like; + private SQLExpr where; public SQLExpr getSchema() { return schema; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionCodeStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionCodeStatement.java index 68e12e900a..4ce1bc6c07 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionCodeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionCodeStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowFunctionCodeStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr name; + private SQLExpr name; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionStatusStatement.java index 53edb1910b..1d242b403e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionStatusStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionStatusStatement.java @@ -20,10 +20,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowFunctionStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr like; - private SQLExpr where; + private SQLExpr like; + private SQLExpr where; public SQLExpr getLike() { return like; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowGrantsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowGrantsStatement.java index 4dc8f3cae1..7338f239a4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowGrantsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowGrantsStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowGrantsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr user; + private SQLExpr user; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowIndexesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowIndexesStatement.java index b2e5e99371..a6febc2969 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowIndexesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowIndexesStatement.java @@ -22,10 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowIndexesStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLName table; - private SQLName database; + private SQLName table; + private SQLName database; public SQLName getTable() { return table; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowKeysStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowKeysStatement.java index 63af10c844..3dac60354a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowKeysStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowKeysStatement.java @@ -22,10 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowKeysStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLName table; - private SQLName database; + private SQLName table; + private SQLName database; public SQLName getTable() { return table; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterLogsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterLogsStatement.java index 5e5ee43361..f5da6ac68c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterLogsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterLogsStatement.java @@ -17,11 +17,8 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; - public class MySqlShowMasterLogsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterStatusStatement.java index a99b49e88f..a27e64b3c8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterStatusStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterStatusStatement.java @@ -17,11 +17,8 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; - public class MySqlShowMasterStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowOpenTablesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowOpenTablesStatement.java index e2c1629773..e45bf63450 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowOpenTablesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowOpenTablesStatement.java @@ -20,11 +20,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowOpenTablesStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr database; - private SQLExpr like; - private SQLExpr where; + private SQLExpr database; + private SQLExpr like; + private SQLExpr where; public SQLExpr getLike() { return like; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPluginsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPluginsStatement.java index 19415b19a1..1755d5269f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPluginsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPluginsStatement.java @@ -17,11 +17,8 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; - public class MySqlShowPluginsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPrivilegesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPrivilegesStatement.java index 08f4b6f0d1..a3383b4d13 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPrivilegesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPrivilegesStatement.java @@ -17,11 +17,8 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; - public class MySqlShowPrivilegesStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureCodeStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureCodeStatement.java index 8df39c6d7b..ff1979ff57 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureCodeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureCodeStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowProcedureCodeStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr name; + private SQLExpr name; public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureStatusStatement.java index 3ae6fce5a1..2c262c549a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureStatusStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureStatusStatement.java @@ -20,10 +20,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowProcedureStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr like; - private SQLExpr where; + private SQLExpr like; + private SQLExpr where; public SQLExpr getLike() { return like; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcessListStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcessListStatement.java index e2a3da1607..aef06dddaa 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcessListStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcessListStatement.java @@ -19,9 +19,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowProcessListStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private boolean full = false; + private boolean full = false; public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfileStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfileStatement.java index fdbdf1151b..357590a132 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfileStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfileStatement.java @@ -24,13 +24,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowProfileStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; + private List types = new ArrayList(); - private List types = new ArrayList(); + private SQLExpr forQuery; - private SQLExpr forQuery; - - private Limit limit; + private Limit limit; public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfilesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfilesStatement.java index 7b2174f1dc..6ff106f53f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfilesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfilesStatement.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowProfilesStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRelayLogEventsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRelayLogEventsStatement.java index 5aa49da5f9..001f09e2b1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRelayLogEventsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRelayLogEventsStatement.java @@ -21,11 +21,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowRelayLogEventsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr logName; - private SQLExpr from; - private Limit limit; + private SQLExpr logName; + private SQLExpr from; + private Limit limit; public SQLExpr getLogName() { return logName; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveHostsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveHostsStatement.java index 8ebce36046..454b4b9154 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveHostsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveHostsStatement.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowSlaveHostsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveStatusStatement.java index 3d0065082e..c1af8030e9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveStatusStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveStatusStatement.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowSlaveStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatement.java index b4227d9086..8989fe4a93 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatement.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.sql.dialect.mysql.ast.statement; - public interface MySqlShowStatement { } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatusStatement.java index 028f2f814e..212433516c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatusStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatusStatement.java @@ -20,13 +20,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; + private boolean global = false; + private boolean session = false; - private boolean global = false; - private boolean session = false; - - private SQLExpr like; - private SQLExpr where; + private SQLExpr like; + private SQLExpr where; public boolean isGlobal() { return global; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTableStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTableStatusStatement.java index 58f750fe9a..e924620db2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTableStatusStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTableStatusStatement.java @@ -20,11 +20,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowTableStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLExpr database; - private SQLExpr like; - private SQLExpr where; + private SQLExpr database; + private SQLExpr like; + private SQLExpr where; public SQLExpr getDatabase() { return database; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTablesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTablesStatement.java index ed917d31e0..2f90640c77 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTablesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTablesStatement.java @@ -21,13 +21,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowTablesStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; + private boolean full; - private boolean full; - - private SQLName database; - private SQLExpr like; - private SQLExpr where; + private SQLName database; + private SQLExpr like; + private SQLExpr where; public boolean isFull() { return full; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTriggersStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTriggersStatement.java index edfba267df..c3394c445d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTriggersStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTriggersStatement.java @@ -21,11 +21,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowTriggersStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private SQLName database; - private SQLExpr like; - private SQLExpr where; + private SQLName database; + private SQLExpr like; + private SQLExpr where; public SQLName getDatabase() { return database; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowVariantsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowVariantsStatement.java index eb781472af..f691e92312 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowVariantsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowVariantsStatement.java @@ -20,13 +20,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowVariantsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; + private boolean global = false; + private boolean session = false; - private boolean global = false; - private boolean session = false; - - private SQLExpr like; - private SQLExpr where; + private SQLExpr like; + private SQLExpr where; public boolean isGlobal() { return global; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowWarningsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowWarningsStatement.java index 5cde0ee01a..61e86a0559 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowWarningsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowWarningsStatement.java @@ -20,10 +20,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowWarningsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private static final long serialVersionUID = 1L; - - private boolean count = false; - private Limit limit; + private boolean count = false; + private Limit limit; public boolean isCount() { return count; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStartTransactionStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStartTransactionStatement.java index d27ffe47e9..fc1431ece4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStartTransactionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStartTransactionStatement.java @@ -19,12 +19,10 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlStartTransactionStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; + private boolean consistentSnapshot = false; - private boolean consistentSnapshot = false; - - private boolean begin = false; - private boolean work = false; + private boolean begin = false; + private boolean work = false; public boolean isConsistentSnapshot() { return consistentSnapshot; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStatementImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStatementImpl.java index 2f8be44c55..fbf7c6a108 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStatementImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStatementImpl.java @@ -21,8 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class MySqlStatementImpl extends SQLStatementImpl implements MySqlStatement { - private static final long serialVersionUID = 1L; - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor instanceof MySqlASTVisitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlTableIndex.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlTableIndex.java index b39f8f7c7e..9ad1198b2e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlTableIndex.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlTableIndex.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.ast.statement.SQLTableElement; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; -@SuppressWarnings("serial") public class MySqlTableIndex extends MySqlObjectImpl implements SQLTableElement { private SQLName name; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUnionQuery.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUnionQuery.java index 1a963b04d6..46db9fc804 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUnionQuery.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUnionQuery.java @@ -23,9 +23,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlUnionQuery extends SQLUnionQuery implements MySqlObject { - private static final long serialVersionUID = 1L; - - private Limit limit; + private Limit limit; public Limit getLimit() { return limit; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUnlockTablesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUnlockTablesStatement.java index 3bb0571ae2..b59dd0e26a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUnlockTablesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUnlockTablesStatement.java @@ -17,11 +17,8 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; - public class MySqlUnlockTablesStatement extends MySqlStatementImpl { - private static final long serialVersionUID = 1L; - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdateStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdateStatement.java index d730cf6ba3..fdaec4cde4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdateStatement.java @@ -23,12 +23,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlUpdateStatement extends SQLUpdateStatement implements MySqlStatement { - private static final long serialVersionUID = 1L; - private SQLOrderBy orderBy; - private Limit limit; + private SQLOrderBy orderBy; + private Limit limit; - private boolean lowPriority = false; - private boolean ignore = false; + private boolean lowPriority = false; + private boolean ignore = false; public Limit getLimit() { return limit; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java index 56b8baf69f..5b8a33e99d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java @@ -178,6 +178,7 @@ public class MySqlExprParser extends SQLExprParser { SQLUnaryExpr binaryExpr = new SQLUnaryExpr(SQLUnaryOperator.BINARY, expr()); return primaryRest(binaryExpr); } + case CACHE: case GROUP: lexer.nextToken(); return primaryRest(new SQLIdentifierExpr(lexer.stringVal())); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java index 9e97eeb670..2109713b4d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java @@ -48,6 +48,7 @@ public class MySqlLexer extends Lexer { map.put("TRUE", Token.TRUE); map.put("BINARY", Token.BINARY); map.put("SHOW", Token.SHOW); + map.put("CACHE", Token.CACHE); DEFAULT_MYSQL_KEYWORDS = new Keywords(map); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index ff1a07f7df..4ae3b85dff 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -508,7 +508,7 @@ public class MySqlStatementParser extends SQLStatementParser { if (lexer.token() == Token.IDENTIFIER) { if (identifierEquals("QUERY")) { lexer.nextToken(); - acceptIdentifier("CACHE"); + accept(Token.CACHE); stmt.getOptions().add("QUERY CACHE"); } else { stmt.getOptions().add(lexer.stringVal()); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeIntervalDay.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeIntervalDay.java index 024353909c..12ec083477 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeIntervalDay.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeIntervalDay.java @@ -25,8 +25,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleDataTypeIntervalDay extends SQLDataTypeImpl implements OracleSQLObject { - private static final long serialVersionUID = 1L; - private boolean toSecond = false; protected final List fractionalSeconds = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeIntervalYear.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeIntervalYear.java index 6aac7f6c80..d8b4d374ad 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeIntervalYear.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeIntervalYear.java @@ -21,8 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleDataTypeIntervalYear extends SQLDataTypeImpl implements OracleSQLObject { - private static final long serialVersionUID = 1L; - public OracleDataTypeIntervalYear(){ this.setName("INTERVAL YEAR"); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeTimestamp.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeTimestamp.java index 924633eadf..91f006a509 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeTimestamp.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleDataTypeTimestamp.java @@ -21,12 +21,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleDataTypeTimestamp extends SQLDataTypeImpl implements OracleSQLObject { - private static final long serialVersionUID = 1L; + private boolean withTimeZone = false; + private boolean withLocalTimeZone = false; - private boolean withTimeZone = false; - private boolean withLocalTimeZone = false; - - public OracleDataTypeTimestamp() { + public OracleDataTypeTimestamp(){ this.setName("TIMESTAMP"); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleOrderBy.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleOrderBy.java index af4787795d..d297606575 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleOrderBy.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleOrderBy.java @@ -22,9 +22,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleOrderBy extends SQLOrderBy { - private static final long serialVersionUID = 1L; - - private boolean sibings; + private boolean sibings; public OracleOrderBy(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObjectImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObjectImpl.java index d65c47e437..bfdbf528a7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObjectImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObjectImpl.java @@ -21,8 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class OracleSQLObjectImpl extends SQLObjectImpl implements OracleSQLObject { - private static final long serialVersionUID = 1L; - public OracleSQLObjectImpl(){ } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/CycleClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/CycleClause.java index 0e0e1feada..e3c1bb3a69 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/CycleClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/CycleClause.java @@ -24,9 +24,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class CycleClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - - private final List aliases = new ArrayList(); + private final List aliases = new ArrayList(); private SQLExpr mark; private SQLExpr value; private SQLExpr defaultValue; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/FlashbackQueryClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/FlashbackQueryClause.java index ecd5d32419..38fbbf57ff 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/FlashbackQueryClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/FlashbackQueryClause.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public abstract class FlashbackQueryClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - - private Type type; + private Type type; public Type getType() { return type; @@ -39,10 +37,8 @@ public abstract class FlashbackQueryClause extends OracleSQLObjectImpl { public static class VersionsFlashbackQueryClause extends FlashbackQueryClause { - private static final long serialVersionUID = 1L; - - private SQLExpr begin; - private SQLExpr end; + private SQLExpr begin; + private SQLExpr end; public SQLExpr getBegin() { return begin; @@ -72,9 +68,7 @@ public abstract class FlashbackQueryClause extends OracleSQLObjectImpl { public static class AsOfFlashbackQueryClause extends FlashbackQueryClause { - private static final long serialVersionUID = 1L; - - private SQLExpr expr; + private SQLExpr expr; public SQLExpr getExpr() { return expr; @@ -92,12 +86,10 @@ public abstract class FlashbackQueryClause extends OracleSQLObjectImpl { visitor.endVisit(this); } } - + public static class AsOfSnapshotClause extends FlashbackQueryClause { - private static final long serialVersionUID = 1L; - - private SQLExpr expr; + private SQLExpr expr; public SQLExpr getExpr() { return expr; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java index c4779f6c3d..c74ddea390 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java @@ -25,8 +25,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class GroupingSetExpr extends SQLExprImpl { - private static final long serialVersionUID = 1L; - private final List parameters = new ArrayList(); + private final List parameters = new ArrayList(); public List getParameters() { return parameters; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/ModelClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/ModelClause.java index 30d2c4a3b5..d49eab9a91 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/ModelClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/ModelClause.java @@ -26,8 +26,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class ModelClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - private final List cellReferenceOptions = new ArrayList(); private ReturnRowsClause returnRowsClause; private final List referenceModelClauses = new ArrayList(); @@ -91,8 +89,7 @@ public class ModelClause extends OracleSQLObjectImpl { public static class ReturnRowsClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - private boolean all = false; + private boolean all = false; public boolean isAll() { return all; @@ -111,7 +108,6 @@ public class ModelClause extends OracleSQLObjectImpl { public static class ReferenceModelClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; private SQLExpr name; private SQLSelect subQuery; private final List cellReferenceOptions = new ArrayList(); @@ -144,7 +140,6 @@ public class ModelClause extends OracleSQLObjectImpl { public static class ModelColumnClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; private QueryPartitionClause queryPartitionClause; private String alias; private final List dimensionByColumns = new ArrayList(); @@ -188,10 +183,8 @@ public class ModelClause extends OracleSQLObjectImpl { public static class ModelColumn extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - - private SQLExpr expr; - private String alias; + private SQLExpr expr; + private String alias; public SQLExpr getExpr() { return expr; @@ -221,8 +214,7 @@ public class ModelClause extends OracleSQLObjectImpl { public static class QueryPartitionClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - private List exprList = new ArrayList(); + private List exprList = new ArrayList(); public List getExprList() { return exprList; @@ -243,7 +235,6 @@ public class ModelClause extends OracleSQLObjectImpl { public static class MainModelClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; private SQLExpr mainModelName; private ModelColumnClause modelColumnClause; @@ -292,7 +283,6 @@ public class ModelClause extends OracleSQLObjectImpl { public static class ModelRulesClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; private final List options = new ArrayList(); private SQLExpr iterate; private SQLExpr until; @@ -352,11 +342,10 @@ public class ModelClause extends OracleSQLObjectImpl { public static class CellAssignmentItem extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - private ModelRuleOption option; - private CellAssignment cellAssignment; - private SQLOrderBy orderBy; - private SQLExpr expr; + private ModelRuleOption option; + private CellAssignment cellAssignment; + private SQLOrderBy orderBy; + private SQLExpr expr; public ModelRuleOption getOption() { return option; @@ -404,9 +393,8 @@ public class ModelClause extends OracleSQLObjectImpl { public static class CellAssignment extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; private SQLExpr measureColumn; - private final List conditions = new ArrayList(); + private final List conditions = new ArrayList(); public List getConditions() { return conditions; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleErrorLoggingClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleErrorLoggingClause.java index 44c4da80b0..73f4c86a16 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleErrorLoggingClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleErrorLoggingClause.java @@ -22,10 +22,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleErrorLoggingClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - private SQLName into; - private SQLExpr simpleExpression; - private SQLExpr limit; + private SQLName into; + private SQLExpr simpleExpression; + private SQLExpr limit; @Override public void accept0(OracleASTVisitor visitor) { @@ -61,4 +60,4 @@ public class OracleErrorLoggingClause extends OracleSQLObjectImpl { this.limit = limit; } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleLobStorageClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleLobStorageClause.java new file mode 100644 index 0000000000..479aca4f66 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleLobStorageClause.java @@ -0,0 +1,130 @@ +/* + * Copyright 1999-2011 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.sql.dialect.oracle.ast.clause; + +import java.util.ArrayList; +import java.util.List; + +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; + +public class OracleLobStorageClause extends OracleSQLObjectImpl { + + private final List items = new ArrayList(); + + private boolean secureFile = false; + private boolean basicFile = false; + + private SQLName tableSpace; + + private Boolean enable; + + private SQLExpr chunk; + + private Boolean cache; + private Boolean logging; + + private Boolean compress; + private Boolean keepDuplicate; + + @Override + public void accept0(OracleASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, items); + acceptChild(visitor, tableSpace); + } + visitor.endVisit(this); + } + + public Boolean getEnable() { + return enable; + } + + public void setEnable(Boolean enable) { + this.enable = enable; + } + + public SQLExpr getChunk() { + return chunk; + } + + public void setChunk(SQLExpr chunk) { + this.chunk = chunk; + } + + public List getItems() { + return items; + } + + public boolean isSecureFile() { + return secureFile; + } + + public void setSecureFile(boolean secureFile) { + this.secureFile = secureFile; + } + + public boolean isBasicFile() { + return basicFile; + } + + public void setBasicFile(boolean basicFile) { + this.basicFile = basicFile; + } + + public SQLName getTableSpace() { + return tableSpace; + } + + public void setTableSpace(SQLName tableSpace) { + this.tableSpace = tableSpace; + } + + public Boolean getCache() { + return cache; + } + + public void setCache(Boolean cache) { + this.cache = cache; + } + + public Boolean getLogging() { + return logging; + } + + public void setLogging(Boolean logging) { + this.logging = logging; + } + + public Boolean getCompress() { + return compress; + } + + public void setCompress(Boolean compress) { + this.compress = compress; + } + + public Boolean getKeepDuplicate() { + return keepDuplicate; + } + + public void setKeepDuplicate(Boolean keepDuplicate) { + this.keepDuplicate = keepDuplicate; + } + +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleParameter.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleParameter.java index b725f59296..fe0198d59a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleParameter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleParameter.java @@ -22,10 +22,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleParameter extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - private SQLExpr name; - private SQLDataType dataType; - private SQLExpr defaultValue; + private SQLExpr name; + private SQLDataType dataType; + private SQLExpr defaultValue; public SQLExpr getDefaultValue() { return defaultValue; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OraclePartitionByRangeClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OraclePartitionByRangeClause.java index 03be7faa0e..ee32456f9b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OraclePartitionByRangeClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OraclePartitionByRangeClause.java @@ -26,14 +26,12 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OraclePartitionByRangeClause extends OracleSQLObjectImpl implements SQLPartitioningClause { - private static final long serialVersionUID = 1L; - - private List columns = new ArrayList(); + private List columns = new ArrayList(); private SQLExpr interval; - private List storeIn = new ArrayList(); + private List storeIn = new ArrayList(); - private List ranges = new ArrayList(); + private List ranges = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleRangeValuesClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleRangeValuesClause.java index 13c08044e0..5d9a86ec54 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleRangeValuesClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleRangeValuesClause.java @@ -25,10 +25,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleRangeValuesClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - - private SQLName name; - private List values = new ArrayList(); + private SQLName name; + private List values = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleReturningClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleReturningClause.java index 8903e03bb6..f63657a817 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleReturningClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleReturningClause.java @@ -24,10 +24,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleReturningClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - - private List items = new ArrayList(); - private List values = new ArrayList(); + private List items = new ArrayList(); + private List values = new ArrayList(); public List getItems() { return items; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleStorageClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleStorageClause.java index a5c80494dd..4deaa6dd67 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleStorageClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleStorageClause.java @@ -21,18 +21,26 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleStorageClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - - private SQLExpr initial; - private SQLExpr freeLists; - private SQLExpr freeListGroups; - private SQLExpr bufferPool; - private SQLExpr objno; + private SQLExpr initial; + private SQLExpr next; + private SQLExpr minExtents; + private SQLExpr maxExtents; + private SQLExpr pctIncrease; + private SQLExpr freeLists; + private SQLExpr freeListGroups; + private SQLExpr bufferPool; + private SQLExpr objno; + private FlashCacheType flashCache; + private FlashCacheType cellFlashCache; @Override public void accept0(OracleASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, initial); + acceptChild(visitor, next); + acceptChild(visitor, minExtents); + acceptChild(visitor, maxExtents); + acceptChild(visitor, pctIncrease); acceptChild(visitor, freeLists); acceptChild(visitor, freeListGroups); acceptChild(visitor, bufferPool); @@ -41,6 +49,54 @@ public class OracleStorageClause extends OracleSQLObjectImpl { visitor.endVisit(this); } + public FlashCacheType getFlashCache() { + return flashCache; + } + + public void setFlashCache(FlashCacheType flashCache) { + this.flashCache = flashCache; + } + + public FlashCacheType getCellFlashCache() { + return cellFlashCache; + } + + public void setCellFlashCache(FlashCacheType cellFlashCache) { + this.cellFlashCache = cellFlashCache; + } + + public SQLExpr getPctIncrease() { + return pctIncrease; + } + + public void setPctIncrease(SQLExpr pctIncrease) { + this.pctIncrease = pctIncrease; + } + + public SQLExpr getNext() { + return next; + } + + public void setNext(SQLExpr next) { + this.next = next; + } + + public SQLExpr getMinExtents() { + return minExtents; + } + + public void setMinExtents(SQLExpr minExtents) { + this.minExtents = minExtents; + } + + public SQLExpr getMaxExtents() { + return maxExtents; + } + + public void setMaxExtents(SQLExpr maxExtents) { + this.maxExtents = maxExtents; + } + public SQLExpr getObjno() { return objno; } @@ -81,4 +137,7 @@ public class OracleStorageClause extends OracleSQLObjectImpl { this.bufferPool = bufferPool; } + public static enum FlashCacheType { + KEEP, NONE, DEFAULT + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleWithSubqueryEntry.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleWithSubqueryEntry.java index 461e700d75..dc83943ef4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleWithSubqueryEntry.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleWithSubqueryEntry.java @@ -22,10 +22,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; */ public class OracleWithSubqueryEntry extends Entry implements OracleSQLObject { - private static final long serialVersionUID = 1L; - - private SearchClause searchClause; - private CycleClause cycleClause; + private SearchClause searchClause; + private CycleClause cycleClause; public CycleClause getCycleClause() { return cycleClause; @@ -43,7 +41,6 @@ public class OracleWithSubqueryEntry extends Entry implements OracleSQLObject { this.searchClause = searchClause; } - @Override public void accept0(OracleASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/PartitionExtensionClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/PartitionExtensionClause.java index 2fc7ce8f12..2ef5d1df11 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/PartitionExtensionClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/PartitionExtensionClause.java @@ -24,11 +24,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class PartitionExtensionClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - private boolean subPartition; private SQLName partition; - private final List target = new ArrayList(); + private final List target = new ArrayList(); public boolean isSubPartition() { return subPartition; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SampleClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SampleClause.java index c7edb135cd..87f95e3dc3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SampleClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SampleClause.java @@ -24,13 +24,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class SampleClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; + private boolean block = false; - private boolean block = false; + private List percent = new ArrayList(); - private List percent = new ArrayList(); - - private SQLExpr seedValue; + private SQLExpr seedValue; public boolean isBlock() { return block; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SearchClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SearchClause.java index 5c11f7573a..9ed4acd695 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SearchClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/SearchClause.java @@ -25,8 +25,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class SearchClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - public static enum Type { DEPTH, BREADTH } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalytic.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalytic.java index 007f4fc6e7..4b0e302889 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalytic.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalytic.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleAnalytic extends SQLOver implements OracleExpr { - private static final long serialVersionUID = 1L; private OracleAnalyticWindowing windowing; public OracleAnalytic(){ 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 4a37819995..a3b5565d97 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,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -@SuppressWarnings("serial") public class OracleAnalyticWindowing extends SQLObjectImpl implements OracleExpr { private Type type; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleArgumentExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleArgumentExpr.java index 8bb54f09b7..8dd87436b3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleArgumentExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleArgumentExpr.java @@ -21,9 +21,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleArgumentExpr extends OracleSQLObjectImpl implements SQLExpr { - private static final long serialVersionUID = 1L; - private String argumentName; - private SQLExpr value; + private String argumentName; + private SQLExpr value; public OracleArgumentExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryDoubleExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryDoubleExpr.java index 22755d2ae9..efdb54c914 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryDoubleExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryDoubleExpr.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleBinaryDoubleExpr extends SQLNumericLiteralExpr implements OracleExpr { - private static final long serialVersionUID = 1L; - - private Double value; + private Double value; public OracleBinaryDoubleExpr(){ @@ -93,7 +91,7 @@ public class OracleBinaryDoubleExpr extends SQLNumericLiteralExpr implements Ora this.setValue(null); return; } - + this.setValue(number.doubleValue()); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryFloatExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryFloatExpr.java index 4835381c19..51e3698ab2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryFloatExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleBinaryFloatExpr.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleBinaryFloatExpr extends SQLNumericLiteralExpr implements OracleExpr { - private static final long serialVersionUID = 1L; - - private Float value; + private Float value; public OracleBinaryFloatExpr(){ @@ -93,8 +91,8 @@ public class OracleBinaryFloatExpr extends SQLNumericLiteralExpr implements Orac this.setValue(null); return; } - - this.setValue(number.floatValue()); + + this.setValue(number.floatValue()); } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleCursorExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleCursorExpr.java index 94e2a6b987..25ea69fa41 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleCursorExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleCursorExpr.java @@ -22,9 +22,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleCursorExpr extends SQLExprImpl implements OracleExpr { - private static final long serialVersionUID = 1L; - - private SQLSelect query; + private SQLSelect query; public OracleCursorExpr(){ 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 caf5458bc9..f249b625f6 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 @@ -22,9 +22,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleDateExpr extends SQLExprImpl implements SQLLiteralExpr, OracleExpr { - private static final long serialVersionUID = 1L; - - private String literal; + private String literal; public OracleDateExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDatetimeExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDatetimeExpr.java index 38d6d2aa4e..776ef4749f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDatetimeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDatetimeExpr.java @@ -21,10 +21,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleDatetimeExpr extends OracleSQLObjectImpl implements SQLExpr { - private static final long serialVersionUID = 1L; - - private SQLExpr expr; - private SQLExpr timeZone; + private SQLExpr expr; + private SQLExpr timeZone; public OracleDatetimeExpr(){ 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 bcd3e07a8c..0e9f37c8eb 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 @@ -23,14 +23,13 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleDbLinkExpr extends SQLExprImpl implements SQLName, OracleExpr { - private static final long serialVersionUID = 1L; - private SQLExpr expr; - private String dbLink; + private SQLExpr expr; + private String dbLink; public OracleDbLinkExpr(){ } - + public String getSimleName() { return dbLink; } 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 0bc303200f..d6cc463fbb 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,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleExtractExpr extends SQLExprImpl implements OracleExpr { - 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/OracleIntervalExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java index 71eeed7846..9e598deaaa 100755 --- 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 @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleIntervalExpr extends SQLExprImpl implements SQLLiteralExpr, OracleExpr { - private static final long serialVersionUID = 1L; private SQLExpr value; private OracleIntervalType type; private Integer precision; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIsSetExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIsSetExpr.java index 94dc181831..72b4103971 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIsSetExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIsSetExpr.java @@ -22,9 +22,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleIsSetExpr extends SQLExprImpl implements OracleExpr { - private static final long serialVersionUID = 1L; - - private SQLExpr nestedTable; + private SQLExpr nestedTable; public OracleIsSetExpr(){ } 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 cb77dcd82f..47c2254946 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,8 +22,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleOuterExpr extends SQLExprImpl implements OracleExpr { - private static final long serialVersionUID = 1L; - private SQLExpr expr; + private SQLExpr expr; public OracleOuterExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleRangeExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleRangeExpr.java index 94bb7cda97..561b2a3be9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleRangeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleRangeExpr.java @@ -21,10 +21,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleRangeExpr extends OracleSQLObjectImpl implements SQLExpr { - private static final long serialVersionUID = 1L; - - private SQLExpr lowBound; - private SQLExpr upBound; + private SQLExpr lowBound; + private SQLExpr upBound; public OracleRangeExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleSizeExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleSizeExpr.java index 06efa3dcac..5049083769 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleSizeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleSizeExpr.java @@ -21,10 +21,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSizeExpr extends OracleSQLObjectImpl implements OracleExpr { - private static final long serialVersionUID = 1L; - - private SQLExpr value; - private Unit unit; + private SQLExpr value; + private Unit unit; public OracleSizeExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleSysdateExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleSysdateExpr.java index 631983acdc..9be28fc2be 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleSysdateExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleSysdateExpr.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSysdateExpr extends OracleSQLObjectImpl implements SQLExpr { - private static final long serialVersionUID = 1L; - - private String option; + private String option; public String getOption() { return option; 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 fb72dc89e3..cb4619232e 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 @@ -22,9 +22,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleTimestampExpr extends SQLExprImpl implements SQLLiteralExpr, OracleExpr { - private static final long serialVersionUID = 1L; - private String literal; - private String timeZone; + private String literal; + private String timeZone; public OracleTimestampExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterIndexStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterIndexStatement.java index c37e5bf3c1..990fdd50ba 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterIndexStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterIndexStatement.java @@ -23,21 +23,19 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterIndexStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; + private SQLName name; - private SQLName name; + private SQLName renameTo; - private SQLName renameTo; + private boolean compile; - private boolean compile; + private Boolean enable; - private Boolean enable; + private Boolean monitoringUsage; - private Boolean monitoringUsage; + private Rebuild rebuild; - private Rebuild rebuild; - - private SQLExpr parallel; + private SQLExpr parallel; @Override public void accept0(OracleASTVisitor visitor) { @@ -108,8 +106,7 @@ public class OracleAlterIndexStatement extends OracleStatementImpl { public static class Rebuild extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - private SQLObject option; + private SQLObject option; public SQLObject getOption() { return option; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterProcedureStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterProcedureStatement.java index c069d66407..3d34f8687f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterProcedureStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterProcedureStatement.java @@ -20,12 +20,10 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterProcedureStatement extends OracleStatementImpl { - private SQLExpr name; + private SQLExpr name; - private boolean compile = false; - private boolean reuseSettings = false; - - private static final long serialVersionUID = 1L; + private boolean compile = false; + private boolean reuseSettings = false; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterSessionStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterSessionStatement.java index b291dc32c1..fdfc26f499 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterSessionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterSessionStatement.java @@ -23,9 +23,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterSessionStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - - private List items = new ArrayList(); + private List items = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterSynonymStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterSynonymStatement.java index d6eea6e9ab..766023b63c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterSynonymStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterSynonymStatement.java @@ -20,13 +20,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterSynonymStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; + private SQLName name; - private SQLName name; + private Boolean enable; - private Boolean enable; - - private boolean compile; + private boolean compile; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableAddConstaint.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableAddConstaint.java index 645d11fbb3..992754b554 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableAddConstaint.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableAddConstaint.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTableAddConstaint extends OracleAlterTableItem { - private static final long serialVersionUID = 1L; - - private SQLConstaint constraint; + private SQLConstaint constraint; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableDropPartition.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableDropPartition.java index f76690450c..bf2702b945 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableDropPartition.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableDropPartition.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTableDropPartition extends OracleAlterTableItem { - private static final long serialVersionUID = 1L; - - private SQLName name; + private SQLName name; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableItem.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableItem.java index 9f75aad39b..358c3f39a9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableItem.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableItem.java @@ -20,6 +20,4 @@ import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl; public abstract class OracleAlterTableItem extends OracleSQLObjectImpl implements SQLAlterTableItem { - private static final long serialVersionUID = 1L; - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableModify.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableModify.java index bf799bc3cc..4ea87ce7cf 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableModify.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableModify.java @@ -23,9 +23,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTableModify extends OracleAlterTableItem { - private static final long serialVersionUID = 1L; - - private List columns = new ArrayList(); + private List columns = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableMoveTablespace.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableMoveTablespace.java index d446bfb721..c940f9a9d3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableMoveTablespace.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableMoveTablespace.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTableMoveTablespace extends OracleAlterTableItem { - private static final long serialVersionUID = 1L; - - private SQLName name; + private SQLName name; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableRenameTo.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableRenameTo.java index 899c602a56..3e5ca3dd04 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableRenameTo.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableRenameTo.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTableRenameTo extends OracleAlterTableItem { - private static final long serialVersionUID = 1L; - - private SQLExpr to; + private SQLExpr to; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableSplitPartition.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableSplitPartition.java index bc72be0f7d..385bafdc48 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableSplitPartition.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableSplitPartition.java @@ -26,14 +26,12 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTableSplitPartition extends OracleAlterTableItem { - private static final long serialVersionUID = 1L; - private SQLName name; - private List at = new ArrayList(); - private List values = new ArrayList(); - private List into = new ArrayList(); + private List at = new ArrayList(); + private List values = new ArrayList(); + private List into = new ArrayList(); - private UpdateIndexesClause updateIndexes = null; + private UpdateIndexesClause updateIndexes = null; @Override public void accept0(OracleASTVisitor visitor) { @@ -88,11 +86,9 @@ public class OracleAlterTableSplitPartition extends OracleAlterTableItem { public static class NestedTablePartitionSpec extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; + private SQLName partition; - private SQLName partition; - - private List segmentAttributeItems = new ArrayList(); + private List segmentAttributeItems = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { @@ -123,8 +119,7 @@ public class OracleAlterTableSplitPartition extends OracleAlterTableItem { public static class TableSpaceItem extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - private SQLName tablespace; + private SQLName tablespace; public TableSpaceItem(){ @@ -153,8 +148,7 @@ public class OracleAlterTableSplitPartition extends OracleAlterTableItem { public static class UpdateIndexesClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - private List items = new ArrayList(); + private List items = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableStatement.java index 474805ff90..1ca577d3f0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableStatement.java @@ -21,10 +21,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleAlterTableStatement extends SQLAlterTableStatement implements OracleDDLStatement { - private static final long serialVersionUID = 1L; - - private boolean updateGlobalIndexes = false; - private boolean invalidateGlobalIndexes = false; + private boolean updateGlobalIndexes = false; + private boolean invalidateGlobalIndexes = false; protected void accept0(SQLASTVisitor visitor) { accept0((OracleASTVisitor) visitor); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableTruncatePartition.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableTruncatePartition.java index 1c36a76158..5e7b016527 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableTruncatePartition.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableTruncatePartition.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTableTruncatePartition extends OracleAlterTableItem { - private static final long serialVersionUID = 1L; - - private SQLName name; + private SQLName name; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTablespaceAddDataFile.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTablespaceAddDataFile.java index a0542d411c..ddc4759abf 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTablespaceAddDataFile.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTablespaceAddDataFile.java @@ -23,9 +23,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTablespaceAddDataFile extends OracleSQLObjectImpl implements OracleAlterTablespaceItem { - private static final long serialVersionUID = 1L; - - private List files = new ArrayList(); + private List files = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTablespaceItem.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTablespaceItem.java index e74bddba00..acd59c1c44 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTablespaceItem.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTablespaceItem.java @@ -17,7 +17,6 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; - public interface OracleAlterTablespaceItem extends OracleSQLObject { } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTablespaceStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTablespaceStatement.java index a6f3e40489..35c9e7ba35 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTablespaceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTablespaceStatement.java @@ -20,8 +20,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTablespaceStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - private SQLName name; private OracleAlterTablespaceItem item; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTriggerStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTriggerStatement.java index ada05648f2..30b53ca622 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTriggerStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTriggerStatement.java @@ -20,13 +20,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTriggerStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; + private SQLName name; - private SQLName name; + private Boolean enable; - private Boolean enable; - - private boolean compile; + private boolean compile; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterViewStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterViewStatement.java index 8e561ceccc..2740af548e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterViewStatement.java @@ -20,13 +20,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterViewStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; + private SQLName name; - private SQLName name; + private Boolean enable; - private Boolean enable; - - private boolean compile; + private boolean compile; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleBlockStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleBlockStatement.java index 8747c18c90..6aa145f51f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleBlockStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleBlockStatement.java @@ -24,11 +24,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleBlockStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; + private List parameters = new ArrayList(); - private List parameters = new ArrayList(); - - private List statementList = new ArrayList(); + private List statementList = new ArrayList(); public List getStatementList() { return statementList; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCommitStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCommitStatement.java index 670e9dbe09..901cea2f27 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCommitStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCommitStatement.java @@ -19,11 +19,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleCommitStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - - private boolean write; - private Boolean wait; - private Boolean immediate; + private boolean write; + private Boolean wait; + private Boolean immediate; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraint.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraint.java index d41261f41d..20d3322f56 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraint.java @@ -21,8 +21,6 @@ import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl; public abstract class OracleConstraint extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - protected OracleConstraintState state; protected SQLName name; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraintState.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraintState.java index 1baf43a459..fde83eba08 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraintState.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraintState.java @@ -25,9 +25,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleConstraintState extends SQLObjectImpl { - private static final long serialVersionUID = 1L; - - private final List states = new ArrayList(); + private final List states = new ArrayList(); public OracleConstraintState(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateDatabaseDbLinkStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateDatabaseDbLinkStatement.java index 9768f754b3..356fc33916 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateDatabaseDbLinkStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateDatabaseDbLinkStatement.java @@ -21,21 +21,19 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleCreateDatabaseDbLinkStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; + private boolean shared; + private boolean _public; - private boolean shared; - private boolean _public; + private SQLName name; - private SQLName name; + private SQLName user; - private SQLName user; + private String password; - private String password; + private SQLExpr using; - private SQLExpr using; - - private SQLExpr authenticatedUser; - private String authenticatedPassword; + private SQLExpr authenticatedUser; + private String authenticatedPassword; public boolean isShared() { return shared; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateIndexStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateIndexStatement.java index 108f03cbd2..62f0352f5b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateIndexStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateIndexStatement.java @@ -23,17 +23,24 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleCreateIndexStatement extends SQLCreateIndexStatement implements OracleDDLStatement { - private static final long serialVersionUID = 1L; + private boolean online = false; - private boolean online = false; + private boolean indexOnlyTopLevel = false; - private boolean indexOnlyTopLevel = false; + private boolean noParallel; - private boolean noParallel; + private SQLExpr parallel; - private SQLExpr parallel; + private SQLName tablespace; - private SQLName tablespace; + private SQLExpr ptcfree; + private SQLExpr pctused; + private SQLExpr initrans; + private SQLExpr maxtrans; + + private Boolean enable = null; + + private boolean computeStatistics = false; public SQLName getTablespace() { return tablespace; @@ -83,9 +90,53 @@ public class OracleCreateIndexStatement extends SQLCreateIndexStatement implemen visitor.endVisit(this); } - // public static enum Type { - // UNIQUE, BITMAP - // } + public SQLExpr getPtcfree() { + return ptcfree; + } + + public void setPtcfree(SQLExpr ptcfree) { + this.ptcfree = ptcfree; + } + + public SQLExpr getPctused() { + return pctused; + } + + public void setPctused(SQLExpr pctused) { + this.pctused = pctused; + } + + public SQLExpr getInitrans() { + return initrans; + } + + public void setInitrans(SQLExpr initrans) { + this.initrans = initrans; + } + + public SQLExpr getMaxtrans() { + return maxtrans; + } + + public void setMaxtrans(SQLExpr maxtrans) { + this.maxtrans = maxtrans; + } + + public Boolean getEnable() { + return enable; + } + + public void setEnable(Boolean enable) { + this.enable = enable; + } + + public boolean isComputeStatistics() { + return computeStatistics; + } + + public void setComputeStatistics(boolean computeStatistics) { + this.computeStatistics = computeStatistics; + } public boolean isOnline() { return online; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateProcedureStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateProcedureStatement.java index 6dc1b4456a..1191931193 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateProcedureStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateProcedureStatement.java @@ -24,12 +24,10 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleCreateProcedureStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - private boolean orReplace; private SQLName name; private OracleBlockStatement block; - private List parameters = new ArrayList(); + private List parameters = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateSequenceStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateSequenceStatement.java index 271451a555..43bea26d8e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateSequenceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateSequenceStatement.java @@ -21,16 +21,15 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleCreateSequenceStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - private SQLName name; + private SQLName name; - private SQLExpr startWith; - private SQLExpr incrementBy; - private SQLExpr maxValue; + private SQLExpr startWith; + private SQLExpr incrementBy; + private SQLExpr maxValue; - private Boolean cycle; - private Boolean cache; - private Boolean order; + private Boolean cycle; + private Boolean cache; + private Boolean order; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateTableStatement.java index 12cf68553e..8d150fe24b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateTableStatement.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLPartitioningClause; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.ast.statement.SQLSelect; +import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleLobStorageClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleStorageClause; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleCreateTableStatement extends SQLCreateTableStatement implements OracleDDLStatement { - private static final long serialVersionUID = 1L; - private SQLName tablespace; private SQLSelect select; @@ -40,6 +39,7 @@ public class OracleCreateTableStatement extends SQLCreateTableStatement implemen private Boolean parallel; private OracleStorageClause storage; + private OracleLobStorageClause lobStorage; private boolean organizationIndex = false; @@ -59,6 +59,14 @@ public class OracleCreateTableStatement extends SQLCreateTableStatement implemen private DeferredSegmentCreation deferredSegmentCreation; + public OracleLobStorageClause getLobStorage() { + return lobStorage; + } + + public void setLobStorage(OracleLobStorageClause lobStorage) { + this.lobStorage = lobStorage; + } + public DeferredSegmentCreation getDeferredSegmentCreation() { return deferredSegmentCreation; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDDLStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDDLStatement.java index 4d7c865392..73e7c336c7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDDLStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDDLStatement.java @@ -17,7 +17,6 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.statement.SQLDDLStatement; - public interface OracleDDLStatement extends SQLDDLStatement, OracleStatement { } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java index 86b3f55a84..22bd2af5e6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java @@ -26,12 +26,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleDeleteStatement extends SQLDeleteStatement { - private static final long serialVersionUID = 1L; + private boolean only = false; - private boolean only = false; - - private final List hints = new ArrayList(); - private OracleReturningClause returning = null; + private final List hints = new ArrayList(); + private OracleReturningClause returning = null; public OracleDeleteStatement(){ @@ -72,5 +70,4 @@ public class OracleDeleteStatement extends SQLDeleteStatement { this.only = only; } - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDropDatabaseLinkStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDropDatabaseLinkStatement.java index 389f265170..88e1192e5a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDropDatabaseLinkStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDropDatabaseLinkStatement.java @@ -20,11 +20,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleDropDatabaseLinkStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; + private boolean _public; - private boolean _public; - - private SQLName name; + private SQLName name; public boolean isPublic() { return _public; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDropSequenceStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDropSequenceStatement.java index 057302768e..d43487c7f4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDropSequenceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDropSequenceStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleDropSequenceStatement extends OracleStatementImpl implements OracleDDLStatement { - private static final long serialVersionUID = 1L; - - private SQLName name; + private SQLName name; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExceptionStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExceptionStatement.java index b619e111b1..9b9b71f564 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExceptionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExceptionStatement.java @@ -25,8 +25,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleExceptionStatement extends OracleStatementImpl implements OracleStatement { - private static final long serialVersionUID = 1L; - private List items = new ArrayList(); + private List items = new ArrayList(); public List getItems() { return items; @@ -38,9 +37,8 @@ public class OracleExceptionStatement extends OracleStatementImpl implements Ora public static class Item extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; private SQLExpr when; - private List statements = new ArrayList(); + private List statements = new ArrayList(); public SQLExpr getWhen() { return when; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExitStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExitStatement.java index b2d3b10c37..f46456489f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExitStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExitStatement.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleExitStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; private SQLExpr when; public SQLExpr getWhen() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExplainStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExplainStatement.java index 7cd0793ac1..ba4dbbd78d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExplainStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExplainStatement.java @@ -22,11 +22,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleExplainStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - - private SQLCharExpr statementId; - private SQLExpr into; - private SQLStatement forStatement; + private SQLCharExpr statementId; + private SQLExpr into; + private SQLStatement forStatement; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExprStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExprStatement.java index e389cb05b2..d6eac3a3d7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExprStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExprStatement.java @@ -20,8 +20,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleExprStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - private SQLExpr expr; public OracleExprStatement(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleFetchStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleFetchStatement.java index dfd59552bd..7366cb3969 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleFetchStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleFetchStatement.java @@ -24,11 +24,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleFetchStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; + private SQLName cursorName; - private SQLName cursorName; - - private List into = new ArrayList(); + private List into = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleFileSpecification.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleFileSpecification.java index b3efcf171d..f5d799f8bf 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleFileSpecification.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleFileSpecification.java @@ -24,15 +24,13 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleFileSpecification extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; + private List fileNames = new ArrayList(); - private List fileNames = new ArrayList(); + private SQLExpr size; - private SQLExpr size; + private boolean autoExtendOff = false; - private boolean autoExtendOff = false; - - private SQLExpr autoExtendOn; + private SQLExpr autoExtendOn; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleForStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleForStatement.java index ba9fb8b288..61ca99a388 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleForStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleForStatement.java @@ -25,13 +25,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleForStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - private SQLName index; private SQLExpr range; - private List statements = new ArrayList(); + private List statements = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleGotoStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleGotoStatement.java index cb59f24f92..77964fc76f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleGotoStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleGotoStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleGotoStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - - private SQLName label; + private SQLName label; public OracleGotoStatement(){ } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleGrantStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleGrantStatement.java index 0092c206de..3225923cda 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleGrantStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleGrantStatement.java @@ -23,8 +23,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleGrantStatement extends OracleStatementImpl implements OracleStatement { - private static final long serialVersionUID = 1L; - private List privileges = new ArrayList(); private SQLExpr on; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleIfStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleIfStatement.java index 05d9f2d9a3..f738b5567e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleIfStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleIfStatement.java @@ -25,11 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleIfStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - private SQLExpr condition; - private List statements = new ArrayList(); - private List elseIfList = new ArrayList(); + private List statements = new ArrayList(); + private List elseIfList = new ArrayList(); private Else elseItem; @Override @@ -77,10 +75,8 @@ public class OracleIfStatement extends OracleStatementImpl { public static class ElseIf extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - private SQLExpr condition; - private List statements = new ArrayList(); + private List statements = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { @@ -111,9 +107,7 @@ public class OracleIfStatement extends OracleStatementImpl { public static class Else extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - - private List statements = new ArrayList(); + private List statements = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleInsertStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleInsertStatement.java index fce6a9264e..801afe2fa8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleInsertStatement.java @@ -27,11 +27,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleInsertStatement extends SQLInsertStatement implements OracleStatement { - private static final long serialVersionUID = 1L; - private OracleReturningClause returning; private OracleErrorLoggingClause errorLogging; - private List hints = new ArrayList(); + private List hints = new ArrayList(); public List getHints() { return hints; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLabelStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLabelStatement.java index 8b6d064f6a..dc73c493d5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLabelStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLabelStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleLabelStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - - private SQLName label; + private SQLName label; public OracleLabelStatement(){ } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLockTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLockTableStatement.java index e9706668b4..b77c0bb817 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLockTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLockTableStatement.java @@ -21,12 +21,10 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleLockTableStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - - private SQLName table; - private LockMode lockMode; - private boolean noWait = false; - private SQLExpr wait; + private SQLName table; + private LockMode lockMode; + private boolean noWait = false; + private SQLExpr wait; public boolean isNoWait() { return noWait; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLoopStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLoopStatement.java index 8e76dcb633..5dc868d78d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLoopStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLoopStatement.java @@ -23,9 +23,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleLoopStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - - private List statements = new ArrayList(); + private List statements = new ArrayList(); @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMergeStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMergeStatement.java index b98ac29aaf..61721dcfd0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMergeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMergeStatement.java @@ -29,17 +29,15 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleMergeStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; + private final List hints = new ArrayList(); - private final List hints = new ArrayList(); - - private SQLName into; - private String alias; - private SQLTableSource using; - private SQLExpr on; - private MergeUpdateClause updateClause; - private MergeInsertClause insertClause; - private OracleErrorLoggingClause errorLoggingClause; + private SQLName into; + private String alias; + private SQLTableSource using; + private SQLExpr on; + private MergeUpdateClause updateClause; + private MergeInsertClause insertClause; + private OracleErrorLoggingClause errorLoggingClause; public void accept0(OracleASTVisitor visitor) { if (visitor.visit(this)) { @@ -115,9 +113,7 @@ public class OracleMergeStatement extends OracleStatementImpl { public static class MergeUpdateClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - - private List items = new ArrayList(); + private List items = new ArrayList(); private SQLExpr where; private SQLExpr deleteWhere; @@ -159,11 +155,9 @@ public class OracleMergeStatement extends OracleStatementImpl { public static class MergeInsertClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - - private List columns = new ArrayList(); - private List values = new ArrayList(); - private SQLExpr where; + private List columns = new ArrayList(); + private List values = new ArrayList(); + private SQLExpr where; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMultiInsertStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMultiInsertStatement.java index c5855df593..668c09a8da 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMultiInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleMultiInsertStatement.java @@ -35,12 +35,10 @@ public class OracleMultiInsertStatement extends OracleStatementImpl { ALL, FIRST } - private static final long serialVersionUID = 1L; - - private SQLSelect subQuery; - private Option option; - private List entries = new ArrayList(); - private List hints = new ArrayList(1); + private SQLSelect subQuery; + private Option option; + private List entries = new ArrayList(); + private List hints = new ArrayList(1); public List getHints() { return hints; @@ -89,8 +87,7 @@ public class OracleMultiInsertStatement extends OracleStatementImpl { public static class ConditionalInsertClause extends OracleSQLObjectImpl implements Entry { - private static final long serialVersionUID = 1L; - private List items = new ArrayList(); + private List items = new ArrayList(); private InsertIntoClause elseItem; public InsertIntoClause getElseItem() { @@ -122,9 +119,8 @@ public class OracleMultiInsertStatement extends OracleStatementImpl { public static class ConditionalInsertClauseItem extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - private SQLExpr when; - private InsertIntoClause then; + private SQLExpr when; + private InsertIntoClause then; public SQLExpr getWhen() { return when; @@ -155,8 +151,6 @@ public class OracleMultiInsertStatement extends OracleStatementImpl { public static class InsertIntoClause extends SQLInsertInto implements OracleSQLObject, Entry { - private static final long serialVersionUID = 1L; - private OracleReturningClause returning; private OracleErrorLoggingClause errorLogging; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleOrderByItem.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleOrderByItem.java index 99770985c4..82e03d043a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleOrderByItem.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleOrderByItem.java @@ -22,9 +22,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleOrderByItem extends SQLSelectOrderByItem { - private static final long serialVersionUID = 1L; - - private NullsOrderType nullsOrderType; + private NullsOrderType nullsOrderType; public OracleOrderByItem(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePLSQLCommitStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePLSQLCommitStatement.java index 1a488a3da6..aa8f891dcc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePLSQLCommitStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePLSQLCommitStatement.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OraclePLSQLCommitStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - public OraclePLSQLCommitStatement(){ } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePrimaryKey.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePrimaryKey.java index 7da076b950..fde510eb62 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePrimaryKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OraclePrimaryKey.java @@ -27,10 +27,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OraclePrimaryKey extends OracleSQLObjectImpl implements SQLPrimaryKey, SQLTableElement { - private static final long serialVersionUID = 1L; - private SQLName name; - private List columns = new ArrayList(); + private List columns = new ArrayList(); private OracleUsingIndexClause using; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSavePointStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSavePointStatement.java index 36d7a8faf0..e0b4c97478 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSavePointStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSavePointStatement.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSavePointStatement extends OracleStatementImpl { - private static final long serialVersionUID = 1L; - - private SQLName to; + private SQLName to; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java index f9c7ca4b3c..58371d0a0c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java @@ -21,8 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelect extends SQLSelect { - private static final long serialVersionUID = 1L; - private OracleSelectForUpdate forUpdate; private OracleSelectRestriction restriction; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectForUpdate.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectForUpdate.java index 0a8477e2c3..8e38bf02f8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectForUpdate.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectForUpdate.java @@ -24,13 +24,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSelectForUpdate extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; + private final List of = new ArrayList(); - private final List of = new ArrayList(); - - private boolean notWait = false; + private boolean notWait = false; private SQLExpr wait; - private boolean skipLocked = false; + private boolean skipLocked = false; public OracleSelectForUpdate(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectHierachicalQueryClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectHierachicalQueryClause.java index 264349b1fb..77d55b581a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectHierachicalQueryClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectHierachicalQueryClause.java @@ -21,12 +21,10 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSelectHierachicalQueryClause extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - - private SQLExpr startWith; - private SQLExpr connectBy; - private boolean prior = false; - private boolean noCycle = false; + private SQLExpr startWith; + private SQLExpr connectBy; + private boolean prior = false; + private boolean noCycle = false; public OracleSelectHierachicalQueryClause(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectJoin.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectJoin.java index 3397593543..04ff92a4e5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectJoin.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectJoin.java @@ -23,8 +23,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelectJoin extends SQLJoinTableSource implements OracleSelectTableSource { - private static final long serialVersionUID = 1L; - protected OracleSelectPivotBase pivot; protected FlashbackQueryClause flashback; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectPivot.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectPivot.java index cc56b904f3..c075c16dae 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectPivot.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectPivot.java @@ -24,12 +24,10 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSelectPivot extends OracleSelectPivotBase { - private static final long serialVersionUID = 1L; - private boolean xml; - private final List items = new ArrayList(); - private final List pivotFor = new ArrayList(); - private final List pivotIn = new ArrayList(); + private final List items = new ArrayList(); + private final List pivotFor = new ArrayList(); + private final List pivotIn = new ArrayList(); public OracleSelectPivot(){ @@ -67,10 +65,8 @@ public class OracleSelectPivot extends OracleSelectPivotBase { public static class Item extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - - private String alias; - private SQLExpr expr; + private String alias; + private SQLExpr expr; public Item(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectPivotBase.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectPivotBase.java index da791a2d8a..62bb3a0b9a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectPivotBase.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectPivotBase.java @@ -23,9 +23,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl; public abstract class OracleSelectPivotBase extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - - protected final List pivotFor = new ArrayList(); + protected final List pivotFor = new ArrayList(); public OracleSelectPivotBase(){ 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 5af1444117..01fb203cd6 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 @@ -26,9 +26,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelectQueryBlock extends SQLSelectQueryBlock { - private static final long serialVersionUID = 1L; - - private final List hints = new ArrayList(1); + private final List hints = new ArrayList(1); private OracleSelectHierachicalQueryClause hierachicalQueryClause; private ModelClause modelClause; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectRestriction.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectRestriction.java index 44023b895f..a0abfd70ba 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectRestriction.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectRestriction.java @@ -20,17 +20,13 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public abstract class OracleSelectRestriction extends OracleSQLObjectImpl { - private static final long serialVersionUID = 1L; - public OracleSelectRestriction(){ } public static class CheckOption extends OracleSelectRestriction { - private static final long serialVersionUID = 1L; - - private OracleConstraint constraint; + private OracleConstraint constraint; public CheckOption(){ @@ -55,8 +51,6 @@ public abstract class OracleSelectRestriction extends OracleSQLObjectImpl { public static class ReadOnly extends OracleSelectRestriction { - private static final long serialVersionUID = 1L; - public ReadOnly(){ } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectSubqueryTableSource.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectSubqueryTableSource.java index 50a30f8efb..1146d7bd5a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectSubqueryTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectSubqueryTableSource.java @@ -23,8 +23,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelectSubqueryTableSource extends SQLSubqueryTableSource implements OracleSelectTableSource { - private static final long serialVersionUID = 1L; - protected OracleSelectPivotBase pivot; protected FlashbackQueryClause flashback; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectTableReference.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectTableReference.java index 413b702aba..17687cd5d6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectTableReference.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectTableReference.java @@ -24,9 +24,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelectTableReference extends SQLExprTableSource implements OracleSelectTableSource { - private static final long serialVersionUID = 1L; - - private boolean only = false; + private boolean only = false; protected OracleSelectPivotBase pivot; protected PartitionExtensionClause partition; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectUnPivot.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectUnPivot.java index 65cf96b1ee..8eac7dcd08 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectUnPivot.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectUnPivot.java @@ -24,12 +24,10 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSelectUnPivot extends OracleSelectPivotBase { - private static final long serialVersionUID = 1L; - private NullsIncludeType nullsIncludeType; - private final List items = new ArrayList(); + private final List items = new ArrayList(); - private final List pivotIn = new ArrayList(); + private final List pivotIn = new ArrayList(); public OracleSelectUnPivot(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSetTransactionStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSetTransactionStatement.java index 305838b4d5..b87ae52734 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSetTransactionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSetTransactionStatement.java @@ -21,11 +21,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSetTransactionStatement extends OracleSQLObjectImpl implements OracleStatement { - private static final long serialVersionUID = 1L; + private boolean readOnly = false; - private boolean readOnly = false; - - private SQLExpr name; + private SQLExpr name; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleStatementImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleStatementImpl.java index ca37636d58..8cae231df3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleStatementImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleStatementImpl.java @@ -22,14 +22,12 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class OracleStatementImpl extends SQLStatementImpl implements OracleStatement { - private static final long serialVersionUID = 1L; - protected void accept0(SQLASTVisitor visitor) { accept0((OracleASTVisitor) visitor); } public abstract void accept0(OracleASTVisitor visitor); - + public String toString() { return SQLUtils.toOracleString(this); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTruncateStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTruncateStatement.java index 1e285afa1d..b3592bffc8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTruncateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleTruncateStatement.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleTruncateStatement extends SQLTruncateStatement implements OracleStatement { - private static final long serialVersionUID = 1L; - - private boolean purgeSnapshotLog = false; + private boolean purgeSnapshotLog = false; @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateStatement.java index 5a6cd98f99..a5ccfb539d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateStatement.java @@ -26,15 +26,13 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleUpdateStatement extends SQLUpdateStatement implements OracleStatement { - private static final long serialVersionUID = 1L; - - private final List hints = new ArrayList(1); - private boolean only = false; + private final List hints = new ArrayList(1); + private boolean only = false; private String alias; private SQLExpr where; - private List returning = new ArrayList(); - private List returningInto = new ArrayList(); + private List returning = new ArrayList(); + private List returningInto = new ArrayList(); public OracleUpdateStatement(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUsingIndexClause.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUsingIndexClause.java index 6130f6e34a..2ad51148be 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUsingIndexClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUsingIndexClause.java @@ -18,22 +18,24 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl; +import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleStorageClause; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; -@SuppressWarnings("serial") public class OracleUsingIndexClause extends OracleSQLObjectImpl { - private SQLName index; - private SQLName tablespace; + private SQLName index; + private SQLName tablespace; - private SQLExpr ptcfree; - private SQLExpr pctused; - private SQLExpr initrans; - private SQLExpr maxtrans; + private SQLExpr ptcfree; + private SQLExpr pctused; + private SQLExpr initrans; + private SQLExpr maxtrans; - private Boolean enable = null; + private Boolean enable = null; - private boolean computeStatistics = false; + private boolean computeStatistics = false; + + private OracleStorageClause storage; public OracleUsingIndexClause(){ @@ -44,10 +46,19 @@ public class OracleUsingIndexClause extends OracleSQLObjectImpl { if (visitor.visit(this)) { acceptChild(visitor, index); acceptChild(visitor, tablespace); + acceptChild(visitor, storage); } visitor.endVisit(this); } + public OracleStorageClause getStorage() { + return storage; + } + + public void setStorage(OracleStorageClause storage) { + this.storage = storage; + } + public Boolean getEnable() { return enable; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTableParser.java index 2ba7bb3d9e..a4c390b433 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTableParser.java @@ -17,6 +17,7 @@ package com.alibaba.druid.sql.dialect.oracle.parser; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleLobStorageClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OraclePartitionByRangeClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleRangeValuesClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleStorageClause; @@ -62,19 +63,19 @@ public class OracleCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); stmt.setParallel(false); continue; - } else if (identifierEquals("LOGGING")) { + } else if (lexer.token() == Token.LOGGING) { lexer.nextToken(); stmt.setLogging(Boolean.TRUE); continue; - } else if (identifierEquals("CACHE")) { + } else if (lexer.token() == Token.CACHE) { lexer.nextToken(); stmt.setCache(Boolean.TRUE); continue; - } else if (identifierEquals("NOCACHE")) { + } else if (lexer.token() == Token.NOCACHE) { lexer.nextToken(); stmt.setCache(Boolean.FALSE); continue; - } else if (identifierEquals("NOCOMPRESS")) { + } else if (lexer.token() == Token.NOCOMPRESS) { lexer.nextToken(); stmt.setCompress(Boolean.FALSE); continue; @@ -89,37 +90,7 @@ public class OracleCreateTableParser extends SQLCreateTableParser { stmt.setPreserveRows(true); continue; } else if (identifierEquals("STORAGE")) { - lexer.nextToken(); - accept(Token.LPAREN); - - OracleStorageClause storage = new OracleStorageClause(); - for (;;) { - if (identifierEquals("INITIAL")) { - lexer.nextToken(); - storage.setInitial(this.exprParser.expr()); - continue; - } else if (identifierEquals("FREELISTS")) { - lexer.nextToken(); - storage.setFreeLists(this.exprParser.expr()); - continue; - } else if (identifierEquals("FREELIST")) { - lexer.nextToken(); - acceptIdentifier("GROUPS"); - storage.setFreeListGroups(this.exprParser.expr()); - continue; - } else if (identifierEquals("BUFFER_POOL")) { - lexer.nextToken(); - storage.setBufferPool(this.exprParser.expr()); - continue; - } else if (identifierEquals("OBJNO")) { - lexer.nextToken(); - storage.setObjno(this.exprParser.expr()); - continue; - } - - break; - } - accept(Token.RPAREN); + OracleStorageClause storage = ((OracleExprParser) this.exprParser).parseStorage(); stmt.setStorage(storage); continue; } else if (identifierEquals("organization")) { @@ -135,6 +106,14 @@ public class OracleCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); stmt.setPctused(this.exprParser.expr()); continue; + } else if (lexer.token() == Token.STORAGE) { + OracleStorageClause storage = ((OracleExprParser) this.exprParser).parseStorage(); + stmt.setStorage(storage); + continue; + } else if (lexer.token() == Token.LOB) { + OracleLobStorageClause lobStorage = ((OracleExprParser) this.exprParser).parseLobStorage(); + stmt.setLobStorage(lobStorage); + continue; } else if (lexer.token() == Token.INITRANS) { lexer.nextToken(); stmt.setInitrans(this.exprParser.expr()); @@ -147,6 +126,7 @@ public class OracleCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); accept(Token.CREATION); if (lexer.token() == Token.IMMEDIATE) { + lexer.nextToken(); stmt.setDeferredSegmentCreation(DeferredSegmentCreation.IMMEDIATE); } else { accept(Token.DEFERRED); @@ -164,76 +144,76 @@ public class OracleCreateTableParser extends SQLCreateTableParser { for (;;) { SQLName column = this.exprParser.name(); clause.getColumns().add(column); - + if (lexer.token() == Token.COMMA) { lexer.nextToken(); continue; } - + break; } accept(Token.RPAREN); - + if (identifierEquals("INTERVAL")) { lexer.nextToken(); clause.setInterval(this.exprParser.expr()); } - - if (identifierEquals("STORE")) { + + if (lexer.token() == Token.STORE) { lexer.nextToken(); accept(Token.IN); accept(Token.LPAREN); for (;;) { SQLName tablespace = this.exprParser.name(); clause.getStoreIn().add(tablespace); - + if (lexer.token() == Token.COMMA) { lexer.nextToken(); continue; } - + break; } accept(Token.RPAREN); } - + accept(Token.LPAREN); - + for (;;) { acceptIdentifier("PARTITION"); OracleRangeValuesClause range = new OracleRangeValuesClause(); range.setName(this.exprParser.name()); - + accept(Token.VALUES); acceptIdentifier("LESS"); acceptIdentifier("THAN"); - + accept(Token.LPAREN); for (;;) { SQLExpr rangeValue = this.exprParser.expr(); range.getValues().add(rangeValue); - + if (lexer.token() == Token.COMMA) { lexer.nextToken(); continue; } - + break; } accept(Token.RPAREN); - + clause.getRanges().add(range); - + if (lexer.token() == Token.COMMA) { lexer.nextToken(); continue; } - + break; } - + accept(Token.RPAREN); - + stmt.setPartitioning(clause); continue; } else { @@ -252,4 +232,5 @@ public class OracleCreateTableParser extends SQLCreateTableParser { return stmt; } + } 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 e197de1c77..59bef6be5a 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 @@ -41,6 +41,9 @@ import com.alibaba.druid.sql.dialect.oracle.ast.OracleDataTypeIntervalDay; import com.alibaba.druid.sql.dialect.oracle.ast.OracleDataTypeIntervalYear; import com.alibaba.druid.sql.dialect.oracle.ast.OracleDataTypeTimestamp; import com.alibaba.druid.sql.dialect.oracle.ast.OracleOrderBy; +import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleLobStorageClause; +import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleStorageClause; +import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleStorageClause.FlashCacheType; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleAggregateExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleAnalytic; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleAnalyticWindowing; @@ -79,6 +82,7 @@ public class OracleExprParser extends SQLExprParser { + public boolean allowStringAdditive = false; /** @@ -430,6 +434,24 @@ public class OracleExprParser extends SQLExprParser { case CREATION: case IMMEDIATE: case DEFERRED: + case STORAGE: + case NEXT: + case MINEXTENTS: + case MAXEXTENTS: + case PCTINCREASE: + case FLASH_CACHE: + case CELL_FLASH_CACHE: + case KEEP: + case NONE: + case LOB: + case STORE: + case ROW: + case CHUNK: + case CACHE: + case NOCACHE: + case LOGGING: + case NOCOMPRESS: + case KEEP_DUPLICATES: sqlExpr = new SQLIdentifierExpr(lexer.stringVal()); lexer.nextToken(); return primaryRest(sqlExpr); @@ -994,6 +1016,10 @@ public class OracleExprParser extends SQLExprParser { lexer.nextToken(); using.setEnable(false); continue; + } else if (lexer.token() == Token.STORAGE) { + OracleStorageClause storage = parseStorage(); + using.setStorage(storage); + continue; } else if (lexer.token() == Token.IDENTIFIER) { using.setTablespace(this.name()); break; @@ -1028,4 +1054,168 @@ public class OracleExprParser extends SQLExprParser { return expr; } + + public OracleLobStorageClause parseLobStorage() { + lexer.nextToken(); + + OracleLobStorageClause clause = new OracleLobStorageClause(); + + accept(Token.LPAREN); + this.names(clause.getItems()); + accept(Token.RPAREN); + + accept(Token.STORE); + accept(Token.AS); + + for (;;) { + if (identifierEquals("SECUREFILE")) { + lexer.nextToken(); + clause.setSecureFile(true); + continue; + } + + if (identifierEquals("BASICFILE")) { + lexer.nextToken(); + clause.setBasicFile(true); + continue; + } + + if (lexer.token() == Token.LPAREN) { + lexer.nextToken(); + + for (;;) { + if (lexer.token() == Token.TABLESPACE) { + lexer.nextToken(); + clause.setTableSpace(this.name()); + continue; + } + + if (lexer.token() == Token.ENABLE) { + lexer.nextToken(); + accept(Token.STORAGE); + accept(Token.IN); + accept(Token.ROW); + clause.setEnable(true); + continue; + } + + if (lexer.token() == Token.CHUNK) { + lexer.nextToken(); + clause.setChunk(this.primary()); + continue; + } + + if (lexer.token() == Token.NOCACHE) { + lexer.nextToken(); + clause.setCache(false); + if (lexer.token() == Token.LOGGING) { + lexer.nextToken(); + clause.setLogging(true); + } + continue; + } + + if (lexer.token() == Token.NOCOMPRESS) { + lexer.nextToken(); + clause.setCompress(false); + continue; + } + + if (lexer.token() == Token.KEEP_DUPLICATES) { + lexer.nextToken(); + clause.setKeepDuplicate(true); + continue; + } + + break; + } + + accept(Token.RPAREN); + } + + break; + } + return clause; + } + + public OracleStorageClause parseStorage() { + lexer.nextToken(); + accept(Token.LPAREN); + + OracleStorageClause storage = new OracleStorageClause(); + for (;;) { + if (identifierEquals("INITIAL")) { + lexer.nextToken(); + storage.setInitial(this.expr()); + continue; + } else if (lexer.token() == Token.NEXT) { + lexer.nextToken(); + storage.setNext(this.expr()); + continue; + } else if (lexer.token() == Token.MINEXTENTS) { + lexer.nextToken(); + storage.setMinExtents(this.expr()); + continue; + } else if (lexer.token() == Token.MAXEXTENTS) { + lexer.nextToken(); + storage.setMaxExtents(this.expr()); + continue; + } else if (lexer.token() == Token.PCTINCREASE) { + lexer.nextToken(); + storage.setPctIncrease(this.expr()); + continue; + } else if (identifierEquals("FREELISTS")) { + lexer.nextToken(); + storage.setFreeLists(this.expr()); + continue; + } else if (identifierEquals("FREELIST")) { + lexer.nextToken(); + acceptIdentifier("GROUPS"); + storage.setFreeListGroups(this.expr()); + continue; + } else if (identifierEquals("BUFFER_POOL")) { + lexer.nextToken(); + storage.setBufferPool(this.expr()); + continue; + } else if (identifierEquals("OBJNO")) { + lexer.nextToken(); + storage.setObjno(this.expr()); + continue; + } else if (lexer.token() == Token.FLASH_CACHE) { + lexer.nextToken(); + FlashCacheType flashCacheType; + if (lexer.token() == Token.KEEP) { + flashCacheType = FlashCacheType.KEEP; + lexer.nextToken(); + } else if (lexer.token() == Token.NONE) { + flashCacheType = FlashCacheType.NONE; + lexer.nextToken(); + } else { + accept(Token.DEFAULT); + flashCacheType = FlashCacheType.DEFAULT; + } + storage.setFlashCache(flashCacheType); + continue; + } else if (lexer.token() == Token.CELL_FLASH_CACHE) { + lexer.nextToken(); + FlashCacheType flashCacheType; + if (lexer.token() == Token.KEEP) { + flashCacheType = FlashCacheType.KEEP; + lexer.nextToken(); + } else if (lexer.token() == Token.NONE) { + flashCacheType = FlashCacheType.NONE; + lexer.nextToken(); + } else { + accept(Token.DEFAULT); + flashCacheType = FlashCacheType.DEFAULT; + } + storage.setCellFlashCache(flashCacheType); + continue; + } + + break; + } + accept(Token.RPAREN); + return storage; + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java index a982be7e74..513347ac9d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java @@ -88,6 +88,24 @@ public class OracleLexer extends Lexer { map.put("CREATION", Token.CREATION); map.put("IMMEDIATE", Token.IMMEDIATE); map.put("DEFERRED", Token.DEFERRED); + map.put("STORAGE", Token.STORAGE); + map.put("NEXT", Token.NEXT); + map.put("MINEXTENTS", Token.MINEXTENTS); + map.put("MAXEXTENTS", Token.MAXEXTENTS); + map.put("PCTINCREASE", Token.PCTINCREASE); + map.put("FLASH_CACHE", Token.FLASH_CACHE); + map.put("CELL_FLASH_CACHE", Token.CELL_FLASH_CACHE); + map.put("KEEP", Token.KEEP); + map.put("NONE", Token.NONE); + map.put("LOB", Token.LOB); + map.put("STORE", Token.STORE); + map.put("ROW", Token.ROW); + map.put("CHUNK", Token.CHUNK); + map.put("CACHE", Token.CACHE); + map.put("NOCACHE", Token.NOCACHE); + map.put("LOGGING", Token.LOGGING); + map.put("NOCOMPRESS", Token.NOCOMPRESS); + map.put("KEEP_DUPLICATES", Token.KEEP_DUPLICATES); DEFAULT_ORACLE_KEYWORDS = new Keywords(map); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java index d807677401..bf3b417bdb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java @@ -1655,6 +1655,31 @@ public class OracleStatementParser extends SQLStatementParser { lexer.nextToken(); stmt.setTablespace(this.exprParser.name()); continue; + } else if (lexer.token() == Token.PCTFREE) { + lexer.nextToken(); + stmt.setPtcfree(this.exprParser.expr()); + continue; + } else if (lexer.token() == Token.INITRANS) { + lexer.nextToken(); + stmt.setInitrans(this.exprParser.expr()); + continue; + } else if (lexer.token() == Token.MAXTRANS) { + lexer.nextToken(); + stmt.setMaxtrans(this.exprParser.expr()); + continue; + } else if (lexer.token() == Token.COMPUTE) { + lexer.nextToken(); + acceptIdentifier("STATISTICS"); + stmt.setComputeStatistics(true); + continue; + } else if (lexer.token() == Token.ENABLE) { + lexer.nextToken(); + stmt.setEnable(true); + continue; + } else if (lexer.token() == Token.DISABLE) { + lexer.nextToken(); + stmt.setEnable(false); + continue; } else if (identifierEquals("ONLINE")) { lexer.nextToken(); stmt.setOnline(true); @@ -1701,11 +1726,11 @@ public class OracleStatementParser extends SQLStatementParser { accept(Token.BY); stmt.setIncrementBy(this.exprParser.expr()); continue; - } else if (identifierEquals("CACHE")) { + } else if (lexer.token() == Token.CACHE) { lexer.nextToken(); stmt.setCache(Boolean.TRUE); continue; - } else if (identifierEquals("NOCACHE")) { + } else if (lexer.token() == Token.NOCACHE) { lexer.nextToken(); stmt.setCache(Boolean.FALSE); continue; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java index 6555685ec4..dbcaf6293d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java @@ -26,6 +26,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.clause.FlashbackQueryClause.Vers import com.alibaba.druid.sql.dialect.oracle.ast.clause.GroupingSetExpr; import com.alibaba.druid.sql.dialect.oracle.ast.clause.ModelClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleErrorLoggingClause; +import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleLobStorageClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleParameter; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OraclePartitionByRangeClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleRangeValuesClause; @@ -606,4 +607,8 @@ public interface OracleASTVisitor extends SQLASTVisitor { boolean visit(OracleUsingIndexClause x); void endVisit(OracleUsingIndexClause x); + + boolean visit(OracleLobStorageClause x); + + void endVisit(OracleLobStorageClause x); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitorAdapter.java index 5f22cc1632..6d25062396 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitorAdapter.java @@ -34,6 +34,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.clause.ModelClause.ModelRulesCla import com.alibaba.druid.sql.dialect.oracle.ast.clause.ModelClause.QueryPartitionClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.ModelClause.ReturnRowsClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleErrorLoggingClause; +import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleLobStorageClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleParameter; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OraclePartitionByRangeClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleRangeValuesClause; @@ -1376,4 +1377,14 @@ public class OracleASTVisitorAdapter extends SQLASTVisitorAdapter implements Ora } + @Override + public boolean visit(OracleLobStorageClause x) { + return true; + } + + @Override + public void endVisit(OracleLobStorageClause x) { + + } + } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java index 7a88797688..b9a8f74c81 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java @@ -58,6 +58,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.clause.ModelClause.QueryPartitio import com.alibaba.druid.sql.dialect.oracle.ast.clause.ModelClause.ReferenceModelClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.ModelClause.ReturnRowsClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleErrorLoggingClause; +import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleLobStorageClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleParameter; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OraclePartitionByRangeClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleRangeValuesClause; @@ -2085,11 +2086,36 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS print(")"); if (x.isIndexOnlyTopLevel()) { - print(" INDEX ONLY TOPLEVEL"); + println(); + print("INDEX ONLY TOPLEVEL"); + } + + if (x.getPtcfree() != null) { + println(); + print("PCTFREE "); + x.getPtcfree().accept(this); + } + + if (x.getInitrans() != null) { + println(); + print("INITRANS "); + x.getInitrans().accept(this); + } + + if (x.getMaxtrans() != null) { + println(); + print("MAXTRANS "); + x.getMaxtrans().accept(this); + } + + if (x.isComputeStatistics()) { + println(); + print("COMPUTE STATISTICS"); } if (x.getTablespace() != null) { - print(" TABLESPACE "); + println(); + print("TABLESPACE "); x.getTablespace().accept(this); } @@ -2321,7 +2347,7 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS printAndAccept(x.getColumns(), ", "); print(")"); if (x.getUsing() != null) { - print(" "); + println(); x.getUsing().accept(this); } return false; @@ -2336,75 +2362,95 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS public boolean visit(OracleCreateTableStatement x) { this.visit((SQLCreateTableStatement) x); - incrementIndent(); - if (x.isOrganizationIndex()) { - print(" ORGANIZATION INDEX"); + println(); + print("ORGANIZATION INDEX"); } if (x.getPtcfree() != null) { - print(" PCTFREE "); + println(); + print("PCTFREE "); x.getPtcfree().accept(this); } if (x.getInitrans() != null) { - print(" INITRANS "); + println(); + print("INITRANS "); x.getInitrans().accept(this); } if (x.getMaxtrans() != null) { - print(" MAXTRANS "); + println(); + print("MAXTRANS "); x.getMaxtrans().accept(this); } if (x.isInMemoryMetadata()) { - print(" IN_MEMORY_METADATA"); + println(); + print("IN_MEMORY_METADATA"); } if (x.isCursorSpecificSegment()) { - print(" CURSOR_SPECIFIC_SEGMENT"); + println(); + print("CURSOR_SPECIFIC_SEGMENT"); } if (x.getParallel() == Boolean.TRUE) { - print(" PARALLEL"); + println(); + print("PARALLEL"); } else if (x.getParallel() == Boolean.FALSE) { - print(" NOPARALLEL"); + println(); + print("NOPARALLEL"); } if (x.getCache() == Boolean.TRUE) { - print(" CACHE"); + println(); + print("CACHE"); } else if (x.getCache() == Boolean.FALSE) { - print(" NOCACHE"); + println(); + print("NOCACHE"); } if (x.getCompress() == Boolean.TRUE) { - print(" COMPRESS"); + println(); + print("COMPRESS"); } else if (x.getCompress() == Boolean.FALSE) { - print(" NOCOMPRESS"); + println(); + print("NOCOMPRESS"); } if (x.getLogging() == Boolean.TRUE) { - print(" LOGGING"); + println(); + print("LOGGING"); } else if (x.getLogging() == Boolean.FALSE) { - print(" NOLOGGING"); + println(); + print("NOLOGGING"); } if (x.getTablespace() != null) { - print(" TABLESPACE "); + println(); + print("TABLESPACE "); x.getTablespace().accept(this); } if (x.getStorage() != null) { - print(" "); + println(); x.getStorage().accept(this); } + + if (x.getLobStorage() != null) { + println(); + x.getLobStorage().accept(this); + } if (x.isOnCommit()) { - print(" ON COMMIT"); + println(); + print("ON COMMIT"); } if (x.isPreserveRows()) { - print(" PRESERVE ROWS"); + println(); + print("PRESERVE ROWS"); } if (x.getPartitioning() != null) { @@ -2418,7 +2464,6 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS println(); x.getSelect().accept(this); } - decrementIndent(); return false; } @@ -3161,4 +3206,98 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS public void endVisit(OracleUsingIndexClause x) { } + + @Override + public boolean visit(OracleLobStorageClause x) { + print("LOB ("); + printAndAccept(x.getItems(), ","); + print(") STORE AS "); + + if (x.isSecureFile()) { + print("SECUREFILE "); + } + + if (x.isBasicFile()) { + print("BASICFILE "); + } + + boolean first = true; + print('('); + if (x.getTableSpace() != null) { + if (!first) { + print(' '); + } + print("TABLESPACE "); + x.getTableSpace().accept(this); + first = false; + } + + if (x.getEnable() != null) { + if (!first) { + print(' '); + } + if (x.getEnable().booleanValue()) { + print("ENABLE STORAGE IN ROW"); + } else { + print("DISABLE STORAGE IN ROW"); + } + } + + if (x.getChunk() != null) { + if (!first) { + print(' '); + } + print("CHUNK "); + x.getChunk().accept(this); + } + + if (x.getCache() != null) { + if (!first) { + print(' '); + } + if (x.getCache().booleanValue()) { + print("CACHE"); + } else { + print("NOCACHE"); + } + + if (x.getLogging() != null) { + if (x.getLogging().booleanValue()) { + print(" LOGGING"); + } else { + print(" NOLOGGING"); + } + } + } + + if (x.getCompress() != null) { + if (!first) { + print(' '); + } + if (x.getCompress().booleanValue()) { + print("COMPRESS"); + } else { + print("NOCOMPRESS"); + } + } + + if (x.getKeepDuplicate() != null) { + if (!first) { + print(' '); + } + if (x.getKeepDuplicate().booleanValue()) { + print("KEEP_DUPLICATES"); + } else { + print("DEDUPLICATE"); + } + } + + print(')'); + return false; + } + + @Override + public void endVisit(OracleLobStorageClause x) { + + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java index 8dc2bed9df..8e82d39fcc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java @@ -56,6 +56,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.clause.ModelClause.ModelRulesCla import com.alibaba.druid.sql.dialect.oracle.ast.clause.ModelClause.QueryPartitionClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.ModelClause.ReturnRowsClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleErrorLoggingClause; +import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleLobStorageClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleParameter; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OraclePartitionByRangeClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleRangeValuesClause; @@ -1795,4 +1796,14 @@ public class OracleSchemaStatVisitor extends SchemaStatVisitor implements Oracle public void endVisit(OracleUsingIndexClause x) { } + + @Override + public boolean visit(OracleLobStorageClause x) { + return false; + } + + @Override + public void endVisit(OracleLobStorageClause x) { + + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGOrderBy.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGOrderBy.java index 61251ad9b8..8269b715bc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGOrderBy.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGOrderBy.java @@ -20,11 +20,8 @@ import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGOrderBy extends SQLOrderBy { - private static final long serialVersionUID = 1L; - - private boolean sibings; - + private boolean sibings; public boolean isSibings() { return this.sibings; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGSQLObjectImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGSQLObjectImpl.java index a196e38575..0c20601c21 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGSQLObjectImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGSQLObjectImpl.java @@ -21,8 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class PGSQLObjectImpl extends SQLObjectImpl implements PGSQLObject { - private static final long serialVersionUID = 1L; - public PGSQLObjectImpl(){ } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGWithClause.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGWithClause.java index a04e8e516c..c692ca2713 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGWithClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGWithClause.java @@ -21,31 +21,31 @@ import java.util.List; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; public class PGWithClause extends PGSQLObjectImpl { - private static final long serialVersionUID = 1L; - private boolean recursive = false; - private List withQuery = new ArrayList(2); - public boolean isRecursive() { - return recursive; - } + private boolean recursive = false; + private List withQuery = new ArrayList(2); - public void setRecursive(boolean recursive) { - this.recursive = recursive; - } + public boolean isRecursive() { + return recursive; + } - public List getWithQuery() { - return withQuery; - } + public void setRecursive(boolean recursive) { + this.recursive = recursive; + } - public void setWithQuery(List withQuery) { - this.withQuery = withQuery; - } + public List getWithQuery() { + return withQuery; + } - @Override - public void accept0(PGASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, withQuery); - } - visitor.endVisit(this); - } + public void setWithQuery(List withQuery) { + this.withQuery = withQuery; + } + + @Override + public void accept0(PGASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, withQuery); + } + visitor.endVisit(this); + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGWithQuery.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGWithQuery.java index bf7da152c0..f08e85fc8c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGWithQuery.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGWithQuery.java @@ -24,9 +24,8 @@ import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; public class PGWithQuery extends PGSQLObjectImpl { - private static final long serialVersionUID = 1L; private SQLExpr name; - private final List columns = new ArrayList(); + private final List columns = new ArrayList(); private SQLStatement query; public SQLExpr getName() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGParameter.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGParameter.java index 4e3f33252b..c22c5aca08 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGParameter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGParameter.java @@ -22,10 +22,8 @@ import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; public class PGParameter extends PGSQLObjectImpl { - private static final long serialVersionUID = 1L; - private SQLExpr name; - private SQLDataType dataType; - + private SQLExpr name; + private SQLDataType dataType; public SQLExpr getName() { return name; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGDeleteStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGDeleteStatement.java index 6ab9bfce4b..d3137e43f7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGDeleteStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGDeleteStatement.java @@ -26,12 +26,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGDeleteStatement extends SQLDeleteStatement implements PGSQLStatement { - private static final long serialVersionUID = 1L; - private PGWithClause with; - private boolean only = false; - private List using = new ArrayList(2); - private boolean returning; - private String alias; + private PGWithClause with; + private boolean only = false; + private List using = new ArrayList(2); + private boolean returning; + private String alias; public boolean isReturning() { return returning; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGFunctionTableSource.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGFunctionTableSource.java index 16bede79b2..f889275776 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGFunctionTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGFunctionTableSource.java @@ -27,9 +27,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGFunctionTableSource extends SQLExprTableSource implements PGSQLObject { - private static final long serialVersionUID = 1L; - - private final List parameters = new ArrayList(); + private final List parameters = new ArrayList(); public PGFunctionTableSource(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGInsertStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGInsertStatement.java index 1cd0dde67e..1659ac9185 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGInsertStatement.java @@ -26,10 +26,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGInsertStatement extends SQLInsertStatement implements PGSQLStatement { - private static final long serialVersionUID = 1L; - private PGWithClause with; - private List valuesList = new ArrayList(); + private List valuesList = new ArrayList(); private SQLExpr returning; public SQLExpr getReturning() { @@ -66,7 +64,7 @@ public class PGInsertStatement extends SQLInsertStatement implements PGSQLStatem public List getValuesList() { return valuesList; } - + public void addValueCause(ValuesClause valueClause) { valueClause.setParent(this); valuesList.add(valueClause); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSelectQueryBlock.java index af4a2cf333..6e58c6893c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSelectQueryBlock.java @@ -28,18 +28,16 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGSelectQueryBlock extends SQLSelectQueryBlock { - private static final long serialVersionUID = 1L; + private PGWithClause with; + private List distinctOn = new ArrayList(2); + private SQLExpr limit; + private SQLExpr offset; + private WindowClause window; - private PGWithClause with; - private List distinctOn = new ArrayList(2); - private SQLExpr limit; - private SQLExpr offset; - private WindowClause window; - - private SQLOrderBy orderBy; - private FetchClause fetch; - private ForClause forClause; - private IntoOption intoOption; + private SQLOrderBy orderBy; + private FetchClause fetch; + private ForClause forClause; + private IntoOption intoOption; public static enum IntoOption { TEMPORARY, TEMP, UNLOGGED @@ -143,9 +141,8 @@ public class PGSelectQueryBlock extends SQLSelectQueryBlock { public static class WindowClause extends PGSQLObjectImpl { - private static final long serialVersionUID = 1L; - private SQLExpr name; - private List definition = new ArrayList(2); + private SQLExpr name; + private List definition = new ArrayList(2); public SQLExpr getName() { return name; @@ -175,8 +172,6 @@ public class PGSelectQueryBlock extends SQLSelectQueryBlock { public static class FetchClause extends PGSQLObjectImpl { - private static final long serialVersionUID = 1L; - public static enum Option { FIRST, NEXT } @@ -212,8 +207,6 @@ public class PGSelectQueryBlock extends SQLSelectQueryBlock { public static class ForClause extends PGSQLObjectImpl { - private static final long serialVersionUID = 1L; - public static enum Option { UPDATE, SHARE } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSelectStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSelectStatement.java index 65439c23ee..d347842377 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSelectStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSelectStatement.java @@ -23,8 +23,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGSelectStatement extends SQLSelectStatement implements PGSQLStatement { - private static final long serialVersionUID = 1L; - private PGWithClause with; + private PGWithClause with; public PGSelectStatement(){ } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGTruncateStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGTruncateStatement.java index d2536313e6..1e60784078 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGTruncateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGTruncateStatement.java @@ -18,13 +18,11 @@ package com.alibaba.druid.sql.dialect.postgresql.ast.stmt; import com.alibaba.druid.sql.ast.statement.SQLTruncateStatement; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; -public class PGTruncateStatement extends SQLTruncateStatement implements PGSQLStatement{ +public class PGTruncateStatement extends SQLTruncateStatement implements PGSQLStatement { - private static final long serialVersionUID = 1L; - - private boolean only; - private Boolean restartIdentity; - private Boolean cascade; + private boolean only; + private Boolean restartIdentity; + private Boolean cascade; public boolean isOnly() { return only; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGUpdateStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGUpdateStatement.java index 309854a95e..feb22081ac 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGUpdateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGUpdateStatement.java @@ -27,15 +27,13 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGUpdateStatement extends SQLUpdateStatement implements PGSQLStatement { - private static final long serialVersionUID = 1L; + private boolean only = false; - private boolean only = false; + private PGWithClause with; - private PGWithClause with; + private List returning = new ArrayList(2); - private List returning = new ArrayList(2); - - private SQLTableSource from; + private SQLTableSource from; public SQLTableSource getFrom() { return from; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerColumnDefinition.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerColumnDefinition.java index f9aa063128..ade575df08 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerColumnDefinition.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerColumnDefinition.java @@ -21,9 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLServerColumnDefinition extends SQLColumnDefinition implements SQLServerObject { - private static final long serialVersionUID = 1L; - - private Identity identity; + private Identity identity; public SQLServerColumnDefinition(){ @@ -57,16 +55,15 @@ public class SQLServerColumnDefinition extends SQLColumnDefinition implements SQ visitor.endVisit(this); } - @SuppressWarnings("serial") public static class Identity extends SQLServerObjectImpl { private Integer seed; private Integer increment; private boolean notForReplication; - - public Identity() { - + + public Identity(){ + } public Integer getSeed() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerObjectImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerObjectImpl.java index 3ff02b8fb2..d6021b3b20 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerObjectImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerObjectImpl.java @@ -21,8 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class SQLServerObjectImpl extends SQLObjectImpl implements SQLServerObject { - private static final long serialVersionUID = 1L; - public SQLServerObjectImpl(){ } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelect.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelect.java index 7f57792dcc..16c8e594ac 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelect.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelect.java @@ -19,9 +19,4 @@ import com.alibaba.druid.sql.ast.statement.SQLSelect; public class SQLServerSelect extends SQLSelect { - /** - * - */ - private static final long serialVersionUID = 1L; - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelectQueryBlock.java index 86fe529395..555a9348b6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelectQueryBlock.java @@ -21,12 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLServerSelectQueryBlock extends SQLSelectQueryBlock { - /** - * - */ - private static final long serialVersionUID = 1L; - - private SQLServerTop top; + private SQLServerTop top; public SQLServerTop getTop() { return top; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerTop.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerTop.java index e887e75d3f..11e9bf9110 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerTop.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerTop.java @@ -20,20 +20,15 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor; public class SQLServerTop extends SQLServerObjectImpl { - /** - * - */ - private static final long serialVersionUID = 1L; + private SQLExpr expr; + private boolean percent; + private boolean withTies; + + public SQLServerTop(){ - private SQLExpr expr; - private boolean percent; - private boolean withTies; - - public SQLServerTop() { - } - - public SQLServerTop(SQLExpr expr) { + + public SQLServerTop(SQLExpr expr){ this.setExpr(expr); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/expr/SQLServerObjectReferenceExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/expr/SQLServerObjectReferenceExpr.java index 113c9b4ed9..64d5144c19 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/expr/SQLServerObjectReferenceExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/expr/SQLServerObjectReferenceExpr.java @@ -24,11 +24,9 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor; public class SQLServerObjectReferenceExpr extends SQLServerObjectImpl implements SQLServerExpr, SQLName { - private static final long serialVersionUID = 1L; - - private String server; - private String database; - private String schema; + private String server; + private String database; + private String schema; public SQLServerObjectReferenceExpr(){ @@ -46,12 +44,12 @@ public class SQLServerObjectReferenceExpr extends SQLServerObjectImpl implements throw new IllegalArgumentException(owner.toString()); } } - + public String getSimleName() { if (schema != null) { return schema; } - + if (database != null) { return database; } @@ -77,12 +75,12 @@ public class SQLServerObjectReferenceExpr extends SQLServerObjectImpl implements if (database != null) { buf.append(database); flag = true; - } + } if (flag) { buf.append('.'); } - + if (schema != null) { buf.append(schema); flag = true; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerExecStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerExecStatement.java index ed1359bd02..334ac379c7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerExecStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerExecStatement.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerObjectImpl; import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerStatement; import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor; -@SuppressWarnings("serial") public class SQLServerExecStatement extends SQLServerObjectImpl implements SQLServerStatement { private SQLName moduleName; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerInsertStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerInsertStatement.java index 460455d4cb..470e5aad9c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerInsertStatement.java @@ -25,9 +25,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLServerInsertStatement extends SQLInsertStatement implements SQLServerObject { - private static final long serialVersionUID = 2652393792927901563L; - - private List valuesList = new ArrayList(); + private List valuesList = new ArrayList(); public ValuesClause getValues() { if (valuesList.size() == 0) { @@ -47,7 +45,7 @@ public class SQLServerInsertStatement extends SQLInsertStatement implements SQLS public List getValuesList() { return valuesList; } - + @Override protected void accept0(SQLASTVisitor visitor) { this.accept0((SQLServerASTVisitor) visitor); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerUpdateStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerUpdateStatement.java index c87dfd3ccf..512c84daff 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerUpdateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerUpdateStatement.java @@ -24,15 +24,13 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLServerUpdateStatement extends SQLUpdateStatement implements SQLServerStatement { - private static final long serialVersionUID = 1L; + private SQLServerTop top; + private SQLTableSource from; - private SQLServerTop top; - private SQLTableSource from; - public SQLServerTop getTop() { return top; } - + public void setTop(SQLServerTop top) { this.top = top; } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java index b725a2d636..181e506973 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java @@ -65,7 +65,33 @@ public class SQLParser { case KEY: case INDEX: case CASE: - alias = lexer.token().name(); + case MODEL: + case PCTFREE: + case INITRANS: + case MAXTRANS: + case SEGMENT: + case CREATION: + case IMMEDIATE: + case DEFERRED: + case STORAGE: + case NEXT: + case MINEXTENTS: + case MAXEXTENTS: + case PCTINCREASE: + case FLASH_CACHE: + case CELL_FLASH_CACHE: + case KEEP: + case NONE: + case LOB: + case STORE: + case ROW: + case CHUNK: + case CACHE: + case NOCACHE: + case LOGGING: + case NOCOMPRESS: + case KEEP_DUPLICATES: + alias = lexer.stringVal(); lexer.nextToken(); return alias; case QUES: diff --git a/src/main/java/com/alibaba/druid/sql/parser/Token.java b/src/main/java/com/alibaba/druid/sql/parser/Token.java index a0ca1c617a..7b1b00c66d 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Token.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Token.java @@ -177,6 +177,22 @@ public enum Token { CREATION("CREATION"), IMMEDIATE("IMMEDIATE"), DEFERRED("DEFERRED"), + STORAGE("STORAGE"), + MINEXTENTS("MINEXTENTS"), + MAXEXTENTS("MAXEXTENTS"), + PCTINCREASE("PCTINCREASE"), + FLASH_CACHE("FLASH_CACHE"), + CELL_FLASH_CACHE("CELL_FLASH_CACHE"), + KEEP("KEEP"), + NONE("NONE"), + LOB("LOB"), + STORE("STORE"), + CHUNK("CHUNK"), + CACHE("CACHE"), + NOCACHE("NOCACHE"), + LOGGING("LOGGING"), + NOCOMPRESS("NOCOMPRESS"), + KEEP_DUPLICATES("KEEP_DUPLICATES"), COMPUTE("COMPUTE"), diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/Binlog_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/Binlog_Test.java index 990c59e542..ad14d87328 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/Binlog_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/Binlog_Test.java @@ -17,9 +17,10 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Assert; + import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest3.java index b90e06844b..498f83cfb1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest4.java new file mode 100644 index 0000000000..01d0d03939 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest4.java @@ -0,0 +1,62 @@ +/* + * Copyright 1999-2011 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.oracle; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.OracleTest; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; + +public class OracleCreateIndexTest4 extends OracleTest { + + public void test_0() throws Exception { + String sql = // + " CREATE UNIQUE INDEX \"SONAR\".\"UNIQ_AUTHOR_LOGINS\" ON \"SONAR\".\"AUTHORS\" (\"LOGIN\") " // + + " PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS " // + + " TABLESPACE \"USERS\" ;"; + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); + statemen.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("relationships : " + visitor.getRelationships()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("SONAR.AUTHORS"))); + + Assert.assertEquals(1, visitor.getColumns().size()); + + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("SONAR.AUTHORS", "LOGIN"))); + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "YEAR"))); + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "order_mode"))); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest18.java index 1a8b5fb795..5960b53674 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest18.java @@ -58,8 +58,15 @@ public class OracleCreateTableTest18 extends OracleTest { + "\n\t\"LOGIN\" VARCHAR2(100 BYTE)," // + "\n\t\"CREATED_AT\" TIMESTAMP(6)," // + "\n\t\"UPDATED_AT\" TIMESTAMP(6)," // - + "\n\tPRIMARY KEY (\"ID\") USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS TABLESPACE \"USERS\" ENABLE" // - + "\n) PCTFREE 10 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING TABLESPACE \"USERS\"", // + + "\n\tPRIMARY KEY (\"ID\")" + + "\n\tUSING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS TABLESPACE \"USERS\" ENABLE" // + + "\n)" + + "\nPCTFREE 10" + + "\nINITRANS 1" + + "\nMAXTRANS 255" + + "\nNOCOMPRESS" + + "\nLOGGING" + + "\nTABLESPACE \"USERS\"", // SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest19.java new file mode 100644 index 0000000000..968f3e5c2a --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest19.java @@ -0,0 +1,92 @@ +/* + * Copyright 1999-2011 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.oracle; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.OracleTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.util.JdbcConstants; + +public class OracleCreateTableTest19 extends OracleTest { + + public void test_types() throws Exception { + String sql = // + " CREATE TABLE \"SONAR\".\"ACTIVE_DASHBOARDS\" " // + + " ( \"ID\" NUMBER(38,0) NOT NULL ENABLE, " // + + " \"DASHBOARD_ID\" NUMBER(38,0) NOT NULL ENABLE, " // + + " \"USER_ID\" NUMBER(38,0), " // + + " \"ORDER_INDEX\" NUMBER(38,0), " // + + " PRIMARY KEY (\"ID\")" // + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS " // + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645" // + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1" // + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)" // + + " TABLESPACE \"USERS\" ENABLE" // + + " ) SEGMENT CREATION IMMEDIATE " // + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 " // + + " NOCOMPRESS LOGGING" // + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645" // + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1" // + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)" // + + " TABLESPACE \"USERS\" ;"; + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statement = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + Assert.assertEquals("CREATE TABLE \"SONAR\".\"ACTIVE_DASHBOARDS\" (" // + + "\n\t\"ID\" NUMBER(38, 0) NOT NULL ENABLE," // + + "\n\t\"DASHBOARD_ID\" NUMBER(38, 0) NOT NULL ENABLE," // + + "\n\t\"USER_ID\" NUMBER(38, 0)," // + + "\n\t\"ORDER_INDEX\" NUMBER(38, 0)," // + + "\n\tPRIMARY KEY (\"ID\")" + + "\n\tUSING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS TABLESPACE \"USERS\" ENABLE" + + "\n)" + + "\nPCTFREE 10" + + "\nINITRANS 1" + + "\nMAXTRANS 255" + + "\nNOCOMPRESS" + + "\nLOGGING" + + "\nTABLESPACE \"USERS\"" + + "\nSTORAGE ( INITIAL 65536 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)", + SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); + statement.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("relationships : " + visitor.getRelationships()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + + Assert.assertEquals(4, visitor.getColumns().size()); + + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("SONAR.ACTIVE_DASHBOARDS", "ID"))); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest20.java new file mode 100644 index 0000000000..d1566718db --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest20.java @@ -0,0 +1,93 @@ +/* + * Copyright 1999-2011 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.oracle; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.OracleTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.util.JdbcConstants; + +public class OracleCreateTableTest20 extends OracleTest { + + public void test_types() throws Exception { + String sql = // + " CREATE TABLE \"SONAR\".\"ACTIVE_RULE_NOTES\" " // + + " ( \"ID\" NUMBER(38,0) NOT NULL ENABLE, " // + + " \"CREATED_AT\" TIMESTAMP (6), " // + + " \"UPDATED_AT\" TIMESTAMP (6), " // + + " \"ACTIVE_RULE_ID\" NUMBER(38,0), " // + + " \"USER_LOGIN\" VARCHAR2(40 BYTE), " // + + " \"DATA\" BLOB, " // + + " PRIMARY KEY (\"ID\")" // + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS " // + + " TABLESPACE \"USERS\" ENABLE" // + + " ) SEGMENT CREATION DEFERRED " // + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 " // + + " NOCOMPRESS LOGGING" // + + " TABLESPACE \"USERS\" " // + + " LOB (\"DATA\") STORE AS SECUREFILE (" // + + " TABLESPACE \"USERS\" ENABLE STORAGE IN ROW CHUNK 8192" // + + " NOCACHE LOGGING NOCOMPRESS KEEP_DUPLICATES ) ;"; + + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statement = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + Assert.assertEquals("CREATE TABLE \"SONAR\".\"ACTIVE_RULE_NOTES\" (" // + + "\n\t\"ID\" NUMBER(38, 0) NOT NULL ENABLE,"// + + "\n\t\"CREATED_AT\" TIMESTAMP(6),"// + + "\n\t\"UPDATED_AT\" TIMESTAMP(6),"// + + "\n\t\"ACTIVE_RULE_ID\" NUMBER(38, 0),"// + + "\n\t\"USER_LOGIN\" VARCHAR2(40 BYTE),"// + + "\n\t\"DATA\" BLOB,"// + + "\n\tPRIMARY KEY (\"ID\")"// + + "\n\tUSING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS TABLESPACE \"USERS\" ENABLE"// + + "\n)"// + + "\nPCTFREE 10"// + + "\nINITRANS 1"// + + "\nMAXTRANS 255"// + + "\nNOCOMPRESS"// + + "\nLOGGING"// + + "\nTABLESPACE \"USERS\""// + + "\nLOB (\"DATA\") STORE AS SECUREFILE (TABLESPACE \"USERS\" ENABLE STORAGE IN ROW CHUNK 8192 NOCACHE LOGGING NOCOMPRESS KEEP_DUPLICATES)",// + SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); + statement.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("relationships : " + visitor.getRelationships()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + + Assert.assertEquals(6, visitor.getColumns().size()); + + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("SONAR.ACTIVE_RULE_NOTES", "ID"))); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePivotClauseTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePivotClauseTest.java index 12b8a2c962..2a74206728 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePivotClauseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePivotClauseTest.java @@ -15,9 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Assert; + import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils;