From 2db8321fe402f44f2b6ee6edc655d5b854e9b997 Mon Sep 17 00:00:00 2001 From: "shaojin.wensj" Date: Sun, 12 Jun 2022 23:48:04 +0800 Subject: [PATCH] check style --- .../druid/admin/DruidAdminApplication.java | 1 - .../druid/admin/config/MonitorProperties.java | 1 - .../druid/admin/model/ServiceNode.java | 1 - .../admin/model/dto/ConnectionResult.java | 2 - .../admin/model/dto/DataSourceResult.java | 2 - .../admin/model/dto/SqlDetailResult.java | 1 - .../druid/admin/model/dto/SqlListResult.java | 2 - .../druid/admin/model/dto/WallResult.java | 2 - .../druid/admin/model/dto/WebResult.java | 1 - .../admin/service/MonitorStatService.java | 9 +- .../admin/servlet/MonitorViewServlet.java | 1 - .../alibaba/druid/admin/util/HttpUtil.java | 1 - .../DruidDataSourceAutoConfigure.java | 1 - .../autoconfigure/DruidDataSourceBuilder.java | 1 - .../stat/DruidFilterConfiguration.java | 1 - .../stat/DruidSpringAopConfiguration.java | 1 - .../demo/configurer/Issue1796Configurer.java | 1 - .../testcase/DruidDataSourceTestCase.java | 1 - .../boot/testcase/DruidFilterTestCase.java | 2 - .../DruidMultiDataSourceTestCase.java | 3 - .../v2/c3p0/ComboPooledDataSource.java | 1 - .../com/mchange/v2/c3p0/PooledDataSource.java | 1 - .../apache/commons/dbcp/BasicDataSource.java | 1 - .../commons/dbcp/BasicDataSourceMBean.java | 1 - .../commons/dbcp/ManagedBasicDataSource.java | 1 - .../dbcp/ManagedBasicDataSourceFactory.java | 1 - .../dbcp/ManagedBasicDataSourceMBean.java | 1 - .../apache/commons/dbcp2/BasicDataSource.java | 1 - .../commons/dbcp2/BasicDataSourceMBean.java | 1 - .../proxool/ProxoolConstants.java | 1 - .../proxool/ProxoolDataSource.java | 12 - pom.xml | 30 + src/checkstyle/druid-checks.xml | 103 ++ .../java/com/alibaba/druid/Constants.java | 5 +- src/main/java/com/alibaba/druid/DbType.java | 138 ++- .../alibaba/druid/DruidRuntimeException.java | 9 +- .../FastsqlColumnAmbiguousException.java | 1 - .../com/alibaba/druid/FastsqlException.java | 9 +- .../druid/TransactionTimeoutException.java | 1 - src/main/java/com/alibaba/druid/VERSION.java | 7 +- .../com/alibaba/druid/filter/AutoLoad.java | 3 +- .../java/com/alibaba/druid/filter/Filter.java | 507 +++++----- .../alibaba/druid/filter/FilterAdapter.java | 498 ++++----- .../com/alibaba/druid/filter/FilterChain.java | 313 +++--- .../alibaba/druid/filter/FilterChainImpl.java | 522 +++++----- .../druid/filter/FilterEventAdapter.java | 78 +- .../alibaba/druid/filter/FilterManager.java | 17 +- .../druid/filter/config/ConfigFilter.java | 58 +- .../druid/filter/config/ConfigTools.java | 300 +++--- .../druid/filter/encoding/CharsetConvert.java | 17 +- .../filter/encoding/CharsetParameter.java | 7 +- .../encoding/EncodingConvertFilter.java | 124 +-- .../filter/logging/CommonsLogFilter.java | 9 +- .../filter/logging/CommonsLogFilterMBean.java | 1 - .../druid/filter/logging/Log4j2Filter.java | 5 +- .../filter/logging/Log4j2FilterMBean.java | 1 - .../druid/filter/logging/Log4jFilter.java | 5 +- .../filter/logging/Log4jFilterMBean.java | 1 - .../druid/filter/logging/LogFilter.java | 212 ++-- .../druid/filter/logging/LogFilterMBean.java | 1 - .../druid/filter/logging/Slf4jLogFilter.java | 5 +- .../druid/filter/stat/MergeStatFilter.java | 3 +- .../alibaba/druid/filter/stat/StatFilter.java | 124 ++- .../druid/filter/stat/StatFilterContext.java | 7 +- .../stat/StatFilterContextListener.java | 15 +- .../StatFilterContextListenerAdapter.java | 19 +- .../druid/filter/stat/StatFilterMBean.java | 12 +- .../com/alibaba/druid/mock/MockArray.java | 5 +- .../java/com/alibaba/druid/mock/MockBlob.java | 2 - .../druid/mock/MockCallableStatement.java | 19 +- .../java/com/alibaba/druid/mock/MockClob.java | 14 +- .../alibaba/druid/mock/MockConnection.java | 52 +- .../mock/MockConnectionClosedException.java | 3 +- .../com/alibaba/druid/mock/MockDriver.java | 63 +- .../alibaba/druid/mock/MockDriverMBean.java | 21 +- .../com/alibaba/druid/mock/MockNClob.java | 1 - .../druid/mock/MockParameterMetaData.java | 19 +- .../druid/mock/MockPreparedStatement.java | 17 +- .../java/com/alibaba/druid/mock/MockRef.java | 1 - .../com/alibaba/druid/mock/MockResultSet.java | 11 +- .../druid/mock/MockResultSetMetaData.java | 8 +- .../com/alibaba/druid/mock/MockRowId.java | 5 +- .../com/alibaba/druid/mock/MockSQLXML.java | 16 +- .../com/alibaba/druid/mock/MockSavepoint.java | 3 +- .../com/alibaba/druid/mock/MockStatement.java | 11 +- .../alibaba/druid/mock/MockStatementBase.java | 1 - .../com/alibaba/druid/mock/MockStruct.java | 1 - .../mock/handler/MockExecuteHandler.java | 5 +- .../handler/MySqlMockExecuteHandlerImpl.java | 34 +- .../druid/pool/DataSourceClosedException.java | 3 +- .../pool/DataSourceDisableException.java | 7 +- .../pool/DataSourceNotAvailableException.java | 4 +- .../druid/pool/DruidAbstractDataSource.java | 607 ++++++----- .../pool/DruidAbstractDataSourceMBean.java | 13 +- .../druid/pool/DruidConnectionHolder.java | 103 +- .../alibaba/druid/pool/DruidDataSource.java | 328 +++--- .../pool/DruidDataSourceC3P0Adapter.java | 37 +- .../pool/DruidDataSourceC3P0AdapterMBean.java | 1 - .../druid/pool/DruidDataSourceFactory.java | 100 +- .../druid/pool/DruidDataSourceMBean.java | 18 +- .../druid/pool/DruidDataSourceStatLogger.java | 9 +- .../DruidDataSourceStatLoggerAdapter.java | 10 +- .../pool/DruidDataSourceStatLoggerImpl.java | 17 +- .../druid/pool/DruidDataSourceStatValue.java | 132 +-- .../pool/DruidPooledCallableStatement.java | 30 +- .../druid/pool/DruidPooledConnection.java | 107 +- .../pool/DruidPooledPreparedStatement.java | 97 +- .../druid/pool/DruidPooledResultSet.java | 32 +- .../druid/pool/DruidPooledStatement.java | 43 +- .../alibaba/druid/pool/ExceptionSorter.java | 5 +- .../pool/GetConnectionTimeoutException.java | 5 +- .../alibaba/druid/pool/ManagedDataSource.java | 1 - .../alibaba/druid/pool/PoolableWrapper.java | 14 +- .../druid/pool/PreparedStatementHolder.java | 23 +- .../druid/pool/PreparedStatementPool.java | 32 +- .../druid/pool/ValidConnectionChecker.java | 3 +- .../pool/ValidConnectionCheckerAdapter.java | 9 +- .../alibaba/druid/pool/WrapperAdapter.java | 3 +- .../druid/pool/ha/DataSourceCreator.java | 5 +- .../pool/ha/HighAvailableDataSource.java | 44 +- .../druid/pool/ha/PropertiesUtils.java | 13 +- .../druid/pool/ha/node/FileNodeListener.java | 4 +- .../druid/pool/ha/node/NodeListener.java | 12 +- .../druid/pool/ha/node/PoolUpdater.java | 15 +- .../pool/ha/node/ZookeeperNodeListener.java | 4 +- .../pool/ha/node/ZookeeperNodeRegister.java | 8 +- .../ha/selector/DataSourceSelectorEnum.java | 2 +- .../ha/selector/NamedDataSourceSelector.java | 4 +- .../RandomDataSourceRecoverThread.java | 14 +- .../ha/selector/RandomDataSourceSelector.java | 22 +- .../RandomDataSourceValidateThread.java | 29 +- .../StickyRandomDataSourceSelector.java | 2 +- .../druid/pool/vendor/DB2ExceptionSorter.java | 8 +- .../pool/vendor/InformixExceptionSorter.java | 8 +- .../vendor/MSSQLValidConnectionChecker.java | 20 +- .../pool/vendor/MockExceptionSorter.java | 12 +- .../pool/vendor/MySqlExceptionSorter.java | 24 +- .../vendor/MySqlValidConnectionChecker.java | 31 +- .../pool/vendor/NullExceptionSorter.java | 10 +- .../OceanBaseOracleExceptionSorter.java | 14 +- .../OceanBaseValidConnectionChecker.java | 71 +- .../pool/vendor/OracleExceptionSorter.java | 31 +- .../vendor/OracleValidConnectionChecker.java | 26 +- .../druid/pool/vendor/PGExceptionSorter.java | 10 +- .../pool/vendor/PGValidConnectionChecker.java | 13 +- .../pool/vendor/PhoenixExceptionSorter.java | 7 +- .../pool/vendor/SybaseExceptionSorter.java | 12 +- .../pool/xa/DruidPooledXAConnection.java | 11 +- .../druid/pool/xa/DruidXADataSource.java | 25 +- .../druid/pool/xa/JtdsXAConnection.java | 22 +- .../alibaba/druid/pool/xa/JtdsXAResource.java | 22 +- .../com/alibaba/druid/proxy/DruidDriver.java | 73 +- .../alibaba/druid/proxy/DruidDriverMBean.java | 2 +- .../proxy/jdbc/CallableStatementProxy.java | 1 - .../jdbc/CallableStatementProxyImpl.java | 17 +- .../alibaba/druid/proxy/jdbc/ClobProxy.java | 1 - .../druid/proxy/jdbc/ClobProxyImpl.java | 13 +- .../druid/proxy/jdbc/ConnectionProxy.java | 3 +- .../druid/proxy/jdbc/ConnectionProxyImpl.java | 45 +- .../druid/proxy/jdbc/DataSourceProxy.java | 7 +- .../proxy/jdbc/DataSourceProxyConfig.java | 25 +- .../druid/proxy/jdbc/DataSourceProxyImpl.java | 50 +- .../proxy/jdbc/DataSourceProxyImplMBean.java | 1 - .../proxy/jdbc/DatabaseMetaDataProxyImpl.java | 77 +- .../druid/proxy/jdbc/JdbcParameter.java | 22 +- .../druid/proxy/jdbc/JdbcParameterDate.java | 2 +- .../proxy/jdbc/JdbcParameterDecimal.java | 13 +- .../druid/proxy/jdbc/JdbcParameterImpl.java | 19 +- .../druid/proxy/jdbc/JdbcParameterInt.java | 9 +- .../druid/proxy/jdbc/JdbcParameterLong.java | 10 +- .../druid/proxy/jdbc/JdbcParameterNull.java | 39 +- .../druid/proxy/jdbc/JdbcParameterString.java | 5 +- .../proxy/jdbc/JdbcParameterTimestamp.java | 3 +- .../alibaba/druid/proxy/jdbc/NClobProxy.java | 1 - .../druid/proxy/jdbc/NClobProxyImpl.java | 7 +- .../proxy/jdbc/PreparedStatementProxy.java | 3 +- .../jdbc/PreparedStatementProxyImpl.java | 107 +- .../proxy/jdbc/ResultSetMetaDataProxy.java | 1 - .../jdbc/ResultSetMetaDataProxyImpl.java | 12 +- .../druid/proxy/jdbc/ResultSetProxy.java | 5 +- .../druid/proxy/jdbc/ResultSetProxyImpl.java | 57 +- .../proxy/jdbc/StatementExecuteType.java | 8 +- .../druid/proxy/jdbc/StatementProxy.java | 26 +- .../druid/proxy/jdbc/StatementProxyImpl.java | 40 +- .../druid/proxy/jdbc/TransactionInfo.java | 3 +- .../druid/proxy/jdbc/WrapperProxy.java | 1 - .../druid/proxy/jdbc/WrapperProxyImpl.java | 27 +- .../com/alibaba/druid/sql/PagerUtils.java | 79 +- .../alibaba/druid/sql/SQLTransformUtils.java | 26 +- .../java/com/alibaba/druid/sql/SQLUtils.java | 103 +- .../druid/sql/ast/AutoIncrementType.java | 3 +- .../druid/sql/ast/SQLAdhocTableSource.java | 1 - .../alibaba/druid/sql/ast/SQLAnnIndex.java | 13 +- .../druid/sql/ast/SQLArrayDataType.java | 4 +- .../alibaba/druid/sql/ast/SQLCommentHint.java | 7 +- .../druid/sql/ast/SQLCurrentTimeExpr.java | 18 +- .../druid/sql/ast/SQLCurrentUserExpr.java | 1 - .../alibaba/druid/sql/ast/SQLDataType.java | 9 +- .../druid/sql/ast/SQLDataTypeImpl.java | 41 +- .../druid/sql/ast/SQLDataTypeRefExpr.java | 8 +- .../druid/sql/ast/SQLDbTypedObject.java | 1 - .../alibaba/druid/sql/ast/SQLDeclareItem.java | 12 +- .../com/alibaba/druid/sql/ast/SQLExpr.java | 5 +- .../druid/sql/ast/SQLExprComparor.java | 2 +- .../alibaba/druid/sql/ast/SQLExprImpl.java | 4 +- .../com/alibaba/druid/sql/ast/SQLHint.java | 1 - .../com/alibaba/druid/sql/ast/SQLIndex.java | 3 +- .../druid/sql/ast/SQLIndexDefinition.java | 1 - .../druid/sql/ast/SQLIndexOptions.java | 2 - .../druid/sql/ast/SQLJSONValueExpr.java | 1 - .../com/alibaba/druid/sql/ast/SQLKeep.java | 8 +- .../com/alibaba/druid/sql/ast/SQLLimit.java | 18 +- .../alibaba/druid/sql/ast/SQLMapDataType.java | 1 - .../com/alibaba/druid/sql/ast/SQLName.java | 9 +- .../com/alibaba/druid/sql/ast/SQLObject.java | 51 +- .../alibaba/druid/sql/ast/SQLObjectImpl.java | 45 +- .../druid/sql/ast/SQLObjectWithDataType.java | 1 + .../com/alibaba/druid/sql/ast/SQLOrderBy.java | 27 +- .../sql/ast/SQLOrderingSpecification.java | 8 +- .../com/alibaba/druid/sql/ast/SQLOver.java | 85 +- .../alibaba/druid/sql/ast/SQLParameter.java | 26 +- .../alibaba/druid/sql/ast/SQLPartition.java | 26 +- .../alibaba/druid/sql/ast/SQLPartitionBy.java | 12 +- .../druid/sql/ast/SQLPartitionByHash.java | 1 - .../druid/sql/ast/SQLPartitionByRange.java | 5 +- .../druid/sql/ast/SQLPartitionByValue.java | 1 - .../druid/sql/ast/SQLPartitionSpec.java | 4 +- .../druid/sql/ast/SQLPartitionValue.java | 14 +- .../alibaba/druid/sql/ast/SQLRowDataType.java | 3 +- .../druid/sql/ast/SQLSetQuantifier.java | 9 +- .../alibaba/druid/sql/ast/SQLStatement.java | 15 +- .../druid/sql/ast/SQLStatementImpl.java | 14 +- .../druid/sql/ast/SQLStructDataType.java | 6 +- .../druid/sql/ast/SQLSubPartition.java | 18 +- .../druid/sql/ast/SQLSubPartitionBy.java | 7 +- .../druid/sql/ast/SQLSubPartitionByHash.java | 3 +- .../druid/sql/ast/SQLSubPartitionByList.java | 1 - .../druid/sql/ast/SQLTableDataType.java | 2 +- .../alibaba/druid/sql/ast/SQLZOrderBy.java | 27 +- .../com/alibaba/druid/sql/ast/TDDLHint.java | 14 +- .../druid/sql/ast/expr/SQLAggregateExpr.java | 63 +- .../sql/ast/expr/SQLAggregateOption.java | 3 +- .../druid/sql/ast/expr/SQLAllColumnExpr.java | 3 +- .../druid/sql/ast/expr/SQLAllExpr.java | 8 +- .../druid/sql/ast/expr/SQLAnyExpr.java | 7 +- .../druid/sql/ast/expr/SQLArrayExpr.java | 40 +- .../druid/sql/ast/expr/SQLBetweenExpr.java | 22 +- .../druid/sql/ast/expr/SQLBigIntExpr.java | 9 +- .../druid/sql/ast/expr/SQLBinaryExpr.java | 6 +- .../druid/sql/ast/expr/SQLBinaryOpExpr.java | 79 +- .../sql/ast/expr/SQLBinaryOpExprGroup.java | 16 +- .../druid/sql/ast/expr/SQLBinaryOperator.java | 87 +- .../druid/sql/ast/expr/SQLBooleanExpr.java | 5 +- .../druid/sql/ast/expr/SQLCaseExpr.java | 56 +- .../druid/sql/ast/expr/SQLCaseStatement.java | 64 +- .../druid/sql/ast/expr/SQLCastExpr.java | 23 +- .../druid/sql/ast/expr/SQLCharExpr.java | 9 +- .../druid/sql/ast/expr/SQLContainsExpr.java | 4 +- .../sql/ast/expr/SQLCurrentOfCursorExpr.java | 7 +- .../druid/sql/ast/expr/SQLDateExpr.java | 46 +- .../druid/sql/ast/expr/SQLDateTimeExpr.java | 21 +- .../druid/sql/ast/expr/SQLDbLinkExpr.java | 18 +- .../druid/sql/ast/expr/SQLDecimalExpr.java | 14 +- .../druid/sql/ast/expr/SQLDefaultExpr.java | 1 - .../druid/sql/ast/expr/SQLDoubleExpr.java | 17 +- .../druid/sql/ast/expr/SQLExistsExpr.java | 14 +- .../druid/sql/ast/expr/SQLExprUtils.java | 5 +- .../druid/sql/ast/expr/SQLExtractExpr.java | 5 +- .../druid/sql/ast/expr/SQLFlashbackExpr.java | 13 +- .../druid/sql/ast/expr/SQLFloatExpr.java | 17 +- .../sql/ast/expr/SQLGroupingSetExpr.java | 3 +- .../druid/sql/ast/expr/SQLHexExpr.java | 8 +- .../druid/sql/ast/expr/SQLIdentifierExpr.java | 19 +- .../druid/sql/ast/expr/SQLInListExpr.java | 4 +- .../druid/sql/ast/expr/SQLInSubQueryExpr.java | 17 +- .../druid/sql/ast/expr/SQLIntegerExpr.java | 8 +- .../druid/sql/ast/expr/SQLIntervalExpr.java | 9 +- .../druid/sql/ast/expr/SQLIntervalUnit.java | 9 +- .../druid/sql/ast/expr/SQLJSONExpr.java | 15 +- .../druid/sql/ast/expr/SQLListExpr.java | 5 +- .../sql/ast/expr/SQLMatchAgainstExpr.java | 23 +- .../sql/ast/expr/SQLMethodInvokeExpr.java | 78 +- .../druid/sql/ast/expr/SQLNCharExpr.java | 8 +- .../druid/sql/ast/expr/SQLNotExpr.java | 8 +- .../druid/sql/ast/expr/SQLNullExpr.java | 6 +- .../druid/sql/ast/expr/SQLNumberExpr.java | 15 +- .../sql/ast/expr/SQLNumericLiteralExpr.java | 4 +- .../druid/sql/ast/expr/SQLPropertyExpr.java | 34 +- .../druid/sql/ast/expr/SQLQueryExpr.java | 8 +- .../druid/sql/ast/expr/SQLRealExpr.java | 16 +- .../druid/sql/ast/expr/SQLSequenceExpr.java | 40 +- .../druid/sql/ast/expr/SQLSizeExpr.java | 22 +- .../druid/sql/ast/expr/SQLSmallIntExpr.java | 9 +- .../druid/sql/ast/expr/SQLSomeExpr.java | 6 +- .../sql/ast/expr/SQLTextLiteralExpr.java | 6 +- .../druid/sql/ast/expr/SQLTimeExpr.java | 22 +- .../druid/sql/ast/expr/SQLTimestampExpr.java | 23 +- .../druid/sql/ast/expr/SQLTinyIntExpr.java | 9 +- .../druid/sql/ast/expr/SQLUnaryExpr.java | 10 +- .../druid/sql/ast/expr/SQLUnaryOperator.java | 22 +- .../druid/sql/ast/expr/SQLValuableExpr.java | 1 - .../druid/sql/ast/expr/SQLValuesExpr.java | 9 +- .../druid/sql/ast/expr/SQLVariantRefExpr.java | 22 +- .../sql/ast/statement/SQLAlterCharacter.java | 1 - .../ast/statement/SQLAlterDatabaseItem.java | 1 - .../statement/SQLAlterDatabaseStatement.java | 9 +- .../ast/statement/SQLAlterIndexStatement.java | 7 +- .../SQLAlterMaterializedViewStatement.java | 3 - .../statement/SQLAlterOutlineStatement.java | 3 +- .../statement/SQLAlterProcedureStatement.java | 5 +- .../statement/SQLAlterSequenceStatement.java | 1 - .../SQLAlterSystemGetConfigStatement.java | 1 - .../SQLAlterSystemSetConfigStatement.java | 1 - .../SQLAlterTableAddClusteringKey.java | 10 +- .../ast/statement/SQLAlterTableAddColumn.java | 4 +- .../statement/SQLAlterTableAddConstraint.java | 8 +- .../SQLAlterTableAddExtPartition.java | 2 +- .../ast/statement/SQLAlterTableAddIndex.java | 3 - .../statement/SQLAlterTableAddPartition.java | 9 +- .../SQLAlterTableAddSupplemental.java | 5 +- .../statement/SQLAlterTableAlterColumn.java | 18 +- .../statement/SQLAlterTableAlterIndex.java | 1 - .../SQLAlterTableAnalyzePartition.java | 3 +- .../SQLAlterTableArchivePartition.java | 3 +- .../ast/statement/SQLAlterTableBlockSize.java | 4 +- .../statement/SQLAlterTableChangeOwner.java | 4 +- .../SQLAlterTableCheckPartition.java | 3 +- .../SQLAlterTableCoalescePartition.java | 1 - .../statement/SQLAlterTableCompression.java | 5 +- .../SQLAlterTableConvertCharSet.java | 4 +- .../SQLAlterTableDeleteByCondition.java | 3 +- .../SQLAlterTableDisableConstraint.java | 1 - .../statement/SQLAlterTableDisableKeys.java | 1 - .../SQLAlterTableDisableLifecycle.java | 1 - .../SQLAlterTableDiscardPartition.java | 4 +- .../SQLAlterTableDropClusteringKey.java | 3 +- .../SQLAlterTableDropColumnItem.java | 8 +- .../SQLAlterTableDropConstraint.java | 5 +- .../SQLAlterTableDropExtPartition.java | 4 +- .../SQLAlterTableDropForeignKey.java | 1 - .../ast/statement/SQLAlterTableDropIndex.java | 1 - .../ast/statement/SQLAlterTableDropKey.java | 3 +- .../statement/SQLAlterTableDropPartition.java | 5 +- .../SQLAlterTableDropPrimaryKey.java | 1 - .../SQLAlterTableDropSubpartition.java | 4 +- .../SQLAlterTableEnableConstraint.java | 1 - .../statement/SQLAlterTableEnableKeys.java | 1 - .../SQLAlterTableEnableLifecycle.java | 1 - .../SQLAlterTableExchangePartition.java | 8 +- .../SQLAlterTableGroupStatement.java | 4 +- .../SQLAlterTableImportPartition.java | 3 +- .../sql/ast/statement/SQLAlterTableItem.java | 1 - .../SQLAlterTableMergePartition.java | 5 +- .../SQLAlterTableOptimizePartition.java | 3 +- .../ast/statement/SQLAlterTablePartition.java | 1 - .../SQLAlterTablePartitionCount.java | 5 +- .../SQLAlterTablePartitionLifecycle.java | 4 +- .../SQLAlterTableReOrganizePartition.java | 5 +- .../SQLAlterTableRebuildPartition.java | 3 +- .../SQLAlterTableRecoverPartitions.java | 3 +- .../ast/statement/SQLAlterTableRename.java | 2 - .../statement/SQLAlterTableRenameColumn.java | 4 +- .../statement/SQLAlterTableRenameIndex.java | 11 +- .../SQLAlterTableRenamePartition.java | 5 +- .../SQLAlterTableRepairPartition.java | 3 +- .../statement/SQLAlterTableReplaceColumn.java | 6 +- .../statement/SQLAlterTableSetComment.java | 1 - .../statement/SQLAlterTableSetLifecycle.java | 1 - .../statement/SQLAlterTableSetLocation.java | 1 - .../ast/statement/SQLAlterTableSetOption.java | 2 - .../ast/statement/SQLAlterTableStatement.java | 50 +- ...ableSubpartitionAvailablePartitionNum.java | 2 - .../SQLAlterTableSubpartitionLifecycle.java | 5 +- .../sql/ast/statement/SQLAlterTableTouch.java | 5 +- .../SQLAlterTableTruncatePartition.java | 3 +- .../SQLAlterTableUnarchivePartition.java | 2 +- .../SQLAlterViewRenameStatement.java | 1 - .../ast/statement/SQLAlterViewStatement.java | 18 +- .../statement/SQLAnalyzeTableStatement.java | 21 +- .../statement/SQLArchiveTableStatement.java | 8 - .../sql/ast/statement/SQLAssignItem.java | 23 +- .../sql/ast/statement/SQLBackupStatement.java | 1 - .../sql/ast/statement/SQLBlockStatement.java | 13 +- .../ast/statement/SQLBuildTableStatement.java | 4 +- .../sql/ast/statement/SQLCallStatement.java | 14 +- .../ast/statement/SQLCancelJobStatement.java | 3 +- .../ast/statement/SQLCharacterDataType.java | 20 +- .../druid/sql/ast/statement/SQLCheck.java | 6 +- .../ast/statement/SQLCloneTableStatement.java | 6 +- .../sql/ast/statement/SQLCloseStatement.java | 61 +- .../sql/ast/statement/SQLColumnCheck.java | 6 +- .../ast/statement/SQLColumnDefinition.java | 91 +- .../ast/statement/SQLColumnPrimaryKey.java | 1 - .../sql/ast/statement/SQLColumnReference.java | 4 +- .../sql/ast/statement/SQLColumnUniqueKey.java | 3 - .../ast/statement/SQLCommentStatement.java | 5 +- .../sql/ast/statement/SQLCommitStatement.java | 6 +- .../sql/ast/statement/SQLConstraint.java | 2 +- .../sql/ast/statement/SQLConstraintImpl.java | 6 +- .../statement/SQLCreateDatabaseStatement.java | 32 +- .../statement/SQLCreateFunctionStatement.java | 38 +- .../statement/SQLCreateIndexStatement.java | 2 - .../SQLCreateProcedureStatement.java | 33 +- .../ast/statement/SQLCreateRoleStatement.java | 13 +- .../statement/SQLCreateSequenceStatement.java | 1 - .../SQLCreateTableGroupStatement.java | 18 +- .../statement/SQLCreateTableStatement.java | 97 +- .../statement/SQLCreateTriggerStatement.java | 30 +- .../ast/statement/SQLCreateUserStatement.java | 1 - .../ast/statement/SQLCreateViewStatement.java | 25 +- .../sql/ast/statement/SQLDDLStatement.java | 2 - .../ast/statement/SQLDeclareStatement.java | 4 +- .../druid/sql/ast/statement/SQLDefault.java | 8 +- .../sql/ast/statement/SQLDeleteStatement.java | 15 +- .../ast/statement/SQLDescribeStatement.java | 1 - .../statement/SQLDropCatalogStatement.java | 9 +- .../statement/SQLDropDatabaseStatement.java | 6 +- .../ast/statement/SQLDropEventStatement.java | 4 +- .../statement/SQLDropFunctionStatement.java | 6 +- .../ast/statement/SQLDropIndexStatement.java | 14 +- .../SQLDropLogFileGroupStatement.java | 4 +- .../SQLDropMaterializedViewStatement.java | 4 +- .../statement/SQLDropOutlineStatement.java | 4 +- .../statement/SQLDropProcedureStatement.java | 8 +- .../SQLDropResourceGroupStatement.java | 4 +- .../statement/SQLDropResourceStatement.java | 4 +- .../ast/statement/SQLDropRoleStatement.java | 12 +- .../statement/SQLDropSequenceStatement.java | 8 +- .../ast/statement/SQLDropServerStatement.java | 4 +- .../statement/SQLDropSynonymStatement.java | 4 +- .../statement/SQLDropTableGroupStatement.java | 11 +- .../statement/SQLDropTableSpaceStatement.java | 8 +- .../ast/statement/SQLDropTableStatement.java | 46 +- .../statement/SQLDropTriggerStatement.java | 7 +- .../ast/statement/SQLDropTypeStatement.java | 4 +- .../ast/statement/SQLDropUserStatement.java | 11 +- .../ast/statement/SQLDropViewStatement.java | 22 +- .../sql/ast/statement/SQLDumpStatement.java | 1 - .../ast/statement/SQLErrorLoggingClause.java | 1 - .../statement/SQLExplainAnalyzeStatement.java | 6 +- .../ast/statement/SQLExplainStatement.java | 23 +- .../statement/SQLExportDatabaseStatement.java | 4 +- .../statement/SQLExportTableStatement.java | 6 +- .../druid/sql/ast/statement/SQLExprHint.java | 6 +- .../sql/ast/statement/SQLExprStatement.java | 6 +- .../sql/ast/statement/SQLExprTableSource.java | 47 +- .../statement/SQLExternalRecordFormat.java | 3 - .../sql/ast/statement/SQLFetchStatement.java | 7 +- .../sql/ast/statement/SQLForStatement.java | 1 - .../statement/SQLForeignKeyConstraint.java | 2 +- .../sql/ast/statement/SQLForeignKeyImpl.java | 36 +- .../sql/ast/statement/SQLGrantStatement.java | 26 +- .../sql/ast/statement/SQLIfStatement.java | 10 +- .../statement/SQLImportTableStatement.java | 15 +- .../sql/ast/statement/SQLInsertInto.java | 26 +- .../sql/ast/statement/SQLInsertStatement.java | 21 +- .../sql/ast/statement/SQLJoinTableSource.java | 118 ++- .../statement/SQLLateralViewTableSource.java | 3 - .../sql/ast/statement/SQLLoopStatement.java | 1 - .../sql/ast/statement/SQLMergeStatement.java | 31 +- .../ast/statement/SQLNotNullConstraint.java | 4 +- .../sql/ast/statement/SQLNullConstraint.java | 3 +- .../sql/ast/statement/SQLObjectType.java | 44 +- .../sql/ast/statement/SQLOpenStatement.java | 93 +- .../ast/statement/SQLOptimizeStatement.java | 3 +- .../sql/ast/statement/SQLPartitionRef.java | 3 - .../sql/ast/statement/SQLPrimaryKey.java | 1 - .../sql/ast/statement/SQLPrimaryKeyImpl.java | 5 +- .../sql/ast/statement/SQLPrivilegeItem.java | 7 +- .../ast/statement/SQLPrivilegeStatement.java | 2 - .../ast/statement/SQLPurgeLogsStatement.java | 4 +- .../SQLPurgeRecyclebinStatement.java | 9 +- .../ast/statement/SQLPurgeTableStatement.java | 6 +- .../SQLPurgeTemporaryOutputStatement.java | 4 +- .../SQLRefreshMaterializedViewStatement.java | 4 +- .../SQLReleaseSavePointStatement.java | 8 +- .../ast/statement/SQLRenameUserStatement.java | 4 +- .../ast/statement/SQLReplaceStatement.java | 12 +- .../sql/ast/statement/SQLReturnStatement.java | 6 +- .../sql/ast/statement/SQLRevokeStatement.java | 4 +- .../ast/statement/SQLRollbackStatement.java | 8 +- .../ast/statement/SQLSavePointStatement.java | 8 +- .../statement/SQLScriptCommitStatement.java | 4 +- .../druid/sql/ast/statement/SQLSelect.java | 75 +- .../ast/statement/SQLSelectGroupByClause.java | 25 +- .../sql/ast/statement/SQLSelectItem.java | 24 +- .../ast/statement/SQLSelectOrderByItem.java | 50 +- .../sql/ast/statement/SQLSelectQuery.java | 1 + .../ast/statement/SQLSelectQueryBlock.java | 261 +++-- .../sql/ast/statement/SQLSelectStatement.java | 20 +- .../sql/ast/statement/SQLSetStatement.java | 18 +- .../ast/statement/SQLShowACLStatement.java | 1 - .../statement/SQLShowCatalogsStatement.java | 2 - .../statement/SQLShowColumnsStatement.java | 2 - ...QLShowCreateMaterializedViewStatement.java | 4 +- .../SQLShowCreateTableStatement.java | 3 - .../statement/SQLShowCreateViewStatement.java | 4 - .../statement/SQLShowDatabasesStatement.java | 5 +- .../statement/SQLShowFunctionsStatement.java | 1 - .../statement/SQLShowHistoryStatement.java | 4 +- .../statement/SQLShowIndexesStatement.java | 5 +- .../SQLShowMaterializedViewStatement.java | 4 +- .../statement/SQLShowOutlinesStatement.java | 4 +- .../ast/statement/SQLShowPartitionsStmt.java | 7 +- .../SQLShowProcessListStatement.java | 8 +- .../statement/SQLShowQueryTaskStatement.java | 9 +- .../ast/statement/SQLShowRolesStatement.java | 5 +- .../statement/SQLShowSessionStatement.java | 1 - .../statement/SQLShowStatisticListStmt.java | 5 +- .../ast/statement/SQLShowStatisticStmt.java | 7 +- .../SQLShowTableGroupsStatement.java | 1 - .../ast/statement/SQLShowTablesStatement.java | 8 +- .../ast/statement/SQLShowUsersStatement.java | 5 +- .../statement/SQLShowVariantsStatement.java | 5 +- .../ast/statement/SQLShowViewsStatement.java | 2 - .../SQLStartTransactionStatement.java | 26 +- .../ast/statement/SQLSubmitJobStatement.java | 59 +- .../ast/statement/SQLSubqueryTableSource.java | 22 +- .../sql/ast/statement/SQLTableConstraint.java | 1 - .../druid/sql/ast/statement/SQLTableLike.java | 5 +- .../sql/ast/statement/SQLTableSource.java | 10 +- .../sql/ast/statement/SQLTableSourceImpl.java | 25 +- .../ast/statement/SQLTruncateStatement.java | 34 +- .../sql/ast/statement/SQLUnionOperator.java | 6 +- .../sql/ast/statement/SQLUnionQuery.java | 45 +- .../statement/SQLUnionQueryTableSource.java | 19 +- .../druid/sql/ast/statement/SQLUnique.java | 9 +- .../ast/statement/SQLUniqueConstraint.java | 1 - .../ast/statement/SQLUnnestTableSource.java | 3 +- .../sql/ast/statement/SQLUpdateSetItem.java | 17 +- .../sql/ast/statement/SQLUpdateStatement.java | 58 +- .../sql/ast/statement/SQLUseStatement.java | 8 +- .../sql/ast/statement/SQLValuesQuery.java | 1 - .../ast/statement/SQLValuesTableSource.java | 2 - .../sql/ast/statement/SQLWhileStatement.java | 118 ++- .../sql/ast/statement/SQLWhoamiStatement.java | 5 +- .../ast/statement/SQLWithSubqueryClause.java | 43 +- .../alibaba/druid/sql/builder/SQLBuilder.java | 2 - .../druid/sql/builder/SQLBuilderFactory.java | 7 +- .../druid/sql/builder/SQLDeleteBuilder.java | 1 - .../druid/sql/builder/SQLSelectBuilder.java | 1 - .../druid/sql/builder/SQLUpdateBuilder.java | 1 - .../druid/sql/builder/UpdateBuilder.java | 3 +- .../sql/builder/impl/SQLBuilderImpl.java | 11 +- .../builder/impl/SQLDeleteBuilderImpl.java | 11 +- .../builder/impl/SQLSelectBuilderImpl.java | 13 +- .../builder/impl/SQLUpdateBuilderImpl.java | 27 +- .../ads/parser/AdsCreateTableParser.java | 20 +- .../sql/dialect/ads/parser/AdsExprParser.java | 15 +- .../sql/dialect/ads/parser/AdsLexer.java | 4 +- .../dialect/ads/parser/AdsSelectParser.java | 8 +- .../ads/parser/AdsStatementParser.java | 6 +- .../dialect/ads/visitor/AdsOutputVisitor.java | 4 - .../sql/dialect/ads/visitor/AdsVisitor.java | 2 + .../ast/AntsparkCreateTableStatement.java | 12 +- .../parser/AntsparkCreateTableParser.java | 23 +- .../antspark/parser/AntsparkExprParser.java | 24 +- .../antspark/parser/AntsparkLexer.java | 9 +- .../parser/AntsparkStatementParser.java | 4 +- .../visitor/AntsparkOutputVisitor.java | 20 +- .../visitor/AntsparkSchemaStatVisitor.java | 4 +- .../antspark/visitor/AntsparkVisitor.java | 4 +- .../blink/ast/BlinkCreateTableStatement.java | 2 - .../blink/parser/BlinkCreateTableParser.java | 18 +- .../dialect/blink/parser/BlinkExprParser.java | 16 +- .../sql/dialect/blink/parser/BlinkLexer.java | 6 +- .../blink/parser/BlinkStatementParser.java | 12 +- .../blink/vsitor/BlinkOutputVisitor.java | 6 - .../dialect/blink/vsitor/BlinkVisitor.java | 4 +- .../ast/ClickhouseCreateTableStatement.java | 2 +- .../parser/ClickhouseCreateTableParser.java | 2 +- .../parser/ClickhouseExprParser.java | 14 +- .../clickhouse/parser/ClickhouseLexer.java | 4 +- .../parser/ClickhouseStatementParser.java | 7 +- .../visitor/ClickSchemaStatVisitor.java | 14 +- .../ClickhouseExportParameterVisitor.java | 28 +- .../clickhouse/visitor/ClickhouseVisitor.java | 1 - .../ast/DB2IntermediateResultTableSource.java | 3 +- .../druid/sql/dialect/db2/ast/DB2Object.java | 1 - .../sql/dialect/db2/ast/DB2StatementImpl.java | 1 - .../db2/ast/stmt/DB2SelectQueryBlock.java | 4 +- .../db2/ast/stmt/DB2ValuesStatement.java | 1 - .../db2/parser/DB2CreateTableParser.java | 9 +- .../sql/dialect/db2/parser/DB2ExprParser.java | 14 +- .../sql/dialect/db2/parser/DB2Lexer.java | 12 +- .../dialect/db2/parser/DB2SelectParser.java | 24 +- .../db2/parser/DB2StatementParser.java | 13 +- .../dialect/db2/visitor/DB2ASTVisitor.java | 6 +- .../db2/visitor/DB2ASTVisitorAdapter.java | 4 - .../dialect/db2/visitor/DB2EvalVisitor.java | 15 +- .../visitor/DB2ExportParameterVisitor.java | 30 +- .../dialect/db2/visitor/DB2OutputVisitor.java | 13 +- .../db2/visitor/DB2SchemaStatVisitor.java | 7 +- .../sql/dialect/h2/parser/H2ExprParser.java | 14 +- .../druid/sql/dialect/h2/parser/H2Lexer.java | 6 +- .../sql/dialect/h2/parser/H2SelectParser.java | 7 +- .../dialect/h2/parser/H2StatementParser.java | 8 +- .../sql/dialect/h2/visitor/H2EvalVisitor.java | 12 +- .../dialect/h2/visitor/H2OutputVisitor.java | 12 +- .../h2/visitor/H2SchemaStatVisitor.java | 5 +- .../hive/ast/HiveInputOutputFormat.java | 13 +- .../dialect/hive/ast/HiveInsertStatement.java | 2 +- .../hive/ast/HiveMultiInsertStatement.java | 8 +- .../hive/parser/HiveCreateTableParser.java | 12 +- .../dialect/hive/parser/HiveExprParser.java | 20 +- .../sql/dialect/hive/parser/HiveLexer.java | 13 +- .../dialect/hive/parser/HiveSelectParser.java | 19 +- .../hive/parser/HiveStatementParser.java | 13 +- .../stmt/HiveCreateFunctionStatement.java | 9 +- .../hive/stmt/HiveCreateTableStatement.java | 22 +- .../hive/stmt/HiveLoadDataStatement.java | 2 +- .../hive/stmt/HiveMsckRepairStatement.java | 1 - .../hive/visitor/HiveASTVisitorAdapter.java | 9 - .../hive/visitor/HiveOutputVisitor.java | 11 +- .../hive/visitor/HiveSchemaStatVisitor.java | 10 +- .../dialect/mysql/ast/AnalyzerIndexType.java | 4 +- .../mysql/ast/MySqlForceIndexHint.java | 1 - .../sql/dialect/mysql/ast/MySqlHint.java | 2 - .../mysql/ast/MySqlIgnoreIndexHint.java | 1 - .../sql/dialect/mysql/ast/MySqlIndexHint.java | 11 +- .../dialect/mysql/ast/MySqlIndexHintImpl.java | 3 +- .../druid/sql/dialect/mysql/ast/MySqlKey.java | 7 +- .../sql/dialect/mysql/ast/MySqlObject.java | 1 - .../dialect/mysql/ast/MySqlObjectImpl.java | 1 - .../dialect/mysql/ast/MySqlPrimaryKey.java | 3 +- .../sql/dialect/mysql/ast/MySqlUnique.java | 5 +- .../dialect/mysql/ast/MySqlUseIndexHint.java | 1 - .../dialect/mysql/ast/MysqlForeignKey.java | 6 +- .../mysql/ast/clause/ConditionValue.java | 56 +- .../mysql/ast/clause/MySqlCaseStatement.java | 124 ++- .../clause/MySqlCursorDeclareStatement.java | 74 +- .../MySqlDeclareConditionStatement.java | 70 +- .../clause/MySqlDeclareHandlerStatement.java | 80 +- .../ast/clause/MySqlDeclareStatement.java | 1 - .../mysql/ast/clause/MySqlExplainType.java | 7 +- .../mysql/ast/clause/MySqlFormatName.java | 5 +- .../mysql/ast/clause/MySqlHandlerType.java | 9 +- .../ast/clause/MySqlIterateStatement.java | 24 +- .../mysql/ast/clause/MySqlLeaveStatement.java | 41 +- .../ast/clause/MySqlRepeatStatement.java | 40 +- .../ast/clause/MySqlSelectIntoStatement.java | 56 +- .../mysql/ast/clause/MySqlStatementType.java | 78 +- .../dialect/mysql/ast/expr/MySqlCharExpr.java | 12 +- .../sql/dialect/mysql/ast/expr/MySqlExpr.java | 1 - .../dialect/mysql/ast/expr/MySqlExprImpl.java | 3 +- .../mysql/ast/expr/MySqlJSONTableExpr.java | 5 +- .../mysql/ast/expr/MySqlOrderingExpr.java | 10 +- .../mysql/ast/expr/MySqlOutFileExpr.java | 15 +- .../dialect/mysql/ast/expr/MySqlUserName.java | 11 +- .../mysql/ast/statement/CobarShowStatus.java | 1 - .../ast/statement/DrdsBaselineStatement.java | 1 - .../mysql/ast/statement/DrdsCancelDDLJob.java | 1 - .../mysql/ast/statement/DrdsChangeDDLJob.java | 7 +- .../ast/statement/DrdsClearDDLJobCache.java | 3 +- .../ast/statement/DrdsInspectDDLJobCache.java | 1 - .../ast/statement/DrdsRecoverDDLJob.java | 3 +- .../mysql/ast/statement/DrdsRemoveDDLJob.java | 5 +- .../ast/statement/DrdsRollbackDDLJob.java | 1 - .../mysql/ast/statement/DrdsShowDDLJobs.java | 3 +- .../ast/statement/DrdsShowGlobalIndex.java | 3 +- .../ast/statement/DrdsShowMetadataLock.java | 3 +- .../statement/MySqlAlterDatabaseKillJob.java | 2 - .../MySqlAlterDatabaseSetOption.java | 2 - .../statement/MySqlAlterEventStatement.java | 16 +- .../statement/MySqlAlterTableAlterColumn.java | 3 +- .../MySqlAlterTableAlterFullTextIndex.java | 5 +- .../MySqlAlterTableChangeColumn.java | 9 +- .../MySqlAlterTableDiscardTablespace.java | 1 - .../MySqlAlterTableImportTablespace.java | 1 - .../ast/statement/MySqlAlterTableLock.java | 1 - .../MySqlAlterTableModifyColumn.java | 7 +- .../ast/statement/MySqlAlterTableOption.java | 7 +- .../ast/statement/MySqlAlterTableOrderBy.java | 1 - .../statement/MySqlAlterTableValidation.java | 1 - .../MySqlAlterTablespaceStatement.java | 2 +- .../statement/MySqlAlterUserStatement.java | 3 +- .../ast/statement/MySqlAnalyzeStatement.java | 5 +- .../ast/statement/MySqlBinlogStatement.java | 1 - .../statement/MySqlCheckTableStatement.java | 2 - .../MySqlChecksumTableStatement.java | 1 - .../MySqlClearPlanCacheStatement.java | 1 - .../statement/MySqlCreateEventStatement.java | 18 +- .../MySqlCreateExternalCatalogStatement.java | 8 +- .../statement/MySqlCreateTableStatement.java | 63 +- .../statement/MySqlCreateUserStatement.java | 7 +- .../ast/statement/MySqlDeleteStatement.java | 24 +- .../MySqlDisabledPlanCacheStatement.java | 1 - .../MySqlExecuteForAdsStatement.java | 2 - .../ast/statement/MySqlExecuteStatement.java | 3 +- .../MySqlExplainPlanCacheStatement.java | 1 - .../ast/statement/MySqlExplainStatement.java | 8 +- .../statement/MySqlFlashbackStatement.java | 1 - .../ast/statement/MySqlFlushStatement.java | 7 +- .../ast/statement/MySqlHelpStatement.java | 1 - .../ast/statement/MySqlHintStatement.java | 5 +- .../ast/statement/MySqlInsertStatement.java | 21 +- .../ast/statement/MySqlKillStatement.java | 9 +- .../MySqlLoadDataInFileStatement.java | 38 +- .../ast/statement/MySqlLoadXmlStatement.java | 23 +- .../statement/MySqlLockTableStatement.java | 8 +- .../MySqlManageInstanceGroupStatement.java | 4 - .../ast/statement/MySqlMigrateStatement.java | 1 - .../ast/statement/MySqlOptimizeStatement.java | 7 +- .../ast/statement/MySqlPartitionByKey.java | 2 +- .../ast/statement/MySqlPrepareStatement.java | 5 +- .../MySqlRaftLeaderTransferStatement.java | 1 - .../MySqlRaftMemberChangeStatement.java | 4 - .../MySqlRenameSequenceStatement.java | 4 +- .../statement/MySqlRenameTableStatement.java | 4 +- .../ast/statement/MySqlResetStatement.java | 1 - .../ast/statement/MySqlSelectQueryBlock.java | 92 +- .../MySqlSetTransactionStatement.java | 6 +- .../statement/MySqlShowAuthorsStatement.java | 1 - .../MySqlShowBinLogEventsStatement.java | 1 - .../MySqlShowBinaryLogsStatement.java | 1 - .../MySqlShowBroadcastsStatement.java | 7 +- .../MySqlShowCharacterSetStatement.java | 1 - .../MySqlShowClusterNameStatement.java | 1 - .../MySqlShowCollationStatement.java | 1 - .../MySqlShowContributorsStatement.java | 1 - .../MySqlShowCreateDatabaseStatement.java | 3 +- .../MySqlShowCreateEventStatement.java | 1 - .../MySqlShowCreateFunctionStatement.java | 1 - .../MySqlShowCreateProcedureStatement.java | 1 - .../MySqlShowCreateTriggerStatement.java | 1 - .../MySqlShowDatabaseStatusStatement.java | 9 +- .../MySqlShowDatasourcesStatement.java | 6 +- .../MySqlShowDdlStatusStatement.java | 6 +- .../ast/statement/MySqlShowDsStatement.java | 6 +- .../statement/MySqlShowEngineStatement.java | 3 +- .../statement/MySqlShowEnginesStatement.java | 3 +- .../statement/MySqlShowErrorsStatement.java | 3 +- .../statement/MySqlShowEventsStatement.java | 1 - .../MySqlShowFunctionCodeStatement.java | 1 - .../MySqlShowFunctionStatusStatement.java | 1 - .../statement/MySqlShowGrantsStatement.java | 2 - .../statement/MySqlShowHMSMetaStatement.java | 6 +- .../ast/statement/MySqlShowHelpStatement.java | 6 +- .../MySqlShowJobStatusStatement.java | 4 +- .../MySqlShowMasterLogsStatement.java | 1 - .../MySqlShowMasterStatusStatement.java | 1 - .../MySqlShowMigrateTaskStatusStatement.java | 1 - .../ast/statement/MySqlShowNodeStatement.java | 6 +- .../MySqlShowOpenTablesStatement.java | 1 - .../MySqlShowPartitionsStatement.java | 4 - .../MySqlShowPlanCacheStatement.java | 1 - .../MySqlShowPlanCacheStatusStatement.java | 5 - .../statement/MySqlShowPluginsStatement.java | 1 - .../MySqlShowPrivilegesStatement.java | 1 - .../MySqlShowProcedureCodeStatement.java | 1 - .../MySqlShowProcedureStatusStatement.java | 1 - .../MySqlShowProcessListStatement.java | 1 - .../statement/MySqlShowProfileStatement.java | 5 +- .../statement/MySqlShowProfilesStatement.java | 1 - .../MySqlShowRelayLogEventsStatement.java | 1 - .../ast/statement/MySqlShowRuleStatement.java | 12 +- .../MySqlShowRuleStatusStatement.java | 12 +- .../MySqlShowSequencesStatement.java | 6 +- .../MySqlShowSlaveHostsStatement.java | 1 - .../MySqlShowSlaveStatusStatement.java | 1 - .../ast/statement/MySqlShowSlowStatement.java | 10 +- .../ast/statement/MySqlShowStatement.java | 1 - .../statement/MySqlShowStatusStatement.java | 6 +- .../MySqlShowTableStatusStatement.java | 2 - .../statement/MySqlShowTopologyStatement.java | 9 +- .../statement/MySqlShowTraceStatement.java | 6 +- .../statement/MySqlShowTriggersStatement.java | 1 - .../statement/MySqlShowWarningsStatement.java | 3 +- .../mysql/ast/statement/MySqlStatement.java | 1 - .../ast/statement/MySqlStatementImpl.java | 1 - .../ast/statement/MySqlSubPartitionByKey.java | 2 +- .../statement/MySqlSubPartitionByList.java | 5 +- .../statement/MySqlSubPartitionByValue.java | 4 +- .../mysql/ast/statement/MySqlTableIndex.java | 5 +- .../statement/MySqlUnlockTablesStatement.java | 1 - .../MySqlUpdatePlanCacheStatement.java | 1 - .../ast/statement/MySqlUpdateStatement.java | 63 +- .../ast/statement/MySqlUpdateTableSource.java | 7 +- .../MysqlAlterFullTextStatement.java | 1 - .../statement/MysqlAlterTableAlterCheck.java | 1 - .../MysqlCreateFullTextAnalyzerStatement.java | 11 +- ...ysqlCreateFullTextCharFilterStatement.java | 5 +- ...ysqlCreateFullTextDictionaryStatement.java | 2 - ...sqlCreateFullTextTokenFilterStatement.java | 3 +- ...MysqlCreateFullTextTokenizerStatement.java | 4 +- .../MysqlDeallocatePrepareStatement.java | 27 +- .../statement/MysqlDropFullTextStatement.java | 1 - .../MysqlShowCreateFullTextStatement.java | 2 - .../statement/MysqlShowFullTextStatement.java | 2 - .../ast/statement/MysqlShowHtcStatement.java | 4 +- .../ast/statement/MysqlShowStcStatement.java | 4 +- .../SQLAlterResourceGroupStatement.java | 3 +- .../SQLCreateResourceGroupStatement.java | 3 +- .../SQLListResourceGroupStatement.java | 6 +- .../executor/MySqlProcedureExecutor.java | 1 - .../mysql/parser/MySqlCreateTableParser.java | 44 +- .../dialect/mysql/parser/MySqlExprParser.java | 115 ++- .../mysql/parser/MySqlInsertReader.java | 1 - .../sql/dialect/mysql/parser/MySqlLexer.java | 87 +- .../mysql/parser/MySqlSelectIntoParser.java | 82 +- .../mysql/parser/MySqlSelectParser.java | 52 +- .../mysql/parser/MySqlStatementParser.java | 237 ++--- .../mysql/visitor/MySqlASTVisitor.java | 176 ---- .../mysql/visitor/MySqlASTVisitorAdapter.java | 12 - .../mysql/visitor/MySqlEvalVisitorImpl.java | 19 +- .../visitor/MySqlExportParameterVisitor.java | 35 +- .../mysql/visitor/MySqlOutputVisitor.java | 152 ++- .../visitor/MySqlParameterizedVisitor.java | 10 - .../mysql/visitor/MySqlSchemaStatVisitor.java | 89 +- .../visitor/MySqlShowColumnOutpuVisitor.java | 4 +- .../transform/FromSubqueryResolver.java | 4 +- .../visitor/transform/NameResolveVisitor.java | 20 +- .../visitor/transform/OrderByResolve.java | 5 +- .../ast/OdpsAddAccountProviderStatement.java | 1 - .../odps/ast/OdpsAddFileStatement.java | 7 +- .../odps/ast/OdpsAddStatisticStatement.java | 1 - .../odps/ast/OdpsAddTableStatement.java | 2 - .../odps/ast/OdpsAddUserStatement.java | 3 - .../dialect/odps/ast/OdpsCountStatement.java | 3 - .../odps/ast/OdpsCreateTableStatement.java | 6 +- .../ast/OdpsDeclareVariableStatement.java | 2 - .../odps/ast/OdpsExstoreStatement.java | 3 +- .../sql/dialect/odps/ast/OdpsGrantStmt.java | 15 +- .../sql/dialect/odps/ast/OdpsListStmt.java | 3 +- .../sql/dialect/odps/ast/OdpsNewExpr.java | 10 +- .../sql/dialect/odps/ast/OdpsObjectImpl.java | 4 +- .../odps/ast/OdpsQueryAliasStatement.java | 1 - .../dialect/odps/ast/OdpsReadStatement.java | 7 +- .../ast/OdpsRemoveStatisticStatement.java | 1 - .../odps/ast/OdpsRemoveUserStatement.java | 3 - .../odps/ast/OdpsRestoreStatement.java | 2 - .../odps/ast/OdpsSelectQueryBlock.java | 5 +- .../odps/ast/OdpsSetLabelStatement.java | 9 +- .../odps/ast/OdpsShowChangelogsStatement.java | 1 - .../dialect/odps/ast/OdpsShowGrantsStmt.java | 2 +- .../dialect/odps/ast/OdpsStatementImpl.java | 5 +- .../dialect/odps/ast/OdpsStatisticClause.java | 29 +- .../odps/ast/OdpsUDTFSQLSelectItem.java | 4 +- .../odps/ast/OdpsUndoTableStatement.java | 2 - .../dialect/odps/ast/OdpsUnloadStatement.java | 5 +- .../odps/parser/OdpsCreateTableParser.java | 30 +- .../dialect/odps/parser/OdpsExprParser.java | 58 +- .../sql/dialect/odps/parser/OdpsLexer.java | 40 +- .../dialect/odps/parser/OdpsSelectParser.java | 20 +- .../odps/parser/OdpsStatementParser.java | 51 +- .../dialect/odps/visitor/OdpsASTVisitor.java | 32 - .../odps/visitor/OdpsASTVisitorAdapter.java | 2 - .../odps/visitor/OdpsOutputVisitor.java | 16 +- .../odps/visitor/OdpsSchemaStatVisitor.java | 3 +- .../oracle/ast/OracleDataTypeIntervalDay.java | 5 +- .../ast/OracleDataTypeIntervalYear.java | 3 +- .../dialect/oracle/ast/OracleSQLObject.java | 1 - .../oracle/ast/OracleSQLObjectImpl.java | 4 +- .../oracle/ast/OracleSegmentAttributes.java | 9 +- .../oracle/ast/clause/CycleClause.java | 9 +- .../oracle/ast/clause/ModelClause.java | 76 +- .../ast/clause/OracleLobStorageClause.java | 26 +- .../ast/clause/OracleReturningClause.java | 3 +- .../ast/clause/OracleStorageClause.java | 22 +- .../ast/clause/OracleWithSubqueryEntry.java | 3 +- .../ast/clause/PartitionExtensionClause.java | 5 +- .../oracle/ast/clause/SampleClause.java | 6 +- .../oracle/ast/clause/SearchClause.java | 7 +- .../oracle/ast/expr/OracleAnalytic.java | 9 +- .../ast/expr/OracleAnalyticWindowing.java | 6 +- .../oracle/ast/expr/OracleArgumentExpr.java | 9 +- .../ast/expr/OracleBinaryDoubleExpr.java | 6 +- .../ast/expr/OracleBinaryFloatExpr.java | 6 +- .../oracle/ast/expr/OracleCursorExpr.java | 6 +- .../oracle/ast/expr/OracleDatetimeExpr.java | 6 +- .../dialect/oracle/ast/expr/OracleExpr.java | 1 - .../oracle/ast/expr/OracleIntervalExpr.java | 12 +- .../oracle/ast/expr/OracleIsOfTypeExpr.java | 12 +- .../oracle/ast/expr/OracleIsSetExpr.java | 5 +- .../oracle/ast/expr/OracleOuterExpr.java | 8 +- .../oracle/ast/expr/OracleRangeExpr.java | 7 +- .../oracle/ast/expr/OracleSysdateExpr.java | 1 - .../oracle/ast/expr/OracleTreatExpr.java | 1 - .../ast/stmt/OracleAlterSessionStatement.java | 1 - .../ast/stmt/OracleAlterSynonymStatement.java | 1 - .../stmt/OracleAlterTableDropPartition.java | 1 - .../oracle/ast/stmt/OracleAlterTableItem.java | 1 - .../ast/stmt/OracleAlterTableModify.java | 1 - .../stmt/OracleAlterTableMoveTablespace.java | 1 - .../stmt/OracleAlterTableSplitPartition.java | 21 +- .../OracleAlterTableTruncatePartition.java | 1 - .../OracleAlterTablespaceAddDataFile.java | 1 - .../ast/stmt/OracleAlterTablespaceItem.java | 1 - .../stmt/OracleAlterTablespaceStatement.java | 3 +- .../ast/stmt/OracleAlterTriggerStatement.java | 1 - .../ast/stmt/OracleAlterViewStatement.java | 1 - .../dialect/oracle/ast/stmt/OracleCheck.java | 7 +- .../oracle/ast/stmt/OracleConstraint.java | 2 +- .../ast/stmt/OracleContinueStatement.java | 1 - .../OracleCreateDatabaseDbLinkStatement.java | 11 +- .../ast/stmt/OracleCreateIndexStatement.java | 16 +- .../stmt/OracleCreatePackageStatement.java | 2 +- .../ast/stmt/OracleCreateTableStatement.java | 56 +- .../ast/stmt/OracleCreateTypeStatement.java | 32 +- .../oracle/ast/stmt/OracleDDLStatement.java | 1 - .../ast/stmt/OracleDeleteStatement.java | 8 +- .../ast/stmt/OracleDropDbLinkStatement.java | 1 - .../ast/stmt/OracleExceptionStatement.java | 6 +- .../stmt/OracleExecuteImmediateStatement.java | 5 +- .../ast/stmt/OracleExplainStatement.java | 8 +- .../ast/stmt/OracleFileSpecification.java | 9 +- .../oracle/ast/stmt/OracleForStatement.java | 6 +- .../oracle/ast/stmt/OracleForeignKey.java | 7 +- .../oracle/ast/stmt/OracleGotoStatement.java | 5 +- .../ast/stmt/OracleInsertStatement.java | 4 +- .../oracle/ast/stmt/OracleLabelStatement.java | 5 +- .../oracle/ast/stmt/OracleLobParameters.java | 1 - .../ast/stmt/OracleLockTableStatement.java | 10 +- .../ast/stmt/OracleMultiInsertStatement.java | 22 +- .../oracle/ast/stmt/OraclePrimaryKey.java | 9 +- .../oracle/ast/stmt/OracleRaiseStatement.java | 1 - .../oracle/ast/stmt/OracleRunStatement.java | 8 +- .../oracle/ast/stmt/OracleSelectJoin.java | 29 +- .../oracle/ast/stmt/OracleSelectPivot.java | 7 +- .../ast/stmt/OracleSelectPivotBase.java | 4 +- .../ast/stmt/OracleSelectQueryBlock.java | 13 +- .../ast/stmt/OracleSelectRestriction.java | 13 +- .../stmt/OracleSelectSubqueryTableSource.java | 12 +- .../ast/stmt/OracleSelectTableReference.java | 42 +- .../ast/stmt/OracleSelectTableSource.java | 1 - .../oracle/ast/stmt/OracleSelectUnPivot.java | 3 - .../stmt/OracleSetTransactionStatement.java | 5 +- .../oracle/ast/stmt/OracleStatement.java | 1 - .../oracle/ast/stmt/OracleStatementImpl.java | 1 - .../ast/stmt/OracleSupplementalIdKey.java | 1 - .../ast/stmt/OracleSupplementalLogGrp.java | 2 +- .../dialect/oracle/ast/stmt/OracleUnique.java | 7 +- .../ast/stmt/OracleUpdateStatement.java | 47 +- .../ast/stmt/OracleUsingIndexClause.java | 13 +- .../ast/stmt/OracleXmlColumnProperties.java | 1 - .../parser/OracleCreateTableParser.java | 28 +- .../oracle/parser/OracleExprParser.java | 343 +++---- .../oracle/parser/OracleFunctionDataType.java | 2 +- .../dialect/oracle/parser/OracleLexer.java | 21 +- .../parser/OracleProcedureDataType.java | 2 +- .../oracle/parser/OracleSelectParser.java | 22 +- .../oracle/parser/OracleStatementParser.java | 79 +- .../oracle/parser/OracleUpdateParser.java | 9 +- .../OracleASTParameterizedVisitor.java | 2 +- .../oracle/visitor/OracleASTVisitor.java | 90 -- .../visitor/OracleASTVisitorAdapter.java | 1 - .../oracle/visitor/OracleEvalVisitor.java | 15 +- .../visitor/OracleExportParameterVisitor.java | 29 +- .../oracle/visitor/OracleOutputVisitor.java | 29 +- .../OracleParameterizedOutputVisitor.java | 7 +- .../oracle/visitor/OracleRowNumToLimit.java | 14 +- .../visitor/OracleSchemaStatVisitor.java | 23 +- .../visitor/OracleToMySqlOutputVisitor.java | 14 +- .../phoenix/ast/PhoenixStatementImpl.java | 1 - .../phoenix/ast/PhoenixUpsertStatement.java | 2 - .../phoenix/parser/PhoenixExprParser.java | 5 +- .../dialect/phoenix/parser/PhoenixLexer.java | 4 +- .../parser/PhoenixStatementParser.java | 18 +- .../phoenix/visitor/PhoenixOutputVisitor.java | 4 +- .../dialect/postgresql/ast/PGSQLObject.java | 1 - .../postgresql/ast/PGSQLObjectImpl.java | 4 +- .../postgresql/ast/expr/PGBoxExpr.java | 1 - .../postgresql/ast/expr/PGCidrExpr.java | 1 - .../postgresql/ast/expr/PGCircleExpr.java | 1 - .../postgresql/ast/expr/PGDateField.java | 2 +- .../dialect/postgresql/ast/expr/PGExpr.java | 3 +- .../postgresql/ast/expr/PGExprImpl.java | 2 - .../postgresql/ast/expr/PGExtractExpr.java | 3 +- .../postgresql/ast/expr/PGInetExpr.java | 1 - .../ast/expr/PGLineSegmentsExpr.java | 1 - .../postgresql/ast/expr/PGMacAddrExpr.java | 4 - .../postgresql/ast/expr/PGPointExpr.java | 1 - .../postgresql/ast/expr/PGPolygonExpr.java | 4 - .../postgresql/ast/expr/PGTypeCastExpr.java | 1 - .../ast/stmt/PGAlterSchemaStatement.java | 2 - .../PGAlterTableAlterColumnSetNotNull.java | 2 - .../ast/stmt/PGConnectToStatement.java | 5 - .../ast/stmt/PGCreateSchemaStatement.java | 1 - .../ast/stmt/PGDeleteStatement.java | 5 +- .../ast/stmt/PGDropSchemaStatement.java | 2 - .../ast/stmt/PGFunctionTableSource.java | 7 +- .../ast/stmt/PGInsertStatement.java | 35 +- .../postgresql/ast/stmt/PGSQLStatement.java | 1 - .../ast/stmt/PGSelectQueryBlock.java | 22 +- .../ast/stmt/PGSelectStatement.java | 5 +- .../postgresql/ast/stmt/PGShowStatement.java | 1 - .../ast/stmt/PGUpdateStatement.java | 7 +- .../parser/PGCreateTableParser.java | 5 +- .../postgresql/parser/PGExprParser.java | 70 +- .../dialect/postgresql/parser/PGLexer.java | 17 +- .../parser/PGSQLStatementParser.java | 64 +- .../postgresql/parser/PGSelectParser.java | 20 +- .../postgresql/visitor/PGASTVisitor.java | 4 +- .../visitor/PGASTVisitorAdapter.java | 80 +- .../postgresql/visitor/PGEvalVisitor.java | 17 +- .../visitor/PGExportParameterVisitor.java | 27 +- .../postgresql/visitor/PGOutputVisitor.java | 32 +- .../visitor/PGSchemaStatVisitor.java | 9 +- .../ast/stmt/PrestoSelectStatement.java | 3 +- .../presto/parser/PrestoExprParser.java | 6 +- .../dialect/presto/parser/PrestoLexer.java | 5 +- .../presto/parser/PrestoSelectParser.java | 6 +- .../presto/parser/PrestoStatementParser.java | 18 +- .../sqlserver/ast/SQLServerObjectImpl.java | 4 +- .../sqlserver/ast/SQLServerOutput.java | 5 +- .../ast/SQLServerSelectQueryBlock.java | 1 - .../sqlserver/ast/SQLServerStatement.java | 1 - .../sqlserver/ast/SQLServerStatementImpl.java | 4 +- .../dialect/sqlserver/ast/SQLServerTop.java | 6 +- .../sqlserver/ast/expr/SQLServerExpr.java | 2 - .../expr/SQLServerObjectReferenceExpr.java | 20 +- .../ast/stmt/SQLServerExecStatement.java | 59 +- .../ast/stmt/SQLServerInsertStatement.java | 7 +- .../ast/stmt/SQLServerRollbackStatement.java | 3 +- ...SetTransactionIsolationLevelStatement.java | 1 - .../ast/stmt/SQLServerUpdateStatement.java | 9 +- .../ast/stmt/SQLServerWaitForStatement.java | 9 +- .../sqlserver/parser/SQLServerExprParser.java | 19 +- .../sqlserver/parser/SQLServerLexer.java | 25 +- .../parser/SQLServerSelectParser.java | 25 +- .../parser/SQLServerStatementParser.java | 71 +- .../MSSQLServerExportParameterVisitor.java | 27 +- .../visitor/SQLServerASTVisitor.java | 48 +- .../visitor/SQLServerEvalVisitor.java | 19 +- .../visitor/SQLServerOutputVisitor.java | 57 +- .../visitor/SQLServerSchemaStatVisitor.java | 14 +- .../transact/ast/TransactSQLObject.java | 1 - .../alibaba/druid/sql/parser/CharTypes.java | 19 +- .../druid/sql/parser/EOFParserException.java | 3 +- .../druid/sql/parser/InsertColumnsCache.java | 14 +- .../alibaba/druid/sql/parser/Keywords.java | 23 +- .../druid/sql/parser/LayoutCharacters.java | 13 +- .../com/alibaba/druid/sql/parser/Lexer.java | 223 ++-- .../sql/parser/NotAllowCommentException.java | 7 +- .../druid/sql/parser/ParserException.java | 27 +- .../sql/parser/SQLCreateTableParser.java | 15 +- .../druid/sql/parser/SQLDDLParser.java | 5 +- .../druid/sql/parser/SQLExprParser.java | 230 +++-- .../sql/parser/SQLInsertValueHandler.java | 8 +- .../alibaba/druid/sql/parser/SQLParser.java | 28 +- .../druid/sql/parser/SQLParserFeature.java | 10 +- .../druid/sql/parser/SQLParserUtils.java | 194 ++-- .../druid/sql/parser/SQLSelectListCache.java | 24 +- .../druid/sql/parser/SQLSelectParser.java | 123 ++- .../druid/sql/parser/SQLStatementParser.java | 255 ++--- .../alibaba/druid/sql/parser/SymbolTable.java | 6 +- .../com/alibaba/druid/sql/parser/Token.java | 231 +++-- .../alibaba/druid/sql/repository/Schema.java | 13 +- .../druid/sql/repository/SchemaObject.java | 2 +- .../sql/repository/SchemaRepository.java | 26 +- .../sql/repository/SchemaResolveVisitor.java | 15 +- .../SchemaResolveVisitorFactory.java | 37 +- .../sql/repository/function/Function.java | 1 + .../repository/function/SignatureUtils.java | 3 +- .../sql/repository/function/Signatures.java | 1 - .../druid/sql/semantic/SemanticCheck.java | 2 - .../druid/sql/semantic/SemanticException.java | 2 +- .../sql/transform/SQLDataTypeTransform.java | 1 - .../sql/transform/SQLRefactorVisitor.java | 8 +- .../druid/sql/transform/SQLTranform.java | 1 + .../druid/sql/transform/SQLUnifiedUtils.java | 1 - .../sql/transform/SQLUnifiedVisitor.java | 3 +- .../sql/visitor/ExportParameterVisitor.java | 2 +- .../visitor/ExportParameterVisitorUtils.java | 5 +- .../ExportParameterizedOutputVisitor.java | 10 +- .../ParameterizedOutputVisitorUtils.java | 107 +- .../sql/visitor/ParameterizedVisitor.java | 1 - .../sql/visitor/SQLASTOutputVisitor.java | 355 +++---- .../visitor/SQLASTParameterizedVisitor.java | 7 +- .../druid/sql/visitor/SQLASTVisitor.java | 270 +---- .../sql/visitor/SQLASTVisitorAdapter.java | 12 - .../sql/visitor/SQLDataTypeValidator.java | 7 +- .../druid/sql/visitor/SQLEvalVisitor.java | 9 +- .../druid/sql/visitor/SQLEvalVisitorImpl.java | 19 +- .../sql/visitor/SQLEvalVisitorUtils.java | 110 +- .../sql/visitor/SQLSubQueryGroupVisitor.java | 5 +- .../visitor/SQLTableAliasCollectVisitor.java | 11 +- .../druid/sql/visitor/SchemaStatVisitor.java | 145 ++- .../druid/sql/visitor/VisitorFeature.java | 10 +- .../druid/sql/visitor/functions/Ascii.java | 7 +- .../druid/sql/visitor/functions/Bin.java | 3 +- .../sql/visitor/functions/BitLength.java | 3 +- .../druid/sql/visitor/functions/Char.java | 3 +- .../druid/sql/visitor/functions/Concat.java | 3 +- .../druid/sql/visitor/functions/DateAdd.java | 7 +- .../druid/sql/visitor/functions/Elt.java | 3 +- .../druid/sql/visitor/functions/Function.java | 1 - .../druid/sql/visitor/functions/Greatest.java | 4 +- .../druid/sql/visitor/functions/Hex.java | 3 +- .../druid/sql/visitor/functions/If.java | 4 +- .../druid/sql/visitor/functions/IfNull.java | 7 +- .../druid/sql/visitor/functions/Insert.java | 11 +- .../druid/sql/visitor/functions/Instr.java | 5 +- .../druid/sql/visitor/functions/Isnull.java | 6 +- .../druid/sql/visitor/functions/Lcase.java | 5 +- .../druid/sql/visitor/functions/Least.java | 3 +- .../druid/sql/visitor/functions/Left.java | 5 +- .../druid/sql/visitor/functions/Length.java | 5 +- .../druid/sql/visitor/functions/Locate.java | 7 +- .../druid/sql/visitor/functions/Lpad.java | 7 +- .../druid/sql/visitor/functions/Ltrim.java | 7 +- .../druid/sql/visitor/functions/Nil.java | 3 +- .../druid/sql/visitor/functions/Now.java | 5 +- .../visitor/functions/OneParamFunctions.java | 20 +- .../druid/sql/visitor/functions/Reverse.java | 5 +- .../druid/sql/visitor/functions/Right.java | 3 +- .../sql/visitor/functions/Substring.java | 5 +- .../druid/sql/visitor/functions/ToChar.java | 5 +- .../druid/sql/visitor/functions/ToDate.java | 7 +- .../druid/sql/visitor/functions/Trim.java | 3 +- .../druid/sql/visitor/functions/Ucase.java | 5 +- .../druid/sql/visitor/functions/Unhex.java | 5 +- .../stat/DruidDataSourceStatManager.java | 90 +- .../stat/DruidDataSourceStatManagerMBean.java | 1 - .../druid/stat/DruidStatManagerFacade.java | 39 +- .../alibaba/druid/stat/DruidStatService.java | 64 +- .../druid/stat/DruidStatServiceMBean.java | 1 - .../druid/stat/JdbcConnectionStat.java | 114 +-- .../druid/stat/JdbcConnectionStatMBean.java | 1 - .../druid/stat/JdbcDataSourceStat.java | 88 +- .../druid/stat/JdbcDataSourceStatMBean.java | 1 - .../alibaba/druid/stat/JdbcResultSetStat.java | 31 +- .../druid/stat/JdbcResultSetStatMBean.java | 1 - .../com/alibaba/druid/stat/JdbcSqlStat.java | 436 ++++---- .../alibaba/druid/stat/JdbcSqlStatMBean.java | 1 - .../alibaba/druid/stat/JdbcSqlStatValue.java | 141 ++- .../alibaba/druid/stat/JdbcStatContext.java | 25 +- .../alibaba/druid/stat/JdbcStatManager.java | 99 +- .../stat/JdbcStatManagerFactoryBean.java | 1 - .../druid/stat/JdbcStatManagerMBean.java | 1 - .../alibaba/druid/stat/JdbcStatementStat.java | 39 +- .../druid/stat/JdbcStatementStatMBean.java | 5 +- .../alibaba/druid/stat/JdbcTraceManager.java | 3 +- .../druid/stat/JdbcTraceManagerMBean.java | 2 - .../com/alibaba/druid/stat/TableStat.java | 93 +- .../calcite/CalciteMySqlNodeVisitor.java | 430 ++++---- .../support/calcite/CalciteSqlBasicCall.java | 3 +- .../druid/support/calcite/TDDLSqlSelect.java | 1 - .../druid/support/console/DruidStat.java | 90 +- .../alibaba/druid/support/console/Option.java | 205 ++-- .../support/console/OptionParseException.java | 3 +- .../druid/support/console/TableFormatter.java | 99 +- .../support/console/TabledDataPrinter.java | 43 +- .../hibernate/DruidConnectionProvider.java | 16 +- .../support/http/AbstractWebStatImpl.java | 33 +- .../http/MonitorClientContextListener.java | 5 +- .../druid/support/http/ResourceServlet.java | 51 +- .../druid/support/http/StatViewFilter.java | 10 +- .../druid/support/http/StatViewServlet.java | 85 +- .../druid/support/http/WebStatFilter.java | 60 +- .../druid/support/http/stat/WebAppStat.java | 218 ++-- .../support/http/stat/WebAppStatManager.java | 33 +- .../support/http/stat/WebAppStatUtils.java | 17 +- .../support/http/stat/WebAppStatValue.java | 133 ++- .../support/http/stat/WebRequestStat.java | 8 +- .../support/http/stat/WebSessionStat.java | 175 ++-- .../http/stat/WebSessionStatValue.java | 49 +- .../druid/support/http/stat/WebURIStat.java | 233 +++-- .../support/http/stat/WebURIStatValue.java | 73 +- .../druid/support/http/util/IPAddress.java | 35 +- .../druid/support/http/util/IPRange.java | 52 +- .../ibatis/DruidDataSourceFactory.java | 5 +- .../druid/support/ibatis/IbatisUtils.java | 22 +- .../SpringIbatisBeanNameAutoProxyCreator.java | 16 +- ...ngIbatisBeanNameAutoProxyCreatorMBean.java | 1 - .../SpringIbatisBeanTypeAutoProxyCreator.java | 26 +- ...ngIbatisBeanTypeAutoProxyCreatorMBean.java | 1 - .../ibatis/SqlMapClientImplWrapper.java | 489 +++++---- .../support/ibatis/SqlMapClientWrapper.java | 17 +- .../support/ibatis/SqlMapExecutorWrapper.java | 54 +- .../support/ibatis/SqlMapSessionWrapper.java | 18 +- .../jconsole/DruidDataSourcePanel.java | 32 +- .../support/jconsole/DruidDriverPanel.java | 19 +- .../druid/support/jconsole/DruidPanel.java | 111 +- .../druid/support/jconsole/DruidPlugin.java | 15 +- .../druid/support/jconsole/DruidSQLPanel.java | 255 +++-- .../support/jconsole/DruidSqlDetailFrame.java | 413 ++++---- .../support/jconsole/model/ColumnGroup.java | 61 +- .../model/DruidTableCellRenderer.java | 12 +- .../jconsole/model/DruidTableModel.java | 29 +- .../jconsole/model/GroupableTableHeader.java | 13 +- .../model/GroupableTableHeaderUI.java | 30 +- .../jconsole/model/RowHeaderRenderer.java | 103 ++ .../jconsole/model/RowHeaderTable.java | 126 +-- .../jconsole/util/TableDataProcessor.java | 109 +- .../druid/support/json/JSONParser.java | 35 +- .../alibaba/druid/support/json/JSONUtils.java | 3 +- .../druid/support/json/JSONWriter.java | 29 +- .../logging/JakartaCommonsLoggingImpl.java | 7 +- .../support/logging/Jdk14LoggingImpl.java | 11 +- .../alibaba/druid/support/logging/Log.java | 3 +- .../druid/support/logging/Log4j2Impl.java | 17 +- .../druid/support/logging/Log4jImpl.java | 21 +- .../druid/support/logging/LogFactory.java | 23 +- .../druid/support/logging/NoLoggingImpl.java | 19 +- .../druid/support/logging/Resources.java | 10 +- .../druid/support/logging/SLF4JImpl.java | 17 +- .../support/metrics/MetricCollector.java | 2 - .../druid/support/monitor/MonitorClient.java | 73 +- .../druid/support/monitor/MonitorContext.java | 20 +- .../druid/support/monitor/MonitorServlet.java | 11 +- .../support/monitor/annotation/MField.java | 3 +- .../support/monitor/annotation/MTable.java | 3 +- .../druid/support/monitor/dao/MonitorDao.java | 11 +- .../monitor/dao/MonitorDaoJdbcImpl.java | 132 ++- .../support/monitor/entity/MonitorApp.java | 3 +- .../monitor/entity/MonitorCluster.java | 3 +- .../monitor/entity/MonitorInstance.java | 7 +- .../druid/support/opds/udf/ExportColumns.java | 1 - .../opds/udf/ExportConditionColumns.java | 3 +- .../support/opds/udf/ExportConditions.java | 7 +- .../opds/udf/ExportSelectListColumns.java | 3 +- .../druid/support/opds/udf/ExportTables.java | 1 - .../support/opds/udf/MetaSqlExtract.java | 2 +- .../druid/support/opds/udf/SqlCodeStat.java | 38 +- .../druid/support/opds/udf/SqlFormat.java | 1 - .../druid/support/opds/udf/SqlTypeUDF.java | 4 +- .../druid/support/profile/ProfileEntry.java | 9 +- .../support/profile/ProfileEntryKey.java | 4 +- .../support/profile/ProfileEntryReqStat.java | 1 - .../support/profile/ProfileEntryStat.java | 9 +- .../profile/ProfileEntryStatValue.java | 5 +- .../druid/support/profile/ProfileStat.java | 13 +- .../druid/support/profile/Profiler.java | 11 +- .../quartz/DruidQuartzConnectionProvider.java | 6 +- .../simplejndi/DruidDataSourceConverter.java | 71 +- .../druid/support/spring/DruidLobCreator.java | 25 +- .../druid/support/spring/DruidLobHandler.java | 7 +- .../spring/DruidNativeJdbcExtractor.java | 10 +- .../spring/MBeanServerFactoryBean.java | 5 +- .../spring/mvc/StatHandlerInterceptor.java | 36 +- .../spring/stat/BeanTypeAutoProxyCreator.java | 21 +- .../spring/stat/DruidStatInterceptor.java | 22 +- .../support/spring/stat/SpringMethodInfo.java | 11 +- .../support/spring/stat/SpringMethodStat.java | 121 ++- .../spring/stat/SpringMethodStatValue.java | 81 +- .../druid/support/spring/stat/SpringStat.java | 16 +- .../spring/stat/SpringStatManager.java | 27 +- .../support/spring/stat/SpringStatUtils.java | 13 +- .../support/spring/stat/annotation/Stat.java | 8 +- .../annotation/StatAnnotationAdvisor.java | 66 +- .../StatAnnotationBeanPostProcessor.java | 22 +- .../config/DruidStatBeanDefinitionParser.java | 75 +- .../config/DruidStatNamespaceHandler.java | 12 +- .../java/com/alibaba/druid/util/Base64.java | 21 +- .../druid/util/DaemonThreadFactory.java | 7 +- .../druid/util/DruidDataSourceUtils.java | 53 +- .../druid/util/DruidPasswordCallback.java | 13 +- .../com/alibaba/druid/util/DruidWebUtils.java | 4 +- .../java/com/alibaba/druid/util/FnvHash.java | 11 +- .../java/com/alibaba/druid/util/H2Utils.java | 22 +- .../java/com/alibaba/druid/util/HexBin.java | 19 +- .../com/alibaba/druid/util/Histogram.java | 7 +- .../java/com/alibaba/druid/util/JMXUtils.java | 29 +- .../com/alibaba/druid/util/JdbcConstants.java | 164 ++- .../alibaba/druid/util/JdbcSqlStatUtils.java | 15 +- .../com/alibaba/druid/util/JdbcUtils.java | 78 +- .../java/com/alibaba/druid/util/LRUCache.java | 7 +- .../java/com/alibaba/druid/util/ListDG.java | 67 +- .../com/alibaba/druid/util/MapComparator.java | 5 +- .../com/alibaba/druid/util/MySqlUtils.java | 161 ++- .../com/alibaba/druid/util/OracleUtils.java | 30 +- .../java/com/alibaba/druid/util/PGUtils.java | 21 +- .../alibaba/druid/util/PatternMatcher.java | 7 +- .../alibaba/druid/util/ResultSetConsumer.java | 1 + .../druid/util/ServletPathMatcher.java | 101 +- .../com/alibaba/druid/util/StringUtils.java | 55 +- .../alibaba/druid/util/TransactionInfo.java | 9 +- .../java/com/alibaba/druid/util/Utils.java | 126 ++- .../druid/util/jdbc/ConnectionBase.java | 28 +- .../druid/util/jdbc/LocalResultSet.java | 9 +- .../util/jdbc/PreparedStatementBase.java | 29 +- .../druid/util/jdbc/ResultSetBase.java | 36 +- .../util/jdbc/ResultSetMetaDataBase.java | 37 +- .../druid/util/jdbc/StatementBase.java | 42 +- .../com/alibaba/druid/wall/Violation.java | 1 - .../alibaba/druid/wall/WallCheckResult.java | 28 +- .../com/alibaba/druid/wall/WallConfig.java | 192 ++-- .../alibaba/druid/wall/WallConfigMBean.java | 1 - .../com/alibaba/druid/wall/WallContext.java | 35 +- .../com/alibaba/druid/wall/WallDenyStat.java | 15 +- .../com/alibaba/druid/wall/WallFilter.java | 269 +++-- .../alibaba/druid/wall/WallFilterMBean.java | 19 +- .../alibaba/druid/wall/WallFunctionStat.java | 11 +- .../druid/wall/WallFunctionStatValue.java | 18 +- .../com/alibaba/druid/wall/WallProvider.java | 125 ++- .../druid/wall/WallProviderStatLogger.java | 1 - .../wall/WallProviderStatLoggerAdapter.java | 6 +- .../wall/WallProviderStatLoggerImpl.java | 13 +- .../druid/wall/WallProviderStatValue.java | 34 +- .../alibaba/druid/wall/WallSQLException.java | 5 +- .../druid/wall/WallSqlFunctionStat.java | 3 +- .../com/alibaba/druid/wall/WallSqlStat.java | 47 +- .../alibaba/druid/wall/WallSqlStatValue.java | 30 +- .../alibaba/druid/wall/WallSqlTableStat.java | 23 +- .../com/alibaba/druid/wall/WallTableStat.java | 229 +++-- .../druid/wall/WallTableStatValue.java | 86 +- .../druid/wall/WallUpdateCheckItem.java | 4 +- .../com/alibaba/druid/wall/WallUtils.java | 14 +- .../com/alibaba/druid/wall/WallVisitor.java | 10 +- .../wall/spi/ClickhouseWallProvider.java | 8 +- .../druid/wall/spi/ClickhouseWallVisitor.java | 4 +- .../druid/wall/spi/DB2WallProvider.java | 8 +- .../druid/wall/spi/DB2WallVisitor.java | 5 +- .../druid/wall/spi/MySqlWallProvider.java | 14 +- .../druid/wall/spi/MySqlWallVisitor.java | 26 +- .../druid/wall/spi/OracleWallProvider.java | 7 +- .../druid/wall/spi/OracleWallVisitor.java | 8 +- .../druid/wall/spi/PGWallProvider.java | 8 +- .../alibaba/druid/wall/spi/PGWallVisitor.java | 4 +- .../druid/wall/spi/SQLServerWallProvider.java | 9 +- .../druid/wall/spi/SQLServerWallVisitor.java | 20 +- .../druid/wall/spi/SQLiteWallProvider.java | 6 +- .../druid/wall/spi/SQLiteWallVisitor.java | 4 +- .../druid/wall/spi/WallVisitorBase.java | 4 +- .../druid/wall/spi/WallVisitorUtils.java | 87 +- .../druid/wall/violation/ErrorCode.java | 117 ++- .../violation/IllegalSQLObjectViolation.java | 5 +- .../wall/violation/SyntaxErrorViolation.java | 5 +- .../META-INF/druid-driver.properties | 20 +- .../META-INF/druid-filter.properties | 2 +- src/main/resources/META-INF/stat.xsd | 28 +- .../resources/activeConnectionStackTrace.html | 107 +- .../resources/support/http/resources/api.html | 167 +-- .../http/resources/connectionInfo.html | 260 ++--- .../support/http/resources/css/style.css | 25 +- .../support/http/resources/datasource.html | 951 ++++++++++-------- .../support/http/resources/header.html | 53 +- .../support/http/resources/index.html | 194 ++-- .../support/http/resources/js/common.js | 364 +++---- .../support/http/resources/js/doT.js | 249 ++--- .../support/http/resources/js/lang.js | 748 +++++++------- .../support/http/resources/login.html | 195 ++-- .../support/http/resources/nopermit.html | 18 +- .../support/http/resources/spring-detail.html | 298 +++--- .../support/http/resources/spring.html | 227 +++-- .../support/http/resources/sql-detail.html | 367 +++---- .../resources/support/http/resources/sql.html | 381 +++---- .../support/http/resources/wall.html | 760 +++++++------- .../support/http/resources/webapp.html | 176 ++-- .../http/resources/websession-detail.html | 340 +++---- .../support/http/resources/websession.html | 293 +++--- .../support/http/resources/weburi-detail.html | 442 ++++---- .../support/http/resources/weburi.html | 289 +++--- .../resources/support/monitor/mysql/basic.sql | 71 +- .../resources/support/monitor/mysql/const.sql | 19 +- .../support/monitor/mysql/datasource.sql | 89 +- .../support/monitor/mysql/springmethod.sql | 79 +- .../resources/support/monitor/mysql/sql.sql | 141 +-- .../resources/support/monitor/mysql/wall.sql | 141 +-- .../support/monitor/mysql/webapp.sql | 145 +-- .../support/monitor/mysql/weburi.sql | 77 +- .../support/monitor/resources/index.html | 8 +- src/main/resources/tpcds/create_tables.sql | 926 ++++++++--------- src/main/resources/tpcds/query01.sql | 36 +- src/main/resources/tpcds/query02.sql | 135 +-- src/main/resources/tpcds/query03.sql | 13 +- src/main/resources/tpcds/query04.sql | 227 ++--- src/main/resources/tpcds/query05.sql | 178 ++-- src/main/resources/tpcds/query06.sql | 45 +- src/main/resources/tpcds/query07.sql | 39 +- src/main/resources/tpcds/query08.sql | 208 ++-- src/main/resources/tpcds/query09.sql | 95 +- src/main/resources/tpcds/query10.sql | 113 +-- src/main/resources/tpcds/query11.sql | 152 ++- src/main/resources/tpcds/query12.sql | 56 +- src/main/resources/tpcds/query13.sql | 95 +- src/main/resources/tpcds/query14.sql | 405 ++++---- src/main/resources/tpcds/query15.sql | 34 +- src/main/resources/tpcds/query16.sql | 52 +- src/main/resources/tpcds/query17.sql | 84 +- src/main/resources/tpcds/query18.sql | 65 +- src/main/resources/tpcds/query19.sql | 51 +- src/main/resources/tpcds/query20.sql | 52 +- src/main/resources/tpcds/query21.sql | 56 +- src/main/resources/tpcds/query22.sql | 33 +- src/main/resources/tpcds/query23.sql | 197 ++-- src/main/resources/tpcds/query24.sql | 180 ++-- src/main/resources/tpcds/query25.sql | 84 +- src/main/resources/tpcds/query26.sql | 39 +- src/main/resources/tpcds/query27.sql | 44 +- src/main/resources/tpcds/query28.sql | 75 +- src/main/resources/tpcds/query29.sql | 82 +- src/main/resources/tpcds/query30.sql | 64 +- src/main/resources/tpcds/query31.sql | 97 +- src/main/resources/tpcds/query32.sql | 43 +- src/main/resources/tpcds/query33.sql | 131 ++- src/main/resources/tpcds/query34.sql | 59 +- src/main/resources/tpcds/query35.sql | 111 +- src/main/resources/tpcds/query36.sql | 43 +- src/main/resources/tpcds/query37.sql | 30 +- src/main/resources/tpcds/query38.sql | 44 +- src/main/resources/tpcds/query39.sql | 124 ++- src/main/resources/tpcds/query40.sql | 48 +- src/main/resources/tpcds/query41.sql | 97 +- src/main/resources/tpcds/query42.sql | 37 +- src/main/resources/tpcds/query43.sql | 34 +- src/main/resources/tpcds/query44.sql | 63 +- src/main/resources/tpcds/query45.sql | 37 +- src/main/resources/tpcds/query46.sql | 69 +- src/main/resources/tpcds/query47.sql | 98 +- src/main/resources/tpcds/query48.sql | 129 +-- src/main/resources/tpcds/query49.sql | 220 ++-- src/main/resources/tpcds/query50.sql | 111 +- src/main/resources/tpcds/query51.sql | 74 +- src/main/resources/tpcds/query52.sql | 37 +- src/main/resources/tpcds/query53.sql | 53 +- src/main/resources/tpcds/query54.sql | 102 +- src/main/resources/tpcds/query55.sql | 24 +- src/main/resources/tpcds/query56.sql | 121 ++- src/main/resources/tpcds/query57.sql | 90 +- src/main/resources/tpcds/query58.sql | 123 +-- src/main/resources/tpcds/query59.sql | 98 +- src/main/resources/tpcds/query60.sql | 136 ++- src/main/resources/tpcds/query61.sql | 80 +- src/main/resources/tpcds/query62.sql | 65 +- src/main/resources/tpcds/query63.sql | 41 +- src/main/resources/tpcds/query64.sql | 227 ++--- src/main/resources/tpcds/query65.sql | 53 +- src/main/resources/tpcds/query66.sql | 433 ++++---- src/main/resources/tpcds/query67.sql | 71 +- src/main/resources/tpcds/query68.sql | 71 +- src/main/resources/tpcds/query69.sql | 89 +- src/main/resources/tpcds/query70.sql | 59 +- src/main/resources/tpcds/query71.sql | 78 +- src/main/resources/tpcds/query72.sql | 41 +- src/main/resources/tpcds/query73.sql | 54 +- src/main/resources/tpcds/query74.sql | 114 +-- src/main/resources/tpcds/query75.sql | 123 +-- src/main/resources/tpcds/query76.sql | 55 +- src/main/resources/tpcds/query77.sql | 205 ++-- src/main/resources/tpcds/query78.sql | 108 +- src/main/resources/tpcds/query79.sql | 46 +- src/main/resources/tpcds/query80.sql | 184 ++-- src/main/resources/tpcds/query81.sql | 67 +- src/main/resources/tpcds/query82.sql | 30 +- src/main/resources/tpcds/query83.sql | 125 ++- src/main/resources/tpcds/query84.sql | 35 +- src/main/resources/tpcds/query85.sql | 160 +-- src/main/resources/tpcds/query86.sql | 35 +- src/main/resources/tpcds/query87.sql | 23 +- src/main/resources/tpcds/query88.sql | 203 ++-- src/main/resources/tpcds/query89.sql | 52 +- src/main/resources/tpcds/query90.sql | 43 +- src/main/resources/tpcds/query91.sql | 51 +- src/main/resources/tpcds/query92.sql | 45 +- src/main/resources/tpcds/query93.sql | 31 +- src/main/resources/tpcds/query94.sql | 48 +- src/main/resources/tpcds/query95.sql | 54 +- src/main/resources/tpcds/query96.sql | 24 +- src/main/resources/tpcds/query97.sql | 44 +- src/main/resources/tpcds/query98.sql | 53 +- src/main/resources/tpcds/query99.sql | 65 +- src/main/resources/tpch/create_tables.sql | 162 +-- .../resources/tpch/insert_lineitem_200.sql | 404 +++++++- src/main/resources/tpch/q1.sql | 37 +- src/main/resources/tpch/q10.sql | 48 +- src/main/resources/tpch/q11.sql | 36 +- src/main/resources/tpch/q12.sql | 41 +- src/main/resources/tpch/q13.sql | 32 +- src/main/resources/tpch/q14.sql | 16 +- src/main/resources/tpch/q15.sql | 20 +- src/main/resources/tpch/q16.sql | 43 +- src/main/resources/tpch/q17.sql | 18 +- src/main/resources/tpch/q18.sql | 51 +- src/main/resources/tpch/q19.sql | 62 +- src/main/resources/tpch/q2.sql | 63 +- src/main/resources/tpch/q20.sql | 52 +- src/main/resources/tpch/q21.sql | 52 +- src/main/resources/tpch/q22.sql | 54 +- src/main/resources/tpch/q3.sql | 32 +- src/main/resources/tpch/q4.sql | 27 +- src/main/resources/tpch/q5.sql | 27 +- src/main/resources/tpch/q6.sql | 12 +- src/main/resources/tpch/q7.sql | 68 +- src/main/resources/tpch/q8.sql | 66 +- src/main/resources/tpch/q9.sql | 54 +- src/test/java/com/alibaba/druid/DBCPTest.java | 10 +- .../com/alibaba/druid/DragoonMetaInfTest.java | 1 - src/test/java/com/alibaba/druid/LockTest.java | 1 - .../java/com/alibaba/druid/TestForZY.java | 2 +- .../TestHibernateCRUDWithTransactional.java | 1 - .../java/com/alibaba/druid/TestHistogram.java | 1 - .../java/com/alibaba/druid/TestIdel3.java | 7 +- src/test/java/com/alibaba/druid/TestLRU.java | 1 - .../java/com/alibaba/druid/TestLockCount.java | 46 +- .../java/com/alibaba/druid/TestOracle.java | 1 - .../com/alibaba/druid/TestOraclePing.java | 1 - .../com/alibaba/druid/TestReplaceLicense.java | 4 +- .../java/com/alibaba/druid/TestRollBack.java | 147 ++- .../java/com/alibaba/druid/TestSqlServer.java | 5 +- .../com/alibaba/druid/TestTraceFilter.java | 1 - src/test/java/com/alibaba/druid/TestUtil.java | 1 - .../com/alibaba/druid/benckmark/TPCDS.java | 2 +- .../com/alibaba/druid/benckmark/TPCH.java | 2 +- .../druid/benckmark/pool/AsyncClose.java | 6 +- .../alibaba/druid/benckmark/pool/Case0.java | 45 +- .../alibaba/druid/benckmark/pool/Case1.java | 40 +- .../alibaba/druid/benckmark/pool/Case2.java | 35 +- .../alibaba/druid/benckmark/pool/Case3.java | 41 +- .../benckmark/pool/CaseKylin_Oracle.java | 55 +- .../druid/benckmark/pool/CaseKylin_mysql.java | 49 +- .../pool/CaseKylin_mysql_idle_1.java | 49 +- .../pool/CaseKylin_mysql_idle_2.java | 49 +- .../benckmark/pool/Case_Concurrent_50.java | 37 +- .../druid/benckmark/pool/Oracle_Case0.java | 25 +- .../druid/benckmark/pool/Oracle_Case3.java | 29 +- .../druid/benckmark/pool/Oracle_Case4.java | 47 +- .../benckmark/pool/druid/DruidCase0.java | 3 +- .../benckmark/pool/model/TableOperator.java | 7 +- .../druid/benckmark/proxy/BenchmarkCase.java | 5 +- .../benckmark/proxy/BenchmarkExecutor.java | 22 +- .../benckmark/proxy/DirectSQLExecutor.java | 3 +- .../benckmark/proxy/DruidBenchmarkTest.java | 2 - .../druid/benckmark/proxy/SQLExecutor.java | 3 +- .../proxy/TestAtomicPerformance.java | 1 - .../benckmark/proxy/sqlcase/Select1.java | 5 +- .../proxy/sqlcase/SelectEmptyTable.java | 13 +- .../benckmark/proxy/sqlcase/SelectNow.java | 5 +- .../proxy/sqlcase/SelectSysUser.java | 5 +- .../benckmark/sql/MySqlInsertBenchmark.java | 1 - .../benckmark/sql/MySqlInsertBenchmark_2.java | 2 - .../druid/benckmark/sql/MySqlPerfMain.java | 5 +- .../sql/MySqlPerfMain_schemaStat.java | 3 +- .../benckmark/sql/MySqlPerfMain_select.java | 2 - .../benckmark/sql/MySqlPerfMain_visitor.java | 3 +- .../druid/benckmark/sql/MySqlPerfTest.java | 1 - .../druid/benckmark/sql/SqlHolder.java | 1 + .../benckmark/sql/StatementConverter.java | 1 - .../druid/benckmark/sql/Templates.java | 2 - .../benckmark/wall/WallBenchmarkTest.java | 9 +- .../benckmark/wall/WallBenchmarkTest1.java | 34 +- .../wall/WallBenchmarkTest_mysql.java | 11 +- .../WallBenchmarkTest_mysql_concurrent.java | 14 +- .../alibaba/druid/bvt/AlipayUseCaseTest.java | 1 - .../java/com/alibaba/druid/bvt/OrTest.java | 4 +- .../druid/bvt/bug/Bug_for_happyday517.java | 11 +- .../druid/bvt/bug/Bug_for_happyday517_2.java | 10 +- .../druid/bvt/bug/Bug_for_happyday517_3.java | 7 +- .../alibaba/druid/bvt/bug/Bug_for_order.java | 1 - .../alibaba/druid/bvt/bug/Bug_for_qianbi.java | 3 +- .../alibaba/druid/bvt/bug/Bug_for_ruiyi.java | 35 +- .../druid/bvt/bug/Bug_for_wdw1206.java | 5 +- .../alibaba/druid/bvt/bug/Bug_for_weizhi.java | 1 - .../druid/bvt/bug/Bug_for_xuershan.java | 7 +- .../com/alibaba/druid/bvt/bug/Issue1576.java | 1 + .../com/alibaba/druid/bvt/bug/Issue1737.java | 4 +- .../com/alibaba/druid/bvt/bug/Issue1912.java | 1 - .../com/alibaba/druid/bvt/bug/Issue1935.java | 24 +- .../com/alibaba/druid/bvt/bug/Issue1994.java | 3 +- .../com/alibaba/druid/bvt/bug/Issue4071.java | 2 +- .../com/alibaba/druid/bvt/bug/Issue4253.java | 1 + .../com/alibaba/druid/bvt/bug/Issue_4094.java | 27 +- .../com/alibaba/druid/bvt/bug/Issue_685.java | 1 - .../com/alibaba/druid/bvt/bug/Issue_697.java | 4 +- .../com/alibaba/druid/bvt/bug/Issue_728.java | 1 - .../bvt/console/DruidStatNullDataTest.java | 26 +- .../druid/bvt/console/DruidStatTest.java | 29 +- .../alibaba/druid/bvt/console/OptionTest.java | 33 +- .../druid/bvt/filter/ClearFilterTest.java | 8 +- .../bvt/filter/EncodingConvertFilterTest.java | 21 +- .../filter/EncodingConvertFilterTest2.java | 101 +- .../druid/bvt/filter/FilterChainImplTest.java | 9 +- .../bvt/filter/FilterChainImplTest2.java | 344 +++---- .../bvt/filter/FilterChainImplTest3.java | 14 +- .../bvt/filter/FilterChainTest_Clob.java | 20 +- .../bvt/filter/FilterChainTest_Clob_2.java | 10 +- .../bvt/filter/FilterChainTest_NClob.java | 20 +- .../bvt/filter/FilterChainTest_NClob_2.java | 28 +- .../bvt/filter/FilterChainTest_ResultSet.java | 20 +- .../filter/FilterChainTest_ResultSet_2.java | 10 +- ...DatasourceConnectAndRecycleFilterTest.java | 11 +- .../druid/bvt/filter/FilterManagerTest.java | 30 +- .../druid/bvt/filter/ReuseStatFilterTest.java | 8 +- .../druid/bvt/filter/Slf4jFilterTest.java | 5 +- .../bvt/filter/StatFilterAfterResetTest.java | 2 - .../StatFilterBuildSlowParameterTest.java | 24 +- .../druid/bvt/filter/StatFilterClobTest.java | 5 +- .../bvt/filter/StatFilterExecErrorTest.java | 7 +- .../StatFilterExecuteFirstResultSetTest.java | 6 +- .../bvt/filter/StatFilterExecuteTest.java | 12 +- .../filter/StatFilterOpenBlobCountTest.java | 6 +- .../filter/StatFilterOpenBlobCountTest2.java | 24 +- .../filter/StatFilterOpenClobCountTest.java | 10 +- .../filter/StatFilterOpenClobCountTest2.java | 36 +- .../StatFilterOpenInputStreamCountTest.java | 6 +- .../StatFilterOpenInputStreamCountTest2.java | 2 - .../filter/StatFilterOpenReaderCountTest.java | 6 +- .../filter/StatFilterReadBytesLengthTest.java | 6 +- .../StatFilterReadStringLengthTest.java | 6 +- .../StatFilterResultSetMultiCloseTest.java | 2 - .../bvt/filter/config/ConfigFilterTest.java | 3 +- .../bvt/filter/config/ConfigFilterTest1.java | 18 +- .../bvt/filter/config/ConfigFilterTest2.java | 1 - .../bvt/filter/config/ConfigFilterTest3.java | 1 - .../bvt/filter/config/ConfigFilterTest4.java | 1 - .../bvt/filter/config/ConfigToolsTest.java | 5 +- .../druid/bvt/filter/log/LogFilterTest.java | 11 +- .../druid/bvt/filter/log/LogFilterTest2.java | 11 +- .../druid/bvt/filter/log/LogFilterTest3.java | 13 +- .../druid/bvt/filter/log/LogFilterTest4.java | 8 +- .../druid/bvt/filter/log/LogFilterTest5.java | 12 +- .../bvt/filter/log/Slf4jLogFilterTest.java | 10 +- .../druid/bvt/filter/wall/BigSqlTest.java | 1 - .../druid/bvt/filter/wall/BitwiseAndTest.java | 5 +- .../bvt/filter/wall/BitwiseInvertTest.java | 5 +- .../druid/bvt/filter/wall/BitwiseOrTest.java | 5 +- .../druid/bvt/filter/wall/BitwiseXorTest.java | 5 +- .../druid/bvt/filter/wall/BooleanXorTest.java | 5 +- .../wall/ConstantArithmeticCheckTest.java | 5 +- .../druid/bvt/filter/wall/CountTest.java | 8 +- .../bvt/filter/wall/DoPrivilegedTest.java | 2 - .../bvt/filter/wall/IdentEqualsTest.java | 5 +- .../bvt/filter/wall/IdentEqualsTest1.java | 5 +- .../druid/bvt/filter/wall/IntersectTest.java | 5 +- .../druid/bvt/filter/wall/LikeTest.java | 1 - .../druid/bvt/filter/wall/MinusTest.java | 6 +- .../filter/wall/MustParameterizedTest.java | 4 +- .../filter/wall/MustParameterizedTest1.java | 4 +- .../filter/wall/MustParameterizedTest2.java | 4 +- .../filter/wall/MustParameterizedTest3.java | 1 - .../filter/wall/MustParameterizedTest4.java | 4 +- .../bvt/filter/wall/PGDenyFunctionTest.java | 5 +- .../druid/bvt/filter/wall/PGWallTest.java | 3 +- .../filter/wall/StrictSyntaxCheckTest.java | 5 +- .../druid/bvt/filter/wall/TAEWallTest.java | 9 +- .../bvt/filter/wall/TenantDeleteTest.java | 7 +- .../bvt/filter/wall/TenantInsertTest.java | 9 +- .../bvt/filter/wall/TenantSelectTest.java | 11 +- .../bvt/filter/wall/TenantSelectTest2.java | 13 +- .../bvt/filter/wall/TenantSelectTest3.java | 18 +- .../bvt/filter/wall/TenantSelectTest4.java | 19 +- .../bvt/filter/wall/TenantTestCallBack.java | 1 - .../bvt/filter/wall/TenantUpdateTest.java | 11 +- .../WallAllowSelectAllColumnDefaultTest.java | 10 +- .../wall/WallAllowSelectAllColumnTest.java | 10 +- .../wall/WallAllowSelectAllColumnTest1.java | 10 +- .../wall/WallAllowSelectAllColumnTest2.java | 10 +- .../bvt/filter/wall/WallAlterTest_0.java | 7 +- .../druid/bvt/filter/wall/WallCallTest.java | 7 +- .../bvt/filter/wall/WallCommentTest.java | 5 +- .../druid/bvt/filter/wall/WallConfigTest.java | 32 +- .../druid/bvt/filter/wall/WallDeleteTest.java | 9 +- .../bvt/filter/wall/WallDeleteWhereTest.java | 3 +- .../bvt/filter/wall/WallDeleteWhereTest1.java | 3 +- .../bvt/filter/wall/WallDeleteWhereTest2.java | 1 - .../bvt/filter/wall/WallDenySchemaTest.java | 1 - .../bvt/filter/wall/WallDenyTableTest.java | 1 - .../druid/bvt/filter/wall/WallDropTest.java | 3 +- .../druid/bvt/filter/wall/WallDropTest1.java | 7 +- .../druid/bvt/filter/wall/WallDropTest2.java | 6 +- .../druid/bvt/filter/wall/WallFilterTest.java | 12 +- .../bvt/filter/wall/WallFilterTest2.java | 37 +- .../bvt/filter/wall/WallFilterTest3.java | 23 +- .../druid/bvt/filter/wall/WallHavingTest.java | 4 +- .../bvt/filter/wall/WallHavingTest6.java | 8 +- .../druid/bvt/filter/wall/WallInsertTest.java | 7 +- .../bvt/filter/wall/WallInsertTest2.java | 7 +- .../bvt/filter/wall/WallLineCommentTest.java | 4 +- .../filter/wall/WallMultiLineCommentTest.java | 4 +- .../filter/wall/WallMultiStatementTest.java | 6 +- .../bvt/filter/wall/WallProviderTest.java | 21 +- .../bvt/filter/wall/WallReadOnlyTest.java | 7 +- .../bvt/filter/wall/WallReadOnlyTest2.java | 5 +- .../bvt/filter/wall/WallSelectIntoTest.java | 4 +- .../bvt/filter/wall/WallSelectIntoTest1.java | 7 +- .../bvt/filter/wall/WallSelectLimitTest.java | 4 +- .../filter/wall/WallSelectLimitTest_2.java | 2 +- .../bvt/filter/wall/WallSelectWhereTest.java | 4 +- .../bvt/filter/wall/WallSelectWhereTest0.java | 3 +- .../bvt/filter/wall/WallSelectWhereTest1.java | 3 +- .../bvt/filter/wall/WallSelectWhereTest2.java | 4 +- .../bvt/filter/wall/WallSelectWhereTest3.java | 3 +- .../bvt/filter/wall/WallSelectWhereTest4.java | 4 +- .../bvt/filter/wall/WallSelectWhereTest5.java | 3 +- .../bvt/filter/wall/WallSelectWhereTest6.java | 8 +- .../filter/wall/WallStatTest_WhiteList.java | 1 - .../wall/WallStatTest_WhiteList_disable.java | 1 - .../filter/wall/WallStatTest_alter_table.java | 12 +- .../filter/wall/WallStatTest_blackList_1.java | 1 - .../WallStatTest_blackList_syntaxError.java | 3 +- .../filter/wall/WallStatTest_blacklist.java | 1 - .../wall/WallStatTest_create_table.java | 22 +- .../bvt/filter/wall/WallStatTest_delete.java | 1 - .../filter/wall/WallStatTest_drop_table.java | 1 - .../wall/WallStatTest_function_stats.java | 3 +- .../bvt/filter/wall/WallStatTest_insert.java | 14 +- .../bvt/filter/wall/WallStatTest_select.java | 1 - .../filter/wall/WallStatTest_select_1.java | 1 - .../filter/wall/WallStatTest_select_2.java | 1 - .../filter/wall/WallStatTest_select_into.java | 1 - .../bvt/filter/wall/WallStatTest_statMap.java | 7 +- .../bvt/filter/wall/WallStatTest_update.java | 16 +- .../WallStatTest_whiteList_syntaxError.java | 3 +- .../bvt/filter/wall/WallTruncateTest.java | 10 +- .../bvt/filter/wall/WallTruncateTest1.java | 7 +- .../druid/bvt/filter/wall/WallUnionTest.java | 3 +- .../druid/bvt/filter/wall/WallUnionTest2.java | 11 +- .../druid/bvt/filter/wall/WallUnionTest3.java | 3 +- .../druid/bvt/filter/wall/WallUnionTest4.java | 11 +- .../bvt/filter/wall/WallUpdateCheckTest.java | 3 - .../druid/bvt/filter/wall/WallUpdateTest.java | 7 +- .../bvt/filter/wall/WallUpdateTest1.java | 7 +- .../bvt/filter/wall/WallUpdateTest2.java | 5 +- .../bvt/filter/wall/WallUpdateTest3.java | 7 +- .../bvt/filter/wall/WallUpdateTest4.java | 7 +- .../bvt/filter/wall/WallUpdateWhereTest.java | 5 +- .../bvt/filter/wall/WallUpdateWhereTest1.java | 3 +- .../wall/WallVisitorUtilsLargeOrTest.java | 18 +- .../bvt/filter/wall/WallVisitorUtilsTest.java | 7 +- .../wall/mysql/MySqlWallDescribteTest.java | 9 +- .../filter/wall/mysql/MySqlWallLimitTest.java | 5 +- .../mysql/MySqlWallLoadDataInfileTest.java | 5 +- .../mysql/MySqlWallPermitFunctionTest.java | 1 - .../wall/mysql/MySqlWallPermitTableTest.java | 11 +- .../mysql/MySqlWallPermitVariantTest.java | 3 +- .../bvt/filter/wall/mysql/MySqlWallTest.java | 5 +- .../bvt/filter/wall/mysql/MySqlWallTest1.java | 4 +- .../filter/wall/mysql/MySqlWallTest10.java | 5 +- .../filter/wall/mysql/MySqlWallTest100.java | 1 - .../filter/wall/mysql/MySqlWallTest101.java | 1 - .../filter/wall/mysql/MySqlWallTest102.java | 1 - .../filter/wall/mysql/MySqlWallTest103.java | 1 - .../filter/wall/mysql/MySqlWallTest104.java | 1 - .../filter/wall/mysql/MySqlWallTest105.java | 1 - .../filter/wall/mysql/MySqlWallTest106.java | 1 - .../filter/wall/mysql/MySqlWallTest107.java | 1 - .../filter/wall/mysql/MySqlWallTest108.java | 1 - .../filter/wall/mysql/MySqlWallTest109.java | 1 - .../filter/wall/mysql/MySqlWallTest11.java | 15 +- .../filter/wall/mysql/MySqlWallTest110.java | 1 - .../filter/wall/mysql/MySqlWallTest111.java | 1 - .../filter/wall/mysql/MySqlWallTest112.java | 1 - .../filter/wall/mysql/MySqlWallTest113.java | 1 - .../filter/wall/mysql/MySqlWallTest114.java | 1 - .../filter/wall/mysql/MySqlWallTest115.java | 1 - .../filter/wall/mysql/MySqlWallTest116.java | 1 - .../filter/wall/mysql/MySqlWallTest117.java | 1 - .../filter/wall/mysql/MySqlWallTest118.java | 1 - .../filter/wall/mysql/MySqlWallTest119.java | 1 - .../filter/wall/mysql/MySqlWallTest12.java | 9 +- .../filter/wall/mysql/MySqlWallTest120.java | 1 - .../filter/wall/mysql/MySqlWallTest121.java | 1 - .../filter/wall/mysql/MySqlWallTest122.java | 1 - .../filter/wall/mysql/MySqlWallTest123.java | 1 - .../filter/wall/mysql/MySqlWallTest124.java | 1 - .../filter/wall/mysql/MySqlWallTest125.java | 1 - .../filter/wall/mysql/MySqlWallTest126.java | 1 - .../filter/wall/mysql/MySqlWallTest127.java | 1 - .../filter/wall/mysql/MySqlWallTest128.java | 1 - .../filter/wall/mysql/MySqlWallTest129.java | 3 +- .../filter/wall/mysql/MySqlWallTest13.java | 11 +- .../filter/wall/mysql/MySqlWallTest130.java | 3 +- .../filter/wall/mysql/MySqlWallTest131.java | 3 +- .../filter/wall/mysql/MySqlWallTest132.java | 3 +- .../filter/wall/mysql/MySqlWallTest133.java | 3 +- .../filter/wall/mysql/MySqlWallTest134.java | 1 - .../filter/wall/mysql/MySqlWallTest135.java | 1 - .../filter/wall/mysql/MySqlWallTest136.java | 1 - .../filter/wall/mysql/MySqlWallTest137.java | 5 +- .../filter/wall/mysql/MySqlWallTest138.java | 19 +- .../filter/wall/mysql/MySqlWallTest139.java | 41 +- .../filter/wall/mysql/MySqlWallTest14.java | 9 +- .../filter/wall/mysql/MySqlWallTest140.java | 5 +- .../filter/wall/mysql/MySqlWallTest141.java | 1 - .../filter/wall/mysql/MySqlWallTest142.java | 1 - .../filter/wall/mysql/MySqlWallTest143.java | 1 - .../filter/wall/mysql/MySqlWallTest144.java | 1 - .../filter/wall/mysql/MySqlWallTest145.java | 1 - .../filter/wall/mysql/MySqlWallTest146.java | 1 - .../wall/mysql/MySqlWallTest147_optimize.java | 1 - .../filter/wall/mysql/MySqlWallTest148.java | 1 - .../filter/wall/mysql/MySqlWallTest149.java | 1 - .../filter/wall/mysql/MySqlWallTest15.java | 23 +- .../filter/wall/mysql/MySqlWallTest150.java | 1 - .../wall/mysql/MySqlWallTest151_update.java | 1 - .../filter/wall/mysql/MySqlWallTest152.java | 1 - .../filter/wall/mysql/MySqlWallTest16.java | 5 +- .../filter/wall/mysql/MySqlWallTest17.java | 5 +- .../filter/wall/mysql/MySqlWallTest18.java | 5 +- .../filter/wall/mysql/MySqlWallTest19.java | 9 +- .../bvt/filter/wall/mysql/MySqlWallTest2.java | 15 +- .../filter/wall/mysql/MySqlWallTest20.java | 5 +- .../filter/wall/mysql/MySqlWallTest21.java | 9 +- .../filter/wall/mysql/MySqlWallTest22.java | 7 +- .../filter/wall/mysql/MySqlWallTest23.java | 9 +- .../filter/wall/mysql/MySqlWallTest24.java | 7 +- .../filter/wall/mysql/MySqlWallTest25.java | 11 +- .../filter/wall/mysql/MySqlWallTest26.java | 5 +- .../filter/wall/mysql/MySqlWallTest27.java | 5 +- .../filter/wall/mysql/MySqlWallTest28.java | 5 +- .../filter/wall/mysql/MySqlWallTest29.java | 5 +- .../bvt/filter/wall/mysql/MySqlWallTest3.java | 9 +- .../filter/wall/mysql/MySqlWallTest30.java | 5 +- .../filter/wall/mysql/MySqlWallTest31.java | 5 +- .../filter/wall/mysql/MySqlWallTest32.java | 17 +- .../filter/wall/mysql/MySqlWallTest33.java | 7 +- .../filter/wall/mysql/MySqlWallTest34.java | 5 +- .../filter/wall/mysql/MySqlWallTest35.java | 7 +- .../filter/wall/mysql/MySqlWallTest36.java | 5 +- .../filter/wall/mysql/MySqlWallTest37.java | 5 +- .../filter/wall/mysql/MySqlWallTest38.java | 5 +- .../filter/wall/mysql/MySqlWallTest39.java | 5 +- .../bvt/filter/wall/mysql/MySqlWallTest4.java | 5 +- .../filter/wall/mysql/MySqlWallTest40.java | 7 +- .../filter/wall/mysql/MySqlWallTest41.java | 5 +- .../filter/wall/mysql/MySqlWallTest42.java | 9 +- .../filter/wall/mysql/MySqlWallTest43.java | 19 +- .../filter/wall/mysql/MySqlWallTest44.java | 5 +- .../filter/wall/mysql/MySqlWallTest45.java | 5 +- .../filter/wall/mysql/MySqlWallTest46.java | 5 +- .../filter/wall/mysql/MySqlWallTest47.java | 15 +- .../filter/wall/mysql/MySqlWallTest48.java | 13 +- .../filter/wall/mysql/MySqlWallTest49.java | 51 +- .../bvt/filter/wall/mysql/MySqlWallTest5.java | 5 +- .../filter/wall/mysql/MySqlWallTest50.java | 5 +- .../filter/wall/mysql/MySqlWallTest51.java | 5 +- .../filter/wall/mysql/MySqlWallTest52.java | 11 +- .../filter/wall/mysql/MySqlWallTest53.java | 11 +- .../filter/wall/mysql/MySqlWallTest54.java | 11 +- .../filter/wall/mysql/MySqlWallTest55.java | 23 +- .../filter/wall/mysql/MySqlWallTest56.java | 5 +- .../filter/wall/mysql/MySqlWallTest57.java | 11 +- .../filter/wall/mysql/MySqlWallTest58.java | 9 +- .../filter/wall/mysql/MySqlWallTest59.java | 9 +- .../bvt/filter/wall/mysql/MySqlWallTest6.java | 5 +- .../filter/wall/mysql/MySqlWallTest60.java | 5 +- .../filter/wall/mysql/MySqlWallTest61.java | 11 +- .../filter/wall/mysql/MySqlWallTest62.java | 34 +- .../filter/wall/mysql/MySqlWallTest63.java | 7 +- .../filter/wall/mysql/MySqlWallTest64.java | 9 +- .../filter/wall/mysql/MySqlWallTest65.java | 9 +- .../filter/wall/mysql/MySqlWallTest66.java | 25 +- .../filter/wall/mysql/MySqlWallTest67.java | 25 +- .../filter/wall/mysql/MySqlWallTest68.java | 7 +- .../filter/wall/mysql/MySqlWallTest69.java | 5 +- .../bvt/filter/wall/mysql/MySqlWallTest7.java | 5 +- .../filter/wall/mysql/MySqlWallTest70.java | 7 +- .../filter/wall/mysql/MySqlWallTest71.java | 7 +- .../filter/wall/mysql/MySqlWallTest72.java | 7 +- .../filter/wall/mysql/MySqlWallTest73.java | 21 +- .../filter/wall/mysql/MySqlWallTest74.java | 25 +- .../filter/wall/mysql/MySqlWallTest75.java | 9 +- .../filter/wall/mysql/MySqlWallTest76.java | 7 +- .../filter/wall/mysql/MySqlWallTest77.java | 7 +- .../filter/wall/mysql/MySqlWallTest78.java | 7 +- .../filter/wall/mysql/MySqlWallTest79.java | 7 +- .../bvt/filter/wall/mysql/MySqlWallTest8.java | 17 +- .../filter/wall/mysql/MySqlWallTest80.java | 7 +- .../filter/wall/mysql/MySqlWallTest81.java | 7 +- .../filter/wall/mysql/MySqlWallTest82.java | 7 +- .../filter/wall/mysql/MySqlWallTest83.java | 7 +- .../filter/wall/mysql/MySqlWallTest84.java | 7 +- .../filter/wall/mysql/MySqlWallTest85.java | 7 +- .../filter/wall/mysql/MySqlWallTest86.java | 7 +- .../filter/wall/mysql/MySqlWallTest87.java | 7 +- .../filter/wall/mysql/MySqlWallTest88.java | 7 +- .../filter/wall/mysql/MySqlWallTest89.java | 9 +- .../bvt/filter/wall/mysql/MySqlWallTest9.java | 9 +- .../filter/wall/mysql/MySqlWallTest90.java | 9 +- .../filter/wall/mysql/MySqlWallTest91.java | 1 - .../filter/wall/mysql/MySqlWallTest92.java | 5 +- .../filter/wall/mysql/MySqlWallTest93.java | 7 +- .../filter/wall/mysql/MySqlWallTest94.java | 7 +- .../filter/wall/mysql/MySqlWallTest95.java | 5 +- .../filter/wall/mysql/MySqlWallTest96.java | 5 +- .../filter/wall/mysql/MySqlWallTest97.java | 1 - .../filter/wall/mysql/MySqlWallTest98.java | 1 - .../filter/wall/mysql/MySqlWallTest99.java | 1 - .../wall/mysql/MySqlWallTest_comment.java | 7 +- .../wall/mysql/MySqlWallTest_concat.java | 3 +- .../wall/mysql/MySqlWallTest_having.java | 11 +- .../filter/wall/mysql/MySqlWallTest_hint.java | 1 - .../filter/wall/mysql/MySqlWallTest_if.java | 7 +- .../wall/mysql/MySqlWallTest_ifnull_1.java | 7 +- .../wall/mysql/MySqlWallTest_ifnull_2.java | 7 +- .../wall/mysql/MySqlWallTest_like_1.java | 7 +- .../wall/mysql/MySqlWallTest_sqlmap.java | 9 +- .../wall/mysql/MySqlWallTest_union.java | 10 +- .../filter/wall/mysql/MySqlWallTest_var.java | 13 +- .../MySqlWallTest_var_autoincrement.java | 5 +- .../mysql/MysqlWallTest_rename_table.java | 3 +- .../oracle/OracleWallPermitFunctionTest.java | 7 +- .../oracle/OracleWallPermitObjectTest.java | 5 +- .../oracle/OracleWallPermitSchemaTest.java | 5 +- .../oracle/OracleWallPermitTableTest.java | 1 - .../oracle/OracleWallPermitVariantTest.java | 7 +- .../oracle/OracleWallPermitVariantTest2.java | 5 +- .../filter/wall/oracle/OracleWallTest.java | 11 +- .../filter/wall/oracle/OracleWallTest1.java | 1 - .../filter/wall/oracle/OracleWallTest10.java | 65 +- .../filter/wall/oracle/OracleWallTest2.java | 1 - .../filter/wall/oracle/OracleWallTest3.java | 13 +- .../filter/wall/oracle/OracleWallTest4.java | 11 +- .../filter/wall/oracle/OracleWallTest5.java | 3 +- .../filter/wall/oracle/OracleWallTest6.java | 73 +- .../filter/wall/oracle/OracleWallTest7.java | 17 +- .../oracle/OracleWallTest8_alter_rebuild.java | 3 +- .../wall/oracle/OracleWallTest9_exists.java | 11 +- .../druid/bvt/filter/wall/pg/PGWallTest1.java | 4 +- .../druid/bvt/filter/wall/pg/PGWallTest2.java | 14 +- .../SQLServerWallPermitFunctionTest.java | 7 +- .../SQLServerWallPermitObjectTest.java | 5 +- .../SQLServerWallPermitSchemaTest.java | 1 - .../SQLServerWallPermitTableTest.java | 3 +- .../wall/sqlserver/SQLServerWallTest.java | 5 +- .../wall/sqlserver/SQLServerWallTest_0.java | 41 +- .../wall/sqlserver/SQLServerWallTest_1.java | 3 +- .../wall/sqlserver/SQLServerWallTest_10.java | 3 +- .../wall/sqlserver/SQLServerWallTest_11.java | 11 +- .../wall/sqlserver/SQLServerWallTest_12.java | 3 +- .../wall/sqlserver/SQLServerWallTest_2.java | 3 +- .../wall/sqlserver/SQLServerWallTest_3.java | 5 +- .../wall/sqlserver/SQLServerWallTest_4.java | 5 +- .../wall/sqlserver/SQLServerWallTest_5.java | 5 +- .../wall/sqlserver/SQLServerWallTest_6.java | 5 +- .../wall/sqlserver/SQLServerWallTest_7.java | 5 +- .../wall/sqlserver/SQLServerWallTest_8.java | 3 +- .../wall/sqlserver/SQLServerWallTest_9.java | 13 +- .../bvt/hibernate/HibernateCRUDTest.java | 365 ++++--- .../druid/bvt/hibernate/entity/Sample.java | 93 +- .../druid/bvt/jmx/DupRegisterTest.java | 4 +- .../druid/bvt/jmx/JMXExporterTest.java | 1 - .../com/alibaba/druid/bvt/log/LoggerTest.java | 9 +- .../druid/bvt/mock/MockExecuteTest.java | 1 - .../bvt/mock/MockResultSetMetaDataTest.java | 1 - .../bvt/pool/Bug_for_dupCloseStmtError.java | 5 +- .../druid/bvt/pool/CallableStatmentTest.java | 15 +- .../com/alibaba/druid/bvt/pool/Case0.java | 4 - .../com/alibaba/druid/bvt/pool/Case1.java | 2 - .../com/alibaba/druid/bvt/pool/Case2.java | 4 +- .../com/alibaba/druid/bvt/pool/Case3.java | 1 - .../alibaba/druid/bvt/pool/ClosedTest.java | 1 - .../druid/bvt/pool/ConfigErrorTest.java | 9 +- .../druid/bvt/pool/ConfigErrorTest2.java | 7 +- .../druid/bvt/pool/ConfigErrorTest3.java | 5 +- .../druid/bvt/pool/ConfigErrorTestMysql.java | 1 - .../druid/bvt/pool/CreateSchedulerTest.java | 7 +- .../CreateSchedulerTest_directCreate.java | 3 +- .../pool/DataSourceDisableExceptionTest.java | 4 +- .../druid/bvt/pool/DestorySchedulerTest.java | 7 +- .../bvt/pool/DruidConnectionHolderTest.java | 2 - .../bvt/pool/DruidConnectionHolderTest2.java | 4 +- .../bvt/pool/DruidConnectionHolderTest3.java | 5 +- .../bvt/pool/DruidConnectionHolderTest4.java | 5 +- .../pool/DruidDataSourceC3P0AdapterTest.java | 1 - .../pool/DruidDataSourceConverterTest.java | 71 +- .../bvt/pool/DruidDataSourceDecryptTest.java | 1 - .../bvt/pool/DruidDataSourceFactoryTest.java | 3 +- .../bvt/pool/DruidDataSourceFactoryTest0.java | 3 +- .../bvt/pool/DruidDataSourceFactoryTest1.java | 15 +- .../bvt/pool/DruidDataSourceFactoryTest2.java | 1 - .../bvt/pool/DruidDataSourceFilterTest.java | 9 +- .../druid/bvt/pool/DruidDataSourceTest.java | 1 - .../druid/bvt/pool/DruidDataSourceTest1.java | 23 +- .../druid/bvt/pool/DruidDataSourceTest2.java | 3 +- .../druid/bvt/pool/DruidDataSourceTest3.java | 12 +- .../druid/bvt/pool/DruidDataSourceTest4.java | 6 +- .../druid/bvt/pool/DruidDataSourceTest5.java | 16 +- .../druid/bvt/pool/DruidDataSourceTest6.java | 21 +- .../druid/bvt/pool/DruidDataSourceTest7.java | 4 +- .../druid/bvt/pool/DruidDataSourceTest8.java | 4 +- .../DruidDataSourceTest9_phyMaxUseCount.java | 3 +- ...dDataSourceTestValidConnectionChecker.java | 1 - .../pool/DruidDataSourceTest_autocommit.java | 7 +- .../pool/DruidDataSourceTest_autocommit2.java | 7 +- .../pool/DruidDataSourceTest_autocommit3.java | 7 +- .../pool/DruidDataSourceTest_autocommit4.java | 7 +- .../pool/DruidDataSourceTest_clearCache.java | 7 +- .../pool/DruidDataSourceTest_closeError.java | 4 +- .../pool/DruidDataSourceTest_createError.java | 6 +- .../bvt/pool/DruidDataSourceTest_enable.java | 9 +- .../DruidDataSourceTest_exceptionSorter.java | 7 +- ...DataSourceTest_exceptionSorter_extend.java | 10 +- .../bvt/pool/DruidDataSourceTest_fill.java | 3 +- .../bvt/pool/DruidDataSourceTest_fill2.java | 7 +- .../DruidDataSourceTest_getConnection.java | 3 +- .../DruidDataSourceTest_getConnection_2.java | 3 +- ...uidDataSourceTest_getPooledConnection.java | 9 +- ...ruidDataSourceTest_getPoolingPeakTime.java | 7 +- .../DruidDataSourceTest_getProperties.java | 3 +- .../bvt/pool/DruidDataSourceTest_initSql.java | 1 - .../DruidDataSourceTest_initSql_factory.java | 1 - .../pool/DruidDataSourceTest_initSqls.java | 7 +- .../pool/DruidDataSourceTest_interrupt.java | 13 +- .../pool/DruidDataSourceTest_interrupt2.java | 6 +- .../pool/DruidDataSourceTest_interrupt3.java | 2 - .../DruidDataSourceTest_lastCreateError.java | 4 +- .../pool/DruidDataSourceTest_lastError.java | 12 +- ...dDataSourceTest_loadSysPropertyFilter.java | 9 +- .../pool/DruidDataSourceTest_maxActive1.java | 3 +- .../pool/DruidDataSourceTest_maxActive2.java | 3 +- .../pool/DruidDataSourceTest_maxActive3.java | 3 +- .../pool/DruidDataSourceTest_maxActive4.java | 3 +- .../bvt/pool/DruidDataSourceTest_maxWait.java | 15 +- .../DruidDataSourceTest_notEmptyWait.java | 8 +- .../DruidDataSourceTest_notEmptyWait2.java | 8 +- .../bvt/pool/DruidDataSourceTest_oracle.java | 4 +- .../bvt/pool/DruidDataSourceTest_oracle2.java | 10 +- .../bvt/pool/DruidDataSourceTest_oracle3.java | 3 +- .../DruidDataSourceTest_oracle_error.java | 4 +- .../bvt/pool/DruidDataSourceTest_recycle.java | 7 +- .../pool/DruidDataSourceTest_recycle2.java | 9 +- ...ruidDataSourceTest_testOnBorrowFailed.java | 12 +- ...dDataSourceTest_testOnWhileIdleFailed.java | 10 +- .../bvt/pool/DruidDataSourceTest_tryGet.java | 3 +- ...DruidDataSourceTest_wrapDriverFilters.java | 11 +- .../DruidPooledCallableStatementTest.java | 22 +- .../bvt/pool/DruidPooledConnectionTest.java | 39 +- .../bvt/pool/DruidPooledConnectionTest1.java | 13 +- ...ruidPooledConnectionTest_prepareError.java | 44 +- .../DruidPooledPreparedStatementTest.java | 13 +- .../DruidPooledPreparedStatementTest1.java | 26 +- .../bvt/pool/DruidPooledResultSetTest.java | 33 +- .../bvt/pool/DruidPooledResultSetTest2.java | 1 - .../bvt/pool/DruidPooledStatementTest.java | 258 +++-- .../com/alibaba/druid/bvt/pool/DumpTest.java | 3 +- .../druid/bvt/pool/ExceptionSorterTest.java | 3 +- .../com/alibaba/druid/bvt/pool/FullTest.java | 1 - .../druid/bvt/pool/HoldableUnsupportTest.java | 6 +- .../bvt/pool/JdbcDataSourceStatTest.java | 7 +- .../bvt/pool/KeepAliveTest_scheduler.java | 1 - .../druid/bvt/pool/LastActiveTest_0.java | 8 +- .../alibaba/druid/bvt/pool/LockFairTest.java | 4 +- .../druid/bvt/pool/ManagedDataSourceTest.java | 1 - .../bvt/pool/OnFatalErrorMaxActiveTest.java | 2 +- .../bvt/pool/OnFatalErrorMaxActiveTest_1.java | 2 +- .../alibaba/druid/bvt/pool/PSCacheTest.java | 1 - .../alibaba/druid/bvt/pool/PSCacheTest1.java | 7 +- .../alibaba/druid/bvt/pool/PSCacheTest2.java | 3 +- .../alibaba/druid/bvt/pool/PSCacheTest3.java | 61 +- .../alibaba/druid/bvt/pool/PSCacheTest4.java | 33 +- .../com/alibaba/druid/bvt/pool/ParamTest.java | 3 +- .../druid/bvt/pool/PasswordCallbackTest.java | 8 +- .../bvt/pool/PreparedStatementKeyTest.java | 27 +- .../pool/PreparedStatementProxyImplTest.java | 1 - .../alibaba/druid/bvt/pool/RegisterTest.java | 8 +- .../alibaba/druid/bvt/pool/SavepointTest.java | 19 +- .../druid/bvt/pool/SlowSqlMillisTest2.java | 2 +- .../bvt/pool/SpringIbatisFilterTest.java | 10 +- .../bvt/pool/SpringMybatisFilterTest.java | 10 +- .../druid/bvt/pool/TestActiveTrace.java | 1 - .../com/alibaba/druid/bvt/pool/TestClone.java | 36 +- .../alibaba/druid/bvt/pool/TestClose_0.java | 1 - .../alibaba/druid/bvt/pool/TestClose_1.java | 1 - .../druid/bvt/pool/TestConnectError.java | 4 +- .../druid/bvt/pool/TestConnectTimeout.java | 2 - .../alibaba/druid/bvt/pool/TestDefault.java | 1 - .../alibaba/druid/bvt/pool/TestDisable.java | 5 +- .../druid/bvt/pool/TestDruidDataSource.java | 1 - .../druid/bvt/pool/TestGetUpdateCount.java | 7 +- .../druid/bvt/pool/TestGraceShutdown.java | 5 +- .../com/alibaba/druid/bvt/pool/TestH2.java | 5 +- .../com/alibaba/druid/bvt/pool/TestIdle.java | 1 - .../com/alibaba/druid/bvt/pool/TestIdle2.java | 1 - .../com/alibaba/druid/bvt/pool/TestIdle3.java | 9 +- .../bvt/pool/TestLogLongTimeTransaction.java | 4 +- .../bvt/pool/TestOnBorrowFileAndNameTest.java | 11 +- .../druid/bvt/pool/TestOraclePrefetch.java | 8 +- .../druid/bvt/pool/TestOracleWall.java | 2 - .../druid/bvt/pool/TestOracleWall2.java | 10 +- .../druid/bvt/pool/TestOracleWall3.java | 10 +- .../druid/bvt/pool/TestOracleWallJdbc3.java | 10 +- .../druid/bvt/pool/TestOracleWrap.java | 10 +- .../druid/bvt/pool/TestOracleWrap2.java | 10 +- .../bvt/pool/TestPoolPreparedStatement.java | 4 +- .../bvt/pool/TestPoolPreparedStatement2.java | 7 +- .../druid/bvt/pool/TestRemoveAbandoned.java | 3 +- .../druid/bvt/pool/TestRemoveAbandoned2.java | 10 +- .../bvt/pool/TestSharePreparedStatements.java | 10 +- .../com/alibaba/druid/bvt/pool/TestStat.java | 2 - .../pool/TimeBetweenLogStatsMillisTest.java | 5 +- .../pool/TimeBetweenLogStatsMillisTest2.java | 3 +- .../pool/TimeBetweenLogStatsMillisTest3.java | 3 +- .../druid/bvt/pool/TransactionTest.java | 4 +- .../alibaba/druid/bvt/pool/UnwrapTest.java | 12 +- .../alibaba/druid/bvt/pool/UnwrapTest2.java | 2 - .../druid/bvt/pool/UnwrapTest_filter.java | 9 +- .../bvt/pool/ValidationQueryLogDB2Test.java | 9 +- .../bvt/pool/ValidationQueryLogTest.java | 7 +- .../DruidDataSourceC3P0AdapterTest.java | 3 +- .../DruidDataSourceC3P0AdapterTest2.java | 1 - .../druid/bvt/pool/basic/ConnectionTest.java | 9 +- .../druid/bvt/pool/basic/ConnectionTest2.java | 9 +- .../druid/bvt/pool/basic/ConnectionTest3.java | 3 +- .../druid/bvt/pool/basic/ConnectionTest4.java | 31 +- .../druid/bvt/pool/basic/ConnectionTest5.java | 6 +- .../druid/bvt/pool/basic/DataSourceTest3.java | 10 +- .../basic/DruidDataSourceFactoryTest.java | 3 - .../basic/MaxEvictableIdleTimeMillisTest.java | 3 +- .../MaxEvictableIdleTimeMillisTest2.java | 7 +- .../bvt/pool/basic/MaxPhyTimeMillisTest.java | 1 - .../basic/PoolableCallableStatementTest.java | 77 +- .../basic/PoolablePreparedStatementTest.java | 13 +- .../bvt/pool/basic/PoolableStatementTest.java | 5 +- .../pool/basic/PoolableStatementTest2.java | 3 +- .../pool/basic/PoolableStatementTest3.java | 3 - .../bvt/pool/basic/PoolableWrapperTest.java | 1 - .../pool/basic/PreparedStatementKeyTest.java | 15 +- .../druid/bvt/pool/basic/ResultSetTest.java | 7 +- .../druid/bvt/pool/basic/ResultSetTest2.java | 7 +- .../druid/bvt/pool/basic/TestCommit.java | 3 +- .../bvt/pool/basic/TestDataSourceBasic.java | 3 +- .../bvt/pool/basic/TestDataSourceBasic2.java | 3 +- .../dynamic/ConnectPropertiesChangeTest.java | 7 +- .../dynamic/ConnectPropertiesChangeTest1.java | 5 +- .../DruidDataSourceStatLoggerImplTest.java | 5 +- .../bvt/pool/dynamic/MaxActiveChangeTest.java | 1 - .../PoolPreparedStatementsChangeTest.java | 21 +- .../bvt/pool/dynamic/SqlSkipCountTest.java | 9 +- .../OceanBaseOracleExceptionSorterTest.java | 7 +- .../exception/OracleExceptionSorterTest.java | 7 +- .../OracleExceptionSorterTest_closeConn.java | 7 +- ...OracleExceptionSorterTest_closeConn_1.java | 7 +- ...OracleExceptionSorterTest_closeConn_2.java | 7 +- ...OracleExceptionSorterTest_closeConn_3.java | 7 +- .../OracleExceptionSorterTest_closeStmt.java | 5 +- .../OracleExceptionSorterTest_commit.java | 5 +- .../OracleExceptionSorterTest_concurrent.java | 3 - .../OracleExceptionSorterTest_rollback.java | 5 +- .../OracleExceptionSorterTest_setCatalog.java | 7 +- ...ExceptionSorterTest_setIsolationLevel.java | 7 +- ...OracleExceptionSorterTest_setReadOnly.java | 7 +- ...racleExceptionSorterTest_setSavepoint.java | 7 +- ...eptionSorterTest_setSavepointWithName.java | 7 +- ...acleExceptionSorterTest_stmt_addBatch.java | 5 +- ...OracleExceptionSorterTest_stmt_cancel.java | 5 +- ...leExceptionSorterTest_stmt_clearBatch.java | 7 +- ...ceptionSorterTest_stmt_clearWarrnings.java | 5 +- ...racleExceptionSorterTest_stmt_execute.java | 5 +- ...ExceptionSorterTest_stmt_executeBatch.java | 7 +- ...ExceptionSorterTest_stmt_executeQuery.java | 5 +- ...xceptionSorterTest_stmt_executeUpdate.java | 5 +- ...eptionSorterTest_stmt_executeUpdate_1.java | 5 +- ...eptionSorterTest_stmt_executeUpdate_2.java | 5 +- ...eptionSorterTest_stmt_executeUpdate_3.java | 5 +- ...cleExceptionSorterTest_stmt_execute_1.java | 5 +- ...cleExceptionSorterTest_stmt_execute_2.java | 5 +- ...cleExceptionSorterTest_stmt_execute_3.java | 5 +- ...tionSorterTest_stmt_getFetchDirection.java | 5 +- ...ExceptionSorterTest_stmt_getFetchSize.java | 5 +- ...ptionSorterTest_stmt_getGeneratedKeys.java | 5 +- ...eExceptionSorterTest_stmt_getMaxField.java | 5 +- ...leExceptionSorterTest_stmt_getMaxRows.java | 5 +- ...ceptionSorterTest_stmt_getMoreResults.java | 5 +- ...ptionSorterTest_stmt_getMoreResults_1.java | 5 +- ...eptionSorterTest_stmt_getQueryTimeout.java | 5 +- ...ExceptionSorterTest_stmt_getResultSet.java | 5 +- ...rterTest_stmt_getResultSetConcurrency.java | 5 +- ...rterTest_stmt_getResultSetHoldability.java | 5 +- ...ptionSorterTest_stmt_getResultSetType.java | 5 +- ...ceptionSorterTest_stmt_getUpdateCount.java | 5 +- ...ExceptionSorterTest_stmt_getWarrnings.java | 5 +- ...xceptionSorterTest_stmt_setCursorName.java | 5 +- ...onSorterTest_stmt_setEscapeProcessing.java | 5 +- ...tionSorterTest_stmt_setFetchDirection.java | 5 +- ...ExceptionSorterTest_stmt_setFetchSize.java | 5 +- ...eExceptionSorterTest_stmt_setMaxField.java | 5 +- ...leExceptionSorterTest_stmt_setMaxRows.java | 5 +- ...eptionSorterTest_stmt_setQueryTimeout.java | 5 +- .../OracleExceptionSorter_userDefined.java | 1 - .../OracleExceptionSorter_userDefined_1.java | 5 +- .../druid/bvt/pool/profile/FailFastTest.java | 9 +- .../bvt/pool/profile/ProfileEnableTest.java | 1 - .../pool/property/PropertyTest_filters.java | 6 +- .../property/PropertyTest_testOnBorrow.java | 6 +- .../property/PropertyTest_testWhileIdle.java | 4 +- .../PropertyTest_useGlobalDataSourceStat.java | 4 +- .../PropertyTest_validationQuery.java | 2 +- .../vendor/InformixExceptionSorterTest.java | 1 - .../MSSQLValidConnectionCheckerTest.java | 1 - .../MySQLValidConnectionCheckerTest.java | 1 - .../pool/vendor/MySqlExceptionSorterTest.java | 12 +- .../MySqlExceptionSorterTest_oceanbase.java | 6 +- .../pool/vendor/PGExceptionSorterTest.java | 3 +- .../vendor/SybaseExceptionSorterTest.java | 7 +- .../alibaba/druid/bvt/pool/xa/H2XATest.java | 1 - .../bvt/pool/xa/JtdsXAConnectionTest.java | 1 - .../druid/bvt/proxy/AllStatisticTest.java | 12 +- .../druid/bvt/proxy/BasicTypeTest.java | 64 +- .../druid/bvt/proxy/BatchReadTest.java | 10 +- .../com/alibaba/druid/bvt/proxy/BlobTest.java | 6 +- .../druid/bvt/proxy/CallStatementTest.java | 16 +- .../proxy/CallableStatementProxyImplTest.java | 9 +- .../com/alibaba/druid/bvt/proxy/ClobTest.java | 8 +- .../druid/bvt/proxy/CommonsLogFilterTest.java | 5 +- .../bvt/proxy/ConnectionProxyImplTest.java | 5 +- .../bvt/proxy/ConnectionStatisticTest.java | 1 - .../druid/bvt/proxy/ConnectionTest.java | 6 +- .../druid/bvt/proxy/CounterFilterTest.java | 8 +- .../alibaba/druid/bvt/proxy/DriverTest.java | 2 +- .../druid/bvt/proxy/DruidDriverTest.java | 48 +- .../bvt/proxy/JdbcFilterEventAdapterTest.java | 123 +-- .../druid/bvt/proxy/JdbcUtilsTest.java | 22 +- .../druid/bvt/proxy/Log4j2FilterTest.java | 366 +------ .../druid/bvt/proxy/Log4jFilterTest.java | 5 +- .../druid/bvt/proxy/LogFilterTest.java | 11 +- .../alibaba/druid/bvt/proxy/PrecallTest.java | 60 +- ...edStatementProxyImplGetParametersTest.java | 7 +- .../bvt/proxy/PreparedStatementTest.java | 70 +- .../druid/bvt/proxy/ProxyDriverTest.java | 3 +- .../bvt/proxy/ResultSetProxyImplTest.java | 4 +- .../druid/bvt/proxy/SchemaReadTest.java | 4 +- .../druid/bvt/proxy/SqlStatisticTest.java | 1 - .../druid/bvt/proxy/StatementTest.java | 14 +- .../druid/bvt/proxy/StatisticTest.java | 3 +- .../alibaba/druid/bvt/proxy/WrapImplTest.java | 1 - .../druid/bvt/proxy/fake/DruidDriverTest.java | 1 - .../druid/bvt/proxy/fake/FakeDriverTest.java | 1 - .../druid/bvt/proxy/filter/ClobTest.java | 3 +- .../bvt/proxy/filter/GlobalStatTest0.java | 9 +- .../bvt/proxy/filter/GlobalStatTest1.java | 9 +- .../bvt/proxy/filter/MergeStatFilterTest.java | 52 +- .../proxy/filter/MergeStatFilterTest2.java | 58 +- .../proxy/filter/MergeStatFilterTest3.java | 61 +- .../filter/MergeStatFilterTest_tddl.java | 3 +- .../filter/MergeStatFilterTest_tddl_1.java | 3 +- .../filter/MergeStatFilterTest_tddl_2.java | 3 +- .../filter/MergeStatFilterTest_tddl_3.java | 5 +- .../filter/MergeStatFilterTest_tddl_4.java | 5 +- .../filter/StatFilterConcurrentTest.java | 6 +- .../bvt/proxy/filter/StatFilterTest.java | 3 +- .../bvt/proxy/filter/StatFilterTest2.java | 4 +- .../bvt/proxy/filter/StatFilterTest3.java | 28 +- .../filter/encoding/CharsetConvertTest.java | 7 +- .../filter/encoding/CharsetParameterTest.java | 1 - .../bvt/proxy/utils/DruidLoaderUtilsTest.java | 10 +- .../bvt/spring/DruidJdbcExtractorTest.java | 21 +- .../bvt/spring/SpringMethodInfoTest.java | 5 - .../bvt/spring/SqlMapClientWrapperTest.java | 9 +- .../bvt/spring/SqlMapExecutorWrapperTest.java | 11 +- .../spring/SqlMapExecutorWrapperTest_2.java | 9 +- .../bvt/spring/SqlMapSessionWrapperTest.java | 1 - .../com/alibaba/druid/bvt/sql/BigOrTest.java | 1 - .../druid/bvt/sql/CreateCompareTest.java | 20 +- .../druid/bvt/sql/CreateCompareTest_1.java | 10 +- .../bvt/sql/CreateCompareTest_cycle.java | 23 +- .../druid/bvt/sql/CreateDatabaseTest.java | 10 +- .../alibaba/druid/bvt/sql/DistinctTest.java | 1 - .../com/alibaba/druid/bvt/sql/EqualTest2.java | 1 - .../druid/bvt/sql/EqualTest_OracleDate.java | 1 - .../sql/EqualTest_OracleTimestampExpr.java | 3 +- .../sql/EqualTest_SQLSelectQueryBlock.java | 1 - .../druid/bvt/sql/EqualTest_aggreate.java | 3 +- .../bvt/sql/EqualTest_aggreate_over.java | 3 +- .../alibaba/druid/bvt/sql/EqualTest_any.java | 3 +- .../druid/bvt/sql/EqualTest_between.java | 3 +- .../druid/bvt/sql/EqualTest_binary.java | 3 +- .../druid/bvt/sql/EqualTest_binaryOp.java | 3 +- .../druid/bvt/sql/EqualTest_boolean.java | 3 +- .../alibaba/druid/bvt/sql/EqualTest_case.java | 3 +- .../alibaba/druid/bvt/sql/EqualTest_cast.java | 5 +- .../druid/bvt/sql/EqualTest_cursor.java | 3 +- .../druid/bvt/sql/EqualTest_dbLink.java | 1 - .../druid/bvt/sql/EqualTest_exists.java | 3 +- .../bvt/sql/EqualTest_extract_mysql.java | 1 - .../bvt/sql/EqualTest_extract_oracle.java | 3 +- .../druid/bvt/sql/EqualTest_groupSet.java | 1 - .../druid/bvt/sql/EqualTest_inList.java | 3 +- .../druid/bvt/sql/EqualTest_inquery.java | 1 - .../bvt/sql/EqualTest_inquery_mysql.java | 3 +- .../bvt/sql/EqualTest_inquery_oracle.java | 3 +- .../bvt/sql/EqualTest_interval_mysql.java | 3 +- .../druid/bvt/sql/EqualTest_mysqlMatch.java | 1 - .../alibaba/druid/bvt/sql/EqualTest_not.java | 3 +- .../druid/bvt/sql/EqualTest_not_2.java | 1 - .../druid/bvt/sql/EqualTest_number.java | 3 +- .../druid/bvt/sql/EqualTest_orderBy.java | 5 +- .../druid/bvt/sql/EqualTest_query.java | 3 +- .../druid/bvt/sql/EqualTest_select.java | 1 - .../alibaba/druid/bvt/sql/EqualTest_some.java | 3 +- .../druid/bvt/sql/EqualTest_unary.java | 3 +- .../druid/bvt/sql/EqualTest_unary_mysql.java | 3 +- .../druid/bvt/sql/GroupingSetsTest.java | 4 +- .../com/alibaba/druid/bvt/sql/HashTest_0.java | 9 +- .../bvt/sql/HashTest_1_propertyExpr.java | 29 +- .../alibaba/druid/bvt/sql/MybatisTest.java | 1 - .../alibaba/druid/bvt/sql/MybatisTest2.java | 1 - .../com/alibaba/druid/bvt/sql/OverTest.java | 15 +- .../bvt/sql/PagerUtilsTest_Count_MySql_0.java | 1 - .../sql/PagerUtilsTest_Count_Oracle_0.java | 7 +- .../bvt/sql/PagerUtilsTest_Count_PG_0.java | 7 +- .../sql/PagerUtilsTest_Count_SQLServer_0.java | 7 +- .../sql/PagerUtilsTest_Limit_SQLServer_1.java | 1 - .../sql/PagerUtilsTest_Limit_SQLServer_2.java | 1 - .../sql/PagerUtilsTest_Limit_SQLServer_3.java | 5 +- .../sql/PagerUtilsTest_Limit_SQLServer_4.java | 1 - .../sql/PagerUtilsTest_Limit_SQLServer_5.java | 1 - .../sql/PagerUtilsTest_Limit_SQLServer_6.java | 1 - .../bvt/sql/PagerUtilsTest_Limit_db2_0.java | 15 +- .../bvt/sql/PagerUtilsTest_Limit_db2_1.java | 1 - .../bvt/sql/PagerUtilsTest_Limit_h2_0.java | 1 - .../bvt/sql/PagerUtilsTest_Limit_hive_0.java | 1 - .../bvt/sql/PagerUtilsTest_Limit_mysql_0.java | 1 - ...Test_Limit_mysql_question_placeholder.java | 15 +- .../sql/PagerUtilsTest_Limit_oracle_0.java | 5 +- .../sql/PagerUtilsTest_Limit_presto_0.java | 1 - .../sql/PagerUtilsTest_hasUnorderedLimit.java | 1 - ...gerUtilsTest_hasUnorderedLimit_oracle.java | 1 - .../bvt/sql/SQLASTVisitorAdapterTest.java | 49 +- .../bvt/sql/SQLCommentStatementTest.java | 1 - .../alibaba/druid/bvt/sql/SQLJoinTest.java | 2 +- .../druid/bvt/sql/SQLParseExceptionTest.java | 1 - .../bvt/sql/SQLSelectQueryBlockTest.java | 3 +- .../druid/bvt/sql/ShardingUnwrapTest.java | 1 - .../com/alibaba/druid/bvt/sql/SplitTest2.java | 2 +- .../alibaba/druid/bvt/sql/TestNewSpout.java | 4 +- .../druid/bvt/sql/UnsignedBigIntTest.java | 1 - .../bvt/sql/builder/BuilderDeleteTest.java | 7 +- .../bvt/sql/builder/BuilderSelectTest.java | 1 - .../bvt/sql/builder/BuilderUpdateTest.java | 11 +- .../bvt/sql/canal/CanalSQLSchemaTest.java | 21 +- .../clickhouse/ClickHouseResourceTest.java | 1 - .../druid/bvt/sql/cobar/DALParserTest.java | 13 +- .../druid/bvt/sql/cobar/DDLParserTest.java | 39 +- .../bvt/sql/cobar/DMLCallParserTest.java | 6 +- .../bvt/sql/cobar/DMLDeleteParserTest.java | 35 +- .../bvt/sql/cobar/DMLInsertParserTest.java | 1 - .../cobar/DMLInsertParserTest_Special.java | 4 +- .../bvt/sql/cobar/DMLReplaceParserTest.java | 21 +- .../bvt/sql/cobar/DMLSelectParserTest.java | 61 +- .../bvt/sql/cobar/DMLUpdateParserTest.java | 9 +- .../druid/bvt/sql/cobar/HintsTest.java | 5 +- .../bvt/sql/cobar/LiteralHexadecimalTest.java | 8 +- .../druid/bvt/sql/cobar/MTSParserTest.java | 15 +- .../db2/DB2AlterTableTest_1_setNotNull.java | 1 - .../bvt/sql/db2/DB2AlterTableTest_2.java | 1 - .../sql/db2/DB2AlterTableTest_drop_pk.java | 1 - .../bvt/sql/db2/DB2CreateTableTest_01.java | 7 +- .../bvt/sql/db2/DB2CreateTableTest_02.java | 7 +- .../bvt/sql/db2/DB2CreateTableTest_03.java | 7 +- .../bvt/sql/db2/DB2CreateTableTest_04.java | 7 +- .../bvt/sql/db2/DB2CreateTableTest_05.java | 7 +- .../bvt/sql/db2/DB2CreateTableTest_06.java | 1 - .../bvt/sql/db2/DB2CreateTableTest_07.java | 7 +- .../bvt/sql/db2/DB2DropSequenceTest_0.java | 7 +- .../druid/bvt/sql/db2/DB2InsertTest_0.java | 7 +- .../druid/bvt/sql/db2/DB2InsertTest_1.java | 5 +- .../druid/bvt/sql/db2/DB2MergeTest.java | 18 +- .../druid/bvt/sql/db2/DB2ResourceTest.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_0.java | 5 +- .../druid/bvt/sql/db2/DB2SelectTest_1.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_10.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_11.java | 9 +- .../druid/bvt/sql/db2/DB2SelectTest_12.java | 29 +- .../druid/bvt/sql/db2/DB2SelectTest_13.java | 27 +- .../druid/bvt/sql/db2/DB2SelectTest_14.java | 11 +- .../druid/bvt/sql/db2/DB2SelectTest_15.java | 11 +- .../druid/bvt/sql/db2/DB2SelectTest_16.java | 11 +- .../druid/bvt/sql/db2/DB2SelectTest_17.java | 11 +- .../druid/bvt/sql/db2/DB2SelectTest_18.java | 11 +- .../druid/bvt/sql/db2/DB2SelectTest_19.java | 11 +- .../druid/bvt/sql/db2/DB2SelectTest_2.java | 9 +- .../druid/bvt/sql/db2/DB2SelectTest_20.java | 11 +- .../druid/bvt/sql/db2/DB2SelectTest_21.java | 11 +- .../druid/bvt/sql/db2/DB2SelectTest_22.java | 33 +- .../druid/bvt/sql/db2/DB2SelectTest_23.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_24.java | 7 +- .../bvt/sql/db2/DB2SelectTest_25_concat.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_26.java | 7 +- .../sql/db2/DB2SelectTest_27_interval.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_28.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_29.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_3.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_30.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_31.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_32.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_33.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_34.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_4.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_5.java | 3 +- .../druid/bvt/sql/db2/DB2SelectTest_6.java | 9 +- .../druid/bvt/sql/db2/DB2SelectTest_7.java | 9 +- .../druid/bvt/sql/db2/DB2SelectTest_8.java | 13 +- .../druid/bvt/sql/db2/DB2SelectTest_9.java | 21 +- .../druid/bvt/sql/db2/DB2SetTest_0.java | 5 +- .../druid/bvt/sql/db2/DB2SetTest_1.java | 5 +- .../bvt/sql/db2/DB2SetTest_2_schema.java | 5 +- .../druid/bvt/sql/db2/DB2TruncateTest.java | 7 +- .../druid/bvt/sql/db2/DB2TruncateTest2.java | 7 +- .../druid/bvt/sql/db2/DB2TruncateTest3.java | 7 +- .../druid/bvt/sql/db2/DB2TruncateTest4.java | 7 +- .../druid/bvt/sql/db2/DB2TruncateTest5.java | 7 +- .../druid/bvt/sql/db2/DB2Values_Test.java | 1 - .../druid/bvt/sql/dm/DM_MergeTest_0.java | 6 +- .../druid/bvt/sql/eval/EvalAndOrTest.java | 6 +- .../druid/bvt/sql/eval/EvalBetweenTest.java | 3 +- .../druid/bvt/sql/eval/EvalCaseThen.java | 1 - .../druid/bvt/sql/eval/EvalConcatTest.java | 1 - .../druid/bvt/sql/eval/EvalInTest.java | 3 +- .../druid/bvt/sql/eval/EvalIsNullTest.java | 1 - .../druid/bvt/sql/eval/EvalLikeTest.java | 3 +- .../druid/bvt/sql/eval/EvalMethodAbsTest.java | 5 +- .../bvt/sql/eval/EvalMethodAcosTest.java | 5 +- .../bvt/sql/eval/EvalMethodAsciiTest.java | 1 - .../bvt/sql/eval/EvalMethodAsinTest.java | 5 +- .../bvt/sql/eval/EvalMethodAtan2Test.java | 5 +- .../bvt/sql/eval/EvalMethodAtanTest.java | 5 +- .../druid/bvt/sql/eval/EvalMethodBinTest.java | 1 - .../bvt/sql/eval/EvalMethodBitLengthTest.java | 1 - .../bvt/sql/eval/EvalMethodCeilTest.java | 6 +- .../druid/bvt/sql/eval/EvalMethodCosTest.java | 5 +- .../bvt/sql/eval/EvalMethodInstrTest.java | 1 - .../bvt/sql/eval/EvalMethodLeftTest.java | 1 - .../bvt/sql/eval/EvalMethodLengthTest.java | 1 - .../bvt/sql/eval/EvalMethodLog10Test.java | 3 +- .../druid/bvt/sql/eval/EvalMethodLogTest.java | 3 +- .../druid/bvt/sql/eval/EvalMethodModTest.java | 1 - .../druid/bvt/sql/eval/EvalMethodNowTest.java | 1 - .../druid/bvt/sql/eval/EvalMethodPITest.java | 1 - .../bvt/sql/eval/EvalMethodPowerTest.java | 1 - .../druid/bvt/sql/eval/EvalMethodRandom.java | 1 - .../bvt/sql/eval/EvalMethodReverseTest.java | 1 - .../bvt/sql/eval/EvalMethodRightTest.java | 1 - .../druid/bvt/sql/eval/EvalMethodSinTest.java | 1 - .../bvt/sql/eval/EvalMethodSqrtTest.java | 1 - .../druid/bvt/sql/eval/EvalMethodTanTest.java | 3 +- .../bvt/sql/eval/EvalMethodTest_Char.java | 1 - .../bvt/sql/eval/EvalMethodTest_Char_1.java | 1 - .../bvt/sql/eval/EvalMethodTest_Elt.java | 3 +- .../bvt/sql/eval/EvalMethodTest_Elt_1.java | 3 +- .../bvt/sql/eval/EvalMethodTest_insert.java | 3 +- .../bvt/sql/eval/EvalMethodTest_insert_1.java | 3 +- .../bvt/sql/eval/EvalMethodTest_insert_2.java | 3 +- .../bvt/sql/eval/EvalMethodTest_instr.java | 1 - .../bvt/sql/eval/EvalMethodTest_instr_1.java | 1 - .../bvt/sql/eval/EvalMethodTest_lcase.java | 3 +- .../bvt/sql/eval/EvalMethodTest_left.java | 3 +- .../bvt/sql/eval/EvalMethodTest_len.java | 1 - .../bvt/sql/eval/EvalMethodTest_locate.java | 1 - .../bvt/sql/eval/EvalMethodTest_locate_1.java | 1 - .../bvt/sql/eval/EvalMethodTest_locate_2.java | 1 - .../bvt/sql/eval/EvalMethodTest_lower.java | 3 +- .../bvt/sql/eval/EvalMethodTest_lpad.java | 1 - .../bvt/sql/eval/EvalMethodTest_lpad_1.java | 1 - .../bvt/sql/eval/EvalMethodTest_ltrim.java | 1 - .../bvt/sql/eval/EvalMethodTest_mid.java | 1 - .../sql/eval/EvalMethodTest_substring.java | 3 +- .../sql/eval/EvalMethodTest_substring_1.java | 3 +- .../sql/eval/EvalMethodTest_substring_2.java | 3 +- .../sql/eval/EvalMethodTest_substring_3.java | 3 +- .../sql/eval/EvalMethodTest_substring_4.java | 3 +- .../bvt/sql/eval/EvalMethodTrimTest.java | 1 - .../druid/bvt/sql/eval/EvalRlikeTest.java | 3 +- .../druid/bvt/sql/eval/EvalSelectTest.java | 1 - .../alibaba/druid/bvt/sql/eval/EvalTest.java | 13 +- .../druid/bvt/sql/eval/EvalTest_add.java | 1 - .../druid/bvt/sql/eval/EvalTest_add_long.java | 11 +- .../bvt/sql/eval/EvalTest_add_short.java | 7 +- .../druid/bvt/sql/eval/EvalTest_div.java | 20 +- .../druid/bvt/sql/eval/EvalTest_gt.java | 7 +- .../druid/bvt/sql/eval/EvalTest_gt_true.java | 7 +- .../druid/bvt/sql/eval/EvalTest_lt.java | 7 +- .../druid/bvt/sql/eval/EvalTest_lt_false.java | 7 +- .../druid/bvt/sql/eval/EvalTest_lteq.java | 17 +- .../bvt/sql/eval/EvalTest_multi_short.java | 7 +- .../alibaba/druid/bvt/sql/eval/LikeTest.java | 13 +- .../bvt/sql/eval/SQLEvalVisitorUtilsTest.java | 127 ++- .../druid/bvt/sql/h2/H2ResourceTest.java | 2 - .../druid/bvt/sql/h2/H2_AlterTableTest_0.java | 3 - .../bvt/sql/h2/H2_CreateTableTest_0.java | 3 - .../bvt/sql/h2/H2_CreateTableTest_1.java | 1 - .../bvt/sql/h2/H2_CreateTriggerTest_0.java | 3 - .../druid/bvt/sql/h2/H2_DropDatabaseTest.java | 9 +- .../druid/bvt/sql/h2/H2_Explain_0.java | 1 - .../druid/bvt/sql/h2/H2_InsertTest_0.java | 1 - .../druid/bvt/sql/h2/H2_MergeTest_0.java | 1 - .../druid/bvt/sql/h2/H2_MergeTest_1.java | 1 - .../druid/bvt/sql/h2/H2_Select_0_limit.java | 1 - .../bvt/sql/h2/H2_Select_1_for_update.java | 1 - .../bvt/sql/h2/H2_Select_1_nulls_first.java | 1 - .../bvt/sql/hive/HiveCreateDatabase_0.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_0.java | 2 +- .../bvt/sql/hive/HiveCreateTableTest_1.java | 3 - .../bvt/sql/hive/HiveCreateTableTest_10.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_11.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_12.java | 1 - .../sql/hive/HiveCreateTableTest_13_skew.java | 1 - .../sql/hive/HiveCreateTableTest_14_skew.java | 1 - .../sql/hive/HiveCreateTableTest_15_pk.java | 1 - .../sql/hive/HiveCreateTableTest_16_fk.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_17.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_18.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_19.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_2.java | 3 - .../bvt/sql/hive/HiveCreateTableTest_20.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_21.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_22.java | 1 - .../HiveCreateTableTest_23_temporary.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_24.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_25.java | 1 - .../hive/HiveCreateTableTest_26_struct.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_27.java | 1 - .../hive/HiveCreateTableTest_28_struct.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_29.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_3.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_30.java | 71 +- ...veCreateTableTest_31_mappedBy_for_dla.java | 2 - .../HiveCreateTableTest_32_properties.java | 1 - .../hive/HiveCreateTableTest_33_struct.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_34.java | 1 - .../sql/hive/HiveCreateTableTest_35_dla.java | 1 - .../sql/hive/HiveCreateTableTest_36_dla.java | 1 - .../sql/hive/HiveCreateTableTest_37_dla.java | 1 - .../sql/hive/HiveCreateTableTest_38_dla.java | 3 +- .../sql/hive/HiveCreateTableTest_39_dla.java | 3 +- .../bvt/sql/hive/HiveCreateTableTest_4.java | 1 - .../sql/hive/HiveCreateTableTest_40_dla.java | 3 +- .../bvt/sql/hive/HiveCreateTableTest_41.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_42.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_43.java | 1 - .../sql/hive/HiveCreateTableTest_43_dla.java | 3 +- .../bvt/sql/hive/HiveCreateTableTest_44.java | 1 - .../sql/hive/HiveCreateTableTest_45_dla.java | 1 - .../sql/hive/HiveCreateTableTest_46_dla.java | 5 +- .../sql/hive/HiveCreateTableTest_47_dla.java | 5 +- .../sql/hive/HiveCreateTableTest_49_dla.java | 5 +- .../bvt/sql/hive/HiveCreateTableTest_5.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_6.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_7.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_8.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_9.java | 1 - .../druid/bvt/sql/hive/HiveInsert_0.java | 1 - .../druid/bvt/sql/hive/HiveInsert_1.java | 1 - .../druid/bvt/sql/hive/HiveInsert_3.java | 10 +- .../druid/bvt/sql/hive/HiveResourceTest.java | 5 +- .../hive/HiveSelectTest_13_cluster_by.java | 4 +- .../hive/HiveSelectTest_2_lateralview.java | 2 +- .../bvt/sql/hive/HiveSelectTest_2_true.java | 1 - .../bvt/sql/hive/HiveSelectTest_3_array.java | 6 +- .../druid/bvt/sql/hive/HiveSelectTest_41.java | 1 - .../bvt/sql/hive/HiveSelectTest_42_cte.java | 1 - .../bvt/sql/hive/HiveSelectTest_43_bug.java | 1 - .../hive/HiveSelectTest_44_issue_3973.java | 3 +- .../hive/HiveSelectTest_45_issue_3987.java | 3 +- .../druid/bvt/sql/hive/HiveSelectTest_47.java | 7 +- .../druid/bvt/sql/hive/HiveSelectTest_48.java | 2 - .../bvt/sql/hive/HiveSelectTest_4_array.java | 6 +- .../sql/hive/HiveSelectTest_cluster_by.java | 4 +- .../sql/hive/HiveSelectTest_distribute.java | 4 +- .../bvt/sql/informix/InformixSelectTest.java | 3 +- .../druid/bvt/sql/mysql/AdsDumpTest_0.java | 3 +- .../sql/mysql/ArithmeticOperatorsTest.java | 1 - .../sql/mysql/AssignmentOperatorsTest.java | 1 - .../druid/bvt/sql/mysql/Binlog_Test.java | 2 - .../druid/bvt/sql/mysql/BitFunctionsTest.java | 1 - .../bvt/sql/mysql/BooleanValuesTest.java | 1 - .../druid/bvt/sql/mysql/CALL_Test.java | 1 - .../mysql/CastFunctionsAndOperatorsTest.java | 3 +- .../druid/bvt/sql/mysql/CobarHintsTest.java | 44 +- .../druid/bvt/sql/mysql/CommitTest.java | 3 +- .../ComparisonFunctionsAndOperatorsTest.java | 1 - .../sql/mysql/ControlFlowFunctionsTest.java | 1 - .../druid/bvt/sql/mysql/CreateUserTest.java | 3 +- .../sql/mysql/DateAndTimeFunctionsTest.java | 9 +- .../bvt/sql/mysql/DateAndTimeValuesTest.java | 1 - .../druid/bvt/sql/mysql/DeleteSyntaxTest.java | 11 +- .../druid/bvt/sql/mysql/DropTableTest.java | 5 +- .../druid/bvt/sql/mysql/DropUserTest.java | 3 +- ...EncryptionAndCompressionFunctionsTest.java | 1 - ...ullTextSearchesWithQueryExpansionTest.java | 17 +- .../alibaba/druid/bvt/sql/mysql/HelpTest.java | 1 - .../bvt/sql/mysql/HexadecimalValuesTest.java | 1 - .../druid/bvt/sql/mysql/IdentifierTest.java | 1 - .../sql/mysql/InformationFunctionsTest.java | 1 - .../druid/bvt/sql/mysql/InsertSyntaxTest.java | 19 +- .../druid/bvt/sql/mysql/Kill_Test.java | 32 +- .../bvt/sql/mysql/LOAD_XML_Syntax_Test.java | 1 - .../sql/mysql/LoadDataInFileSyntaxTest.java | 7 +- .../bvt/sql/mysql/LogicalOperatorsTest.java | 7 +- .../sql/mysql/MathematicalFunctionsTest.java | 1 - .../sql/mysql/MiscellaneousFunctionsTest.java | 1 - .../druid/bvt/sql/mysql/MySql57Test.java | 8 +- .../sql/mysql/MySqlASTVisitorAdapterTest.java | 1 - .../bvt/sql/mysql/MySqlAnalyzeTest_1.java | 9 +- .../druid/bvt/sql/mysql/MySqlBeginTest.java | 56 +- .../bvt/sql/mysql/MySqlChecksumTableTest.java | 1 - .../bvt/sql/mysql/MySqlDeleteTest_0.java | 5 +- .../bvt/sql/mysql/MySqlDeleteTest_1.java | 7 +- .../bvt/sql/mysql/MySqlDeleteTest_2.java | 5 +- .../bvt/sql/mysql/MySqlDeleteTest_3.java | 15 +- .../MySqlDeleteTest_4_force_partition.java | 5 +- .../MySqlDeleteTest_5_force_partition.java | 5 +- .../bvt/sql/mysql/MySqlDeleteTest_6.java | 1 - .../druid/bvt/sql/mysql/MySqlDescTest_0.java | 5 +- .../bvt/sql/mysql/MySqlDescribteTest.java | 1 - .../druid/bvt/sql/mysql/MySqlDumpTest.java | 5 +- .../druid/bvt/sql/mysql/MySqlDumpTest_1.java | 5 +- .../druid/bvt/sql/mysql/MySqlError_test.java | 5 +- .../bvt/sql/mysql/MySqlError_test_1.java | 1 - .../bvt/sql/mysql/MySqlError_test_2.java | 1 - .../bvt/sql/mysql/MySqlError_test_3.java | 1 - .../druid/bvt/sql/mysql/MySqlExplainTest.java | 1 - .../bvt/sql/mysql/MySqlExplainTest_0.java | 5 +- .../bvt/sql/mysql/MySqlExplainTest_1.java | 5 +- .../druid/bvt/sql/mysql/MySqlFormatTest.java | 9 +- .../druid/bvt/sql/mysql/MySqlFormatTest2.java | 1 - .../druid/bvt/sql/mysql/MySqlFormatTest3.java | 1 - .../druid/bvt/sql/mysql/MySqlHelpTest_0.java | 9 +- .../bvt/sql/mysql/MySqlHintStatementTest.java | 1 - .../bvt/sql/mysql/MySqlOptimizeTest_1.java | 9 +- .../druid/bvt/sql/mysql/MySqlReplaceTest.java | 3 +- .../bvt/sql/mysql/MySqlReplaceTest_1.java | 1 - .../druid/bvt/sql/mysql/MySqlRevokeTest.java | 12 +- .../bvt/sql/mysql/MySqlSetPasswordTest.java | 9 +- .../druid/bvt/sql/mysql/MySqlSetTest_0.java | 1 - .../druid/bvt/sql/mysql/MySqlSetTest_1.java | 1 - .../druid/bvt/sql/mysql/MySqlSetTest_2.java | 1 - .../druid/bvt/sql/mysql/MySqlSetTest_3.java | 1 - .../druid/bvt/sql/mysql/MySqlTest_Char.java | 17 +- .../bvt/sql/mysql/MySqlTruncateTest_1.java | 2 - .../mysql/MySqlUpdateStatementLimitTest.java | 18 +- .../druid/bvt/sql/mysql/MySqlUseTest_0.java | 1 - .../druid/bvt/sql/mysql/MysqlCheckTest.java | 3 +- .../druid/bvt/sql/mysql/NumberTest.java | 1 - .../bvt/sql/mysql/REPLACE_Syntax_Test.java | 5 +- .../bvt/sql/mysql/RegularExpressionsTest.java | 3 +- .../druid/bvt/sql/mysql/Reset_Test.java | 2 - .../bvt/sql/mysql/SELECT_Syntax_Test.java | 25 +- .../sql/mysql/SHOW_COLUMNS_Syntax_Test.java | 3 +- .../sql/mysql/SHOW_DATABASES_Syntax_Test.java | 1 - .../sql/mysql/SHOW_STATUS_Syntax_Test.java | 5 +- .../sql/mysql/SHOW_TABLES_Syntax_Test.java | 2 - .../sql/mysql/SHOW_WARNINGS_Syntax_Test.java | 1 - .../druid/bvt/sql/mysql/SQLSelectTest.java | 3 +- .../bvt/sql/mysql/SQLUtilsAddColumnTest.java | 9 +- .../sql/mysql/SQLUtilsAddConditionTest.java | 12 +- .../druid/bvt/sql/mysql/SQLUtilsTest.java | 15 +- .../bvt/sql/mysql/START_TRANSACTION_Test.java | 1 - .../mysql/StringComparisonFunctionsTest.java | 1 - .../bvt/sql/mysql/StringFunctionsTest.java | 1 - .../druid/bvt/sql/mysql/StringTest.java | 1 - .../druid/bvt/sql/mysql/XMLFunctionsTest.java | 1 - .../sql/mysql/alter/MySqlAlterDbTest0.java | 3 +- .../sql/mysql/alter/MySqlAlterDbTest1.java | 3 +- .../sql/mysql/alter/MySqlAlterDbTest2.java | 3 +- .../MySqlAlterMaterializedViewTest_0.java | 8 +- .../sql/mysql/alter/MySqlAlterSequence_0.java | 1 - .../alter/MySqlAlterSequence_1_change_to.java | 3 - .../sql/mysql/alter/MySqlAlterSequence_2.java | 1 - .../mysql/alter/MySqlAlterSystemTest_0.java | 3 +- .../alter/MySqlAlterTableGroupTest_0.java | 4 +- .../alter/MySqlAlterTable_refactor_test.java | 1 - .../sql/mysql/alter/MySqlAlterUserTest.java | 5 +- .../sql/mysql/alter/MySqlAlterViewTest_0.java | 3 +- .../alterTable/MySqlAlterTableAddIndex_0.java | 13 +- .../alterTable/MySqlAlterTableAddIndex_1.java | 7 +- .../MySqlAlterTableAddIndex_10.java | 1 - .../MySqlAlterTableAddIndex_11.java | 1 - .../alterTable/MySqlAlterTableAddIndex_2.java | 5 +- .../alterTable/MySqlAlterTableAddIndex_3.java | 5 +- .../alterTable/MySqlAlterTableAddIndex_4.java | 5 +- .../alterTable/MySqlAlterTableAddIndex_5.java | 5 +- .../alterTable/MySqlAlterTableAddIndex_6.java | 7 +- .../alterTable/MySqlAlterTableAddIndex_7.java | 7 +- .../alterTable/MySqlAlterTableAddIndex_8.java | 7 +- .../alterTable/MySqlAlterTableAddIndex_9.java | 17 +- .../MySqlAlterTableAddPrimaryKey.java | 9 +- .../MySqlAlterTableAddPrimaryKey_1.java | 7 +- .../MySqlAlterTableAddUniqueTest.java | 5 +- ...lAlterTableAlterColumnDropDefaultTest.java | 7 +- ...qlAlterTableAlterColumnSetDefaultTest.java | 7 +- .../MySqlAlterTableAlterColumnTest.java | 5 +- .../MySqlAlterTableDisableKeys.java | 5 +- .../MySqlAlterTableDropIndex_0.java | 7 +- .../MySqlAlterTableDropIndex_1.java | 9 +- .../alterTable/MySqlAlterTableDropKey.java | 7 +- .../MySqlAlterTableDropPrimaryKey.java | 5 +- .../alterTable/MySqlAlterTableDrop_Test.java | 9 +- .../MySqlAlterTableDrop_Test_1.java | 5 +- .../MySqlAlterTableDrop_Test_2.java | 5 +- .../alterTable/MySqlAlterTableEnableKeys.java | 5 +- .../mysql/alterTable/MySqlAlterTableTest.java | 12 +- .../alterTable/MySqlAlterTableTest1.java | 9 +- .../alterTable/MySqlAlterTableTest10.java | 3 +- .../alterTable/MySqlAlterTableTest11.java | 3 +- .../alterTable/MySqlAlterTableTest12.java | 3 +- .../alterTable/MySqlAlterTableTest13.java | 3 +- .../alterTable/MySqlAlterTableTest14.java | 3 +- .../alterTable/MySqlAlterTableTest15.java | 3 +- .../alterTable/MySqlAlterTableTest16.java | 3 +- .../alterTable/MySqlAlterTableTest17.java | 3 +- .../alterTable/MySqlAlterTableTest18.java | 3 +- .../alterTable/MySqlAlterTableTest19.java | 3 +- .../alterTable/MySqlAlterTableTest2.java | 5 +- .../alterTable/MySqlAlterTableTest20.java | 3 +- .../alterTable/MySqlAlterTableTest21.java | 1 - .../alterTable/MySqlAlterTableTest22.java | 1 - .../alterTable/MySqlAlterTableTest23.java | 3 +- .../alterTable/MySqlAlterTableTest24.java | 5 +- .../alterTable/MySqlAlterTableTest25.java | 1 - .../alterTable/MySqlAlterTableTest26.java | 1 - .../alterTable/MySqlAlterTableTest27.java | 1 - .../alterTable/MySqlAlterTableTest28.java | 1 - .../alterTable/MySqlAlterTableTest29.java | 1 - .../alterTable/MySqlAlterTableTest3.java | 7 +- .../alterTable/MySqlAlterTableTest30.java | 1 - .../MySqlAlterTableTest31_renameIndex.java | 1 - .../alterTable/MySqlAlterTableTest32.java | 1 - .../alterTable/MySqlAlterTableTest33.java | 1 - .../MySqlAlterTableTest34_renameIndex.java | 1 - .../MySqlAlterTableTest35_multi.java | 1 - .../alterTable/MySqlAlterTableTest36.java | 1 - .../alterTable/MySqlAlterTableTest37.java | 3 +- .../alterTable/MySqlAlterTableTest38.java | 1 - .../alterTable/MySqlAlterTableTest39_ann.java | 1 - .../alterTable/MySqlAlterTableTest4.java | 5 +- .../alterTable/MySqlAlterTableTest41.java | 1 - .../alterTable/MySqlAlterTableTest42.java | 1 - .../alterTable/MySqlAlterTableTest43.java | 1 - .../alterTable/MySqlAlterTableTest44.java | 1 - .../alterTable/MySqlAlterTableTest45.java | 48 +- .../alterTable/MySqlAlterTableTest5.java | 3 +- .../MySqlAlterTableTest51_table_options.java | 1 - ...qlAlterTableTest52_primary_prefix_key.java | 1 - .../alterTable/MySqlAlterTableTest54.java | 2 +- .../alterTable/MySqlAlterTableTest6.java | 3 +- .../alterTable/MySqlAlterTableTest7.java | 3 +- .../alterTable/MySqlAlterTableTest8.java | 3 +- .../alterTable/MySqlAlterTableTest9.java | 5 +- .../MySqlAlterTableTest_40_change.java | 3 +- .../alterTable/MySqlAlterTableTest_addFk.java | 15 +- .../alterTable/MySqlAlterTableTest_addPk.java | 5 +- .../alterTable/MySqlAlterTableTest_ads.java | 3 +- .../MySqlAlterTableTest_drop_constraint.java | 5 +- .../MySQLCreateMaterializedViewTest0.java | 19 +- .../MySQLCreateMaterializedViewTest1.java | 19 +- .../MySQLCreateMaterializedViewTest2.java | 9 +- .../MySQLCreateMaterializedViewTest3.java | 11 +- .../MySQLCreateMaterializedViewTest4.java | 15 +- .../MySQLCreateMaterializedViewTest5.java | 19 +- .../MySQLCreateMaterializedViewTest6.java | 1 - .../MySQLCreateMaterializedViewTest7.java | 1 - .../MySQLCreateMaterializedViewTest_fail.java | 1 - .../MySqlCreateAddLogFileGroupTest.java | 1 - .../mysql/create/MySqlCreateDatabaseTest.java | 17 +- .../create/MySqlCreateDatabaseTest2.java | 1 - .../create/MySqlCreateDatabaseTest3.java | 1 - .../create/MySqlCreateDatabaseTest4.java | 1 - .../create/MySqlCreateDatabaseTest5.java | 2 - .../create/MySqlCreateDatabaseTest6_drds.java | 1 - .../create/MySqlCreateDatabaseTest7_drds.java | 1 - .../create/MySqlCreateDatabaseTest8_drds.java | 2 - .../MySqlCreateDatabaseTest9_issue_3975.java | 1 - .../mysql/create/MySqlCreateEventTest.java | 1 - .../mysql/create/MySqlCreateEventTest1.java | 1 - .../MySqlCreateExternalCatalogTest1.java | 33 +- .../MySqlCreateExternalCatalogTest2.java | 3 - .../MySqlCreateFullTextAnalyzerTest.java | 39 +- .../MySqlCreateFullTextCharFilterTest.java | 23 +- .../create/MySqlCreateFullTextDictTest.java | 18 +- .../MySqlCreateFullTextTokenFilterTest.java | 13 +- .../MySqlCreateFullTextTokenizeTest.java | 17 +- .../create/MySqlCreateFunctionTest_1.java | 10 +- .../mysql/create/MySqlCreateIndex2Test.java | 1 - .../mysql/create/MySqlCreateIndexTest.java | 1 - .../mysql/create/MySqlCreateIndexTest_1.java | 1 - .../create/MySqlCreateIndexTest_10_drds.java | 19 +- .../create/MySqlCreateIndexTest_11_adb.java | 1 - .../create/MySqlCreateIndexTest_2_ann.java | 1 - .../mysql/create/MySqlCreateIndexTest_3.java | 1 - .../mysql/create/MySqlCreateIndexTest_4.java | 1 - .../mysql/create/MySqlCreateIndexTest_5.java | 1 - .../mysql/create/MySqlCreateIndexTest_6.java | 1 - .../create/MySqlCreateIndexTest_7_drds.java | 23 +- .../create/MySqlCreateIndexTest_8_drds.java | 13 +- .../create/MySqlCreateIndexTest_9_drds.java | 17 +- .../create/MySqlCreateOutlineTest_0.java | 1 - .../create/MySqlCreateProcedureTest.java | 77 +- .../create/MySqlCreateProcedureTest1.java | 32 +- .../create/MySqlCreateProcedureTest10.java | 10 +- .../create/MySqlCreateProcedureTest11.java | 10 +- .../create/MySqlCreateProcedureTest12.java | 10 +- .../create/MySqlCreateProcedureTest13.java | 10 +- .../create/MySqlCreateProcedureTest14.java | 10 +- .../create/MySqlCreateProcedureTest15.java | 4 +- .../create/MySqlCreateProcedureTest2.java | 86 +- .../create/MySqlCreateProcedureTest3.java | 92 +- .../create/MySqlCreateProcedureTest4.java | 65 +- .../create/MySqlCreateProcedureTest5.java | 30 +- .../create/MySqlCreateProcedureTest6.java | 90 +- .../create/MySqlCreateProcedureTest7.java | 30 +- .../create/MySqlCreateProcedureTest8.java | 163 ++- .../create/MySqlCreateProcedureTest9.java | 96 +- .../create/MySqlCreateResourceGroupTest.java | 1 - .../MySqlCreateResourceGroupTest_hive.java | 1 - .../mysql/create/MySqlCreateSequenceTest.java | 1 - .../create/MySqlCreateSequenceTest1.java | 11 +- .../create/MySqlCreateSequenceTest2.java | 3 +- .../create/MySqlCreateSequenceTest3.java | 3 +- .../mysql/create/MySqlCreateServerTest.java | 1 - .../create/MySqlCreateTableSpaceTest.java | 1 - .../create/MySqlCreateTableUnitTest.java | 1 - .../create/MySqlCreateTable_like_test.java | 2 - .../MySqlCreateTable_refactor_test.java | 1 - ...eateTable_showColumns_repository_test.java | 38 +- .../MySqlCreateTable_showColumns_test.java | 1 - .../MySqlCreateTable_showColumns_test_2.java | 1 - .../MySqlCreateTable_showColumns_test_3.java | 1 - .../MySqlCreateTable_showColumns_test_4.java | 2 - .../MySqlCreateTable_storage_type_test.java | 1 - .../mysql/create/MySqlCreateTriggerTest.java | 5 +- .../mysql/create/MySqlCreateTriggerTest2.java | 5 +- .../mysql/create/MySqlCreateTriggerTest3.java | 2 - .../mysql/create/MySqlCreateTriggerTest4.java | 2 - .../mysql/create/MySqlCreateTriggerTest5.java | 2 - .../mysql/create/MySqlCreateUserTest_1.java | 11 +- .../mysql/create/MySqlCreateUserTest_2.java | 11 +- .../mysql/create/MySqlCreateUserTest_3.java | 13 +- .../mysql/create/MySqlCreateUserTest_4.java | 13 +- .../mysql/create/MySqlCreateUserTest_5.java | 7 +- .../mysql/create/MySqlCreateUserTest_6.java | 7 +- .../mysql/create/MySqlCreateUserTest_7.java | 1 - .../sql/mysql/create/MySqlCreateViewTest.java | 7 +- .../mysql/create/MySqlCreateViewTest1.java | 1 - .../mysql/create/MySqlCreateViewTest2.java | 1 - .../mysql/create/MySqlCreateViewTest3.java | 1 - .../mysql/create/MySqlCreateViewTest4.java | 1 - .../mysql/create/MySqlCreateViewTest5.java | 1 - .../createTable/MySqlCreateTableTest.java | 13 +- .../createTable/MySqlCreateTableTest1.java | 7 +- .../createTable/MySqlCreateTableTest10.java | 15 +- .../createTable/MySqlCreateTableTest100.java | 3 +- .../MySqlCreateTableTest101_geometry.java | 3 +- .../createTable/MySqlCreateTableTest102.java | 3 +- .../createTable/MySqlCreateTableTest103.java | 3 +- .../createTable/MySqlCreateTableTest104.java | 19 +- .../createTable/MySqlCreateTableTest105.java | 17 +- .../createTable/MySqlCreateTableTest106.java | 3 +- .../createTable/MySqlCreateTableTest107.java | 35 +- .../MySqlCreateTableTest108_drds.java | 1 - .../MySqlCreateTableTest108_error.java | 1 - .../createTable/MySqlCreateTableTest11.java | 13 +- .../MySqlCreateTableTest110_drds.java | 1 - .../MySqlCreateTableTest111_ann.java | 1 - .../createTable/MySqlCreateTableTest112.java | 3 +- .../MySqlCreateTableTest113_drds.java | 1 - .../createTable/MySqlCreateTableTest114.java | 3 +- .../createTable/MySqlCreateTableTest115.java | 3 +- .../createTable/MySqlCreateTableTest116.java | 5 +- .../createTable/MySqlCreateTableTest117.java | 11 +- .../createTable/MySqlCreateTableTest118.java | 5 +- .../MySqlCreateTableTest119_ann.java | 1 - .../createTable/MySqlCreateTableTest12.java | 3 +- .../createTable/MySqlCreateTableTest120.java | 9 +- .../MySqlCreateTableTest121_fulltext.java | 3 +- .../MySqlCreateTableTest122_ads.java | 4 +- .../MySqlCreateTableTest125_drds.java | 169 ++-- .../createTable/MySqlCreateTableTest126.java | 38 +- .../MySqlCreateTableTest126_drds.java | 4 +- .../MySqlCreateTableTest127_ads_ann.java | 4 +- .../MySqlCreateTableTest128_quote.java | 4 +- .../MySqlCreateTableTest129_ads.java | 12 +- .../createTable/MySqlCreateTableTest13.java | 21 +- .../MySqlCreateTableTest130_ads.java | 5 +- .../MySqlCreateTableTest131_drds.java | 5 +- ...SqlCreateTableTest132_drds_primaryKey.java | 6 +- .../MySqlCreateTableTest133_drds_gsi.java | 48 +- .../createTable/MySqlCreateTableTest134.java | 5 +- .../MySqlCreateTableTest135_isString.java | 5 +- .../createTable/MySqlCreateTableTest136.java | 5 +- .../createTable/MySqlCreateTableTest137.java | 5 +- .../createTable/MySqlCreateTableTest138.java | 6 +- .../createTable/MySqlCreateTableTest139.java | 6 +- .../createTable/MySqlCreateTableTest14.java | 59 +- .../createTable/MySqlCreateTableTest140.java | 6 +- .../createTable/MySqlCreateTableTest141.java | 6 +- .../createTable/MySqlCreateTableTest142.java | 6 +- .../MySqlCreateTableTest143_position.java | 4 +- ...ySqlCreateTableTest144_three_backtick.java | 4 +- .../MySqlCreateTableTest145_tail_hint.java | 4 +- .../MySqlCreateTableTest146_col_def.java | 41 +- .../MySqlCreateTableTest147_fulltext.java | 10 +- .../MySqlCreateTableTest147_fulltext2.java | 3 +- .../MySqlCreateTableTest147_fulltext3.java | 5 - ...MySqlCreateTableTest148_national_char.java | 8 +- ...TableTest149_collate_before_generated.java | 20 +- .../createTable/MySqlCreateTableTest15.java | 25 +- ...ateTableTest150_eunm_set_with_charset.java | 5 +- ...qlCreateTableTest151_double_precision.java | 3 +- ...MySqlCreateTableTest152_table_options.java | 58 +- .../MySqlCreateTableTest153_collate.java | 6 +- .../MySqlCreateTableTest154_hint.java | 6 +- .../createTable/MySqlCreateTableTest155.java | 1 - .../MySqlCreateTableTest156_ob.java | 1 - .../MySqlCreateTableTest157_shadow.java | 1 - .../MySqlCreateTableTest158_asselect.java | 1 - .../createTable/MySqlCreateTableTest159.java | 1 - .../createTable/MySqlCreateTableTest16.java | 25 +- .../createTable/MySqlCreateTableTest160.java | 1 - ...ySqlCreateTableTest161_storage_policy.java | 2 - .../createTable/MySqlCreateTableTest17.java | 5 +- .../createTable/MySqlCreateTableTest18.java | 65 +- .../createTable/MySqlCreateTableTest19.java | 7 +- .../createTable/MySqlCreateTableTest2.java | 3 +- .../createTable/MySqlCreateTableTest20.java | 1 - .../createTable/MySqlCreateTableTest21.java | 1 - .../createTable/MySqlCreateTableTest22.java | 13 +- .../createTable/MySqlCreateTableTest23.java | 11 +- .../createTable/MySqlCreateTableTest24.java | 11 +- .../createTable/MySqlCreateTableTest25.java | 11 +- .../createTable/MySqlCreateTableTest26.java | 11 +- .../createTable/MySqlCreateTableTest27.java | 11 +- .../createTable/MySqlCreateTableTest28.java | 11 +- .../createTable/MySqlCreateTableTest29.java | 11 +- .../createTable/MySqlCreateTableTest3.java | 1 - .../createTable/MySqlCreateTableTest30.java | 11 +- .../createTable/MySqlCreateTableTest31.java | 11 +- .../createTable/MySqlCreateTableTest32.java | 11 +- .../createTable/MySqlCreateTableTest33.java | 11 +- .../createTable/MySqlCreateTableTest34.java | 11 +- .../createTable/MySqlCreateTableTest35.java | 11 +- .../createTable/MySqlCreateTableTest36.java | 11 +- .../createTable/MySqlCreateTableTest37.java | 11 +- .../createTable/MySqlCreateTableTest38.java | 11 +- .../createTable/MySqlCreateTableTest39.java | 11 +- .../createTable/MySqlCreateTableTest4.java | 13 +- .../createTable/MySqlCreateTableTest40.java | 11 +- .../createTable/MySqlCreateTableTest41.java | 15 +- .../createTable/MySqlCreateTableTest42.java | 19 +- .../createTable/MySqlCreateTableTest43.java | 19 +- .../createTable/MySqlCreateTableTest44.java | 19 +- .../createTable/MySqlCreateTableTest45.java | 31 +- .../createTable/MySqlCreateTableTest46.java | 11 +- .../createTable/MySqlCreateTableTest47.java | 27 +- .../createTable/MySqlCreateTableTest48.java | 31 +- .../createTable/MySqlCreateTableTest49.java | 35 +- .../createTable/MySqlCreateTableTest5.java | 13 +- .../createTable/MySqlCreateTableTest50.java | 15 +- .../createTable/MySqlCreateTableTest51.java | 15 +- .../createTable/MySqlCreateTableTest52.java | 35 +- .../createTable/MySqlCreateTableTest53.java | 111 +- .../createTable/MySqlCreateTableTest54.java | 171 ++-- .../createTable/MySqlCreateTableTest55.java | 7 +- .../createTable/MySqlCreateTableTest56.java | 13 +- .../createTable/MySqlCreateTableTest57.java | 27 +- .../createTable/MySqlCreateTableTest58.java | 117 ++- .../createTable/MySqlCreateTableTest59.java | 7 +- .../createTable/MySqlCreateTableTest6.java | 17 +- .../createTable/MySqlCreateTableTest60.java | 1 - .../createTable/MySqlCreateTableTest61.java | 1 - .../createTable/MySqlCreateTableTest62.java | 1 - .../createTable/MySqlCreateTableTest63.java | 1 - .../createTable/MySqlCreateTableTest64.java | 1 - .../createTable/MySqlCreateTableTest65.java | 1 - .../createTable/MySqlCreateTableTest66.java | 5 +- .../createTable/MySqlCreateTableTest67.java | 1 - .../createTable/MySqlCreateTableTest68.java | 3 +- .../createTable/MySqlCreateTableTest69.java | 5 +- .../createTable/MySqlCreateTableTest7.java | 15 +- .../createTable/MySqlCreateTableTest70.java | 5 +- .../createTable/MySqlCreateTableTest71.java | 5 +- .../createTable/MySqlCreateTableTest72.java | 5 +- .../createTable/MySqlCreateTableTest73.java | 5 +- .../createTable/MySqlCreateTableTest74.java | 7 +- .../createTable/MySqlCreateTableTest75.java | 5 +- .../createTable/MySqlCreateTableTest76.java | 5 +- .../createTable/MySqlCreateTableTest77.java | 5 +- .../MySqlCreateTableTest78_json.java | 5 +- .../MySqlCreateTableTest79_collate.java | 5 +- .../createTable/MySqlCreateTableTest8.java | 17 +- .../createTable/MySqlCreateTableTest80.java | 3 +- .../createTable/MySqlCreateTableTest81.java | 3 +- .../createTable/MySqlCreateTableTest82.java | 3 +- .../createTable/MySqlCreateTableTest83.java | 3 +- .../createTable/MySqlCreateTableTest84.java | 47 +- .../createTable/MySqlCreateTableTest85.java | 3 +- .../createTable/MySqlCreateTableTest86.java | 3 +- .../createTable/MySqlCreateTableTest87.java | 3 +- .../createTable/MySqlCreateTableTest88.java | 3 +- .../createTable/MySqlCreateTableTest89.java | 3 +- .../createTable/MySqlCreateTableTest9.java | 7 +- .../createTable/MySqlCreateTableTest90.java | 3 +- .../createTable/MySqlCreateTableTest91.java | 1 - .../createTable/MySqlCreateTableTest92.java | 9 +- .../createTable/MySqlCreateTableTest93.java | 3 +- .../createTable/MySqlCreateTableTest94.java | 3 +- .../createTable/MySqlCreateTableTest95.java | 3 +- .../MySqlCreateTableTest96_set.java | 3 +- .../createTable/MySqlCreateTableTest97.java | 3 +- .../MySqlCreateTableTest98_keyword.java | 11 +- .../createTable/MySqlCreateTableTest99.java | 3 +- .../MySql_Create_Function_0.java | 13 +- .../MySql_Create_Function_1.java | 13 +- .../sql/mysql/drop/MySqlDropDatabaseTest.java | 9 +- .../mysql/drop/MySqlDropDatabaseTest2.java | 9 +- .../sql/mysql/drop/MySqlDropFunctionTest.java | 4 +- .../sql/mysql/drop/MySqlDropIndexTest.java | 1 - .../sql/mysql/drop/MySqlDropIndexTest1.java | 1 - .../sql/mysql/drop/MySqlDropIndexTest2.java | 1 - .../mysql/drop/MySqlDropProcedureTest.java | 4 +- .../sql/mysql/drop/MySqlDropTableTest.java | 3 +- .../drop/MySqlDropTableTest_1_hints.java | 3 +- .../sql/mysql/drop/MySqlDropTablespace.java | 1 - .../mysql/drop/MySqlDropTablespaceTest.java | 4 +- .../sql/mysql/drop/MySqlDropTriggerTest.java | 4 +- .../bvt/sql/mysql/drop/MySqlDropUserTest.java | 9 +- .../bvt/sql/mysql/drop/MySqlDropViewTest.java | 1 - .../bvt/sql/mysql/grant/MySqlGrantTest.java | 9 +- .../bvt/sql/mysql/grant/MySqlGrantTest_1.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_10.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_11.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_12.java | 11 +- .../sql/mysql/grant/MySqlGrantTest_13.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_14.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_15.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_16.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_17.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_18.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_19.java | 9 +- .../bvt/sql/mysql/grant/MySqlGrantTest_2.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_20.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_21.java | 7 +- .../sql/mysql/grant/MySqlGrantTest_22.java | 7 +- .../sql/mysql/grant/MySqlGrantTest_23.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_24.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_25.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_26.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_27.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_28.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_29.java | 9 +- .../bvt/sql/mysql/grant/MySqlGrantTest_3.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_30.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_31.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_32.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_33.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_34.java | 13 +- .../sql/mysql/grant/MySqlGrantTest_35.java | 5 +- .../sql/mysql/grant/MySqlGrantTest_36.java | 5 +- .../sql/mysql/grant/MySqlGrantTest_37.java | 1 - .../bvt/sql/mysql/grant/MySqlGrantTest_4.java | 9 +- .../bvt/sql/mysql/grant/MySqlGrantTest_5.java | 9 +- .../bvt/sql/mysql/grant/MySqlGrantTest_6.java | 9 +- .../bvt/sql/mysql/grant/MySqlGrantTest_7.java | 9 +- .../bvt/sql/mysql/grant/MySqlGrantTest_8.java | 9 +- .../bvt/sql/mysql/grant/MySqlGrantTest_9.java | 9 +- .../sql/mysql/grant/MySqlGrantTest_ads.java | 14 +- .../mysql/grant/MySqlRevokeTest_ads_1.java | 4 - .../sql/mysql/insert/MySqlInsertTest_0.java | 35 +- .../sql/mysql/insert/MySqlInsertTest_1.java | 3 +- .../sql/mysql/insert/MySqlInsertTest_10.java | 15 +- .../sql/mysql/insert/MySqlInsertTest_11.java | 3 +- .../sql/mysql/insert/MySqlInsertTest_12.java | 1 - .../sql/mysql/insert/MySqlInsertTest_13.java | 1 - .../sql/mysql/insert/MySqlInsertTest_14.java | 1 - .../sql/mysql/insert/MySqlInsertTest_15.java | 1 - .../mysql/insert/MySqlInsertTest_16_hint.java | 1 - .../sql/mysql/insert/MySqlInsertTest_17.java | 41 +- .../insert/MySqlInsertTest_18_alias.java | 1 - .../sql/mysql/insert/MySqlInsertTest_2.java | 3 +- .../mysql/insert/MySqlInsertTest_25_time.java | 1 - .../insert/MySqlInsertTest_26_special.java | 1 - .../insert/MySqlInsertTest_27_str_concat.java | 1 - .../sql/mysql/insert/MySqlInsertTest_3.java | 3 +- .../sql/mysql/insert/MySqlInsertTest_36.java | 1 - .../sql/mysql/insert/MySqlInsertTest_4.java | 7 +- .../sql/mysql/insert/MySqlInsertTest_43.java | 1 - .../sql/mysql/insert/MySqlInsertTest_5.java | 5 +- .../sql/mysql/insert/MySqlInsertTest_6.java | 27 +- .../sql/mysql/insert/MySqlInsertTest_7.java | 9 +- .../sql/mysql/insert/MySqlInsertTest_8.java | 17 +- .../sql/mysql/insert/MySqlInsertTest_9.java | 1 - .../druid/bvt/sql/mysql/mysql_block_0.java | 77 +- .../druid/bvt/sql/mysql/mysql_block_1.java | 247 +++-- .../druid/bvt/sql/mysql/mysql_block_2.java | 247 +++-- .../mysql/param/MySQLParameterizedTest.java | 4 - .../bvt/sql/mysql/param/MySqlParamTest.java | 3 +- .../MySqlParameterizedOutputVisitorTest.java | 23 +- .../MySqlParameterizedOutputVisitorTest2.java | 1 - ...MySqlParameterizedOutputVisitorTest_1.java | 9 +- ...ySqlParameterizedOutputVisitorTest_16.java | 2 - ...MySqlParameterizedOutputVisitorTest_3.java | 2 +- ...ySqlParameterizedOutputVisitorTest_30.java | 1 - ...ySqlParameterizedOutputVisitorTest_31.java | 1 - ...ySqlParameterizedOutputVisitorTest_33.java | 1 - ...ySqlParameterizedOutputVisitorTest_34.java | 1 - ...ySqlParameterizedOutputVisitorTest_35.java | 3 - ...ySqlParameterizedOutputVisitorTest_36.java | 3 - ...MySqlParameterizedOutputVisitorTest_4.java | 9 +- ...ySqlParameterizedOutputVisitorTest_42.java | 1 - ...ySqlParameterizedOutputVisitorTest_43.java | 4 +- ...ySqlParameterizedOutputVisitorTest_44.java | 1 - ...ySqlParameterizedOutputVisitorTest_45.java | 1 - ...ySqlParameterizedOutputVisitorTest_46.java | 1 - ...rameterizedOutputVisitorTest_47_hints.java | 5 +- ...terizedOutputVisitorTest_48_aggregate.java | 1 - ...rizedOutputVisitorTest_49_createTable.java | 1 - ...MySqlParameterizedOutputVisitorTest_5.java | 1 - ...meterizedOutputVisitorTest_50_orderby.java | 1 - ...ameterizedOutputVisitorTest_51_schema.java | 1 - ...ameterizedOutputVisitorTest_52_schema.java | 1 - ...lParameterizedOutputVisitorTest_53_or.java | 1 - ...lParameterizedOutputVisitorTest_54_or.java | 1 - ...ySqlParameterizedOutputVisitorTest_55.java | 1 - ...ySqlParameterizedOutputVisitorTest_56.java | 2 - ...ySqlParameterizedOutputVisitorTest_57.java | 3 - ...ySqlParameterizedOutputVisitorTest_58.java | 2 +- ...rizedOutputVisitorTest_59_multiupdate.java | 2 +- ...MySqlParameterizedOutputVisitorTest_6.java | 1 - ...lParameterizedOutputVisitorTest_60_in.java | 8 +- ...ySqlParameterizedOutputVisitorTest_61.java | 3 +- ...ySqlParameterizedOutputVisitorTest_62.java | 3 +- ...ySqlParameterizedOutputVisitorTest_63.java | 9 +- ...ySqlParameterizedOutputVisitorTest_64.java | 3 +- ...ySqlParameterizedOutputVisitorTest_65.java | 2 +- ...ySqlParameterizedOutputVisitorTest_66.java | 3 +- ...ySqlParameterizedOutputVisitorTest_67.java | 3 +- ...ySqlParameterizedOutputVisitorTest_68.java | 3 +- ...ySqlParameterizedOutputVisitorTest_69.java | 6 +- ...MySqlParameterizedOutputVisitorTest_7.java | 1 - ...ySqlParameterizedOutputVisitorTest_70.java | 6 +- ...ySqlParameterizedOutputVisitorTest_71.java | 7 +- ...ySqlParameterizedOutputVisitorTest_72.java | 7 +- ...ySqlParameterizedOutputVisitorTest_73.java | 6 +- ...ySqlParameterizedOutputVisitorTest_74.java | 4 +- ...lParameterizedOutputVisitorTest_75_or.java | 2 - ...ySqlParameterizedOutputVisitorTest_76.java | 1 - ...ySqlParameterizedOutputVisitorTest_77.java | 19 +- ...rameterizedOutputVisitorTest_78_nchar.java | 3 +- ...edOutputVisitorTest_79_group_asc_desc.java | 1 - ...MySqlParameterizedOutputVisitorTest_8.java | 2 - ...ySqlParameterizedOutputVisitorTest_80.java | 11 +- ...MySqlParameterizedOutputVisitorTest_9.java | 1 - .../druid/bvt/sql/mysql/param/ParseUtil.java | 20 +- .../mysql/parser/MySqlParserResourceTest.java | 4 +- .../mysql/resolve/Resolve_AllColumn_Test.java | 26 +- .../sql/mysql/resolve/TPCDS_ALL_Resolve.java | 2 +- .../bvt/sql/mysql/select/AdsDumpTest_0.java | 3 +- .../sql/mysql/select/MySqlFlushTest_0.java | 9 +- .../sql/mysql/select/MySqlFlushTest_1.java | 9 +- .../sql/mysql/select/MySqlFlushTest_10.java | 9 +- .../sql/mysql/select/MySqlFlushTest_11.java | 9 +- .../sql/mysql/select/MySqlFlushTest_12.java | 9 +- .../sql/mysql/select/MySqlFlushTest_13.java | 9 +- .../sql/mysql/select/MySqlFlushTest_14.java | 9 +- .../sql/mysql/select/MySqlFlushTest_2.java | 9 +- .../sql/mysql/select/MySqlFlushTest_3.java | 9 +- .../sql/mysql/select/MySqlFlushTest_4.java | 9 +- .../sql/mysql/select/MySqlFlushTest_5.java | 9 +- .../sql/mysql/select/MySqlFlushTest_6.java | 9 +- .../sql/mysql/select/MySqlFlushTest_7.java | 9 +- .../sql/mysql/select/MySqlFlushTest_8.java | 9 +- .../sql/mysql/select/MySqlFlushTest_9.java | 9 +- .../sql/mysql/select/MySqlSelectTest_0.java | 3 +- .../sql/mysql/select/MySqlSelectTest_1.java | 1 - .../sql/mysql/select/MySqlSelectTest_10.java | 7 +- .../select/MySqlSelectTest_100_alias.java | 1 - .../sql/mysql/select/MySqlSelectTest_11.java | 7 +- .../sql/mysql/select/MySqlSelectTest_110.java | 8 +- .../select/MySqlSelectTest_111_sequence.java | 8 +- .../select/MySqlSelectTest_112_orderBy.java | 8 +- .../select/MySqlSelectTest_113_time.java | 8 +- .../sql/mysql/select/MySqlSelectTest_114.java | 8 +- .../select/MySqlSelectTest_115_collate.java | 3 +- .../select/MySqlSelectTest_116_with_cube.java | 3 +- .../sql/mysql/select/MySqlSelectTest_117.java | 3 +- .../select/MySqlSelectTest_118_timestamp.java | 3 +- .../select/MySqlSelectTest_119_date.java | 3 +- .../select/MySqlSelectTest_119_real.java | 3 +- .../sql/mysql/select/MySqlSelectTest_12.java | 3 +- .../mysql/select/MySqlSelectTest_120_not.java | 3 +- .../sql/mysql/select/MySqlSelectTest_121.java | 3 +- .../sql/mysql/select/MySqlSelectTest_122.java | 3 +- .../mysql/select/MySqlSelectTest_123_mod.java | 9 +- .../select/MySqlSelectTest_124_contains.java | 5 +- .../mysql/select/MySqlSelectTest_125_eq.java | 3 +- .../select/MySqlSelectTest_126_ads_minus.java | 3 +- .../sql/mysql/select/MySqlSelectTest_127.java | 3 +- .../MySqlSelectTest_128_ads_count_as.java | 3 +- .../mysql/select/MySqlSelectTest_129_ads.java | 3 +- .../sql/mysql/select/MySqlSelectTest_13.java | 5 +- .../mysql/select/MySqlSelectTest_130_ads.java | 3 +- .../mysql/select/MySqlSelectTest_131_div.java | 3 +- .../select/MySqlSelectTest_132_not_in.java | 3 +- .../sql/mysql/select/MySqlSelectTest_133.java | 3 +- .../sql/mysql/select/MySqlSelectTest_134.java | 11 +- .../sql/mysql/select/MySqlSelectTest_135.java | 3 +- .../sql/mysql/select/MySqlSelectTest_136.java | 3 +- .../sql/mysql/select/MySqlSelectTest_137.java | 3 +- .../select/MySqlSelectTest_138_ads_minus.java | 3 +- .../sql/mysql/select/MySqlSelectTest_139.java | 3 +- .../sql/mysql/select/MySqlSelectTest_14.java | 17 +- .../select/MySqlSelectTest_140_union.java | 3 +- .../select/MySqlSelectTest_141_bigunion.java | 1 - .../sql/mysql/select/MySqlSelectTest_142.java | 3 +- .../sql/mysql/select/MySqlSelectTest_143.java | 1 - .../MySqlSelectTest_144_ads_values.java | 1 - .../sql/mysql/select/MySqlSelectTest_146.java | 3 +- .../select/MySqlSelectTest_147_huizhi.java | 3 +- .../select/MySqlSelectTest_148_extract.java | 3 +- .../sql/mysql/select/MySqlSelectTest_149.java | 11 +- .../sql/mysql/select/MySqlSelectTest_15.java | 7 +- .../sql/mysql/select/MySqlSelectTest_150.java | 3 +- .../sql/mysql/select/MySqlSelectTest_151.java | 3 +- .../sql/mysql/select/MySqlSelectTest_152.java | 5 +- .../sql/mysql/select/MySqlSelectTest_153.java | 3 +- .../sql/mysql/select/MySqlSelectTest_154.java | 3 +- .../sql/mysql/select/MySqlSelectTest_155.java | 3 +- .../sql/mysql/select/MySqlSelectTest_156.java | 3 +- .../sql/mysql/select/MySqlSelectTest_157.java | 3 +- .../sql/mysql/select/MySqlSelectTest_158.java | 3 +- .../sql/mysql/select/MySqlSelectTest_159.java | 3 +- .../sql/mysql/select/MySqlSelectTest_16.java | 3 +- .../sql/mysql/select/MySqlSelectTest_160.java | 3 +- .../sql/mysql/select/MySqlSelectTest_161.java | 3 +- .../sql/mysql/select/MySqlSelectTest_162.java | 3 +- .../sql/mysql/select/MySqlSelectTest_163.java | 3 +- .../select/MySqlSelectTest_164_window.java | 3 +- .../select/MySqlSelectTest_165_json.java | 3 +- .../mysql/select/MySqlSelectTest_166_xor.java | 7 +- .../sql/mysql/select/MySqlSelectTest_167.java | 3 +- .../select/MySqlSelectTest_168_decimal.java | 3 +- .../mysql/select/MySqlSelectTest_168_int.java | 25 +- .../select/MySqlSelectTest_168_union.java | 3 +- .../MySqlSelectTest_169_not_between.java | 5 +- .../select/MySqlSelectTest_169_not_in.java | 3 +- .../select/MySqlSelectTest_169_values.java | 11 +- .../sql/mysql/select/MySqlSelectTest_17.java | 7 +- .../select/MySqlSelectTest_170_tddl_hint.java | 7 +- .../MySqlSelectTest_171_multi_error.java | 1 - .../select/MySqlSelectTest_172_trim.java | 23 +- .../sql/mysql/select/MySqlSelectTest_173.java | 3 +- .../select/MySqlSelectTest_174_union.java | 3 +- .../select/MySqlSelectTest_175_hints.java | 3 +- .../select/MySqlSelectTest_176_hints.java | 3 +- .../select/MySqlSelectTest_177_hints.java | 13 +- .../sql/mysql/select/MySqlSelectTest_178.java | 3 +- .../sql/mysql/select/MySqlSelectTest_179.java | 7 +- .../sql/mysql/select/MySqlSelectTest_18.java | 3 +- .../select/MySqlSelectTest_180_extract.java | 15 +- .../select/MySqlSelectTest_181_limit.java | 5 +- .../sql/mysql/select/MySqlSelectTest_182.java | 3 +- .../mysql/select/MySqlSelectTest_183_mpp.java | 3 +- .../sql/mysql/select/MySqlSelectTest_184.java | 3 +- .../sql/mysql/select/MySqlSelectTest_185.java | 3 +- .../sql/mysql/select/MySqlSelectTest_186.java | 3 +- .../sql/mysql/select/MySqlSelectTest_187.java | 3 +- .../sql/mysql/select/MySqlSelectTest_188.java | 3 +- .../sql/mysql/select/MySqlSelectTest_189.java | 3 +- .../sql/mysql/select/MySqlSelectTest_19.java | 3 +- .../select/MySqlSelectTest_190_drds.java | 3 +- .../MySqlSelectTest_191_specialName.java | 3 +- .../select/MySqlSelectTest_192_ibatis.java | 3 +- .../select/MySqlSelectTest_193_ibatis.java | 3 +- .../mysql/select/MySqlSelectTest_194_dla.java | 3 +- .../mysql/select/MySqlSelectTest_195_dla.java | 3 +- .../select/MySqlSelectTest_196_wall.java | 1 - .../sql/mysql/select/MySqlSelectTest_197.java | 13 +- .../sql/mysql/select/MySqlSelectTest_198.java | 3 +- .../select/MySqlSelectTest_199_hint.java | 375 +++---- .../sql/mysql/select/MySqlSelectTest_2.java | 9 +- .../sql/mysql/select/MySqlSelectTest_20.java | 11 +- .../select/MySqlSelectTest_200_presto.java | 7 +- .../sql/mysql/select/MySqlSelectTest_201.java | 7 +- .../select/MySqlSelectTest_20190424_01.java | 2 - .../sql/mysql/select/MySqlSelectTest_202.java | 1 - .../mysql/select/MySqlSelectTest_203_dla.java | 3 +- .../mysql/select/MySqlSelectTest_204_dla.java | 3 +- ...MySqlSelectTest_205_drds_group_concat.java | 7 +- .../select/MySqlSelectTest_206_union.java | 3 +- .../select/MySqlSelectTest_207_cast.java | 1 - .../mysql/select/MySqlSelectTest_209_not.java | 3 +- .../sql/mysql/select/MySqlSelectTest_21.java | 13 +- .../select/MySqlSelectTest_210_union.java | 3 +- .../select/MySqlSelectTest_211_union.java | 3 +- .../select/MySqlSelectTest_212_alias.java | 1 - .../sql/mysql/select/MySqlSelectTest_213.java | 1 - .../sql/mysql/select/MySqlSelectTest_214.java | 1 - .../sql/mysql/select/MySqlSelectTest_215.java | 1 - .../sql/mysql/select/MySqlSelectTest_216.java | 1 - .../select/MySqlSelectTest_217_unnest.java | 1 - .../select/MySqlSelectTest_218_jdbc.java | 1 - .../select/MySqlSelectTest_219_jdbc_fn.java | 1 - .../sql/mysql/select/MySqlSelectTest_22.java | 10 +- .../select/MySqlSelectTest_220_jdbc_fn.java | 1 - .../sql/mysql/select/MySqlSelectTest_221.java | 1 - .../sql/mysql/select/MySqlSelectTest_222.java | 1 - .../select/MySqlSelectTest_223_jdbc_fn.java | 1 - .../sql/mysql/select/MySqlSelectTest_224.java | 1 - .../mysql/select/MySqlSelectTest_225_reg.java | 1 - .../sql/mysql/select/MySqlSelectTest_226.java | 1 - .../sql/mysql/select/MySqlSelectTest_227.java | 1 - .../sql/mysql/select/MySqlSelectTest_228.java | 1 - .../select/MySqlSelectTest_229_interval.java | 1 - .../sql/mysql/select/MySqlSelectTest_23.java | 28 +- .../sql/mysql/select/MySqlSelectTest_230.java | 1 - .../select/MySqlSelectTest_231_keywords.java | 1 - .../sql/mysql/select/MySqlSelectTest_232.java | 1 - .../sql/mysql/select/MySqlSelectTest_233.java | 2 - .../sql/mysql/select/MySqlSelectTest_234.java | 2 - .../sql/mysql/select/MySqlSelectTest_235.java | 2 - .../sql/mysql/select/MySqlSelectTest_236.java | 2 - .../sql/mysql/select/MySqlSelectTest_237.java | 2 - .../sql/mysql/select/MySqlSelectTest_238.java | 2 - .../sql/mysql/select/MySqlSelectTest_239.java | 2 - .../sql/mysql/select/MySqlSelectTest_24.java | 16 +- .../sql/mysql/select/MySqlSelectTest_240.java | 2 - .../sql/mysql/select/MySqlSelectTest_241.java | 2 - .../sql/mysql/select/MySqlSelectTest_242.java | 2 - .../sql/mysql/select/MySqlSelectTest_243.java | 2 - .../sql/mysql/select/MySqlSelectTest_244.java | 2 - .../sql/mysql/select/MySqlSelectTest_245.java | 2 - .../sql/mysql/select/MySqlSelectTest_246.java | 2 - .../sql/mysql/select/MySqlSelectTest_247.java | 2 - .../sql/mysql/select/MySqlSelectTest_248.java | 2 - .../sql/mysql/select/MySqlSelectTest_249.java | 2 - .../sql/mysql/select/MySqlSelectTest_25.java | 32 +- .../sql/mysql/select/MySqlSelectTest_250.java | 2 - .../sql/mysql/select/MySqlSelectTest_251.java | 2 - .../sql/mysql/select/MySqlSelectTest_252.java | 2 - .../sql/mysql/select/MySqlSelectTest_253.java | 1 - .../sql/mysql/select/MySqlSelectTest_254.java | 1 - .../sql/mysql/select/MySqlSelectTest_255.java | 1 - .../sql/mysql/select/MySqlSelectTest_256.java | 1 - .../sql/mysql/select/MySqlSelectTest_257.java | 1 - .../sql/mysql/select/MySqlSelectTest_258.java | 1 - .../sql/mysql/select/MySqlSelectTest_259.java | 1 - .../sql/mysql/select/MySqlSelectTest_26.java | 16 +- .../sql/mysql/select/MySqlSelectTest_260.java | 1 - .../sql/mysql/select/MySqlSelectTest_261.java | 1 - .../sql/mysql/select/MySqlSelectTest_262.java | 1 - .../sql/mysql/select/MySqlSelectTest_263.java | 1 - .../sql/mysql/select/MySqlSelectTest_264.java | 1 - .../sql/mysql/select/MySqlSelectTest_265.java | 1 - .../sql/mysql/select/MySqlSelectTest_266.java | 1 - .../sql/mysql/select/MySqlSelectTest_267.java | 1 - .../sql/mysql/select/MySqlSelectTest_268.java | 1 - .../sql/mysql/select/MySqlSelectTest_269.java | 1 - .../sql/mysql/select/MySqlSelectTest_27.java | 20 +- .../sql/mysql/select/MySqlSelectTest_270.java | 1 - .../sql/mysql/select/MySqlSelectTest_271.java | 2 - .../sql/mysql/select/MySqlSelectTest_272.java | 2 - .../sql/mysql/select/MySqlSelectTest_273.java | 2 - .../sql/mysql/select/MySqlSelectTest_274.java | 2 - .../sql/mysql/select/MySqlSelectTest_275.java | 2 - .../sql/mysql/select/MySqlSelectTest_276.java | 2 - .../sql/mysql/select/MySqlSelectTest_277.java | 2 - .../sql/mysql/select/MySqlSelectTest_278.java | 2 - .../sql/mysql/select/MySqlSelectTest_279.java | 2 - .../sql/mysql/select/MySqlSelectTest_28.java | 16 +- .../sql/mysql/select/MySqlSelectTest_280.java | 2 - .../sql/mysql/select/MySqlSelectTest_281.java | 2 - .../sql/mysql/select/MySqlSelectTest_282.java | 2 - .../MySqlSelectTest_282_hint_in_where.java | 1 - .../MySqlSelectTest_283_current_user.java | 2 - .../sql/mysql/select/MySqlSelectTest_284.java | 2 - .../sql/mysql/select/MySqlSelectTest_285.java | 2 - .../sql/mysql/select/MySqlSelectTest_286.java | 2 - .../sql/mysql/select/MySqlSelectTest_287.java | 2 - .../sql/mysql/select/MySqlSelectTest_288.java | 2 - .../sql/mysql/select/MySqlSelectTest_289.java | 2 - .../sql/mysql/select/MySqlSelectTest_29.java | 16 +- .../sql/mysql/select/MySqlSelectTest_290.java | 2 - .../select/MySqlSelectTest_292_lateral.java | 1 - ...ySqlSelectTest_293_group_concat_clone.java | 2 - ...SqlSelectTest_293_operator_precedence.java | 1 - .../mysql/select/MySqlSelectTest_294_dla.java | 2 - .../sql/mysql/select/MySqlSelectTest_295.java | 2 - .../sql/mysql/select/MySqlSelectTest_296.java | 2 - .../sql/mysql/select/MySqlSelectTest_297.java | 1 - .../sql/mysql/select/MySqlSelectTest_298.java | 1 - .../mysql/select/MySqlSelectTest_299_mtr.java | 1 - .../sql/mysql/select/MySqlSelectTest_3.java | 3 +- .../sql/mysql/select/MySqlSelectTest_30.java | 24 +- .../select/MySqlSelectTest_300_genAlias.java | 1 - .../mysql/select/MySqlSelectTest_301_dla.java | 2 - .../mysql/select/MySqlSelectTest_302_agg.java | 1 - .../select/MySqlSelectTest_304_adb_hints.java | 101 +- .../mysql/select/MySqlSelectTest_305_dla.java | 1 - .../MySqlSelectTest_306_outer_orderby.java | 1 - .../MySqlSelectTest_307_lateralview.java | 1 - .../mysql/select/MySqlSelectTest_308_mtr.java | 1 - .../sql/mysql/select/MySqlSelectTest_309.java | 2 - .../sql/mysql/select/MySqlSelectTest_31.java | 24 +- .../sql/mysql/select/MySqlSelectTest_310.java | 3 +- .../select/MySqlSelectTest_311_issue.java | 1 - .../sql/mysql/select/MySqlSelectTest_313.java | 1 - .../sql/mysql/select/MySqlSelectTest_314.java | 1 - .../sql/mysql/select/MySqlSelectTest_32.java | 16 +- .../sql/mysql/select/MySqlSelectTest_33.java | 16 +- .../sql/mysql/select/MySqlSelectTest_34.java | 16 +- .../sql/mysql/select/MySqlSelectTest_35.java | 14 +- .../sql/mysql/select/MySqlSelectTest_36.java | 14 +- .../sql/mysql/select/MySqlSelectTest_37.java | 14 +- .../sql/mysql/select/MySqlSelectTest_38.java | 14 +- .../sql/mysql/select/MySqlSelectTest_39.java | 14 +- .../sql/mysql/select/MySqlSelectTest_4.java | 3 +- .../sql/mysql/select/MySqlSelectTest_40.java | 9 +- .../sql/mysql/select/MySqlSelectTest_41.java | 9 +- .../select/MySqlSelectTest_42_with_cte.java | 7 +- .../select/MySqlSelectTest_43_with_cte.java | 9 +- .../select/MySqlSelectTest_44_with_cte.java | 9 +- ...SelectTest_45_subquery_scalar_operand.java | 9 +- .../MySqlSelectTest_46_group_concat.java | 9 +- .../MySqlSelectTest_47_group_concat.java | 9 +- .../select/MySqlSelectTest_48_union.java | 9 +- ...MySqlSelectTest_49_for_update_no_wait.java | 9 +- .../sql/mysql/select/MySqlSelectTest_5.java | 3 +- .../select/MySqlSelectTest_50_union.java | 9 +- .../mysql/select/MySqlSelectTest_51_open.java | 9 +- .../select/MySqlSelectTest_52_comment.java | 9 +- .../select/MySqlSelectTest_53_match.java | 29 +- .../sql/mysql/select/MySqlSelectTest_54.java | 11 +- .../sql/mysql/select/MySqlSelectTest_55.java | 11 +- .../sql/mysql/select/MySqlSelectTest_56.java | 11 +- .../sql/mysql/select/MySqlSelectTest_57.java | 11 +- .../select/MySqlSelectTest_58_alias_dot.java | 11 +- .../mysql/select/MySqlSelectTest_59_neq.java | 11 +- .../sql/mysql/select/MySqlSelectTest_6.java | 3 +- .../MySqlSelectTest_60_firstComment.java | 7 +- .../MySqlSelectTest_61_firstComment_2.java | 7 +- .../select/MySqlSelectTest_62_optimized.java | 7 +- .../select/MySqlSelectTest_63_alias.java | 7 +- .../select/MySqlSelectTest_64_negative.java | 7 +- .../select/MySqlSelectTest_65_orderby.java | 7 +- .../sql/mysql/select/MySqlSelectTest_66.java | 7 +- .../sql/mysql/select/MySqlSelectTest_67.java | 7 +- .../MySqlSelectTest_68_mariadb_cte.java | 7 +- .../sql/mysql/select/MySqlSelectTest_7.java | 9 +- .../select/MySqlSelectTest_70_nchar.java | 7 +- .../select/MySqlSelectTest_71_concat.java | 7 +- .../select/MySqlSelectTest_72_nchar.java | 7 +- .../mysql/select/MySqlSelectTest_73_null.java | 7 +- .../select/MySqlSelectTest_74_latin.java | 7 +- .../select/MySqlSelectTest_75_select.java | 7 +- .../select/MySqlSelectTest_76_union.java | 7 +- .../select/MySqlSelectTest_77_is_unkown.java | 7 +- .../select/MySqlSelectTest_78_is_unkown.java | 7 +- .../select/MySqlSelectTest_79_between.java | 7 +- .../sql/mysql/select/MySqlSelectTest_8.java | 7 +- .../select/MySqlSelectTest_80_hints.java | 7 +- .../select/MySqlSelectTest_81_hints.java | 7 +- .../MySqlSelectTest_82_force_partition.java | 7 +- .../sql/mysql/select/MySqlSelectTest_9.java | 7 +- .../sql/mysql/select/MySqlSelectTest_90.java | 1 - .../select/MySqlSelectTest_91_hints.java | 1 - .../sql/mysql/select/MySqlSelectTest_92.java | 1 - .../sql/mysql/select/MySqlSelectTest_93.java | 31 +- .../sql/mysql/select/MySqlSelectTest_94.java | 24 +- .../select/MySqlSelectTest_94_error.java | 1 - .../MySqlSelectTest_95_error_orderBy.java | 1 - .../select/MySqlSelectTest_95_soundsLike.java | 1 - .../select/MySqlSelectTest_96_istrue.java | 1 - .../select/MySqlSelectTest_97_alias.java | 1 - .../sql/mysql/select/MySqlSelectTest_98.java | 16 +- .../MySqlSelectTest_99_union_order.java | 1 - .../select/MySqlSelectTest_BinaryConcat.java | 7 +- .../select/MySqlSelectTest_POSITION.java | 15 +- ...MySqlSelectTest_adsHintAndTypeConvert.java | 1 - .../select/MySqlSelectTest_ads_keywords.java | 3 +- .../MySqlSelectTest_ads_keywords_0.java | 3 +- .../MySqlSelectTest_ads_keywords_1.java | 2 +- .../select/MySqlSelectTest_clearLimit.java | 44 +- .../select/MySqlSelectTest_comma_src.java | 11 +- .../mysql/select/MySqlSelectTest_comment.java | 1 - .../select/MySqlSelectTest_crossjoin.java | 7 +- ...MySqlSelectTest_eq_null_parameterized.java | 1 - .../mysql/select/MySqlSelectTest_equals.java | 2 +- .../select/MySqlSelectTest_exportTables.java | 7 +- .../mysql/select/MySqlSelectTest_forADB.java | 1 - .../MySqlSelectTest_func_in_order_by.java | 1 - .../select/MySqlSelectTest_group_concat.java | 20 +- .../MySqlSelectTest_group_concat_2.java | 15 +- .../mysql/select/MySqlSelectTest_jinyuan.java | 3 +- .../mysql/select/MySqlSelectTest_json.java | 3 +- .../sql/mysql/select/MySqlSelectTest_mtr.java | 1 - .../select/MySqlSelectTest_plus_ques.java | 1 - .../MySqlSelectTest_plus_sub_comment.java | 16 +- .../select/MySqlSelectTest_straight_join.java | 3 +- .../mysql/select/MySqlSelectTest_trim.java | 7 +- .../mysql/select/MySqlSelectTest_update.java | 11 +- .../select/MySqlSelectTest_with_20433301.java | 2 - .../sql/mysql/select/MysqlResolveTest.java | 2 - .../mysql/select/MysqlSelectTest_like.java | 2 - .../sql/mysql/show/MySqlShowFieldsTest.java | 1 - .../show/MySqlShowTestMaterializedView.java | 1 - .../bvt/sql/mysql/show/MySqlShowTest_0.java | 9 +- .../bvt/sql/mysql/show/MySqlShowTest_1.java | 1 - .../show/MySqlShowTest_10_broadcasts.java | 3 +- .../show/MySqlShowTest_11_datasources.java | 3 +- .../sql/mysql/show/MySqlShowTest_12_node.java | 3 +- .../sql/mysql/show/MySqlShowTest_13_help.java | 3 +- .../sql/mysql/show/MySqlShowTest_14_slow.java | 3 +- .../mysql/show/MySqlShowTest_15_outlines.java | 3 +- .../show/MySqlShowTest_15_queryTask.java | 17 +- .../mysql/show/MySqlShowTest_15_sequence.java | 1 - .../show/MySqlShowTest_16_createView.java | 1 - .../show/MySqlShowTest_17_recyclebin.java | 1 - .../bvt/sql/mysql/show/MySqlShowTest_18.java | 8 +- .../mysql/show/MySqlShowTest_19_stats.java | 1 - .../bvt/sql/mysql/show/MySqlShowTest_2.java | 1 - .../mysql/show/MySqlShowTest_20_outlines.java | 1 - .../mysql/show/MySqlShowTest_21_outlines.java | 1 - .../show/MySqlShowTest_22_rule_version.java | 1 - .../mysql/show/MySqlShowTest_23_catalogs.java | 1 - .../show/MySqlShowTest_24_functions.java | 1 - .../mysql/show/MySqlShowTest_25_schemas.java | 1 - .../mysql/show/MySqlShowTest_26_session.java | 1 - .../show/MySqlShowTest_27_plancache.java | 1 - .../mysql/show/MySqlShowTest_28_config.java | 1 - .../show/MySqlShowTest_29_plancache.java | 1 - .../bvt/sql/mysql/show/MySqlShowTest_3.java | 1 - .../mysql/show/MySqlShowTest_30_hints.java | 1 - .../mysql/show/MySqlShowTest_31_hints.java | 1 - .../mysql/show/MySqlShowTest_32_hints.java | 1 - .../show/MySqlShowTest_33_rule_status.java | 7 +- .../mysql/show/MySqlShowTest_34_stats.java | 1 - ...MySqlShowTest_35_PHYSICAL_PROCESSLIST.java | 1 - .../sql/mysql/show/MySqlShowTest_36_db.java | 2 - .../mysql/show/MySqlShowTest_37_hints.java | 5 +- .../mysql/show/MySqlShowTest_38_hints.java | 7 +- .../sql/mysql/show/MySqlShowTest_39_stc.java | 1 - .../bvt/sql/mysql/show/MySqlShowTest_4.java | 3 +- .../show/MySqlShowTest_40_partitions.java | 3 +- .../bvt/sql/mysql/show/MySqlShowTest_41.java | 1 - .../show/MySqlShowTest_41_partitions.java | 3 +- .../sql/mysql/show/MySqlShowTest_42_dla.java | 1 - .../bvt/sql/mysql/show/MySqlShowTest_5.java | 3 +- .../bvt/sql/mysql/show/MySqlShowTest_6.java | 3 +- .../mysql/show/MySqlShowTest_7_show_rule.java | 3 +- .../mysql/show/MySqlShowTest_8_topology.java | 3 +- .../show/MySqlShowTest_9_partitions.java | 3 +- .../mysql/show/MySqlShowTest_mappings.java | 2 - .../sql/mysql/show/MySqlShowTest_table.java | 1 - .../sql/mysql/show/MySqlShowTest_table2.java | 1 - .../sql/mysql/show/MySqlShowTest_table3.java | 1 - .../sql/mysql/show/MySqlShowTest_users.java | 1 - .../mysql/show/SHOW_COLUMNS_Syntax_Test.java | 3 +- .../show/SHOW_DATABASES_Syntax_Test.java | 1 - .../mysql/show/SHOW_STATUS_Syntax_Test.java | 5 +- .../mysql/show/SHOW_TABLES_Syntax_Test.java | 4 - .../mysql/show/SHOW_WARNINGS_Syntax_Test.java | 1 - .../sql/mysql/update/MySqlUpdateTest_0.java | 3 +- .../sql/mysql/update/MySqlUpdateTest_1.java | 7 +- .../sql/mysql/update/MySqlUpdateTest_10.java | 5 +- .../update/MySqlUpdateTest_11_using.java | 5 +- .../sql/mysql/update/MySqlUpdateTest_12.java | 5 +- .../MySqlUpdateTest_13_force_partition.java | 5 +- .../MySqlUpdateTest_14_force_partition.java | 5 +- .../sql/mysql/update/MySqlUpdateTest_15.java | 5 +- .../sql/mysql/update/MySqlUpdateTest_16.java | 5 +- .../sql/mysql/update/MySqlUpdateTest_17.java | 1 - .../sql/mysql/update/MySqlUpdateTest_2.java | 3 +- .../sql/mysql/update/MySqlUpdateTest_3.java | 13 +- .../sql/mysql/update/MySqlUpdateTest_4.java | 17 +- .../sql/mysql/update/MySqlUpdateTest_5.java | 17 +- .../sql/mysql/update/MySqlUpdateTest_6.java | 1 - .../sql/mysql/update/MySqlUpdateTest_7.java | 33 +- .../sql/mysql/update/MySqlUpdateTest_8.java | 13 +- .../sql/mysql/update/MySqlUpdateTest_9.java | 5 +- .../MySqlParameterizedOutputVisitorTest.java | 1 - .../sql/mysql/visitor/MySqlResourceTest.java | 2 - .../visitor/MySqlSchemaStatVisitorTest1.java | 5 +- .../visitor/MySqlSchemaStatVisitorTest2.java | 1 - .../visitor/MySqlSchemaStatVisitorTest3.java | 1 - .../visitor/MySqlSchemaStatVisitorTest4.java | 1 - .../visitor/MySqlSchemaStatVisitorTest5.java | 47 +- .../visitor/MySqlSchemaStatVisitorTest6.java | 39 +- .../visitor/MySqlSchemaStatVisitorTest7.java | 83 +- .../MySqlSchemaStatVisitorTest7_between.java | 43 +- .../visitor/MySqlSchemaStatVisitorTest8.java | 55 +- .../MySqlSchemaStatVisitorTest9_in.java | 33 +- .../MySqlSchemaStatVisitorTest_Alter.java | 1 - .../MySqlSchemaStatVisitorTest_Delete.java | 1 - .../MySqlSchemaStatVisitorTest_Subquery.java | 1 - .../MySqlSchemaStatVisitorTest_Subquery2.java | 1 - .../MySqlSchemaStatVisitorTest_Update.java | 1 - .../MySqlSchemaStatVisitorTest_pk_0.java | 127 ++- .../OceanbaseAlterTableAddPartitionTest.java | 9 +- .../OceanbaseAlterTableAddPartitionTest2.java | 9 +- ...eanbaseAlterTableAnalyzePartitionTest.java | 9 +- ...anbaseAlterTableAnalyzePartitionTest2.java | 9 +- ...anbaseAlterTableAnalyzePartitionTest3.java | 9 +- ...OceanbaseAlterTableCheckPartitionTest.java | 9 +- ...ceanbaseAlterTableCheckPartitionTest2.java | 9 +- ...anbaseAlterTableCoalescePartitionTest.java | 9 +- ...eanbaseAlterTableDiscardPartitionTest.java | 9 +- ...anbaseAlterTableDiscardPartitionTest2.java | 9 +- .../OceanbaseAlterTableDropPartitionTest.java | 3 +- ...ceanbaseAlterTableImportPartitionTest.java | 9 +- ...eanbaseAlterTableImportPartitionTest2.java | 9 +- ...anbaseAlterTableOptimizePartitionTest.java | 9 +- ...nbaseAlterTableOptimizePartitionTest2.java | 9 +- ...baseAlterTableReOrganizePartitionTest.java | 9 +- ...aseAlterTableReOrganizePartitionTest2.java | 9 +- ...eanbaseAlterTableRebuildPartitionTest.java | 9 +- ...anbaseAlterTableRebuildPartitionTest2.java | 11 +- ...nbaseAlterTableRemovePartitioningTest.java | 9 +- ...ceanbaseAlterTableRepairPartitionTest.java | 9 +- ...eanbaseAlterTableRepairPartitionTest2.java | 9 +- ...anbaseAlterTableTruncatePartitionTest.java | 9 +- ...nbaseAlterTableTruncatePartitionTest2.java | 9 +- ...baseAlterTableUpgradePartitioningTest.java | 9 +- ...anbaseCreateTableTest_partitionByHash.java | 23 +- ...nbaseCreateTableTest_partitionByHash2.java | 41 +- ...eanbaseCreateTableTest_partitionByKey.java | 21 +- ...eanbaseCreateTableTest_rangePartition.java | 1 - ...anbaseCreateTableTest_rangePartition2.java | 1 - ...anbaseCreateTableTest_rangePartition3.java | 1 - ...anbaseCreateTableTest_rangePartition4.java | 61 +- ...anbaseCreateTableTest_rangePartition5.java | 1 - ...OceanbaseCreateTableTest_subPartition.java | 41 +- ...ceanbaseCreateTableTest_subPartition2.java | 5 +- ...ceanbaseCreateTableTest_subPartition3.java | 3 +- ...ceanbaseCreateTableTest_subPartition4.java | 3 +- .../oceanbase/OceanbaseHintTest_Index.java | 3 +- .../oceanbase/OceanbaseHintTest_Index2.java | 3 +- .../sql/oceanbase/OceanbaseHintTest_Topk.java | 3 +- .../oceanbase/OceanbaseHintTest_multiget.java | 3 +- .../oceanbase/OceanbaseHintTest_parallel.java | 3 +- .../OceanbaseSelectPartitionTest.java | 5 +- .../bvt/sql/odps/OdpsAddStatisticTest.java | 10 +- .../odps/OdpsAlterTableAddColumnsTest.java | 13 +- .../odps/OdpsAlterTableAddPartitionTest.java | 1 - .../odps/OdpsAlterTableChangeColumnTest.java | 13 +- .../odps/OdpsAlterTableChangeColumnTest2.java | 13 +- .../odps/OdpsAlterTableChangeColumnTest3.java | 1 - .../odps/OdpsAlterTableChangeColumnTest4.java | 1 - .../odps/OdpsAlterTableDisableLifecycle.java | 8 +- .../odps/OdpsAlterTableDropPartitionTest.java | 5 +- .../OdpsAlterTableDropPartitionTest2.java | 1 - .../odps/OdpsAlterTableEnableLifecycle.java | 8 +- .../OdpsAlterTableMergeSmallFilesTest.java | 1 - .../OdpsAlterTableRenamePartitionTest.java | 1 - .../odps/OdpsAlterTableSetCommentTest.java | 3 +- .../sql/odps/OdpsAlterTableSetLifecycle.java | 1 - .../bvt/sql/odps/OdpsAlterTableTouchTest.java | 3 +- .../druid/bvt/sql/odps/OdpsAlterViewTest.java | 1 - .../bvt/sql/odps/OdpsAnalyzeTableTest.java | 2 +- .../druid/bvt/sql/odps/OdpsCaseWhenTest.java | 1 - .../bvt/sql/odps/OdpsCreateTableTest.java | 17 +- .../bvt/sql/odps/OdpsCreateTableTest2.java | 1 - .../bvt/sql/odps/OdpsCreateTableTest3.java | 1 - .../bvt/sql/odps/OdpsCreateTableTest4.java | 14 +- .../sql/odps/OdpsCreateTableTest6_array.java | 4 - .../sql/odps/OdpsCreateTableTest7_struct.java | 4 - .../bvt/sql/odps/OdpsCreateViewTest.java | 36 +- .../druid/bvt/sql/odps/OdpsDescTest.java | 1 - .../bvt/sql/odps/OdpsDoubleQuoteTest.java | 1 - .../druid/bvt/sql/odps/OdpsDropViewTest.java | 2 - .../bvt/sql/odps/OdpsFormatCommentTest.java | 2 +- .../bvt/sql/odps/OdpsFormatCommentTest10.java | 1 - .../bvt/sql/odps/OdpsFormatCommentTest11.java | 1 - .../bvt/sql/odps/OdpsFormatCommentTest12.java | 1 - .../bvt/sql/odps/OdpsFormatCommentTest13.java | 1 - .../bvt/sql/odps/OdpsFormatCommentTest14.java | 1 - .../bvt/sql/odps/OdpsFormatCommentTest15.java | 1 - .../bvt/sql/odps/OdpsFormatCommentTest16.java | 1 - .../bvt/sql/odps/OdpsFormatCommentTest17.java | 1 - .../bvt/sql/odps/OdpsFormatCommentTest18.java | 1 - .../bvt/sql/odps/OdpsFormatCommentTest19.java | 1 - .../bvt/sql/odps/OdpsFormatCommentTest20.java | 1 - .../bvt/sql/odps/OdpsFormatCommentTest21.java | 1 - .../bvt/sql/odps/OdpsFormatCommentTest22.java | 2 +- .../bvt/sql/odps/OdpsFormatCommentTest23.java | 2 +- .../bvt/sql/odps/OdpsFormatCommentTest24.java | 2 +- .../bvt/sql/odps/OdpsFormatCommentTest25.java | 2 +- .../bvt/sql/odps/OdpsFormatCommentTest26.java | 2 +- .../bvt/sql/odps/OdpsFormatCommentTest27.java | 2 +- .../bvt/sql/odps/OdpsFormatCommentTest28.java | 2 +- .../bvt/sql/odps/OdpsFormatCommentTest29.java | 2 +- .../bvt/sql/odps/OdpsFormatCommentTest30.java | 2 +- .../bvt/sql/odps/OdpsFormatCommentTest4.java | 3 +- .../bvt/sql/odps/OdpsFormatCommentTest5.java | 10 +- .../bvt/sql/odps/OdpsFormatCommentTest6.java | 4 +- .../bvt/sql/odps/OdpsFormatCommentTest7.java | 4 +- .../bvt/sql/odps/OdpsFormatCommentTest8.java | 6 +- .../bvt/sql/odps/OdpsFormatCommentTest9.java | 1 - .../druid/bvt/sql/odps/OdpsFormatInTest.java | 2 +- .../druid/bvt/sql/odps/OdpsFormatTest.java | 2 +- .../druid/bvt/sql/odps/OdpsGrantTest.java | 7 +- .../druid/bvt/sql/odps/OdpsIfTest.java | 1 - .../druid/bvt/sql/odps/OdpsInsertTest.java | 3 - .../druid/bvt/sql/odps/OdpsLexerTest.java | 2 - .../bvt/sql/odps/OdpsListResourcesTest.java | 4 - .../druid/bvt/sql/odps/OdpsListTest.java | 1 - .../druid/bvt/sql/odps/OdpsLoadTest.java | 4 - .../bvt/sql/odps/OdpsMultiInsertTest.java | 3 - .../bvt/sql/odps/OdpsMultiInsertTest2.java | 2 +- .../druid/bvt/sql/odps/OdpsReadTest.java | 10 +- .../bvt/sql/odps/OdpsRemoveStatisticTest.java | 10 +- .../druid/bvt/sql/odps/OdpsResourceTest.java | 7 +- .../druid/bvt/sql/odps/OdpsSelectTest.java | 1 - .../druid/bvt/sql/odps/OdpsSelectTest10.java | 13 +- .../druid/bvt/sql/odps/OdpsSelectTest11.java | 13 +- .../druid/bvt/sql/odps/OdpsSelectTest12.java | 15 +- .../druid/bvt/sql/odps/OdpsSelectTest13.java | 15 +- .../druid/bvt/sql/odps/OdpsSelectTest14.java | 13 +- .../druid/bvt/sql/odps/OdpsSelectTest15.java | 13 +- .../druid/bvt/sql/odps/OdpsSelectTest16.java | 13 +- .../druid/bvt/sql/odps/OdpsSelectTest17.java | 13 +- .../druid/bvt/sql/odps/OdpsSelectTest18.java | 13 +- .../druid/bvt/sql/odps/OdpsSelectTest19.java | 17 +- .../druid/bvt/sql/odps/OdpsSelectTest2.java | 2 - .../druid/bvt/sql/odps/OdpsSelectTest20.java | 12 +- .../druid/bvt/sql/odps/OdpsSelectTest21.java | 2 - .../druid/bvt/sql/odps/OdpsSelectTest22.java | 18 +- .../druid/bvt/sql/odps/OdpsSelectTest23.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest24.java | 2 - .../druid/bvt/sql/odps/OdpsSelectTest25.java | 2 - .../druid/bvt/sql/odps/OdpsSelectTest26.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest27.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest28.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest29.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest3.java | 2 - .../druid/bvt/sql/odps/OdpsSelectTest30.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest31.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest32.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest33.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest34.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest35.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest36.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest4.java | 1 - .../druid/bvt/sql/odps/OdpsSelectTest5.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest6.java | 11 +- .../druid/bvt/sql/odps/OdpsSelectTest7.java | 13 +- .../druid/bvt/sql/odps/OdpsSelectTest8.java | 13 +- .../druid/bvt/sql/odps/OdpsSelectTest9.java | 13 +- .../bvt/sql/odps/OdpsSelectTest_mapjoin.java | 2 - .../sql/odps/OdpsSelectTest_over_rows.java | 13 +- .../sql/odps/OdpsSelectTest_over_rows_1.java | 13 +- .../sql/odps/OdpsSelectTest_over_rows_2.java | 13 +- .../sql/odps/OdpsSelectTest_over_rows_3.java | 13 +- .../sql/odps/OdpsSelectTest_over_rows_4.java | 13 +- .../sql/odps/OdpsSelectTest_over_rows_5.java | 13 +- .../odps/OdpsSelect_distribute_by_Test.java | 3 - .../druid/bvt/sql/odps/OdpsSetLabelTest.java | 3 +- .../druid/bvt/sql/odps/OdpsSetLabelTest2.java | 1 - .../bvt/sql/odps/OdpsShowGrantsTest.java | 1 - .../bvt/sql/odps/OdpsShowPartitionsTest.java | 1 - .../bvt/sql/odps/OdpsShowStatisticTest.java | 1 - .../bvt/sql/odps/OdpsShowTablesTest0.java | 9 +- .../druid/bvt/sql/odps/OdpsUDFTest.java | 1 - .../druid/bvt/sql/odps/OdpsUDTFTest.java | 1 - .../bvt/sql/odps/udf/ExportColumnsTest0.java | 3 +- .../odps/udf/ExportSelectListColumnsTest.java | 9 +- .../udf/ExportSelectListColumnsTest2.java | 4 +- .../druid/bvt/sql/oracle/CallTest.java | 1 - .../druid/bvt/sql/oracle/CursorTest.java | 5 +- .../druid/bvt/sql/oracle/LargeOrTest.java | 1 - .../druid/bvt/sql/oracle/MergeTest.java | 1 - .../bvt/sql/oracle/OracleAnalyticTest.java | 1 - .../druid/bvt/sql/oracle/OracleAnyTest.java | 13 +- .../druid/bvt/sql/oracle/OracleCallTest.java | 1 - .../druid/bvt/sql/oracle/OracleCallTest2.java | 1 - .../bvt/sql/oracle/OracleDeleteTest.java | 9 +- .../bvt/sql/oracle/OracleDeleteTest_1.java | 3 +- .../bvt/sql/oracle/OracleDeleteTest_2.java | 1 - .../bvt/sql/oracle/OracleDeleteTest_3.java | 1 - .../bvt/sql/oracle/OracleDropDbLinkTest.java | 9 +- .../bvt/sql/oracle/OracleDropIndexTest.java | 5 +- .../sql/oracle/OracleDropSequenceTest.java | 3 +- .../bvt/sql/oracle/OracleDropTableTest.java | 5 +- .../bvt/sql/oracle/OracleDropTableTest2.java | 5 +- .../bvt/sql/oracle/OracleDropTriggerTest.java | 5 +- .../bvt/sql/oracle/OracleDropUserTest.java | 5 +- .../bvt/sql/oracle/OracleDropViewTest.java | 5 +- .../bvt/sql/oracle/OracleEXTRACTTest.java | 1 - .../bvt/sql/oracle/OracleEXTRACTTest2.java | 1 - .../bvt/sql/oracle/OracleExplainTest.java | 3 +- .../bvt/sql/oracle/OracleExplainTest2.java | 17 +- .../bvt/sql/oracle/OracleExplainTest3.java | 3 +- .../sql/oracle/OracleFlashbackQueryTest.java | 3 +- .../sql/oracle/OracleFlashbackQueryTest2.java | 11 +- .../sql/oracle/OracleFlashbackQueryTest3.java | 7 +- .../sql/oracle/OracleFlashbackQueryTest4.java | 1 - .../bvt/sql/oracle/OracleFormatTest.java | 10 +- .../bvt/sql/oracle/OracleFormatTest2.java | 1 - .../druid/bvt/sql/oracle/OracleGrantTest.java | 1 - .../bvt/sql/oracle/OracleGrantTest_1.java | 3 +- .../bvt/sql/oracle/OracleGrantTest_2.java | 29 +- .../bvt/sql/oracle/OracleGrantTest_3.java | 3 +- .../bvt/sql/oracle/OracleGrantTest_4.java | 13 +- .../bvt/sql/oracle/OracleGrantTest_5.java | 3 +- .../bvt/sql/oracle/OracleGroupingSetTest.java | 17 +- .../sql/oracle/OracleGroupingSetsTest.java | 3 +- .../druid/bvt/sql/oracle/OracleHintTest.java | 53 +- .../sql/oracle/OracleIbatisSelectTest.java | 1 - .../sql/oracle/OracleIbatisSelectTest1.java | 1 - .../bvt/sql/oracle/OracleIntervalTest.java | 3 +- .../bvt/sql/oracle/OracleIsASetTest.java | 3 +- .../bvt/sql/oracle/OracleIsEmptyTest.java | 3 +- .../druid/bvt/sql/oracle/OracleLexerTest.java | 3 +- .../bvt/sql/oracle/OracleListAggTest.java | 15 +- .../bvt/sql/oracle/OracleListAggTest1.java | 2 +- .../bvt/sql/oracle/OracleLiteralTest.java | 1 - .../bvt/sql/oracle/OracleLockTableTest1.java | 1 - .../bvt/sql/oracle/OracleLockTableTest2.java | 1 - .../bvt/sql/oracle/OracleLockTableTest3.java | 1 - .../bvt/sql/oracle/OracleLockTableTest4.java | 1 - .../druid/bvt/sql/oracle/OracleMergeTest.java | 17 +- .../bvt/sql/oracle/OracleMergeTest10.java | 1 - .../bvt/sql/oracle/OracleMergeTest11.java | 5 +- .../bvt/sql/oracle/OracleMergeTest2.java | 57 +- .../bvt/sql/oracle/OracleMergeTest3.java | 1 - .../bvt/sql/oracle/OracleMergeTest4.java | 1 - .../bvt/sql/oracle/OracleMergeTest5.java | 17 +- .../bvt/sql/oracle/OracleMergeTest6.java | 27 +- .../bvt/sql/oracle/OracleMergeTest7.java | 31 +- .../bvt/sql/oracle/OracleMergeTest8.java | 3 +- .../bvt/sql/oracle/OracleMergeTest9.java | 3 +- .../bvt/sql/oracle/OracleMultiInsertTest.java | 35 +- .../sql/oracle/OracleMultiInsertTest2.java | 17 +- .../sql/oracle/OracleNumberLiteralTest.java | 1 - .../druid/bvt/sql/oracle/OracleOuterTest.java | 5 +- .../bvt/sql/oracle/OraclePivotClauseTest.java | 1 - .../druid/bvt/sql/oracle/OraclePriorTest.java | 11 +- .../oracle/OracleSQLParserResourceTest.java | 1 - .../bvt/sql/oracle/OracleSQLParserTest.java | 1 - .../sql/oracle/OracleSampleClauseTest.java | 1 - .../oracle/OracleSchemaStatVisitorTest.java | 9 +- .../sql/oracle/OracleSetTransactionTest.java | 1 - .../sql/oracle/OracleSetTransactionTest2.java | 1 - .../sql/oracle/OracleSetTransactionTest3.java | 1 - .../oracle/OracleSubqueryFactoringTest.java | 13 +- .../oracle/OracleSubqueryFactoringTest2.java | 23 +- .../druid/bvt/sql/oracle/OracleTest2.java | 1 - .../sql/oracle/OracleTruncateTableTest.java | 3 +- .../bvt/sql/oracle/OracleUpdateTest1.java | 15 +- .../bvt/sql/oracle/OracleUpdateTest2.java | 25 +- .../bvt/sql/oracle/OracleUpdateTest3.java | 15 +- .../bvt/sql/oracle/OracleUpdateTest4.java | 11 +- .../OracleUpdateTest5_encoding_error.java | 5 +- .../alter/OracleAlterFunctionTest0.java | 3 +- .../oracle/alter/OracleAlterIndexTest1.java | 3 +- .../oracle/alter/OracleAlterIndexTest2.java | 3 +- .../oracle/alter/OracleAlterIndexTest3.java | 3 +- .../oracle/alter/OracleAlterIndexTest4.java | 3 +- .../alter/OracleAlterProcedureTest.java | 3 +- .../alter/OracleAlterProcedureTest2.java | 3 +- .../oracle/alter/OracleAlterSequence_0.java | 1 - .../oracle/alter/OracleAlterSessionTest.java | 1 - .../oracle/alter/OracleAlterSynonymTest.java | 3 +- .../oracle/alter/OracleAlterTableTest.java | 5 +- .../oracle/alter/OracleAlterTableTest10.java | 7 +- .../oracle/alter/OracleAlterTableTest11.java | 3 +- .../oracle/alter/OracleAlterTableTest12.java | 3 +- .../oracle/alter/OracleAlterTableTest13.java | 3 +- .../oracle/alter/OracleAlterTableTest14.java | 3 +- .../oracle/alter/OracleAlterTableTest15.java | 3 +- .../oracle/alter/OracleAlterTableTest16.java | 3 +- .../oracle/alter/OracleAlterTableTest17.java | 3 +- .../oracle/alter/OracleAlterTableTest18.java | 3 +- .../oracle/alter/OracleAlterTableTest19.java | 9 +- .../oracle/alter/OracleAlterTableTest2.java | 5 +- .../oracle/alter/OracleAlterTableTest20.java | 9 +- .../oracle/alter/OracleAlterTableTest21.java | 7 +- .../oracle/alter/OracleAlterTableTest22.java | 11 +- .../oracle/alter/OracleAlterTableTest24.java | 5 +- .../alter/OracleAlterTableTest25_drop_pk.java | 1 - .../oracle/alter/OracleAlterTableTest3.java | 11 +- .../oracle/alter/OracleAlterTableTest4.java | 5 +- .../oracle/alter/OracleAlterTableTest5.java | 5 +- .../oracle/alter/OracleAlterTableTest6.java | 5 +- .../oracle/alter/OracleAlterTableTest7.java | 7 +- .../oracle/alter/OracleAlterTableTest8.java | 5 +- .../oracle/alter/OracleAlterTableTest9.java | 3 +- .../alter/OracleAlterTableTestRename.java | 3 +- .../OracleAlterTableTest_drop_constraint.java | 3 +- .../alter/OracleAlterTablespaceTest.java | 3 +- .../oracle/alter/OracleAlterTriggerTest.java | 3 +- .../oracle/alter/OracleAlterTriggerTest2.java | 3 +- .../oracle/alter/OracleAlterTypeTest0.java | 3 +- .../sql/oracle/alter/OracleAlterViewTest.java | 3 +- .../bvt/sql/oracle/block/OracleBlockTest.java | 1 - .../sql/oracle/block/OracleBlockTest1.java | 1 - .../sql/oracle/block/OracleBlockTest10.java | 19 +- .../sql/oracle/block/OracleBlockTest11.java | 63 +- .../sql/oracle/block/OracleBlockTest12.java | 47 +- .../sql/oracle/block/OracleBlockTest13.java | 55 +- .../sql/oracle/block/OracleBlockTest14.java | 57 +- .../sql/oracle/block/OracleBlockTest15.java | 27 +- .../sql/oracle/block/OracleBlockTest16.java | 1 - .../sql/oracle/block/OracleBlockTest17.java | 1 - .../sql/oracle/block/OracleBlockTest18.java | 1 - .../sql/oracle/block/OracleBlockTest19.java | 1 - .../sql/oracle/block/OracleBlockTest2.java | 33 +- .../sql/oracle/block/OracleBlockTest20.java | 3 +- .../sql/oracle/block/OracleBlockTest21.java | 3 +- .../block/OracleBlockTest22_comment.java | 5 +- .../sql/oracle/block/OracleBlockTest3.java | 21 +- .../sql/oracle/block/OracleBlockTest4.java | 19 +- .../sql/oracle/block/OracleBlockTest5.java | 45 +- .../sql/oracle/block/OracleBlockTest6.java | 53 +- .../sql/oracle/block/OracleBlockTest7.java | 55 +- .../sql/oracle/block/OracleBlockTest8.java | 49 +- .../sql/oracle/block/OracleBlockTest9.java | 37 +- .../oracle/create/OracleCreateDbLinkTest.java | 19 +- .../create/OracleCreateDbLinkTest1.java | 1 - .../create/OracleCreateFunctionTest_0.java | 23 +- .../create/OracleCreateFunctionTest_1.java | 9 +- .../create/OracleCreateFunctionTest_2.java | 7 +- .../create/OracleCreateFunctionTest_3.java | 91 +- .../create/OracleCreateFunctionTest_4.java | 73 +- .../create/OracleCreateFunctionTest_5.java | 51 +- .../oracle/create/OracleCreateIndexTest1.java | 3 +- .../OracleCreateIndexTest10_function.java | 3 +- .../create/OracleCreateIndexTest11.java | 59 +- .../create/OracleCreateIndexTest12.java | 17 +- .../create/OracleCreateIndexTest13.java | 5 +- .../create/OracleCreateIndexTest14.java | 5 +- .../create/OracleCreateIndexTest15.java | 3 +- .../create/OracleCreateIndexTest16_local.java | 3 +- .../OracleCreateIndexTest17_global.java | 3 +- .../OracleCreateIndexTest18_global.java | 11 +- .../OracleCreateIndexTest19_global.java | 7 +- .../OracleCreateIndexTest19_local_store.java | 5 +- .../oracle/create/OracleCreateIndexTest2.java | 7 +- .../create/OracleCreateIndexTest20.java | 3 +- .../create/OracleCreateIndexTest21.java | 1 - .../oracle/create/OracleCreateIndexTest3.java | 7 +- .../oracle/create/OracleCreateIndexTest4.java | 9 +- .../oracle/create/OracleCreateIndexTest5.java | 5 +- .../oracle/create/OracleCreateIndexTest6.java | 11 +- .../oracle/create/OracleCreateIndexTest7.java | 9 +- .../OracleCreateIndexTest8_cluster.java | 3 +- .../oracle/create/OracleCreateIndexTest9.java | 5 +- .../OracleCreateMaterializedViewTest0.java | 29 +- .../OracleCreateMaterializedViewTest1.java | 19 +- .../OracleCreateMaterializedViewTest2.java | 25 +- .../OracleCreateMaterializedViewTest3.java | 61 +- .../OracleCreateMaterializedViewTest4.java | 20 +- .../create/OracleCreatePackageTest0.java | 147 ++- .../create/OracleCreatePackageTest1.java | 3 +- .../create/OracleCreatePackageTest2.java | 3 +- .../create/OracleCreatePackageTest3.java | 3 +- .../create/OracleCreatePackageTest4.java | 3 +- .../create/OracleCreatePackageTest5.java | 3 +- .../create/OracleCreateProcedureTest1.java | 39 +- .../create/OracleCreateProcedureTest2.java | 35 +- .../create/OracleCreateProcedureTest3.java | 5 +- .../create/OracleCreateProcedureTest4.java | 1 - .../create/OracleCreateProcedureTest5.java | 1 - .../create/OracleCreateProcedureTest6.java | 1 - .../create/OracleCreateProcedureTest7.java | 57 +- .../create/OracleCreateSequenceTest.java | 11 +- .../create/OracleCreateSequenceTest_1.java | 3 +- .../OracleCreateSequenceTest_1_bugfix.java | 3 +- .../create/OracleCreateSequenceTest_2.java | 7 +- ...OracleCreateSequenceTest_3_cachevalue.java | 7 +- .../OracleCreateSequenceTest_4_order.java | 7 +- .../OracleCreateSequenceTest_5_noorder.java | 7 +- .../OracleCreateSequenceTest_6_goto.java | 7 +- .../create/OracleCreateSynonymTest.java | 5 +- .../create/OracleCreateSynonymTest1.java | 3 +- .../create/OracleCreateSynonymTest2.java | 5 +- .../create/OracleCreateSynonymTest_0.java | 5 +- .../create/OracleCreateSynonymTest_1.java | 5 +- .../create/OracleCreateSynonymTest_2.java | 3 +- .../create/OracleCreateTriggerTest.java | 15 +- .../create/OracleCreateTriggerTest2.java | 19 +- .../create/OracleCreateTriggerTest3.java | 13 +- .../create/OracleCreateTriggerTest4.java | 27 +- .../create/OracleCreateTriggerTest5.java | 3 +- .../create/OracleCreateTriggerTest6.java | 3 +- .../oracle/create/OracleCreateTypeTest0.java | 1 - .../oracle/create/OracleCreateTypeTest1.java | 1 - .../oracle/create/OracleCreateTypeTest10.java | 3 +- .../oracle/create/OracleCreateTypeTest11.java | 3 +- .../oracle/create/OracleCreateTypeTest12.java | 3 +- .../oracle/create/OracleCreateTypeTest2.java | 1 - .../oracle/create/OracleCreateTypeTest3.java | 1 - .../oracle/create/OracleCreateTypeTest4.java | 1 - .../oracle/create/OracleCreateTypeTest5.java | 3 +- .../oracle/create/OracleCreateTypeTest6.java | 3 +- .../oracle/create/OracleCreateTypeTest7.java | 3 +- .../oracle/create/OracleCreateTypeTest8.java | 3 +- .../oracle/create/OracleCreateTypeTest9.java | 3 +- .../oracle/create/OracleCreateUserTest1.java | 1 - .../oracle/create/OracleCreateViewTest0.java | 7 +- .../oracle/create/OracleCreateViewTest1.java | 117 ++- ...OracleCreateViewTest10_with_read_only.java | 11 +- ...OracleCreateViewTest11_error_encoding.java | 135 ++- .../oracle/create/OracleCreateViewTest12.java | 239 +++-- .../oracle/create/OracleCreateViewTest13.java | 22 +- .../oracle/create/OracleCreateViewTest14.java | 310 +++--- .../oracle/create/OracleCreateViewTest15.java | 24 +- .../oracle/create/OracleCreateViewTest16.java | 102 +- .../create/OracleCreateViewTest17_dblink.java | 54 +- ...cleCreateViewTest18_with_check_option.java | 3 +- .../oracle/create/OracleCreateViewTest2.java | 55 +- .../oracle/create/OracleCreateViewTest3.java | 57 +- .../oracle/create/OracleCreateViewTest4.java | 41 +- .../oracle/create/OracleCreateViewTest5.java | 31 +- .../oracle/create/OracleCreateViewTest6.java | 83 +- .../oracle/create/OracleCreateViewTest7.java | 11 +- .../oracle/create/OracleCreateViewTest8.java | 11 +- .../OracleCreateViewTest9_check_option.java | 17 +- .../create/OracleDropSynonymTest_0.java | 3 +- .../oracle/create/OracleDropTypeTest_0.java | 3 +- .../create/OraclePipeRowStatementTest.java | 5 +- .../createTable/OracleCreateTableTest1.java | 3 +- .../createTable/OracleCreateTableTest10.java | 7 +- .../createTable/OracleCreateTableTest11.java | 69 +- .../createTable/OracleCreateTableTest12.java | 33 +- .../createTable/OracleCreateTableTest13.java | 19 +- .../createTable/OracleCreateTableTest14.java | 33 +- .../createTable/OracleCreateTableTest15.java | 31 +- .../createTable/OracleCreateTableTest16.java | 31 +- .../createTable/OracleCreateTableTest17.java | 33 +- .../createTable/OracleCreateTableTest18.java | 29 +- .../createTable/OracleCreateTableTest19.java | 39 +- .../createTable/OracleCreateTableTest2.java | 3 +- .../createTable/OracleCreateTableTest20.java | 37 +- .../createTable/OracleCreateTableTest21.java | 13 +- .../createTable/OracleCreateTableTest22.java | 25 +- .../createTable/OracleCreateTableTest23.java | 37 +- .../createTable/OracleCreateTableTest24.java | 35 +- .../createTable/OracleCreateTableTest25.java | 35 +- .../createTable/OracleCreateTableTest26.java | 43 +- .../createTable/OracleCreateTableTest27.java | 27 +- .../createTable/OracleCreateTableTest28.java | 39 +- .../createTable/OracleCreateTableTest29.java | 39 +- .../createTable/OracleCreateTableTest3.java | 3 +- .../createTable/OracleCreateTableTest30.java | 51 +- .../createTable/OracleCreateTableTest31.java | 19 +- .../createTable/OracleCreateTableTest32.java | 11 +- .../createTable/OracleCreateTableTest33.java | 15 +- .../createTable/OracleCreateTableTest34.java | 11 +- .../createTable/OracleCreateTableTest35.java | 13 +- .../createTable/OracleCreateTableTest36.java | 127 ++- .../createTable/OracleCreateTableTest37.java | 75 +- .../createTable/OracleCreateTableTest38.java | 29 +- .../createTable/OracleCreateTableTest39.java | 19 +- .../createTable/OracleCreateTableTest4.java | 3 +- .../createTable/OracleCreateTableTest40.java | 37 +- .../createTable/OracleCreateTableTest41.java | 65 +- .../createTable/OracleCreateTableTest42.java | 35 +- .../createTable/OracleCreateTableTest43.java | 31 +- .../createTable/OracleCreateTableTest44.java | 57 +- .../createTable/OracleCreateTableTest45.java | 33 +- .../createTable/OracleCreateTableTest46.java | 41 +- .../createTable/OracleCreateTableTest47.java | 59 +- .../createTable/OracleCreateTableTest48.java | 47 +- .../createTable/OracleCreateTableTest49.java | 173 ++-- .../createTable/OracleCreateTableTest5.java | 9 +- .../createTable/OracleCreateTableTest50.java | 269 +++-- .../createTable/OracleCreateTableTest51.java | 19 +- .../createTable/OracleCreateTableTest52.java | 45 +- .../createTable/OracleCreateTableTest53.java | 49 +- .../createTable/OracleCreateTableTest54.java | 39 +- .../createTable/OracleCreateTableTest55.java | 27 +- .../createTable/OracleCreateTableTest56.java | 43 +- .../createTable/OracleCreateTableTest57.java | 137 ++- .../createTable/OracleCreateTableTest58.java | 69 +- .../createTable/OracleCreateTableTest59.java | 35 +- .../createTable/OracleCreateTableTest6.java | 7 +- .../createTable/OracleCreateTableTest60.java | 25 +- .../createTable/OracleCreateTableTest61.java | 71 +- .../createTable/OracleCreateTableTest62.java | 61 +- .../createTable/OracleCreateTableTest63.java | 21 +- .../createTable/OracleCreateTableTest64.java | 67 +- .../createTable/OracleCreateTableTest65.java | 67 +- .../createTable/OracleCreateTableTest66.java | 229 +++-- .../createTable/OracleCreateTableTest67.java | 5 +- .../createTable/OracleCreateTableTest68.java | 25 +- .../createTable/OracleCreateTableTest69.java | 25 +- .../createTable/OracleCreateTableTest7.java | 7 +- .../createTable/OracleCreateTableTest70.java | 15 +- .../createTable/OracleCreateTableTest71.java | 25 +- .../createTable/OracleCreateTableTest72.java | 31 +- .../createTable/OracleCreateTableTest74.java | 61 +- .../createTable/OracleCreateTableTest75.java | 49 +- .../createTable/OracleCreateTableTest76.java | 45 +- .../createTable/OracleCreateTableTest77.java | 79 +- .../createTable/OracleCreateTableTest78.java | 89 +- .../createTable/OracleCreateTableTest79.java | 3 +- .../createTable/OracleCreateTableTest8.java | 23 +- .../createTable/OracleCreateTableTest80.java | 3 +- .../createTable/OracleCreateTableTest81.java | 3 +- .../createTable/OracleCreateTableTest82.java | 3 +- .../createTable/OracleCreateTableTest83.java | 3 +- .../createTable/OracleCreateTableTest84.java | 3 +- .../createTable/OracleCreateTableTest85.java | 1 - .../createTable/OracleCreateTableTest86.java | 20 +- .../createTable/OracleCreateTableTest87.java | 1 - .../createTable/OracleCreateTableTest88.java | 1 - .../createTable/OracleCreateTableTest89.java | 1 - .../createTable/OracleCreateTableTest9.java | 19 +- .../createTable/OracleCreateTableTest90.java | 1 - .../createTable/OracleCreateTableTest91.java | 1 - .../createTable/OracleCreateTableTest92.java | 1 - .../createTable/OracleCreateTableTest93.java | 1 - .../createTable/OracleCreateTableTest94.java | 1 - .../createTable/OracleCreateTableTest95.java | 1 - .../createTable/OracleCreateTableTest96.java | 1 - .../createTable/OracleCreateTableTest97.java | 1 - .../OracleCreateTableTest_error_0.java | 1 - .../sql/oracle/insert/OracleInsertTest.java | 5 +- .../sql/oracle/insert/OracleInsertTest1.java | 11 +- .../sql/oracle/insert/OracleInsertTest10.java | 5 +- .../sql/oracle/insert/OracleInsertTest11.java | 7 +- .../sql/oracle/insert/OracleInsertTest12.java | 19 +- .../sql/oracle/insert/OracleInsertTest13.java | 15 +- .../sql/oracle/insert/OracleInsertTest14.java | 17 +- .../sql/oracle/insert/OracleInsertTest15.java | 15 +- .../sql/oracle/insert/OracleInsertTest16.java | 7 +- .../sql/oracle/insert/OracleInsertTest17.java | 9 +- .../sql/oracle/insert/OracleInsertTest18.java | 9 +- .../sql/oracle/insert/OracleInsertTest19.java | 21 +- .../sql/oracle/insert/OracleInsertTest2.java | 11 +- .../insert/OracleInsertTest20_first.java | 5 +- .../OracleInsertTest21_encoding_error.java | 5 +- .../sql/oracle/insert/OracleInsertTest22.java | 5 +- .../sql/oracle/insert/OracleInsertTest3.java | 7 +- .../sql/oracle/insert/OracleInsertTest4.java | 81 +- .../sql/oracle/insert/OracleInsertTest5.java | 1 - .../sql/oracle/insert/OracleInsertTest6.java | 1 - .../sql/oracle/insert/OracleInsertTest7.java | 3 +- .../sql/oracle/insert/OracleInsertTest8.java | 15 +- .../sql/oracle/insert/OracleInsertTest9.java | 15 +- .../druid/bvt/sql/oracle/pl/Oracle_pl_0.java | 77 +- .../druid/bvt/sql/oracle/pl/Oracle_pl_1.java | 135 ++- .../druid/bvt/sql/oracle/pl/Oracle_pl_2.java | 39 +- .../druid/bvt/sql/oracle/pl/Oracle_pl_3.java | 101 +- .../druid/bvt/sql/oracle/pl/Oracle_pl_4.java | 45 +- .../druid/bvt/sql/oracle/pl/Oracle_pl_5.java | 117 ++- .../bvt/sql/oracle/pl/Oracle_pl_case_0.java | 99 +- .../bvt/sql/oracle/pl/Oracle_pl_case_1.java | 107 +- .../bvt/sql/oracle/pl/Oracle_pl_case_2.java | 71 +- .../sql/oracle/pl/Oracle_pl_exception_0.java | 201 ++-- .../sql/oracle/pl/Oracle_pl_exception_1.java | 131 ++- .../sql/oracle/pl/Oracle_pl_exception_2.java | 93 +- .../sql/oracle/pl/Oracle_pl_exception_3.java | 165 ++- .../sql/oracle/pl/Oracle_pl_exception_4.java | 125 ++- .../sql/oracle/pl/Oracle_pl_exception_5.java | 91 +- .../sql/oracle/pl/Oracle_pl_exception_6.java | 65 +- .../sql/oracle/pl/Oracle_pl_exception_7.java | 81 +- .../sql/oracle/pl/Oracle_pl_exception_8.java | 259 +++-- .../bvt/sql/oracle/pl/Oracle_pl_exit_0.java | 93 +- .../bvt/sql/oracle/pl/Oracle_pl_exit_1.java | 81 +- .../sql/oracle/pl/Oracle_pl_external_0.java | 49 +- .../bvt/sql/oracle/pl/Oracle_pl_for_0.java | 89 +- .../bvt/sql/oracle/pl/Oracle_pl_for_1.java | 165 ++- .../bvt/sql/oracle/pl/Oracle_pl_for_2.java | 108 +- .../bvt/sql/oracle/pl/Oracle_pl_for_3.java | 103 +- .../bvt/sql/oracle/pl/Oracle_pl_for_4.java | 131 ++- .../bvt/sql/oracle/pl/Oracle_pl_forall_0.java | 95 +- .../bvt/sql/oracle/pl/Oracle_pl_if_0.java | 39 +- .../bvt/sql/oracle/pl/Oracle_pl_if_1.java | 49 +- .../bvt/sql/oracle/pl/Oracle_pl_if_2.java | 51 +- .../bvt/sql/oracle/pl/Oracle_pl_if_3.java | 65 +- .../bvt/sql/oracle/pl/Oracle_pl_loop_0.java | 95 +- .../bvt/sql/oracle/pl/Oracle_pl_loop_1.java | 83 +- .../sql/oracle/pl/Oracle_pl_open_for_0.java | 243 +++-- .../oracle/pl/Oracle_pl_param_inout_0.java | 65 +- .../bvt/sql/oracle/pl/oracle_pl_open_1.java | 25 +- .../select/OracleSelectGroupingTest.java | 1 - .../oracle/select/OracleSelectParserTest.java | 1 - .../sql/oracle/select/OracleSelectTest1.java | 1 - .../sql/oracle/select/OracleSelectTest10.java | 11 +- .../select/OracleSelectTest100_var.java | 3 +- .../oracle/select/OracleSelectTest101.java | 3 +- .../select/OracleSelectTest102_interval.java | 3 +- .../oracle/select/OracleSelectTest103.java | 3 +- .../oracle/select/OracleSelectTest104.java | 3 +- .../oracle/select/OracleSelectTest105.java | 3 +- .../oracle/select/OracleSelectTest106.java | 5 +- .../oracle/select/OracleSelectTest107.java | 2 +- .../oracle/select/OracleSelectTest108.java | 29 +- .../oracle/select/OracleSelectTest109.java | 1 - .../sql/oracle/select/OracleSelectTest11.java | 37 +- .../oracle/select/OracleSelectTest110.java | 117 +-- .../oracle/select/OracleSelectTest111.java | 50 +- .../oracle/select/OracleSelectTest112.java | 1 - .../oracle/select/OracleSelectTest113.java | 3 +- .../oracle/select/OracleSelectTest114.java | 3 +- .../oracle/select/OracleSelectTest115.java | 3 +- .../sql/oracle/select/OracleSelectTest12.java | 11 +- .../sql/oracle/select/OracleSelectTest13.java | 5 +- .../sql/oracle/select/OracleSelectTest14.java | 3 +- .../sql/oracle/select/OracleSelectTest15.java | 1 - .../sql/oracle/select/OracleSelectTest16.java | 1 - .../sql/oracle/select/OracleSelectTest17.java | 1 - .../sql/oracle/select/OracleSelectTest18.java | 27 +- .../sql/oracle/select/OracleSelectTest19.java | 29 +- .../sql/oracle/select/OracleSelectTest2.java | 31 +- .../sql/oracle/select/OracleSelectTest20.java | 11 +- .../sql/oracle/select/OracleSelectTest21.java | 35 +- .../sql/oracle/select/OracleSelectTest22.java | 5 +- .../sql/oracle/select/OracleSelectTest23.java | 5 +- .../sql/oracle/select/OracleSelectTest24.java | 5 +- .../sql/oracle/select/OracleSelectTest25.java | 3 +- .../sql/oracle/select/OracleSelectTest26.java | 17 +- .../sql/oracle/select/OracleSelectTest27.java | 13 +- .../sql/oracle/select/OracleSelectTest28.java | 3 +- .../sql/oracle/select/OracleSelectTest29.java | 3 +- .../sql/oracle/select/OracleSelectTest3.java | 11 +- .../sql/oracle/select/OracleSelectTest30.java | 25 +- .../sql/oracle/select/OracleSelectTest31.java | 25 +- .../sql/oracle/select/OracleSelectTest32.java | 7 +- .../sql/oracle/select/OracleSelectTest33.java | 9 +- .../sql/oracle/select/OracleSelectTest34.java | 31 +- .../sql/oracle/select/OracleSelectTest35.java | 13 +- .../sql/oracle/select/OracleSelectTest36.java | 21 +- .../sql/oracle/select/OracleSelectTest37.java | 15 +- .../sql/oracle/select/OracleSelectTest38.java | 33 +- .../sql/oracle/select/OracleSelectTest39.java | 3 +- .../sql/oracle/select/OracleSelectTest4.java | 9 +- .../sql/oracle/select/OracleSelectTest40.java | 43 +- .../sql/oracle/select/OracleSelectTest41.java | 51 +- .../sql/oracle/select/OracleSelectTest42.java | 13 +- .../sql/oracle/select/OracleSelectTest43.java | 7 +- .../sql/oracle/select/OracleSelectTest44.java | 13 +- .../sql/oracle/select/OracleSelectTest45.java | 19 +- .../sql/oracle/select/OracleSelectTest46.java | 23 +- .../sql/oracle/select/OracleSelectTest47.java | 7 +- .../sql/oracle/select/OracleSelectTest48.java | 23 +- .../sql/oracle/select/OracleSelectTest49.java | 9 +- .../sql/oracle/select/OracleSelectTest5.java | 3 +- .../sql/oracle/select/OracleSelectTest50.java | 23 +- .../sql/oracle/select/OracleSelectTest51.java | 9 +- .../sql/oracle/select/OracleSelectTest52.java | 9 +- .../sql/oracle/select/OracleSelectTest53.java | 5 +- .../sql/oracle/select/OracleSelectTest54.java | 5 +- .../sql/oracle/select/OracleSelectTest55.java | 5 +- .../sql/oracle/select/OracleSelectTest56.java | 47 +- .../sql/oracle/select/OracleSelectTest57.java | 7 +- .../sql/oracle/select/OracleSelectTest58.java | 1 - .../sql/oracle/select/OracleSelectTest59.java | 1 - .../sql/oracle/select/OracleSelectTest6.java | 11 +- .../sql/oracle/select/OracleSelectTest60.java | 1 - .../sql/oracle/select/OracleSelectTest61.java | 1 - .../sql/oracle/select/OracleSelectTest62.java | 1 - .../OracleSelectTest63_with_recursive.java | 1 - .../OracleSelectTest64_with_recursive.java | 1 - .../select/OracleSelectTest65_error.java | 1 - .../select/OracleSelectTest66_not_eq.java | 1 - .../sql/oracle/select/OracleSelectTest67.java | 1 - .../sql/oracle/select/OracleSelectTest68.java | 1 - .../sql/oracle/select/OracleSelectTest69.java | 1 - .../sql/oracle/select/OracleSelectTest7.java | 11 +- .../sql/oracle/select/OracleSelectTest70.java | 1 - .../sql/oracle/select/OracleSelectTest71.java | 1 - .../sql/oracle/select/OracleSelectTest72.java | 1 - .../sql/oracle/select/OracleSelectTest73.java | 1 - .../select/OracleSelectTest74_translate.java | 1 - .../select/OracleSelectTest75_comment.java | 1 - .../select/OracleSelectTest76_brace.java | 1 - .../sql/oracle/select/OracleSelectTest77.java | 1 - .../sql/oracle/select/OracleSelectTest78.java | 1 - .../sql/oracle/select/OracleSelectTest79.java | 1 - .../sql/oracle/select/OracleSelectTest8.java | 7 +- .../sql/oracle/select/OracleSelectTest80.java | 5 +- .../select/OracleSelectTest81_join_brace.java | 6 +- .../OracleSelectTest82_wmsysconcat.java | 6 +- .../OracleSelectTest83_number_negative.java | 2 - .../oracle/select/OracleSelectTest84_as.java | 2 - .../oracle/select/OracleSelectTest85_in.java | 2 - .../select/OracleSelectTest86_comment.java | 1 - .../OracleSelectTest86_wmsys_wmconat.java | 1 - .../select/OracleSelectTest87_bindvar.java | 1 - .../select/OracleSelectTest88_bindvar.java | 1 - .../select/OracleSelectTest89_condition.java | 1 - .../sql/oracle/select/OracleSelectTest9.java | 13 +- .../select/OracleSelectTest90_isof.java | 1 - .../sql/oracle/select/OracleSelectTest91.java | 1 - .../select/OracleSelectTest92_lexer.java | 1 - .../select/OracleSelectTest93_model.java | 1 - .../sql/oracle/select/OracleSelectTest94.java | 1 - .../select/OracleSelectTest95_pivot.java | 1 - .../select/OracleSelectTest96_pivot.java | 1 - .../OracleSelectTest97_wmsys_wmconat.java | 3 +- .../sql/oracle/select/OracleSelectTest98.java | 1 - .../sql/oracle/select/OracleSelectTest99.java | 3 +- .../OracleSelectTest_connect_by_root.java | 1 - ...tTest_hierarchical_CONNECT_BY_ISCYCLE.java | 1 - ...leSelectTest_limit_join_with_order_by.java | 6 +- .../sql/oracle/select/OracleSysdateTest.java | 2 +- .../tomysql/OracleToMySql_PageTest.java | 23 +- .../tomysql/OracleToMySql_PageTest1.java | 23 +- .../tomysql/OracleToMySql_PageTest2.java | 17 +- .../visitor/ExportParameterDotNumberTest.java | 52 +- .../visitor/OracleASTVisitorAdapterTest.java | 1 - .../OracleOutputVisitorTest_Aggregate.java | 1 - .../OracleOutputVisitorTest_PrettyFormat.java | 5 +- .../OracleOutputVisitorTest_dblink.java | 1 - .../OracleOutputVisitorTest_delete.java | 1 - .../OracleOutputVisitorTest_forupdate.java | 1 - .../OracleOutputVisitorTest_orderBy.java | 1 - .../OracleOutputVisitorTest_selectJoin.java | 3 +- ...acleParameterizedOutputVisitorTest_01.java | 1 + .../oracle/visitor/OracleResourceTest.java | 7 +- .../visitor/OracleSchemaStatVisitorTest1.java | 1 - .../visitor/OracleSchemaStatVisitorTest2.java | 1 - .../visitor/OracleSchemaStatVisitorTest3.java | 1 - .../visitor/OracleSchemaStatVisitorTest4.java | 1 - .../visitor/OracleSchemaStatVisitorTest5.java | 5 +- .../visitor/OracleSchemaStatVisitorTest6.java | 1 - .../visitor/OracleSchemaStatVisitorTest7.java | 1 - ...acleSchemaStatVisitorTest8_merge_into.java | 2 +- .../OracleSchemaStatVisitorTest_Delete.java | 1 - .../OracleSchemaStatVisitorTest_Subquery.java | 1 - ...OracleSchemaStatVisitorTest_Subquery2.java | 1 - .../OracleSchemaStatVisitorTest_Update.java | 1 - .../druid/bvt/sql/polardbx/PolarDBXTest.java | 2 +- .../bvt/sql/postgresql/DropTableTest.java | 5 +- .../postgresql/PGASTVisitorAdapterTest.java | 1 - .../bvt/sql/postgresql/PGAlterTableTest.java | 5 +- .../bvt/sql/postgresql/PGAlterTableTest1.java | 5 +- .../bvt/sql/postgresql/PGAlterTableTest2.java | 5 +- .../bvt/sql/postgresql/PGAlterTableTest3.java | 5 +- .../bvt/sql/postgresql/PGCommentTest.java | 53 +- .../sql/postgresql/PGCreateIndexTest_0.java | 3 +- .../sql/postgresql/PGCreateSequenceTest0.java | 5 +- .../sql/postgresql/PGCreateTableTest_0.java | 11 +- .../sql/postgresql/PGCreateTableTest_1.java | 9 +- .../sql/postgresql/PGCreateTableTest_10.java | 7 +- .../sql/postgresql/PGCreateTableTest_11.java | 7 +- .../sql/postgresql/PGCreateTableTest_12.java | 7 +- .../sql/postgresql/PGCreateTableTest_13.java | 3 +- .../sql/postgresql/PGCreateTableTest_2.java | 9 +- .../sql/postgresql/PGCreateTableTest_3.java | 9 +- .../sql/postgresql/PGCreateTableTest_4.java | 11 +- .../sql/postgresql/PGCreateTableTest_5.java | 9 +- .../sql/postgresql/PGCreateTableTest_6.java | 5 +- .../sql/postgresql/PGCreateTableTest_7.java | 7 +- .../sql/postgresql/PGCreateTableTest_8.java | 7 +- .../sql/postgresql/PGCreateTableTest_9.java | 7 +- .../bvt/sql/postgresql/PGDeleteTest.java | 23 +- .../bvt/sql/postgresql/PGDeleteTest10.java | 3 +- .../bvt/sql/postgresql/PGDeleteTest2.java | 3 +- .../bvt/sql/postgresql/PGDeleteTest3.java | 3 +- .../bvt/sql/postgresql/PGDeleteTest4.java | 5 +- .../bvt/sql/postgresql/PGDeleteTest5.java | 5 +- .../bvt/sql/postgresql/PGDeleteTest6.java | 5 +- .../bvt/sql/postgresql/PGDeleteTest7.java | 5 +- .../bvt/sql/postgresql/PGDeleteTest8.java | 7 +- .../bvt/sql/postgresql/PGDeleteTest9.java | 7 +- .../PGExportParameterVisitorTest.java | 2 +- .../PGExportParameterVisitorTest1.java | 4 +- .../bvt/sql/postgresql/PGFormatTest.java | 9 +- .../bvt/sql/postgresql/PGInsertTest0.java | 21 +- .../bvt/sql/postgresql/PGInsertTest1.java | 5 +- .../bvt/sql/postgresql/PGInsertTest10.java | 1 - .../bvt/sql/postgresql/PGInsertTest11.java | 1 - .../postgresql/PGInsertTest12_issue_2192.java | 1 - .../bvt/sql/postgresql/PGInsertTest13.java | 1 - .../bvt/sql/postgresql/PGInsertTest14.java | 1 - .../bvt/sql/postgresql/PGInsertTest2.java | 5 +- .../bvt/sql/postgresql/PGInsertTest3.java | 1 - .../bvt/sql/postgresql/PGInsertTest4.java | 1 - .../bvt/sql/postgresql/PGInsertTest5.java | 11 +- .../sql/postgresql/PGInsertTest6_multi.java | 1 - .../bvt/sql/postgresql/PGInsertTest7.java | 1 - .../bvt/sql/postgresql/PGInsertTest8.java | 1 - .../bvt/sql/postgresql/PGInsertTest9.java | 1 - .../bvt/sql/postgresql/PGMergeIntoTest0.java | 3 +- .../druid/bvt/sql/postgresql/PGSetTest.java | 1 - .../druid/bvt/sql/postgresql/PGSetTest2.java | 1 - .../druid/bvt/sql/postgresql/PGShowTest.java | 7 +- .../bvt/sql/postgresql/PGUpdateTest0.java | 7 +- .../postgresql/PostgresqlResourceTest.java | 3 +- .../bvt/sql/postgresql/TruncateTest.java | 1 - .../postgresql/datatypes/BitStringTest.java | 1 - .../sql/postgresql/datatypes/BitsTest.java | 1 - .../sql/postgresql/datatypes/BooleanTest.java | 2 +- .../postgresql/datatypes/TimestampTest.java | 2 +- .../postgresql/ddl/PGAlterTableAddCheck0.java | 4 +- .../ddl/PGAlterTableAddColumnTest0.java | 4 +- .../ddl/PGAlterTableAddColumnTest1.java | 4 +- .../ddl/PGAlterTableAddColumnTest2.java | 4 +- .../postgresql/ddl/PGAlterTableAddFk0.java | 4 +- .../ddl/PGAlterTableAddUnique0.java | 4 +- .../ddl/PGAlterTableAlterColumnTest0.java | 4 +- .../ddl/PGAlterTableDropColumnTest0.java | 4 +- .../ddl/PGAlterTableDropColumnTest1.java | 4 +- .../ddl/PGAlterTableDropConstraint.java | 4 +- .../ddl/PGAlterTableDropDefault.java | 6 +- .../ddl/PGAlterTableDropNotNull.java | 6 +- .../ddl/PGAlterTableRenameTest.java | 4 +- .../ddl/PGAlterTableRenameTest1.java | 4 +- .../ddl/PGAlterTableSetDefault.java | 6 +- .../ddl/PGAlterTableSetNotNull.java | 6 +- .../ddl/PGDropTableIfExistsTest.java | 4 +- .../bvt/sql/postgresql/ddl/PGGrantTest0.java | 4 +- .../bvt/sql/postgresql/ddl/PGRovokeTest0.java | 4 +- .../sql/postgresql/expr/AliasTest_Type.java | 5 +- .../bvt/sql/postgresql/expr/ArrayTest.java | 3 +- .../bvt/sql/postgresql/expr/BoxTest.java | 2 +- .../bvt/sql/postgresql/expr/CidrTest.java | 1 - .../bvt/sql/postgresql/expr/CircleTest.java | 1 - .../bvt/sql/postgresql/expr/InetTest.java | 1 - .../sql/postgresql/expr/LineSegmentsTest.java | 2 +- .../bvt/sql/postgresql/expr/MacAddrTest.java | 1 - .../bvt/sql/postgresql/expr/PolygonTest.java | 1 - .../bvt/sql/postgresql/expr/PolygonTest2.java | 1 - .../select/PGSelectForUpdateTest.java | 1 - .../postgresql/select/PGSelectIntoTest.java | 22 +- .../sql/postgresql/select/PGSelectTest.java | 53 +- .../sql/postgresql/select/PGSelectTest1.java | 33 +- .../sql/postgresql/select/PGSelectTest10.java | 1 - .../sql/postgresql/select/PGSelectTest11.java | 1 - .../sql/postgresql/select/PGSelectTest12.java | 1 - .../sql/postgresql/select/PGSelectTest13.java | 1 - .../sql/postgresql/select/PGSelectTest14.java | 1 - .../sql/postgresql/select/PGSelectTest15.java | 1 - .../sql/postgresql/select/PGSelectTest16.java | 3 +- .../sql/postgresql/select/PGSelectTest17.java | 1 - .../sql/postgresql/select/PGSelectTest18.java | 3 +- .../sql/postgresql/select/PGSelectTest19.java | 1 - .../sql/postgresql/select/PGSelectTest2.java | 1 - .../sql/postgresql/select/PGSelectTest20.java | 1 - .../sql/postgresql/select/PGSelectTest21.java | 13 +- .../sql/postgresql/select/PGSelectTest22.java | 1 - .../sql/postgresql/select/PGSelectTest23.java | 3 +- .../sql/postgresql/select/PGSelectTest24.java | 3 +- .../sql/postgresql/select/PGSelectTest25.java | 3 +- .../sql/postgresql/select/PGSelectTest26.java | 3 +- .../sql/postgresql/select/PGSelectTest27.java | 3 +- .../sql/postgresql/select/PGSelectTest28.java | 3 +- .../sql/postgresql/select/PGSelectTest29.java | 3 +- .../sql/postgresql/select/PGSelectTest3.java | 9 +- .../sql/postgresql/select/PGSelectTest30.java | 3 +- .../sql/postgresql/select/PGSelectTest31.java | 3 +- .../sql/postgresql/select/PGSelectTest32.java | 3 +- .../sql/postgresql/select/PGSelectTest33.java | 3 +- .../sql/postgresql/select/PGSelectTest34.java | 3 +- .../sql/postgresql/select/PGSelectTest35.java | 3 +- .../sql/postgresql/select/PGSelectTest36.java | 3 +- .../sql/postgresql/select/PGSelectTest37.java | 3 +- .../sql/postgresql/select/PGSelectTest38.java | 3 +- .../sql/postgresql/select/PGSelectTest39.java | 3 +- .../sql/postgresql/select/PGSelectTest4.java | 9 +- .../sql/postgresql/select/PGSelectTest40.java | 3 +- .../sql/postgresql/select/PGSelectTest41.java | 3 +- .../sql/postgresql/select/PGSelectTest42.java | 3 +- .../sql/postgresql/select/PGSelectTest43.java | 3 +- .../sql/postgresql/select/PGSelectTest44.java | 2 +- .../sql/postgresql/select/PGSelectTest45.java | 2 +- .../sql/postgresql/select/PGSelectTest46.java | 2 +- .../sql/postgresql/select/PGSelectTest47.java | 2 +- .../sql/postgresql/select/PGSelectTest48.java | 2 +- .../sql/postgresql/select/PGSelectTest49.java | 2 +- .../sql/postgresql/select/PGSelectTest5.java | 19 +- .../sql/postgresql/select/PGSelectTest50.java | 2 +- .../sql/postgresql/select/PGSelectTest51.java | 2 +- .../sql/postgresql/select/PGSelectTest52.java | 2 +- .../sql/postgresql/select/PGSelectTest53.java | 2 +- .../sql/postgresql/select/PGSelectTest54.java | 2 +- .../sql/postgresql/select/PGSelectTest55.java | 2 +- .../sql/postgresql/select/PGSelectTest56.java | 2 +- .../sql/postgresql/select/PGSelectTest57.java | 2 +- .../sql/postgresql/select/PGSelectTest58.java | 2 +- .../sql/postgresql/select/PGSelectTest6.java | 15 +- .../select/PGSelectTest60_array.java | 2 +- .../select/PGSelectTest61_type_string.java | 2 +- .../select/PGSelectTest62_json.java | 2 +- .../sql/postgresql/select/PGSelectTest63.java | 2 +- .../select/PGSelectTest63_json.java | 2 +- .../sql/postgresql/select/PGSelectTest64.java | 2 +- .../select/PGSelectTest66_castInterval.java | 2 +- .../select/PGSelectTest67_window.java | 2 +- .../sql/postgresql/select/PGSelectTest68.java | 2 +- .../select/PGSelectTest69_interval.java | 2 +- .../sql/postgresql/select/PGSelectTest7.java | 27 +- .../select/PGSelectTest70_string_agg.java | 2 +- .../select/PGSelectTest71_window.java | 2 +- .../sql/postgresql/select/PGSelectTest72.java | 2 +- .../sql/postgresql/select/PGSelectTest8.java | 9 +- .../sql/postgresql/select/PGSelectTest81.java | 6 +- .../sql/postgresql/select/PGSelectTest82.java | 2 +- .../sql/postgresql/select/PGSelectTest83.java | 2 +- .../sql/postgresql/select/PGSelectTest84.java | 2 +- .../sql/postgresql/select/PGSelectTest85.java | 2 +- .../sql/postgresql/select/PGSelectTest86.java | 4 +- .../sql/postgresql/select/PGSelectTest87.java | 2 +- .../sql/postgresql/select/PGSelectTest9.java | 5 +- .../sql/postgresql/select/PGUnionTest.java | 7 +- .../sql/repository/OracleJoinResolveTest.java | 6 +- .../OracleJoinResolveTest_1_fk.java | 3 +- .../repository/OraclePKNameResolveTest.java | 3 +- .../bvt/sql/schemaStat/SchemaStatTest.java | 6 +- .../bvt/sql/schemaStat/SchemaStatTest10.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest11.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest12.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest13.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest14.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest15.java | 2 +- .../bvt/sql/schemaStat/SchemaStatTest16.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest17.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest18.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest19.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest2.java | 10 +- .../SchemaStatTest20_issue3993.java | 1 - .../SchemaStatTest21_issue3980.java | 1 - .../schemaStat/SchemaStatTest22_yiran.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest3.java | 8 +- .../bvt/sql/schemaStat/SchemaStatTest4.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest5.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest6.java | 18 +- .../bvt/sql/schemaStat/SchemaStatTest7.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest8.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest9.java | 1 - .../bvt/sql/sqlite/SQLite_SelectTest_0.java | 3 +- .../bvt/sql/sqlite/SQLite_SelectTest_1.java | 3 +- .../bvt/sql/sqlite/SQLite_SelectTest_2.java | 3 +- ...MSSQLServerExportParameterVisitorTest.java | 3 +- .../sqlserver/SQLServerAlterTableTest_0.java | 3 +- .../sqlserver/SQLServerAlterTableTest_1.java | 3 +- .../sqlserver/SQLServerAlterTableTest_10.java | 3 +- .../sqlserver/SQLServerAlterTableTest_11.java | 7 +- .../sqlserver/SQLServerAlterTableTest_12.java | 1 - .../SQLServerAlterTableTest_13_default.java | 3 - .../sqlserver/SQLServerAlterTableTest_2.java | 3 +- .../sqlserver/SQLServerAlterTableTest_3.java | 3 +- .../sqlserver/SQLServerAlterTableTest_4.java | 3 +- .../sqlserver/SQLServerAlterTableTest_5.java | 3 +- .../sqlserver/SQLServerAlterTableTest_6.java | 3 +- .../sqlserver/SQLServerAlterTableTest_7.java | 3 +- .../sqlserver/SQLServerAlterTableTest_8.java | 3 +- .../sqlserver/SQLServerAlterTableTest_9.java | 3 +- ...LServerAlterTableTest_drop_constraint.java | 3 +- .../sql/sqlserver/SQLServerCommitTest.java | 1 - .../sqlserver/SQLServerCreateIndexTest.java | 5 +- .../sqlserver/SQLServerCreateIndexTest_2.java | 5 +- .../sqlserver/SQLServerCreateIndexTest_3.java | 7 +- .../sqlserver/SQLServerCreateIndexTest_4.java | 3 +- .../sql/sqlserver/SQLServerDeclareTest.java | 15 +- .../sqlserver/SQLServerDropIndex_Test.java | 1 - .../sqlserver/SQLServerDropIndex_Test_2.java | 1 - .../sql/sqlserver/SQLServerDropTableTest.java | 1 - .../bvt/sql/sqlserver/SQLServerExec_Test.java | 8 +- .../bvt/sql/sqlserver/SQLServerIfTest.java | 19 +- .../sql/sqlserver/SQLServerInsertTest.java | 5 +- .../sql/sqlserver/SQLServerInsertTest1.java | 5 +- .../sql/sqlserver/SQLServerInsertTest10.java | 1 - .../sql/sqlserver/SQLServerInsertTest2.java | 9 +- .../sql/sqlserver/SQLServerInsertTest3.java | 5 +- .../sql/sqlserver/SQLServerInsertTest4.java | 1 - .../sql/sqlserver/SQLServerInsertTest5.java | 15 +- .../sql/sqlserver/SQLServerInsertTest6.java | 3 +- .../sql/sqlserver/SQLServerInsertTest7.java | 1 - .../sql/sqlserver/SQLServerInsertTest8.java | 19 +- .../sql/sqlserver/SQLServerInsertTest9.java | 1 - .../bvt/sql/sqlserver/SQLServerMerge_0.java | 1 - ...LServerParameterizedOutputVisitorTest.java | 15 +- ...erverParameterizedOutputVisitorTest_1.java | 1 - ...erverParameterizedOutputVisitorTest_2.java | 1 - .../sql/sqlserver/SQLServerRollbackTest.java | 1 - .../sql/sqlserver/SQLServerRowNumberTest.java | 1 - .../sqlserver/SQLServerRowNumberTest2.java | 31 +- .../bvt/sql/sqlserver/SQLServerSetTest.java | 1 - .../SQLServerStartTransactionTest.java | 1 - .../bvt/sql/sqlserver/SQLServerTopTest.java | 1 - .../bvt/sql/sqlserver/SQLServerTopTest2.java | 1 - .../sql/sqlserver/SQLServerUpdateTest.java | 26 +- .../sql/sqlserver/SQLServerUpdateTest1.java | 15 +- .../sql/sqlserver/SQLServerUpdateTest2.java | 9 +- .../sql/sqlserver/SQLServerUpdateTest3.java | 41 +- .../sql/sqlserver/SQLServerUpdateTest4.java | 5 +- .../sql/sqlserver/SQLServerUpdateTest5.java | 3 +- .../sql/sqlserver/SQLServerUpdateTest6.java | 3 +- .../sql/sqlserver/SQLServerWaitForTest.java | 1 - .../sql/sqlserver/SqlServerResourceTest.java | 6 +- .../createtable/SQLServerCreateTableTest.java | 7 +- .../SQLServerCreateTableTest_1.java | 23 +- .../SQLServerCreateTableTest_2.java | 9 +- .../SQLServerCreateTableTest_3.java | 31 +- .../SQLServerCreateTableTest_4.java | 29 +- .../SQLServerCreateTableTest_5.java | 25 +- .../SQLServerCreateTableTest_6.java | 61 +- .../SQLServerCreateTableTest_7.java | 1 - .../SQLServerCreateTableTest_8.java | 1 - .../SQLServerCreateTableTest_9.java | 1 - .../sqlserver/select/SQLServerSelectTest.java | 1 - .../select/SQLServerSelectTest1.java | 1 - .../select/SQLServerSelectTest10.java | 29 +- .../select/SQLServerSelectTest11.java | 1 - .../select/SQLServerSelectTest12.java | 11 +- .../select/SQLServerSelectTest13.java | 127 ++- .../select/SQLServerSelectTest14.java | 1 - .../select/SQLServerSelectTest15.java | 3 +- .../select/SQLServerSelectTest16.java | 9 +- .../select/SQLServerSelectTest17.java | 1 - .../select/SQLServerSelectTest18.java | 1 - .../select/SQLServerSelectTest19.java | 1 - .../select/SQLServerSelectTest2.java | 1 - .../select/SQLServerSelectTest20.java | 7 +- .../select/SQLServerSelectTest21.java | 13 +- .../select/SQLServerSelectTest22.java | 1 - .../select/SQLServerSelectTest23.java | 1 - .../select/SQLServerSelectTest24.java | 1 - .../select/SQLServerSelectTest25.java | 1 - .../select/SQLServerSelectTest26.java | 1 - .../select/SQLServerSelectTest27.java | 1 - .../select/SQLServerSelectTest28.java | 1 - .../select/SQLServerSelectTest29.java | 1 - .../select/SQLServerSelectTest3.java | 3 +- .../select/SQLServerSelectTest30.java | 1 - .../select/SQLServerSelectTest31.java | 1 - .../SQLServerSelectTest32_with_hint.java | 1 - .../SQLServerSelectTest32_with_lock.java | 1 - .../SQLServerSelectTest33_with_readpast.java | 1 - .../SQLServerSelectTest34_gtltspace.java | 1 - .../select/SQLServerSelectTest4.java | 3 +- .../select/SQLServerSelectTest5.java | 3 +- .../select/SQLServerSelectTest6.java | 35 +- .../select/SQLServerSelectTest7.java | 145 ++- .../select/SQLServerSelectTest8.java | 3 +- .../select/SQLServerSelectTest9.java | 1 - .../SQLServerSelectTest_cross_apply.java | 7 +- .../SQLServerSelectTest_outer_apply.java | 7 +- .../druid/bvt/stat/DruidStatServiceTest.java | 18 +- .../druid/bvt/stat/DruidStatServiceTest2.java | 3 +- .../druid/bvt/stat/JdbcTraceManagerTest.java | 1 - .../DruidConnectionProviderTest.java | 12 +- .../http/StatViewSerlvetTest_allow.java | 5 +- .../http/StatViewServletTest_resetEnable.java | 1 - .../http/UserAgentAndroid_4_0_3_Test.java | 1 - .../http/UserAgentAndroid_4_0_3_Test_2.java | 1 - .../http/UserAgentAndroid_4_0_4_Test.java | 1 - .../http/UserAgentAndroid_4_1_Test.java | 1 - .../http/UserAgentAndroid_4_2_Test_2.java | 1 - .../http/UserAgentAndroid_4_3_Test_2.java | 1 - .../bvt/support/http/UserAgentBotStat.java | 89 +- .../bvt/support/http/UserAgentMacTest.java | 1 - .../druid/bvt/support/http/UserAgentTest.java | 49 +- .../support/http/UserAgentWin8ChromeTest.java | 1 - .../bvt/support/http/UserAgentWin8IETest.java | 1 - .../support/http/UserAgentWin8IETest_2.java | 1 - .../bvt/support/http/UserAgentWindows.java | 205 ++-- .../bvt/support/http/WebStatFilterTest.java | 7 +- .../bvt/support/http/WebStatFilterTest2.java | 61 +- .../WebStatFilterTest3_WebURIStatNull.java | 7 +- .../bvt/support/http/util/IPRangeTest.java | 9 +- .../bvt/support/json/JSONParserTest.java | 1 - .../bvt/support/json/JSONParserTest2.java | 2 +- .../bvt/support/json/JSONParserTest3.java | 2 +- .../bvt/support/json/JSONParserTest4.java | 3 +- .../JakartaCommonsLoggingImplTest.java | 3 +- .../support/logging/Jdk14LoggingImplTest.java | 3 +- .../bvt/support/logging/Log4jImplTest.java | 3 +- .../support/logging/NoLoggingImplTest.java | 3 +- .../bvt/support/logging/SLF4JImplTest.java | 3 +- .../odps/udf/ExportConditionsTest.java | 2 +- .../odps/udf/ExportConditionsTest2.java | 2 +- .../odps/udf/ExportConditionsTest3.java | 2 +- .../odps/udf/ExportConditionsTest4.java | 2 +- .../odps/udf/ExportConditionsTest5.java | 2 +- .../odps/udf/ExportConditionsTest6.java | 2 +- .../bvt/support/profile/ProfilerTest.java | 7 +- .../support/spring/DruidLobCreatorTest.java | 1 - .../support/spring/DruidLobHandlerTest.java | 11 +- .../bvt/utils/DaemonThreadFactoryTest.java | 5 +- .../druid/bvt/utils/DruidWebUtilsTest.java | 2 - .../druid/bvt/utils/HistogramTest.java | 17 +- .../druid/bvt/utils/JSONWriterTest.java | 6 +- .../druid/bvt/utils/JdbcUtilsTest.java | 5 +- .../druid/bvt/utils/JdbcUtilsTest1.java | 34 +- .../druid/bvt/utils/JdbcUtilsTest2.java | 2 +- .../bvt/utils/JdbcUtilsTest_for_odps.java | 1 + .../druid/bvt/utils/JdbcUtils_driver.java | 3 +- .../druid/bvt/utils/LocalResultSetTest.java | 1 - .../demo/sql/CreateTableSetSchemaDemo.java | 23 +- .../druid/demo/sql/ExportParameters.java | 8 +- .../druid/demo/sql/MySqlVisitorDemo.java | 1 + .../druid/demo/sql/OracleCompatibleTest.java | 3 +- .../druid/demo/sql/OracleVisitorDemo.java | 1 + .../alibaba/druid/demo/sql/PGVisitorDemo.java | 1 + .../druid/demo/sql/SchemaStatTest_odps.java | 1 - .../filter/config/ConfigFileGenerator.java | 3 +- .../druid/kylin/KylinDriverSupportTest.java | 1 - .../druid/mysql/MySqlBigTableTest.java | 12 +- .../druid/mysql/MySqlConnectFailTest.java | 1 + .../com/alibaba/druid/mysql/MySqlHexTest.java | 11 +- .../alibaba/druid/mysql/MySqlInsertTest.java | 3 +- .../alibaba/druid/mysql/MysqlLimitTest.java | 5 +- .../druid/mysql/MysqlVarantRefTest.java | 87 +- .../alibaba/druid/mysql/QueryTimeoutTest.java | 6 +- ...SelectTest_69_mysql8_windows_function.java | 7 +- .../postgresql/PGSelectTest59_lateral.java | 2 +- .../druid/oracle/OracleKillSessionTest.java | 8 +- .../druid/oracle/Oracle_PSCacheTest.java | 6 +- .../druid/polardb/PolarDBDataSourceTest.java | 4 +- .../java/com/alibaba/druid/pool/Case0.java | 11 +- .../java/com/alibaba/druid/pool/Case3.java | 1 - .../com/alibaba/druid/pool/CobarTest.java | 8 +- .../alibaba/druid/pool/ConcurrentTest.java | 8 +- .../alibaba/druid/pool/ConcurrentTest2.java | 13 +- .../java/com/alibaba/druid/pool/DBCPTest.java | 1 - .../com/alibaba/druid/pool/DruidTest.java | 6 +- .../druid/pool/ExeptionSorterTest.java | 4 +- .../com/alibaba/druid/pool/MaxWaitTest.java | 2 - .../java/com/alibaba/druid/pool/MemTest.java | 49 +- .../druid/pool/MySqlValdConnectionTest.java | 1 - .../alibaba/druid/pool/QueryTimeoutTest.java | 6 +- .../TestDruidOraclePreparedStatement.java | 9 +- .../pool/TestIdle3_Concurrent_MaxActive.java | 5 +- ...tIdle3_Concurrent_Starvation_Longtime.java | 10 +- .../com/alibaba/druid/pool/TestMockPerf.java | 5 +- .../com/alibaba/druid/pool/TestMySql.java | 1 - .../com/alibaba/druid/pool/TestMySqlPing.java | 1 - .../pool/TestOraclePreparedStatement.java | 17 +- .../pool/TestOracle_DruidDataSource.java | 2 - .../alibaba/druid/pool/TestPoolStatement.java | 3 - .../com/alibaba/druid/pool/TestRollBack.java | 2 - .../java/com/alibaba/druid/pool/Test_C2.java | 8 +- .../com/alibaba/druid/pool/Test_kyline.java | 7 +- .../alibaba/druid/pool/bonecp/TestLRU.java | 13 +- .../druid/pool/bonecp/TestPSCache.java | 3 +- .../com/alibaba/druid/pool/dbcp/Test0.java | 1 - .../druid/pool/dbcp/TestIdleForKylin.java | 1 - .../com/alibaba/druid/pool/demo/Demo0.java | 9 +- .../ha/CounterValidConnectionChecker.java | 1 - .../pool/ha/HighAvailableDataSourceTest.java | 2 +- .../alibaba/druid/pool/ha/MockDataSource.java | 2 - .../druid/pool/ha/node/NodeEventTest.java | 1 - .../druid/pool/ha/node/PoolUpdaterTest.java | 6 +- .../ha/node/ZookeeperNodeListenerTest.java | 2 +- .../ha/node/ZookeeperNodeRegisterTest.java | 2 +- .../selector/NamedDataSourceSelectorTest.java | 6 +- ...ataSourceSelectorSingleDataSourceTest.java | 2 +- ...andomDataSourceSelectorWithFilterTest.java | 4 +- .../alibaba/druid/pool/oceanbase/OBTest.java | 1 - .../oracle/DruidDataSourceTest_oracle3.java | 6 +- .../druid/pool/oracle/QueryTimeoutTest.java | 9 +- .../pool/postgres/PG_500_connection_Test.java | 7 +- .../alibaba/druid/pool/qa/MySqlTestSuit.java | 6 +- .../pool/ui/DruidDataSourceUIManager.java | 149 ++- .../druid/pool/ui/DruidDataStatusPanel.java | 14 +- .../alibaba/druid/postgresql/PGLimitTest.java | 29 +- .../druid/postgresql/PGUpsertTest.java | 21 +- .../PG_getCreateTableScriptTest.java | 3 +- .../com/alibaba/druid/proxy/TestOracle.java | 1 - .../com/alibaba/druid/proxy/demo/Demo1.java | 1 - .../filter/wall/WallPerformanceTest_1.java | 3 +- .../druid/pvt/pool/AsyncCloseTest.java | 15 +- .../druid/pvt/pool/AsyncCloseTest1.java | 27 +- .../druid/pvt/pool/AsyncCloseTest2.java | 31 +- .../druid/pvt/pool/AsyncCloseTest3.java | 25 +- .../alibaba/druid/pvt/pool/DiscardTest.java | 9 +- .../druid/pvt/pool/Large10ConcurrentTest.java | 16 +- .../alibaba/druid/pvt/pool/Large10KTest.java | 18 +- .../alibaba/druid/pvt/pool/PSCacheTest5.java | 5 +- .../alibaba/druid/pvt/pool/TestAbondon.java | 5 +- .../druid/pvt/pool/TestConcurrent.java | 6 +- .../druid/pvt/pool/TestIdle3_Concurrent.java | 4 +- .../pool/TestIdle3_Concurrent_MaxActive.java | 4 +- .../pool/TestIdle3_Concurrent_Starvation.java | 8 +- .../monitor/MonitorDaoJdbcImplTest.java | 9 +- .../alibaba/druid/spring/ISequenceDao.java | 1 - .../druid/spring/MBeanServerFactoryBean.java | 1 - .../com/alibaba/druid/spring/SequenceDao.java | 2 - .../alibaba/druid/spring/SequenceService.java | 8 +- .../druid/spring/SequenceServiceMBean.java | 1 - .../java/com/alibaba/druid/spring/User.java | 8 +- .../com/alibaba/druid/spring/UserDao.java | 1 - .../com/alibaba/druid/spring/UserService.java | 3 +- .../java/com/alibaba/druid/sql/DB2Test.java | 32 +- .../alibaba/druid/sql/KeywordsMySqlTest.java | 1 - .../com/alibaba/druid/sql/KeywordsTest.java | 1 - .../java/com/alibaba/druid/sql/MysqlTest.java | 68 +- .../alibaba/druid/sql/OnlineOracleTest3.java | 7 +- .../com/alibaba/druid/sql/OnlineSQLTest.java | 9 +- .../com/alibaba/druid/sql/OnlineSQLTest2.java | 10 +- .../com/alibaba/druid/sql/OracleTest.java | 34 +- .../java/com/alibaba/druid/sql/PGTest.java | 38 +- .../alibaba/druid/sql/SQLExprParserTest.java | 6 +- .../com/alibaba/druid/sql/TestMigrate.java | 38 +- .../alibaba/druid/sql/TestOnlineSQLTest3.java | 11 +- .../com/alibaba/druid/sql/TestTransform.java | 54 +- .../h2/visitor/H2OutputVisitorTest.java | 1 - .../alibaba/druid/sql/mysql/demo/Demo0.java | 1 - .../alibaba/druid/sql/odps/OdpsFileTest.java | 2 - .../alibaba/druid/sql/oracle/demo/Demo0.java | 1 - .../alibaba/druid/sql/oracle/demo/Demo1.java | 23 +- .../alibaba/druid/sql/oracle/demo/Demo2.java | 8 +- .../alibaba/druid/sql/oracle/demo/Demo3.java | 10 +- .../druid/sql/oracle/demo/Demo_casewhen.java | 1 - .../sql/oracle/demo/OracleResourceTest.java | 2 - .../sql/oracle/demo/OracleResourceTest2.java | 2 - .../alibaba/druid/sql/parser/CommentTest.java | 3 +- .../sql/parser/DeallocatePrepareTest.java | 19 +- ...ExportAndParameterizedVisitorTestCase.java | 17 +- .../sql/parser/LoadDataSQLParserTest.java | 13 +- .../druid/sql/parser/MySQLCharSetTest.java | 19 +- .../druid/sql/parser/PGIntervalSQLTest.java | 27 +- .../alibaba/druid/sql/parser/PerfTest.java | 1 - .../druid/sql/parser/SQLLexerTest2.java | 27 +- .../druid/sql/parser/SQLMergeTest.java | 3 - .../sql/parser/SqlserverGroupByTest.java | 6 +- .../performance/TestSelectPerformance.java | 7 +- .../com/alibaba/druid/sql/test/TestUtils.java | 5 +- .../alibaba/druid/stat/AtomicMemoryTest.java | 1 - .../alibaba/druid/stat/HashMapMemoryTest.java | 1 - .../druid/stat/HistogramMemoryTest.java | 9 +- .../alibaba/druid/stat/JdbcSqlStatTest1.java | 1 - .../com/alibaba/druid/stat/MemoryTest.java | 1 - .../java/com/alibaba/druid/stat/PerfTest.java | 5 +- .../druid/stat/StatAnnotationTest.java | 38 +- .../com/alibaba/druid/stat/TestBeidou.java | 1 - .../com/alibaba/druid/stat/TestOracle.java | 1 - .../druid/stat/WebSessionStatTest.java | 1 - .../druid/stat/WebURIStatMemoryTest.java | 1 - .../druid/stat/spring/UserService.java | 3 +- .../druid/stat/spring/UserServiceImpl.java | 1 - .../alibaba/druid/test/AlibDriverTest.java | 1 - .../java/com/alibaba/druid/test/FNVTest.java | 2 +- .../druid/test/NutzTransactionTest.java | 13 +- .../alibaba/druid/test/OdpsSelectTest6.java | 9 +- .../com/alibaba/druid/test/QuartzTest.java | 7 +- .../alibaba/druid/test/ThreadLocalCache.java | 1 - .../druid/test/util/OracleMockConnection.java | 30 +- .../test/util/OracleMockConnectionJdbc3.java | 5 +- .../druid/test/util/OracleMockDriver.java | 6 +- .../test/util/OracleMockDriverJdbc3.java | 6 +- .../util/OracleMockPreparedStatement.java | 49 +- .../OracleMockPreparedStatementJdbc3.java | 3 +- .../druid/test/util/OracleMockResultSet.java | 83 +- .../test/util/OracleMockResultSetJdbc3.java | 3 +- .../druid/test/util/OracleUtilsTest.java | 11 +- .../test/wall/MySqlResourceWallTest.java | 2 - .../alibaba/druid/test/wall/ResourceTest.java | 3 +- .../com/alibaba/druid/util/DropTables.java | 1 - .../com/alibaba/druid/util/JdbcUtilsTest.java | 5 +- .../alibaba/druid/util/MapComparatorTest.java | 11 +- .../druid/util/ServletPathMathcherTest.java | 23 +- src/test/resources/DruidDriverConfig.xml | 22 +- .../resources/bvt/config/config-0.properties | 2 +- .../resources/bvt/config/config-1.properties | 2 +- .../resources/bvt/config/config-2.properties | 2 +- .../resources/bvt/config/config-3.properties | 2 +- .../resources/bvt/config/config-4.properties | 2 +- src/test/resources/bvt/parser/odps-0.sql | 40 +- src/test/resources/bvt/parser/odps-1.sql | 179 ++-- src/test/resources/bvt/parser/odps-2.sql | 198 ++-- src/test/resources/bvt/parser/odps-3.sql | 105 +- src/test/resources/bvt/parser/z321.sql | 202 ++-- .../resources/bvt/quartz/quartz.properties | 10 +- .../alibaba/druid/jmx/spring_stat_export.xml | 38 +- .../com/alibaba/druid/pool/dataSource.xml | 116 +-- .../druid/pool/ha/ha-datasource.properties | 2 +- .../alibaba/druid/pool/ibatis/Sequence.xml | 41 +- .../com/alibaba/druid/pool/ibatis/User.xml | 41 +- .../pool/ibatis/ibatis-config-druid-test.xml | 11 +- .../pool/ibatis/spring-config-ibatis-1.xml | 68 +- .../pool/ibatis/spring-config-ibatis.xml | 60 +- .../pool/mybatis/spring-config-mybatis.xml | 34 +- .../alibaba/druid/sql/oracle/bvt/source.sql | 249 +++-- .../stat/spring-config-stat-annotation.xml | 16 +- .../alibaba/druid/stat/spring-config-stat.xml | 36 +- src/test/resources/commons-logging.properties | 2 +- src/test/resources/log4j.properties | 3 - 4844 files changed, 40655 insertions(+), 46637 deletions(-) create mode 100644 src/checkstyle/druid-checks.xml create mode 100644 src/main/java/com/alibaba/druid/support/jconsole/model/RowHeaderRenderer.java diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/DruidAdminApplication.java b/druid-admin/src/main/java/com/alibaba/druid/admin/DruidAdminApplication.java index 0a4c4e989d..5882f5d7ff 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/DruidAdminApplication.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/DruidAdminApplication.java @@ -11,7 +11,6 @@ @SpringBootApplication @EnableConfigurationProperties(MonitorProperties.class) public class DruidAdminApplication { - public static void main(String[] args) { SpringApplication.run(DruidAdminApplication.class, args); } diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/config/MonitorProperties.java b/druid-admin/src/main/java/com/alibaba/druid/admin/config/MonitorProperties.java index 1129472329..e0f00ad438 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/config/MonitorProperties.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/config/MonitorProperties.java @@ -12,7 +12,6 @@ @Data @ConfigurationProperties(prefix = "monitor") public class MonitorProperties { - /** * 需要监控的服务 */ diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/model/ServiceNode.java b/druid-admin/src/main/java/com/alibaba/druid/admin/model/ServiceNode.java index 9246d118d7..f4297c1d0c 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/model/ServiceNode.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/model/ServiceNode.java @@ -8,7 +8,6 @@ **/ @Data public class ServiceNode { - private String id; private Integer port; diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/ConnectionResult.java b/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/ConnectionResult.java index e967b20eb8..df58c7a6ce 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/ConnectionResult.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/ConnectionResult.java @@ -14,7 +14,6 @@ @NoArgsConstructor @Data public class ConnectionResult { - @JSONField(name = "ResultCode") private int ResultCode; @JSONField(name = "Content") @@ -23,7 +22,6 @@ public class ConnectionResult { @NoArgsConstructor @Data public static class ContentBean { - @JSONField(name = "id") private int id; @JSONField(name = "connectionId") diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/DataSourceResult.java b/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/DataSourceResult.java index a650c034d8..3a6188c770 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/DataSourceResult.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/DataSourceResult.java @@ -13,7 +13,6 @@ @Data @NoArgsConstructor public class DataSourceResult { - @JSONField(name = "ResultCode") private int ResultCode; @JSONField(name = "Content") @@ -22,7 +21,6 @@ public class DataSourceResult { @NoArgsConstructor @Data public static class ContentBean { - private String serviceId; @JSONField(name = "Identity") diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/SqlDetailResult.java b/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/SqlDetailResult.java index 40ce318c52..f14add7ac8 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/SqlDetailResult.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/SqlDetailResult.java @@ -13,7 +13,6 @@ @NoArgsConstructor @Data public class SqlDetailResult { - @JSONField(name = "ResultCode") private int ResultCode; @JSONField(name = "Content") diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/SqlListResult.java b/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/SqlListResult.java index d2b277d707..ac0f50b580 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/SqlListResult.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/SqlListResult.java @@ -13,7 +13,6 @@ @NoArgsConstructor @Data public class SqlListResult { - @JSONField(name = "ResultCode") private int ResultCode; @JSONField(name = "Content") @@ -22,7 +21,6 @@ public class SqlListResult { @NoArgsConstructor @Data public static class ContentBean { - private String serviceId; private String address; diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/WallResult.java b/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/WallResult.java index c2c34cd3ac..76d5588121 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/WallResult.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/WallResult.java @@ -15,7 +15,6 @@ @Data @NoArgsConstructor public class WallResult { - @JSONField(name = "ResultCode") private int ResultCode; @JSONField(name = "Content") @@ -54,7 +53,6 @@ public static class ContentBean { @NoArgsConstructor @Data public static class TablesBean { - @JSONField(name = "name") private String name; diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/WebResult.java b/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/WebResult.java index 53324b8356..65922eebfa 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/WebResult.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/model/dto/WebResult.java @@ -13,7 +13,6 @@ @NoArgsConstructor @Data public class WebResult { - @JSONField(name = "ResultCode") private int ResultCode; @JSONField(name = "Content") diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/service/MonitorStatService.java b/druid-admin/src/main/java/com/alibaba/druid/admin/service/MonitorStatService.java index 0791330cf0..a3221243e0 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/service/MonitorStatService.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/service/MonitorStatService.java @@ -40,12 +40,11 @@ @Slf4j @Component public class MonitorStatService implements DruidStatServiceMBean { + public static final int RESULT_CODE_SUCCESS = 1; + public static final int RESULT_CODE_ERROR = -1; - public final static int RESULT_CODE_SUCCESS = 1; - public final static int RESULT_CODE_ERROR = -1; - - private final static int DEFAULT_PAGE = 1; - private final static int DEFAULT_PER_PAGE_COUNT = Integer.MAX_VALUE; + private static final int DEFAULT_PAGE = 1; + private static final int DEFAULT_PER_PAGE_COUNT = Integer.MAX_VALUE; private static final String ORDER_TYPE_DESC = "desc"; private static final String ORDER_TYPE_ASC = "asc"; private static final String DEFAULT_ORDER_TYPE = ORDER_TYPE_ASC; diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/servlet/MonitorViewServlet.java b/druid-admin/src/main/java/com/alibaba/druid/admin/servlet/MonitorViewServlet.java index 8461b95046..c321d50473 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/servlet/MonitorViewServlet.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/servlet/MonitorViewServlet.java @@ -13,7 +13,6 @@ **/ @Slf4j public class MonitorViewServlet extends ResourceServlet { - private MonitorStatService monitorStatService; public MonitorViewServlet() { diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/util/HttpUtil.java b/druid-admin/src/main/java/com/alibaba/druid/admin/util/HttpUtil.java index 7ed769bf04..17cd02cab0 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/util/HttpUtil.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/util/HttpUtil.java @@ -16,7 +16,6 @@ * @date 2020-09-16 16:12 **/ public class HttpUtil { - public static T get(String url, Class resultType) { CloseableHttpClient httpClient = HttpClients.createDefault(); HttpGet httpGet = new HttpGet(url); diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java index 665e6b2657..2e9abd9146 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java @@ -47,7 +47,6 @@ DruidWebStatFilterConfiguration.class, DruidFilterConfiguration.class}) public class DruidDataSourceAutoConfigure { - private static final Logger LOGGER = LoggerFactory.getLogger(DruidDataSourceAutoConfigure.class); @Bean(initMethod = "init") diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceBuilder.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceBuilder.java index 7384e2f5d7..20416c091b 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceBuilder.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceBuilder.java @@ -23,7 +23,6 @@ * @author lihengming [89921218@qq.com] */ public class DruidDataSourceBuilder { - public static DruidDataSourceBuilder create() { return new DruidDataSourceBuilder(); } diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java index c604ee040e..dd0230c813 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java @@ -30,7 +30,6 @@ * @author lihengming [89921218@qq.com] */ public class DruidFilterConfiguration { - @Bean @ConfigurationProperties(FILTER_STAT_PREFIX) @ConditionalOnProperty(prefix = FILTER_STAT_PREFIX, name = "enabled") diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java index ad04ab620b..8c8e2223e4 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java @@ -30,7 +30,6 @@ */ @ConditionalOnProperty("spring.datasource.druid.aop-patterns") public class DruidSpringAopConfiguration { - @Bean public Advice advice() { return new DruidStatInterceptor(); diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/Issue1796Configurer.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/Issue1796Configurer.java index 8353b2f3b8..535ab805eb 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/Issue1796Configurer.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/Issue1796Configurer.java @@ -10,7 +10,6 @@ /*@Configuration @Profile("issue-1796")*/ public class Issue1796Configurer { - @Bean public DataSource dataSource(Environment environment) { return DruidDataSourceBuilder diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java index 0901333dfa..ca24c66cb1 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java @@ -33,7 +33,6 @@ @RunWith(SpringRunner.class) @SpringBootTest(classes = DemoApplication.class) public class DruidDataSourceTestCase { - @Resource private DruidDataSource dataSource; diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidFilterTestCase.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidFilterTestCase.java index ca50620fb9..030e4ac239 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidFilterTestCase.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidFilterTestCase.java @@ -47,13 +47,11 @@ public void test() { @Configuration @ComponentScan public static class Config{ - /** * @author dk */ @Component public static class SomeCustomFilter extends FilterAdapter { - private static Logger logger = LoggerFactory.getLogger(SomeCustomFilter.class); @Override diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidMultiDataSourceTestCase.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidMultiDataSourceTestCase.java index ef4fcbbb4a..cbb9d815c6 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidMultiDataSourceTestCase.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidMultiDataSourceTestCase.java @@ -37,7 +37,6 @@ @SpringBootTest(classes = DemoApplication.class) @ActiveProfiles("multi-datasource") public class DruidMultiDataSourceTestCase { - @Resource private DruidDataSource dataSourceOne; @Resource @@ -45,7 +44,6 @@ public class DruidMultiDataSourceTestCase { @Test public void testDataSourceOne() throws SQLException { - assertThat(dataSourceOne.getUrl()).isEqualTo("jdbc:h2:file:./demo-db"); assertThat(dataSourceOne.getUsername()).isEqualTo("sa"); assertThat(dataSourceOne.getPassword()).isEqualTo("sa"); @@ -58,7 +56,6 @@ public void testDataSourceOne() throws SQLException { } @Test public void testDataSourceTwo() throws SQLException { - assertThat(dataSourceTwo.getUrl()).isEqualTo("jdbc:h2:file:./demo-db"); assertThat(dataSourceTwo.getUsername()).isEqualTo("sa"); assertThat(dataSourceTwo.getPassword()).isEqualTo("sa"); diff --git a/druid-wrapper/src/main/java/com/mchange/v2/c3p0/ComboPooledDataSource.java b/druid-wrapper/src/main/java/com/mchange/v2/c3p0/ComboPooledDataSource.java index b08a574f42..16e9958641 100755 --- a/druid-wrapper/src/main/java/com/mchange/v2/c3p0/ComboPooledDataSource.java +++ b/druid-wrapper/src/main/java/com/mchange/v2/c3p0/ComboPooledDataSource.java @@ -3,5 +3,4 @@ import com.alibaba.druid.pool.DruidDataSourceC3P0Adapter; public class ComboPooledDataSource extends DruidDataSourceC3P0Adapter implements PooledDataSource { - } diff --git a/druid-wrapper/src/main/java/com/mchange/v2/c3p0/PooledDataSource.java b/druid-wrapper/src/main/java/com/mchange/v2/c3p0/PooledDataSource.java index 56d35fc709..789d959ee0 100755 --- a/druid-wrapper/src/main/java/com/mchange/v2/c3p0/PooledDataSource.java +++ b/druid-wrapper/src/main/java/com/mchange/v2/c3p0/PooledDataSource.java @@ -4,5 +4,4 @@ public interface PooledDataSource extends DataSource { - } diff --git a/druid-wrapper/src/main/java/org/apache/commons/dbcp/BasicDataSource.java b/druid-wrapper/src/main/java/org/apache/commons/dbcp/BasicDataSource.java index a3d8e09720..7aa67e707d 100755 --- a/druid-wrapper/src/main/java/org/apache/commons/dbcp/BasicDataSource.java +++ b/druid-wrapper/src/main/java/org/apache/commons/dbcp/BasicDataSource.java @@ -3,7 +3,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class BasicDataSource extends DruidDataSource implements BasicDataSourceMBean { - private static final long serialVersionUID = 1L; } diff --git a/druid-wrapper/src/main/java/org/apache/commons/dbcp/BasicDataSourceMBean.java b/druid-wrapper/src/main/java/org/apache/commons/dbcp/BasicDataSourceMBean.java index 3a0febed08..5d00b56af9 100755 --- a/druid-wrapper/src/main/java/org/apache/commons/dbcp/BasicDataSourceMBean.java +++ b/druid-wrapper/src/main/java/org/apache/commons/dbcp/BasicDataSourceMBean.java @@ -3,5 +3,4 @@ import com.alibaba.druid.pool.DruidDataSourceMBean; public interface BasicDataSourceMBean extends DruidDataSourceMBean { - } diff --git a/druid-wrapper/src/main/java/org/apache/commons/dbcp/ManagedBasicDataSource.java b/druid-wrapper/src/main/java/org/apache/commons/dbcp/ManagedBasicDataSource.java index 331c130b30..d939d2debb 100755 --- a/druid-wrapper/src/main/java/org/apache/commons/dbcp/ManagedBasicDataSource.java +++ b/druid-wrapper/src/main/java/org/apache/commons/dbcp/ManagedBasicDataSource.java @@ -1,7 +1,6 @@ package org.apache.commons.dbcp; public class ManagedBasicDataSource extends BasicDataSource implements BasicDataSourceMBean { - private static final long serialVersionUID = 1L; } diff --git a/druid-wrapper/src/main/java/org/apache/commons/dbcp/ManagedBasicDataSourceFactory.java b/druid-wrapper/src/main/java/org/apache/commons/dbcp/ManagedBasicDataSourceFactory.java index 7dc1384da8..7c8d1166cf 100755 --- a/druid-wrapper/src/main/java/org/apache/commons/dbcp/ManagedBasicDataSourceFactory.java +++ b/druid-wrapper/src/main/java/org/apache/commons/dbcp/ManagedBasicDataSourceFactory.java @@ -5,7 +5,6 @@ import javax.sql.DataSource; public class ManagedBasicDataSourceFactory extends BasicDataSourceFactory { - public static DataSource createDataSource(Properties properties) throws Exception { ManagedBasicDataSource dataSource = new ManagedBasicDataSource(); config(dataSource, properties); diff --git a/druid-wrapper/src/main/java/org/apache/commons/dbcp/ManagedBasicDataSourceMBean.java b/druid-wrapper/src/main/java/org/apache/commons/dbcp/ManagedBasicDataSourceMBean.java index d4deee618d..aa57898dd5 100755 --- a/druid-wrapper/src/main/java/org/apache/commons/dbcp/ManagedBasicDataSourceMBean.java +++ b/druid-wrapper/src/main/java/org/apache/commons/dbcp/ManagedBasicDataSourceMBean.java @@ -2,5 +2,4 @@ public interface ManagedBasicDataSourceMBean extends BasicDataSourceMBean { - } diff --git a/druid-wrapper/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java b/druid-wrapper/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java index 2afb0b7d72..df1084d757 100755 --- a/druid-wrapper/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java +++ b/druid-wrapper/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java @@ -3,7 +3,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class BasicDataSource extends DruidDataSource implements BasicDataSourceMBean { - private static final long serialVersionUID = 1L; } diff --git a/druid-wrapper/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMBean.java b/druid-wrapper/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMBean.java index 128364e635..78463a3469 100755 --- a/druid-wrapper/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMBean.java +++ b/druid-wrapper/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMBean.java @@ -3,5 +3,4 @@ import com.alibaba.druid.pool.DruidDataSourceMBean; public interface BasicDataSourceMBean extends DruidDataSourceMBean { - } diff --git a/druid-wrapper/src/main/java/org/logicalcobwebs/proxool/ProxoolConstants.java b/druid-wrapper/src/main/java/org/logicalcobwebs/proxool/ProxoolConstants.java index 5d1d7faf10..628c041cf1 100755 --- a/druid-wrapper/src/main/java/org/logicalcobwebs/proxool/ProxoolConstants.java +++ b/druid-wrapper/src/main/java/org/logicalcobwebs/proxool/ProxoolConstants.java @@ -7,7 +7,6 @@ public interface ProxoolConstants { - public final String PROXOOL = "proxool"; /** diff --git a/druid-wrapper/src/main/java/org/logicalcobwebs/proxool/ProxoolDataSource.java b/druid-wrapper/src/main/java/org/logicalcobwebs/proxool/ProxoolDataSource.java index c2b09a3c0d..88627060cb 100755 --- a/druid-wrapper/src/main/java/org/logicalcobwebs/proxool/ProxoolDataSource.java +++ b/druid-wrapper/src/main/java/org/logicalcobwebs/proxool/ProxoolDataSource.java @@ -21,13 +21,11 @@ import com.alibaba.druid.pool.DruidDataSource; public class ProxoolDataSource implements DataSource, ObjectFactory { - private DruidDataSource druid = new DruidDataSource(); private Properties delegateProperties = new Properties(); public ProxoolDataSource(){ - } public ProxoolDataSource(String alias){ @@ -110,7 +108,6 @@ public long getMaximumConnectionLifetime() { @Deprecated public void setMaximumConnectionLifetime(int maximumConnectionLifetime) { - } @Deprecated @@ -120,7 +117,6 @@ public int getPrototypeCount() { @Deprecated public void setPrototypeCount(int prototypeCount) { - } public int getMinimumConnectionCount() { @@ -152,7 +148,6 @@ public int getSimultaneousBuildThrottle() { } public void setSimultaneousBuildThrottle(int simultaneousBuildThrottle) { - } public long getRecentlyStartedThreshold() { @@ -160,7 +155,6 @@ public long getRecentlyStartedThreshold() { } public void setRecentlyStartedThreshold(int recentlyStartedThreshold) { - } public long getOverloadWithoutRefusalLifetime() { @@ -168,7 +162,6 @@ public long getOverloadWithoutRefusalLifetime() { } public void setOverloadWithoutRefusalLifetime(int overloadWithoutRefusalLifetime) { - } public long getMaximumActiveTime() { @@ -185,7 +178,6 @@ public boolean isVerbose() { @Deprecated public void setVerbose(boolean verbose) { - } public boolean isTrace() { @@ -216,7 +208,6 @@ public String getFatalSqlExceptionsAsString() { @Deprecated public void setFatalSqlExceptionsAsString(String fatalSqlExceptionsAsString) { - } public String getFatalSqlExceptionWrapperClass() { @@ -224,7 +215,6 @@ public String getFatalSqlExceptionWrapperClass() { } public void setFatalSqlExceptionWrapperClass(String fatalSqlExceptionWrapperClass) { - } public String getHouseKeepingTestSql() { @@ -256,7 +246,6 @@ public boolean isJmx() { } public void setJmx(boolean jmx) { - } @Deprecated @@ -266,7 +255,6 @@ public String getJmxAgentId() { @Deprecated public void setJmxAgentId(String jmxAgentId) { - } public boolean isTestBeforeUse() { diff --git a/pom.xml b/pom.xml index 6b396c6daa..cab1b20791 100644 --- a/pom.xml +++ b/pom.xml @@ -187,6 +187,36 @@ true + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.2 + + + com.puppycrawl.tools + checkstyle + 9.2 + + + + + checkstyle + validate + + check + + + false + true + false + src/checkstyle/druid-checks.xml + + + + + + diff --git a/src/checkstyle/druid-checks.xml b/src/checkstyle/druid-checks.xml new file mode 100644 index 0000000000..a654bb4046 --- /dev/null +++ b/src/checkstyle/druid-checks.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/alibaba/druid/Constants.java b/src/main/java/com/alibaba/druid/Constants.java index 7b2709ddd0..28a3b90662 100644 --- a/src/main/java/com/alibaba/druid/Constants.java +++ b/src/main/java/com/alibaba/druid/Constants.java @@ -16,8 +16,7 @@ package com.alibaba.druid; public interface Constants { + public static final String DRUID_STAT_SQL_MAX_SIZE = "druid.stat.sql.MaxSize"; - public final static String DRUID_STAT_SQL_MAX_SIZE = "druid.stat.sql.MaxSize"; - - public final static String DRUID_TIME_BETWEEN_LOG_STATS_MILLIS = "druid.timeBetweenLogStatsMillis"; + public static final String DRUID_TIME_BETWEEN_LOG_STATS_MILLIS = "druid.timeBetweenLogStatsMillis"; } diff --git a/src/main/java/com/alibaba/druid/DbType.java b/src/main/java/com/alibaba/druid/DbType.java index 18af1fe0df..219c035b2e 100644 --- a/src/main/java/com/alibaba/druid/DbType.java +++ b/src/main/java/com/alibaba/druid/DbType.java @@ -3,84 +3,82 @@ import com.alibaba.druid.util.FnvHash; public enum DbType { - other (1 << 0), - jtds (1 << 1), - hsql (1 << 2), - db2 (1 << 3), - postgresql (1 << 4), - - sqlserver (1 << 5), - oracle (1 << 6), - mysql (1 << 7), - mariadb (1 << 8), - derby (1 << 9), - - hive (1 << 10), - h2 (1 << 11), - dm (1 << 12), // dm.jdbc.driver.DmDriver - kingbase (1 << 13), - gbase (1 << 14), - - oceanbase (1 << 15), - informix (1 << 16), - odps (1 << 17), - teradata (1 << 18), - phoenix (1 << 19), - - edb (1 << 20), - kylin (1 << 21), // org.apache.kylin.jdbc.Driver - sqlite (1 << 22), - ads (1 << 23), - presto (1 << 24), - - elastic_search (1 << 25), // com.alibaba.xdriver.elastic.jdbc.ElasticDriver - hbase (1 << 26), - drds (1 << 27), - - clickhouse (1 << 28), - blink (1 << 29), + other(1 << 0), + jtds(1 << 1), + hsql(1 << 2), + db2(1 << 3), + postgresql(1 << 4), + + sqlserver(1 << 5), + oracle(1 << 6), + mysql(1 << 7), + mariadb(1 << 8), + derby(1 << 9), + + hive(1 << 10), + h2(1 << 11), + dm(1 << 12), // dm.jdbc.driver.DmDriver + kingbase(1 << 13), + gbase(1 << 14), + + oceanbase(1 << 15), + informix(1 << 16), + odps(1 << 17), + teradata(1 << 18), + phoenix(1 << 19), + + edb(1 << 20), + kylin(1 << 21), // org.apache.kylin.jdbc.Driver + sqlite(1 << 22), + ads(1 << 23), + presto(1 << 24), + + elastic_search(1 << 25), // com.alibaba.xdriver.elastic.jdbc.ElasticDriver + hbase(1 << 26), + drds(1 << 27), + + clickhouse(1 << 28), + blink(1 << 29), antspark(1 << 30), - oceanbase_oracle (1 << 31), - polardb (1 << 32), + oceanbase_oracle(1 << 31), + polardb(1 << 32), - ali_oracle (1 << 33), - mock (1 << 34), - sybase (1 << 35), - highgo (1 << 36), + ali_oracle(1 << 33), + mock(1 << 34), + sybase(1 << 35), + highgo(1 << 36), /** * 非常成熟的开源mpp数据库 */ - greenplum (1 << 37), + greenplum(1 << 37), /** * 华为的mpp数据库 */ - gaussdb (1 << 38), - - trino (1 << 39), - - oscar (1 << 40), - - tidb ( 1 << 41), - - tydb ( 1 << 42), - - ingres (0), - cloudscape (0), - timesten (0), - as400 (0), - sapdb (0), - kdb (0), - log4jdbc (0), - xugu (0), - firebirdsql (0), - JSQLConnect (0), - JTurbo (0), - interbase (0), - pointbase (0), - edbc (0), - mimer (0), - - ; + gaussdb(1 << 38), + + trino(1 << 39), + + oscar(1 << 40), + + tidb(1 << 41), + + tydb(1 << 42), + + ingres(0), + cloudscape(0), + timesten(0), + as400(0), + sapdb(0), + kdb(0), + log4jdbc(0), + xugu(0), + firebirdsql(0), + JSQLConnect(0), + JTurbo(0), + interbase(0), + pointbase(0), + edbc(0), + mimer(0); public final long mask; public final long hashCode64; diff --git a/src/main/java/com/alibaba/druid/DruidRuntimeException.java b/src/main/java/com/alibaba/druid/DruidRuntimeException.java index 68c897252c..4c8593a18f 100644 --- a/src/main/java/com/alibaba/druid/DruidRuntimeException.java +++ b/src/main/java/com/alibaba/druid/DruidRuntimeException.java @@ -16,22 +16,21 @@ package com.alibaba.druid; public class DruidRuntimeException extends RuntimeException { - private static final long serialVersionUID = 1L; - public DruidRuntimeException(){ + public DruidRuntimeException() { super(); } - public DruidRuntimeException(String message, Throwable cause){ + public DruidRuntimeException(String message, Throwable cause) { super(message, cause); } - public DruidRuntimeException(String message){ + public DruidRuntimeException(String message) { super(message); } - public DruidRuntimeException(Throwable cause){ + public DruidRuntimeException(Throwable cause) { super(cause); } diff --git a/src/main/java/com/alibaba/druid/FastsqlColumnAmbiguousException.java b/src/main/java/com/alibaba/druid/FastsqlColumnAmbiguousException.java index 9e69cef818..62b9b27bd8 100644 --- a/src/main/java/com/alibaba/druid/FastsqlColumnAmbiguousException.java +++ b/src/main/java/com/alibaba/druid/FastsqlColumnAmbiguousException.java @@ -2,7 +2,6 @@ public class FastsqlColumnAmbiguousException extends FastsqlException { public FastsqlColumnAmbiguousException() { - } public FastsqlColumnAmbiguousException(String msg) { diff --git a/src/main/java/com/alibaba/druid/FastsqlException.java b/src/main/java/com/alibaba/druid/FastsqlException.java index f3e8e97b52..2e14998396 100644 --- a/src/main/java/com/alibaba/druid/FastsqlException.java +++ b/src/main/java/com/alibaba/druid/FastsqlException.java @@ -16,22 +16,21 @@ package com.alibaba.druid; public class FastsqlException extends RuntimeException { - private static final long serialVersionUID = 1L; - public FastsqlException(){ + public FastsqlException() { super(); } - public FastsqlException(String message, Throwable cause){ + public FastsqlException(String message, Throwable cause) { super(message, cause); } - public FastsqlException(String message){ + public FastsqlException(String message) { super(message); } - public FastsqlException(Throwable cause){ + public FastsqlException(Throwable cause) { super(cause); } diff --git a/src/main/java/com/alibaba/druid/TransactionTimeoutException.java b/src/main/java/com/alibaba/druid/TransactionTimeoutException.java index edf05d40dd..a0debf5f43 100644 --- a/src/main/java/com/alibaba/druid/TransactionTimeoutException.java +++ b/src/main/java/com/alibaba/druid/TransactionTimeoutException.java @@ -18,7 +18,6 @@ import java.sql.SQLException; public class TransactionTimeoutException extends SQLException { - private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/alibaba/druid/VERSION.java b/src/main/java/com/alibaba/druid/VERSION.java index 06292631b1..49fa920d8d 100644 --- a/src/main/java/com/alibaba/druid/VERSION.java +++ b/src/main/java/com/alibaba/druid/VERSION.java @@ -16,10 +16,9 @@ package com.alibaba.druid; public final class VERSION { - - public final static int MajorVersion = 1; - public final static int MinorVersion = 2; - public final static int RevisionVersion = 10; + public static final int MajorVersion = 1; + public static final int MinorVersion = 2; + public static final int RevisionVersion = 10; public static String getVersionNumber() { return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion; diff --git a/src/main/java/com/alibaba/druid/filter/AutoLoad.java b/src/main/java/com/alibaba/druid/filter/AutoLoad.java index 8b538ad299..22dfdaea17 100644 --- a/src/main/java/com/alibaba/druid/filter/AutoLoad.java +++ b/src/main/java/com/alibaba/druid/filter/AutoLoad.java @@ -25,8 +25,7 @@ */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.TYPE }) +@Target(ElementType.TYPE) public @interface AutoLoad { - boolean value() default true; } diff --git a/src/main/java/com/alibaba/druid/filter/Filter.java b/src/main/java/com/alibaba/druid/filter/Filter.java index 6e38a8af0a..6c8ba38edb 100644 --- a/src/main/java/com/alibaba/druid/filter/Filter.java +++ b/src/main/java/com/alibaba/druid/filter/Filter.java @@ -15,52 +15,24 @@ */ package com.alibaba.druid.filter; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import com.alibaba.druid.proxy.jdbc.*; + import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; import java.io.Writer; import java.math.BigDecimal; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.Date; -import java.sql.NClob; -import java.sql.ParameterMetaData; -import java.sql.Ref; -import java.sql.ResultSetMetaData; -import java.sql.RowId; -import java.sql.SQLClientInfoException; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.SQLXML; -import java.sql.Savepoint; -import java.sql.Statement; -import java.sql.Struct; -import java.sql.Time; -import java.sql.Timestamp; -import java.sql.Wrapper; +import java.sql.*; import java.util.Calendar; import java.util.Properties; import java.util.concurrent.Executor; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidPooledConnection; -import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; -import com.alibaba.druid.proxy.jdbc.ClobProxy; -import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.proxy.jdbc.DataSourceProxy; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetMetaDataProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetProxy; -import com.alibaba.druid.proxy.jdbc.StatementProxy; - /** * @author wenshao [szujobs@hotmail.com] */ public interface Filter extends Wrapper { - void init(DataSourceProxy dataSource); void destroy(); @@ -76,15 +48,15 @@ public interface Filter extends Wrapper { StatementProxy connection_createStatement(FilterChain chain, ConnectionProxy connection) throws SQLException; PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql) - throws SQLException; + throws SQLException; CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy connection, String sql) - throws SQLException; + throws SQLException; String connection_nativeSQL(FilterChain chain, ConnectionProxy connection, String sql) throws SQLException; void connection_setAutoCommit(FilterChain chain, ConnectionProxy connection, boolean autoCommit) - throws SQLException; + throws SQLException; boolean connection_getAutoCommit(FilterChain chain, ConnectionProxy connection) throws SQLException; @@ -107,7 +79,7 @@ void connection_setAutoCommit(FilterChain chain, ConnectionProxy connection, boo String connection_getCatalog(FilterChain chain, ConnectionProxy connection) throws SQLException; void connection_setTransactionIsolation(FilterChain chain, ConnectionProxy connection, int level) - throws SQLException; + throws SQLException; int connection_getTransactionIsolation(FilterChain chain, ConnectionProxy connection) throws SQLException; @@ -125,10 +97,10 @@ CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy int resultSetType, int resultSetConcurrency) throws SQLException; java.util.Map> connection_getTypeMap(FilterChain chain, ConnectionProxy connection) - throws SQLException; + throws SQLException; void connection_setTypeMap(FilterChain chain, ConnectionProxy connection, java.util.Map> map) - throws SQLException; + throws SQLException; void connection_setHoldability(FilterChain chain, ConnectionProxy connection, int holdability) throws SQLException; @@ -141,7 +113,7 @@ void connection_setTypeMap(FilterChain chain, ConnectionProxy connection, java.u void connection_rollback(FilterChain chain, ConnectionProxy connection, Savepoint savepoint) throws SQLException; void connection_releaseSavepoint(FilterChain chain, ConnectionProxy connection, Savepoint savepoint) - throws SQLException; + throws SQLException; StatementProxy connection_createStatement(FilterChain chain, ConnectionProxy connection, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException; @@ -152,16 +124,16 @@ PreparedStatementProxy connection_prepareStatement(FilterChain chain, Connection CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) - throws SQLException; + throws SQLException; PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql, int autoGeneratedKeys) throws SQLException; PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql, - int columnIndexes[]) throws SQLException; + int[] columnIndexes) throws SQLException; PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql, - String columnNames[]) throws SQLException; + String[] columnNames) throws SQLException; Clob connection_createClob(FilterChain chain, ConnectionProxy connection) throws SQLException; @@ -174,28 +146,32 @@ PreparedStatementProxy connection_prepareStatement(FilterChain chain, Connection boolean connection_isValid(FilterChain chain, ConnectionProxy connection, int timeout) throws SQLException; void connection_setClientInfo(FilterChain chain, ConnectionProxy connection, String name, String value) - throws SQLClientInfoException; + throws SQLClientInfoException; void connection_setClientInfo(FilterChain chain, ConnectionProxy connection, Properties properties) - throws SQLClientInfoException; + throws SQLClientInfoException; String connection_getClientInfo(FilterChain chain, ConnectionProxy connection, String name) throws SQLException; Properties connection_getClientInfo(FilterChain chain, ConnectionProxy connection) throws SQLException; Array connection_createArrayOf(FilterChain chain, ConnectionProxy connection, String typeName, Object[] elements) - throws SQLException; + throws SQLException; Struct connection_createStruct(FilterChain chain, ConnectionProxy connection, String typeName, Object[] attributes) - throws SQLException; - + throws SQLException; String connection_getSchema(FilterChain chain, ConnectionProxy connection) throws SQLException; + void connection_setSchema(FilterChain chain, ConnectionProxy connection, String schema) throws SQLException; void connection_abort(FilterChain chain, ConnectionProxy connection, Executor executor) throws SQLException; - void connection_setNetworkTimeout(FilterChain chain, ConnectionProxy connection, Executor executor, int milliseconds) throws SQLException; + void connection_setNetworkTimeout(FilterChain chain, + ConnectionProxy connection, + Executor executor, + int milliseconds) throws SQLException; + int connection_getNetworkTimeout(FilterChain chain, ConnectionProxy connection) throws SQLException; // /////////////// @@ -222,7 +198,7 @@ Struct connection_createStruct(FilterChain chain, ConnectionProxy connection, St double resultSet_getDouble(FilterChain chain, ResultSetProxy resultSet, int columnIndex) throws SQLException; BigDecimal resultSet_getBigDecimal(FilterChain chain, ResultSetProxy resultSet, int columnIndex, int scale) - throws SQLException; + throws SQLException; byte[] resultSet_getBytes(FilterChain chain, ResultSetProxy resultSet, int columnIndex) throws SQLException; @@ -233,13 +209,13 @@ BigDecimal resultSet_getBigDecimal(FilterChain chain, ResultSetProxy resultSet, Timestamp resultSet_getTimestamp(FilterChain chain, ResultSetProxy resultSet, int columnIndex) throws SQLException; java.io.InputStream resultSet_getAsciiStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException; + throws SQLException; java.io.InputStream resultSet_getUnicodeStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException; + throws SQLException; java.io.InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException; + throws SQLException; String resultSet_getString(FilterChain chain, ResultSetProxy resultSet, String columnLabel) throws SQLException; @@ -258,27 +234,27 @@ java.io.InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy double resultSet_getDouble(FilterChain chain, ResultSetProxy resultSet, String columnLabel) throws SQLException; BigDecimal resultSet_getBigDecimal(FilterChain chain, ResultSetProxy resultSet, String columnLabel, int scale) - throws SQLException; + throws SQLException; byte[] resultSet_getBytes(FilterChain chain, ResultSetProxy resultSet, String columnLabel) throws SQLException; java.sql.Date resultSet_getDate(FilterChain chain, ResultSetProxy resultSet, String columnLabel) - throws SQLException; + throws SQLException; java.sql.Time resultSet_getTime(FilterChain chain, ResultSetProxy resultSet, String columnLabel) - throws SQLException; + throws SQLException; java.sql.Timestamp resultSet_getTimestamp(FilterChain chain, ResultSetProxy resultSet, String columnLabel) - throws SQLException; + throws SQLException; java.io.InputStream resultSet_getAsciiStream(FilterChain chain, ResultSetProxy resultSet, String columnLabel) - throws SQLException; + throws SQLException; java.io.InputStream resultSet_getUnicodeStream(FilterChain chain, ResultSetProxy resultSet, String columnLabel) - throws SQLException; + throws SQLException; java.io.InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy resultSet, String columnLabel) - throws SQLException; + throws SQLException; SQLWarning resultSet_getWarnings(FilterChain chain, ResultSetProxy resultSet) throws SQLException; @@ -290,25 +266,31 @@ java.io.InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy Object resultSet_getObject(FilterChain chain, ResultSetProxy resultSet, int columnIndex) throws SQLException; - T resultSet_getObject(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Class type) throws SQLException; + T resultSet_getObject(FilterChain chain, + ResultSetProxy resultSet, + int columnIndex, + Class type) throws SQLException; Object resultSet_getObject(FilterChain chain, ResultSetProxy resultSet, String columnLabel) throws SQLException; - T resultSet_getObject(FilterChain chain, ResultSetProxy resultSet, String columnLabel, Class type) throws SQLException; + T resultSet_getObject(FilterChain chain, + ResultSetProxy resultSet, + String columnLabel, + Class type) throws SQLException; int resultSet_findColumn(FilterChain chain, ResultSetProxy resultSet, String columnLabel) throws SQLException; java.io.Reader resultSet_getCharacterStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException; + throws SQLException; java.io.Reader resultSet_getCharacterStream(FilterChain chain, ResultSetProxy resultSet, String columnLabel) - throws SQLException; + throws SQLException; BigDecimal resultSet_getBigDecimal(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException; + throws SQLException; BigDecimal resultSet_getBigDecimal(FilterChain chain, ResultSetProxy resultSet, String columnLabel) - throws SQLException; + throws SQLException; boolean resultSet_isBeforeFirst(FilterChain chain, ResultSetProxy resultSet) throws SQLException; @@ -355,40 +337,40 @@ BigDecimal resultSet_getBigDecimal(FilterChain chain, ResultSetProxy resultSet, void resultSet_updateNull(FilterChain chain, ResultSetProxy resultSet, int columnIndex) throws SQLException; void resultSet_updateBoolean(FilterChain chain, ResultSetProxy resultSet, int columnIndex, boolean x) - throws SQLException; + throws SQLException; void resultSet_updateByte(FilterChain chain, ResultSetProxy resultSet, int columnIndex, byte x) throws SQLException; void resultSet_updateShort(FilterChain chain, ResultSetProxy resultSet, int columnIndex, short x) - throws SQLException; + throws SQLException; void resultSet_updateInt(FilterChain chain, ResultSetProxy resultSet, int columnIndex, int x) throws SQLException; void resultSet_updateLong(FilterChain chain, ResultSetProxy resultSet, int columnIndex, long x) throws SQLException; void resultSet_updateFloat(FilterChain chain, ResultSetProxy resultSet, int columnIndex, float x) - throws SQLException; + throws SQLException; void resultSet_updateDouble(FilterChain chain, ResultSetProxy resultSet, int columnIndex, double x) - throws SQLException; + throws SQLException; void resultSet_updateBigDecimal(FilterChain chain, ResultSetProxy resultSet, int columnIndex, BigDecimal x) - throws SQLException; + throws SQLException; void resultSet_updateString(FilterChain chain, ResultSetProxy resultSet, int columnIndex, String x) - throws SQLException; + throws SQLException; - void resultSet_updateBytes(FilterChain chain, ResultSetProxy resultSet, int columnIndex, byte x[]) - throws SQLException; + void resultSet_updateBytes(FilterChain chain, ResultSetProxy resultSet, int columnIndex, byte[] x) + throws SQLException; void resultSet_updateDate(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Date x) - throws SQLException; + throws SQLException; void resultSet_updateTime(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Time x) - throws SQLException; + throws SQLException; void resultSet_updateTimestamp(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Timestamp x) - throws SQLException; + throws SQLException; void resultSet_updateAsciiStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.io.InputStream x, int length) throws SQLException; @@ -403,48 +385,51 @@ void resultSet_updateObject(FilterChain chain, ResultSetProxy resultSet, int col int scaleOrLength) throws SQLException; void resultSet_updateObject(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Object x) - throws SQLException; + throws SQLException; void resultSet_updateNull(FilterChain chain, ResultSetProxy resultSet, String columnLabel) throws SQLException; void resultSet_updateBoolean(FilterChain chain, ResultSetProxy resultSet, String columnLabel, boolean x) - throws SQLException; + throws SQLException; void resultSet_updateByte(FilterChain chain, ResultSetProxy resultSet, String columnLabel, byte x) - throws SQLException; + throws SQLException; void resultSet_updateShort(FilterChain chain, ResultSetProxy resultSet, String columnLabel, short x) - throws SQLException; + throws SQLException; void resultSet_updateInt(FilterChain chain, ResultSetProxy resultSet, String columnLabel, int x) - throws SQLException; + throws SQLException; void resultSet_updateLong(FilterChain chain, ResultSetProxy resultSet, String columnLabel, long x) - throws SQLException; + throws SQLException; void resultSet_updateFloat(FilterChain chain, ResultSetProxy resultSet, String columnLabel, float x) - throws SQLException; + throws SQLException; void resultSet_updateDouble(FilterChain chain, ResultSetProxy resultSet, String columnLabel, double x) - throws SQLException; + throws SQLException; void resultSet_updateBigDecimal(FilterChain chain, ResultSetProxy resultSet, String columnLabel, BigDecimal x) - throws SQLException; + throws SQLException; void resultSet_updateString(FilterChain chain, ResultSetProxy resultSet, String columnLabel, String x) - throws SQLException; + throws SQLException; - void resultSet_updateBytes(FilterChain chain, ResultSetProxy resultSet, String columnLabel, byte x[]) - throws SQLException; + void resultSet_updateBytes(FilterChain chain, ResultSetProxy resultSet, String columnLabel, byte[] x) + throws SQLException; void resultSet_updateDate(FilterChain chain, ResultSetProxy resultSet, String columnLabel, java.sql.Date x) - throws SQLException; + throws SQLException; void resultSet_updateTime(FilterChain chain, ResultSetProxy resultSet, String columnLabel, java.sql.Time x) - throws SQLException; + throws SQLException; - void resultSet_updateTimestamp(FilterChain chain, ResultSetProxy resultSet, String columnLabel, java.sql.Timestamp x) - throws SQLException; + void resultSet_updateTimestamp(FilterChain chain, + ResultSetProxy resultSet, + String columnLabel, + java.sql.Timestamp x) + throws SQLException; void resultSet_updateAsciiStream(FilterChain chain, ResultSetProxy resultSet, String columnLabel, java.io.InputStream x, int length) throws SQLException; @@ -459,7 +444,7 @@ void resultSet_updateObject(FilterChain chain, ResultSetProxy resultSet, String int scaleOrLength) throws SQLException; void resultSet_updateObject(FilterChain chain, ResultSetProxy resultSet, String columnLabel, Object x) - throws SQLException; + throws SQLException; void resultSet_insertRow(FilterChain chain, ResultSetProxy resultSet) throws SQLException; @@ -500,19 +485,22 @@ Object resultSet_getObject(FilterChain chain, ResultSetProxy resultSet, String c Array resultSet_getArray(FilterChain chain, ResultSetProxy resultSet, String columnLabel) throws SQLException; java.sql.Date resultSet_getDate(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Calendar cal) - throws SQLException; + throws SQLException; java.sql.Date resultSet_getDate(FilterChain chain, ResultSetProxy resultSet, String columnLabel, Calendar cal) - throws SQLException; + throws SQLException; java.sql.Time resultSet_getTime(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Calendar cal) - throws SQLException; + throws SQLException; java.sql.Time resultSet_getTime(FilterChain chain, ResultSetProxy resultSet, String columnLabel, Calendar cal) - throws SQLException; + throws SQLException; - java.sql.Timestamp resultSet_getTimestamp(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Calendar cal) - throws SQLException; + java.sql.Timestamp resultSet_getTimestamp(FilterChain chain, + ResultSetProxy resultSet, + int columnIndex, + Calendar cal) + throws SQLException; java.sql.Timestamp resultSet_getTimestamp(FilterChain chain, ResultSetProxy resultSet, String columnLabel, Calendar cal) throws SQLException; @@ -522,54 +510,54 @@ java.sql.Timestamp resultSet_getTimestamp(FilterChain chain, ResultSetProxy resu java.net.URL resultSet_getURL(FilterChain chain, ResultSetProxy resultSet, String columnLabel) throws SQLException; void resultSet_updateRef(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Ref x) - throws SQLException; + throws SQLException; void resultSet_updateRef(FilterChain chain, ResultSetProxy resultSet, String columnLabel, java.sql.Ref x) - throws SQLException; + throws SQLException; void resultSet_updateBlob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Blob x) - throws SQLException; + throws SQLException; void resultSet_updateBlob(FilterChain chain, ResultSetProxy resultSet, String columnLabel, java.sql.Blob x) - throws SQLException; + throws SQLException; void resultSet_updateClob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Clob x) - throws SQLException; + throws SQLException; void resultSet_updateClob(FilterChain chain, ResultSetProxy resultSet, String columnLabel, java.sql.Clob x) - throws SQLException; + throws SQLException; void resultSet_updateArray(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Array x) - throws SQLException; + throws SQLException; void resultSet_updateArray(FilterChain chain, ResultSetProxy resultSet, String columnLabel, java.sql.Array x) - throws SQLException; + throws SQLException; RowId resultSet_getRowId(FilterChain chain, ResultSetProxy resultSet, int columnIndex) throws SQLException; RowId resultSet_getRowId(FilterChain chain, ResultSetProxy resultSet, String columnLabel) throws SQLException; void resultSet_updateRowId(FilterChain chain, ResultSetProxy resultSet, int columnIndex, RowId x) - throws SQLException; + throws SQLException; void resultSet_updateRowId(FilterChain chain, ResultSetProxy resultSet, String columnLabel, RowId x) - throws SQLException; + throws SQLException; int resultSet_getHoldability(FilterChain chain, ResultSetProxy resultSet) throws SQLException; boolean resultSet_isClosed(FilterChain chain, ResultSetProxy resultSet) throws SQLException; void resultSet_updateNString(FilterChain chain, ResultSetProxy resultSet, int columnIndex, String nString) - throws SQLException; + throws SQLException; void resultSet_updateNString(FilterChain chain, ResultSetProxy resultSet, String columnLabel, String nString) - throws SQLException; + throws SQLException; void resultSet_updateNClob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, NClob nClob) - throws SQLException; + throws SQLException; void resultSet_updateNClob(FilterChain chain, ResultSetProxy resultSet, String columnLabel, NClob nClob) - throws SQLException; + throws SQLException; NClob resultSet_getNClob(FilterChain chain, ResultSetProxy resultSet, int columnIndex) throws SQLException; @@ -580,20 +568,20 @@ void resultSet_updateNClob(FilterChain chain, ResultSetProxy resultSet, String c SQLXML resultSet_getSQLXML(FilterChain chain, ResultSetProxy resultSet, String columnLabel) throws SQLException; void resultSet_updateSQLXML(FilterChain chain, ResultSetProxy resultSet, int columnIndex, SQLXML xmlObject) - throws SQLException; + throws SQLException; void resultSet_updateSQLXML(FilterChain chain, ResultSetProxy resultSet, String columnLabel, SQLXML xmlObject) - throws SQLException; + throws SQLException; String resultSet_getNString(FilterChain chain, ResultSetProxy resultSet, int columnIndex) throws SQLException; String resultSet_getNString(FilterChain chain, ResultSetProxy resultSet, String columnLabel) throws SQLException; java.io.Reader resultSet_getNCharacterStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException; + throws SQLException; java.io.Reader resultSet_getNCharacterStream(FilterChain chain, ResultSetProxy resultSet, String columnLabel) - throws SQLException; + throws SQLException; void resultSet_updateNCharacterStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.io.Reader x, long length) throws SQLException; @@ -626,31 +614,37 @@ void resultSet_updateBlob(FilterChain chain, ResultSetProxy resultSet, String co long length) throws SQLException; void resultSet_updateClob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Reader reader, long length) - throws SQLException; + throws SQLException; void resultSet_updateClob(FilterChain chain, ResultSetProxy resultSet, String columnLabel, Reader reader, long length) throws SQLException; void resultSet_updateNClob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Reader reader, long length) - throws SQLException; + throws SQLException; void resultSet_updateNClob(FilterChain chain, ResultSetProxy resultSet, String columnLabel, Reader reader, long length) throws SQLException; - void resultSet_updateNCharacterStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.io.Reader x) - throws SQLException; + void resultSet_updateNCharacterStream(FilterChain chain, + ResultSetProxy resultSet, + int columnIndex, + java.io.Reader x) + throws SQLException; void resultSet_updateNCharacterStream(FilterChain chain, ResultSetProxy resultSet, String columnLabel, java.io.Reader reader) throws SQLException; - void resultSet_updateAsciiStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.io.InputStream x) - throws SQLException; + void resultSet_updateAsciiStream(FilterChain chain, + ResultSetProxy resultSet, + int columnIndex, + java.io.InputStream x) + throws SQLException; void resultSet_updateBinaryStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.io.InputStream x) throws SQLException; void resultSet_updateCharacterStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.io.Reader x) - throws SQLException; + throws SQLException; void resultSet_updateAsciiStream(FilterChain chain, ResultSetProxy resultSet, String columnLabel, java.io.InputStream x) throws SQLException; @@ -662,22 +656,22 @@ void resultSet_updateCharacterStream(FilterChain chain, ResultSetProxy resultSet java.io.Reader reader) throws SQLException; void resultSet_updateBlob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, InputStream inputStream) - throws SQLException; + throws SQLException; void resultSet_updateBlob(FilterChain chain, ResultSetProxy resultSet, String columnLabel, InputStream inputStream) - throws SQLException; + throws SQLException; void resultSet_updateClob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Reader reader) - throws SQLException; + throws SQLException; void resultSet_updateClob(FilterChain chain, ResultSetProxy resultSet, String columnLabel, Reader reader) - throws SQLException; + throws SQLException; void resultSet_updateNClob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Reader reader) - throws SQLException; + throws SQLException; void resultSet_updateNClob(FilterChain chain, ResultSetProxy resultSet, String columnLabel, Reader reader) - throws SQLException; + throws SQLException; // / statement @@ -742,22 +736,22 @@ void resultSet_updateNClob(FilterChain chain, ResultSetProxy resultSet, String c ResultSetProxy statement_getGeneratedKeys(FilterChain chain, StatementProxy statement) throws SQLException; int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException; + throws SQLException; - int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException; + int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException; - int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, String columnNames[]) - throws SQLException; + int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, String[] columnNames) + throws SQLException; boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException; + throws SQLException; - boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException; + boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException; - boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, String columnNames[]) - throws SQLException; + boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, String[] columnNames) + throws SQLException; int statement_getResultSetHoldability(FilterChain chain, StatementProxy statement) throws SQLException; @@ -770,42 +764,45 @@ boolean statement_execute(FilterChain chain, StatementProxy statement, String sq // /// ResultSetProxy preparedStatement_executeQuery(FilterChain chain, PreparedStatementProxy statement) - throws SQLException; + throws SQLException; int preparedStatement_executeUpdate(FilterChain chain, PreparedStatementProxy statement) throws SQLException; void preparedStatement_setNull(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, int sqlType) - throws SQLException; + throws SQLException; - void preparedStatement_setBoolean(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, boolean x) - throws SQLException; + void preparedStatement_setBoolean(FilterChain chain, + PreparedStatementProxy statement, + int parameterIndex, + boolean x) + throws SQLException; void preparedStatement_setByte(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, byte x) - throws SQLException; + throws SQLException; void preparedStatement_setShort(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, short x) - throws SQLException; + throws SQLException; void preparedStatement_setInt(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, int x) - throws SQLException; + throws SQLException; void preparedStatement_setLong(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, long x) - throws SQLException; + throws SQLException; void preparedStatement_setFloat(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, float x) - throws SQLException; + throws SQLException; void preparedStatement_setDouble(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, double x) - throws SQLException; + throws SQLException; void preparedStatement_setBigDecimal(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, BigDecimal x) throws SQLException; void preparedStatement_setString(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, String x) - throws SQLException; + throws SQLException; - void preparedStatement_setBytes(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, byte x[]) - throws SQLException; + void preparedStatement_setBytes(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, byte[] x) + throws SQLException; void preparedStatement_setDate(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, java.sql.Date x) throws SQLException; @@ -831,7 +828,7 @@ void preparedStatement_setObject(FilterChain chain, PreparedStatementProxy state int targetSqlType) throws SQLException; void preparedStatement_setObject(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, Object x) - throws SQLException; + throws SQLException; boolean preparedStatement_execute(FilterChain chain, PreparedStatementProxy statement) throws SQLException; @@ -841,19 +838,19 @@ void preparedStatement_setCharacterStream(FilterChain chain, PreparedStatementPr java.io.Reader reader, int length) throws SQLException; void preparedStatement_setRef(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, Ref x) - throws SQLException; + throws SQLException; void preparedStatement_setBlob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, Blob x) - throws SQLException; + throws SQLException; void preparedStatement_setClob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, Clob x) - throws SQLException; + throws SQLException; void preparedStatement_setArray(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, Array x) - throws SQLException; + throws SQLException; ResultSetMetaData preparedStatement_getMetaData(FilterChain chain, PreparedStatementProxy statement) - throws SQLException; + throws SQLException; void preparedStatement_setDate(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, java.sql.Date x, Calendar cal) throws SQLException; @@ -871,10 +868,10 @@ void preparedStatement_setURL(FilterChain chain, PreparedStatementProxy statemen java.net.URL x) throws SQLException; ParameterMetaData preparedStatement_getParameterMetaData(FilterChain chain, PreparedStatementProxy statement) - throws SQLException; + throws SQLException; void preparedStatement_setRowId(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, RowId x) - throws SQLException; + throws SQLException; void preparedStatement_setNString(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, String value) throws SQLException; @@ -882,8 +879,11 @@ void preparedStatement_setNString(FilterChain chain, PreparedStatementProxy stat void preparedStatement_setNCharacterStream(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, Reader value, long length) throws SQLException; - void preparedStatement_setNClob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, NClob value) - throws SQLException; + void preparedStatement_setNClob(FilterChain chain, + PreparedStatementProxy statement, + int parameterIndex, + NClob value) + throws SQLException; void preparedStatement_setClob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, Reader reader, long length) throws SQLException; @@ -941,64 +941,64 @@ void callableStatement_registerOutParameter(FilterChain chain, CallableStatement boolean callableStatement_wasNull(FilterChain chain, CallableStatementProxy statement) throws SQLException; String callableStatement_getString(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; boolean callableStatement_getBoolean(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; byte callableStatement_getByte(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; short callableStatement_getShort(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; int callableStatement_getInt(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; long callableStatement_getLong(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; float callableStatement_getFloat(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; double callableStatement_getDouble(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; BigDecimal callableStatement_getBigDecimal(FilterChain chain, CallableStatementProxy statement, int parameterIndex, int scale) throws SQLException; byte[] callableStatement_getBytes(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; java.sql.Date callableStatement_getDate(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; java.sql.Time callableStatement_getTime(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; java.sql.Timestamp callableStatement_getTimestamp(FilterChain chain, CallableStatementProxy statement, int parameterIndex) throws SQLException; Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; BigDecimal callableStatement_getBigDecimal(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, int parameterIndex, java.util.Map> map) throws SQLException; Ref callableStatement_getRef(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; Blob callableStatement_getBlob(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; Clob callableStatement_getClob(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; Array callableStatement_getArray(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; java.sql.Date callableStatement_getDate(FilterChain chain, CallableStatementProxy statement, int parameterIndex, Calendar cal) throws SQLException; @@ -1022,7 +1022,7 @@ void callableStatement_registerOutParameter(FilterChain chain, CallableStatement String parameterName, int sqlType, String typeName) throws SQLException; java.net.URL callableStatement_getURL(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; void callableStatement_setURL(FilterChain chain, CallableStatementProxy statement, String parameterName, java.net.URL val) throws SQLException; @@ -1034,31 +1034,37 @@ void callableStatement_setBoolean(FilterChain chain, CallableStatementProxy stat boolean x) throws SQLException; void callableStatement_setByte(FilterChain chain, CallableStatementProxy statement, String parameterName, byte x) - throws SQLException; + throws SQLException; void callableStatement_setShort(FilterChain chain, CallableStatementProxy statement, String parameterName, short x) - throws SQLException; + throws SQLException; void callableStatement_setInt(FilterChain chain, CallableStatementProxy statement, String parameterName, int x) - throws SQLException; + throws SQLException; void callableStatement_setLong(FilterChain chain, CallableStatementProxy statement, String parameterName, long x) - throws SQLException; + throws SQLException; void callableStatement_setFloat(FilterChain chain, CallableStatementProxy statement, String parameterName, float x) - throws SQLException; + throws SQLException; - void callableStatement_setDouble(FilterChain chain, CallableStatementProxy statement, String parameterName, double x) - throws SQLException; + void callableStatement_setDouble(FilterChain chain, + CallableStatementProxy statement, + String parameterName, + double x) + throws SQLException; void callableStatement_setBigDecimal(FilterChain chain, CallableStatementProxy statement, String parameterName, BigDecimal x) throws SQLException; - void callableStatement_setString(FilterChain chain, CallableStatementProxy statement, String parameterName, String x) - throws SQLException; + void callableStatement_setString(FilterChain chain, + CallableStatementProxy statement, + String parameterName, + String x) + throws SQLException; - void callableStatement_setBytes(FilterChain chain, CallableStatementProxy statement, String parameterName, byte x[]) - throws SQLException; + void callableStatement_setBytes(FilterChain chain, CallableStatementProxy statement, String parameterName, byte[] x) + throws SQLException; void callableStatement_setDate(FilterChain chain, CallableStatementProxy statement, String parameterName, java.sql.Date x) throws SQLException; @@ -1081,12 +1087,15 @@ void callableStatement_setObject(FilterChain chain, CallableStatementProxy state void callableStatement_setObject(FilterChain chain, CallableStatementProxy statement, String parameterName, Object x, int targetSqlType) throws SQLException; - void callableStatement_setObject(FilterChain chain, CallableStatementProxy statement, String parameterName, Object x) - throws SQLException; + void callableStatement_setObject(FilterChain chain, + CallableStatementProxy statement, + String parameterName, + Object x) + throws SQLException; void callableStatement_setCharacterStream(FilterChain chain, CallableStatementProxy statement, String parameterName, java.io.Reader reader, int length) - throws SQLException; + throws SQLException; void callableStatement_setDate(FilterChain chain, CallableStatementProxy statement, String parameterName, java.sql.Date x, Calendar cal) throws SQLException; @@ -1101,61 +1110,63 @@ void callableStatement_setNull(FilterChain chain, CallableStatementProxy stateme int sqlType, String typeName) throws SQLException; String callableStatement_getString(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; boolean callableStatement_getBoolean(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; byte callableStatement_getByte(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; short callableStatement_getShort(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; int callableStatement_getInt(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; long callableStatement_getLong(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; float callableStatement_getFloat(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; double callableStatement_getDouble(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; byte[] callableStatement_getBytes(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; java.sql.Date callableStatement_getDate(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; java.sql.Time callableStatement_getTime(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; java.sql.Timestamp callableStatement_getTimestamp(FilterChain chain, CallableStatementProxy statement, String parameterName) throws SQLException; Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; - BigDecimal callableStatement_getBigDecimal(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + BigDecimal callableStatement_getBigDecimal(FilterChain chain, + CallableStatementProxy statement, + String parameterName) + throws SQLException; Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, String parameterName, java.util.Map> map) throws SQLException; Ref callableStatement_getRef(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; Blob callableStatement_getBlob(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; Clob callableStatement_getClob(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; Array callableStatement_getArray(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; java.sql.Date callableStatement_getDate(FilterChain chain, CallableStatementProxy statement, String parameterName, Calendar cal) throws SQLException; @@ -1167,16 +1178,16 @@ java.sql.Timestamp callableStatement_getTimestamp(FilterChain chain, CallableSta String parameterName, Calendar cal) throws SQLException; java.net.URL callableStatement_getURL(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; RowId callableStatement_getRowId(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; RowId callableStatement_getRowId(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; void callableStatement_setRowId(FilterChain chain, CallableStatementProxy statement, String parameterName, RowId x) - throws SQLException; + throws SQLException; void callableStatement_setNString(FilterChain chain, CallableStatementProxy statement, String parameterName, String value) throws SQLException; @@ -1197,25 +1208,25 @@ void callableStatement_setNClob(FilterChain chain, CallableStatementProxy statem Reader reader, long length) throws SQLException; NClob callableStatement_getNClob(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; NClob callableStatement_getNClob(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; void callableStatement_setSQLXML(FilterChain chain, CallableStatementProxy statement, String parameterName, SQLXML xmlObject) throws SQLException; SQLXML callableStatement_getSQLXML(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; SQLXML callableStatement_getSQLXML(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; String callableStatement_getNString(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; String callableStatement_getNString(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; java.io.Reader callableStatement_getNCharacterStream(FilterChain chain, CallableStatementProxy statement, int parameterIndex) throws SQLException; @@ -1230,10 +1241,10 @@ java.io.Reader callableStatement_getCharacterStream(FilterChain chain, CallableS String parameterName) throws SQLException; void callableStatement_setBlob(FilterChain chain, CallableStatementProxy statement, String parameterName, Blob x) - throws SQLException; + throws SQLException; void callableStatement_setClob(FilterChain chain, CallableStatementProxy statement, String parameterName, Clob x) - throws SQLException; + throws SQLException; void callableStatement_setAsciiStream(FilterChain chain, CallableStatementProxy statement, String parameterName, java.io.InputStream x, long length) throws SQLException; @@ -1243,7 +1254,7 @@ void callableStatement_setBinaryStream(FilterChain chain, CallableStatementProxy void callableStatement_setCharacterStream(FilterChain chain, CallableStatementProxy statement, String parameterName, java.io.Reader reader, long length) - throws SQLException; + throws SQLException; void callableStatement_setAsciiStream(FilterChain chain, CallableStatementProxy statement, String parameterName, java.io.InputStream x) throws SQLException; @@ -1293,75 +1304,75 @@ void callableStatement_setNClob(FilterChain chain, CallableStatementProxy statem int clob_setString(FilterChain chain, ClobProxy wrapper, long pos, String str) throws SQLException; int clob_setString(FilterChain chain, ClobProxy wrapper, long pos, String str, int offset, int len) - throws SQLException; + throws SQLException; void clob_truncate(FilterChain chain, ClobProxy wrapper, long len) throws SQLException; void dataSource_releaseConnection(FilterChain chain, DruidPooledConnection connection) throws SQLException; DruidPooledConnection dataSource_getConnection(FilterChain chain, DruidDataSource dataSource, long maxWaitMillis) - throws SQLException; + throws SQLException; // ///////////////// int resultSetMetaData_getColumnCount(FilterChain chain, ResultSetMetaDataProxy metaData) throws SQLException; boolean resultSetMetaData_isAutoIncrement(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; boolean resultSetMetaData_isCaseSensitive(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; boolean resultSetMetaData_isSearchable(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; boolean resultSetMetaData_isCurrency(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; int resultSetMetaData_isNullable(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; boolean resultSetMetaData_isSigned(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; int resultSetMetaData_getColumnDisplaySize(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; String resultSetMetaData_getColumnLabel(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; String resultSetMetaData_getColumnName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; String resultSetMetaData_getSchemaName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; int resultSetMetaData_getPrecision(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; int resultSetMetaData_getScale(FilterChain chain, ResultSetMetaDataProxy metaData, int column) throws SQLException; String resultSetMetaData_getTableName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; String resultSetMetaData_getCatalogName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; int resultSetMetaData_getColumnType(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; String resultSetMetaData_getColumnTypeName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; boolean resultSetMetaData_isReadOnly(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; boolean resultSetMetaData_isWritable(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; boolean resultSetMetaData_isDefinitelyWritable(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; String resultSetMetaData_getColumnClassName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException; + throws SQLException; } diff --git a/src/main/java/com/alibaba/druid/filter/FilterAdapter.java b/src/main/java/com/alibaba/druid/filter/FilterAdapter.java index 40d238895d..d355f917f6 100644 --- a/src/main/java/com/alibaba/druid/filter/FilterAdapter.java +++ b/src/main/java/com/alibaba/druid/filter/FilterAdapter.java @@ -15,63 +15,36 @@ */ package com.alibaba.druid.filter; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import com.alibaba.druid.proxy.jdbc.*; + +import javax.management.NotificationBroadcasterSupport; + import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.NClob; -import java.sql.ParameterMetaData; -import java.sql.Ref; -import java.sql.ResultSetMetaData; -import java.sql.RowId; -import java.sql.SQLClientInfoException; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.SQLXML; -import java.sql.Savepoint; -import java.sql.Statement; -import java.sql.Struct; -import java.sql.Wrapper; +import java.sql.*; import java.util.Calendar; import java.util.Map; import java.util.Properties; import java.util.concurrent.Executor; -import javax.management.NotificationBroadcasterSupport; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidPooledConnection; -import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; -import com.alibaba.druid.proxy.jdbc.ClobProxy; -import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.proxy.jdbc.DataSourceProxy; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetMetaDataProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetProxy; -import com.alibaba.druid.proxy.jdbc.StatementProxy; - /** * 提供JdbcFilter的基本实现，使得实现一个JdbcFilter更容易。 - * + * * @author wenshao [szujobs@hotmail.com] */ public abstract class FilterAdapter extends NotificationBroadcasterSupport implements Filter { - @Override public void init(DataSourceProxy dataSource) { } @Override public void destroy() { - } public void configFromProperties(Properties properties) { - } @Override @@ -89,13 +62,13 @@ public T unwrap(Class iface) { @Override public Array callableStatement_getArray(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getArray(statement, parameterIndex); } @Override public Array callableStatement_getArray(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getArray(statement, parameterName); } @@ -119,19 +92,19 @@ public BigDecimal callableStatement_getBigDecimal(FilterChain chain, CallableSta @Override public Blob callableStatement_getBlob(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getBlob(statement, parameterIndex); } @Override public Blob callableStatement_getBlob(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getBlob(statement, parameterName); } @Override public boolean callableStatement_getBoolean(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getBoolean(statement, parameterIndex); } @@ -143,25 +116,25 @@ public boolean callableStatement_getBoolean(FilterChain chain, CallableStatement @Override public byte callableStatement_getByte(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getByte(statement, parameterIndex); } @Override public byte callableStatement_getByte(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getByte(statement, parameterName); } @Override public byte[] callableStatement_getBytes(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getBytes(statement, parameterIndex); } @Override public byte[] callableStatement_getBytes(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getBytes(statement, parameterName); } @@ -179,13 +152,13 @@ public java.io.Reader callableStatement_getCharacterStream(FilterChain chain, Ca @Override public Clob callableStatement_getClob(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getClob(statement, parameterIndex); } @Override public Clob callableStatement_getClob(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getClob(statement, parameterName); } @@ -215,49 +188,49 @@ public java.sql.Date callableStatement_getDate(FilterChain chain, CallableStatem @Override public double callableStatement_getDouble(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getDouble(statement, parameterIndex); } @Override public double callableStatement_getDouble(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getDouble(statement, parameterName); } @Override public float callableStatement_getFloat(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getFloat(statement, parameterIndex); } @Override public float callableStatement_getFloat(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getFloat(statement, parameterName); } @Override public int callableStatement_getInt(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getInt(statement, parameterIndex); } @Override public int callableStatement_getInt(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getInt(statement, parameterName); } @Override public long callableStatement_getLong(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getLong(statement, parameterIndex); } @Override public long callableStatement_getLong(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getLong(statement, parameterName); } @@ -275,31 +248,33 @@ public java.io.Reader callableStatement_getNCharacterStream(FilterChain chain, C @Override public NClob callableStatement_getNClob(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getNClob(statement, parameterIndex); } @Override public NClob callableStatement_getNClob(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getNClob(statement, parameterName); } @Override public String callableStatement_getNString(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getNString(statement, parameterIndex); } @Override - public String callableStatement_getNString(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + public String callableStatement_getNString(FilterChain chain, + CallableStatementProxy statement, + String parameterName) + throws SQLException { return chain.callableStatement_getNString(statement, parameterName); } @Override public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getObject(statement, parameterIndex); } @@ -311,74 +286,74 @@ public Object callableStatement_getObject(FilterChain chain, CallableStatementPr @Override public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getObject(statement, parameterName); } @Override public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, String parameterName, java.util.Map> map) - throws SQLException { + throws SQLException { return chain.callableStatement_getObject(statement, parameterName, map); } @Override public Ref callableStatement_getRef(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getRef(statement, parameterIndex); } @Override public Ref callableStatement_getRef(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getRef(statement, parameterName); } @Override public RowId callableStatement_getRowId(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getRowId(statement, parameterIndex); } @Override public RowId callableStatement_getRowId(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getRowId(statement, parameterName); } @Override public short callableStatement_getShort(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getShort(statement, parameterIndex); } @Override public short callableStatement_getShort(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getShort(statement, parameterName); } @Override public SQLXML callableStatement_getSQLXML(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getSQLXML(statement, parameterIndex); } @Override public SQLXML callableStatement_getSQLXML(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getSQLXML(statement, parameterName); } @Override public String callableStatement_getString(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { return chain.callableStatement_getString(statement, parameterIndex); } @Override public String callableStatement_getString(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { return chain.callableStatement_getString(statement, parameterName); } @@ -433,8 +408,10 @@ public java.sql.Timestamp callableStatement_getTimestamp(FilterChain chain, Call } @Override - public java.net.URL callableStatement_getURL(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + public java.net.URL callableStatement_getURL(FilterChain chain, + CallableStatementProxy statement, + int parameterIndex) + throws SQLException { return chain.callableStatement_getURL(statement, parameterIndex); } @@ -460,7 +437,7 @@ public void callableStatement_registerOutParameter(FilterChain chain, CallableSt @Override public void callableStatement_registerOutParameter(FilterChain chain, CallableStatementProxy statement, int parameterIndex, int sqlType, String typeName) - throws SQLException { + throws SQLException { chain.callableStatement_registerOutParameter(statement, parameterIndex, sqlType, typeName); } @@ -473,14 +450,14 @@ public void callableStatement_registerOutParameter(FilterChain chain, CallableSt @Override public void callableStatement_registerOutParameter(FilterChain chain, CallableStatementProxy statement, String parameterName, int sqlType, int scale) - throws SQLException { + throws SQLException { chain.callableStatement_registerOutParameter(statement, parameterName, sqlType, scale); } @Override public void callableStatement_registerOutParameter(FilterChain chain, CallableStatementProxy statement, String parameterName, int sqlType, String typeName) - throws SQLException { + throws SQLException { chain.callableStatement_registerOutParameter(statement, parameterName, sqlType, typeName); } @@ -493,14 +470,14 @@ public void callableStatement_setAsciiStream(FilterChain chain, CallableStatemen @Override public void callableStatement_setAsciiStream(FilterChain chain, CallableStatementProxy statement, String parameterName, java.io.InputStream x, int length) - throws SQLException { + throws SQLException { chain.callableStatement_setAsciiStream(statement, parameterName, x, length); } @Override public void callableStatement_setAsciiStream(FilterChain chain, CallableStatementProxy statement, String parameterName, java.io.InputStream x, long length) - throws SQLException { + throws SQLException { chain.callableStatement_setAsciiStream(statement, parameterName, x, length); } @@ -519,14 +496,14 @@ public void callableStatement_setBinaryStream(FilterChain chain, CallableStateme @Override public void callableStatement_setBinaryStream(FilterChain chain, CallableStatementProxy statement, String parameterName, java.io.InputStream x, int length) - throws SQLException { + throws SQLException { chain.callableStatement_setBinaryStream(statement, parameterName, x, length); } @Override public void callableStatement_setBinaryStream(FilterChain chain, CallableStatementProxy statement, String parameterName, java.io.InputStream x, long length) - throws SQLException { + throws SQLException { chain.callableStatement_setBinaryStream(statement, parameterName, x, length); } @@ -562,7 +539,7 @@ public void callableStatement_setByte(FilterChain chain, CallableStatementProxy @Override public void callableStatement_setBytes(FilterChain chain, CallableStatementProxy statement, String parameterName, - byte x[]) throws SQLException { + byte[] x) throws SQLException { chain.callableStatement_setBytes(statement, parameterName, x); } @@ -575,14 +552,14 @@ public void callableStatement_setCharacterStream(FilterChain chain, CallableStat @Override public void callableStatement_setCharacterStream(FilterChain chain, CallableStatementProxy statement, String parameterName, java.io.Reader reader, int length) - throws SQLException { + throws SQLException { chain.callableStatement_setCharacterStream(statement, parameterName, reader, length); } @Override public void callableStatement_setCharacterStream(FilterChain chain, CallableStatementProxy statement, String parameterName, java.io.Reader reader, long length) - throws SQLException { + throws SQLException { chain.callableStatement_setCharacterStream(statement, parameterName, reader, length); } @@ -649,7 +626,7 @@ public void callableStatement_setNCharacterStream(FilterChain chain, CallableSta @Override public void callableStatement_setNCharacterStream(FilterChain chain, CallableStatementProxy statement, String parameterName, Reader value, long length) - throws SQLException { + throws SQLException { chain.callableStatement_setNCharacterStream(statement, parameterName, value, length); } @@ -752,7 +729,7 @@ public void callableStatement_setTimestamp(FilterChain chain, CallableStatementP @Override public void callableStatement_setTimestamp(FilterChain chain, CallableStatementProxy statement, String parameterName, java.sql.Timestamp x, Calendar cal) - throws SQLException { + throws SQLException { chain.callableStatement_setTimestamp(statement, parameterName, x, cal); } @@ -814,7 +791,8 @@ public SQLXML connection_createSQLXML(FilterChain chain, ConnectionProxy connect } @Override - public StatementProxy connection_createStatement(FilterChain chain, ConnectionProxy connection) throws SQLException { + public StatementProxy connection_createStatement(FilterChain chain, + ConnectionProxy connection) throws SQLException { return chain.connection_createStatement(connection); } @@ -827,7 +805,7 @@ public StatementProxy connection_createStatement(FilterChain chain, ConnectionPr @Override public StatementProxy connection_createStatement(FilterChain chain, ConnectionProxy connection, int resultSetType, int resultSetConcurrency, int resultSetHoldability) - throws SQLException { + throws SQLException { return chain.connection_createStatement(connection, resultSetType, resultSetConcurrency, resultSetHoldability); } @@ -854,7 +832,7 @@ public Properties connection_getClientInfo(FilterChain chain, ConnectionProxy co @Override public String connection_getClientInfo(FilterChain chain, ConnectionProxy connection, String name) - throws SQLException { + throws SQLException { return chain.connection_getClientInfo(connection, name); } @@ -875,7 +853,7 @@ public int connection_getTransactionIsolation(FilterChain chain, ConnectionProxy @Override public Map> connection_getTypeMap(FilterChain chain, ConnectionProxy connection) - throws SQLException { + throws SQLException { return chain.connection_getTypeMap(connection); } @@ -906,14 +884,14 @@ public String connection_nativeSQL(FilterChain chain, ConnectionProxy connection @Override public CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy connection, String sql) - throws SQLException { + throws SQLException { return chain.connection_prepareCall(connection, sql); } @Override public CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { return chain.connection_prepareCall(connection, sql, resultSetType, resultSetConcurrency); } @@ -926,7 +904,7 @@ public CallableStatementProxy connection_prepareCall(FilterChain chain, Connecti @Override public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql) - throws SQLException { + throws SQLException { return chain.connection_prepareStatement(connection, sql); } @@ -939,7 +917,7 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con @Override public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { return chain.connection_prepareStatement(connection, sql, resultSetType, resultSetConcurrency); } @@ -948,7 +926,7 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { return chain.connection_prepareStatement(connection, sql, resultSetType, resultSetConcurrency, - resultSetHoldability); + resultSetHoldability); } @Override @@ -965,7 +943,7 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con @Override public void connection_releaseSavepoint(FilterChain chain, ConnectionProxy connection, Savepoint savepoint) - throws SQLException { + throws SQLException { chain.connection_releaseSavepoint(connection, savepoint); } @@ -976,43 +954,43 @@ public void connection_rollback(FilterChain chain, ConnectionProxy connection) t @Override public void connection_rollback(FilterChain chain, ConnectionProxy connection, Savepoint savepoint) - throws SQLException { + throws SQLException { chain.connection_rollback(connection, savepoint); } @Override public void connection_setAutoCommit(FilterChain chain, ConnectionProxy connection, boolean autoCommit) - throws SQLException { + throws SQLException { chain.connection_setAutoCommit(connection, autoCommit); } @Override public void connection_setCatalog(FilterChain chain, ConnectionProxy connection, String catalog) - throws SQLException { + throws SQLException { chain.connection_setCatalog(connection, catalog); } @Override public void connection_setClientInfo(FilterChain chain, ConnectionProxy connection, Properties properties) - throws SQLClientInfoException { + throws SQLClientInfoException { chain.connection_setClientInfo(connection, properties); } @Override public void connection_setClientInfo(FilterChain chain, ConnectionProxy connection, String name, String value) - throws SQLClientInfoException { + throws SQLClientInfoException { chain.connection_setClientInfo(connection, name, value); } @Override public void connection_setHoldability(FilterChain chain, ConnectionProxy connection, int holdability) - throws SQLException { + throws SQLException { chain.connection_setHoldability(connection, holdability); } @Override public void connection_setReadOnly(FilterChain chain, ConnectionProxy connection, boolean readOnly) - throws SQLException { + throws SQLException { chain.connection_setReadOnly(connection, readOnly); } @@ -1023,19 +1001,19 @@ public Savepoint connection_setSavepoint(FilterChain chain, ConnectionProxy conn @Override public Savepoint connection_setSavepoint(FilterChain chain, ConnectionProxy connection, String name) - throws SQLException { + throws SQLException { return chain.connection_setSavepoint(connection, name); } @Override public void connection_setTransactionIsolation(FilterChain chain, ConnectionProxy connection, int level) - throws SQLException { + throws SQLException { chain.connection_setTransactionIsolation(connection, level); } @Override public void connection_setTypeMap(FilterChain chain, ConnectionProxy connection, Map> map) - throws SQLException { + throws SQLException { chain.connection_setTypeMap(connection, map); } @@ -1053,9 +1031,13 @@ public void connection_abort(FilterChain chain, ConnectionProxy connection, Exec chain.connection_abort(connection, executor); } - public void connection_setNetworkTimeout(FilterChain chain, ConnectionProxy connection, Executor executor, int milliseconds) throws SQLException { + public void connection_setNetworkTimeout(FilterChain chain, + ConnectionProxy connection, + Executor executor, + int milliseconds) throws SQLException { chain.connection_setNetworkTimeout(connection, executor, milliseconds); } + public int connection_getNetworkTimeout(FilterChain chain, ConnectionProxy connection) throws SQLException { return chain.connection_getNetworkTimeout(connection); } @@ -1072,7 +1054,7 @@ public void preparedStatement_addBatch(FilterChain chain, PreparedStatementProxy @Override public void preparedStatement_clearParameters(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { + throws SQLException { chain.preparedStatement_clearParameters(statement); } @@ -1083,24 +1065,25 @@ public boolean preparedStatement_execute(FilterChain chain, PreparedStatementPro @Override public ResultSetProxy preparedStatement_executeQuery(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { + throws SQLException { return chain.preparedStatement_executeQuery(statement); } @Override - public int preparedStatement_executeUpdate(FilterChain chain, PreparedStatementProxy statement) throws SQLException { + public int preparedStatement_executeUpdate(FilterChain chain, + PreparedStatementProxy statement) throws SQLException { return chain.preparedStatement_executeUpdate(statement); } @Override public ResultSetMetaData preparedStatement_getMetaData(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { + throws SQLException { return chain.preparedStatement_getMetaData(statement); } @Override public ParameterMetaData preparedStatement_getParameterMetaData(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { + throws SQLException { return chain.preparedStatement_getParameterMetaData(statement); } @@ -1119,14 +1102,14 @@ public void preparedStatement_setAsciiStream(FilterChain chain, PreparedStatemen @Override public void preparedStatement_setAsciiStream(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, java.io.InputStream x, int length) - throws SQLException { + throws SQLException { chain.preparedStatement_setAsciiStream(statement, parameterIndex, x, length); } @Override public void preparedStatement_setAsciiStream(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, java.io.InputStream x, long length) - throws SQLException { + throws SQLException { chain.preparedStatement_setAsciiStream(statement, parameterIndex, x, length); } @@ -1145,14 +1128,14 @@ public void preparedStatement_setBinaryStream(FilterChain chain, PreparedStateme @Override public void preparedStatement_setBinaryStream(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, java.io.InputStream x, int length) - throws SQLException { + throws SQLException { chain.preparedStatement_setBinaryStream(statement, parameterIndex, x, length); } @Override public void preparedStatement_setBinaryStream(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, java.io.InputStream x, long length) - throws SQLException { + throws SQLException { chain.preparedStatement_setBinaryStream(statement, parameterIndex, x, length); } @@ -1188,7 +1171,7 @@ public void preparedStatement_setByte(FilterChain chain, PreparedStatementProxy @Override public void preparedStatement_setBytes(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - byte x[]) throws SQLException { + byte[] x) throws SQLException { chain.preparedStatement_setBytes(statement, parameterIndex, x); } @@ -1201,14 +1184,14 @@ public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStat @Override public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, java.io.Reader reader, int length) - throws SQLException { + throws SQLException { chain.preparedStatement_setCharacterStream(statement, parameterIndex, reader, length); } @Override public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, java.io.Reader reader, long length) - throws SQLException { + throws SQLException { chain.preparedStatement_setCharacterStream(statement, parameterIndex, reader, length); } @@ -1256,7 +1239,7 @@ public void preparedStatement_setFloat(FilterChain chain, PreparedStatementProxy @Override public void preparedStatement_setInt(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, int x) - throws SQLException { + throws SQLException { chain.preparedStatement_setInt(statement, parameterIndex, x); } @@ -1275,7 +1258,7 @@ public void preparedStatement_setNCharacterStream(FilterChain chain, PreparedSta @Override public void preparedStatement_setNCharacterStream(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, Reader value, long length) - throws SQLException { + throws SQLException { chain.preparedStatement_setNCharacterStream(statement, parameterIndex, value, length); } @@ -1335,7 +1318,7 @@ public void preparedStatement_setObject(FilterChain chain, PreparedStatementProx @Override public void preparedStatement_setRef(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, Ref x) - throws SQLException { + throws SQLException { chain.preparedStatement_setRef(statement, parameterIndex, x); } @@ -1390,7 +1373,7 @@ public void preparedStatement_setTimestamp(FilterChain chain, PreparedStatementP @Override public void preparedStatement_setUnicodeStream(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, java.io.InputStream x, int length) - throws SQLException { + throws SQLException { chain.preparedStatement_setUnicodeStream(statement, parameterIndex, x, length); } @@ -1457,49 +1440,49 @@ public Array resultSet_getArray(FilterChain chain, ResultSetProxy result, String @Override public java.io.InputStream resultSet_getAsciiStream(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getAsciiStream(result, columnIndex); } @Override public java.io.InputStream resultSet_getAsciiStream(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return chain.resultSet_getAsciiStream(result, columnLabel); } @Override public BigDecimal resultSet_getBigDecimal(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getBigDecimal(result, columnIndex); } @Override public BigDecimal resultSet_getBigDecimal(FilterChain chain, ResultSetProxy result, int columnIndex, int scale) - throws SQLException { + throws SQLException { return chain.resultSet_getBigDecimal(result, columnIndex, scale); } @Override public BigDecimal resultSet_getBigDecimal(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return chain.resultSet_getBigDecimal(result, columnLabel); } @Override public BigDecimal resultSet_getBigDecimal(FilterChain chain, ResultSetProxy result, String columnLabel, int scale) - throws SQLException { + throws SQLException { return chain.resultSet_getBigDecimal(result, columnLabel, scale); } @Override public java.io.InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getBinaryStream(result, columnIndex); } @Override public java.io.InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return chain.resultSet_getBinaryStream(result, columnLabel); } @@ -1520,7 +1503,7 @@ public boolean resultSet_getBoolean(FilterChain chain, ResultSetProxy result, in @Override public boolean resultSet_getBoolean(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return chain.resultSet_getBoolean(result, columnLabel); } @@ -1546,13 +1529,13 @@ public byte[] resultSet_getBytes(FilterChain chain, ResultSetProxy result, Strin @Override public java.io.Reader resultSet_getCharacterStream(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getCharacterStream(result, columnIndex); } @Override public java.io.Reader resultSet_getCharacterStream(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return chain.resultSet_getCharacterStream(result, columnLabel); } @@ -1578,25 +1561,25 @@ public String resultSet_getCursorName(FilterChain chain, ResultSetProxy resultSe @Override public java.sql.Date resultSet_getDate(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getDate(result, columnIndex); } @Override public java.sql.Date resultSet_getDate(FilterChain chain, ResultSetProxy result, int columnIndex, Calendar cal) - throws SQLException { + throws SQLException { return chain.resultSet_getDate(result, columnIndex, cal); } @Override public java.sql.Date resultSet_getDate(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return chain.resultSet_getDate(result, columnLabel); } @Override public java.sql.Date resultSet_getDate(FilterChain chain, ResultSetProxy result, String columnLabel, Calendar cal) - throws SQLException { + throws SQLException { return chain.resultSet_getDate(result, columnLabel, cal); } @@ -1606,7 +1589,9 @@ public double resultSet_getDouble(FilterChain chain, ResultSetProxy result, int } @Override - public double resultSet_getDouble(FilterChain chain, ResultSetProxy result, String columnLabel) throws SQLException { + public double resultSet_getDouble(FilterChain chain, + ResultSetProxy result, + String columnLabel) throws SQLException { return chain.resultSet_getDouble(result, columnLabel); } @@ -1662,13 +1647,13 @@ public ResultSetMetaData resultSet_getMetaData(FilterChain chain, ResultSetProxy @Override public java.io.Reader resultSet_getNCharacterStream(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getNCharacterStream(result, columnIndex); } @Override public java.io.Reader resultSet_getNCharacterStream(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return chain.resultSet_getNCharacterStream(result, columnLabel); } @@ -1689,7 +1674,7 @@ public String resultSet_getNString(FilterChain chain, ResultSetProxy result, int @Override public String resultSet_getNString(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return chain.resultSet_getNString(result, columnLabel); } @@ -1699,7 +1684,10 @@ public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, int } @Override - public T resultSet_getObject(FilterChain chain, ResultSetProxy result, int columnIndex, Class type) throws SQLException { + public T resultSet_getObject(FilterChain chain, + ResultSetProxy result, + int columnIndex, + Class type) throws SQLException { return chain.resultSet_getObject(result, columnIndex, type); } @@ -1710,12 +1698,17 @@ public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, int } @Override - public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, String columnLabel) throws SQLException { + public Object resultSet_getObject(FilterChain chain, + ResultSetProxy result, + String columnLabel) throws SQLException { return chain.resultSet_getObject(result, columnLabel); } @Override - public T resultSet_getObject(FilterChain chain, ResultSetProxy result, String columnLabel, Class type) throws SQLException { + public T resultSet_getObject(FilterChain chain, + ResultSetProxy result, + String columnLabel, + Class type) throws SQLException { return chain.resultSet_getObject(result, columnLabel, type); } @@ -1768,7 +1761,9 @@ public SQLXML resultSet_getSQLXML(FilterChain chain, ResultSetProxy result, int } @Override - public SQLXML resultSet_getSQLXML(FilterChain chain, ResultSetProxy result, String columnLabel) throws SQLException { + public SQLXML resultSet_getSQLXML(FilterChain chain, + ResultSetProxy result, + String columnLabel) throws SQLException { return chain.resultSet_getSQLXML(result, columnLabel); } @@ -1783,37 +1778,39 @@ public String resultSet_getString(FilterChain chain, ResultSetProxy result, int } @Override - public String resultSet_getString(FilterChain chain, ResultSetProxy result, String columnLabel) throws SQLException { + public String resultSet_getString(FilterChain chain, + ResultSetProxy result, + String columnLabel) throws SQLException { return chain.resultSet_getString(result, columnLabel); } @Override public java.sql.Time resultSet_getTime(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getTime(result, columnIndex); } @Override public java.sql.Time resultSet_getTime(FilterChain chain, ResultSetProxy result, int columnIndex, Calendar cal) - throws SQLException { + throws SQLException { return chain.resultSet_getTime(result, columnIndex, cal); } @Override public java.sql.Time resultSet_getTime(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return chain.resultSet_getTime(result, columnLabel); } @Override public java.sql.Time resultSet_getTime(FilterChain chain, ResultSetProxy result, String columnLabel, Calendar cal) - throws SQLException { + throws SQLException { return chain.resultSet_getTime(result, columnLabel, cal); } @Override public java.sql.Timestamp resultSet_getTimestamp(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getTimestamp(result, columnIndex); } @@ -1825,7 +1822,7 @@ public java.sql.Timestamp resultSet_getTimestamp(FilterChain chain, ResultSetPro @Override public java.sql.Timestamp resultSet_getTimestamp(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return chain.resultSet_getTimestamp(result, columnLabel); } @@ -1842,24 +1839,26 @@ public int resultSet_getType(FilterChain chain, ResultSetProxy resultSet) throws @Override public java.io.InputStream resultSet_getUnicodeStream(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getUnicodeStream(result, columnIndex); } @Override public java.io.InputStream resultSet_getUnicodeStream(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return chain.resultSet_getUnicodeStream(result, columnLabel); } @Override - public java.net.URL resultSet_getURL(FilterChain chain, ResultSetProxy result, int columnIndex) throws SQLException { + public java.net.URL resultSet_getURL(FilterChain chain, + ResultSetProxy result, + int columnIndex) throws SQLException { return chain.resultSet_getURL(result, columnIndex); } @Override public java.net.URL resultSet_getURL(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return chain.resultSet_getURL(result, columnLabel); } @@ -1950,7 +1949,7 @@ public boolean resultSet_rowUpdated(FilterChain chain, ResultSetProxy resultSet) @Override public void resultSet_setFetchDirection(FilterChain chain, ResultSetProxy result, int direction) - throws SQLException { + throws SQLException { chain.resultSet_setFetchDirection(result, direction); } @@ -1961,13 +1960,13 @@ public void resultSet_setFetchSize(FilterChain chain, ResultSetProxy result, int @Override public void resultSet_updateArray(FilterChain chain, ResultSetProxy result, int columnIndex, java.sql.Array x) - throws SQLException { + throws SQLException { chain.resultSet_updateArray(result, columnIndex, x); } @Override public void resultSet_updateArray(FilterChain chain, ResultSetProxy result, String columnLabel, java.sql.Array x) - throws SQLException { + throws SQLException { chain.resultSet_updateArray(result, columnLabel, x); } @@ -2009,13 +2008,13 @@ public void resultSet_updateAsciiStream(FilterChain chain, ResultSetProxy result @Override public void resultSet_updateBigDecimal(FilterChain chain, ResultSetProxy result, int columnIndex, BigDecimal x) - throws SQLException { + throws SQLException { chain.resultSet_updateBigDecimal(result, columnIndex, x); } @Override public void resultSet_updateBigDecimal(FilterChain chain, ResultSetProxy result, String columnLabel, BigDecimal x) - throws SQLException { + throws SQLException { chain.resultSet_updateBigDecimal(result, columnLabel, x); } @@ -2057,7 +2056,7 @@ public void resultSet_updateBinaryStream(FilterChain chain, ResultSetProxy resul @Override public void resultSet_updateBlob(FilterChain chain, ResultSetProxy result, int columnIndex, InputStream inputStream) - throws SQLException { + throws SQLException { chain.resultSet_updateBlob(result, columnIndex, inputStream); } @@ -2069,7 +2068,7 @@ public void resultSet_updateBlob(FilterChain chain, ResultSetProxy result, int c @Override public void resultSet_updateBlob(FilterChain chain, ResultSetProxy result, int columnIndex, java.sql.Blob x) - throws SQLException { + throws SQLException { chain.resultSet_updateBlob(result, columnIndex, x); } @@ -2087,43 +2086,43 @@ public void resultSet_updateBlob(FilterChain chain, ResultSetProxy result, Strin @Override public void resultSet_updateBlob(FilterChain chain, ResultSetProxy result, String columnLabel, java.sql.Blob x) - throws SQLException { + throws SQLException { chain.resultSet_updateBlob(result, columnLabel, x); } @Override public void resultSet_updateBoolean(FilterChain chain, ResultSetProxy result, int columnIndex, boolean x) - throws SQLException { + throws SQLException { chain.resultSet_updateBoolean(result, columnIndex, x); } @Override public void resultSet_updateBoolean(FilterChain chain, ResultSetProxy result, String columnLabel, boolean x) - throws SQLException { + throws SQLException { chain.resultSet_updateBoolean(result, columnLabel, x); } @Override public void resultSet_updateByte(FilterChain chain, ResultSetProxy result, int columnIndex, byte x) - throws SQLException { + throws SQLException { chain.resultSet_updateByte(result, columnIndex, x); } @Override public void resultSet_updateByte(FilterChain chain, ResultSetProxy result, String columnLabel, byte x) - throws SQLException { + throws SQLException { chain.resultSet_updateByte(result, columnLabel, x); } @Override public void resultSet_updateBytes(FilterChain chain, ResultSetProxy result, int columnIndex, byte[] x) - throws SQLException { + throws SQLException { chain.resultSet_updateBytes(result, columnIndex, x); } @Override public void resultSet_updateBytes(FilterChain chain, ResultSetProxy result, String columnLabel, byte[] x) - throws SQLException { + throws SQLException { chain.resultSet_updateBytes(result, columnLabel, x); } @@ -2165,13 +2164,13 @@ public void resultSet_updateCharacterStream(FilterChain chain, ResultSetProxy re @Override public void resultSet_updateClob(FilterChain chain, ResultSetProxy result, int columnIndex, java.sql.Clob x) - throws SQLException { + throws SQLException { chain.resultSet_updateClob(result, columnIndex, x); } @Override public void resultSet_updateClob(FilterChain chain, ResultSetProxy result, int columnIndex, Reader reader) - throws SQLException { + throws SQLException { chain.resultSet_updateClob(result, columnIndex, reader); } @@ -2183,13 +2182,13 @@ public void resultSet_updateClob(FilterChain chain, ResultSetProxy result, int c @Override public void resultSet_updateClob(FilterChain chain, ResultSetProxy result, String columnLabel, java.sql.Clob x) - throws SQLException { + throws SQLException { chain.resultSet_updateClob(result, columnLabel, x); } @Override public void resultSet_updateClob(FilterChain chain, ResultSetProxy result, String columnLabel, Reader reader) - throws SQLException { + throws SQLException { chain.resultSet_updateClob(result, columnLabel, reader); } @@ -2201,61 +2200,61 @@ public void resultSet_updateClob(FilterChain chain, ResultSetProxy result, Strin @Override public void resultSet_updateDate(FilterChain chain, ResultSetProxy result, int columnIndex, java.sql.Date x) - throws SQLException { + throws SQLException { chain.resultSet_updateDate(result, columnIndex, x); } @Override public void resultSet_updateDate(FilterChain chain, ResultSetProxy result, String columnLabel, java.sql.Date x) - throws SQLException { + throws SQLException { chain.resultSet_updateDate(result, columnLabel, x); } @Override public void resultSet_updateDouble(FilterChain chain, ResultSetProxy result, int columnIndex, double x) - throws SQLException { + throws SQLException { chain.resultSet_updateDouble(result, columnIndex, x); } @Override public void resultSet_updateDouble(FilterChain chain, ResultSetProxy result, String columnLabel, double x) - throws SQLException { + throws SQLException { chain.resultSet_updateDouble(result, columnLabel, x); } @Override public void resultSet_updateFloat(FilterChain chain, ResultSetProxy result, int columnIndex, float x) - throws SQLException { + throws SQLException { chain.resultSet_updateFloat(result, columnIndex, x); } @Override public void resultSet_updateFloat(FilterChain chain, ResultSetProxy result, String columnLabel, float x) - throws SQLException { + throws SQLException { chain.resultSet_updateFloat(result, columnLabel, x); } @Override public void resultSet_updateInt(FilterChain chain, ResultSetProxy result, int columnIndex, int x) - throws SQLException { + throws SQLException { chain.resultSet_updateInt(result, columnIndex, x); } @Override public void resultSet_updateInt(FilterChain chain, ResultSetProxy result, String columnLabel, int x) - throws SQLException { + throws SQLException { chain.resultSet_updateInt(result, columnLabel, x); } @Override public void resultSet_updateLong(FilterChain chain, ResultSetProxy result, int columnIndex, long x) - throws SQLException { + throws SQLException { chain.resultSet_updateLong(result, columnIndex, x); } @Override public void resultSet_updateLong(FilterChain chain, ResultSetProxy result, String columnLabel, long x) - throws SQLException { + throws SQLException { chain.resultSet_updateLong(result, columnLabel, x); } @@ -2285,13 +2284,13 @@ public void resultSet_updateNCharacterStream(FilterChain chain, ResultSetProxy r @Override public void resultSet_updateNClob(FilterChain chain, ResultSetProxy result, int columnIndex, NClob nClob) - throws SQLException { + throws SQLException { chain.resultSet_updateNClob(result, columnIndex, nClob); } @Override public void resultSet_updateNClob(FilterChain chain, ResultSetProxy result, int columnIndex, Reader reader) - throws SQLException { + throws SQLException { chain.resultSet_updateNClob(result, columnIndex, reader); } @@ -2303,13 +2302,13 @@ public void resultSet_updateNClob(FilterChain chain, ResultSetProxy result, int @Override public void resultSet_updateNClob(FilterChain chain, ResultSetProxy result, String columnLabel, NClob nClob) - throws SQLException { + throws SQLException { chain.resultSet_updateNClob(result, columnLabel, nClob); } @Override public void resultSet_updateNClob(FilterChain chain, ResultSetProxy result, String columnLabel, Reader reader) - throws SQLException { + throws SQLException { chain.resultSet_updateNClob(result, columnLabel, reader); } @@ -2321,13 +2320,13 @@ public void resultSet_updateNClob(FilterChain chain, ResultSetProxy result, Stri @Override public void resultSet_updateNString(FilterChain chain, ResultSetProxy result, int columnIndex, String nString) - throws SQLException { + throws SQLException { chain.resultSet_updateNString(result, columnIndex, nString); } @Override public void resultSet_updateNString(FilterChain chain, ResultSetProxy result, String columnLabel, String nString) - throws SQLException { + throws SQLException { chain.resultSet_updateNString(result, columnLabel, nString); } @@ -2343,7 +2342,7 @@ public void resultSet_updateNull(FilterChain chain, ResultSetProxy result, Strin @Override public void resultSet_updateObject(FilterChain chain, ResultSetProxy result, int columnIndex, Object x) - throws SQLException { + throws SQLException { chain.resultSet_updateObject(result, columnIndex, x); } @@ -2355,7 +2354,7 @@ public void resultSet_updateObject(FilterChain chain, ResultSetProxy result, int @Override public void resultSet_updateObject(FilterChain chain, ResultSetProxy result, String columnLabel, Object x) - throws SQLException { + throws SQLException { chain.resultSet_updateObject(result, columnLabel, x); } @@ -2367,13 +2366,13 @@ public void resultSet_updateObject(FilterChain chain, ResultSetProxy result, Str @Override public void resultSet_updateRef(FilterChain chain, ResultSetProxy result, int columnIndex, java.sql.Ref x) - throws SQLException { + throws SQLException { chain.resultSet_updateRef(result, columnIndex, x); } @Override public void resultSet_updateRef(FilterChain chain, ResultSetProxy result, String columnLabel, java.sql.Ref x) - throws SQLException { + throws SQLException { chain.resultSet_updateRef(result, columnLabel, x); } @@ -2384,61 +2383,61 @@ public void resultSet_updateRow(FilterChain chain, ResultSetProxy resultSet) thr @Override public void resultSet_updateRowId(FilterChain chain, ResultSetProxy result, int columnIndex, RowId x) - throws SQLException { + throws SQLException { chain.resultSet_updateRowId(result, columnIndex, x); } @Override public void resultSet_updateRowId(FilterChain chain, ResultSetProxy result, String columnLabel, RowId x) - throws SQLException { + throws SQLException { chain.resultSet_updateRowId(result, columnLabel, x); } @Override public void resultSet_updateShort(FilterChain chain, ResultSetProxy result, int columnIndex, short x) - throws SQLException { + throws SQLException { chain.resultSet_updateShort(result, columnIndex, x); } @Override public void resultSet_updateShort(FilterChain chain, ResultSetProxy result, String columnLabel, short x) - throws SQLException { + throws SQLException { chain.resultSet_updateShort(result, columnLabel, x); } @Override public void resultSet_updateSQLXML(FilterChain chain, ResultSetProxy result, int columnIndex, SQLXML xmlObject) - throws SQLException { + throws SQLException { chain.resultSet_updateSQLXML(result, columnIndex, xmlObject); } @Override public void resultSet_updateSQLXML(FilterChain chain, ResultSetProxy result, String columnLabel, SQLXML xmlObject) - throws SQLException { + throws SQLException { chain.resultSet_updateSQLXML(result, columnLabel, xmlObject); } @Override public void resultSet_updateString(FilterChain chain, ResultSetProxy result, int columnIndex, String x) - throws SQLException { + throws SQLException { chain.resultSet_updateString(result, columnIndex, x); } @Override public void resultSet_updateString(FilterChain chain, ResultSetProxy result, String columnLabel, String x) - throws SQLException { + throws SQLException { chain.resultSet_updateString(result, columnLabel, x); } @Override public void resultSet_updateTime(FilterChain chain, ResultSetProxy result, int columnIndex, java.sql.Time x) - throws SQLException { + throws SQLException { chain.resultSet_updateTime(result, columnIndex, x); } @Override public void resultSet_updateTime(FilterChain chain, ResultSetProxy result, String columnLabel, java.sql.Time x) - throws SQLException { + throws SQLException { chain.resultSet_updateTime(result, columnLabel, x); } @@ -2486,19 +2485,19 @@ public boolean statement_execute(FilterChain chain, StatementProxy statement, St @Override public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { return chain.statement_execute(statement, sql, autoGeneratedKeys); } @Override - public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { return chain.statement_execute(statement, sql, columnIndexes); } @Override - public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, String[] columnNames) + throws SQLException { return chain.statement_execute(statement, sql, columnNames); } @@ -2510,7 +2509,7 @@ public int[] statement_executeBatch(FilterChain chain, StatementProxy statement) // ///////////////////////////// @Override public ResultSetProxy statement_executeQuery(FilterChain chain, StatementProxy statement, String sql) - throws SQLException { + throws SQLException { return chain.statement_executeQuery(statement, sql); } @@ -2521,19 +2520,19 @@ public int statement_executeUpdate(FilterChain chain, StatementProxy statement, @Override public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { return chain.statement_executeUpdate(statement, sql, autoGeneratedKeys); } @Override - public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { return chain.statement_executeUpdate(statement, sql, columnIndexes); } @Override - public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, String[] columnNames) + throws SQLException { return chain.statement_executeUpdate(statement, sql, columnNames); } @@ -2574,7 +2573,7 @@ public boolean statement_getMoreResults(FilterChain chain, StatementProxy statem @Override public boolean statement_getMoreResults(FilterChain chain, StatementProxy statement, int current) - throws SQLException { + throws SQLException { return chain.statement_getMoreResults(statement, current); } @@ -2584,7 +2583,9 @@ public int statement_getQueryTimeout(FilterChain chain, StatementProxy statement } @Override - public void statement_setQueryTimeout(FilterChain chain, StatementProxy statement, int seconds) throws SQLException { + public void statement_setQueryTimeout(FilterChain chain, + StatementProxy statement, + int seconds) throws SQLException { chain.statement_setQueryTimeout(statement, seconds); } @@ -2640,13 +2641,13 @@ public void statement_setCursorName(FilterChain chain, StatementProxy statement, @Override public void statement_setEscapeProcessing(FilterChain chain, StatementProxy statement, boolean enable) - throws SQLException { + throws SQLException { chain.statement_setEscapeProcessing(statement, enable); } @Override public void statement_setFetchDirection(FilterChain chain, StatementProxy statement, int direction) - throws SQLException { + throws SQLException { chain.statement_setFetchDirection(statement, direction); } @@ -2667,7 +2668,7 @@ public void statement_setMaxRows(FilterChain chain, StatementProxy statement, in @Override public void statement_setPoolable(FilterChain chain, StatementProxy statement, boolean poolable) - throws SQLException { + throws SQLException { chain.statement_setPoolable(statement, poolable); } @@ -2713,12 +2714,14 @@ public int clob_setString(FilterChain chain, ClobProxy wrapper, long pos, String @Override public int clob_setString(FilterChain chain, ClobProxy wrapper, long pos, String str, int offset, int len) - throws SQLException { + throws SQLException { return chain.clob_setString(wrapper, pos, str, offset, len); } @Override - public java.io.OutputStream clob_setAsciiStream(FilterChain chain, ClobProxy wrapper, long pos) throws SQLException { + public java.io.OutputStream clob_setAsciiStream(FilterChain chain, + ClobProxy wrapper, + long pos) throws SQLException { return chain.clob_setAsciiStream(wrapper, pos); } @@ -2739,7 +2742,7 @@ public void clob_free(FilterChain chain, ClobProxy wrapper) throws SQLException @Override public Reader clob_getCharacterStream(FilterChain chain, ClobProxy wrapper, long pos, long length) - throws SQLException { + throws SQLException { return chain.clob_getCharacterStream(wrapper, pos, length); } @@ -2759,127 +2762,130 @@ public DruidPooledConnection dataSource_getConnection(FilterChain chain, DruidDa // /////////////// @Override - public int resultSetMetaData_getColumnCount(FilterChain chain, ResultSetMetaDataProxy metaData) throws SQLException { + public int resultSetMetaData_getColumnCount(FilterChain chain, + ResultSetMetaDataProxy metaData) throws SQLException { return chain.resultSetMetaData_getColumnCount(metaData); } @Override public boolean resultSetMetaData_isAutoIncrement(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isAutoIncrement(metaData, column); } @Override public boolean resultSetMetaData_isCaseSensitive(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isCaseSensitive(metaData, column); } @Override public boolean resultSetMetaData_isSearchable(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isSearchable(metaData, column); } @Override public boolean resultSetMetaData_isCurrency(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isCurrency(metaData, column); } @Override public int resultSetMetaData_isNullable(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isNullable(metaData, column); } @Override public boolean resultSetMetaData_isSigned(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isSigned(metaData, column); } @Override public int resultSetMetaData_getColumnDisplaySize(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getColumnDisplaySize(metaData, column); } @Override public String resultSetMetaData_getColumnLabel(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getColumnLabel(metaData, column); } @Override public String resultSetMetaData_getColumnName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getColumnName(metaData, column); } @Override public String resultSetMetaData_getSchemaName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getSchemaName(metaData, column); } @Override public int resultSetMetaData_getPrecision(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getPrecision(metaData, column); } @Override public int resultSetMetaData_getScale(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getScale(metaData, column); } @Override public String resultSetMetaData_getTableName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getTableName(metaData, column); } @Override public String resultSetMetaData_getCatalogName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getCatalogName(metaData, column); } @Override public int resultSetMetaData_getColumnType(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getColumnType(metaData, column); } @Override public String resultSetMetaData_getColumnTypeName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getColumnTypeName(metaData, column); } @Override public boolean resultSetMetaData_isReadOnly(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isReadOnly(metaData, column); } @Override public boolean resultSetMetaData_isWritable(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isWritable(metaData, column); } @Override - public boolean resultSetMetaData_isDefinitelyWritable(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + public boolean resultSetMetaData_isDefinitelyWritable(FilterChain chain, + ResultSetMetaDataProxy metaData, + int column) + throws SQLException { return chain.resultSetMetaData_isDefinitelyWritable(metaData, column); } @Override public String resultSetMetaData_getColumnClassName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getColumnClassName(metaData, column); } } diff --git a/src/main/java/com/alibaba/druid/filter/FilterChain.java b/src/main/java/com/alibaba/druid/filter/FilterChain.java index c2d0cfee1a..0f70520bf4 100644 --- a/src/main/java/com/alibaba/druid/filter/FilterChain.java +++ b/src/main/java/com/alibaba/druid/filter/FilterChain.java @@ -15,49 +15,24 @@ */ package com.alibaba.druid.filter; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import com.alibaba.druid.proxy.jdbc.*; + import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; import java.io.Writer; import java.math.BigDecimal; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.NClob; -import java.sql.ParameterMetaData; -import java.sql.Ref; -import java.sql.ResultSetMetaData; -import java.sql.RowId; -import java.sql.SQLClientInfoException; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.SQLXML; -import java.sql.Savepoint; -import java.sql.Statement; -import java.sql.Struct; -import java.sql.Wrapper; +import java.sql.*; import java.util.Calendar; import java.util.Properties; import java.util.concurrent.Executor; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidPooledConnection; -import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; -import com.alibaba.druid.proxy.jdbc.ClobProxy; -import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.proxy.jdbc.DataSourceProxy; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetMetaDataProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetProxy; -import com.alibaba.druid.proxy.jdbc.StatementProxy; - /** * @author wenshao [szujobs@hotmail.com] */ public interface FilterChain { - DataSourceProxy getDataSource(); int getFilterSize(); @@ -111,7 +86,7 @@ public interface FilterChain { void connection_clearWarnings(ConnectionProxy connection) throws SQLException; StatementProxy connection_createStatement(ConnectionProxy connection, int resultSetType, int resultSetConcurrency) - throws SQLException; + throws SQLException; PreparedStatementProxy connection_prepareStatement(ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency) throws SQLException; @@ -140,20 +115,20 @@ StatementProxy connection_createStatement(ConnectionProxy connection, int result PreparedStatementProxy connection_prepareStatement(ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) - throws SQLException; + throws SQLException; CallableStatementProxy connection_prepareCall(ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) - throws SQLException; + throws SQLException; PreparedStatementProxy connection_prepareStatement(ConnectionProxy connection, String sql, int autoGeneratedKeys) - throws SQLException; + throws SQLException; - PreparedStatementProxy connection_prepareStatement(ConnectionProxy connection, String sql, int columnIndexes[]) - throws SQLException; + PreparedStatementProxy connection_prepareStatement(ConnectionProxy connection, String sql, int[] columnIndexes) + throws SQLException; - PreparedStatementProxy connection_prepareStatement(ConnectionProxy connection, String sql, String columnNames[]) - throws SQLException; + PreparedStatementProxy connection_prepareStatement(ConnectionProxy connection, String sql, String[] columnNames) + throws SQLException; Clob connection_createClob(ConnectionProxy connection) throws SQLException; @@ -176,12 +151,18 @@ PreparedStatementProxy connection_prepareStatement(ConnectionProxy connection, S Array connection_createArrayOf(ConnectionProxy connection, String typeName, Object[] elements) throws SQLException; Struct connection_createStruct(ConnectionProxy connection, String typeName, Object[] attributes) - throws SQLException; + throws SQLException; String connection_getSchema(ConnectionProxy connection) throws SQLException; + void connection_setSchema(ConnectionProxy connection, String schema) throws SQLException; + void connection_abort(ConnectionProxy connection, Executor executor) throws SQLException; - void connection_setNetworkTimeout(ConnectionProxy connection, Executor executor, int milliseconds) throws SQLException; + + void connection_setNetworkTimeout(ConnectionProxy connection, + Executor executor, + int milliseconds) throws SQLException; + int connection_getNetworkTimeout(ConnectionProxy connection) throws SQLException; // --------- @@ -344,7 +325,7 @@ Struct connection_createStruct(ConnectionProxy connection, String typeName, Obje void resultSet_updateString(ResultSetProxy resultSet, int columnIndex, String x) throws SQLException; - void resultSet_updateBytes(ResultSetProxy resultSet, int columnIndex, byte x[]) throws SQLException; + void resultSet_updateBytes(ResultSetProxy resultSet, int columnIndex, byte[] x) throws SQLException; void resultSet_updateDate(ResultSetProxy resultSet, int columnIndex, java.sql.Date x) throws SQLException; @@ -353,16 +334,16 @@ Struct connection_createStruct(ConnectionProxy connection, String typeName, Obje void resultSet_updateTimestamp(ResultSetProxy resultSet, int columnIndex, java.sql.Timestamp x) throws SQLException; void resultSet_updateAsciiStream(ResultSetProxy resultSet, int columnIndex, java.io.InputStream x, int length) - throws SQLException; + throws SQLException; void resultSet_updateBinaryStream(ResultSetProxy resultSet, int columnIndex, java.io.InputStream x, int length) - throws SQLException; + throws SQLException; void resultSet_updateCharacterStream(ResultSetProxy resultSet, int columnIndex, java.io.Reader x, int length) - throws SQLException; + throws SQLException; void resultSet_updateObject(ResultSetProxy resultSet, int columnIndex, Object x, int scaleOrLength) - throws SQLException; + throws SQLException; void resultSet_updateObject(ResultSetProxy resultSet, int columnIndex, Object x) throws SQLException; @@ -386,26 +367,29 @@ void resultSet_updateObject(ResultSetProxy resultSet, int columnIndex, Object x, void resultSet_updateString(ResultSetProxy resultSet, String columnLabel, String x) throws SQLException; - void resultSet_updateBytes(ResultSetProxy resultSet, String columnLabel, byte x[]) throws SQLException; + void resultSet_updateBytes(ResultSetProxy resultSet, String columnLabel, byte[] x) throws SQLException; void resultSet_updateDate(ResultSetProxy resultSet, String columnLabel, java.sql.Date x) throws SQLException; void resultSet_updateTime(ResultSetProxy resultSet, String columnLabel, java.sql.Time x) throws SQLException; void resultSet_updateTimestamp(ResultSetProxy resultSet, String columnLabel, java.sql.Timestamp x) - throws SQLException; + throws SQLException; void resultSet_updateAsciiStream(ResultSetProxy resultSet, String columnLabel, java.io.InputStream x, int length) - throws SQLException; + throws SQLException; void resultSet_updateBinaryStream(ResultSetProxy resultSet, String columnLabel, java.io.InputStream x, int length) - throws SQLException; + throws SQLException; - void resultSet_updateCharacterStream(ResultSetProxy resultSet, String columnLabel, java.io.Reader reader, int length) - throws SQLException; + void resultSet_updateCharacterStream(ResultSetProxy resultSet, + String columnLabel, + java.io.Reader reader, + int length) + throws SQLException; void resultSet_updateObject(ResultSetProxy resultSet, String columnLabel, Object x, int scaleOrLength) - throws SQLException; + throws SQLException; void resultSet_updateObject(ResultSetProxy resultSet, String columnLabel, Object x) throws SQLException; @@ -426,7 +410,7 @@ void resultSet_updateObject(ResultSetProxy resultSet, String columnLabel, Object Statement resultSet_getStatement(ResultSetProxy resultSet) throws SQLException; Object resultSet_getObject(ResultSetProxy resultSet, int columnIndex, java.util.Map> map) - throws SQLException; + throws SQLException; Ref resultSet_getRef(ResultSetProxy resultSet, int columnIndex) throws SQLException; @@ -437,7 +421,7 @@ Object resultSet_getObject(ResultSetProxy resultSet, int columnIndex, java.util. Array resultSet_getArray(ResultSetProxy resultSet, int columnIndex) throws SQLException; Object resultSet_getObject(ResultSetProxy resultSet, String columnLabel, java.util.Map> map) - throws SQLException; + throws SQLException; Ref resultSet_getRef(ResultSetProxy resultSet, String columnLabel) throws SQLException; @@ -456,10 +440,10 @@ Object resultSet_getObject(ResultSetProxy resultSet, String columnLabel, java.ut java.sql.Time resultSet_getTime(ResultSetProxy resultSet, String columnLabel, Calendar cal) throws SQLException; java.sql.Timestamp resultSet_getTimestamp(ResultSetProxy resultSet, int columnIndex, Calendar cal) - throws SQLException; + throws SQLException; java.sql.Timestamp resultSet_getTimestamp(ResultSetProxy resultSet, String columnLabel, Calendar cal) - throws SQLException; + throws SQLException; java.net.URL resultSet_getURL(ResultSetProxy resultSet, int columnIndex) throws SQLException; @@ -522,75 +506,75 @@ java.sql.Timestamp resultSet_getTimestamp(ResultSetProxy resultSet, String colum java.io.Reader resultSet_getNCharacterStream(ResultSetProxy resultSet, String columnLabel) throws SQLException; void resultSet_updateNCharacterStream(ResultSetProxy resultSet, int columnIndex, java.io.Reader x, long length) - throws SQLException; + throws SQLException; void resultSet_updateNCharacterStream(ResultSetProxy resultSet, String columnLabel, java.io.Reader reader, long length) throws SQLException; void resultSet_updateAsciiStream(ResultSetProxy resultSet, int columnIndex, java.io.InputStream x, long length) - throws SQLException; + throws SQLException; void resultSet_updateBinaryStream(ResultSetProxy resultSet, int columnIndex, java.io.InputStream x, long length) - throws SQLException; + throws SQLException; void resultSet_updateCharacterStream(ResultSetProxy resultSet, int columnIndex, java.io.Reader x, long length) - throws SQLException; + throws SQLException; void resultSet_updateAsciiStream(ResultSetProxy resultSet, String columnLabel, java.io.InputStream x, long length) - throws SQLException; + throws SQLException; void resultSet_updateBinaryStream(ResultSetProxy resultSet, String columnLabel, java.io.InputStream x, long length) - throws SQLException; + throws SQLException; void resultSet_updateCharacterStream(ResultSetProxy resultSet, String columnLabel, java.io.Reader reader, long length) throws SQLException; void resultSet_updateBlob(ResultSetProxy resultSet, int columnIndex, InputStream inputStream, long length) - throws SQLException; + throws SQLException; void resultSet_updateBlob(ResultSetProxy resultSet, String columnLabel, InputStream inputStream, long length) - throws SQLException; + throws SQLException; void resultSet_updateClob(ResultSetProxy resultSet, int columnIndex, Reader reader, long length) - throws SQLException; + throws SQLException; void resultSet_updateClob(ResultSetProxy resultSet, String columnLabel, Reader reader, long length) - throws SQLException; + throws SQLException; void resultSet_updateNClob(ResultSetProxy resultSet, int columnIndex, Reader reader, long length) - throws SQLException; + throws SQLException; void resultSet_updateNClob(ResultSetProxy resultSet, String columnLabel, Reader reader, long length) - throws SQLException; + throws SQLException; void resultSet_updateNCharacterStream(ResultSetProxy resultSet, int columnIndex, java.io.Reader x) - throws SQLException; + throws SQLException; void resultSet_updateNCharacterStream(ResultSetProxy resultSet, String columnLabel, java.io.Reader reader) - throws SQLException; + throws SQLException; void resultSet_updateAsciiStream(ResultSetProxy resultSet, int columnIndex, java.io.InputStream x) - throws SQLException; + throws SQLException; void resultSet_updateBinaryStream(ResultSetProxy resultSet, int columnIndex, java.io.InputStream x) - throws SQLException; + throws SQLException; void resultSet_updateCharacterStream(ResultSetProxy resultSet, int columnIndex, java.io.Reader x) - throws SQLException; + throws SQLException; void resultSet_updateAsciiStream(ResultSetProxy resultSet, String columnLabel, java.io.InputStream x) - throws SQLException; + throws SQLException; void resultSet_updateBinaryStream(ResultSetProxy resultSet, String columnLabel, java.io.InputStream x) - throws SQLException; + throws SQLException; void resultSet_updateCharacterStream(ResultSetProxy resultSet, String columnLabel, java.io.Reader reader) - throws SQLException; + throws SQLException; void resultSet_updateBlob(ResultSetProxy resultSet, int columnIndex, InputStream inputStream) throws SQLException; void resultSet_updateBlob(ResultSetProxy resultSet, String columnLabel, InputStream inputStream) - throws SQLException; + throws SQLException; void resultSet_updateClob(ResultSetProxy resultSet, int columnIndex, Reader reader) throws SQLException; @@ -664,15 +648,15 @@ void resultSet_updateBlob(ResultSetProxy resultSet, String columnLabel, InputStr int statement_executeUpdate(StatementProxy statement, String sql, int autoGeneratedKeys) throws SQLException; - int statement_executeUpdate(StatementProxy statement, String sql, int columnIndexes[]) throws SQLException; + int statement_executeUpdate(StatementProxy statement, String sql, int[] columnIndexes) throws SQLException; - int statement_executeUpdate(StatementProxy statement, String sql, String columnNames[]) throws SQLException; + int statement_executeUpdate(StatementProxy statement, String sql, String[] columnNames) throws SQLException; boolean statement_execute(StatementProxy statement, String sql, int autoGeneratedKeys) throws SQLException; - boolean statement_execute(StatementProxy statement, String sql, int columnIndexes[]) throws SQLException; + boolean statement_execute(StatementProxy statement, String sql, int[] columnIndexes) throws SQLException; - boolean statement_execute(StatementProxy statement, String sql, String columnNames[]) throws SQLException; + boolean statement_execute(StatementProxy statement, String sql, String[] columnNames) throws SQLException; int statement_getResultSetHoldability(StatementProxy statement) throws SQLException; @@ -689,10 +673,10 @@ void resultSet_updateBlob(ResultSetProxy resultSet, String columnLabel, InputStr int preparedStatement_executeUpdate(PreparedStatementProxy statement) throws SQLException; void preparedStatement_setNull(PreparedStatementProxy statement, int parameterIndex, int sqlType) - throws SQLException; + throws SQLException; void preparedStatement_setBoolean(PreparedStatementProxy statement, int parameterIndex, boolean x) - throws SQLException; + throws SQLException; void preparedStatement_setByte(PreparedStatementProxy statement, int parameterIndex, byte x) throws SQLException; @@ -705,24 +689,24 @@ void preparedStatement_setBoolean(PreparedStatementProxy statement, int paramete void preparedStatement_setFloat(PreparedStatementProxy statement, int parameterIndex, float x) throws SQLException; void preparedStatement_setDouble(PreparedStatementProxy statement, int parameterIndex, double x) - throws SQLException; + throws SQLException; void preparedStatement_setBigDecimal(PreparedStatementProxy statement, int parameterIndex, BigDecimal x) - throws SQLException; + throws SQLException; void preparedStatement_setString(PreparedStatementProxy statement, int parameterIndex, String x) - throws SQLException; + throws SQLException; - void preparedStatement_setBytes(PreparedStatementProxy statement, int parameterIndex, byte x[]) throws SQLException; + void preparedStatement_setBytes(PreparedStatementProxy statement, int parameterIndex, byte[] x) throws SQLException; void preparedStatement_setDate(PreparedStatementProxy statement, int parameterIndex, java.sql.Date x) - throws SQLException; + throws SQLException; void preparedStatement_setTime(PreparedStatementProxy statement, int parameterIndex, java.sql.Time x) - throws SQLException; + throws SQLException; void preparedStatement_setTimestamp(PreparedStatementProxy statement, int parameterIndex, java.sql.Timestamp x) - throws SQLException; + throws SQLException; void preparedStatement_setAsciiStream(PreparedStatementProxy statement, int parameterIndex, java.io.InputStream x, int length) throws SQLException; @@ -736,10 +720,10 @@ void preparedStatement_setBinaryStream(PreparedStatementProxy statement, int par void preparedStatement_clearParameters(PreparedStatementProxy statement) throws SQLException; void preparedStatement_setObject(PreparedStatementProxy statement, int parameterIndex, Object x, int targetSqlType) - throws SQLException; + throws SQLException; void preparedStatement_setObject(PreparedStatementProxy statement, int parameterIndex, Object x) - throws SQLException; + throws SQLException; boolean preparedStatement_execute(PreparedStatementProxy statement) throws SQLException; @@ -759,44 +743,44 @@ void preparedStatement_setCharacterStream(PreparedStatementProxy statement, int ResultSetMetaData preparedStatement_getMetaData(PreparedStatementProxy statement) throws SQLException; void preparedStatement_setDate(PreparedStatementProxy statement, int parameterIndex, java.sql.Date x, Calendar cal) - throws SQLException; + throws SQLException; void preparedStatement_setTime(PreparedStatementProxy statement, int parameterIndex, java.sql.Time x, Calendar cal) - throws SQLException; + throws SQLException; void preparedStatement_setTimestamp(PreparedStatementProxy statement, int parameterIndex, java.sql.Timestamp x, Calendar cal) throws SQLException; void preparedStatement_setNull(PreparedStatementProxy statement, int parameterIndex, int sqlType, String typeName) - throws SQLException; + throws SQLException; void preparedStatement_setURL(PreparedStatementProxy statement, int parameterIndex, java.net.URL x) - throws SQLException; + throws SQLException; ParameterMetaData preparedStatement_getParameterMetaData(PreparedStatementProxy statement) throws SQLException; void preparedStatement_setRowId(PreparedStatementProxy statement, int parameterIndex, RowId x) throws SQLException; void preparedStatement_setNString(PreparedStatementProxy statement, int parameterIndex, String value) - throws SQLException; + throws SQLException; void preparedStatement_setNCharacterStream(PreparedStatementProxy statement, int parameterIndex, Reader value, long length) throws SQLException; void preparedStatement_setNClob(PreparedStatementProxy statement, int parameterIndex, NClob value) - throws SQLException; + throws SQLException; void preparedStatement_setClob(PreparedStatementProxy statement, int parameterIndex, Reader reader, long length) - throws SQLException; + throws SQLException; void preparedStatement_setBlob(PreparedStatementProxy statement, int parameterIndex, InputStream inputStream, long length) throws SQLException; void preparedStatement_setNClob(PreparedStatementProxy statement, int parameterIndex, Reader reader, long length) - throws SQLException; + throws SQLException; void preparedStatement_setSQLXML(PreparedStatementProxy statement, int parameterIndex, SQLXML xmlObject) - throws SQLException; + throws SQLException; void preparedStatement_setObject(PreparedStatementProxy statement, int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException; @@ -811,30 +795,30 @@ void preparedStatement_setCharacterStream(PreparedStatementProxy statement, int java.io.Reader reader, long length) throws SQLException; void preparedStatement_setAsciiStream(PreparedStatementProxy statement, int parameterIndex, java.io.InputStream x) - throws SQLException; + throws SQLException; void preparedStatement_setBinaryStream(PreparedStatementProxy statement, int parameterIndex, java.io.InputStream x) - throws SQLException; + throws SQLException; void preparedStatement_setCharacterStream(PreparedStatementProxy statement, int parameterIndex, java.io.Reader reader) throws SQLException; void preparedStatement_setNCharacterStream(PreparedStatementProxy statement, int parameterIndex, Reader value) - throws SQLException; + throws SQLException; void preparedStatement_setClob(PreparedStatementProxy statement, int parameterIndex, Reader reader) - throws SQLException; + throws SQLException; void preparedStatement_setBlob(PreparedStatementProxy statement, int parameterIndex, InputStream inputStream) - throws SQLException; + throws SQLException; void preparedStatement_setNClob(PreparedStatementProxy statement, int parameterIndex, Reader reader) - throws SQLException; + throws SQLException; // ///////////////////////////// void callableStatement_registerOutParameter(CallableStatementProxy statement, int parameterIndex, int sqlType) - throws SQLException; + throws SQLException; void callableStatement_registerOutParameter(CallableStatementProxy statement, int parameterIndex, int sqlType, int scale) throws SQLException; @@ -858,7 +842,7 @@ void callableStatement_registerOutParameter(CallableStatementProxy statement, in double callableStatement_getDouble(CallableStatementProxy statement, int parameterIndex) throws SQLException; BigDecimal callableStatement_getBigDecimal(CallableStatementProxy statement, int parameterIndex, int scale) - throws SQLException; + throws SQLException; byte[] callableStatement_getBytes(CallableStatementProxy statement, int parameterIndex) throws SQLException; @@ -867,12 +851,12 @@ BigDecimal callableStatement_getBigDecimal(CallableStatementProxy statement, int java.sql.Time callableStatement_getTime(CallableStatementProxy statement, int parameterIndex) throws SQLException; java.sql.Timestamp callableStatement_getTimestamp(CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; Object callableStatement_getObject(CallableStatementProxy statement, int parameterIndex) throws SQLException; BigDecimal callableStatement_getBigDecimal(CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; Object callableStatement_getObject(CallableStatementProxy statement, int parameterIndex, java.util.Map> map) throws SQLException; @@ -886,19 +870,21 @@ Object callableStatement_getObject(CallableStatementProxy statement, int paramet Array callableStatement_getArray(CallableStatementProxy statement, int parameterIndex) throws SQLException; java.sql.Date callableStatement_getDate(CallableStatementProxy statement, int parameterIndex, Calendar cal) - throws SQLException; + throws SQLException; java.sql.Time callableStatement_getTime(CallableStatementProxy statement, int parameterIndex, Calendar cal) - throws SQLException; + throws SQLException; - java.sql.Timestamp callableStatement_getTimestamp(CallableStatementProxy statement, int parameterIndex, Calendar cal) - throws SQLException; + java.sql.Timestamp callableStatement_getTimestamp(CallableStatementProxy statement, + int parameterIndex, + Calendar cal) + throws SQLException; void callableStatement_registerOutParameter(CallableStatementProxy statement, int parameterIndex, int sqlType, String typeName) throws SQLException; void callableStatement_registerOutParameter(CallableStatementProxy statement, String parameterName, int sqlType) - throws SQLException; + throws SQLException; void callableStatement_registerOutParameter(CallableStatementProxy statement, String parameterName, int sqlType, int scale) throws SQLException; @@ -909,46 +895,46 @@ void callableStatement_registerOutParameter(CallableStatementProxy statement, St java.net.URL callableStatement_getURL(CallableStatementProxy statement, int parameterIndex) throws SQLException; void callableStatement_setURL(CallableStatementProxy statement, String parameterName, java.net.URL val) - throws SQLException; + throws SQLException; void callableStatement_setNull(CallableStatementProxy statement, String parameterName, int sqlType) - throws SQLException; + throws SQLException; void callableStatement_setBoolean(CallableStatementProxy statement, String parameterName, boolean x) - throws SQLException; + throws SQLException; void callableStatement_setByte(CallableStatementProxy statement, String parameterName, byte x) throws SQLException; void callableStatement_setShort(CallableStatementProxy statement, String parameterName, short x) - throws SQLException; + throws SQLException; void callableStatement_setInt(CallableStatementProxy statement, String parameterName, int x) throws SQLException; void callableStatement_setLong(CallableStatementProxy statement, String parameterName, long x) throws SQLException; void callableStatement_setFloat(CallableStatementProxy statement, String parameterName, float x) - throws SQLException; + throws SQLException; void callableStatement_setDouble(CallableStatementProxy statement, String parameterName, double x) - throws SQLException; + throws SQLException; void callableStatement_setBigDecimal(CallableStatementProxy statement, String parameterName, BigDecimal x) - throws SQLException; + throws SQLException; void callableStatement_setString(CallableStatementProxy statement, String parameterName, String x) - throws SQLException; + throws SQLException; - void callableStatement_setBytes(CallableStatementProxy statement, String parameterName, byte x[]) - throws SQLException; + void callableStatement_setBytes(CallableStatementProxy statement, String parameterName, byte[] x) + throws SQLException; void callableStatement_setDate(CallableStatementProxy statement, String parameterName, java.sql.Date x) - throws SQLException; + throws SQLException; void callableStatement_setTime(CallableStatementProxy statement, String parameterName, java.sql.Time x) - throws SQLException; + throws SQLException; void callableStatement_setTimestamp(CallableStatementProxy statement, String parameterName, java.sql.Timestamp x) - throws SQLException; + throws SQLException; void callableStatement_setAsciiStream(CallableStatementProxy statement, String parameterName, java.io.InputStream x, int length) throws SQLException; @@ -959,26 +945,35 @@ void callableStatement_setBinaryStream(CallableStatementProxy statement, String void callableStatement_setObject(CallableStatementProxy statement, String parameterName, Object x, int targetSqlType, int scale) throws SQLException; - void callableStatement_setObject(CallableStatementProxy statement, String parameterName, Object x, int targetSqlType) - throws SQLException; + void callableStatement_setObject(CallableStatementProxy statement, + String parameterName, + Object x, + int targetSqlType) + throws SQLException; void callableStatement_setObject(CallableStatementProxy statement, String parameterName, Object x) - throws SQLException; + throws SQLException; void callableStatement_setCharacterStream(CallableStatementProxy statement, String parameterName, java.io.Reader reader, int length) throws SQLException; - void callableStatement_setDate(CallableStatementProxy statement, String parameterName, java.sql.Date x, Calendar cal) - throws SQLException; + void callableStatement_setDate(CallableStatementProxy statement, + String parameterName, + java.sql.Date x, + Calendar cal) + throws SQLException; - void callableStatement_setTime(CallableStatementProxy statement, String parameterName, java.sql.Time x, Calendar cal) - throws SQLException; + void callableStatement_setTime(CallableStatementProxy statement, + String parameterName, + java.sql.Time x, + Calendar cal) + throws SQLException; void callableStatement_setTimestamp(CallableStatementProxy statement, String parameterName, java.sql.Timestamp x, Calendar cal) throws SQLException; void callableStatement_setNull(CallableStatementProxy statement, String parameterName, int sqlType, String typeName) - throws SQLException; + throws SQLException; String callableStatement_getString(CallableStatementProxy statement, String parameterName) throws SQLException; @@ -1003,12 +998,12 @@ void callableStatement_setNull(CallableStatementProxy statement, String paramete java.sql.Time callableStatement_getTime(CallableStatementProxy statement, String parameterName) throws SQLException; java.sql.Timestamp callableStatement_getTimestamp(CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; Object callableStatement_getObject(CallableStatementProxy statement, String parameterName) throws SQLException; BigDecimal callableStatement_getBigDecimal(CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; Object callableStatement_getObject(CallableStatementProxy statement, String parameterName, java.util.Map> map) throws SQLException; @@ -1022,10 +1017,10 @@ Object callableStatement_getObject(CallableStatementProxy statement, String para Array callableStatement_getArray(CallableStatementProxy statement, String parameterName) throws SQLException; java.sql.Date callableStatement_getDate(CallableStatementProxy statement, String parameterName, Calendar cal) - throws SQLException; + throws SQLException; java.sql.Time callableStatement_getTime(CallableStatementProxy statement, String parameterName, Calendar cal) - throws SQLException; + throws SQLException; java.sql.Timestamp callableStatement_getTimestamp(CallableStatementProxy statement, String parameterName, Calendar cal) throws SQLException; @@ -1037,32 +1032,32 @@ java.sql.Timestamp callableStatement_getTimestamp(CallableStatementProxy stateme RowId callableStatement_getRowId(CallableStatementProxy statement, String parameterName) throws SQLException; void callableStatement_setRowId(CallableStatementProxy statement, String parameterName, RowId x) - throws SQLException; + throws SQLException; void callableStatement_setNString(CallableStatementProxy statement, String parameterName, String value) - throws SQLException; + throws SQLException; void callableStatement_setNCharacterStream(CallableStatementProxy statement, String parameterName, Reader value, long length) throws SQLException; void callableStatement_setNClob(CallableStatementProxy statement, String parameterName, NClob value) - throws SQLException; + throws SQLException; void callableStatement_setClob(CallableStatementProxy statement, String parameterName, Reader reader, long length) - throws SQLException; + throws SQLException; void callableStatement_setBlob(CallableStatementProxy statement, String parameterName, InputStream inputStream, long length) throws SQLException; void callableStatement_setNClob(CallableStatementProxy statement, String parameterName, Reader reader, long length) - throws SQLException; + throws SQLException; NClob callableStatement_getNClob(CallableStatementProxy statement, int parameterIndex) throws SQLException; NClob callableStatement_getNClob(CallableStatementProxy statement, String parameterName) throws SQLException; void callableStatement_setSQLXML(CallableStatementProxy statement, String parameterName, SQLXML xmlObject) - throws SQLException; + throws SQLException; SQLXML callableStatement_getSQLXML(CallableStatementProxy statement, int parameterIndex) throws SQLException; @@ -1073,16 +1068,16 @@ void callableStatement_setSQLXML(CallableStatementProxy statement, String parame String callableStatement_getNString(CallableStatementProxy statement, String parameterName) throws SQLException; java.io.Reader callableStatement_getNCharacterStream(CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; java.io.Reader callableStatement_getNCharacterStream(CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; java.io.Reader callableStatement_getCharacterStream(CallableStatementProxy statement, int parameterIndex) - throws SQLException; + throws SQLException; java.io.Reader callableStatement_getCharacterStream(CallableStatementProxy statement, String parameterName) - throws SQLException; + throws SQLException; void callableStatement_setBlob(CallableStatementProxy statement, String parameterName, Blob x) throws SQLException; @@ -1098,25 +1093,27 @@ void callableStatement_setCharacterStream(CallableStatementProxy statement, Stri java.io.Reader reader, long length) throws SQLException; void callableStatement_setAsciiStream(CallableStatementProxy statement, String parameterName, java.io.InputStream x) - throws SQLException; + throws SQLException; - void callableStatement_setBinaryStream(CallableStatementProxy statement, String parameterName, java.io.InputStream x) - throws SQLException; + void callableStatement_setBinaryStream(CallableStatementProxy statement, + String parameterName, + java.io.InputStream x) + throws SQLException; void callableStatement_setCharacterStream(CallableStatementProxy statement, String parameterName, java.io.Reader reader) throws SQLException; void callableStatement_setNCharacterStream(CallableStatementProxy statement, String parameterName, Reader value) - throws SQLException; + throws SQLException; void callableStatement_setClob(CallableStatementProxy statement, String parameterName, Reader reader) - throws SQLException; + throws SQLException; void callableStatement_setBlob(CallableStatementProxy statement, String parameterName, InputStream inputStream) - throws SQLException; + throws SQLException; void callableStatement_setNClob(CallableStatementProxy statement, String parameterName, Reader reader) - throws SQLException; + throws SQLException; void clob_free(ClobProxy wrapper) throws SQLException; diff --git a/src/main/java/com/alibaba/druid/filter/FilterChainImpl.java b/src/main/java/com/alibaba/druid/filter/FilterChainImpl.java index fa7fc67e2e..a48c6c856a 100644 --- a/src/main/java/com/alibaba/druid/filter/FilterChainImpl.java +++ b/src/main/java/com/alibaba/druid/filter/FilterChainImpl.java @@ -15,74 +15,36 @@ */ package com.alibaba.druid.filter; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import com.alibaba.druid.proxy.jdbc.*; + import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; -import java.sql.Array; -import java.sql.Blob; -import java.sql.CallableStatement; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.Driver; -import java.sql.NClob; -import java.sql.ParameterMetaData; -import java.sql.PreparedStatement; -import java.sql.Ref; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.RowId; -import java.sql.SQLClientInfoException; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.SQLXML; -import java.sql.Savepoint; -import java.sql.Statement; -import java.sql.Struct; -import java.sql.Wrapper; +import java.sql.*; import java.util.Calendar; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.concurrent.Executor; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidPooledConnection; -import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; -import com.alibaba.druid.proxy.jdbc.CallableStatementProxyImpl; -import com.alibaba.druid.proxy.jdbc.ClobProxy; -import com.alibaba.druid.proxy.jdbc.ClobProxyImpl; -import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl; -import com.alibaba.druid.proxy.jdbc.DataSourceProxy; -import com.alibaba.druid.proxy.jdbc.NClobProxy; -import com.alibaba.druid.proxy.jdbc.NClobProxyImpl; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxyImpl; -import com.alibaba.druid.proxy.jdbc.ResultSetMetaDataProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetMetaDataProxyImpl; -import com.alibaba.druid.proxy.jdbc.ResultSetProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetProxyImpl; -import com.alibaba.druid.proxy.jdbc.StatementProxy; -import com.alibaba.druid.proxy.jdbc.StatementProxyImpl; - /** * @author wenshao [szujobs@hotmail.com] */ public class FilterChainImpl implements FilterChain { - - protected int pos = 0; + protected int pos; private final DataSourceProxy dataSource; - private final int filterSize; + private final int filterSize; - public FilterChainImpl(DataSourceProxy dataSource){ + public FilterChainImpl(DataSourceProxy dataSource) { this.dataSource = dataSource; this.filterSize = getFilters().size(); } - public FilterChainImpl(DataSourceProxy dataSource, int pos){ + public FilterChainImpl(DataSourceProxy dataSource, int pos) { this.dataSource = dataSource; this.pos = pos; this.filterSize = getFilters().size(); @@ -129,7 +91,7 @@ public boolean isWrapperFor(Wrapper wrapper, Class iface) throws SQLException public T unwrap(Wrapper wrapper, Class iface) throws SQLException { if (this.pos < filterSize) { return nextFilter() - .unwrap(this, wrapper, iface); + .unwrap(this, wrapper, iface); } if (iface == null) { @@ -201,7 +163,7 @@ public void connection_commit(ConnectionProxy connection) throws SQLException { @Override public Array connection_createArrayOf(ConnectionProxy connection, String typeName, Object[] elements) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter() .connection_createArrayOf(this, connection, typeName, elements); @@ -230,9 +192,11 @@ public Clob connection_createClob(ConnectionProxy connection) throws SQLExceptio .connection_createClob(this, connection); } - return wrap(connection - , connection.getRawObject() - .createClob() + return wrap( + connection, + connection + .getRawObject() + .createClob() ); } @@ -243,9 +207,11 @@ public NClob connection_createNClob(ConnectionProxy connection) throws SQLExcept .connection_createNClob(this, connection); } - return wrap(connection - , connection.getRawObject() - .createNClob() + return wrap( + connection, + connection + .getRawObject() + .createNClob() ); } @@ -274,9 +240,10 @@ public StatementProxy connection_createStatement(ConnectionProxy connection) thr return null; } - return new StatementProxyImpl(connection - , statement - , dataSource.createStatementId() + return new StatementProxyImpl( + connection, + statement, + dataSource.createStatementId() ); } @@ -284,8 +251,7 @@ public StatementProxy connection_createStatement(ConnectionProxy connection) thr public StatementProxy connection_createStatement( ConnectionProxy connection, int resultSetType, - int resultSetConcurrency) throws SQLException - { + int resultSetConcurrency) throws SQLException { if (this.pos < filterSize) { return nextFilter() .connection_createStatement(this, connection, resultSetType, resultSetConcurrency); @@ -306,8 +272,7 @@ public StatementProxy connection_createStatement( ConnectionProxy connection, int resultSetType, int resultSetConcurrency, - int resultSetHoldability) throws SQLException - { + int resultSetHoldability) throws SQLException { if (this.pos < filterSize) { return nextFilter() .connection_createStatement(this, connection, resultSetType, resultSetConcurrency, resultSetHoldability); @@ -318,17 +283,17 @@ public StatementProxy connection_createStatement( if (statement == null) { return null; } - return new StatementProxyImpl(connection - , statement - , dataSource.createStatementId()); + return new StatementProxyImpl( + connection, + statement, + dataSource.createStatementId()); } @Override public Struct connection_createStruct( ConnectionProxy connection, String typeName, - Object[] attributes) throws SQLException - { + Object[] attributes) throws SQLException { if (this.pos < filterSize) { return nextFilter() .connection_createStruct(this, connection, typeName, attributes); @@ -512,8 +477,7 @@ public CallableStatementProxy connection_prepareCall( ConnectionProxy connection, String sql, int resultSetType, - int resultSetConcurrency) throws SQLException - { + int resultSetConcurrency) throws SQLException { if (this.pos < filterSize) { return nextFilter() .connection_prepareCall(this, connection, sql, resultSetType, resultSetConcurrency); @@ -535,16 +499,16 @@ public CallableStatementProxy connection_prepareCall( String sql, int resultSetType, int resultSetConcurrency, - int resultSetHoldability) throws SQLException - { + int resultSetHoldability) throws SQLException { if (this.pos < filterSize) { return nextFilter() - .connection_prepareCall(this - , connection - , sql - , resultSetType - , resultSetConcurrency - , resultSetHoldability + .connection_prepareCall( + this, + connection, + sql, + resultSetType, + resultSetConcurrency, + resultSetHoldability ); } @@ -561,8 +525,7 @@ public CallableStatementProxy connection_prepareCall( @Override public PreparedStatementProxy connection_prepareStatement( ConnectionProxy connection, - String sql) throws SQLException - { + String sql) throws SQLException { if (this.pos < filterSize) { return nextFilter() .connection_prepareStatement(this, connection, sql); @@ -582,8 +545,7 @@ public PreparedStatementProxy connection_prepareStatement( public PreparedStatementProxy connection_prepareStatement( ConnectionProxy connection, String sql, - int autoGeneratedKeys) throws SQLException - { + int autoGeneratedKeys) throws SQLException { if (this.pos < filterSize) { return nextFilter() .connection_prepareStatement(this, connection, sql, autoGeneratedKeys); @@ -603,8 +565,7 @@ public PreparedStatementProxy connection_prepareStatement( ConnectionProxy connection, String sql, int resultSetType, - int resultSetConcurrency) throws SQLException - { + int resultSetConcurrency) throws SQLException { if (this.pos < filterSize) { return nextFilter() .connection_prepareStatement(this, connection, sql, resultSetType, resultSetConcurrency); @@ -627,8 +588,7 @@ public PreparedStatementProxy connection_prepareStatement( String sql, int resultSetType, int resultSetConcurrency, - int resultSetHoldability) throws SQLException - { + int resultSetHoldability) throws SQLException { if (this.pos < filterSize) { return nextFilter() .connection_prepareStatement(this, connection, sql, resultSetType, resultSetConcurrency, resultSetHoldability); @@ -641,10 +601,11 @@ public PreparedStatementProxy connection_prepareStatement( return null; } - return new PreparedStatementProxyImpl(connection - , statement - , sql - , dataSource.createStatementId() + return new PreparedStatementProxyImpl( + connection, + statement, + sql, + dataSource.createStatementId() ); } @@ -652,8 +613,7 @@ public PreparedStatementProxy connection_prepareStatement( public PreparedStatementProxy connection_prepareStatement( ConnectionProxy connection, String sql, - int[] columnIndexes) throws SQLException - { + int[] columnIndexes) throws SQLException { if (this.pos < filterSize) { return nextFilter() .connection_prepareStatement(this, connection, sql, columnIndexes); @@ -666,10 +626,11 @@ public PreparedStatementProxy connection_prepareStatement( return null; } - return new PreparedStatementProxyImpl(connection - , statement - , sql - , dataSource.createStatementId() + return new PreparedStatementProxyImpl( + connection, + statement, + sql, + dataSource.createStatementId() ); } @@ -753,8 +714,7 @@ public void connection_setCatalog(ConnectionProxy connection, String catalog) th @Override public void connection_setClientInfo( ConnectionProxy connection, - Properties properties) throws SQLClientInfoException - { + Properties properties) throws SQLClientInfoException { if (this.pos < filterSize) { nextFilter() .connection_setClientInfo(this, connection, properties); @@ -768,8 +728,7 @@ public void connection_setClientInfo( @Override public void connection_setClientInfo( ConnectionProxy connection, - String name, String value) throws SQLClientInfoException - { + String name, String value) throws SQLClientInfoException { if (this.pos < filterSize) { nextFilter() .connection_setClientInfo(this, connection, name, value); @@ -884,7 +843,9 @@ public void connection_abort(ConnectionProxy conn, Executor executor) throws SQL .abort(executor); } - public void connection_setNetworkTimeout(ConnectionProxy conn, Executor executor, int milliseconds) throws SQLException { + public void connection_setNetworkTimeout(ConnectionProxy conn, + Executor executor, + int milliseconds) throws SQLException { if (this.pos < filterSize) { nextFilter() .connection_setNetworkTimeout(this, conn, executor, milliseconds); @@ -1098,7 +1059,7 @@ public java.io.InputStream resultSet_getAsciiStream(ResultSetProxy rs, int colum @SuppressWarnings("deprecation") @Override public java.io.InputStream resultSet_getUnicodeStream(ResultSetProxy rs, int columnIndex) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter() .resultSet_getUnicodeStream(this, rs, columnIndex); @@ -1353,10 +1314,11 @@ public Object resultSet_getObject(ResultSetProxy rs, int columnIndex) throws SQL if (obj instanceof ResultSet) { StatementProxy statement = rs.getStatementProxy(); - return new ResultSetProxyImpl(statement - , (ResultSet) obj - , dataSource.createResultSetId() - , statement.getLastExecuteSql() + return new ResultSetProxyImpl( + statement, + (ResultSet) obj, + dataSource.createResultSetId(), + statement.getLastExecuteSql() ); } @@ -1379,10 +1341,11 @@ public T resultSet_getObject(ResultSetProxy rs, int columnIndex, Class ty if (obj instanceof ResultSet) { StatementProxy statement = rs.getStatementProxy(); - return (T) new ResultSetProxyImpl(statement - , (ResultSet) obj - , dataSource.createResultSetId() - , statement.getLastExecuteSql() + return (T) new ResultSetProxyImpl( + statement, + (ResultSet) obj, + dataSource.createResultSetId(), + statement.getLastExecuteSql() ); } @@ -1406,10 +1369,11 @@ public Object resultSet_getObject(ResultSetProxy rs, String columnLabel) throws if (obj instanceof ResultSet) { StatementProxy stmt = rs.getStatementProxy(); - return new ResultSetProxyImpl(stmt - , (ResultSet) obj - , dataSource.createResultSetId() - , stmt.getLastExecuteSql() + return new ResultSetProxyImpl( + stmt, + (ResultSet) obj, + dataSource.createResultSetId(), + stmt.getLastExecuteSql() ); } @@ -1432,10 +1396,11 @@ public T resultSet_getObject(ResultSetProxy rs, String columnLabel, Class if (obj instanceof ResultSet) { StatementProxy stmt = rs.getStatementProxy(); - return (T) new ResultSetProxyImpl(stmt - , (ResultSet) obj - , dataSource.createResultSetId() - , stmt.getLastExecuteSql() + return (T) new ResultSetProxyImpl( + stmt, + (ResultSet) obj, + dataSource.createResultSetId(), + stmt.getLastExecuteSql() ); } @@ -1808,7 +1773,9 @@ public void resultSet_updateDouble(ResultSetProxy resultSet, int columnIndex, do } @Override - public void resultSet_updateBigDecimal(ResultSetProxy resultSet, int columnIndex, BigDecimal x) throws SQLException { + public void resultSet_updateBigDecimal(ResultSetProxy resultSet, + int columnIndex, + BigDecimal x) throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateBigDecimal(this, resultSet, columnIndex, x); return; @@ -1854,7 +1821,7 @@ public void resultSet_updateTime(ResultSetProxy resultSet, int columnIndex, java @Override public void resultSet_updateTimestamp(ResultSetProxy resultSet, int columnIndex, java.sql.Timestamp x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateTimestamp(this, resultSet, columnIndex, x); return; @@ -1863,8 +1830,11 @@ public void resultSet_updateTimestamp(ResultSetProxy resultSet, int columnIndex, } @Override - public void resultSet_updateAsciiStream(ResultSetProxy resultSet, int columnIndex, java.io.InputStream x, int length) - throws SQLException { + public void resultSet_updateAsciiStream(ResultSetProxy resultSet, + int columnIndex, + java.io.InputStream x, + int length) + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateAsciiStream(this, resultSet, columnIndex, x, length); return; @@ -1884,7 +1854,7 @@ public void resultSet_updateBinaryStream(ResultSetProxy resultSet, int columnInd @Override public void resultSet_updateCharacterStream(ResultSetProxy resultSet, int columnIndex, java.io.Reader x, int length) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateCharacterStream(this, resultSet, columnIndex, x, length); return; @@ -1894,7 +1864,7 @@ public void resultSet_updateCharacterStream(ResultSetProxy resultSet, int column @Override public void resultSet_updateObject(ResultSetProxy resultSet, int columnIndex, Object x, int scaleOrLength) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateObject(this, resultSet, columnIndex, x, scaleOrLength); return; @@ -1985,7 +1955,7 @@ public void resultSet_updateDouble(ResultSetProxy resultSet, String columnLabel, @Override public void resultSet_updateBigDecimal(ResultSetProxy resultSet, String columnLabel, BigDecimal x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateBigDecimal(this, resultSet, columnLabel, x); return; @@ -2003,7 +1973,7 @@ public void resultSet_updateString(ResultSetProxy resultSet, String columnLabel, } @Override - public void resultSet_updateBytes(ResultSetProxy resultSet, String columnLabel, byte x[]) throws SQLException { + public void resultSet_updateBytes(ResultSetProxy resultSet, String columnLabel, byte[] x) throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateBytes(this, resultSet, columnLabel, x); return; @@ -2012,7 +1982,9 @@ public void resultSet_updateBytes(ResultSetProxy resultSet, String columnLabel, } @Override - public void resultSet_updateDate(ResultSetProxy resultSet, String columnLabel, java.sql.Date x) throws SQLException { + public void resultSet_updateDate(ResultSetProxy resultSet, + String columnLabel, + java.sql.Date x) throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateDate(this, resultSet, columnLabel, x); return; @@ -2021,7 +1993,9 @@ public void resultSet_updateDate(ResultSetProxy resultSet, String columnLabel, j } @Override - public void resultSet_updateTime(ResultSetProxy resultSet, String columnLabel, java.sql.Time x) throws SQLException { + public void resultSet_updateTime(ResultSetProxy resultSet, + String columnLabel, + java.sql.Time x) throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateTime(this, resultSet, columnLabel, x); return; @@ -2031,7 +2005,7 @@ public void resultSet_updateTime(ResultSetProxy resultSet, String columnLabel, j @Override public void resultSet_updateTimestamp(ResultSetProxy resultSet, String columnLabel, java.sql.Timestamp x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateTimestamp(this, resultSet, columnLabel, x); return; @@ -2071,7 +2045,7 @@ public void resultSet_updateCharacterStream(ResultSetProxy resultSet, String col @Override public void resultSet_updateObject(ResultSetProxy resultSet, String columnLabel, Object x, int scaleOrLength) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateObject(this, resultSet, columnLabel, x, scaleOrLength); return; @@ -2161,7 +2135,7 @@ public Statement resultSet_getStatement(ResultSetProxy resultSet) throws SQLExce @Override public Object resultSet_getObject(ResultSetProxy resultSet, int columnIndex, java.util.Map> map) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().resultSet_getObject(this, resultSet, columnIndex, map); } @@ -2221,7 +2195,7 @@ public Array resultSet_getArray(ResultSetProxy resultSet, int columnIndex) throw @Override public Object resultSet_getObject(ResultSetProxy resultSet, String columnLabel, java.util.Map> map) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().resultSet_getObject(this, resultSet, columnLabel, map); } @@ -2277,7 +2251,9 @@ public Array resultSet_getArray(ResultSetProxy resultSet, String columnLabel) th } @Override - public java.sql.Date resultSet_getDate(ResultSetProxy resultSet, int columnIndex, Calendar cal) throws SQLException { + public java.sql.Date resultSet_getDate(ResultSetProxy resultSet, + int columnIndex, + Calendar cal) throws SQLException { if (this.pos < filterSize) { return nextFilter().resultSet_getDate(this, resultSet, columnIndex, cal); } @@ -2286,7 +2262,7 @@ public java.sql.Date resultSet_getDate(ResultSetProxy resultSet, int columnIndex @Override public java.sql.Date resultSet_getDate(ResultSetProxy resultSet, String columnLabel, Calendar cal) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().resultSet_getDate(this, resultSet, columnLabel, cal); } @@ -2294,7 +2270,9 @@ public java.sql.Date resultSet_getDate(ResultSetProxy resultSet, String columnLa } @Override - public java.sql.Time resultSet_getTime(ResultSetProxy resultSet, int columnIndex, Calendar cal) throws SQLException { + public java.sql.Time resultSet_getTime(ResultSetProxy resultSet, + int columnIndex, + Calendar cal) throws SQLException { if (this.pos < filterSize) { return nextFilter().resultSet_getTime(this, resultSet, columnIndex, cal); } @@ -2303,7 +2281,7 @@ public java.sql.Time resultSet_getTime(ResultSetProxy resultSet, int columnIndex @Override public java.sql.Time resultSet_getTime(ResultSetProxy resultSet, String columnLabel, Calendar cal) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().resultSet_getTime(this, resultSet, columnLabel, cal); } @@ -2312,7 +2290,7 @@ public java.sql.Time resultSet_getTime(ResultSetProxy resultSet, String columnLa @Override public java.sql.Timestamp resultSet_getTimestamp(ResultSetProxy resultSet, int columnIndex, Calendar cal) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().resultSet_getTimestamp(this, resultSet, columnIndex, cal); } @@ -2321,7 +2299,7 @@ public java.sql.Timestamp resultSet_getTimestamp(ResultSetProxy resultSet, int c @Override public java.sql.Timestamp resultSet_getTimestamp(ResultSetProxy resultSet, String columnLabel, Calendar cal) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().resultSet_getTimestamp(this, resultSet, columnLabel, cal); } @@ -2409,7 +2387,7 @@ public void resultSet_updateArray(ResultSetProxy resultSet, int columnIndex, jav @Override public void resultSet_updateArray(ResultSetProxy resultSet, String columnLabel, java.sql.Array x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateArray(this, resultSet, columnLabel, x); return; @@ -2478,7 +2456,7 @@ public void resultSet_updateNString(ResultSetProxy resultSet, int columnIndex, S @Override public void resultSet_updateNString(ResultSetProxy resultSet, String columnLabel, String nString) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateNString(this, resultSet, columnLabel, nString); return; @@ -2546,7 +2524,9 @@ public SQLXML resultSet_getSQLXML(ResultSetProxy resultSet, String columnLabel) } @Override - public void resultSet_updateSQLXML(ResultSetProxy resultSet, int columnIndex, SQLXML xmlObject) throws SQLException { + public void resultSet_updateSQLXML(ResultSetProxy resultSet, + int columnIndex, + SQLXML xmlObject) throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateSQLXML(this, resultSet, columnIndex, xmlObject); return; @@ -2556,7 +2536,7 @@ public void resultSet_updateSQLXML(ResultSetProxy resultSet, int columnIndex, SQ @Override public void resultSet_updateSQLXML(ResultSetProxy resultSet, String columnLabel, SQLXML xmlObject) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateSQLXML(this, resultSet, columnLabel, xmlObject); return; @@ -2590,7 +2570,7 @@ public java.io.Reader resultSet_getNCharacterStream(ResultSetProxy resultSet, in @Override public java.io.Reader resultSet_getNCharacterStream(ResultSetProxy resultSet, String columnLabel) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().resultSet_getNCharacterStream(this, resultSet, columnLabel); } @@ -2638,8 +2618,11 @@ public void resultSet_updateBinaryStream(ResultSetProxy resultSet, int columnInd } @Override - public void resultSet_updateCharacterStream(ResultSetProxy resultSet, int columnIndex, java.io.Reader x, long length) - throws SQLException { + public void resultSet_updateCharacterStream(ResultSetProxy resultSet, + int columnIndex, + java.io.Reader x, + long length) + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateCharacterStream(this, resultSet, columnIndex, x, length); return; @@ -2679,7 +2662,7 @@ public void resultSet_updateCharacterStream(ResultSetProxy resultSet, String col @Override public void resultSet_updateBlob(ResultSetProxy resultSet, int columnIndex, InputStream inputStream, long length) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateBlob(this, resultSet, columnIndex, inputStream, length); return; @@ -2689,7 +2672,7 @@ public void resultSet_updateBlob(ResultSetProxy resultSet, int columnIndex, Inpu @Override public void resultSet_updateBlob(ResultSetProxy resultSet, String columnLabel, InputStream inputStream, long length) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateBlob(this, resultSet, columnLabel, inputStream, length); return; @@ -2699,7 +2682,7 @@ public void resultSet_updateBlob(ResultSetProxy resultSet, String columnLabel, I @Override public void resultSet_updateClob(ResultSetProxy resultSet, int columnIndex, Reader reader, long length) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateClob(this, resultSet, columnIndex, reader, length); return; @@ -2709,7 +2692,7 @@ public void resultSet_updateClob(ResultSetProxy resultSet, int columnIndex, Read @Override public void resultSet_updateClob(ResultSetProxy resultSet, String columnLabel, Reader reader, long length) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateClob(this, resultSet, columnLabel, reader, length); return; @@ -2719,7 +2702,7 @@ public void resultSet_updateClob(ResultSetProxy resultSet, String columnLabel, R @Override public void resultSet_updateNClob(ResultSetProxy resultSet, int columnIndex, Reader reader, long length) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateNClob(this, resultSet, columnIndex, reader, length); return; @@ -2729,7 +2712,7 @@ public void resultSet_updateNClob(ResultSetProxy resultSet, int columnIndex, Rea @Override public void resultSet_updateNClob(ResultSetProxy resultSet, String columnLabel, Reader reader, long length) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateNClob(this, resultSet, columnLabel, reader, length); return; @@ -2739,7 +2722,7 @@ public void resultSet_updateNClob(ResultSetProxy resultSet, String columnLabel, @Override public void resultSet_updateNCharacterStream(ResultSetProxy resultSet, int columnIndex, java.io.Reader x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateNCharacterStream(this, resultSet, columnIndex, x); return; @@ -2749,7 +2732,7 @@ public void resultSet_updateNCharacterStream(ResultSetProxy resultSet, int colum @Override public void resultSet_updateNCharacterStream(ResultSetProxy resultSet, String columnLabel, java.io.Reader reader) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateNCharacterStream(this, resultSet, columnLabel, reader); return; @@ -2759,7 +2742,7 @@ public void resultSet_updateNCharacterStream(ResultSetProxy resultSet, String co @Override public void resultSet_updateAsciiStream(ResultSetProxy resultSet, int columnIndex, java.io.InputStream x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateAsciiStream(this, resultSet, columnIndex, x); return; @@ -2769,7 +2752,7 @@ public void resultSet_updateAsciiStream(ResultSetProxy resultSet, int columnInde @Override public void resultSet_updateBinaryStream(ResultSetProxy resultSet, int columnIndex, java.io.InputStream x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateBinaryStream(this, resultSet, columnIndex, x); return; @@ -2779,7 +2762,7 @@ public void resultSet_updateBinaryStream(ResultSetProxy resultSet, int columnInd @Override public void resultSet_updateCharacterStream(ResultSetProxy resultSet, int columnIndex, java.io.Reader x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateCharacterStream(this, resultSet, columnIndex, x); return; @@ -2789,7 +2772,7 @@ public void resultSet_updateCharacterStream(ResultSetProxy resultSet, int column @Override public void resultSet_updateAsciiStream(ResultSetProxy resultSet, String columnLabel, java.io.InputStream x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateAsciiStream(this, resultSet, columnLabel, x); return; @@ -2799,7 +2782,7 @@ public void resultSet_updateAsciiStream(ResultSetProxy resultSet, String columnL @Override public void resultSet_updateBinaryStream(ResultSetProxy resultSet, String columnLabel, java.io.InputStream x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateBinaryStream(this, resultSet, columnLabel, x); return; @@ -2809,7 +2792,7 @@ public void resultSet_updateBinaryStream(ResultSetProxy resultSet, String column @Override public void resultSet_updateCharacterStream(ResultSetProxy resultSet, String columnLabel, java.io.Reader reader) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateCharacterStream(this, resultSet, columnLabel, reader); return; @@ -2819,7 +2802,7 @@ public void resultSet_updateCharacterStream(ResultSetProxy resultSet, String col @Override public void resultSet_updateBlob(ResultSetProxy resultSet, int columnIndex, InputStream inputStream) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateBlob(this, resultSet, columnIndex, inputStream); return; @@ -2829,7 +2812,7 @@ public void resultSet_updateBlob(ResultSetProxy resultSet, int columnIndex, Inpu @Override public void resultSet_updateBlob(ResultSetProxy resultSet, String columnLabel, InputStream inputStream) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().resultSet_updateBlob(this, resultSet, columnLabel, inputStream); return; @@ -3149,7 +3132,9 @@ public ResultSetProxy statement_getGeneratedKeys(StatementProxy statement) throw } @Override - public int statement_executeUpdate(StatementProxy statement, String sql, int autoGeneratedKeys) throws SQLException { + public int statement_executeUpdate(StatementProxy statement, + String sql, + int autoGeneratedKeys) throws SQLException { if (this.pos < filterSize) { return nextFilter().statement_executeUpdate(this, statement, sql, autoGeneratedKeys); } @@ -3157,7 +3142,7 @@ public int statement_executeUpdate(StatementProxy statement, String sql, int aut } @Override - public int statement_executeUpdate(StatementProxy statement, String sql, int columnIndexes[]) throws SQLException { + public int statement_executeUpdate(StatementProxy statement, String sql, int[] columnIndexes) throws SQLException { if (this.pos < filterSize) { return nextFilter().statement_executeUpdate(this, statement, sql, columnIndexes); } @@ -3165,7 +3150,7 @@ public int statement_executeUpdate(StatementProxy statement, String sql, int col } @Override - public int statement_executeUpdate(StatementProxy statement, String sql, String columnNames[]) throws SQLException { + public int statement_executeUpdate(StatementProxy statement, String sql, String[] columnNames) throws SQLException { if (this.pos < filterSize) { return nextFilter().statement_executeUpdate(this, statement, sql, columnNames); } @@ -3181,7 +3166,7 @@ public boolean statement_execute(StatementProxy statement, String sql, int autoG } @Override - public boolean statement_execute(StatementProxy statement, String sql, int columnIndexes[]) throws SQLException { + public boolean statement_execute(StatementProxy statement, String sql, int[] columnIndexes) throws SQLException { if (this.pos < filterSize) { return nextFilter().statement_execute(this, statement, sql, columnIndexes); } @@ -3189,7 +3174,7 @@ public boolean statement_execute(StatementProxy statement, String sql, int colum } @Override - public boolean statement_execute(StatementProxy statement, String sql, String columnNames[]) throws SQLException { + public boolean statement_execute(StatementProxy statement, String sql, String[] columnNames) throws SQLException { if (this.pos < filterSize) { return nextFilter().statement_execute(this, statement, sql, columnNames); } @@ -3255,7 +3240,7 @@ public int preparedStatement_executeUpdate(PreparedStatementProxy statement) thr @Override public void preparedStatement_setNull(PreparedStatementProxy statement, int parameterIndex, int sqlType) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setNull(this, statement, parameterIndex, sqlType); return; @@ -3265,7 +3250,7 @@ public void preparedStatement_setNull(PreparedStatementProxy statement, int para @Override public void preparedStatement_setBoolean(PreparedStatementProxy statement, int parameterIndex, boolean x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setBoolean(this, statement, parameterIndex, x); return; @@ -3275,7 +3260,7 @@ public void preparedStatement_setBoolean(PreparedStatementProxy statement, int p @Override public void preparedStatement_setByte(PreparedStatementProxy statement, int parameterIndex, byte x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setByte(this, statement, parameterIndex, x); return; @@ -3285,7 +3270,7 @@ public void preparedStatement_setByte(PreparedStatementProxy statement, int para @Override public void preparedStatement_setShort(PreparedStatementProxy statement, int parameterIndex, short x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setShort(this, statement, parameterIndex, x); return; @@ -3295,7 +3280,7 @@ public void preparedStatement_setShort(PreparedStatementProxy statement, int par @Override public void preparedStatement_setInt(PreparedStatementProxy statement, int parameterIndex, int x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setInt(this, statement, parameterIndex, x); return; @@ -3305,7 +3290,7 @@ public void preparedStatement_setInt(PreparedStatementProxy statement, int param @Override public void preparedStatement_setLong(PreparedStatementProxy statement, int parameterIndex, long x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setLong(this, statement, parameterIndex, x); return; @@ -3315,7 +3300,7 @@ public void preparedStatement_setLong(PreparedStatementProxy statement, int para @Override public void preparedStatement_setFloat(PreparedStatementProxy statement, int parameterIndex, float x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setFloat(this, statement, parameterIndex, x); return; @@ -3325,7 +3310,7 @@ public void preparedStatement_setFloat(PreparedStatementProxy statement, int par @Override public void preparedStatement_setDouble(PreparedStatementProxy statement, int parameterIndex, double x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setDouble(this, statement, parameterIndex, x); return; @@ -3335,7 +3320,7 @@ public void preparedStatement_setDouble(PreparedStatementProxy statement, int pa @Override public void preparedStatement_setBigDecimal(PreparedStatementProxy statement, int parameterIndex, BigDecimal x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setBigDecimal(this, statement, parameterIndex, x); return; @@ -3345,7 +3330,7 @@ public void preparedStatement_setBigDecimal(PreparedStatementProxy statement, in @Override public void preparedStatement_setString(PreparedStatementProxy statement, int parameterIndex, String x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setString(this, statement, parameterIndex, x); return; @@ -3354,8 +3339,8 @@ public void preparedStatement_setString(PreparedStatementProxy statement, int pa } @Override - public void preparedStatement_setBytes(PreparedStatementProxy statement, int parameterIndex, byte x[]) - throws SQLException { + public void preparedStatement_setBytes(PreparedStatementProxy statement, int parameterIndex, byte[] x) + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setBytes(this, statement, parameterIndex, x); return; @@ -3365,7 +3350,7 @@ public void preparedStatement_setBytes(PreparedStatementProxy statement, int par @Override public void preparedStatement_setDate(PreparedStatementProxy statement, int parameterIndex, java.sql.Date x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setDate(this, statement, parameterIndex, x); return; @@ -3375,7 +3360,7 @@ public void preparedStatement_setDate(PreparedStatementProxy statement, int para @Override public void preparedStatement_setTime(PreparedStatementProxy statement, int parameterIndex, java.sql.Time x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setTime(this, statement, parameterIndex, x); return; @@ -3445,7 +3430,7 @@ public void preparedStatement_setObject(PreparedStatementProxy statement, int pa @Override public void preparedStatement_setObject(PreparedStatementProxy statement, int parameterIndex, Object x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setObject(this, statement, parameterIndex, x); return; @@ -3482,7 +3467,7 @@ public void preparedStatement_setCharacterStream(PreparedStatementProxy statemen @Override public void preparedStatement_setRef(PreparedStatementProxy statement, int parameterIndex, Ref x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setRef(this, statement, parameterIndex, x); return; @@ -3492,7 +3477,7 @@ public void preparedStatement_setRef(PreparedStatementProxy statement, int param @Override public void preparedStatement_setBlob(PreparedStatementProxy statement, int parameterIndex, Blob x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setBlob(this, statement, parameterIndex, x); return; @@ -3504,7 +3489,7 @@ public void preparedStatement_setBlob(PreparedStatementProxy statement, int para @Override public void preparedStatement_setClob(PreparedStatementProxy statement, int parameterIndex, Clob x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setClob(this, statement, parameterIndex, x); return; @@ -3520,7 +3505,7 @@ public void preparedStatement_setClob(PreparedStatementProxy statement, int para @Override public void preparedStatement_setArray(PreparedStatementProxy statement, int parameterIndex, Array x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setArray(this, statement, parameterIndex, x); return; @@ -3578,7 +3563,7 @@ public void preparedStatement_setNull(PreparedStatementProxy statement, int para @Override public void preparedStatement_setURL(PreparedStatementProxy statement, int parameterIndex, java.net.URL x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setURL(this, statement, parameterIndex, x); return; @@ -3588,7 +3573,7 @@ public void preparedStatement_setURL(PreparedStatementProxy statement, int param @Override public ParameterMetaData preparedStatement_getParameterMetaData(PreparedStatementProxy statement) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().preparedStatement_getParameterMetaData(this, statement); } @@ -3597,7 +3582,7 @@ public ParameterMetaData preparedStatement_getParameterMetaData(PreparedStatemen @Override public void preparedStatement_setRowId(PreparedStatementProxy statement, int parameterIndex, RowId x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setRowId(this, statement, parameterIndex, x); return; @@ -3607,7 +3592,7 @@ public void preparedStatement_setRowId(PreparedStatementProxy statement, int par @Override public void preparedStatement_setNString(PreparedStatementProxy statement, int parameterIndex, String value) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setNString(this, statement, parameterIndex, value); return; @@ -3627,7 +3612,7 @@ public void preparedStatement_setNCharacterStream(PreparedStatementProxy stateme @Override public void preparedStatement_setNClob(PreparedStatementProxy statement, int parameterIndex, NClob x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setNClob(this, statement, parameterIndex, x); return; @@ -3673,7 +3658,7 @@ public void preparedStatement_setNClob(PreparedStatementProxy statement, int par @Override public void preparedStatement_setSQLXML(PreparedStatementProxy statement, int parameterIndex, SQLXML xmlObject) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setSQLXML(this, statement, parameterIndex, xmlObject); return; @@ -3752,8 +3737,10 @@ public void preparedStatement_setCharacterStream(PreparedStatementProxy statemen } @Override - public void preparedStatement_setNCharacterStream(PreparedStatementProxy statement, int parameterIndex, Reader value) - throws SQLException { + public void preparedStatement_setNCharacterStream(PreparedStatementProxy statement, + int parameterIndex, + Reader value) + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setNCharacterStream(this, statement, parameterIndex, value); return; @@ -3763,7 +3750,7 @@ public void preparedStatement_setNCharacterStream(PreparedStatementProxy stateme @Override public void preparedStatement_setClob(PreparedStatementProxy statement, int parameterIndex, Reader reader) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setClob(this, statement, parameterIndex, reader); return; @@ -3773,7 +3760,7 @@ public void preparedStatement_setClob(PreparedStatementProxy statement, int para @Override public void preparedStatement_setBlob(PreparedStatementProxy statement, int parameterIndex, InputStream inputStream) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setBlob(this, statement, parameterIndex, inputStream); return; @@ -3783,7 +3770,7 @@ public void preparedStatement_setBlob(PreparedStatementProxy statement, int para @Override public void preparedStatement_setNClob(PreparedStatementProxy statement, int parameterIndex, Reader reader) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().preparedStatement_setNClob(this, statement, parameterIndex, reader); return; @@ -3794,8 +3781,10 @@ public void preparedStatement_setNClob(PreparedStatementProxy statement, int par // ///////////////////////////////////// @Override - public void callableStatement_registerOutParameter(CallableStatementProxy statement, int parameterIndex, int sqlType) - throws SQLException { + public void callableStatement_registerOutParameter(CallableStatementProxy statement, + int parameterIndex, + int sqlType) + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_registerOutParameter(this, statement, parameterIndex, sqlType); return; @@ -3822,7 +3811,8 @@ public boolean callableStatement_wasNull(CallableStatementProxy statement) throw } @Override - public String callableStatement_getString(CallableStatementProxy statement, int parameterIndex) throws SQLException { + public String callableStatement_getString(CallableStatementProxy statement, + int parameterIndex) throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getString(this, statement, parameterIndex); } @@ -3831,7 +3821,7 @@ public String callableStatement_getString(CallableStatementProxy statement, int @Override public boolean callableStatement_getBoolean(CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getBoolean(this, statement, parameterIndex); } @@ -3879,7 +3869,8 @@ public float callableStatement_getFloat(CallableStatementProxy statement, int pa } @Override - public double callableStatement_getDouble(CallableStatementProxy statement, int parameterIndex) throws SQLException { + public double callableStatement_getDouble(CallableStatementProxy statement, + int parameterIndex) throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getDouble(this, statement, parameterIndex); } @@ -3889,7 +3880,7 @@ public double callableStatement_getDouble(CallableStatementProxy statement, int @SuppressWarnings("deprecation") @Override public BigDecimal callableStatement_getBigDecimal(CallableStatementProxy statement, int parameterIndex, int scale) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getBigDecimal(this, statement, parameterIndex, scale); } @@ -3906,7 +3897,7 @@ public byte[] callableStatement_getBytes(CallableStatementProxy statement, int p @Override public java.sql.Date callableStatement_getDate(CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getDate(this, statement, parameterIndex); } @@ -3915,7 +3906,7 @@ public java.sql.Date callableStatement_getDate(CallableStatementProxy statement, @Override public java.sql.Time callableStatement_getTime(CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getTime(this, statement, parameterIndex); } @@ -3924,7 +3915,7 @@ public java.sql.Time callableStatement_getTime(CallableStatementProxy statement, @Override public java.sql.Timestamp callableStatement_getTimestamp(CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getTimestamp(this, statement, parameterIndex); } @@ -3932,7 +3923,8 @@ public java.sql.Timestamp callableStatement_getTimestamp(CallableStatementProxy } @Override - public Object callableStatement_getObject(CallableStatementProxy statement, int parameterIndex) throws SQLException { + public Object callableStatement_getObject(CallableStatementProxy statement, + int parameterIndex) throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getObject(this, statement, parameterIndex); } @@ -3974,7 +3966,7 @@ public Object callableStatement_getObject(CallableStatementProxy statement, int @Override public Object callableStatement_getObject(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getObject(this, statement, parameterName); } @@ -4016,7 +4008,7 @@ public Object callableStatement_getObject(CallableStatementProxy statement, Stri @Override public BigDecimal callableStatement_getBigDecimal(CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getBigDecimal(this, statement, parameterIndex); } @@ -4061,7 +4053,7 @@ public Array callableStatement_getArray(CallableStatementProxy statement, int pa @Override public java.sql.Date callableStatement_getDate(CallableStatementProxy statement, int parameterIndex, Calendar cal) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getDate(this, statement, parameterIndex, cal); } @@ -4070,7 +4062,7 @@ public java.sql.Date callableStatement_getDate(CallableStatementProxy statement, @Override public java.sql.Time callableStatement_getTime(CallableStatementProxy statement, int parameterIndex, Calendar cal) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getTime(this, statement, parameterIndex, cal); } @@ -4128,7 +4120,7 @@ public void callableStatement_registerOutParameter(CallableStatementProxy statem @Override public java.net.URL callableStatement_getURL(CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getURL(this, statement, parameterIndex); } @@ -4137,7 +4129,7 @@ public java.net.URL callableStatement_getURL(CallableStatementProxy statement, i @Override public void callableStatement_setURL(CallableStatementProxy statement, String parameterName, java.net.URL val) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setURL(this, statement, parameterName, val); return; @@ -4147,7 +4139,7 @@ public void callableStatement_setURL(CallableStatementProxy statement, String pa @Override public void callableStatement_setNull(CallableStatementProxy statement, String parameterName, int sqlType) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setNull(this, statement, parameterName, sqlType); return; @@ -4157,7 +4149,7 @@ public void callableStatement_setNull(CallableStatementProxy statement, String p @Override public void callableStatement_setBoolean(CallableStatementProxy statement, String parameterName, boolean x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setBoolean(this, statement, parameterName, x); return; @@ -4167,7 +4159,7 @@ public void callableStatement_setBoolean(CallableStatementProxy statement, Strin @Override public void callableStatement_setByte(CallableStatementProxy statement, String parameterName, byte x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setByte(this, statement, parameterName, x); } @@ -4176,7 +4168,7 @@ public void callableStatement_setByte(CallableStatementProxy statement, String p @Override public void callableStatement_setShort(CallableStatementProxy statement, String parameterName, short x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setShort(this, statement, parameterName, x); return; @@ -4186,7 +4178,7 @@ public void callableStatement_setShort(CallableStatementProxy statement, String @Override public void callableStatement_setInt(CallableStatementProxy statement, String parameterName, int x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setInt(this, statement, parameterName, x); return; @@ -4196,7 +4188,7 @@ public void callableStatement_setInt(CallableStatementProxy statement, String pa @Override public void callableStatement_setLong(CallableStatementProxy statement, String parameterName, long x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setLong(this, statement, parameterName, x); return; @@ -4206,7 +4198,7 @@ public void callableStatement_setLong(CallableStatementProxy statement, String p @Override public void callableStatement_setFloat(CallableStatementProxy statement, String parameterName, float x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setFloat(this, statement, parameterName, x); return; @@ -4216,7 +4208,7 @@ public void callableStatement_setFloat(CallableStatementProxy statement, String @Override public void callableStatement_setDouble(CallableStatementProxy statement, String parameterName, double x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setDouble(this, statement, parameterName, x); return; @@ -4226,7 +4218,7 @@ public void callableStatement_setDouble(CallableStatementProxy statement, String @Override public void callableStatement_setBigDecimal(CallableStatementProxy statement, String parameterName, BigDecimal x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setBigDecimal(this, statement, parameterName, x); return; @@ -4236,7 +4228,7 @@ public void callableStatement_setBigDecimal(CallableStatementProxy statement, St @Override public void callableStatement_setString(CallableStatementProxy statement, String parameterName, String x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setString(this, statement, parameterName, x); return; @@ -4245,8 +4237,8 @@ public void callableStatement_setString(CallableStatementProxy statement, String } @Override - public void callableStatement_setBytes(CallableStatementProxy statement, String parameterName, byte x[]) - throws SQLException { + public void callableStatement_setBytes(CallableStatementProxy statement, String parameterName, byte[] x) + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setBytes(this, statement, parameterName, x); return; @@ -4256,7 +4248,7 @@ public void callableStatement_setBytes(CallableStatementProxy statement, String @Override public void callableStatement_setDate(CallableStatementProxy statement, String parameterName, java.sql.Date x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setDate(this, statement, parameterName, x); return; @@ -4266,7 +4258,7 @@ public void callableStatement_setDate(CallableStatementProxy statement, String p @Override public void callableStatement_setTime(CallableStatementProxy statement, String parameterName, java.sql.Time x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setTime(this, statement, parameterName, x); return; @@ -4326,7 +4318,7 @@ public void callableStatement_setObject(CallableStatementProxy statement, String @Override public void callableStatement_setObject(CallableStatementProxy statement, String parameterName, Object x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setObject(this, statement, parameterName, x); return; @@ -4386,7 +4378,7 @@ public void callableStatement_setNull(CallableStatementProxy statement, String p @Override public String callableStatement_getString(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getString(this, statement, parameterName); } @@ -4395,7 +4387,7 @@ public String callableStatement_getString(CallableStatementProxy statement, Stri @Override public boolean callableStatement_getBoolean(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getBoolean(this, statement, parameterName); } @@ -4411,7 +4403,8 @@ public byte callableStatement_getByte(CallableStatementProxy statement, String p } @Override - public short callableStatement_getShort(CallableStatementProxy statement, String parameterName) throws SQLException { + public short callableStatement_getShort(CallableStatementProxy statement, + String parameterName) throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getShort(this, statement, parameterName); } @@ -4435,7 +4428,8 @@ public long callableStatement_getLong(CallableStatementProxy statement, String p } @Override - public float callableStatement_getFloat(CallableStatementProxy statement, String parameterName) throws SQLException { + public float callableStatement_getFloat(CallableStatementProxy statement, + String parameterName) throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getFloat(this, statement, parameterName); } @@ -4444,7 +4438,7 @@ public float callableStatement_getFloat(CallableStatementProxy statement, String @Override public double callableStatement_getDouble(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getDouble(this, statement, parameterName); } @@ -4453,7 +4447,7 @@ public double callableStatement_getDouble(CallableStatementProxy statement, Stri @Override public byte[] callableStatement_getBytes(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getBytes(this, statement, parameterName); } @@ -4462,7 +4456,7 @@ public byte[] callableStatement_getBytes(CallableStatementProxy statement, Strin @Override public java.sql.Date callableStatement_getDate(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getDate(this, statement, parameterName); } @@ -4471,7 +4465,7 @@ public java.sql.Date callableStatement_getDate(CallableStatementProxy statement, @Override public java.sql.Time callableStatement_getTime(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getTime(this, statement, parameterName); } @@ -4480,7 +4474,7 @@ public java.sql.Time callableStatement_getTime(CallableStatementProxy statement, @Override public java.sql.Timestamp callableStatement_getTimestamp(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getTimestamp(this, statement, parameterName); } @@ -4489,7 +4483,7 @@ public java.sql.Timestamp callableStatement_getTimestamp(CallableStatementProxy @Override public BigDecimal callableStatement_getBigDecimal(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getBigDecimal(this, statement, parameterName); } @@ -4525,7 +4519,8 @@ public Clob callableStatement_getClob(CallableStatementProxy statement, String p } @Override - public Array callableStatement_getArray(CallableStatementProxy statement, String parameterName) throws SQLException { + public Array callableStatement_getArray(CallableStatementProxy statement, + String parameterName) throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getArray(this, statement, parameterName); } @@ -4534,7 +4529,7 @@ public Array callableStatement_getArray(CallableStatementProxy statement, String @Override public java.sql.Date callableStatement_getDate(CallableStatementProxy statement, String parameterName, Calendar cal) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getDate(this, statement, parameterName, cal); } @@ -4543,7 +4538,7 @@ public java.sql.Date callableStatement_getDate(CallableStatementProxy statement, @Override public java.sql.Time callableStatement_getTime(CallableStatementProxy statement, String parameterName, Calendar cal) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getTime(this, statement, parameterName, cal); } @@ -4561,7 +4556,7 @@ public java.sql.Timestamp callableStatement_getTimestamp(CallableStatementProxy @Override public java.net.URL callableStatement_getURL(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getURL(this, statement, parameterName); } @@ -4577,7 +4572,8 @@ public RowId callableStatement_getRowId(CallableStatementProxy statement, int pa } @Override - public RowId callableStatement_getRowId(CallableStatementProxy statement, String parameterName) throws SQLException { + public RowId callableStatement_getRowId(CallableStatementProxy statement, + String parameterName) throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getRowId(this, statement, parameterName); } @@ -4586,7 +4582,7 @@ public RowId callableStatement_getRowId(CallableStatementProxy statement, String @Override public void callableStatement_setRowId(CallableStatementProxy statement, String parameterName, RowId x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setRowId(this, statement, parameterName, x); return; @@ -4596,7 +4592,7 @@ public void callableStatement_setRowId(CallableStatementProxy statement, String @Override public void callableStatement_setNString(CallableStatementProxy statement, String parameterName, String value) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setNString(this, statement, parameterName, value); return; @@ -4616,7 +4612,7 @@ public void callableStatement_setNCharacterStream(CallableStatementProxy stateme @Override public void callableStatement_setNClob(CallableStatementProxy statement, String parameterName, NClob x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setNClob(this, statement, parameterName, x); return; @@ -4673,7 +4669,8 @@ public NClob callableStatement_getNClob(CallableStatementProxy statement, int pa } @Override - public NClob callableStatement_getNClob(CallableStatementProxy statement, String parameterName) throws SQLException { + public NClob callableStatement_getNClob(CallableStatementProxy statement, + String parameterName) throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getNClob(this, statement, parameterName); } @@ -4686,7 +4683,7 @@ public NClob callableStatement_getNClob(CallableStatementProxy statement, String @Override public void callableStatement_setSQLXML(CallableStatementProxy statement, String parameterName, SQLXML xmlObject) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setSQLXML(this, statement, parameterName, xmlObject); return; @@ -4695,7 +4692,8 @@ public void callableStatement_setSQLXML(CallableStatementProxy statement, String } @Override - public SQLXML callableStatement_getSQLXML(CallableStatementProxy statement, int parameterIndex) throws SQLException { + public SQLXML callableStatement_getSQLXML(CallableStatementProxy statement, + int parameterIndex) throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getSQLXML(this, statement, parameterIndex); } @@ -4704,7 +4702,7 @@ public SQLXML callableStatement_getSQLXML(CallableStatementProxy statement, int @Override public SQLXML callableStatement_getSQLXML(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getSQLXML(this, statement, parameterName); } @@ -4713,7 +4711,7 @@ public SQLXML callableStatement_getSQLXML(CallableStatementProxy statement, Stri @Override public String callableStatement_getNString(CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getNString(this, statement, parameterIndex); } @@ -4722,7 +4720,7 @@ public String callableStatement_getNString(CallableStatementProxy statement, int @Override public String callableStatement_getNString(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getNString(this, statement, parameterName); } @@ -4731,7 +4729,7 @@ public String callableStatement_getNString(CallableStatementProxy statement, Str @Override public java.io.Reader callableStatement_getNCharacterStream(CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getNCharacterStream(this, statement, parameterIndex); } @@ -4740,7 +4738,7 @@ public java.io.Reader callableStatement_getNCharacterStream(CallableStatementPro @Override public java.io.Reader callableStatement_getNCharacterStream(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getNCharacterStream(this, statement, parameterName); } @@ -4749,7 +4747,7 @@ public java.io.Reader callableStatement_getNCharacterStream(CallableStatementPro @Override public java.io.Reader callableStatement_getCharacterStream(CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getCharacterStream(this, statement, parameterIndex); } @@ -4758,7 +4756,7 @@ public java.io.Reader callableStatement_getCharacterStream(CallableStatementProx @Override public java.io.Reader callableStatement_getCharacterStream(CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter().callableStatement_getCharacterStream(this, statement, parameterName); } @@ -4767,7 +4765,7 @@ public java.io.Reader callableStatement_getCharacterStream(CallableStatementProx @Override public void callableStatement_setBlob(CallableStatementProxy statement, String parameterName, Blob x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setBlob(this, statement, parameterName, x); return; @@ -4777,7 +4775,7 @@ public void callableStatement_setBlob(CallableStatementProxy statement, String p @Override public void callableStatement_setClob(CallableStatementProxy statement, String parameterName, Clob x) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setClob(this, statement, parameterName, x); return; @@ -4863,7 +4861,7 @@ public void callableStatement_setNCharacterStream(CallableStatementProxy stateme @Override public void callableStatement_setClob(CallableStatementProxy statement, String parameterName, Reader reader) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setClob(this, statement, parameterName, reader); return; @@ -4883,7 +4881,7 @@ public void callableStatement_setBlob(CallableStatementProxy statement, String p @Override public void callableStatement_setNClob(CallableStatementProxy statement, String parameterName, Reader reader) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { nextFilter().callableStatement_setNClob(this, statement, parameterName, reader); return; @@ -5050,7 +5048,8 @@ public void dataSource_recycle(DruidPooledConnection connection) throws SQLExcep } @Override - public DruidPooledConnection dataSource_connect(DruidDataSource dataSource, long maxWaitMillis) throws SQLException { + public DruidPooledConnection dataSource_connect(DruidDataSource dataSource, + long maxWaitMillis) throws SQLException { if (this.pos < filterSize) { DruidPooledConnection conn = nextFilter().dataSource_getConnection(this, dataSource, maxWaitMillis); return conn; @@ -5247,7 +5246,7 @@ public boolean resultSetMetaData_isWritable(ResultSetMetaDataProxy metaData, int @Override public boolean resultSetMetaData_isDefinitelyWritable(ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { if (this.pos < filterSize) { return nextFilter() .resultSetMetaData_isDefinitelyWritable(this, metaData, column); @@ -5258,7 +5257,8 @@ public boolean resultSetMetaData_isDefinitelyWritable(ResultSetMetaDataProxy met } @Override - public String resultSetMetaData_getColumnClassName(ResultSetMetaDataProxy metaData, int column) throws SQLException { + public String resultSetMetaData_getColumnClassName(ResultSetMetaDataProxy metaData, + int column) throws SQLException { if (this.pos < filterSize) { return nextFilter() .resultSetMetaData_getColumnClassName(this, metaData, column); diff --git a/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java b/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java index 9557d8267c..120df2acd5 100644 --- a/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java +++ b/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java @@ -15,21 +15,16 @@ */ package com.alibaba.druid.filter; +import com.alibaba.druid.proxy.jdbc.*; + import java.sql.SQLException; import java.util.Properties; -import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; -import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetProxy; -import com.alibaba.druid.proxy.jdbc.StatementProxy; - /** * @author wenshao [szujobs@hotmail.com] */ public abstract class FilterEventAdapter extends FilterAdapter { - - public FilterEventAdapter(){ + public FilterEventAdapter() { } public ConnectionProxy connection_connect(FilterChain chain, Properties info) throws SQLException { @@ -43,15 +38,14 @@ public ConnectionProxy connection_connect(FilterChain chain, Properties info) th } public void connection_connectBefore(FilterChain chain, Properties info) { - } public void connection_connectAfter(ConnectionProxy connection) { - } @Override - public StatementProxy connection_createStatement(FilterChain chain, ConnectionProxy connection) throws SQLException { + public StatementProxy connection_createStatement(FilterChain chain, + ConnectionProxy connection) throws SQLException { StatementProxy statement = super.connection_createStatement(chain, connection); statementCreateAfter(statement); @@ -63,7 +57,7 @@ public StatementProxy connection_createStatement(FilterChain chain, ConnectionPr public StatementProxy connection_createStatement(FilterChain chain, ConnectionProxy connection, int resultSetType, int resultSetConcurrency) throws SQLException { StatementProxy statement = super.connection_createStatement(chain, connection, resultSetType, - resultSetConcurrency); + resultSetConcurrency); statementCreateAfter(statement); @@ -73,9 +67,9 @@ public StatementProxy connection_createStatement(FilterChain chain, ConnectionPr @Override public StatementProxy connection_createStatement(FilterChain chain, ConnectionProxy connection, int resultSetType, int resultSetConcurrency, int resultSetHoldability) - throws SQLException { + throws SQLException { StatementProxy statement = super.connection_createStatement(chain, connection, resultSetType, - resultSetConcurrency, resultSetHoldability); + resultSetConcurrency, resultSetHoldability); statementCreateAfter(statement); @@ -84,7 +78,7 @@ public StatementProxy connection_createStatement(FilterChain chain, ConnectionPr @Override public CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy connection, String sql) - throws SQLException { + throws SQLException { CallableStatementProxy statement = super.connection_prepareCall(chain, connection, sql); statementPrepareCallAfter(statement); @@ -95,9 +89,9 @@ public CallableStatementProxy connection_prepareCall(FilterChain chain, Connecti @Override public CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { CallableStatementProxy statement = super.connection_prepareCall(chain, connection, sql, resultSetType, - resultSetConcurrency); + resultSetConcurrency); statementPrepareCallAfter(statement); @@ -109,7 +103,7 @@ public CallableStatementProxy connection_prepareCall(FilterChain chain, Connecti int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { CallableStatementProxy statement = super.connection_prepareCall(chain, connection, sql, resultSetType, - resultSetConcurrency, resultSetHoldability); + resultSetConcurrency, resultSetHoldability); statementPrepareCallAfter(statement); @@ -118,7 +112,7 @@ public CallableStatementProxy connection_prepareCall(FilterChain chain, Connecti @Override public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql) - throws SQLException { + throws SQLException { PreparedStatementProxy statement = super.connection_prepareStatement(chain, connection, sql); statementPrepareAfter(statement); @@ -139,9 +133,9 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con @Override public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { PreparedStatementProxy statement = super.connection_prepareStatement(chain, connection, sql, resultSetType, - resultSetConcurrency); + resultSetConcurrency); statementPrepareAfter(statement); @@ -153,7 +147,7 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { PreparedStatementProxy statement = super.connection_prepareStatement(chain, connection, sql, resultSetType, - resultSetConcurrency, resultSetHoldability); + resultSetConcurrency, resultSetHoldability); statementPrepareAfter(statement); @@ -204,7 +198,7 @@ public boolean statement_execute(FilterChain chain, StatementProxy statement, St @Override public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { statementExecuteBefore(statement, sql); try { @@ -226,8 +220,8 @@ public boolean statement_execute(FilterChain chain, StatementProxy statement, St } @Override - public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { statementExecuteBefore(statement, sql); try { @@ -249,8 +243,8 @@ public boolean statement_execute(FilterChain chain, StatementProxy statement, St } @Override - public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, String[] columnNames) + throws SQLException { statementExecuteBefore(statement, sql); try { @@ -295,7 +289,7 @@ public int[] statement_executeBatch(FilterChain chain, StatementProxy statement) @Override public ResultSetProxy statement_executeQuery(FilterChain chain, StatementProxy statement, String sql) - throws SQLException { + throws SQLException { statementExecuteQueryBefore(statement, sql); try { @@ -343,7 +337,7 @@ public int statement_executeUpdate(FilterChain chain, StatementProxy statement, @Override public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { statementExecuteUpdateBefore(statement, sql); try { @@ -365,8 +359,8 @@ public int statement_executeUpdate(FilterChain chain, StatementProxy statement, } @Override - public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { statementExecuteUpdateBefore(statement, sql); try { @@ -388,8 +382,8 @@ public int statement_executeUpdate(FilterChain chain, StatementProxy statement, } @Override - public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, String[] columnNames) + throws SQLException { statementExecuteUpdateBefore(statement, sql); try { @@ -458,7 +452,7 @@ public boolean preparedStatement_execute(FilterChain chain, PreparedStatementPro @Override public ResultSetProxy preparedStatement_executeQuery(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { + throws SQLException { try { statementExecuteQueryBefore(statement, statement.getSql()); @@ -484,7 +478,8 @@ public ResultSetProxy preparedStatement_executeQuery(FilterChain chain, Prepared } @Override - public int preparedStatement_executeUpdate(FilterChain chain, PreparedStatementProxy statement) throws SQLException { + public int preparedStatement_executeUpdate(FilterChain chain, + PreparedStatementProxy statement) throws SQLException { try { statementExecuteUpdateBefore(statement, statement.getSql()); @@ -506,54 +501,41 @@ public int preparedStatement_executeUpdate(FilterChain chain, PreparedStatementP } protected void statementCreateAfter(StatementProxy statement) { - } protected void statementPrepareAfter(PreparedStatementProxy statement) { - } protected void statementPrepareCallAfter(CallableStatementProxy statement) { - } protected void resultSetOpenAfter(ResultSetProxy resultSet) { - } protected void statementExecuteUpdateBefore(StatementProxy statement, String sql) { - } protected void statementExecuteUpdateAfter(StatementProxy statement, String sql, int updateCount) { - } protected void statementExecuteQueryBefore(StatementProxy statement, String sql) { - } protected void statementExecuteQueryAfter(StatementProxy statement, String sql, ResultSetProxy resultSet) { - } protected void statementExecuteBefore(StatementProxy statement, String sql) { - } protected void statementExecuteAfter(StatementProxy statement, String sql, boolean result) { - } protected void statementExecuteBatchBefore(StatementProxy statement) { - } protected void statementExecuteBatchAfter(StatementProxy statement, int[] result) { - } protected void statement_executeErrorAfter(StatementProxy statement, String sql, Throwable error) { - } } diff --git a/src/main/java/com/alibaba/druid/filter/FilterManager.java b/src/main/java/com/alibaba/druid/filter/FilterManager.java index e1d543429d..99c33264d9 100644 --- a/src/main/java/com/alibaba/druid/filter/FilterManager.java +++ b/src/main/java/com/alibaba/druid/filter/FilterManager.java @@ -15,6 +15,11 @@ */ package com.alibaba.druid.filter; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.Utils; + import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -25,14 +30,8 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.util.Utils; - public class FilterManager { - - private final static Log LOG = LogFactory.getLog(FilterManager.class); + private static final Log LOG = LogFactory.getLog(FilterManager.class); private static final ConcurrentHashMap aliasMap = new ConcurrentHashMap(16, 0.75f, 1); @@ -79,8 +78,8 @@ private static void loadFilterConfig(Properties filterProperties, ClassLoader cl if (classLoader == null) { return; } - - for (Enumeration e = classLoader.getResources("META-INF/druid-filter.properties"); e.hasMoreElements();) { + + for (Enumeration e = classLoader.getResources("META-INF/druid-filter.properties"); e.hasMoreElements(); ) { URL url = e.nextElement(); Properties property = new Properties(); diff --git a/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java b/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java index fbd6280f95..bd5d991fb2 100644 --- a/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java +++ b/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java @@ -15,15 +15,6 @@ */ package com.alibaba.druid.filter.config; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.InputStream; -import java.net.URL; -import java.security.PublicKey; -import java.sql.SQLException; -import java.util.Properties; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceFactory; @@ -33,11 +24,20 @@ import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.StringUtils; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.net.URL; +import java.security.PublicKey; +import java.sql.SQLException; +import java.util.Properties; + /** * 
  * 这个类主要是负责两个事情, 解密, 和下载远程的配置文件
  * [解密]
- * 
+ *
  * DruidDataSource dataSource = new DruidDataSource();
  * //dataSource.setXXX 其他设置
  * //下面两步很重要
@@ -46,7 +46,7 @@
  * //使用RSA解密(使用默认密钥）
  * dataSource.setConnectionPropertise("config.decrypt=true");
  * dataSource.setPassword("加密的密文");
- * 
+ *
  * [远程配置文件]
  * DruidDataSource dataSource = new DruidDataSource();
  * //下面两步很重要
@@ -54,55 +54,54 @@
  * dataSource.setFilters("config");
  * //使用RSA解密(使用默认密钥）
  * dataSource.setConnectionPropertise("config.file=http://localhost:8080/remote.propreties;");
- * 
+ *
  * [Spring的配置解密]
- * 
+ *
  * <bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
  *     <property name="password" value="加密的密文" />
  *     <!-- 其他的属性设置 -->
  *     <property name="filters" value="config" />
  *     <property name="connectionProperties" value="config.decrypt=true" />
  * </bean>
- * 
+ *
  * [Spring的配置远程配置文件]
- * 
+ *
  * <bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
  *     <property name="filters" value="config" />
  *     <property name="connectionProperties" value="config.file=http://localhost:8080/remote.propreties; />
  * </bean>
- * 
+ *
  * [使用系统属性配置远程文件]
  * java -Ddruid.config.file=file:///home/test/my.properties ...
- * 
+ *
  * 远程配置文件格式:
  * 1. 其他的属性KEY请查看 @see com.alibaba.druid.pool.DruidDataSourceFactory
  * 2. config filter 相关设置:
  * #远程文件路径
  * config.file=http://xxxxx(http://开头或者file:开头)
- * 
+ *
  * #RSA解密, Key不指定, 使用默认的
  * config.decrypt=true
  * config.decrypt.key=密钥字符串
  * config.decrypt.keyFile=密钥文件路径
  * config.decrypt.x509File=证书路径
- * 
+ *
  *
- * + * * @author Jonas Yang */ public class ConfigFilter extends FilterAdapter { + private static Log LOG = LogFactory.getLog(ConfigFilter.class); - private static Log LOG = LogFactory.getLog(ConfigFilter.class); - - public static final String CONFIG_FILE = "config.file"; - public static final String CONFIG_DECRYPT = "config.decrypt"; - public static final String CONFIG_KEY = "config.decrypt.key"; + public static final String CONFIG_FILE = "config.file"; + public static final String CONFIG_DECRYPT = "config.decrypt"; + public static final String CONFIG_KEY = "config.decrypt.key"; - public static final String SYS_PROP_CONFIG_FILE = "druid.config.file"; + public static final String SYS_PROP_CONFIG_FILE = "druid.config.file"; public static final String SYS_PROP_CONFIG_DECRYPT = "druid.config.decrypt"; - public static final String SYS_PROP_CONFIG_KEY = "druid.config.decrypt.key"; + public static final String SYS_PROP_CONFIG_KEY = "druid.config.decrypt.key"; - public ConfigFilter(){ + public ConfigFilter() { } public void init(DataSourceProxy dataSourceProxy) { @@ -167,7 +166,7 @@ Properties loadPropertyFromConfigFile(Properties connectionProperties) { if (info == null) { throw new IllegalArgumentException("Cannot load remote config file from the [config.file=" + configFile - + "]."); + + "]."); } return info; @@ -177,7 +176,6 @@ Properties loadPropertyFromConfigFile(Properties connectionProperties) { } public void decrypt(DruidDataSource dataSource, Properties info) { - try { String encryptedPassword = null; if (info != null) { diff --git a/src/main/java/com/alibaba/druid/filter/config/ConfigTools.java b/src/main/java/com/alibaba/druid/filter/config/ConfigTools.java index 6487120b83..6912f1c167 100644 --- a/src/main/java/com/alibaba/druid/filter/config/ConfigTools.java +++ b/src/main/java/com/alibaba/druid/filter/config/ConfigTools.java @@ -15,18 +15,14 @@ */ package com.alibaba.druid.filter.config; +import com.alibaba.druid.util.Base64; +import com.alibaba.druid.util.JdbcUtils; + +import javax.crypto.Cipher; + import java.io.ByteArrayOutputStream; import java.io.FileInputStream; -import java.security.InvalidKeyException; -import java.security.Key; -import java.security.KeyFactory; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.SecureRandom; +import java.security.*; import java.security.cert.Certificate; import java.security.cert.CertificateFactory; import java.security.interfaces.RSAPrivateKey; @@ -36,104 +32,98 @@ import java.security.spec.RSAPublicKeySpec; import java.security.spec.X509EncodedKeySpec; -import javax.crypto.Cipher; - -import com.alibaba.druid.util.Base64; -import com.alibaba.druid.util.JdbcUtils; - public class ConfigTools { + private static final String DEFAULT_PRIVATE_KEY_STRING = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAocbCrurZGbC5GArEHKlAfDSZi7gFBnd4yxOt0rwTqKBFzGyhtQLu5PRKjEiOXVa95aeIIBJ6OhC2f8FjqFUpawIDAQABAkAPejKaBYHrwUqUEEOe8lpnB6lBAsQIUFnQI/vXU4MV+MhIzW0BLVZCiarIQqUXeOhThVWXKFt8GxCykrrUsQ6BAiEA4vMVxEHBovz1di3aozzFvSMdsjTcYRRo82hS5Ru2/OECIQC2fAPoXixVTVY7bNMeuxCP4954ZkXp7fEPDINCjcQDywIgcc8XLkkPcs3Jxk7uYofaXaPbg39wuJpEmzPIxi3k0OECIGubmdpOnin3HuCP/bbjbJLNNoUdGiEmFL5hDI4UdwAdAiEAtcAwbm08bKN7pwwvyqaCBC//VnEWaq39DCzxr+Z2EIk="; + public static final String DEFAULT_PUBLIC_KEY_STRING = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKHGwq7q2RmwuRgKxBypQHw0mYu4BQZ3eMsTrdK8E6igRcxsobUC7uT0SoxIjl1WveWniCASejoQtn/BY6hVKWsCAwEAAQ=="; - private static final String DEFAULT_PRIVATE_KEY_STRING = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAocbCrurZGbC5GArEHKlAfDSZi7gFBnd4yxOt0rwTqKBFzGyhtQLu5PRKjEiOXVa95aeIIBJ6OhC2f8FjqFUpawIDAQABAkAPejKaBYHrwUqUEEOe8lpnB6lBAsQIUFnQI/vXU4MV+MhIzW0BLVZCiarIQqUXeOhThVWXKFt8GxCykrrUsQ6BAiEA4vMVxEHBovz1di3aozzFvSMdsjTcYRRo82hS5Ru2/OECIQC2fAPoXixVTVY7bNMeuxCP4954ZkXp7fEPDINCjcQDywIgcc8XLkkPcs3Jxk7uYofaXaPbg39wuJpEmzPIxi3k0OECIGubmdpOnin3HuCP/bbjbJLNNoUdGiEmFL5hDI4UdwAdAiEAtcAwbm08bKN7pwwvyqaCBC//VnEWaq39DCzxr+Z2EIk="; - public static final String DEFAULT_PUBLIC_KEY_STRING = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKHGwq7q2RmwuRgKxBypQHw0mYu4BQZ3eMsTrdK8E6igRcxsobUC7uT0SoxIjl1WveWniCASejoQtn/BY6hVKWsCAwEAAQ=="; - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { String password = args[0]; String[] arr = genKeyPair(512); System.out.println("privateKey:" + arr[0]); System.out.println("publicKey:" + arr[1]); System.out.println("password:" + encrypt(arr[0], password)); - } - - public static String decrypt(String cipherText) throws Exception { - return decrypt((String) null, cipherText); - } - - public static String decrypt(String publicKeyText, String cipherText) - throws Exception { - PublicKey publicKey = getPublicKey(publicKeyText); - - return decrypt(publicKey, cipherText); - } - - public static PublicKey getPublicKeyByX509(String x509File) { - if (x509File == null || x509File.length() == 0) { - return ConfigTools.getPublicKey(null); - } - - FileInputStream in = null; - try { - in = new FileInputStream(x509File); - - CertificateFactory factory = CertificateFactory - .getInstance("X.509"); - Certificate cer = factory.generateCertificate(in); - return cer.getPublicKey(); - } catch (Exception e) { - throw new IllegalArgumentException("Failed to get public key", e); - } finally { - JdbcUtils.close(in); - } - } - - public static PublicKey getPublicKey(String publicKeyText) { - if (publicKeyText == null || publicKeyText.length() == 0) { - publicKeyText = ConfigTools.DEFAULT_PUBLIC_KEY_STRING; - } - - try { - byte[] publicKeyBytes = Base64.base64ToByteArray(publicKeyText); - X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec( - publicKeyBytes); - - KeyFactory keyFactory = KeyFactory.getInstance("RSA", "SunRsaSign"); - return keyFactory.generatePublic(x509KeySpec); - } catch (Exception e) { - throw new IllegalArgumentException("Failed to get public key", e); - } - } - - public static PublicKey getPublicKeyByPublicKeyFile(String publicKeyFile) { - if (publicKeyFile == null || publicKeyFile.length() == 0) { - return ConfigTools.getPublicKey(null); - } - - FileInputStream in = null; - try { - in = new FileInputStream(publicKeyFile); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - int len = 0; - byte[] b = new byte[512 / 8]; - while ((len = in.read(b)) != -1) { - out.write(b, 0, len); - } - - byte[] publicKeyBytes = out.toByteArray(); - X509EncodedKeySpec spec = new X509EncodedKeySpec(publicKeyBytes); - KeyFactory factory = KeyFactory.getInstance("RSA", "SunRsaSign"); - return factory.generatePublic(spec); - } catch (Exception e) { - throw new IllegalArgumentException("Failed to get public key", e); - } finally { - JdbcUtils.close(in); - } - } - - public static String decrypt(PublicKey publicKey, String cipherText) - throws Exception { - Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding"); - try { - cipher.init(Cipher.DECRYPT_MODE, publicKey); - } catch (InvalidKeyException e) { + } + + public static String decrypt(String cipherText) throws Exception { + return decrypt((String) null, cipherText); + } + + public static String decrypt(String publicKeyText, String cipherText) + throws Exception { + PublicKey publicKey = getPublicKey(publicKeyText); + + return decrypt(publicKey, cipherText); + } + + public static PublicKey getPublicKeyByX509(String x509File) { + if (x509File == null || x509File.length() == 0) { + return ConfigTools.getPublicKey(null); + } + + FileInputStream in = null; + try { + in = new FileInputStream(x509File); + + CertificateFactory factory = CertificateFactory + .getInstance("X.509"); + Certificate cer = factory.generateCertificate(in); + return cer.getPublicKey(); + } catch (Exception e) { + throw new IllegalArgumentException("Failed to get public key", e); + } finally { + JdbcUtils.close(in); + } + } + + public static PublicKey getPublicKey(String publicKeyText) { + if (publicKeyText == null || publicKeyText.length() == 0) { + publicKeyText = ConfigTools.DEFAULT_PUBLIC_KEY_STRING; + } + + try { + byte[] publicKeyBytes = Base64.base64ToByteArray(publicKeyText); + X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec( + publicKeyBytes); + + KeyFactory keyFactory = KeyFactory.getInstance("RSA", "SunRsaSign"); + return keyFactory.generatePublic(x509KeySpec); + } catch (Exception e) { + throw new IllegalArgumentException("Failed to get public key", e); + } + } + + public static PublicKey getPublicKeyByPublicKeyFile(String publicKeyFile) { + if (publicKeyFile == null || publicKeyFile.length() == 0) { + return ConfigTools.getPublicKey(null); + } + + FileInputStream in = null; + try { + in = new FileInputStream(publicKeyFile); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + int len = 0; + byte[] b = new byte[512 / 8]; + while ((len = in.read(b)) != -1) { + out.write(b, 0, len); + } + + byte[] publicKeyBytes = out.toByteArray(); + X509EncodedKeySpec spec = new X509EncodedKeySpec(publicKeyBytes); + KeyFactory factory = KeyFactory.getInstance("RSA", "SunRsaSign"); + return factory.generatePublic(spec); + } catch (Exception e) { + throw new IllegalArgumentException("Failed to get public key", e); + } finally { + JdbcUtils.close(in); + } + } + + public static String decrypt(PublicKey publicKey, String cipherText) + throws Exception { + Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding"); + try { + cipher.init(Cipher.DECRYPT_MODE, publicKey); + } catch (InvalidKeyException e) { // 因为 IBM JDK 不支持私钥加密, 公钥解密, 所以要反转公私钥 // 也就是说对于解密, 可以通过公钥的参数伪造一个私钥对象欺骗 IBM JDK RSAPublicKey rsaPublicKey = (RSAPublicKey) publicKey; @@ -141,39 +131,39 @@ public static String decrypt(PublicKey publicKey, String cipherText) Key fakePrivateKey = KeyFactory.getInstance("RSA").generatePrivate(spec); cipher = Cipher.getInstance("RSA"); //It is a stateful object. so we need to get new one. cipher.init(Cipher.DECRYPT_MODE, fakePrivateKey); - } - - if (cipherText == null || cipherText.length() == 0) { - return cipherText; - } - - byte[] cipherBytes = Base64.base64ToByteArray(cipherText); - byte[] plainBytes = cipher.doFinal(cipherBytes); - - return new String(plainBytes); - } - - public static String encrypt(String plainText) throws Exception { - return encrypt((String) null, plainText); - } - - public static String encrypt(String key, String plainText) throws Exception { - if (key == null) { - key = DEFAULT_PRIVATE_KEY_STRING; - } - - byte[] keyBytes = Base64.base64ToByteArray(key); - return encrypt(keyBytes, plainText); - } - - public static String encrypt(byte[] keyBytes, String plainText) - throws Exception { - PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes); - KeyFactory factory = KeyFactory.getInstance("RSA", "SunRsaSign"); - PrivateKey privateKey = factory.generatePrivate(spec); - Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding"); + } + + if (cipherText == null || cipherText.length() == 0) { + return cipherText; + } + + byte[] cipherBytes = Base64.base64ToByteArray(cipherText); + byte[] plainBytes = cipher.doFinal(cipherBytes); + + return new String(plainBytes); + } + + public static String encrypt(String plainText) throws Exception { + return encrypt((String) null, plainText); + } + + public static String encrypt(String key, String plainText) throws Exception { + if (key == null) { + key = DEFAULT_PRIVATE_KEY_STRING; + } + + byte[] keyBytes = Base64.base64ToByteArray(key); + return encrypt(keyBytes, plainText); + } + + public static String encrypt(byte[] keyBytes, String plainText) + throws Exception { + PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes); + KeyFactory factory = KeyFactory.getInstance("RSA", "SunRsaSign"); + PrivateKey privateKey = factory.generatePrivate(spec); + Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding"); try { - cipher.init(Cipher.ENCRYPT_MODE, privateKey); + cipher.init(Cipher.ENCRYPT_MODE, privateKey); } catch (InvalidKeyException e) { //For IBM JDK, 原因请看解密方法中的说明 RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) privateKey; @@ -183,35 +173,35 @@ public static String encrypt(byte[] keyBytes, String plainText) cipher.init(Cipher.ENCRYPT_MODE, fakePublicKey); } - byte[] encryptedBytes = cipher.doFinal(plainText.getBytes("UTF-8")); - String encryptedString = Base64.byteArrayToBase64(encryptedBytes); + byte[] encryptedBytes = cipher.doFinal(plainText.getBytes("UTF-8")); + String encryptedString = Base64.byteArrayToBase64(encryptedBytes); - return encryptedString; - } + return encryptedString; + } - public static byte[][] genKeyPairBytes(int keySize) - throws NoSuchAlgorithmException, NoSuchProviderException { - byte[][] keyPairBytes = new byte[2][]; + public static byte[][] genKeyPairBytes(int keySize) + throws NoSuchAlgorithmException, NoSuchProviderException { + byte[][] keyPairBytes = new byte[2][]; - KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA", "SunRsaSign"); - gen.initialize(keySize, new SecureRandom()); - KeyPair pair = gen.generateKeyPair(); + KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA", "SunRsaSign"); + gen.initialize(keySize, new SecureRandom()); + KeyPair pair = gen.generateKeyPair(); - keyPairBytes[0] = pair.getPrivate().getEncoded(); - keyPairBytes[1] = pair.getPublic().getEncoded(); + keyPairBytes[0] = pair.getPrivate().getEncoded(); + keyPairBytes[1] = pair.getPublic().getEncoded(); - return keyPairBytes; - } + return keyPairBytes; + } - public static String[] genKeyPair(int keySize) - throws NoSuchAlgorithmException, NoSuchProviderException { - byte[][] keyPairBytes = genKeyPairBytes(keySize); - String[] keyPairs = new String[2]; + public static String[] genKeyPair(int keySize) + throws NoSuchAlgorithmException, NoSuchProviderException { + byte[][] keyPairBytes = genKeyPairBytes(keySize); + String[] keyPairs = new String[2]; - keyPairs[0] = Base64.byteArrayToBase64(keyPairBytes[0]); - keyPairs[1] = Base64.byteArrayToBase64(keyPairBytes[1]); + keyPairs[0] = Base64.byteArrayToBase64(keyPairBytes[0]); + keyPairs[1] = Base64.byteArrayToBase64(keyPairBytes[1]); - return keyPairs; - } + return keyPairs; + } } diff --git a/src/main/java/com/alibaba/druid/filter/encoding/CharsetConvert.java b/src/main/java/com/alibaba/druid/filter/encoding/CharsetConvert.java index e7aac4d9cc..9bd4f73f7a 100644 --- a/src/main/java/com/alibaba/druid/filter/encoding/CharsetConvert.java +++ b/src/main/java/com/alibaba/druid/filter/encoding/CharsetConvert.java @@ -19,18 +19,17 @@ /** * 字符编码转换器 - * + * * @author xianmao.hexm 2007-3-5 09:51:33 */ public class CharsetConvert { + private String clientEncoding; - private String clientEncoding = null; - - private String serverEncoding = null; + private String serverEncoding; - private boolean enable = false; + private boolean enable; - public CharsetConvert(String clientEncoding, String serverEncoding){ + public CharsetConvert(String clientEncoding, String serverEncoding) { this.clientEncoding = clientEncoding; this.serverEncoding = serverEncoding; if (clientEncoding != null && serverEncoding != null && !clientEncoding.equalsIgnoreCase(serverEncoding)) { @@ -40,7 +39,7 @@ public CharsetConvert(String clientEncoding, String serverEncoding){ /** * 字符串编码 - * + * * @param s String * @return String * @throws UnsupportedEncodingException @@ -54,7 +53,7 @@ public String encode(String s) throws UnsupportedEncodingException { /** * 字符串解码 - * + * * @param s String * @return String * @throws UnsupportedEncodingException @@ -68,7 +67,7 @@ public String decode(String s) throws UnsupportedEncodingException { /** * 判断空字符串 - * + * * @param s String * @return boolean */ diff --git a/src/main/java/com/alibaba/druid/filter/encoding/CharsetParameter.java b/src/main/java/com/alibaba/druid/filter/encoding/CharsetParameter.java index 6e64f9a6ef..cd5d65f869 100644 --- a/src/main/java/com/alibaba/druid/filter/encoding/CharsetParameter.java +++ b/src/main/java/com/alibaba/druid/filter/encoding/CharsetParameter.java @@ -17,20 +17,19 @@ /** * 类URLParameter.java的实现描述：JDBC 参数类 - * + * * @author hexianmao 2007-5-24 上午11:21:59 */ public class CharsetParameter { - public static final String CLIENTENCODINGKEY = "clientEncoding"; public static final String SERVERENCODINGKEY = "serverEncoding"; // 数据库客户端编码 - private String clientEncoding; + private String clientEncoding; // 数据库服务器端编码 - private String serverEncoding; + private String serverEncoding; public String getClientEncoding() { return clientEncoding; diff --git a/src/main/java/com/alibaba/druid/filter/encoding/EncodingConvertFilter.java b/src/main/java/com/alibaba/druid/filter/encoding/EncodingConvertFilter.java index e7eb617086..21d78e552b 100644 --- a/src/main/java/com/alibaba/druid/filter/encoding/EncodingConvertFilter.java +++ b/src/main/java/com/alibaba/druid/filter/encoding/EncodingConvertFilter.java @@ -15,6 +15,11 @@ */ package com.alibaba.druid.filter.encoding; +import com.alibaba.druid.filter.FilterAdapter; +import com.alibaba.druid.filter.FilterChain; +import com.alibaba.druid.proxy.jdbc.*; +import com.alibaba.druid.util.Utils; + import java.io.Reader; import java.io.StringReader; import java.io.UnsupportedEncodingException; @@ -24,25 +29,14 @@ import java.sql.Types; import java.util.Properties; -import com.alibaba.druid.filter.FilterAdapter; -import com.alibaba.druid.filter.FilterChain; -import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; -import com.alibaba.druid.proxy.jdbc.ClobProxy; -import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetProxy; -import com.alibaba.druid.proxy.jdbc.StatementProxy; -import com.alibaba.druid.util.Utils; - /** * @author wenshao [szujobs@hotmail.com] */ public class EncodingConvertFilter extends FilterAdapter { - - public final static String ATTR_CHARSET_PARAMETER = "ali.charset.param"; - public final static String ATTR_CHARSET_CONVERTER = "ali.charset.converter"; - private String clientEncoding; - private String serverEncoding; + public static final String ATTR_CHARSET_PARAMETER = "ali.charset.param"; + public static final String ATTR_CHARSET_CONVERTER = "ali.charset.converter"; + private String clientEncoding; + private String serverEncoding; public ConnectionProxy connection_connect(FilterChain chain, Properties info) throws SQLException { ConnectionProxy conn = chain.connection_connect(info); @@ -59,7 +53,7 @@ public ConnectionProxy connection_connect(FilterChain chain, Properties info) th } conn.putAttribute(ATTR_CHARSET_PARAMETER, param); conn.putAttribute(ATTR_CHARSET_CONVERTER, - new CharsetConvert(param.getClientEncoding(), param.getServerEncoding())); + new CharsetConvert(param.getClientEncoding(), param.getServerEncoding())); return conn; } @@ -71,7 +65,9 @@ public String resultSet_getString(FilterChain chain, ResultSetProxy result, int } @Override - public String resultSet_getString(FilterChain chain, ResultSetProxy result, String columnLabel) throws SQLException { + public String resultSet_getString(FilterChain chain, + ResultSetProxy result, + String columnLabel) throws SQLException { String value = super.resultSet_getString(chain, result, columnLabel); return decode(result.getStatementProxy().getConnectionProxy(), value); } @@ -98,7 +94,10 @@ public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, int } @Override - public T resultSet_getObject(FilterChain chain, ResultSetProxy result, int columnIndex, Class type) throws SQLException { + public T resultSet_getObject(FilterChain chain, + ResultSetProxy result, + int columnIndex, + Class type) throws SQLException { ResultSet rawResultSet = result.getResultSetRaw(); ResultSetMetaData metadata = rawResultSet.getMetaData(); int columnType = metadata.getColumnType(columnIndex); @@ -141,7 +140,9 @@ public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, int } @Override - public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, String columnLabel) throws SQLException { + public Object resultSet_getObject(FilterChain chain, + ResultSetProxy result, + String columnLabel) throws SQLException { ResultSet rawResultSet = result.getResultSetRaw(); ResultSetMetaData metadata = rawResultSet.getMetaData(); int columnIndex = rawResultSet.findColumn(columnLabel); @@ -162,7 +163,10 @@ public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, Stri } @Override - public T resultSet_getObject(FilterChain chain, ResultSetProxy result, String columnLabel, Class type) throws SQLException { + public T resultSet_getObject(FilterChain chain, + ResultSetProxy result, + String columnLabel, + Class type) throws SQLException { ResultSet rawResultSet = result.getResultSetRaw(); ResultSetMetaData metadata = rawResultSet.getMetaData(); int columnIndex = rawResultSet.findColumn(columnLabel); @@ -264,7 +268,7 @@ public String decode(ConnectionProxy connection, String s) throws SQLException { @Override public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql) - throws SQLException { + throws SQLException { return super.connection_prepareStatement(chain, connection, encode(connection, sql)); } @@ -277,9 +281,9 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con @Override public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { return super.connection_prepareStatement(chain, connection, encode(connection, sql), resultSetType, - resultSetConcurrency); + resultSetConcurrency); } @Override @@ -287,7 +291,7 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { return super.connection_prepareStatement(chain, connection, encode(connection, sql), resultSetType, - resultSetConcurrency, resultSetHoldability); + resultSetConcurrency, resultSetHoldability); } @Override @@ -306,16 +310,16 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con @Override public CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy connection, String sql) - throws SQLException { + throws SQLException { return super.connection_prepareCall(chain, connection, encode(connection, sql)); } @Override public CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { return super.connection_prepareCall(chain, connection, encode(connection, sql), resultSetType, - resultSetConcurrency); + resultSetConcurrency); } @Override @@ -323,7 +327,7 @@ public CallableStatementProxy connection_prepareCall(FilterChain chain, Connecti int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { return super.connection_prepareCall(chain, connection, encode(connection, sql), resultSetType, - resultSetConcurrency, resultSetHoldability); + resultSetConcurrency, resultSetHoldability); } // nativeSQL @@ -348,25 +352,25 @@ public boolean statement_execute(FilterChain chain, StatementProxy statement, St @Override public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { return super.statement_execute(chain, statement, encode(statement.getConnectionProxy(), sql), autoGeneratedKeys); } @Override - public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { return super.statement_execute(chain, statement, encode(statement.getConnectionProxy(), sql), columnIndexes); } @Override - public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, String[] columnNames) + throws SQLException { return super.statement_execute(chain, statement, encode(statement.getConnectionProxy(), sql), columnNames); } @Override public ResultSetProxy statement_executeQuery(FilterChain chain, StatementProxy statement, String sql) - throws SQLException { + throws SQLException { return super.statement_executeQuery(chain, statement, encode(statement.getConnectionProxy(), sql)); } @@ -377,21 +381,21 @@ public int statement_executeUpdate(FilterChain chain, StatementProxy statement, @Override public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { return super.statement_executeUpdate(chain, statement, encode(statement.getConnectionProxy(), sql), - autoGeneratedKeys); + autoGeneratedKeys); } @Override - public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { return super.statement_executeUpdate(chain, statement, encode(statement.getConnectionProxy(), sql), - columnIndexes); + columnIndexes); } @Override - public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, String[] columnNames) + throws SQLException { return super.statement_executeUpdate(chain, statement, encode(statement.getConnectionProxy(), sql), columnNames); } @@ -414,21 +418,21 @@ public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStat @Override public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, java.io.Reader reader, int length) - throws SQLException { + throws SQLException { String text = Utils.read(reader, length); String encodedText = encode(statement.getConnectionProxy(), text); super.preparedStatement_setCharacterStream(chain, statement, parameterIndex, new StringReader(encodedText), - encodedText.length()); + encodedText.length()); } @Override public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, java.io.Reader reader, long length) - throws SQLException { + throws SQLException { String text = Utils.read(reader, (int) length); String encodedText = encode(statement.getConnectionProxy(), text); super.preparedStatement_setCharacterStream(chain, statement, parameterIndex, new StringReader(encodedText), - encodedText.length()); + encodedText.length()); } @Override @@ -456,7 +460,7 @@ public void preparedStatement_setObject(FilterChain chain, PreparedStatementProx String text = Utils.read((Reader) x); String encodedText = encode(statement.getConnectionProxy(), text); super.preparedStatement_setObject(chain, statement, parameterIndex, new StringReader(encodedText), - targetSqlType); + targetSqlType); } else { super.preparedStatement_setObject(chain, statement, parameterIndex, x, targetSqlType); } @@ -468,12 +472,12 @@ public void preparedStatement_setObject(FilterChain chain, PreparedStatementProx if (x instanceof String) { String encodedText = encode(statement.getConnectionProxy(), (String) x); super.preparedStatement_setObject(chain, statement, parameterIndex, encodedText, targetSqlType, - scaleOrLength); + scaleOrLength); } else if (x instanceof Reader) { String text = Utils.read((Reader) x); String encodedText = encode(statement.getConnectionProxy(), text); super.preparedStatement_setObject(chain, statement, parameterIndex, new StringReader(encodedText), - targetSqlType, scaleOrLength); + targetSqlType, scaleOrLength); } else { super.preparedStatement_setObject(chain, statement, parameterIndex, x, targetSqlType, scaleOrLength); } @@ -501,7 +505,7 @@ public java.io.Reader clob_getCharacterStream(FilterChain chain, ClobProxy wrapp @Override public Reader clob_getCharacterStream(FilterChain chain, ClobProxy wrapper, long pos, long length) - throws SQLException { + throws SQLException { Reader reader = super.clob_getCharacterStream(chain, wrapper, pos, length); String text = Utils.read(reader); return new StringReader(decode(wrapper.getConnectionWrapper(), text)); @@ -514,7 +518,7 @@ public int clob_setString(FilterChain chain, ClobProxy wrapper, long pos, String @Override public int clob_setString(FilterChain chain, ClobProxy wrapper, long pos, String str, int offset, int len) - throws SQLException { + throws SQLException { return chain.clob_setString(wrapper, pos, encode(wrapper.getConnectionWrapper(), str), offset, len); } @@ -531,7 +535,7 @@ public void callableStatement_setCharacterStream(FilterChain chain, CallableStat @Override public void callableStatement_setCharacterStream(FilterChain chain, CallableStatementProxy statement, String parameterName, java.io.Reader reader, int length) - throws SQLException { + throws SQLException { String text = Utils.read(reader, length); String encodeText = encode(statement.getConnectionProxy(), text); Reader encodeReader = new StringReader(encodeText); @@ -541,12 +545,12 @@ public void callableStatement_setCharacterStream(FilterChain chain, CallableStat @Override public void callableStatement_setCharacterStream(FilterChain chain, CallableStatementProxy statement, String parameterName, java.io.Reader reader, long length) - throws SQLException { + throws SQLException { String text = Utils.read(reader, (int) length); String encodeText = encode(statement.getConnectionProxy(), text); Reader encodeReader = new StringReader(encodeText); super.callableStatement_setCharacterStream(chain, statement, parameterName, encodeReader, - (long) encodeText.length()); + (long) encodeText.length()); } @Override @@ -580,7 +584,7 @@ public void callableStatement_setObject(FilterChain chain, CallableStatementProx String text = Utils.read((Reader) x); String encodedText = encode(statement.getConnectionProxy(), text); super.callableStatement_setObject(chain, statement, parameterName, new StringReader(encodedText), - targetSqlType); + targetSqlType); } else { super.callableStatement_setObject(chain, statement, parameterName, x, targetSqlType); } @@ -596,7 +600,7 @@ public void callableStatement_setObject(FilterChain chain, CallableStatementProx String text = Utils.read((Reader) x); String encodedText = encode(statement.getConnectionProxy(), text); super.callableStatement_setObject(chain, statement, parameterName, new StringReader(encodedText), - targetSqlType, scale); + targetSqlType, scale); } else { super.callableStatement_setObject(chain, statement, parameterName, x, targetSqlType, scale); } @@ -604,21 +608,21 @@ public void callableStatement_setObject(FilterChain chain, CallableStatementProx @Override public String callableStatement_getString(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { String value = super.callableStatement_getString(chain, statement, parameterIndex); return decode(statement.getConnectionProxy(), value); } @Override public String callableStatement_getString(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { String value = super.callableStatement_getString(chain, statement, parameterName); return decode(statement.getConnectionProxy(), value); } @Override public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { Object value = chain.callableStatement_getObject(statement, parameterIndex); return decodeObject(statement, value); } @@ -632,7 +636,7 @@ public Object callableStatement_getObject(FilterChain chain, CallableStatementPr @Override public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { Object value = chain.callableStatement_getObject(statement, parameterName); return decodeObject(statement, value); } @@ -640,7 +644,7 @@ public Object callableStatement_getObject(FilterChain chain, CallableStatementPr @Override public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, String parameterName, java.util.Map> map) - throws SQLException { + throws SQLException { Object value = chain.callableStatement_getObject(statement, parameterName, map); return decodeObject(statement, value); } diff --git a/src/main/java/com/alibaba/druid/filter/logging/CommonsLogFilter.java b/src/main/java/com/alibaba/druid/filter/logging/CommonsLogFilter.java index fc4608b344..59784b3cc3 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/CommonsLogFilter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/CommonsLogFilter.java @@ -23,11 +23,10 @@ * @author wenshao [szujobs@hotmail.com] */ public class CommonsLogFilter extends LogFilter { - - private Log dataSourceLogger = LogFactory.getLog(dataSourceLoggerName); - private Log connectionLogger = LogFactory.getLog(connectionLoggerName); - private Log statementLogger = LogFactory.getLog(statementLoggerName); - private Log resultSetLogger = LogFactory.getLog(resultSetLoggerName); + private Log dataSourceLogger = LogFactory.getLog(dataSourceLoggerName); + private Log connectionLogger = LogFactory.getLog(connectionLoggerName); + private Log statementLogger = LogFactory.getLog(statementLoggerName); + private Log resultSetLogger = LogFactory.getLog(resultSetLoggerName); public void setDataSourceLogger(Log dataSourceLogger) { this.dataSourceLogger = dataSourceLogger; diff --git a/src/main/java/com/alibaba/druid/filter/logging/CommonsLogFilterMBean.java b/src/main/java/com/alibaba/druid/filter/logging/CommonsLogFilterMBean.java index 0339118fe5..3f9804fcba 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/CommonsLogFilterMBean.java +++ b/src/main/java/com/alibaba/druid/filter/logging/CommonsLogFilterMBean.java @@ -19,5 +19,4 @@ * @author wenshao [szujobs@hotmail.com] */ public interface CommonsLogFilterMBean extends LogFilterMBean { - } diff --git a/src/main/java/com/alibaba/druid/filter/logging/Log4j2Filter.java b/src/main/java/com/alibaba/druid/filter/logging/Log4j2Filter.java index 8c6fe72f62..1375769e51 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/Log4j2Filter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/Log4j2Filter.java @@ -22,11 +22,10 @@ * @author wenshao [szujobs@hotmail.com] */ public class Log4j2Filter extends LogFilter implements Log4j2FilterMBean { - private Logger dataSourceLogger = LogManager.getLogger(dataSourceLoggerName); private Logger connectionLogger = LogManager.getLogger(connectionLoggerName); - private Logger statementLogger = LogManager.getLogger(statementLoggerName); - private Logger resultSetLogger = LogManager.getLogger(resultSetLoggerName); + private Logger statementLogger = LogManager.getLogger(statementLoggerName); + private Logger resultSetLogger = LogManager.getLogger(resultSetLoggerName); @Override public String getDataSourceLoggerName() { diff --git a/src/main/java/com/alibaba/druid/filter/logging/Log4j2FilterMBean.java b/src/main/java/com/alibaba/druid/filter/logging/Log4j2FilterMBean.java index f731d7e07f..8cf89a9333 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/Log4j2FilterMBean.java +++ b/src/main/java/com/alibaba/druid/filter/logging/Log4j2FilterMBean.java @@ -16,5 +16,4 @@ package com.alibaba.druid.filter.logging; public interface Log4j2FilterMBean extends LogFilterMBean { - } diff --git a/src/main/java/com/alibaba/druid/filter/logging/Log4jFilter.java b/src/main/java/com/alibaba/druid/filter/logging/Log4jFilter.java index 7a03538640..7fcee3714e 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/Log4jFilter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/Log4jFilter.java @@ -22,11 +22,10 @@ * @author wenshao [szujobs@hotmail.com] */ public class Log4jFilter extends LogFilter implements Log4jFilterMBean { - private Logger dataSourceLogger = Logger.getLogger(dataSourceLoggerName); private Logger connectionLogger = Logger.getLogger(connectionLoggerName); - private Logger statementLogger = Logger.getLogger(statementLoggerName); - private Logger resultSetLogger = Logger.getLogger(resultSetLoggerName); + private Logger statementLogger = Logger.getLogger(statementLoggerName); + private Logger resultSetLogger = Logger.getLogger(resultSetLoggerName); @Override public String getDataSourceLoggerName() { diff --git a/src/main/java/com/alibaba/druid/filter/logging/Log4jFilterMBean.java b/src/main/java/com/alibaba/druid/filter/logging/Log4jFilterMBean.java index 3fe0d91098..696c36adc7 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/Log4jFilterMBean.java +++ b/src/main/java/com/alibaba/druid/filter/logging/Log4jFilterMBean.java @@ -19,5 +19,4 @@ * @author wenshao [szujobs@hotmail.com] */ public interface Log4jFilterMBean extends LogFilterMBean { - } diff --git a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java index 031f3ace0c..8c01816045 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java @@ -15,77 +15,70 @@ */ package com.alibaba.druid.filter.logging; -import java.sql.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - import com.alibaba.druid.DbType; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.filter.FilterEventAdapter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; -import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; -import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.proxy.jdbc.DataSourceProxy; -import com.alibaba.druid.proxy.jdbc.JdbcParameter; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetProxy; -import com.alibaba.druid.proxy.jdbc.StatementProxy; +import com.alibaba.druid.proxy.jdbc.*; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.SQLUtils.FormatOption; -import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.MySqlUtils; +import java.sql.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + /** * @author wenshao [szujobs@hotmail.com] */ public abstract class LogFilter extends FilterEventAdapter implements LogFilterMBean { - protected String dataSourceLoggerName = "druid.sql.DataSource"; - protected String connectionLoggerName = "druid.sql.Connection"; - protected String statementLoggerName = "druid.sql.Statement"; - protected String resultSetLoggerName = "druid.sql.ResultSet"; - - private boolean connectionConnectBeforeLogEnable = true; - private boolean connectionConnectAfterLogEnable = true; - private boolean connectionCommitAfterLogEnable = true; - private boolean connectionRollbackAfterLogEnable = true; - private boolean connectionCloseAfterLogEnable = true; - - private boolean statementCreateAfterLogEnable = true; - private boolean statementPrepareAfterLogEnable = true; - private boolean statementPrepareCallAfterLogEnable = true; - - private boolean statementExecuteAfterLogEnable = true; - private boolean statementExecuteQueryAfterLogEnable = true; - private boolean statementExecuteUpdateAfterLogEnable = true; - private boolean statementExecuteBatchAfterLogEnable = true; - private boolean statementExecutableSqlLogEnable = false; - - private boolean statementCloseAfterLogEnable = true; - - private boolean statementParameterClearLogEnable = true; - private boolean statementParameterSetLogEnable = true; - - private boolean resultSetNextAfterLogEnable = true; - private boolean resultSetOpenAfterLogEnable = true; - private boolean resultSetCloseAfterLogEnable = true; - - private boolean dataSourceLogEnabled = true; - private boolean connectionLogEnabled = true; - private boolean connectionLogErrorEnabled = true; - private boolean statementLogEnabled = true; - private boolean statementLogErrorEnabled = true; - private boolean resultSetLogEnabled = true; - private boolean resultSetLogErrorEnabled = true; - - private FormatOption statementSqlFormatOption = new FormatOption(false, true); - private boolean statementLogSqlPrettyFormat = false; + protected String dataSourceLoggerName = "druid.sql.DataSource"; + protected String connectionLoggerName = "druid.sql.Connection"; + protected String statementLoggerName = "druid.sql.Statement"; + protected String resultSetLoggerName = "druid.sql.ResultSet"; + + private boolean connectionConnectBeforeLogEnable = true; + private boolean connectionConnectAfterLogEnable = true; + private boolean connectionCommitAfterLogEnable = true; + private boolean connectionRollbackAfterLogEnable = true; + private boolean connectionCloseAfterLogEnable = true; + + private boolean statementCreateAfterLogEnable = true; + private boolean statementPrepareAfterLogEnable = true; + private boolean statementPrepareCallAfterLogEnable = true; + + private boolean statementExecuteAfterLogEnable = true; + private boolean statementExecuteQueryAfterLogEnable = true; + private boolean statementExecuteUpdateAfterLogEnable = true; + private boolean statementExecuteBatchAfterLogEnable = true; + private boolean statementExecutableSqlLogEnable; + + private boolean statementCloseAfterLogEnable = true; + + private boolean statementParameterClearLogEnable = true; + private boolean statementParameterSetLogEnable = true; + + private boolean resultSetNextAfterLogEnable = true; + private boolean resultSetOpenAfterLogEnable = true; + private boolean resultSetCloseAfterLogEnable = true; + + private boolean dataSourceLogEnabled = true; + private boolean connectionLogEnabled = true; + private boolean connectionLogErrorEnabled = true; + private boolean statementLogEnabled = true; + private boolean statementLogErrorEnabled = true; + private boolean resultSetLogEnabled = true; + private boolean resultSetLogErrorEnabled = true; + + private FormatOption statementSqlFormatOption = new FormatOption(false, true); + private boolean statementLogSqlPrettyFormat; protected DataSourceProxy dataSource; - public LogFilter(){ + public LogFilter() { configFromProperties(System.getProperties()); } @@ -397,7 +390,7 @@ public void connection_connectAfter(ConnectionProxy connection) { if (connection == null) { return; } - + if (connectionConnectAfterLogEnable && isConnectionLogEnabled()) { StringBuilder msg = new StringBuilder(34) .append("{conn-") @@ -418,7 +411,6 @@ public void connection_connectAfter(ConnectionProxy connection) { @Override public Savepoint connection_setSavepoint(FilterChain chain, ConnectionProxy connection) throws SQLException { - Savepoint savepoint = chain.connection_setSavepoint(connection); if (isConnectionLogEnabled()) { @@ -430,7 +422,7 @@ public Savepoint connection_setSavepoint(FilterChain chain, ConnectionProxy conn @Override public Savepoint connection_setSavepoint(FilterChain chain, ConnectionProxy connection, String name) - throws SQLException { + throws SQLException { Savepoint savepoint = chain.connection_setSavepoint(connection, name); if (isConnectionLogEnabled()) { @@ -451,7 +443,7 @@ public void connection_rollback(FilterChain chain, ConnectionProxy connection) t @Override public void connection_rollback(FilterChain chain, ConnectionProxy connection, Savepoint savePoint) - throws SQLException { + throws SQLException { super.connection_rollback(chain, connection, savePoint); if (connectionRollbackAfterLogEnable && isConnectionLogEnabled()) { @@ -470,8 +462,7 @@ public void connection_commit(FilterChain chain, ConnectionProxy connection) thr @Override public void connection_setAutoCommit(FilterChain chain, ConnectionProxy connection, boolean autoCommit) - throws SQLException { - + throws SQLException { connectionLog("{conn-" + connection.getId() + "} setAutoCommit " + autoCommit); chain.connection_setAutoCommit(connection, autoCommit); } @@ -512,7 +503,7 @@ protected void statementExecuteAfter(StatementProxy statement, String sql, boole double millis = nanos / (1000 * 1000); statementLog("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement) + "} executed. " - + millis + " millis. " + sql); + + millis + " millis. " + sql); } } @@ -538,7 +529,7 @@ protected void statementExecuteBatchAfter(StatementProxy statement, int[] result double millis = nanos / (1000 * 1000); statementLog("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement) - + "} batch executed. " + millis + " millis. " + sql); + + "} batch executed. " + millis + " millis. " + sql); } } @@ -560,7 +551,7 @@ protected void statementExecuteQueryAfter(StatementProxy statement, String sql, double millis = nanos / (1000 * 1000); statementLog("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement) + ", rs-" - + resultSet.getId() + "} query executed. " + millis + " millis. " + sql); + + resultSet.getId() + "} query executed. " + millis + " millis. " + sql); } } @@ -582,7 +573,7 @@ protected void statementExecuteUpdateAfter(StatementProxy statement, String sql, double millis = nanos / (1000 * 1000); statementLog("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement) - + "} update executed. effort " + updateCount + ". " + millis + " millis. " + sql); + + "} update executed. effort " + updateCount + ". " + millis + " millis. " + sql); } } @@ -594,7 +585,7 @@ private void logExecutableSql(StatementProxy statement, String sql) { int parametersSize = statement.getParametersSize(); if (parametersSize == 0) { statementLog("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement) + "} executed. " - + sql); + + sql); return; } @@ -609,7 +600,7 @@ private void logExecutableSql(StatementProxy statement, String sql) { DbType dbType = DbType.of(statement.getConnectionProxy().getDirectDataSource().getDbType()); String formattedSql = SQLUtils.format(sql, dbType, parameters, this.statementSqlFormatOption); statementLog("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement) + "} executed. " - + formattedSql); + + formattedSql); } @Override @@ -686,7 +677,7 @@ public boolean resultSet_next(FilterChain chain, ResultSetProxy resultSet) throw @Override public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { Object obj = chain.callableStatement_getObject(statement, parameterIndex); if (obj instanceof ResultSetProxy) { @@ -710,7 +701,7 @@ public Object callableStatement_getObject(FilterChain chain, CallableStatementPr @Override public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { Object obj = chain.callableStatement_getObject(statement, parameterName); if (obj instanceof ResultSetProxy) { @@ -723,7 +714,7 @@ public Object callableStatement_getObject(FilterChain chain, CallableStatementPr @Override public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, String parameterName, java.util.Map> map) - throws SQLException { + throws SQLException { Object obj = chain.callableStatement_getObject(statement, parameterName, map); if (obj instanceof ResultSetProxy) { @@ -770,50 +761,51 @@ protected void resultSetOpenAfter(ResultSetProxy resultSet) { protected void statementCreateAfter(StatementProxy statement) { if (statementCreateAfterLogEnable && isStatementLogEnabled()) { statementLog("{conn-" + statement.getConnectionProxy().getId() + ", stmt-" + statement.getId() - + "} created"); + + "} created"); } } protected void statementPrepareAfter(PreparedStatementProxy statement) { if (statementPrepareAfterLogEnable && isStatementLogEnabled()) { statementLog("{conn-" + statement.getConnectionProxy().getId() + ", pstmt-" + statement.getId() - + "} created. " + statement.getSql()); + + "} created. " + statement.getSql()); } } protected void statementPrepareCallAfter(CallableStatementProxy statement) { if (statementPrepareCallAfterLogEnable && isStatementLogEnabled()) { statementLog("{conn-" + statement.getConnectionProxy().getId() + ", cstmt-" + statement.getId() - + "} created. " + statement.getSql()); + + "} created. " + statement.getSql()); } } @Override protected void statement_executeErrorAfter(StatementProxy statement, String sql, Throwable error) { if (this.isStatementLogErrorEnabled()) { - if (!isStatementExecutableSqlLogEnable()) { - statementLogError("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement) - + "} execute error. " + sql, error); - }else{ - int parametersSize = statement.getParametersSize(); - if (parametersSize > 0) { - List parameters = new ArrayList(parametersSize); - for (int i = 0; i < parametersSize; ++i) { - JdbcParameter jdbcParam = statement.getParameter(i); - parameters.add(jdbcParam != null - ? jdbcParam.getValue() - : null); - } - DbType dbType = DbType.of(statement.getConnectionProxy().getDirectDataSource().getDbType()); - String formattedSql = SQLUtils.format(sql, dbType, parameters, this.statementSqlFormatOption); - statementLogError("{conn-" + statement.getConnectionProxy().getId() - + ", " + stmtId(statement) - + "} execute error. " + formattedSql - , error); - } else{ - statementLogError("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement) - + "} execute error. " + sql, error); - } + if (!isStatementExecutableSqlLogEnable()) { + statementLogError("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement) + + "} execute error. " + sql, error); + } else { + int parametersSize = statement.getParametersSize(); + if (parametersSize > 0) { + List parameters = new ArrayList(parametersSize); + for (int i = 0; i < parametersSize; ++i) { + JdbcParameter jdbcParam = statement.getParameter(i); + parameters.add(jdbcParam != null + ? jdbcParam.getValue() + : null); + } + DbType dbType = DbType.of(statement.getConnectionProxy().getDirectDataSource().getDbType()); + String formattedSql = SQLUtils.format(sql, dbType, parameters, this.statementSqlFormatOption); + statementLogError("{conn-" + statement.getConnectionProxy().getId() + + ", " + stmtId(statement) + + "} execute error. " + formattedSql, + error + ); + } else { + statementLogError("{conn-" + statement.getConnectionProxy().getId() + ", " + stmtId(statement) + + "} execute error. " + sql, error); + } } } } @@ -927,11 +919,10 @@ public DruidPooledConnection dataSource_getConnection(FilterChain chain, DruidDa @Override public void preparedStatement_clearParameters(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { - + throws SQLException { if (isStatementParameterClearLogEnable()) { statementLog("{conn-" + statement.getConnectionProxy().getId() + ", pstmt-" + statement.getId() - + "} clearParameters. "); + + "} clearParameters. "); } chain.preparedStatement_clearParameters(statement); } @@ -939,7 +930,6 @@ public void preparedStatement_clearParameters(FilterChain chain, PreparedStateme @Override public void statement_clearBatch(FilterChain chain, StatementProxy statement) throws SQLException { - if (isStatementParameterClearLogEnable()) { statementLog("{conn-" + statement.getConnectionProxy().getId() + ", stmt-" + statement.getId() + "} clearBatch. "); @@ -960,18 +950,18 @@ public T unwrap(Class iface) { } return null; } - + protected String savepointToString(Savepoint savePoint) { - String savePointString = null; - try{ - savePointString = savePoint.getSavepointName(); - } catch (SQLException e) { - try { - savePointString = String.valueOf(savePoint.getSavepointId()); - } catch (SQLException e1) { - savePointString = savePoint.toString(); - } - } - return savePointString; + String savePointString = null; + try { + savePointString = savePoint.getSavepointName(); + } catch (SQLException e) { + try { + savePointString = String.valueOf(savePoint.getSavepointId()); + } catch (SQLException e1) { + savePointString = savePoint.toString(); + } + } + return savePointString; } } diff --git a/src/main/java/com/alibaba/druid/filter/logging/LogFilterMBean.java b/src/main/java/com/alibaba/druid/filter/logging/LogFilterMBean.java index 0952e9290f..68e37b3241 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/LogFilterMBean.java +++ b/src/main/java/com/alibaba/druid/filter/logging/LogFilterMBean.java @@ -21,7 +21,6 @@ * @author wenshao [szujobs@hotmail.com] */ public interface LogFilterMBean { - String getDataSourceLoggerName(); void setDataSourceLoggerName(String loggerName); diff --git a/src/main/java/com/alibaba/druid/filter/logging/Slf4jLogFilter.java b/src/main/java/com/alibaba/druid/filter/logging/Slf4jLogFilter.java index e4497b8cfe..cab8d5ee93 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/Slf4jLogFilter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/Slf4jLogFilter.java @@ -19,11 +19,10 @@ import org.slf4j.LoggerFactory; public class Slf4jLogFilter extends LogFilter { - private Logger dataSourceLogger = LoggerFactory.getLogger(dataSourceLoggerName); private Logger connectionLogger = LoggerFactory.getLogger(connectionLoggerName); - private Logger statementLogger = LoggerFactory.getLogger(statementLoggerName); - private Logger resultSetLogger = LoggerFactory.getLogger(resultSetLoggerName); + private Logger statementLogger = LoggerFactory.getLogger(statementLoggerName); + private Logger resultSetLogger = LoggerFactory.getLogger(resultSetLoggerName); @Override public String getDataSourceLoggerName() { diff --git a/src/main/java/com/alibaba/druid/filter/stat/MergeStatFilter.java b/src/main/java/com/alibaba/druid/filter/stat/MergeStatFilter.java index 1e81017d71..1b1dd4051e 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/MergeStatFilter.java +++ b/src/main/java/com/alibaba/druid/filter/stat/MergeStatFilter.java @@ -16,8 +16,7 @@ package com.alibaba.druid.filter.stat; public class MergeStatFilter extends StatFilter { - - public MergeStatFilter(){ + public MergeStatFilter() { super.setMergeSql(true); } diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java index dba7f3a963..94be99acc2 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java @@ -15,18 +15,6 @@ */ package com.alibaba.druid.filter.stat; -import java.io.InputStream; -import java.io.Reader; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.NClob; -import java.sql.SQLException; -import java.sql.Savepoint; -import java.util.Date; -import java.util.Properties; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - import com.alibaba.druid.DbType; import com.alibaba.druid.VERSION; import com.alibaba.druid.filter.Filter; @@ -34,67 +22,60 @@ import com.alibaba.druid.filter.FilterEventAdapter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; -import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; -import com.alibaba.druid.proxy.jdbc.ClobProxy; -import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.proxy.jdbc.DataSourceProxy; -import com.alibaba.druid.proxy.jdbc.JdbcParameter; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetProxy; -import com.alibaba.druid.proxy.jdbc.StatementExecuteType; -import com.alibaba.druid.proxy.jdbc.StatementProxy; +import com.alibaba.druid.proxy.jdbc.*; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; -import com.alibaba.druid.stat.JdbcConnectionStat; -import com.alibaba.druid.stat.JdbcDataSourceStat; -import com.alibaba.druid.stat.JdbcResultSetStat; -import com.alibaba.druid.stat.JdbcSqlStat; -import com.alibaba.druid.stat.JdbcStatContext; -import com.alibaba.druid.stat.JdbcStatManager; -import com.alibaba.druid.stat.JdbcStatementStat; +import com.alibaba.druid.stat.*; import com.alibaba.druid.support.json.JSONWriter; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.support.profile.Profiler; +import java.io.InputStream; +import java.io.Reader; +import java.sql.*; +import java.util.Date; +import java.util.Properties; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + /** * @author wenshao [szujobs@hotmail.com] */ public class StatFilter extends FilterEventAdapter implements StatFilterMBean { + private static final Log LOG = LogFactory.getLog(StatFilter.class); - private final static Log LOG = LogFactory.getLog(StatFilter.class); + private static final String SYS_PROP_LOG_SLOW_SQL = "druid.stat.logSlowSql"; + private static final String SYS_PROP_SLOW_SQL_MILLIS = "druid.stat.slowSqlMillis"; + private static final String SYS_PROP_SLOW_SQL_LOG_LEVEL = "druid.stat.slowSqlLogLevel"; + private static final String SYS_PROP_MERGE_SQL = "druid.stat.mergeSql"; - private static final String SYS_PROP_LOG_SLOW_SQL = "druid.stat.logSlowSql"; - private static final String SYS_PROP_SLOW_SQL_MILLIS = "druid.stat.slowSqlMillis"; - private static final String SYS_PROP_SLOW_SQL_LOG_LEVEL = "druid.stat.slowSqlLogLevel"; - private static final String SYS_PROP_MERGE_SQL = "druid.stat.mergeSql"; + public static final String ATTR_NAME_CONNECTION_STAT = "stat.conn"; + public static final String ATTR_TRANSACTION = "stat.tx"; - public final static String ATTR_NAME_CONNECTION_STAT = "stat.conn"; - public final static String ATTR_TRANSACTION = "stat.tx"; - - private final Lock lock = new ReentrantLock(); + private final Lock lock = new ReentrantLock(); // protected JdbcDataSourceStat dataSourceStat; @Deprecated - protected final JdbcStatementStat statementStat = JdbcStatManager.getInstance().getStatementStat(); + protected final JdbcStatementStat statementStat = JdbcStatManager.getInstance().getStatementStat(); @Deprecated - protected final JdbcResultSetStat resultSetStat = JdbcStatManager.getInstance().getResultSetStat(); + protected final JdbcResultSetStat resultSetStat = JdbcStatManager.getInstance().getResultSetStat(); - private boolean connectionStackTraceEnable = false; + private boolean connectionStackTraceEnable; // 3 seconds is slow sql - protected long slowSqlMillis = 3 * 1000; + protected long slowSqlMillis = 3 * 1000; - protected boolean logSlowSql = false; + protected boolean logSlowSql; - protected String slowSqlLogLevel = "ERROR"; + protected String slowSqlLogLevel = "ERROR"; - private DbType dbType; + private DbType dbType; - private boolean mergeSql = false; + private boolean mergeSql; - public StatFilter(){ + public StatFilter() { } public DbType getDbType() { @@ -313,7 +294,7 @@ public void connection_rollback(FilterChain chain, ConnectionProxy connection) t @Override public void connection_rollback(FilterChain chain, ConnectionProxy connection, Savepoint savepoint) - throws SQLException { + throws SQLException { chain.connection_rollback(connection, savepoint); JdbcDataSourceStat dataSourceStat = connection.getDirectDataSource().getDataSourceStat(); @@ -535,12 +516,10 @@ private final void internalAfterStatementExecute(StatementProxy statement, boole } protected void handleSlowSql(StatementProxy statementProxy) { - } @Override protected void statement_executeErrorAfter(StatementProxy statement, String sql, Throwable error) { - ConnectionProxy connection = statement.getConnectionProxy(); JdbcConnectionStat.Entry connectionCounter = getConnectionInfo(connection); @@ -624,7 +603,6 @@ protected void resultSetOpenAfter(ResultSetProxy resultSet) { @Override public void resultSet_close(FilterChain chain, ResultSetProxy resultSet) throws SQLException { - long nanos = System.nanoTime() - resultSet.getConstructNano(); int fetchRowCount = resultSet.getFetchRowCount(); @@ -669,7 +647,7 @@ public JdbcConnectionStat.Entry getConnectionInfo(ConnectionProxy connection) { if (counter == null) { String dataSourceName = connection.getDirectDataSource().getName(); connection.putAttribute(ATTR_NAME_CONNECTION_STAT, - new JdbcConnectionStat.Entry(dataSourceName, connection.getId())); + new JdbcConnectionStat.Entry(dataSourceName, connection.getId())); counter = (JdbcConnectionStat.Entry) connection.getAttribute(ATTR_NAME_CONNECTION_STAT); } @@ -758,7 +736,7 @@ public Clob resultSet_getClob(FilterChain chain, ResultSetProxy resultSet, Strin @Override public Blob callableStatement_getBlob(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { Blob blob = chain.callableStatement_getBlob(statement, parameterIndex); if (blob != null) { @@ -770,7 +748,7 @@ public Blob callableStatement_getBlob(FilterChain chain, CallableStatementProxy @Override public Blob callableStatement_getBlob(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { Blob blob = chain.callableStatement_getBlob(statement, parameterName); if (blob != null) { @@ -804,7 +782,7 @@ public Blob resultSet_getBlob(FilterChain chain, ResultSetProxy result, String c @Override public Clob callableStatement_getClob(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { Clob clob = chain.callableStatement_getClob(statement, parameterIndex); if (clob != null) { @@ -816,7 +794,7 @@ public Clob callableStatement_getClob(FilterChain chain, CallableStatementProxy @Override public Clob callableStatement_getClob(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { Clob clob = chain.callableStatement_getClob(statement, parameterName); if (clob != null) { @@ -842,7 +820,10 @@ public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, int } @Override - public T resultSet_getObject(FilterChain chain, ResultSetProxy result, int columnIndex, Class type) throws SQLException { + public T resultSet_getObject(FilterChain chain, + ResultSetProxy result, + int columnIndex, + Class type) throws SQLException { T obj = chain.resultSet_getObject(result, columnIndex, type); if (obj instanceof Clob) { @@ -873,7 +854,9 @@ public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, int } @Override - public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, String columnLabel) throws SQLException { + public Object resultSet_getObject(FilterChain chain, + ResultSetProxy result, + String columnLabel) throws SQLException { Object obj = chain.resultSet_getObject(result, columnLabel); if (obj instanceof Clob) { @@ -888,7 +871,10 @@ public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, Stri } @Override - public T resultSet_getObject(FilterChain chain, ResultSetProxy result, String columnLabel, Class type) throws SQLException { + public T resultSet_getObject(FilterChain chain, + ResultSetProxy result, + String columnLabel, + Class type) throws SQLException { T obj = chain.resultSet_getObject(result, columnLabel, type); if (obj instanceof Clob) { @@ -920,7 +906,7 @@ public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, Stri @Override public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, int parameterIndex) - throws SQLException { + throws SQLException { Object obj = chain.callableStatement_getObject(statement, parameterIndex); if (obj instanceof Clob) { @@ -948,7 +934,7 @@ public Object callableStatement_getObject(FilterChain chain, CallableStatementPr @Override public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, String parameterName) - throws SQLException { + throws SQLException { Object obj = chain.callableStatement_getObject(statement, parameterName); if (obj instanceof Clob) { @@ -963,7 +949,7 @@ public Object callableStatement_getObject(FilterChain chain, CallableStatementPr @Override public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, String parameterName, java.util.Map> map) - throws SQLException { + throws SQLException { Object obj = chain.callableStatement_getObject(statement, parameterName, map); if (obj instanceof Clob) { @@ -1021,7 +1007,9 @@ public String resultSet_getString(FilterChain chain, ResultSetProxy result, int } @Override - public String resultSet_getString(FilterChain chain, ResultSetProxy result, String columnLabel) throws SQLException { + public String resultSet_getString(FilterChain chain, + ResultSetProxy result, + String columnLabel) throws SQLException { String value = chain.resultSet_getString(result, columnLabel); if (value != null) { @@ -1055,7 +1043,7 @@ public byte[] resultSet_getBytes(FilterChain chain, ResultSetProxy result, Strin @Override public InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { InputStream input = chain.resultSet_getBinaryStream(result, columnIndex); if (input != null) { @@ -1067,7 +1055,7 @@ public InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy r @Override public InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { InputStream input = chain.resultSet_getBinaryStream(result, columnLabel); if (input != null) { @@ -1079,7 +1067,7 @@ public InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy r @Override public InputStream resultSet_getAsciiStream(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { InputStream input = chain.resultSet_getAsciiStream(result, columnIndex); if (input != null) { @@ -1091,7 +1079,7 @@ public InputStream resultSet_getAsciiStream(FilterChain chain, ResultSetProxy re @Override public InputStream resultSet_getAsciiStream(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { InputStream input = chain.resultSet_getAsciiStream(result, columnLabel); if (input != null) { @@ -1103,7 +1091,7 @@ public InputStream resultSet_getAsciiStream(FilterChain chain, ResultSetProxy re @Override public Reader resultSet_getCharacterStream(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { Reader reader = chain.resultSet_getCharacterStream(result, columnIndex); if (reader != null) { @@ -1115,7 +1103,7 @@ public Reader resultSet_getCharacterStream(FilterChain chain, ResultSetProxy res @Override public Reader resultSet_getCharacterStream(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { Reader reader = chain.resultSet_getCharacterStream(result, columnLabel); if (reader != null) { diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilterContext.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilterContext.java index 6d6f2ba0e5..a1047aa731 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilterContext.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilterContext.java @@ -19,12 +19,11 @@ import java.util.concurrent.CopyOnWriteArrayList; public class StatFilterContext { - private List listeners = new CopyOnWriteArrayList(); - private static final StatFilterContext instance = new StatFilterContext(); + private static final StatFilterContext instance = new StatFilterContext(); - public final static StatFilterContext getInstance() { + public static final StatFilterContext getInstance() { return instance; } @@ -130,7 +129,7 @@ public void clob_open() { listener.clob_open(); } } - + public void blob_open() { for (int i = 0; i < listeners.size(); ++i) { StatFilterContextListener listener = listeners.get(i); diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilterContextListener.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilterContextListener.java index 927ad0e235..c3e91c9093 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilterContextListener.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilterContextListener.java @@ -16,7 +16,6 @@ package com.alibaba.druid.filter.stat; public interface StatFilterContextListener { - void addUpdateCount(int updateCount); void addFetchRowCount(int fetchRowCount); @@ -28,20 +27,20 @@ public interface StatFilterContextListener { void commit(); void rollback(); - + void pool_connect(); - + void pool_close(long nanos); - + void physical_connection_connect(); void physical_connection_close(long nanos); - + void resultSet_open(); - + void resultSet_close(long nanos); - + void clob_open(); - + void blob_open(); } diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilterContextListenerAdapter.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilterContextListenerAdapter.java index 5584d7bddb..b505f87043 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilterContextListenerAdapter.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilterContextListenerAdapter.java @@ -16,77 +16,60 @@ package com.alibaba.druid.filter.stat; public class StatFilterContextListenerAdapter implements StatFilterContextListener { - @Override public void addUpdateCount(int updateCount) { - } @Override public void addFetchRowCount(int fetchRowCount) { - } @Override public void executeBefore(String sql, boolean inTransaction) { - } @Override public void executeAfter(String sql, long nanoSpan, Throwable error) { - } @Override public void commit() { - } @Override public void rollback() { - } @Override public void pool_connect() { - } @Override public void pool_close(long nanos) { - } @Override public void physical_connection_connect() { - } @Override public void physical_connection_close(long nanos) { - } @Override public void resultSet_open() { - } @Override public void resultSet_close(long nanos) { - } @Override public void clob_open() { - } - + @Override public void blob_open() { - } - - } diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilterMBean.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilterMBean.java index 2c69224833..cacf9966bb 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilterMBean.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilterMBean.java @@ -20,16 +20,16 @@ */ public interface StatFilterMBean { boolean isMergeSql(); - + void setMergeSql(boolean mergeSql); - + boolean isLogSlowSql(); - + void setLogSlowSql(boolean logSlowSql); - + String mergeSql(String sql, String dbType); - + long getSlowSqlMillis(); - + void setSlowSqlMillis(long slowSqlMillis); } diff --git a/src/main/java/com/alibaba/druid/mock/MockArray.java b/src/main/java/com/alibaba/druid/mock/MockArray.java index a8857ac9cf..bee72979aa 100644 --- a/src/main/java/com/alibaba/druid/mock/MockArray.java +++ b/src/main/java/com/alibaba/druid/mock/MockArray.java @@ -21,11 +21,9 @@ import java.util.Map; public class MockArray implements Array { - private int baseType; - public MockArray(){ - + public MockArray() { } @Override @@ -80,7 +78,6 @@ public ResultSet getResultSet(long index, int count, Map> map) @Override public void free() throws SQLException { - } } diff --git a/src/main/java/com/alibaba/druid/mock/MockBlob.java b/src/main/java/com/alibaba/druid/mock/MockBlob.java index 987eabcc21..0e1d30f6b8 100644 --- a/src/main/java/com/alibaba/druid/mock/MockBlob.java +++ b/src/main/java/com/alibaba/druid/mock/MockBlob.java @@ -70,12 +70,10 @@ public OutputStream setBinaryStream(long pos) throws SQLException { @Override public void truncate(long len) throws SQLException { - } @Override public void free() throws SQLException { - } @Override diff --git a/src/main/java/com/alibaba/druid/mock/MockCallableStatement.java b/src/main/java/com/alibaba/druid/mock/MockCallableStatement.java index 30c8de9af4..a930328039 100644 --- a/src/main/java/com/alibaba/druid/mock/MockCallableStatement.java +++ b/src/main/java/com/alibaba/druid/mock/MockCallableStatement.java @@ -19,30 +19,17 @@ import java.io.Reader; import java.math.BigDecimal; import java.net.URL; -import java.sql.Array; -import java.sql.Blob; -import java.sql.CallableStatement; -import java.sql.Clob; -import java.sql.Date; -import java.sql.NClob; -import java.sql.Ref; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.SQLXML; -import java.sql.Time; -import java.sql.Timestamp; +import java.sql.*; import java.util.ArrayList; import java.util.Calendar; import java.util.List; import java.util.Map; public class MockCallableStatement extends MockPreparedStatement implements CallableStatement { - private final List outParameters = new ArrayList(); - private boolean wasNull = false; + private boolean wasNull; - public MockCallableStatement(MockConnection conn, String sql){ + public MockCallableStatement(MockConnection conn, String sql) { super(conn, sql); } diff --git a/src/main/java/com/alibaba/druid/mock/MockClob.java b/src/main/java/com/alibaba/druid/mock/MockClob.java index 2720a6373d..11728f2730 100644 --- a/src/main/java/com/alibaba/druid/mock/MockClob.java +++ b/src/main/java/com/alibaba/druid/mock/MockClob.java @@ -15,25 +15,19 @@ */ package com.alibaba.druid.mock; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; -import java.io.Writer; +import java.io.*; import java.sql.Clob; import java.sql.SQLException; public class MockClob implements Clob { - private byte[] bytes; private ByteArrayOutputStream out = new ByteArrayOutputStream(); - public MockClob(){ + public MockClob() { this(new byte[0]); } - public MockClob(byte[] bytes){ + public MockClob(byte[] bytes) { this.bytes = bytes; } @@ -93,12 +87,10 @@ public Writer setCharacterStream(long pos) throws SQLException { @Override public void truncate(long len) throws SQLException { - } @Override public void free() throws SQLException { - } @Override diff --git a/src/main/java/com/alibaba/druid/mock/MockConnection.java b/src/main/java/com/alibaba/druid/mock/MockConnection.java index 49194d87e2..9c8f655a27 100644 --- a/src/main/java/com/alibaba/druid/mock/MockConnection.java +++ b/src/main/java/com/alibaba/druid/mock/MockConnection.java @@ -15,53 +15,38 @@ */ package com.alibaba.druid.mock; -import java.sql.Array; -import java.sql.Blob; -import java.sql.CallableStatement; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.NClob; -import java.sql.PreparedStatement; -import java.sql.SQLClientInfoException; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.SQLXML; -import java.sql.Savepoint; -import java.sql.Statement; -import java.sql.Struct; +import com.alibaba.druid.util.jdbc.ConnectionBase; + +import java.sql.*; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.concurrent.Executor; -import com.alibaba.druid.util.jdbc.ConnectionBase; - public class MockConnection extends ConnectionBase implements Connection { + // private static final Log LOG = LogFactory.getLog(MockConnection.class); - // private final static Log LOG = LogFactory.getLog(MockConnection.class); + private boolean closed; - private boolean closed = false; + private MockDriver driver; + private int savepointIdSeed; + private List savepoints = new ArrayList(); - private MockDriver driver; - private int savepointIdSeed = 0; - private List savepoints = new ArrayList(); + private long id; - private long id; + private final long createdTimeMillis = System.currentTimeMillis(); + private long lastActiveTimeMillis = System.currentTimeMillis(); - private final long createdTimeMillis = System.currentTimeMillis(); - private long lastActiveTimeMillis = System.currentTimeMillis(); + private SQLException error; - private SQLException error; + private String lastSql; - private String lastSql; - - public MockConnection(){ + public MockConnection() { this(null, null, null); } - public MockConnection(MockDriver driver, String url, Properties connectProperties){ + public MockConnection(MockDriver driver, String url, Properties connectProperties) { super(url, connectProperties); this.driver = driver; @@ -218,7 +203,7 @@ public Statement createStatement(int resultSetType, int resultSetConcurrency) th @Override public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { checkState(); MockPreparedStatement stmt = createMockPreparedStatement(sql); @@ -248,7 +233,6 @@ public Map> getTypeMap() throws SQLException { @Override public void setTypeMap(Map> map) throws SQLException { - } @Override @@ -314,7 +298,7 @@ public void releaseSavepoint(Savepoint savepoint) throws SQLException { @Override public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) - throws SQLException { + throws SQLException { checkState(); MockStatement stmt = createMockStatement(); @@ -432,12 +416,10 @@ public boolean isValid(int timeout) throws SQLException { @Override public void setClientInfo(String name, String value) throws SQLClientInfoException { - } @Override public void setClientInfo(Properties properties) throws SQLClientInfoException { - } @Override diff --git a/src/main/java/com/alibaba/druid/mock/MockConnectionClosedException.java b/src/main/java/com/alibaba/druid/mock/MockConnectionClosedException.java index 0e7a265384..1cc66a6ab6 100644 --- a/src/main/java/com/alibaba/druid/mock/MockConnectionClosedException.java +++ b/src/main/java/com/alibaba/druid/mock/MockConnectionClosedException.java @@ -18,10 +18,9 @@ import java.sql.SQLException; public class MockConnectionClosedException extends SQLException { - private static final long serialVersionUID = 1L; - public MockConnectionClosedException(){ + public MockConnectionClosedException() { super(); } } diff --git a/src/main/java/com/alibaba/druid/mock/MockDriver.java b/src/main/java/com/alibaba/druid/mock/MockDriver.java index 89fdc3bb77..f770fc33b5 100644 --- a/src/main/java/com/alibaba/druid/mock/MockDriver.java +++ b/src/main/java/com/alibaba/druid/mock/MockDriver.java @@ -15,57 +15,46 @@ */ package com.alibaba.druid.mock; +import com.alibaba.druid.mock.handler.MockExecuteHandler; +import com.alibaba.druid.mock.handler.MySqlMockExecuteHandlerImpl; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; + +import javax.management.MBeanServer; +import javax.management.ObjectName; + import java.lang.management.ManagementFactory; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.Driver; -import java.sql.DriverManager; -import java.sql.DriverPropertyInfo; -import java.sql.NClob; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.SQLXML; +import java.sql.*; import java.util.List; import java.util.Properties; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Logger; -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import com.alibaba.druid.mock.handler.MockExecuteHandler; -import com.alibaba.druid.mock.handler.MySqlMockExecuteHandlerImpl; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; - public class MockDriver implements Driver, MockDriverMBean { + private static Log LOG; - private static Log LOG; - - public final static MockExecuteHandler DEFAULT_HANDLER = new MySqlMockExecuteHandlerImpl(); + public static final MockExecuteHandler DEFAULT_HANDLER = new MySqlMockExecuteHandlerImpl(); - private String prefix = "jdbc:fake:"; - private String mockPrefix = "jdbc:mock:"; + private String prefix = "jdbc:fake:"; + private String mockPrefix = "jdbc:mock:"; - private MockExecuteHandler executeHandler = DEFAULT_HANDLER; + private MockExecuteHandler executeHandler = DEFAULT_HANDLER; - public final static MockDriver instance = new MockDriver(); + public static final MockDriver instance = new MockDriver(); - private final AtomicLong connectCount = new AtomicLong(); - private final AtomicLong connectionCloseCount = new AtomicLong(); + private final AtomicLong connectCount = new AtomicLong(); + private final AtomicLong connectionCloseCount = new AtomicLong(); - private final AtomicLong connectionIdSeed = new AtomicLong(1000L); + private final AtomicLong connectionIdSeed = new AtomicLong(1000L); - private final List connections = new CopyOnWriteArrayList(); + private final List connections = new CopyOnWriteArrayList(); - private long idleTimeCount = 1000 * 60 * 3; + private long idleTimeCount = 1000 * 60 * 3; - private boolean logExecuteQueryEnable = true; + private boolean logExecuteQueryEnable = true; - private final static String MBEAN_NAME = "com.alibaba.druid:type=MockDriver"; + private static final String MBEAN_NAME = "com.alibaba.druid:type=MockDriver"; static { registerDriver(instance); @@ -267,7 +256,7 @@ public ResultSet executeQuery(MockStatementBase stmt, String sql) throws SQLExce MockResultSet rs = createMockResultSet(stmt); for (int i = 0; i < 1000; ++i) { - rs.getRows().add(new Object[] { i }); + rs.getRows().add(new Object[]{i}); } return rs; @@ -288,11 +277,11 @@ public ResultSet createResultSet(MockPreparedStatement stmt) { String sql = stmt.getSql(); if ("SELECT 1".equalsIgnoreCase(sql)) { - rs.getRows().add(new Object[] { 1 }); + rs.getRows().add(new Object[]{1}); } else if ("SELECT NOW()".equalsIgnoreCase(sql)) { - rs.getRows().add(new Object[] { new java.sql.Timestamp(System.currentTimeMillis()) }); + rs.getRows().add(new Object[]{new java.sql.Timestamp(System.currentTimeMillis())}); } else if ("SELECT ?".equalsIgnoreCase(sql)) { - rs.getRows().add(new Object[] { stmt.getParameters().get(0) }); + rs.getRows().add(new Object[]{stmt.getParameters().get(0)}); } return rs; diff --git a/src/main/java/com/alibaba/druid/mock/MockDriverMBean.java b/src/main/java/com/alibaba/druid/mock/MockDriverMBean.java index d751bb9a21..e695dfa3b5 100644 --- a/src/main/java/com/alibaba/druid/mock/MockDriverMBean.java +++ b/src/main/java/com/alibaba/druid/mock/MockDriverMBean.java @@ -17,27 +17,26 @@ import java.sql.SQLException; - public interface MockDriverMBean { long getConnectionCloseCount(); - + int getMajorVersion(); - + int getMinorVersion(); - + boolean jdbcCompliant(); - + boolean acceptsURL(String url) throws SQLException; - + boolean isLogExecuteQueryEnable(); - + void setLogExecuteQueryEnable(boolean logExecuteQueryEnable); - + long getIdleTimeCount(); - + void setIdleTimeCount(long idleTimeCount); - + void closeAllConnections() throws SQLException; - + int getConnectionsSize(); } diff --git a/src/main/java/com/alibaba/druid/mock/MockNClob.java b/src/main/java/com/alibaba/druid/mock/MockNClob.java index 23250372df..04cbc0fe75 100644 --- a/src/main/java/com/alibaba/druid/mock/MockNClob.java +++ b/src/main/java/com/alibaba/druid/mock/MockNClob.java @@ -18,5 +18,4 @@ import java.sql.NClob; public class MockNClob extends MockClob implements NClob { - } diff --git a/src/main/java/com/alibaba/druid/mock/MockParameterMetaData.java b/src/main/java/com/alibaba/druid/mock/MockParameterMetaData.java index 618e0a3e3b..87606bbfa7 100644 --- a/src/main/java/com/alibaba/druid/mock/MockParameterMetaData.java +++ b/src/main/java/com/alibaba/druid/mock/MockParameterMetaData.java @@ -21,9 +21,7 @@ import java.util.List; public class MockParameterMetaData implements ParameterMetaData { - - public MockParameterMetaData(){ - + public MockParameterMetaData() { } private final List parameters = new ArrayList(); @@ -88,15 +86,14 @@ public int getParameterMode(int param) throws SQLException { } public static class Parameter { - - private int nullable; + private int nullable; private boolean signed; - private int mode; - private String className; - private int type; - private String typeName; - private int scale; - private int precision; + private int mode; + private String className; + private int type; + private String typeName; + private int scale; + private int precision; public int getType() { return type; diff --git a/src/main/java/com/alibaba/druid/mock/MockPreparedStatement.java b/src/main/java/com/alibaba/druid/mock/MockPreparedStatement.java index d4f87e40b6..1acba9cf80 100644 --- a/src/main/java/com/alibaba/druid/mock/MockPreparedStatement.java +++ b/src/main/java/com/alibaba/druid/mock/MockPreparedStatement.java @@ -15,17 +15,16 @@ */ package com.alibaba.druid.mock; +import com.alibaba.druid.util.jdbc.PreparedStatementBase; + import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import com.alibaba.druid.util.jdbc.PreparedStatementBase; - public class MockPreparedStatement extends PreparedStatementBase implements MockStatementBase, PreparedStatement { - private final String sql; - public MockPreparedStatement(MockConnection conn, String sql){ + public MockPreparedStatement(MockConnection conn, String sql) { super(conn); this.sql = sql; } @@ -41,7 +40,7 @@ public MockConnection getConnection() throws SQLException { @Override public ResultSet executeQuery() throws SQLException { checkOpen(); - + MockConnection conn = getConnection(); if (conn != null && conn.getDriver() != null) { @@ -50,10 +49,10 @@ public ResultSet executeQuery() throws SQLException { if (conn != null) { conn.handleSleep(); - + return conn.getDriver().createMockResultSet(this); } - + return new MockResultSet(this); } @@ -75,14 +74,14 @@ public boolean execute() throws SQLException { if (getConnection() != null) { getConnection().handleSleep(); } - + return false; } @Override public ResultSet getResultSet() throws SQLException { checkOpen(); - + if (resultSet == null) { resultSet = this.getConnection().getDriver().createResultSet(this); } diff --git a/src/main/java/com/alibaba/druid/mock/MockRef.java b/src/main/java/com/alibaba/druid/mock/MockRef.java index 582d24f59c..233a65f9a0 100644 --- a/src/main/java/com/alibaba/druid/mock/MockRef.java +++ b/src/main/java/com/alibaba/druid/mock/MockRef.java @@ -20,7 +20,6 @@ import java.util.Map; public class MockRef implements Ref { - private String baseTypeName; private Object object; diff --git a/src/main/java/com/alibaba/druid/mock/MockResultSet.java b/src/main/java/com/alibaba/druid/mock/MockResultSet.java index a7e2f16ee6..339b2d5d09 100644 --- a/src/main/java/com/alibaba/druid/mock/MockResultSet.java +++ b/src/main/java/com/alibaba/druid/mock/MockResultSet.java @@ -15,6 +15,8 @@ */ package com.alibaba.druid.mock; +import com.alibaba.druid.util.jdbc.ResultSetBase; + import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; @@ -22,18 +24,15 @@ import java.util.ArrayList; import java.util.List; -import com.alibaba.druid.util.jdbc.ResultSetBase; - public class MockResultSet extends ResultSetBase implements ResultSet { - - private int rowIndex = -1; + private int rowIndex = -1; private List rows; - public MockResultSet(Statement statement){ + public MockResultSet(Statement statement) { this(statement, new ArrayList()); } - public MockResultSet(Statement statement, List rows){ + public MockResultSet(Statement statement, List rows) { super(statement); this.rows = rows; super.metaData = new MockResultSetMetaData(); diff --git a/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java b/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java index 657e22fc90..e79f7d8760 100644 --- a/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java +++ b/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java @@ -15,14 +15,12 @@ */ package com.alibaba.druid.mock; -import java.sql.ResultSetMetaData; - import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase; -public class MockResultSetMetaData extends ResultSetMetaDataBase implements ResultSetMetaData { - - public MockResultSetMetaData(){ +import java.sql.ResultSetMetaData; +public class MockResultSetMetaData extends ResultSetMetaDataBase implements ResultSetMetaData { + public MockResultSetMetaData() { } } diff --git a/src/main/java/com/alibaba/druid/mock/MockRowId.java b/src/main/java/com/alibaba/druid/mock/MockRowId.java index 1b82640619..c2e7122428 100644 --- a/src/main/java/com/alibaba/druid/mock/MockRowId.java +++ b/src/main/java/com/alibaba/druid/mock/MockRowId.java @@ -18,13 +18,12 @@ import java.sql.RowId; public class MockRowId implements RowId { - private byte[] bytes; - public MockRowId(){ + public MockRowId() { } - public MockRowId(byte[] bytes){ + public MockRowId(byte[] bytes) { this.bytes = bytes; } diff --git a/src/main/java/com/alibaba/druid/mock/MockSQLXML.java b/src/main/java/com/alibaba/druid/mock/MockSQLXML.java index 568a3d559b..927928715b 100644 --- a/src/main/java/com/alibaba/druid/mock/MockSQLXML.java +++ b/src/main/java/com/alibaba/druid/mock/MockSQLXML.java @@ -15,6 +15,9 @@ */ package com.alibaba.druid.mock; +import javax.xml.transform.Result; +import javax.xml.transform.Source; + import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; @@ -22,60 +25,47 @@ import java.sql.SQLException; import java.sql.SQLXML; -import javax.xml.transform.Result; -import javax.xml.transform.Source; - public class MockSQLXML implements SQLXML { - @Override public void free() throws SQLException { - } @Override public InputStream getBinaryStream() throws SQLException { - return null; } @Override public OutputStream setBinaryStream() throws SQLException { - return null; } @Override public Reader getCharacterStream() throws SQLException { - return null; } @Override public Writer setCharacterStream() throws SQLException { - return null; } @Override public String getString() throws SQLException { - return null; } @Override public void setString(String value) throws SQLException { - } @Override public T getSource(Class sourceClass) throws SQLException { - return null; } @Override public T setResult(Class resultClass) throws SQLException { - return null; } diff --git a/src/main/java/com/alibaba/druid/mock/MockSavepoint.java b/src/main/java/com/alibaba/druid/mock/MockSavepoint.java index 9b251a2bf1..9436c276b6 100644 --- a/src/main/java/com/alibaba/druid/mock/MockSavepoint.java +++ b/src/main/java/com/alibaba/druid/mock/MockSavepoint.java @@ -18,8 +18,7 @@ import java.sql.Savepoint; public class MockSavepoint implements Savepoint { - - private int savepointId; + private int savepointId; private String savepointName; public int getSavepointId() { diff --git a/src/main/java/com/alibaba/druid/mock/MockStatement.java b/src/main/java/com/alibaba/druid/mock/MockStatement.java index baa0e4288c..44d1ffecc6 100644 --- a/src/main/java/com/alibaba/druid/mock/MockStatement.java +++ b/src/main/java/com/alibaba/druid/mock/MockStatement.java @@ -15,20 +15,19 @@ */ package com.alibaba.druid.mock; +import com.alibaba.druid.util.jdbc.StatementBase; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import com.alibaba.druid.util.jdbc.StatementBase; - public class MockStatement extends StatementBase implements MockStatementBase, Statement { + public static final String ERROR_SQL = "THROW ERROR"; - public final static String ERROR_SQL = "THROW ERROR"; - - protected MockConnection mockConnection; + protected MockConnection mockConnection; - public MockStatement(Connection connection){ + public MockStatement(Connection connection) { super(connection); if (connection instanceof MockConnection) { diff --git a/src/main/java/com/alibaba/druid/mock/MockStatementBase.java b/src/main/java/com/alibaba/druid/mock/MockStatementBase.java index d08c944cfe..389104296c 100644 --- a/src/main/java/com/alibaba/druid/mock/MockStatementBase.java +++ b/src/main/java/com/alibaba/druid/mock/MockStatementBase.java @@ -18,7 +18,6 @@ import java.sql.SQLException; import java.sql.Statement; - public interface MockStatementBase extends Statement { MockConnection getConnection() throws SQLException; } diff --git a/src/main/java/com/alibaba/druid/mock/MockStruct.java b/src/main/java/com/alibaba/druid/mock/MockStruct.java index 97b94acdc1..56a02ebc5f 100644 --- a/src/main/java/com/alibaba/druid/mock/MockStruct.java +++ b/src/main/java/com/alibaba/druid/mock/MockStruct.java @@ -20,7 +20,6 @@ import java.util.Map; public class MockStruct implements Struct { - @Override public String getSQLTypeName() throws SQLException { return null; diff --git a/src/main/java/com/alibaba/druid/mock/handler/MockExecuteHandler.java b/src/main/java/com/alibaba/druid/mock/handler/MockExecuteHandler.java index 58b74e0670..8e21a98b7f 100644 --- a/src/main/java/com/alibaba/druid/mock/handler/MockExecuteHandler.java +++ b/src/main/java/com/alibaba/druid/mock/handler/MockExecuteHandler.java @@ -15,12 +15,11 @@ */ package com.alibaba.druid.mock.handler; +import com.alibaba.druid.mock.MockStatementBase; + import java.sql.ResultSet; import java.sql.SQLException; -import com.alibaba.druid.mock.MockStatementBase; - public interface MockExecuteHandler { - ResultSet executeQuery(MockStatementBase statement, String sql) throws SQLException; } diff --git a/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java b/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java index f8e0cc0a01..b3e9232e91 100644 --- a/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java +++ b/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java @@ -15,42 +15,26 @@ */ package com.alibaba.druid.mock.handler; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Timestamp; -import java.sql.Types; -import java.util.List; - import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.mock.MockResultSet; import com.alibaba.druid.mock.MockResultSetMetaData; import com.alibaba.druid.mock.MockStatementBase; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLBooleanExpr; -import com.alibaba.druid.sql.ast.expr.SQLCharExpr; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; -import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; -import com.alibaba.druid.sql.ast.expr.SQLNCharExpr; -import com.alibaba.druid.sql.ast.expr.SQLNullExpr; -import com.alibaba.druid.sql.ast.expr.SQLNumberExpr; -import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr; -import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; -import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; -import com.alibaba.druid.sql.ast.statement.SQLSelect; -import com.alibaba.druid.sql.ast.statement.SQLSelectItem; -import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; -import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.ast.statement.SQLTableSource; +import com.alibaba.druid.sql.ast.expr.*; +import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.mysql.ast.statement.CobarShowStatus; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; -public class MySqlMockExecuteHandlerImpl implements MockExecuteHandler { +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.sql.Types; +import java.util.List; +public class MySqlMockExecuteHandlerImpl implements MockExecuteHandler { @Override public ResultSet executeQuery(MockStatementBase statement, String sql) throws SQLException { SQLStatementParser parser = new MySqlStatementParser(sql); @@ -108,7 +92,7 @@ public ResultSet showStatus(MockStatementBase statement) throws SQLException { MockResultSet rs = new MockResultSet(statement); MockResultSetMetaData metaData = rs.getMockMetaData(); - Object[] row = new Object[] { "on" }; + Object[] row = new Object[]{"on"}; ColumnMetaData column = new ColumnMetaData(); column.setColumnType(Types.NVARCHAR); diff --git a/src/main/java/com/alibaba/druid/pool/DataSourceClosedException.java b/src/main/java/com/alibaba/druid/pool/DataSourceClosedException.java index 52d85e887e..4243e86670 100644 --- a/src/main/java/com/alibaba/druid/pool/DataSourceClosedException.java +++ b/src/main/java/com/alibaba/druid/pool/DataSourceClosedException.java @@ -18,10 +18,9 @@ import java.sql.SQLException; public class DataSourceClosedException extends SQLException { - private static final long serialVersionUID = 1L; - public DataSourceClosedException(String reason){ + public DataSourceClosedException(String reason) { super(reason); } diff --git a/src/main/java/com/alibaba/druid/pool/DataSourceDisableException.java b/src/main/java/com/alibaba/druid/pool/DataSourceDisableException.java index 58bb8f2507..63024eefdd 100644 --- a/src/main/java/com/alibaba/druid/pool/DataSourceDisableException.java +++ b/src/main/java/com/alibaba/druid/pool/DataSourceDisableException.java @@ -18,18 +18,17 @@ import java.sql.SQLException; public class DataSourceDisableException extends SQLException { - private static final long serialVersionUID = 1L; - public DataSourceDisableException(){ + public DataSourceDisableException() { super(); } - public DataSourceDisableException(String reason){ + public DataSourceDisableException(String reason) { super(reason); } - public DataSourceDisableException(Throwable cause){ + public DataSourceDisableException(Throwable cause) { super(cause); } diff --git a/src/main/java/com/alibaba/druid/pool/DataSourceNotAvailableException.java b/src/main/java/com/alibaba/druid/pool/DataSourceNotAvailableException.java index fe17e25296..1b1c860164 100644 --- a/src/main/java/com/alibaba/druid/pool/DataSourceNotAvailableException.java +++ b/src/main/java/com/alibaba/druid/pool/DataSourceNotAvailableException.java @@ -18,12 +18,10 @@ import java.sql.SQLException; public class DataSourceNotAvailableException extends SQLException { - private static final long serialVersionUID = 1L; - public DataSourceNotAvailableException(Throwable cause){ + public DataSourceNotAvailableException(Throwable cause) { super(cause); } } - diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 909b1bf4af..6cde51a8bd 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -15,41 +15,6 @@ */ package com.alibaba.druid.pool; -import java.io.PrintWriter; -import java.io.Serializable; -import java.sql.Connection; -import java.sql.Driver; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; -import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.ReentrantLock; -import java.util.logging.Logger; - -import javax.management.JMException; -import javax.management.ObjectName; -import javax.management.openmbean.CompositeDataSupport; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.PasswordCallback; -import javax.sql.DataSource; - import com.alibaba.druid.DbType; import com.alibaba.druid.DruidRuntimeException; import com.alibaba.druid.VERSION; @@ -64,231 +29,243 @@ import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.DruidPasswordCallback; -import com.alibaba.druid.util.Histogram; -import com.alibaba.druid.util.JdbcConstants; -import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.util.MySqlUtils; -import com.alibaba.druid.util.StringUtils; -import com.alibaba.druid.util.Utils; +import com.alibaba.druid.util.*; + +import javax.management.JMException; +import javax.management.ObjectName; +import javax.management.openmbean.CompositeDataSupport; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.sql.DataSource; + +import java.io.PrintWriter; +import java.io.Serializable; +import java.sql.*; +import java.util.*; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; +import java.util.concurrent.atomic.AtomicLongFieldUpdater; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.ReentrantLock; +import java.util.logging.Logger; /** * @author wenshao [szujobs@hotmail.com] * @author ljw [ljw2083@alibaba-inc.com] */ public abstract class DruidAbstractDataSource extends WrapperAdapter implements DruidAbstractDataSourceMBean, DataSource, DataSourceProxy, Serializable { - private static final long serialVersionUID = 1L; - private final static Log LOG = LogFactory.getLog(DruidAbstractDataSource.class); + private static final long serialVersionUID = 1L; + private static final Log LOG = LogFactory.getLog(DruidAbstractDataSource.class); - public final static int DEFAULT_INITIAL_SIZE = 0; - public final static int DEFAULT_MAX_ACTIVE_SIZE = 8; - public final static int DEFAULT_MAX_IDLE = 8; - public final static int DEFAULT_MIN_IDLE = 0; - public final static int DEFAULT_MAX_WAIT = -1; - public final static String DEFAULT_VALIDATION_QUERY = null; // - public final static boolean DEFAULT_TEST_ON_BORROW = false; - public final static boolean DEFAULT_TEST_ON_RETURN = false; - public final static boolean DEFAULT_WHILE_IDLE = true; - public static final long DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS = 60 * 1000L; - public static final long DEFAULT_TIME_BETWEEN_CONNECT_ERROR_MILLIS = 500; - public static final int DEFAULT_NUM_TESTS_PER_EVICTION_RUN = 3; - - public static final long DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS = 1000L * 60L * 30L; - public static final long DEFAULT_MAX_EVICTABLE_IDLE_TIME_MILLIS = 1000L * 60L * 60L * 7; - public static final long DEFAULT_PHY_TIMEOUT_MILLIS = -1; - - protected volatile boolean defaultAutoCommit = true; - protected volatile Boolean defaultReadOnly; - protected volatile Integer defaultTransactionIsolation; - protected volatile String defaultCatalog = null; - - protected String name; - - protected volatile String username; - protected volatile String password; - protected volatile String jdbcUrl; - protected volatile String driverClass; - protected volatile ClassLoader driverClassLoader; - protected volatile Properties connectProperties = new Properties(); - - protected volatile PasswordCallback passwordCallback; - protected volatile NameCallback userCallback; - - protected volatile int initialSize = DEFAULT_INITIAL_SIZE; - protected volatile int maxActive = DEFAULT_MAX_ACTIVE_SIZE; - protected volatile int minIdle = DEFAULT_MIN_IDLE; - protected volatile int maxIdle = DEFAULT_MAX_IDLE; - protected volatile long maxWait = DEFAULT_MAX_WAIT; - protected int notFullTimeoutRetryCount = 0; - - protected volatile String validationQuery = DEFAULT_VALIDATION_QUERY; - protected volatile int validationQueryTimeout = -1; - protected volatile boolean testOnBorrow = DEFAULT_TEST_ON_BORROW; - protected volatile boolean testOnReturn = DEFAULT_TEST_ON_RETURN; - protected volatile boolean testWhileIdle = DEFAULT_WHILE_IDLE; - protected volatile boolean poolPreparedStatements = false; - protected volatile boolean sharePreparedStatements = false; - protected volatile int maxPoolPreparedStatementPerConnectionSize = 10; - - protected volatile boolean inited = false; - protected volatile boolean initExceptionThrow = true; - - protected PrintWriter logWriter = new PrintWriter(System.out); - - protected List filters = new CopyOnWriteArrayList(); - private boolean clearFiltersEnable = true; - protected volatile ExceptionSorter exceptionSorter = null; - - protected Driver driver; - - protected volatile int queryTimeout; - protected volatile int transactionQueryTimeout; - - protected long createTimespan; - - protected volatile int maxWaitThreadCount = -1; - protected volatile boolean accessToUnderlyingConnectionAllowed = true; - - protected volatile long timeBetweenEvictionRunsMillis = DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS; - protected volatile int numTestsPerEvictionRun = DEFAULT_NUM_TESTS_PER_EVICTION_RUN; - protected volatile long minEvictableIdleTimeMillis = DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS; - protected volatile long maxEvictableIdleTimeMillis = DEFAULT_MAX_EVICTABLE_IDLE_TIME_MILLIS; - protected volatile long keepAliveBetweenTimeMillis = DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS * 2; - protected volatile long phyTimeoutMillis = DEFAULT_PHY_TIMEOUT_MILLIS; - protected volatile long phyMaxUseCount = -1; - - protected volatile boolean removeAbandoned; - protected volatile long removeAbandonedTimeoutMillis = 300 * 1000; - protected volatile boolean logAbandoned; - - protected volatile int maxOpenPreparedStatements = -1; - - protected volatile List connectionInitSqls; - - protected volatile String dbTypeName; - - protected volatile long timeBetweenConnectErrorMillis = DEFAULT_TIME_BETWEEN_CONNECT_ERROR_MILLIS; - - protected volatile ValidConnectionChecker validConnectionChecker = null; - - protected volatile boolean usePingMethod = false; - - protected final Map activeConnections = new IdentityHashMap(); - protected final static Object PRESENT = new Object(); - - protected long id; - - protected int connectionErrorRetryAttempts = 1; - protected boolean breakAfterAcquireFailure = false; - protected long transactionThresholdMillis = 0L; - - protected final Date createdTime = new Date(); - protected Date initedTime; - protected volatile long errorCount = 0L; - protected volatile long dupCloseCount = 0L; - protected volatile long startTransactionCount = 0L; - protected volatile long commitCount = 0L; - protected volatile long rollbackCount = 0L; - protected volatile long cachedPreparedStatementHitCount = 0L; - protected volatile long preparedStatementCount = 0L; - protected volatile long closedPreparedStatementCount = 0L; - protected volatile long cachedPreparedStatementCount = 0L; - protected volatile long cachedPreparedStatementDeleteCount = 0L; - protected volatile long cachedPreparedStatementMissCount = 0L; - - final static AtomicLongFieldUpdater errorCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "errorCount"); - final static AtomicLongFieldUpdater dupCloseCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "dupCloseCount"); - final static AtomicLongFieldUpdater startTransactionCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "startTransactionCount"); - final static AtomicLongFieldUpdater commitCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "commitCount"); - final static AtomicLongFieldUpdater rollbackCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "rollbackCount"); - final static AtomicLongFieldUpdater cachedPreparedStatementHitCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "cachedPreparedStatementHitCount"); - final static AtomicLongFieldUpdater preparedStatementCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "preparedStatementCount"); - final static AtomicLongFieldUpdater closedPreparedStatementCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "closedPreparedStatementCount"); - final static AtomicLongFieldUpdater cachedPreparedStatementCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "cachedPreparedStatementCount"); - final static AtomicLongFieldUpdater cachedPreparedStatementDeleteCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "cachedPreparedStatementDeleteCount"); - final static AtomicLongFieldUpdater cachedPreparedStatementMissCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "cachedPreparedStatementMissCount"); - - - protected final Histogram transactionHistogram = new Histogram(1, - 10, - 100, - 1000, - 10 * 1000, - 100 * 1000); - - private boolean dupCloseLogEnable = false; - - private ObjectName objectName; - - protected volatile long executeCount = 0L; - protected volatile long executeQueryCount = 0L; - protected volatile long executeUpdateCount = 0L; - protected volatile long executeBatchCount = 0L; - - final static AtomicLongFieldUpdater executeQueryCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "executeQueryCount"); - final static AtomicLongFieldUpdater executeUpdateCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "executeUpdateCount"); - final static AtomicLongFieldUpdater executeBatchCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "executeBatchCount"); - final static AtomicLongFieldUpdater executeCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "executeCount"); - - protected volatile Throwable createError; - protected volatile Throwable lastError; - protected volatile long lastErrorTimeMillis; - protected volatile Throwable lastCreateError; - protected volatile long lastCreateErrorTimeMillis; - protected volatile long lastCreateStartTimeMillis; - - protected boolean isOracle = false; - protected boolean isMySql = false; - protected boolean useOracleImplicitCache = true; - - protected ReentrantLock lock; - protected Condition notEmpty; - protected Condition empty; - - protected ReentrantLock activeConnectionLock = new ReentrantLock(); - - protected volatile int createErrorCount = 0; - protected volatile int creatingCount = 0; - protected volatile int directCreateCount = 0; - protected volatile long createCount = 0L; - protected volatile long destroyCount = 0L; - protected volatile long createStartNanos = 0L; - - final static AtomicIntegerFieldUpdater createErrorCountUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "createErrorCount"); - final static AtomicIntegerFieldUpdater creatingCountUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "creatingCount"); - final static AtomicIntegerFieldUpdater directCreateCountUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "directCreateCount"); - final static AtomicLongFieldUpdater createCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "createCount"); - final static AtomicLongFieldUpdater destroyCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "destroyCount"); - final static AtomicLongFieldUpdater createStartNanosUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "createStartNanos"); - - private Boolean useUnfairLock = null; - private boolean useLocalSessionState = true; - - protected long timeBetweenLogStatsMillis; - protected DruidDataSourceStatLogger statLogger = new DruidDataSourceStatLoggerImpl(); - - private boolean asyncCloseConnectionEnable = false; - protected int maxCreateTaskCount = 3; - protected boolean failFast = false; - protected volatile int failContinuous = 0; - protected volatile long failContinuousTimeMillis = 0L; - protected ScheduledExecutorService destroyScheduler; - protected ScheduledExecutorService createScheduler; - - final static AtomicLongFieldUpdater failContinuousTimeMillisUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "failContinuousTimeMillis"); - final static AtomicIntegerFieldUpdater failContinuousUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "failContinuous"); - - protected boolean initVariants = false; - protected boolean initGlobalVariants = false; - protected volatile boolean onFatalError = false; - protected volatile int onFatalErrorMaxActive = 0; - protected volatile int fatalErrorCount = 0; - protected volatile int fatalErrorCountLastShrink = 0; - protected volatile long lastFatalErrorTimeMillis = 0; - protected volatile String lastFatalErrorSql = null; - protected volatile Throwable lastFatalError = null; - - public DruidAbstractDataSource(boolean lockFair){ + public static final int DEFAULT_INITIAL_SIZE = 0; + public static final int DEFAULT_MAX_ACTIVE_SIZE = 8; + public static final int DEFAULT_MAX_IDLE = 8; + public static final int DEFAULT_MIN_IDLE = 0; + public static final int DEFAULT_MAX_WAIT = -1; + public static final String DEFAULT_VALIDATION_QUERY = null; // + public static final boolean DEFAULT_TEST_ON_BORROW = false; + public static final boolean DEFAULT_TEST_ON_RETURN = false; + public static final boolean DEFAULT_WHILE_IDLE = true; + public static final long DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS = 60 * 1000L; + public static final long DEFAULT_TIME_BETWEEN_CONNECT_ERROR_MILLIS = 500; + public static final int DEFAULT_NUM_TESTS_PER_EVICTION_RUN = 3; + + public static final long DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS = 1000L * 60L * 30L; + public static final long DEFAULT_MAX_EVICTABLE_IDLE_TIME_MILLIS = 1000L * 60L * 60L * 7; + public static final long DEFAULT_PHY_TIMEOUT_MILLIS = -1; + + protected volatile boolean defaultAutoCommit = true; + protected volatile Boolean defaultReadOnly; + protected volatile Integer defaultTransactionIsolation; + protected volatile String defaultCatalog; + + protected String name; + + protected volatile String username; + protected volatile String password; + protected volatile String jdbcUrl; + protected volatile String driverClass; + protected volatile ClassLoader driverClassLoader; + protected volatile Properties connectProperties = new Properties(); + + protected volatile PasswordCallback passwordCallback; + protected volatile NameCallback userCallback; + + protected volatile int initialSize = DEFAULT_INITIAL_SIZE; + protected volatile int maxActive = DEFAULT_MAX_ACTIVE_SIZE; + protected volatile int minIdle = DEFAULT_MIN_IDLE; + protected volatile int maxIdle = DEFAULT_MAX_IDLE; + protected volatile long maxWait = DEFAULT_MAX_WAIT; + protected int notFullTimeoutRetryCount; + + protected volatile String validationQuery = DEFAULT_VALIDATION_QUERY; + protected volatile int validationQueryTimeout = -1; + protected volatile boolean testOnBorrow = DEFAULT_TEST_ON_BORROW; + protected volatile boolean testOnReturn = DEFAULT_TEST_ON_RETURN; + protected volatile boolean testWhileIdle = DEFAULT_WHILE_IDLE; + protected volatile boolean poolPreparedStatements; + protected volatile boolean sharePreparedStatements; + protected volatile int maxPoolPreparedStatementPerConnectionSize = 10; + + protected volatile boolean inited; + protected volatile boolean initExceptionThrow = true; + + protected PrintWriter logWriter = new PrintWriter(System.out); + + protected List filters = new CopyOnWriteArrayList(); + private boolean clearFiltersEnable = true; + protected volatile ExceptionSorter exceptionSorter; + + protected Driver driver; + + protected volatile int queryTimeout; + protected volatile int transactionQueryTimeout; + + protected long createTimespan; + + protected volatile int maxWaitThreadCount = -1; + protected volatile boolean accessToUnderlyingConnectionAllowed = true; + + protected volatile long timeBetweenEvictionRunsMillis = DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS; + protected volatile int numTestsPerEvictionRun = DEFAULT_NUM_TESTS_PER_EVICTION_RUN; + protected volatile long minEvictableIdleTimeMillis = DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS; + protected volatile long maxEvictableIdleTimeMillis = DEFAULT_MAX_EVICTABLE_IDLE_TIME_MILLIS; + protected volatile long keepAliveBetweenTimeMillis = DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS * 2; + protected volatile long phyTimeoutMillis = DEFAULT_PHY_TIMEOUT_MILLIS; + protected volatile long phyMaxUseCount = -1; + + protected volatile boolean removeAbandoned; + protected volatile long removeAbandonedTimeoutMillis = 300 * 1000; + protected volatile boolean logAbandoned; + + protected volatile int maxOpenPreparedStatements = -1; + + protected volatile List connectionInitSqls; + + protected volatile String dbTypeName; + + protected volatile long timeBetweenConnectErrorMillis = DEFAULT_TIME_BETWEEN_CONNECT_ERROR_MILLIS; + + protected volatile ValidConnectionChecker validConnectionChecker; + + protected volatile boolean usePingMethod; + + protected final Map activeConnections = new IdentityHashMap(); + protected static final Object PRESENT = new Object(); + + protected long id; + + protected int connectionErrorRetryAttempts = 1; + protected boolean breakAfterAcquireFailure; + protected long transactionThresholdMillis; + + protected final java.util.Date createdTime = new java.util.Date(); + protected java.util.Date initedTime; + protected volatile long errorCount; + protected volatile long dupCloseCount; + protected volatile long startTransactionCount; + protected volatile long commitCount; + protected volatile long rollbackCount; + protected volatile long cachedPreparedStatementHitCount; + protected volatile long preparedStatementCount; + protected volatile long closedPreparedStatementCount; + protected volatile long cachedPreparedStatementCount; + protected volatile long cachedPreparedStatementDeleteCount; + protected volatile long cachedPreparedStatementMissCount; + + static final AtomicLongFieldUpdater errorCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "errorCount"); + static final AtomicLongFieldUpdater dupCloseCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "dupCloseCount"); + static final AtomicLongFieldUpdater startTransactionCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "startTransactionCount"); + static final AtomicLongFieldUpdater commitCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "commitCount"); + static final AtomicLongFieldUpdater rollbackCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "rollbackCount"); + static final AtomicLongFieldUpdater cachedPreparedStatementHitCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "cachedPreparedStatementHitCount"); + static final AtomicLongFieldUpdater preparedStatementCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "preparedStatementCount"); + static final AtomicLongFieldUpdater closedPreparedStatementCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "closedPreparedStatementCount"); + static final AtomicLongFieldUpdater cachedPreparedStatementCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "cachedPreparedStatementCount"); + static final AtomicLongFieldUpdater cachedPreparedStatementDeleteCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "cachedPreparedStatementDeleteCount"); + static final AtomicLongFieldUpdater cachedPreparedStatementMissCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "cachedPreparedStatementMissCount"); + + protected final Histogram transactionHistogram = new Histogram(1, + 10, + 100, + 1000, + 10 * 1000, + 100 * 1000); + + private boolean dupCloseLogEnable; + + private ObjectName objectName; + + protected volatile long executeCount; + protected volatile long executeQueryCount; + protected volatile long executeUpdateCount; + protected volatile long executeBatchCount; + + static final AtomicLongFieldUpdater executeQueryCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "executeQueryCount"); + static final AtomicLongFieldUpdater executeUpdateCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "executeUpdateCount"); + static final AtomicLongFieldUpdater executeBatchCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "executeBatchCount"); + static final AtomicLongFieldUpdater executeCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "executeCount"); + + protected volatile Throwable createError; + protected volatile Throwable lastError; + protected volatile long lastErrorTimeMillis; + protected volatile Throwable lastCreateError; + protected volatile long lastCreateErrorTimeMillis; + protected volatile long lastCreateStartTimeMillis; + + protected boolean isOracle; + protected boolean isMySql; + protected boolean useOracleImplicitCache = true; + + protected ReentrantLock lock; + protected Condition notEmpty; + protected Condition empty; + + protected ReentrantLock activeConnectionLock = new ReentrantLock(); + + protected volatile int createErrorCount; + protected volatile int creatingCount; + protected volatile int directCreateCount; + protected volatile long createCount; + protected volatile long destroyCount; + protected volatile long createStartNanos; + + static final AtomicIntegerFieldUpdater createErrorCountUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "createErrorCount"); + static final AtomicIntegerFieldUpdater creatingCountUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "creatingCount"); + static final AtomicIntegerFieldUpdater directCreateCountUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "directCreateCount"); + static final AtomicLongFieldUpdater createCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "createCount"); + static final AtomicLongFieldUpdater destroyCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "destroyCount"); + static final AtomicLongFieldUpdater createStartNanosUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "createStartNanos"); + + private Boolean useUnfairLock; + private boolean useLocalSessionState = true; + + protected long timeBetweenLogStatsMillis; + protected DruidDataSourceStatLogger statLogger = new DruidDataSourceStatLoggerImpl(); + + private boolean asyncCloseConnectionEnable; + protected int maxCreateTaskCount = 3; + protected boolean failFast; + protected volatile int failContinuous; + protected volatile long failContinuousTimeMillis; + protected ScheduledExecutorService destroyScheduler; + protected ScheduledExecutorService createScheduler; + + static final AtomicLongFieldUpdater failContinuousTimeMillisUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "failContinuousTimeMillis"); + static final AtomicIntegerFieldUpdater failContinuousUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "failContinuous"); + + protected boolean initVariants; + protected boolean initGlobalVariants; + protected volatile boolean onFatalError; + protected volatile int onFatalErrorMaxActive; + protected volatile int fatalErrorCount; + protected volatile int fatalErrorCountLastShrink; + protected volatile long lastFatalErrorTimeMillis; + protected volatile String lastFatalErrorSql; + protected volatile Throwable lastFatalError; + + public DruidAbstractDataSource(boolean lockFair) { lock = new ReentrantLock(lockFair); notEmpty = lock.newCondition(); @@ -396,24 +373,24 @@ public long getLastErrorTimeMillis() { return lastErrorTimeMillis; } - public Date getLastErrorTime() { + public java.util.Date getLastErrorTime() { if (lastErrorTimeMillis <= 0) { return null; } - return new Date(lastErrorTimeMillis); + return new java.util.Date(lastErrorTimeMillis); } public long getLastCreateErrorTimeMillis() { return lastCreateErrorTimeMillis; } - public Date getLastCreateErrorTime() { + public java.util.Date getLastCreateErrorTime() { if (lastCreateErrorTimeMillis <= 0) { return null; } - return new Date(lastCreateErrorTimeMillis); + return new java.util.Date(lastCreateErrorTimeMillis); } public int getTransactionQueryTimeout() { @@ -661,7 +638,7 @@ public String getValidConnectionCheckerClassName() { public void setValidConnectionCheckerClassName(String validConnectionCheckerClass) throws Exception { Class clazz = Utils.loadClass(validConnectionCheckerClass); - ValidConnectionChecker validConnectionChecker = null; + ValidConnectionChecker validConnectionChecker; if (clazz != null) { validConnectionChecker = (ValidConnectionChecker) clazz.newInstance(); this.validConnectionChecker = validConnectionChecker; @@ -787,7 +764,7 @@ public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) { if (minEvictableIdleTimeMillis < 1000 * 30) { LOG.error("minEvictableIdleTimeMillis should be greater than 30000"); } - + this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis; } @@ -810,17 +787,16 @@ public void setKeepAliveBetweenTimeMillis(long keepAliveBetweenTimeMillis) { public long getMaxEvictableIdleTimeMillis() { return maxEvictableIdleTimeMillis; } - public void setMaxEvictableIdleTimeMillis(long maxEvictableIdleTimeMillis) { if (maxEvictableIdleTimeMillis < 1000 * 30) { LOG.error("maxEvictableIdleTimeMillis should be greater than 30000"); } - + if (inited && maxEvictableIdleTimeMillis < minEvictableIdleTimeMillis) { throw new IllegalArgumentException("maxEvictableIdleTimeMillis must be grater than minEvictableIdleTimeMillis"); } - + this.maxEvictableIdleTimeMillis = maxEvictableIdleTimeMillis; } @@ -996,7 +972,7 @@ public void setInitGlobalVariants(boolean initGlobalVariants) { /** * Retrieves the number of seconds the driver will wait for a Statement object to execute. If the limit * is exceeded, a SQLException is thrown. - * + * * @return the current query timeout limit in seconds; zero means there is no limit * Statement * @see #setQueryTimeout @@ -1011,7 +987,7 @@ public int getQueryTimeout() { * this limit to the execute, executeQuery and executeUpdate methods. JDBC * driver implementations may also apply this limit to ResultSet methods (consult your driver vendor * documentation for details). - * + * * @param seconds the new query timeout limit in seconds; zero means there is no limit * @see #getQueryTimeout */ @@ -1065,12 +1041,11 @@ public void setMaxWait(long maxWaitMillis) { this.maxWait = maxWaitMillis; } - + public int getNotFullTimeoutRetryCount() { return notFullTimeoutRetryCount; } - public void setNotFullTimeoutRetryCount(int notFullTimeoutRetryCount) { this.notFullTimeoutRetryCount = notFullTimeoutRetryCount; } @@ -1087,7 +1062,7 @@ public void setMinIdle(int value) { if (inited && value > this.maxActive) { throw new IllegalArgumentException("minIdle greater than maxActive, " + maxActive + " < " + this.minIdle); } - + if (minIdle < 0) { throw new IllegalArgumentException("minIdle must > 0"); } @@ -1242,7 +1217,7 @@ public void setDriverClassName(String driverClass) { if (StringUtils.equals(this.driverClass, driverClass)) { return; } - + throw new UnsupportedOperationException(); } @@ -1423,11 +1398,11 @@ public void validateConnection(Connection conn) throws SQLException { result = false; error = ex; } - + if (!result) { SQLException sqlError = error != null ? // - new SQLException("validateConnection false", error) // - : new SQLException("validateConnection false"); + new SQLException("validateConnection false", error) // + : new SQLException("validateConnection false"); throw sqlError; } return; @@ -1452,8 +1427,7 @@ public void validateConnection(Connection conn) throws SQLException { if (onFatalError) { onFatalError = false; } - } - finally { + } finally { lock.unlock(); } } @@ -1610,17 +1584,17 @@ public void setClearFiltersEnable(boolean clearFiltersEnable) { this.clearFiltersEnable = clearFiltersEnable; } - protected volatile long connectionIdSeed = 10000L; - protected volatile long statementIdSeed = 20000L; - protected volatile long resultSetIdSeed = 50000L; + protected volatile long connectionIdSeed = 10000L; + protected volatile long statementIdSeed = 20000L; + protected volatile long resultSetIdSeed = 50000L; protected volatile long transactionIdSeed = 60000L; - protected volatile long metaDataIdSeed = 80000L; + protected volatile long metaDataIdSeed = 80000L; - final static AtomicLongFieldUpdater connectionIdSeedUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "connectionIdSeed"); - final static AtomicLongFieldUpdater statementIdSeedUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "statementIdSeed"); - final static AtomicLongFieldUpdater resultSetIdSeedUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "resultSetIdSeed"); - final static AtomicLongFieldUpdater transactionIdSeedUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "transactionIdSeed"); - final static AtomicLongFieldUpdater metaDataIdSeedUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "metaDataIdSeed"); + static final AtomicLongFieldUpdater connectionIdSeedUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "connectionIdSeed"); + static final AtomicLongFieldUpdater statementIdSeedUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "statementIdSeed"); + static final AtomicLongFieldUpdater resultSetIdSeedUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "resultSetIdSeed"); + static final AtomicLongFieldUpdater transactionIdSeedUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "transactionIdSeed"); + static final AtomicLongFieldUpdater metaDataIdSeedUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "metaDataIdSeed"); public long createConnectionId() { return connectionIdSeedUpdater.incrementAndGet(this); @@ -1657,7 +1631,9 @@ public void handleConnectionException(DruidPooledConnection conn, Throwable t) t handleConnectionException(conn, t, null); } - public abstract void handleConnectionException(DruidPooledConnection conn, Throwable t, String sql) throws SQLException; + public abstract void handleConnectionException(DruidPooledConnection conn, + Throwable t, + String sql) throws SQLException; protected abstract void recycle(DruidPooledConnection pooledConnection) throws SQLException; @@ -1779,7 +1755,7 @@ protected void setCreateError(Throwable ex) { } return; } - + createErrorCountUpdater.incrementAndGet(this); long now = System.currentTimeMillis(); lock.lock(); @@ -1825,7 +1801,9 @@ public void initPhysicalConnection(Connection conn) throws SQLException { initPhysicalConnection(conn, null, null); } - public void initPhysicalConnection(Connection conn, Map variables, Map globalVariables) throws SQLException { + public void initPhysicalConnection(Connection conn, + Map variables, + Map globalVariables) throws SQLException { if (conn.getAutoCommit() != defaultAutoCommit) { conn.setAutoCommit(defaultAutoCommit); } @@ -2002,7 +1980,7 @@ public long getID() { return this.id; } - public Date getCreatedTime() { + public java.util.Date getCreatedTime() { return createdTime; } @@ -2085,7 +2063,7 @@ protected void cloneTo(DruidAbstractDataSource to) { to.createScheduler = this.createScheduler; to.destroyScheduler = this.destroyScheduler; } - + public abstract void discardConnection(Connection realConnection); public void discardConnection(DruidConnectionHolder holder) { @@ -2106,7 +2084,7 @@ public void setAsyncCloseConnectionEnable(boolean asyncCloseConnectionEnable) { public ScheduledExecutorService getCreateScheduler() { return createScheduler; } - + public void setCreateScheduler(ScheduledExecutorService createScheduler) { if (isInited()) { throw new DruidRuntimeException("dataSource inited."); @@ -2118,7 +2096,6 @@ public ScheduledExecutorService getDestroyScheduler() { return destroyScheduler; } - public void setDestroyScheduler(ScheduledExecutorService destroyScheduler) { if (isInited()) { throw new DruidRuntimeException("dataSource inited."); @@ -2130,24 +2107,22 @@ public boolean isInited() { return this.inited; } - public int getMaxCreateTaskCount() { return maxCreateTaskCount; } - public void setMaxCreateTaskCount(int maxCreateTaskCount) { if (maxCreateTaskCount < 1) { throw new IllegalArgumentException(); } - + this.maxCreateTaskCount = maxCreateTaskCount; } - + public boolean isFailFast() { return failFast; } - + public void setFailFast(boolean failFast) { this.failFast = failFast; } @@ -2189,23 +2164,27 @@ public static class PhysicalConnectionInfo { long createTaskId; - public PhysicalConnectionInfo(Connection connection // - , long connectStartNanos // - , long connectedNanos // - , long initedNanos // - , long validatedNanos) { - this(connection, connectStartNanos, connectedNanos, initedNanos,validatedNanos, null, null); - } - - public PhysicalConnectionInfo(Connection connection // - , long connectStartNanos // - , long connectedNanos // - , long initedNanos // - , long validatedNanos - , Map vairiables - , Map globalVairiables) { + public PhysicalConnectionInfo( + Connection connection, + long connectStartNanos, + long connectedNanos, + long initedNanos, + long validatedNanos + ) { + this(connection, connectStartNanos, connectedNanos, initedNanos, validatedNanos, null, null); + } + + public PhysicalConnectionInfo( + Connection connection, + long connectStartNanos, + long connectedNanos, + long initedNanos, + long validatedNanos, + Map vairiables, + Map globalVairiables + ) { this.connection = connection; - + this.connectStartNanos = connectStartNanos; this.connectedNanos = connectedNanos; this.initedNanos = initedNanos; @@ -2213,7 +2192,7 @@ public PhysicalConnectionInfo(Connection connection // this.vairiables = vairiables; this.globalVairiables = globalVairiables; } - + public Connection getPhysicalConnection() { return connection; } @@ -2221,11 +2200,11 @@ public Connection getPhysicalConnection() { public long getConnectStartNanos() { return connectStartNanos; } - + public long getConnectedNanos() { return connectedNanos; } - + public long getInitedNanos() { return initedNanos; } @@ -2233,7 +2212,7 @@ public long getInitedNanos() { public long getValidatedNanos() { return validatedNanos; } - + public long getConnectNanoSpan() { return connectedNanos - connectStartNanos; } diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSourceMBean.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSourceMBean.java index 67dc5e0798..42755ba524 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSourceMBean.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSourceMBean.java @@ -19,7 +19,6 @@ import java.util.List; public interface DruidAbstractDataSourceMBean { - int getLoginTimeout(); String getDbType(); @@ -111,7 +110,7 @@ public interface DruidAbstractDataSourceMBean { long getCreateErrorCount(); int getMaxActive(); - + void setMaxActive(int maxActive); long getTimeBetweenConnectErrorMillis(); @@ -163,14 +162,14 @@ public interface DruidAbstractDataSourceMBean { long getCachedPreparedStatementMissCount(); long getCachedPreparedStatementHitCount(); - + boolean isUseOracleImplicitCache(); - + void setUseOracleImplicitCache(boolean useOracleImplicitCache); - + int getDriverMajorVersion(); - + int getDriverMinorVersion(); - + String getExceptionSorterClassName(); } diff --git a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java index 9e049f6eda..f555f99572 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java +++ b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java @@ -15,6 +15,17 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.DbType; +import com.alibaba.druid.pool.DruidAbstractDataSource.PhysicalConnectionInfo; +import com.alibaba.druid.proxy.jdbc.WrapperProxy; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.Utils; + +import javax.sql.ConnectionEventListener; +import javax.sql.StatementEventListener; + import java.sql.Connection; import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; @@ -26,73 +37,61 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.locks.ReentrantLock; -import javax.sql.ConnectionEventListener; -import javax.sql.StatementEventListener; - -import com.alibaba.druid.DbType; -import com.alibaba.druid.pool.DruidAbstractDataSource.PhysicalConnectionInfo; -import com.alibaba.druid.proxy.jdbc.WrapperProxy; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.JdbcConstants; -import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.util.Utils; - /** * @author wenshao [szujobs@hotmail.com] */ public final class DruidConnectionHolder { - private final static Log LOG = LogFactory.getLog(DruidConnectionHolder.class); - public static boolean holdabilityUnsupported = false; + private static final Log LOG = LogFactory.getLog(DruidConnectionHolder.class); + public static boolean holdabilityUnsupported; - protected final DruidAbstractDataSource dataSource; - protected final long connectionId; - protected final Connection conn; + protected final DruidAbstractDataSource dataSource; + protected final long connectionId; + protected final Connection conn; protected final List connectionEventListeners = new CopyOnWriteArrayList(); - protected final List statementEventListeners = new CopyOnWriteArrayList(); - protected final long connectTimeMillis; - protected volatile long lastActiveTimeMillis; - protected volatile long lastExecTimeMillis; - protected volatile long lastKeepTimeMillis; - protected volatile long lastValidTimeMillis; - protected long useCount = 0; - private long keepAliveCheckCount = 0; - private long lastNotEmptyWaitNanos; - private final long createNanoSpan; - protected PreparedStatementPool statementPool; - protected final List statementTrace = new ArrayList(2); - protected final boolean defaultReadOnly; - protected final int defaultHoldability; - protected final int defaultTransactionIsolation; - protected final boolean defaultAutoCommit; - protected boolean underlyingReadOnly; - protected int underlyingHoldability; - protected int underlyingTransactionIsolation; - protected boolean underlyingAutoCommit; - protected volatile boolean discard = false; - protected volatile boolean active = false; - protected final Map variables; - protected final Map globleVariables; - final ReentrantLock lock = new ReentrantLock(); - protected String initSchema; + protected final List statementEventListeners = new CopyOnWriteArrayList(); + protected final long connectTimeMillis; + protected volatile long lastActiveTimeMillis; + protected volatile long lastExecTimeMillis; + protected volatile long lastKeepTimeMillis; + protected volatile long lastValidTimeMillis; + protected long useCount; + private long keepAliveCheckCount; + private long lastNotEmptyWaitNanos; + private final long createNanoSpan; + protected PreparedStatementPool statementPool; + protected final List statementTrace = new ArrayList(2); + protected final boolean defaultReadOnly; + protected final int defaultHoldability; + protected final int defaultTransactionIsolation; + protected final boolean defaultAutoCommit; + protected boolean underlyingReadOnly; + protected int underlyingHoldability; + protected int underlyingTransactionIsolation; + protected boolean underlyingAutoCommit; + protected volatile boolean discard; + protected volatile boolean active; + protected final Map variables; + protected final Map globleVariables; + final ReentrantLock lock = new ReentrantLock(); + protected String initSchema; public DruidConnectionHolder(DruidAbstractDataSource dataSource, PhysicalConnectionInfo pyConnectInfo) - throws SQLException{ + throws SQLException { this(dataSource, - pyConnectInfo.getPhysicalConnection(), - pyConnectInfo.getConnectNanoSpan(), - pyConnectInfo.getVairiables(), - pyConnectInfo.getGlobalVairiables()); + pyConnectInfo.getPhysicalConnection(), + pyConnectInfo.getConnectNanoSpan(), + pyConnectInfo.getVairiables(), + pyConnectInfo.getGlobalVairiables()); } public DruidConnectionHolder(DruidAbstractDataSource dataSource, Connection conn, long connectNanoSpan) - throws SQLException{ + throws SQLException { this(dataSource, conn, connectNanoSpan, null, null); } public DruidConnectionHolder(DruidAbstractDataSource dataSource, Connection conn, long connectNanoSpan, Map variables, Map globleVariables) - throws SQLException{ + throws SQLException { this.dataSource = dataSource; this.conn = conn; this.createNanoSpan = connectNanoSpan; @@ -101,7 +100,7 @@ public DruidConnectionHolder(DruidAbstractDataSource dataSource, Connection conn this.connectTimeMillis = System.currentTimeMillis(); this.lastActiveTimeMillis = connectTimeMillis; - this.lastExecTimeMillis = connectTimeMillis; + this.lastExecTimeMillis = connectTimeMillis; this.underlyingAutoCommit = conn.getAutoCommit(); @@ -322,7 +321,7 @@ public void reset() throws SQLException { Statement stmt = (Statement) item; JdbcUtils.close(stmt); } - + statementTrace.clear(); } finally { lock.unlock(); diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 0f28b86987..4eb62baf21 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -15,50 +15,6 @@ */ package com.alibaba.druid.pool; -import static com.alibaba.druid.util.Utils.getBoolean; - -import java.io.Closeable; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.ConcurrentModificationException; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.ServiceLoader; -import java.util.StringTokenizer; -import java.util.TimeZone; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Future; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import javax.management.JMException; -import javax.management.MBeanRegistration; -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.naming.Referenceable; -import javax.naming.StringRefAddr; -import javax.sql.ConnectionEvent; -import javax.sql.ConnectionEventListener; -import javax.sql.ConnectionPoolDataSource; -import javax.sql.PooledConnection; - import com.alibaba.druid.Constants; import com.alibaba.druid.DbType; import com.alibaba.druid.TransactionTimeoutException; @@ -85,89 +41,111 @@ import com.alibaba.druid.support.clickhouse.BalancedClickhouseDriver; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.JMXUtils; -import com.alibaba.druid.util.JdbcConstants; -import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.util.StringUtils; -import com.alibaba.druid.util.Utils; +import com.alibaba.druid.util.*; import com.alibaba.druid.wall.WallFilter; import com.alibaba.druid.wall.WallProviderStatValue; +import javax.management.JMException; +import javax.management.MBeanRegistration; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.naming.Referenceable; +import javax.naming.StringRefAddr; +import javax.sql.ConnectionEvent; +import javax.sql.ConnectionEventListener; +import javax.sql.ConnectionPoolDataSource; +import javax.sql.PooledConnection; + +import java.io.Closeable; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicLongFieldUpdater; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +import static com.alibaba.druid.util.Utils.getBoolean; + /** * @author ljw [ljw2083@alibaba-inc.com] * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSource extends DruidAbstractDataSource implements DruidDataSourceMBean, ManagedDataSource, Referenceable, Closeable, Cloneable, ConnectionPoolDataSource, MBeanRegistration { - - private final static Log LOG = LogFactory.getLog(DruidDataSource.class); - private static final long serialVersionUID = 1L; + private static final Log LOG = LogFactory.getLog(DruidDataSource.class); + private static final long serialVersionUID = 1L; // stats - private volatile long recycleErrorCount = 0L; - private long connectCount = 0L; - private long closeCount = 0L; - private volatile long connectErrorCount = 0L; - private long recycleCount = 0L; - private long removeAbandonedCount = 0L; - private long notEmptyWaitCount = 0L; - private long notEmptySignalCount = 0L; - private long notEmptyWaitNanos = 0L; - private int keepAliveCheckCount = 0; - private int activePeak = 0; - private long activePeakTime = 0; - private int poolingPeak = 0; - private long poolingPeakTime = 0; + private volatile long recycleErrorCount; + private long connectCount; + private long closeCount; + private volatile long connectErrorCount; + private long recycleCount; + private long removeAbandonedCount; + private long notEmptyWaitCount; + private long notEmptySignalCount; + private long notEmptyWaitNanos; + private int keepAliveCheckCount; + private int activePeak; + private long activePeakTime; + private int poolingPeak; + private long poolingPeakTime; // store private volatile DruidConnectionHolder[] connections; - private int poolingCount = 0; - private int activeCount = 0; - private volatile long discardCount = 0; - private int notEmptyWaitThreadCount = 0; - private int notEmptyWaitThreadPeak = 0; + private int poolingCount; + private int activeCount; + private volatile long discardCount; + private int notEmptyWaitThreadCount; + private int notEmptyWaitThreadPeak; // - private DruidConnectionHolder[] evictConnections; - private DruidConnectionHolder[] keepAliveConnections; + private DruidConnectionHolder[] evictConnections; + private DruidConnectionHolder[] keepAliveConnections; // threads - private volatile ScheduledFuture destroySchedulerFuture; - private DestroyTask destroyTask; + private volatile ScheduledFuture destroySchedulerFuture; + private DestroyTask destroyTask; - private volatile Future createSchedulerFuture; + private volatile Future createSchedulerFuture; - private CreateConnectionThread createConnectionThread; - private DestroyConnectionThread destroyConnectionThread; - private LogStatsThread logStatsThread; - private int createTaskCount; + private CreateConnectionThread createConnectionThread; + private DestroyConnectionThread destroyConnectionThread; + private LogStatsThread logStatsThread; + private int createTaskCount; - private volatile long createTaskIdSeed = 1L; - private long[] createTasks; + private volatile long createTaskIdSeed = 1L; + private long[] createTasks; - private final CountDownLatch initedLatch = new CountDownLatch(2); + private final CountDownLatch initedLatch = new CountDownLatch(2); - private volatile boolean enable = true; + private volatile boolean enable = true; - private boolean resetStatEnable = true; - private volatile long resetCount = 0L; + private boolean resetStatEnable = true; + private volatile long resetCount; - private String initStackTrace; + private String initStackTrace; - private volatile boolean closing = false; - private volatile boolean closed = false; - private long closeTimeMillis = -1L; + private volatile boolean closing; + private volatile boolean closed; + private long closeTimeMillis = -1L; - protected JdbcDataSourceStat dataSourceStat; + protected JdbcDataSourceStat dataSourceStat; - private boolean useGlobalDataSourceStat = false; - private boolean mbeanRegistered = false; - public static ThreadLocal waitNanosLocal = new ThreadLocal(); - private boolean logDifferentThread = true; - private volatile boolean keepAlive = false; - private boolean asyncInit = false; - protected boolean killWhenSocketReadTimeout = false; - protected boolean checkExecuteTime = false; + private boolean useGlobalDataSourceStat; + private boolean mbeanRegistered; + public static ThreadLocal waitNanosLocal = new ThreadLocal(); + private boolean logDifferentThread = true; + private volatile boolean keepAlive; + private boolean asyncInit; + protected boolean killWhenSocketReadTimeout; + protected boolean checkExecuteTime; - private static List autoFilters = null; - private boolean loadSpifilterSkip = false; - private volatile DataSourceDisableException disableException = null; + private static List autoFilters; + private boolean loadSpifilterSkip; + private volatile DataSourceDisableException disableException; protected static final AtomicLongFieldUpdater recycleErrorCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidDataSource.class, "recycleErrorCount"); @@ -178,11 +156,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat protected static final AtomicLongFieldUpdater createTaskIdSeedUpdater = AtomicLongFieldUpdater.newUpdater(DruidDataSource.class, "createTaskIdSeed"); - public DruidDataSource(){ + public DruidDataSource() { this(false); } - public DruidDataSource(boolean fairLock){ + public DruidDataSource(boolean fairLock) { super(fairLock); configFromPropety(System.getProperties()); @@ -686,7 +664,6 @@ private void setPoolPreparedStatements0(boolean value) { if (!value) { lock.lock(); try { - for (int i = 0; i < poolingCount; ++i) { DruidConnectionHolder connection = connections[i]; @@ -971,10 +948,10 @@ public void init() throws SQLException { throw e; } catch (InterruptedException e) { throw new SQLException(e.getMessage(), e); - } catch (RuntimeException e){ + } catch (RuntimeException e) { LOG.error("{dataSource-" + this.getID() + "} init error", e); throw e; - } catch (Error e){ + } catch (Error e) { LOG.error("{dataSource-" + this.getID() + "} init error", e); throw e; @@ -1075,7 +1052,7 @@ protected void createAndStartDestroyThread() { period = 1000; } destroySchedulerFuture = destroyScheduler.scheduleAtFixedRate(destroyTask, period, period, - TimeUnit.MILLISECONDS); + TimeUnit.MILLISECONDS); initedLatch.countDown(); return; } @@ -1098,7 +1075,7 @@ protected void createAndStartCreatorThread() { /** * load filters from SPI ServiceLoader - * + * * @see ServiceLoader */ private void initFromSPIServiceLoader() { @@ -1149,7 +1126,7 @@ private void initFromWrapDriverUrl() throws SQLException { /** * 会去重复 - * + * * @param filter */ private void addFilter(Filter filter) { @@ -1233,7 +1210,7 @@ protected void initCheck() throws SQLException { if (driver.getMajorVersion() < 10) { throw new SQLException("not support oracle driver " + driver.getMajorVersion() + "." - + driver.getMinorVersion()); + + driver.getMinorVersion()); } if (driver.getMajorVersion() == 10 && isUseOracleImplicitCache()) { @@ -1277,7 +1254,7 @@ private void oracleValidationQueryCheck() { if (query instanceof SQLSelectQueryBlock) { if (((SQLSelectQueryBlock) query).getFrom() == null) { LOG.error("invalid oracle validationQuery. " + validationQuery + ", may should be : " + validationQuery - + " FROM DUAL"); + + " FROM DUAL"); } } } @@ -1306,7 +1283,7 @@ private void db2ValidationQueryCheck() { if (query instanceof SQLSelectQueryBlock) { if (((SQLSelectQueryBlock) query).getFrom() == null) { LOG.error("invalid db2 validationQuery. " + validationQuery + ", may should be : " + validationQuery - + " FROM SYSDUMMY"); + + " FROM SYSDUMMY"); } } } @@ -1325,8 +1302,8 @@ private void initValidConnectionChecker() { this.validConnectionChecker = new OracleValidConnectionChecker(); } else if (realDriverClassName.equals(JdbcConstants.SQL_SERVER_DRIVER) - || realDriverClassName.equals(JdbcConstants.SQL_SERVER_DRIVER_SQLJDBC4) - || realDriverClassName.equals(JdbcConstants.SQL_SERVER_DRIVER_JTDS)) { + || realDriverClassName.equals(JdbcConstants.SQL_SERVER_DRIVER_SQLJDBC4) + || realDriverClassName.equals(JdbcConstants.SQL_SERVER_DRIVER_JTDS)) { this.validConnectionChecker = new MSSQLValidConnectionChecker(); } else if (realDriverClassName.equals(JdbcConstants.POSTGRESQL_DRIVER) @@ -1334,7 +1311,7 @@ private void initValidConnectionChecker() { || realDriverClassName.equals(JdbcConstants.POLARDB_DRIVER)) { this.validConnectionChecker = new PGValidConnectionChecker(); } else if (realDriverClassName.equals(JdbcConstants.OCEANBASE_DRIVER) - || (realDriverClassName.equals(JdbcConstants.OCEANBASE_DRIVER2))) { + || (realDriverClassName.equals(JdbcConstants.OCEANBASE_DRIVER2))) { DbType dbType = DbType.of(this.dbTypeName); this.validConnectionChecker = new OceanBaseValidConnectionChecker(dbType); } @@ -1350,8 +1327,7 @@ private void initExceptionSorter() { return; } - - for (Class driverClass = driver.getClass();;) { + for (Class driverClass = driver.getClass(); ; ) { String realDriverClassName = driverClass.getName(); if (realDriverClassName.equals(JdbcConstants.MYSQL_DRIVER) // || realDriverClassName.equals(JdbcConstants.MYSQL_DRIVER_6)) { @@ -1422,7 +1398,7 @@ public PooledConnection getPooledConnection(String user, String password) throws public DruidPooledConnection getConnectionDirect(long maxWaitMillis) throws SQLException { int notFullTimeoutRetryCnt = 0; - for (;;) { + for (; ; ) { // handle notFullTimeoutRetry DruidPooledConnection poolableConnection; try { @@ -1456,10 +1432,10 @@ public DruidPooledConnection getConnectionDirect(long maxWaitMillis) throws SQLE if (testWhileIdle) { final DruidConnectionHolder holder = poolableConnection.holder; - long currentTimeMillis = System.currentTimeMillis(); - long lastActiveTimeMillis = holder.lastActiveTimeMillis; - long lastExecTimeMillis = holder.lastExecTimeMillis; - long lastKeepTimeMillis = holder.lastKeepTimeMillis; + long currentTimeMillis = System.currentTimeMillis(); + long lastActiveTimeMillis = holder.lastActiveTimeMillis; + long lastExecTimeMillis = holder.lastExecTimeMillis; + long lastKeepTimeMillis = holder.lastKeepTimeMillis; if (checkExecuteTime && lastExecTimeMillis != lastActiveTimeMillis) { @@ -1470,7 +1446,7 @@ public DruidPooledConnection getConnectionDirect(long maxWaitMillis) throws SQLE lastActiveTimeMillis = lastKeepTimeMillis; } - long idleMillis = currentTimeMillis - lastActiveTimeMillis; + long idleMillis = currentTimeMillis - lastActiveTimeMillis; long timeBetweenEvictionRunsMillis = this.timeBetweenEvictionRunsMillis; @@ -1480,7 +1456,7 @@ public DruidPooledConnection getConnectionDirect(long maxWaitMillis) throws SQLE if (idleMillis >= timeBetweenEvictionRunsMillis || idleMillis < 0 // unexcepted branch - ) { + ) { boolean validate = testConnectionInternal(poolableConnection.holder, poolableConnection.conn); if (!validate) { if (LOG.isDebugEnabled()) { @@ -1488,7 +1464,7 @@ public DruidPooledConnection getConnectionDirect(long maxWaitMillis) throws SQLE } discardConnection(poolableConnection.holder); - continue; + continue; } } } @@ -1518,7 +1494,7 @@ public DruidPooledConnection getConnectionDirect(long maxWaitMillis) throws SQLE /** * 抛弃连接，不进行回收，而是抛弃 - * + * * @param realConnection * @deprecated */ @@ -1591,7 +1567,7 @@ private DruidPooledConnection getConnectionInternal(long maxWait) throws SQLExce DruidConnectionHolder holder; - for (boolean createDirect = false;;) { + for (boolean createDirect = false; ; ) { if (createDirect) { createStartNanosUpdater.set(this, System.nanoTime()); if (creatingCountUpdater.compareAndSet(this, 0, 1)) { @@ -1606,7 +1582,7 @@ private DruidPooledConnection getConnectionInternal(long maxWait) throws SQLExce LOG.debug("conn-direct_create "); } - boolean discard = false; + boolean discard; lock.lock(); try { if (activeCount < maxActive) { @@ -1739,12 +1715,12 @@ private DruidPooledConnection getConnectionInternal(long maxWait) throws SQLExce } StringBuilder buf = new StringBuilder(128); - buf.append("wait millis ")// - .append(waitNanos / (1000 * 1000))// - .append(", active ").append(activeCount)// - .append(", maxActive ").append(maxActive)// - .append(", creating ").append(creatingCount)// - ; + buf.append("wait millis ") + .append(waitNanos / (1000 * 1000)) + .append(", active ").append(activeCount) + .append(", maxActive ").append(maxActive) + .append(", creating ").append(creatingCount); + if (creatingCount > 0 && createStartNanos > 0) { long createElapseMillis = (System.nanoTime() - createStartNanos) / (1000 * 1000); if (createElapseMillis > 0) { @@ -1784,7 +1760,9 @@ private DruidPooledConnection getConnectionInternal(long maxWait) throws SQLExce return poolalbeConnection; } - public void handleConnectionException(DruidPooledConnection pooledConnection, Throwable t, String sql) throws SQLException { + public void handleConnectionException(DruidPooledConnection pooledConnection, + Throwable t, + String sql) throws SQLException { final DruidConnectionHolder holder = pooledConnection.getConnectionHolder(); if (holder == null) { return; @@ -1814,7 +1792,9 @@ public void handleConnectionException(DruidPooledConnection pooledConnection, Th } } - protected final void handleFatalError(DruidPooledConnection conn, SQLException error, String sql) throws SQLException { + protected final void handleFatalError(DruidPooledConnection conn, + SQLException error, + String sql) throws SQLException { final DruidConnectionHolder holder = conn.holder; if (conn.isTraceEnable()) { @@ -1858,13 +1838,12 @@ protected final void handleFatalError(DruidPooledConnection conn, SQLException e lock.unlock(); } - if(onFatalError && holder != null && holder.getDataSource() != null) { + if (onFatalError && holder != null && holder.getDataSource() != null) { ReentrantLock dataSourceLock = holder.getDataSource().lock; dataSourceLock.lock(); try { emptySignal(); - } - finally { + } finally { dataSourceLock.unlock(); } } @@ -1884,7 +1863,6 @@ protected final void handleFatalError(DruidPooledConnection conn, SQLException e this.discardConnection(holder); } - // holder. LOG.error("{conn-" + holder.getConnectionId() + "} discard", error); } @@ -1901,8 +1879,8 @@ protected void recycle(DruidPooledConnection pooledConnection) throws SQLExcepti } if (logDifferentThread // - && (!isAsyncCloseConnectionEnable()) // - && pooledConnection.ownerThread != Thread.currentThread()// + && (!isAsyncCloseConnectionEnable()) // + && pooledConnection.ownerThread != Thread.currentThread()// ) { LOG.warn("get/close not same thread"); } @@ -2150,11 +2128,10 @@ public void close() { public void registerMbean() { if (!mbeanRegistered) { AccessController.doPrivileged(new PrivilegedAction() { - @Override public Object run() { ObjectName objectName = DruidDataSourceStatManager.addDataSource(DruidDataSource.this, - DruidDataSource.this.name); + DruidDataSource.this.name); DruidDataSource.this.setObjectName(objectName); DruidDataSource.this.mbeanRegistered = true; @@ -2168,7 +2145,6 @@ public Object run() { public void unregisterMbean() { if (mbeanRegistered) { AccessController.doPrivileged(new PrivilegedAction() { - @Override public Object run() { DruidDataSourceStatManager.removeDataSource(DruidDataSource.this); @@ -2248,7 +2224,7 @@ DruidConnectionHolder takeLast() throws InterruptedException, SQLException { private DruidConnectionHolder pollLast(long nanos) throws InterruptedException, SQLException { long estimate = nanos; - for (;;) { + for (; ; ) { if (poolingCount == 0) { emptySignal(); // send signal to CreateThread create connection @@ -2269,8 +2245,8 @@ private DruidConnectionHolder pollLast(long nanos) throws InterruptedException, try { long startEstimate = estimate; estimate = notEmpty.awaitNanos(estimate); // signal by - // recycle or - // creator + // recycle or + // creator notEmptyWaitCount++; notEmptyWaitNanos += (startEstimate - estimate); @@ -2494,7 +2470,7 @@ public DruidDataSourceStatValue getStatValueAndReset() { value.setCommitCount(commitCountUpdater.getAndSet(this, 0)); value.setRollbackCount(rollbackCountUpdater.getAndSet(this, 0)); - value.setPstmtCacheHitCount(cachedPreparedStatementHitCountUpdater.getAndSet(this,0)); + value.setPstmtCacheHitCount(cachedPreparedStatementHitCountUpdater.getAndSet(this, 0)); value.setPstmtCacheMissCount(cachedPreparedStatementMissCountUpdater.getAndSet(this, 0)); value.setStartTransactionCount(startTransactionCountUpdater.getAndSet(this, 0)); @@ -2572,7 +2548,7 @@ private boolean put(DruidConnectionHolder holder, long createTaskId, boolean che clearCreateTask(createTaskId); if (poolingCount + createTaskCount < notEmptyWaitThreadCount // - && activeCount + poolingCount + createTaskCount < maxActive) { + && activeCount + poolingCount + createTaskCount < maxActive) { emptySignal(); } } @@ -2583,9 +2559,8 @@ private boolean put(DruidConnectionHolder holder, long createTaskId, boolean che } public class CreateConnectionTask implements Runnable { - - private int errorCount = 0; - private boolean initTask = false; + private int errorCount; + private boolean initTask; private final long taskId; public CreateConnectionTask() { @@ -2603,8 +2578,7 @@ public void run() { } private void runInternal() { - for (;;) { - + for (; ; ) { // addLast lock.lock(); try { @@ -2769,8 +2743,7 @@ private void runInternal() { } public class CreateConnectionThread extends Thread { - - public CreateConnectionThread(String name){ + public CreateConnectionThread(String name) { super(name); this.setDaemon(true); } @@ -2780,7 +2753,7 @@ public void run() { long lastDiscardCount = 0; int errorCount = 0; - for (;;) { + for (; ; ) { // addLast try { lock.lockInterruptibly(); @@ -2840,7 +2813,7 @@ public void run() { connection = createPhysicalConnection(); } catch (SQLException e) { LOG.error("create connection SQLException, url: " + jdbcUrl + ", errorCode " + e.getErrorCode() - + ", state " + e.getSQLState(), e); + + ", state " + e.getSQLState(), e); errorCount++; if (errorCount > connectionErrorRetryAttempts && timeBetweenConnectErrorMillis > 0) { @@ -2895,8 +2868,7 @@ public void run() { } public class DestroyConnectionThread extends Thread { - - public DestroyConnectionThread(String name){ + public DestroyConnectionThread(String name) { super(name); this.setDaemon(true); } @@ -2904,7 +2876,7 @@ public DestroyConnectionThread(String name){ public void run() { initedLatch.countDown(); - for (;;) { + for (; ; ) { // 从前面开始删除 try { if (closed || closing) { @@ -2932,7 +2904,6 @@ public void run() { public class DestroyTask implements Runnable { public DestroyTask() { - } @Override @@ -2947,15 +2918,14 @@ public void run() { } public class LogStatsThread extends Thread { - - public LogStatsThread(String name){ + public LogStatsThread(String name) { super(name); this.setDaemon(true); } public void run() { try { - for (;;) { + for (; ; ) { try { logStats(); } catch (Exception e) { @@ -2981,7 +2951,7 @@ public int removeAbandoned() { try { Iterator iter = activeConnections.keySet().iterator(); - for (; iter.hasNext();) { + for (; iter.hasNext(); ) { DruidPooledConnection pooledConnection = iter.next(); if (pooledConnection.isRunning()) { @@ -3033,7 +3003,7 @@ public int removeAbandoned() { } buf.append("ownerThread current state is " + pooledConnection.getOwnerThread().getState() - + ", current stackTrace\n"); + + ", current stackTrace\n"); trace = pooledConnection.getOwnerThread().getStackTrace(); for (int i = 0; i < trace.length; i++) { buf.append("\tat "); @@ -3049,8 +3019,10 @@ public int removeAbandoned() { return removeCount; } - /** Instance key */ - protected String instanceKey = null; + /** + * Instance key + */ + protected String instanceKey; public Reference getReference() throws NamingException { final String className = getClass().getName(); @@ -3119,7 +3091,7 @@ public void shrink(boolean checkTime, boolean keepAlive) { int keepAliveCount = 0; int fatalErrorIncrement = fatalErrorCount - fatalErrorCountLastShrink; fatalErrorCountLastShrink = fatalErrorCount; - + try { if (!inited) { return; @@ -3130,7 +3102,7 @@ public void shrink(boolean checkTime, boolean keepAlive) { for (int i = 0; i < poolingCount; ++i) { DruidConnectionHolder connection = connections[i]; - if ((onFatalError || fatalErrorIncrement > 0) && (lastFatalErrorTimeMillis > connection.connectTimeMillis)) { + if ((onFatalError || fatalErrorIncrement > 0) && (lastFatalErrorTimeMillis > connection.connectTimeMillis)) { keepAliveConnections[keepAliveCount++] = connection; continue; } @@ -3754,7 +3726,7 @@ public boolean isWrapperFor(Class iface) { } if (this.statLogger != null - && (this.statLogger.getClass() == iface || DruidDataSourceStatLogger.class == iface)) { + && (this.statLogger.getClass() == iface || DruidDataSourceStatLogger.class == iface)) { return true; } @@ -3770,7 +3742,7 @@ public T unwrap(Class iface) { } if (this.statLogger != null - && (this.statLogger.getClass() == iface || DruidDataSourceStatLogger.class == iface)) { + && (this.statLogger.getClass() == iface || DruidDataSourceStatLogger.class == iface)) { return (T) statLogger; } @@ -3814,7 +3786,7 @@ public int fill(int toCount) throws SQLException { } int fillCount = 0; - for (;;) { + for (; ; ) { try { lock.lockInterruptibly(); } catch (InterruptedException e) { @@ -3917,17 +3889,14 @@ public ObjectName preRegister(MBeanServer server, ObjectName name) throws Except @Override public void postRegister(Boolean registrationDone) { - } @Override public void preDeregister() throws Exception { - } @Override public void postDeregister() { - } public boolean isClosed() { @@ -3943,6 +3912,5 @@ public void setCheckExecuteTime(boolean checkExecuteTime) { } public void forEach(Connection conn) { - } } diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java index 6874e99031..4c8a6bdd00 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java @@ -15,6 +15,10 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.filter.Filter; + +import javax.sql.DataSource; + import java.io.PrintWriter; import java.sql.Connection; import java.sql.Driver; @@ -24,15 +28,10 @@ import java.util.Properties; import java.util.logging.Logger; -import javax.sql.DataSource; - -import com.alibaba.druid.filter.Filter; - public class DruidDataSourceC3P0Adapter implements DataSource, DruidDataSourceC3P0AdapterMBean { - private DruidDataSource dataSource; - public DruidDataSourceC3P0Adapter(){ + public DruidDataSourceC3P0Adapter() { dataSource = new DruidDataSource(); // setDefault @@ -355,20 +354,20 @@ public void close() { // /////////////// - private String overrideDefaultUser; - private String overrideDefaultPassword; - private int propertyCycle; + private String overrideDefaultUser; + private String overrideDefaultPassword; + private int propertyCycle; private boolean usesTraditionalReflectiveProxies; - private String userOverridesAsString; - private int maxAdministrativeTaskTime; - private int maxIdleTimeExcessConnections; - private int maxConnectionAge; - private String connectionCustomizerClassName; - private String factoryClassLocation; - private int acquireIncrement = 1; - - private String connectionTesterClassName; - private String automaticTestTable; + private String userOverridesAsString; + private int maxAdministrativeTaskTime; + private int maxIdleTimeExcessConnections; + private int maxConnectionAge; + private String connectionCustomizerClassName; + private String factoryClassLocation; + private int acquireIncrement = 1; + + private String connectionTesterClassName; + private String automaticTestTable; public String getConnectionTesterClassName() { return connectionTesterClassName; diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0AdapterMBean.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0AdapterMBean.java index e8d4572d57..03ec249fff 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0AdapterMBean.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0AdapterMBean.java @@ -18,7 +18,6 @@ import java.util.Properties; public interface DruidDataSourceC3P0AdapterMBean { - String getDriverClass(); String getJdbcUrl(); diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java index 545c2112da..786182159a 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.pool; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Collections; -import java.util.Hashtable; -import java.util.Map; -import java.util.Properties; -import java.util.StringTokenizer; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; import javax.naming.Context; import javax.naming.Name; @@ -30,52 +25,52 @@ import javax.naming.spi.ObjectFactory; import javax.sql.DataSource; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.*; public class DruidDataSourceFactory implements ObjectFactory { - - private final static Log LOG = LogFactory.getLog(DruidDataSourceFactory.class); + private static final Log LOG = LogFactory.getLog(DruidDataSourceFactory.class); static final int UNKNOWN_TRANSACTIONISOLATION = -1; - public final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit"; - public final static String PROP_DEFAULTREADONLY = "defaultReadOnly"; - public final static String PROP_DEFAULTTRANSACTIONISOLATION = "defaultTransactionIsolation"; - public final static String PROP_DEFAULTCATALOG = "defaultCatalog"; - public final static String PROP_DRIVERCLASSNAME = "driverClassName"; - public final static String PROP_MAXACTIVE = "maxActive"; - public final static String PROP_MAXIDLE = "maxIdle"; - public final static String PROP_MINIDLE = "minIdle"; - public final static String PROP_INITIALSIZE = "initialSize"; - public final static String PROP_MAXWAIT = "maxWait"; - public final static String PROP_TESTONBORROW = "testOnBorrow"; - public final static String PROP_TESTONRETURN = "testOnReturn"; - public final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = "timeBetweenEvictionRunsMillis"; - public final static String PROP_NUMTESTSPEREVICTIONRUN = "numTestsPerEvictionRun"; - public final static String PROP_MINEVICTABLEIDLETIMEMILLIS = "minEvictableIdleTimeMillis"; - public final static String PROP_PHY_TIMEOUT_MILLIS = "phyTimeoutMillis"; - public final static String PROP_TESTWHILEIDLE = "testWhileIdle"; - public final static String PROP_PASSWORD = "password"; - public final static String PROP_URL = "url"; - public final static String PROP_USERNAME = "username"; - public final static String PROP_VALIDATIONQUERY = "validationQuery"; - public final static String PROP_VALIDATIONQUERY_TIMEOUT = "validationQueryTimeout"; - public final static String PROP_INITCONNECTIONSQLS = "initConnectionSqls"; - public final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = "accessToUnderlyingConnectionAllowed"; - public final static String PROP_REMOVEABANDONED = "removeAbandoned"; - public final static String PROP_REMOVEABANDONEDTIMEOUT = "removeAbandonedTimeout"; - public final static String PROP_LOGABANDONED = "logAbandoned"; - public final static String PROP_POOLPREPAREDSTATEMENTS = "poolPreparedStatements"; - public final static String PROP_MAXOPENPREPAREDSTATEMENTS = "maxOpenPreparedStatements"; - public final static String PROP_CONNECTIONPROPERTIES = "connectionProperties"; - public final static String PROP_FILTERS = "filters"; - public final static String PROP_EXCEPTION_SORTER = "exceptionSorter"; - public final static String PROP_EXCEPTION_SORTER_CLASS_NAME = "exception-sorter-class-name"; - public final static String PROP_NAME = "name"; - public final static String PROP_INIT = "init"; - - private final static String[] ALL_PROPERTIES = { + public static final String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit"; + public static final String PROP_DEFAULTREADONLY = "defaultReadOnly"; + public static final String PROP_DEFAULTTRANSACTIONISOLATION = "defaultTransactionIsolation"; + public static final String PROP_DEFAULTCATALOG = "defaultCatalog"; + public static final String PROP_DRIVERCLASSNAME = "driverClassName"; + public static final String PROP_MAXACTIVE = "maxActive"; + public static final String PROP_MAXIDLE = "maxIdle"; + public static final String PROP_MINIDLE = "minIdle"; + public static final String PROP_INITIALSIZE = "initialSize"; + public static final String PROP_MAXWAIT = "maxWait"; + public static final String PROP_TESTONBORROW = "testOnBorrow"; + public static final String PROP_TESTONRETURN = "testOnReturn"; + public static final String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = "timeBetweenEvictionRunsMillis"; + public static final String PROP_NUMTESTSPEREVICTIONRUN = "numTestsPerEvictionRun"; + public static final String PROP_MINEVICTABLEIDLETIMEMILLIS = "minEvictableIdleTimeMillis"; + public static final String PROP_PHY_TIMEOUT_MILLIS = "phyTimeoutMillis"; + public static final String PROP_TESTWHILEIDLE = "testWhileIdle"; + public static final String PROP_PASSWORD = "password"; + public static final String PROP_URL = "url"; + public static final String PROP_USERNAME = "username"; + public static final String PROP_VALIDATIONQUERY = "validationQuery"; + public static final String PROP_VALIDATIONQUERY_TIMEOUT = "validationQueryTimeout"; + public static final String PROP_INITCONNECTIONSQLS = "initConnectionSqls"; + public static final String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = "accessToUnderlyingConnectionAllowed"; + public static final String PROP_REMOVEABANDONED = "removeAbandoned"; + public static final String PROP_REMOVEABANDONEDTIMEOUT = "removeAbandonedTimeout"; + public static final String PROP_LOGABANDONED = "logAbandoned"; + public static final String PROP_POOLPREPAREDSTATEMENTS = "poolPreparedStatements"; + public static final String PROP_MAXOPENPREPAREDSTATEMENTS = "maxOpenPreparedStatements"; + public static final String PROP_CONNECTIONPROPERTIES = "connectionProperties"; + public static final String PROP_FILTERS = "filters"; + public static final String PROP_EXCEPTION_SORTER = "exceptionSorter"; + public static final String PROP_EXCEPTION_SORTER_CLASS_NAME = "exception-sorter-class-name"; + public static final String PROP_NAME = "name"; + public static final String PROP_INIT = "init"; + + private static final String[] ALL_PROPERTIES = { PROP_DEFAULTAUTOCOMMIT, PROP_DEFAULTREADONLY, PROP_DEFAULTTRANSACTIONISOLATION, @@ -109,11 +104,11 @@ public class DruidDataSourceFactory implements ObjectFactory { PROP_EXCEPTION_SORTER, PROP_EXCEPTION_SORTER_CLASS_NAME, PROP_INIT, - PROP_NAME, // + PROP_NAME, - "druid.timeBetweenLogStatsMillis", // - "druid.stat.sql.MaxSize", // - "druid.clearFiltersEnable", // + "druid.timeBetweenLogStatsMillis", + "druid.stat.sql.MaxSize", + "druid.clearFiltersEnable", "druid.resetStatEnable", // "druid.notFullTimeoutRetryCount", // "druid.maxWaitThreadCount", // @@ -130,7 +125,6 @@ public class DruidDataSourceFactory implements ObjectFactory { @Override public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception { - // We only know how to deal with javax.naming.References // that specify a class name of "javax.sql.DataSource" if ((obj == null) || !(obj instanceof Reference)) { diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java index be7a4ff4ff..ba7c51ec17 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java @@ -15,11 +15,11 @@ */ package com.alibaba.druid.pool; +import javax.management.ObjectName; + import java.sql.SQLException; import java.util.Date; -import javax.management.ObjectName; - /** * @author wenshao [szujobs@hotmail.com] */ @@ -73,19 +73,19 @@ public interface DruidDataSourceMBean extends DruidAbstractDataSourceMBean { ObjectName getObjectName(); void clearStatementCache() throws SQLException; - + long getDiscardCount(); - + void setStatLoggerClassName(String className); - + long getTimeBetweenLogStatsMillis(); - + void setTimeBetweenLogStatsMillis(long timeBetweenLogStatsMillis); - + void setConnectionProperties(String connectionProperties); - + int fill() throws SQLException; - + int fill(int toCount) throws SQLException; boolean isUseGlobalDataSourceStat(); diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLogger.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLogger.java index abdf9e4c09..9aecf766d3 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLogger.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLogger.java @@ -15,16 +15,15 @@ */ package com.alibaba.druid.pool; -import java.util.Properties; - import com.alibaba.druid.support.logging.Log; +import java.util.Properties; + /** * @author wenshao [szujobs@hotmail.com] * @since 0.2.19 */ public interface DruidDataSourceStatLogger { - void log(DruidDataSourceStatValue statValue); /** @@ -32,8 +31,8 @@ public interface DruidDataSourceStatLogger { * @since 0.2.21 */ void configFromProperties(Properties properties); - + void setLogger(Log logger); - + void setLoggerName(String loggerName); } diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerAdapter.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerAdapter.java index a6de75c88a..c8b8d06b7e 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerAdapter.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerAdapter.java @@ -15,35 +15,29 @@ */ package com.alibaba.druid.pool; -import java.util.Properties; - import com.alibaba.druid.support.logging.Log; +import java.util.Properties; + /** - * * @author wenshao [szujobs@hotmail.com] * @since 0.2.21 */ public class DruidDataSourceStatLoggerAdapter implements DruidDataSourceStatLogger { - @Override public void log(DruidDataSourceStatValue statValue) { - } @Override public void configFromProperties(Properties properties) { - } @Override public void setLogger(Log logger) { - } @Override public void setLoggerName(String loggerName) { - } } diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerImpl.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerImpl.java index 0c0b42e7d0..e2197a3d03 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerImpl.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerImpl.java @@ -15,29 +15,28 @@ */ package com.alibaba.druid.pool; -import static com.alibaba.druid.util.JdbcSqlStatUtils.rtrim; +import com.alibaba.druid.stat.JdbcSqlStatValue; +import com.alibaba.druid.support.json.JSONUtils; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.Map; import java.util.Properties; -import com.alibaba.druid.stat.JdbcSqlStatValue; -import com.alibaba.druid.support.json.JSONUtils; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; +import static com.alibaba.druid.util.JdbcSqlStatUtils.rtrim; /** * @author wenshao [szujobs@hotmail.com] * @since 0.2.19 */ public class DruidDataSourceStatLoggerImpl extends DruidDataSourceStatLoggerAdapter { + private static Log LOG = LogFactory.getLog(DruidDataSourceStatLoggerImpl.class); - private static Log LOG = LogFactory.getLog(DruidDataSourceStatLoggerImpl.class); - - private Log logger = LOG; + private Log logger = LOG; - public DruidDataSourceStatLoggerImpl(){ + public DruidDataSourceStatLoggerImpl() { this.configFromProperties(System.getProperties()); } diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatValue.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatValue.java index c7f8846dda..1d26a5aa0d 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatValue.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatValue.java @@ -15,137 +15,136 @@ */ package com.alibaba.druid.pool; -import java.util.Date; -import java.util.List; - import com.alibaba.druid.stat.JdbcSqlStatValue; import com.alibaba.druid.support.monitor.annotation.AggregateType; import com.alibaba.druid.support.monitor.annotation.MField; import com.alibaba.druid.support.monitor.annotation.MTable; +import java.util.Date; +import java.util.List; + @MTable(name = "druid_datasource") public class DruidDataSourceStatValue { - @MField(groupBy = true, aggregate = AggregateType.None) - protected String name; + protected String name; @MField(aggregate = AggregateType.None) - protected String dbType; + protected String dbType; @MField(aggregate = AggregateType.None) - protected String driverClassName; - - protected String url; - protected String userName; - protected List filterClassNames; - protected boolean removeAbandoned; - - protected int initialSize; - protected int minIdle; - protected int maxActive; - protected int queryTimeout; - protected int transactionQueryTimeout; - protected int loginTimeout; - protected String validConnectionCheckerClassName; - protected String exceptionSorterClassName; - protected boolean testOnBorrow; - protected boolean testOnReturn; - protected boolean testWhileIdle; - protected boolean defaultAutoCommit; - protected boolean defaultReadOnly; - protected Integer defaultTransactionIsolation; + protected String driverClassName; + + protected String url; + protected String userName; + protected List filterClassNames; + protected boolean removeAbandoned; + + protected int initialSize; + protected int minIdle; + protected int maxActive; + protected int queryTimeout; + protected int transactionQueryTimeout; + protected int loginTimeout; + protected String validConnectionCheckerClassName; + protected String exceptionSorterClassName; + protected boolean testOnBorrow; + protected boolean testOnReturn; + protected boolean testWhileIdle; + protected boolean defaultAutoCommit; + protected boolean defaultReadOnly; + protected Integer defaultTransactionIsolation; @MField(aggregate = AggregateType.Last) - protected int activeCount; + protected int activeCount; @MField(aggregate = AggregateType.Max) - protected int activePeak; + protected int activePeak; @MField(aggregate = AggregateType.Max) - protected long activePeakTime; + protected long activePeakTime; @MField(aggregate = AggregateType.Last) - protected int poolingCount; + protected int poolingCount; @MField(aggregate = AggregateType.Max) - protected int poolingPeak; + protected int poolingPeak; @MField(aggregate = AggregateType.Max) - protected long poolingPeakTime; + protected long poolingPeakTime; @MField(aggregate = AggregateType.Sum) - protected long connectCount; + protected long connectCount; @MField(aggregate = AggregateType.Sum) - protected long closeCount; + protected long closeCount; @MField(aggregate = AggregateType.Sum) - protected long waitThreadCount; + protected long waitThreadCount; @MField(aggregate = AggregateType.Sum) - protected long notEmptyWaitCount; + protected long notEmptyWaitCount; @MField(aggregate = AggregateType.Sum) - protected long notEmptyWaitNanos; + protected long notEmptyWaitNanos; @MField(aggregate = AggregateType.Sum) - protected long logicConnectErrorCount; + protected long logicConnectErrorCount; @MField(aggregate = AggregateType.Sum) - protected long physicalConnectCount; + protected long physicalConnectCount; @MField(aggregate = AggregateType.Sum) - protected long physicalCloseCount; + protected long physicalCloseCount; @MField(aggregate = AggregateType.Sum) - protected long physicalConnectErrorCount; + protected long physicalConnectErrorCount; @MField(aggregate = AggregateType.Sum) - protected long executeCount; + protected long executeCount; @MField(aggregate = AggregateType.Sum) - protected long errorCount; + protected long errorCount; @MField(aggregate = AggregateType.Sum) - protected long commitCount; + protected long commitCount; @MField(aggregate = AggregateType.Sum) - protected long rollbackCount; + protected long rollbackCount; @MField(aggregate = AggregateType.Sum) - protected long pstmtCacheHitCount; + protected long pstmtCacheHitCount; @MField(aggregate = AggregateType.Sum) - protected long pstmtCacheMissCount; + protected long pstmtCacheMissCount; @MField(aggregate = AggregateType.Sum) - protected long startTransactionCount; + protected long startTransactionCount; @MField(aggregate = AggregateType.Sum) - protected long keepAliveCheckCount; + protected long keepAliveCheckCount; // protected long[] transactionHistogram; - protected long[] connectionHoldTimeHistogram; + protected long[] connectionHoldTimeHistogram; @MField(aggregate = AggregateType.Sum) - protected long txn_0_1; + protected long txn_0_1; @MField(aggregate = AggregateType.Sum) - protected long txn_1_10; + protected long txn_1_10; @MField(aggregate = AggregateType.Sum) - protected long txn_10_100; + protected long txn_10_100; @MField(aggregate = AggregateType.Sum) - protected long txn_100_1000; + protected long txn_100_1000; @MField(aggregate = AggregateType.Sum) - protected long txn_1000_10000; + protected long txn_1000_10000; @MField(aggregate = AggregateType.Sum) - protected long txn_10000_100000; + protected long txn_10000_100000; @MField(aggregate = AggregateType.Sum) - protected long txn_more; + protected long txn_more; @MField(aggregate = AggregateType.Sum) - protected long clobOpenCount; + protected long clobOpenCount; @MField(aggregate = AggregateType.Sum) - protected long blobOpenCount; + protected long blobOpenCount; @MField(aggregate = AggregateType.Sum) - protected long sqlSkipCount; + protected long sqlSkipCount; protected List sqlList; @@ -506,12 +505,13 @@ public void setStartTransactionCount(long startTransactionCount) { } public long[] getTransactionHistogram() { - return new long[] { txn_0_1,// txn_0_1 + return new long[]{ + txn_0_1, // txn_0_1 txn_1_10, - txn_10_100, // - txn_100_1000, // - txn_1000_10000, // - txn_10000_100000, // + txn_10_100, + txn_100_1000, + txn_1000_10000, + txn_10000_100000, txn_more, // }; } diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java index 1615a39b2f..c861b66f78 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledCallableStatement.java @@ -15,32 +15,22 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; + import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; -import java.sql.Array; -import java.sql.Blob; -import java.sql.CallableStatement; -import java.sql.Clob; -import java.sql.NClob; -import java.sql.PreparedStatement; -import java.sql.Ref; -import java.sql.ResultSet; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLXML; +import java.sql.*; import java.util.Calendar; -import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; - /** * @author wenshao [szujobs@hotmail.com] */ public class DruidPooledCallableStatement extends DruidPooledPreparedStatement implements CallableStatement { - private CallableStatement stmt; - public DruidPooledCallableStatement(DruidPooledConnection conn, PreparedStatementHolder holder) throws SQLException{ + public DruidPooledCallableStatement(DruidPooledConnection conn, + PreparedStatementHolder holder) throws SQLException { super(conn, holder); this.stmt = (CallableStatement) holder.statement; } @@ -207,13 +197,13 @@ public Object getObject(int parameterIndex) throws SQLException { private Object wrapObject(Object obj) { if (obj instanceof ResultSet) { ResultSet rs = (ResultSet) obj; - + DruidPooledResultSet poolableResultSet = new DruidPooledResultSet(this, rs); addResultSetTrace(poolableResultSet); - + obj = poolableResultSet; } - + return obj; } @@ -444,7 +434,7 @@ public void setString(String parameterName, String x) throws SQLException { } @Override - public void setBytes(String parameterName, byte x[]) throws SQLException { + public void setBytes(String parameterName, byte[] x) throws SQLException { try { stmt.setBytes(parameterName, x); } catch (Throwable t) { @@ -1082,7 +1072,7 @@ public T unwrap(Class iface) throws SQLException { } return (T) stmt; } - + return super.unwrap(iface); } } diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java index 35f4db3fc9..e1352de09c 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java @@ -15,33 +15,6 @@ */ package com.alibaba.druid.pool; -import java.sql.Array; -import java.sql.Blob; -import java.sql.CallableStatement; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.NClob; -import java.sql.PreparedStatement; -import java.sql.SQLClientInfoException; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.SQLWarning; -import java.sql.SQLXML; -import java.sql.Savepoint; -import java.sql.Statement; -import java.sql.Struct; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.Executor; -import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; -import java.util.concurrent.locks.ReentrantLock; - -import javax.sql.ConnectionEvent; -import javax.sql.ConnectionEventListener; -import javax.sql.StatementEventListener; - import com.alibaba.druid.filter.Filter; import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey; @@ -51,31 +24,43 @@ import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.JdbcUtils; +import javax.sql.ConnectionEvent; +import javax.sql.ConnectionEventListener; +import javax.sql.StatementEventListener; + +import java.sql.*; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.Executor; +import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; +import java.util.concurrent.locks.ReentrantLock; + /** * @author wenshao [szujobs@hotmail.com] */ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.PooledConnection, Connection { - private final static Log LOG = LogFactory.getLog(DruidPooledConnection.class); - public static final int MAX_RECORD_SQL_COUNT = 10; - protected Connection conn; - protected volatile DruidConnectionHolder holder; - protected TransactionInfo transactionInfo; - private final boolean dupCloseLogEnable; - protected volatile boolean traceEnable = false; - private volatile boolean disable = false; - protected volatile boolean closed = false; + private static final Log LOG = LogFactory.getLog(DruidPooledConnection.class); + public static final int MAX_RECORD_SQL_COUNT = 10; + protected Connection conn; + protected volatile DruidConnectionHolder holder; + protected TransactionInfo transactionInfo; + private final boolean dupCloseLogEnable; + protected volatile boolean traceEnable; + private volatile boolean disable; + protected volatile boolean closed; static AtomicIntegerFieldUpdater CLOSING_UPDATER = AtomicIntegerFieldUpdater.newUpdater(DruidPooledConnection.class, "closing"); - protected final Thread ownerThread; - private long connectedTimeMillis; - private long connectedTimeNano; - private volatile boolean running = false; - private volatile boolean abandoned = false; - protected StackTraceElement[] connectStackTrace; - protected Throwable disableError = null; - final ReentrantLock lock; - protected volatile int closing = 0; - - public DruidPooledConnection(DruidConnectionHolder holder){ + protected final Thread ownerThread; + private long connectedTimeMillis; + private long connectedTimeNano; + private volatile boolean running; + private volatile boolean abandoned; + protected StackTraceElement[] connectStackTrace; + protected Throwable disableError; + final ReentrantLock lock; + protected volatile int closing; + + public DruidPooledConnection(DruidConnectionHolder holder) { super(holder.getConnection()); this.conn = holder.getConnection(); @@ -397,12 +382,12 @@ private void initStatement(PreparedStatementHolder stmtHolder) throws SQLExcepti @Override public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { checkState(); PreparedStatementHolder stmtHolder = null; PreparedStatementKey key = new PreparedStatementKey(sql, getCatalog(), MethodType.M2, resultSetType, - resultSetConcurrency); + resultSetConcurrency); boolean poolPreparedStatements = holder.isPoolPreparedStatements(); @@ -413,7 +398,7 @@ public PreparedStatement prepareStatement(String sql, int resultSetType, int res if (stmtHolder == null) { try { stmtHolder = new PreparedStatementHolder(key, conn.prepareStatement(sql, resultSetType, - resultSetConcurrency)); + resultSetConcurrency)); holder.getDataSource().incrementPreparedStatementCount(); } catch (SQLException ex) { handleException(ex, sql); @@ -436,7 +421,7 @@ public PreparedStatement prepareStatement(String sql, int resultSetType, int res PreparedStatementHolder stmtHolder = null; PreparedStatementKey key = new PreparedStatementKey(sql, getCatalog(), MethodType.M3, resultSetType, - resultSetConcurrency, resultSetHoldability); + resultSetConcurrency, resultSetHoldability); boolean poolPreparedStatements = holder.isPoolPreparedStatements(); @@ -447,8 +432,8 @@ public PreparedStatement prepareStatement(String sql, int resultSetType, int res if (stmtHolder == null) { try { stmtHolder = new PreparedStatementHolder(key, conn.prepareStatement(sql, resultSetType, - resultSetConcurrency, - resultSetHoldability)); + resultSetConcurrency, + resultSetHoldability)); holder.getDataSource().incrementPreparedStatementCount(); } catch (SQLException ex) { handleException(ex, sql); @@ -597,7 +582,7 @@ public CallableStatement prepareCall(String sql, int resultSetType, int resultSe PreparedStatementHolder stmtHolder = null; PreparedStatementKey key = new PreparedStatementKey(sql, getCatalog(), MethodType.Precall_2, resultSetType, - resultSetConcurrency, resultSetHoldability); + resultSetConcurrency, resultSetHoldability); boolean poolPreparedStatements = holder.isPoolPreparedStatements(); @@ -608,8 +593,8 @@ public CallableStatement prepareCall(String sql, int resultSetType, int resultSe if (stmtHolder == null) { try { stmtHolder = new PreparedStatementHolder(key, conn.prepareCall(sql, resultSetType, - resultSetConcurrency, - resultSetHoldability)); + resultSetConcurrency, + resultSetHoldability)); holder.getDataSource().incrementPreparedStatementCount(); } catch (SQLException ex) { handleException(ex, sql); @@ -631,7 +616,7 @@ public CallableStatement prepareCall(String sql, int resultSetType, int resultSe PreparedStatementHolder stmtHolder = null; PreparedStatementKey key = new PreparedStatementKey(sql, getCatalog(), MethodType.Precall_3, resultSetType, - resultSetConcurrency); + resultSetConcurrency); boolean poolPreparedStatements = holder.isPoolPreparedStatements(); @@ -642,7 +627,7 @@ public CallableStatement prepareCall(String sql, int resultSetType, int resultSe if (stmtHolder == null) { try { stmtHolder = new PreparedStatementHolder(key, - conn.prepareCall(sql, resultSetType, resultSetConcurrency)); + conn.prepareCall(sql, resultSetType, resultSetConcurrency)); holder.getDataSource().incrementPreparedStatementCount(); } catch (SQLException ex) { handleException(ex, sql); @@ -680,7 +665,7 @@ public Statement createStatement() throws SQLException { @Override public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) - throws SQLException { + throws SQLException { checkState(); Statement stmt = null; @@ -1295,14 +1280,14 @@ public long getConnectNotEmptyWaitNanos() { } /** - * @since 1.0.28 + * @since 1.0.28 */ public Map getVariables() { return this.holder.variables; } /** - * @since 1.0.28 + * @since 1.0.28 */ public Map getGloablVariables() { return this.holder.globleVariables; diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java index 910fa4317b..1d75a9c382 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java @@ -15,58 +15,44 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.pool.PreparedStatementPool.MethodType; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import com.alibaba.druid.util.OracleUtils; + import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; import java.net.URL; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Date; -import java.sql.NClob; -import java.sql.ParameterMetaData; -import java.sql.PreparedStatement; -import java.sql.Ref; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLXML; -import java.sql.Time; -import java.sql.Timestamp; +import java.sql.*; import java.util.Arrays; import java.util.Calendar; -import com.alibaba.druid.pool.PreparedStatementPool.MethodType; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.OracleUtils; - /** * @author wenshao [szujobs@hotmail.com] */ public class DruidPooledPreparedStatement extends DruidPooledStatement implements PreparedStatement { - - private final static Log LOG = LogFactory.getLog(DruidPooledPreparedStatement.class); + private static final Log LOG = LogFactory.getLog(DruidPooledPreparedStatement.class); private final PreparedStatementHolder holder; - private final PreparedStatement stmt; - private final String sql; - - private int defaultMaxFieldSize; - private int defaultMaxRows; - private int defaultQueryTimeout; - private int defaultFetchDirection; - private int defaultFetchSize; - private int currentMaxFieldSize; - private int currentMaxRows; - private int currentQueryTimeout; - private int currentFetchDirection; - private int currentFetchSize; - - private boolean pooled = false; - - public DruidPooledPreparedStatement(DruidPooledConnection conn, PreparedStatementHolder holder) throws SQLException{ + private final PreparedStatement stmt; + private final String sql; + + private int defaultMaxFieldSize; + private int defaultMaxRows; + private int defaultQueryTimeout; + private int defaultFetchDirection; + private int defaultFetchSize; + private int currentMaxFieldSize; + private int currentMaxRows; + private int currentQueryTimeout; + private int currentFetchDirection; + private int currentFetchSize; + + private boolean pooled; + + public DruidPooledPreparedStatement(DruidPooledConnection conn, + PreparedStatementHolder holder) throws SQLException { super(conn, holder.statement); this.stmt = holder.statement; this.holder = holder; @@ -200,7 +186,7 @@ public void close() throws SQLException { conn.closePoolableStatement(this); } - + public boolean isPooled() { return pooled; } @@ -922,51 +908,50 @@ public void setNClob(int parameterIndex, Reader reader) throws SQLException { } public static class PreparedStatementKey { - - protected final String sql; - protected final String catalog; + protected final String sql; + protected final String catalog; protected final MethodType methodType; - public final int resultSetType; - public final int resultSetConcurrency; - public final int resultSetHoldability; - public final int autoGeneratedKeys; - private final int[] columnIndexes; - private final String[] columnNames; + public final int resultSetType; + public final int resultSetConcurrency; + public final int resultSetHoldability; + public final int autoGeneratedKeys; + private final int[] columnIndexes; + private final String[] columnNames; - public PreparedStatementKey(String sql, String catalog, MethodType methodType) throws SQLException{ + public PreparedStatementKey(String sql, String catalog, MethodType methodType) throws SQLException { this(sql, catalog, methodType, 0, 0, 0, 0, null, null); } public PreparedStatementKey(String sql, String catalog, MethodType methodType, int resultSetType, - int resultSetConcurrency) throws SQLException{ + int resultSetConcurrency) throws SQLException { this(sql, catalog, methodType, resultSetType, resultSetConcurrency, 0, 0, null, null); } public PreparedStatementKey(String sql, String catalog, MethodType methodType, int resultSetType, - int resultSetConcurrency, int resultSetHoldability) throws SQLException{ + int resultSetConcurrency, int resultSetHoldability) throws SQLException { this(sql, catalog, methodType, resultSetType, resultSetConcurrency, resultSetHoldability, 0, null, null); } public PreparedStatementKey(String sql, String catalog, MethodType methodType, int autoGeneratedKeys) - throws SQLException{ + throws SQLException { this(sql, catalog, methodType, 0, 0, 0, autoGeneratedKeys, null, null); } public PreparedStatementKey(String sql, String catalog, MethodType methodType, int[] columnIndexes) - throws SQLException{ + throws SQLException { this(sql, catalog, methodType, 0, 0, 0, 0, columnIndexes, null); } public PreparedStatementKey(String sql, String catalog, MethodType methodType, String[] columnNames) - throws SQLException{ + throws SQLException { this(sql, catalog, methodType, 0, 0, 0, 0, null, columnNames); } public PreparedStatementKey(String sql, String catalog, MethodType methodType, int resultSetType, int resultSetConcurrency, int resultSetHoldability, int autoGeneratedKeys, - int[] columnIndexes, String[] columnNames) throws SQLException{ + int[] columnIndexes, String[] columnNames) throws SQLException { if (sql == null) { throw new SQLException("sql is null"); } diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledResultSet.java b/src/main/java/com/alibaba/druid/pool/DruidPooledResultSet.java index c30895be8e..f665d498bc 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledResultSet.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledResultSet.java @@ -18,33 +18,21 @@ import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.NClob; -import java.sql.Ref; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.SQLXML; -import java.sql.Statement; +import java.sql.*; import java.util.Calendar; /** * @author wenshao [szujobs@hotmail.com] */ public final class DruidPooledResultSet extends PoolableWrapper implements ResultSet { - - private final ResultSet rs; + private final ResultSet rs; private final DruidPooledStatement stmt; - protected boolean closed = false; + protected boolean closed; - protected int cursorIndex = 0; - protected int fetchRowCount = 0; + protected int cursorIndex; + protected int fetchRowCount; - public DruidPooledResultSet(DruidPooledStatement stmt, ResultSet rs){ + public DruidPooledResultSet(DruidPooledStatement stmt, ResultSet rs) { super(rs); this.stmt = stmt; this.rs = rs; @@ -84,13 +72,13 @@ public void close() throws SQLException { try { this.closed = true; rs.close(); - + stmt.recordFetchRowCount(fetchRowCount); } catch (Throwable t) { throw checkException(t); } } - + public int getFetchRowCount() { return fetchRowCount; } @@ -781,7 +769,7 @@ public void updateString(int columnIndex, String x) throws SQLException { } @Override - public void updateBytes(int columnIndex, byte x[]) throws SQLException { + public void updateBytes(int columnIndex, byte[] x) throws SQLException { try { rs.updateBytes(columnIndex, x); } catch (Throwable t) { @@ -952,7 +940,7 @@ public void updateString(String columnLabel, String x) throws SQLException { } @Override - public void updateBytes(String columnLabel, byte x[]) throws SQLException { + public void updateBytes(String columnLabel, byte[] x) throws SQLException { try { rs.updateBytes(columnLabel, x); } catch (Throwable t) { diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java index 4864cd546b..a06fe7d834 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java @@ -15,37 +15,31 @@ */ package com.alibaba.druid.pool; -import java.net.SocketTimeoutException; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.List; - -import com.alibaba.druid.DbType; import com.alibaba.druid.VERSION; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.MySqlUtils; +import java.net.SocketTimeoutException; +import java.sql.*; +import java.util.ArrayList; +import java.util.List; + /** * @author wenshao [szujobs@hotmail.com] */ public class DruidPooledStatement extends PoolableWrapper implements Statement { + private static final Log LOG = LogFactory.getLog(DruidPooledStatement.class); - private final static Log LOG = LogFactory.getLog(DruidPooledStatement.class); - - private final Statement stmt; + private final Statement stmt; protected DruidPooledConnection conn; - protected List resultSetTrace; - protected boolean closed = false; - protected int fetchRowPeak = -1; - protected int exceptionCount = 0; + protected List resultSetTrace; + protected boolean closed; + protected int fetchRowPeak = -1; + protected int exceptionCount; - public DruidPooledStatement(DruidPooledConnection conn, Statement stmt){ + public DruidPooledStatement(DruidPooledConnection conn, Statement stmt) { super(stmt); this.conn = conn; @@ -130,7 +124,6 @@ protected void handleSocketTimeout(Throwable error) throws SQLException { return; } - Throwable cause = error.getCause(); boolean socketReadTimeout = cause instanceof SocketTimeoutException && "Read timed out".equals(cause.getMessage()); @@ -151,7 +144,6 @@ protected void handleSocketTimeout(Throwable error) throws SQLException { DruidPooledConnection killQueryConn = null; Statement killQueryStmt = null; - try { killQueryConn = dataSource.getConnection(1000); if (killQueryConn == null) { @@ -347,8 +339,7 @@ protected final void errorCheck(Throwable t) { String errorClassName = t.getClass().getName(); if (errorClassName.endsWith(".CommunicationsException") && conn.holder != null - && conn.holder.dataSource.testWhileIdle) - { + && conn.holder.dataSource.testWhileIdle) { DruidConnectionHolder holder = conn.holder; DruidAbstractDataSource dataSource = holder.dataSource; @@ -400,7 +391,7 @@ public final int executeUpdate(String sql, int autoGeneratedKeys) throws SQLExce } @Override - public final int executeUpdate(String sql, int columnIndexes[]) throws SQLException { + public final int executeUpdate(String sql, int[] columnIndexes) throws SQLException { checkOpen(); incrementExecuteUpdateCount(); @@ -419,7 +410,7 @@ public final int executeUpdate(String sql, int columnIndexes[]) throws SQLExcept } @Override - public final int executeUpdate(String sql, String columnNames[]) throws SQLException { + public final int executeUpdate(String sql, String[] columnNames) throws SQLException { checkOpen(); incrementExecuteUpdateCount(); @@ -457,7 +448,7 @@ public final boolean execute(String sql, int autoGeneratedKeys) throws SQLExcept } @Override - public final boolean execute(String sql, int columnIndexes[]) throws SQLException { + public final boolean execute(String sql, int[] columnIndexes) throws SQLException { checkOpen(); incrementExecuteCount(); @@ -476,7 +467,7 @@ public final boolean execute(String sql, int columnIndexes[]) throws SQLExceptio } @Override - public final boolean execute(String sql, String columnNames[]) throws SQLException { + public final boolean execute(String sql, String[] columnNames) throws SQLException { checkOpen(); incrementExecuteCount(); diff --git a/src/main/java/com/alibaba/druid/pool/ExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/ExceptionSorter.java index 84d0665768..0c10265cda 100644 --- a/src/main/java/com/alibaba/druid/pool/ExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/ExceptionSorter.java @@ -22,14 +22,13 @@ * An interface to allow for exception evaluation. */ public interface ExceptionSorter { - /** * Returns true or false whether or not the exception is fatal. - * + * * @param e the exception * @return true or false if the exception is fatal. */ boolean isExceptionFatal(SQLException e); - + void configFromProperties(Properties properties); } diff --git a/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java b/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java index 4fd6afd101..42a85311cd 100644 --- a/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java +++ b/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java @@ -18,14 +18,13 @@ import java.sql.SQLException; public class GetConnectionTimeoutException extends SQLException { - private static final long serialVersionUID = 1L; - public GetConnectionTimeoutException(String reason){ + public GetConnectionTimeoutException(String reason) { super(reason); } - public GetConnectionTimeoutException(String message, Throwable cause){ + public GetConnectionTimeoutException(String message, Throwable cause) { super(message, cause); } diff --git a/src/main/java/com/alibaba/druid/pool/ManagedDataSource.java b/src/main/java/com/alibaba/druid/pool/ManagedDataSource.java index 19a1f42fd2..c09c64406d 100644 --- a/src/main/java/com/alibaba/druid/pool/ManagedDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ManagedDataSource.java @@ -19,7 +19,6 @@ import javax.sql.DataSource; public interface ManagedDataSource extends DataSource { - boolean isEnable(); void setEnable(boolean value); diff --git a/src/main/java/com/alibaba/druid/pool/PoolableWrapper.java b/src/main/java/com/alibaba/druid/pool/PoolableWrapper.java index 8a21089213..986d79efd2 100644 --- a/src/main/java/com/alibaba/druid/pool/PoolableWrapper.java +++ b/src/main/java/com/alibaba/druid/pool/PoolableWrapper.java @@ -15,25 +15,23 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.proxy.jdbc.WrapperProxy; + import java.sql.SQLException; import java.sql.Wrapper; -import com.alibaba.druid.proxy.jdbc.WrapperProxy; - /** * @author wenshao [szujobs@hotmail.com] */ public class PoolableWrapper implements Wrapper { - private final Wrapper wrapper; - public PoolableWrapper(Wrapper wraaper){ + public PoolableWrapper(Wrapper wraaper) { this.wrapper = wraaper; } @Override public boolean isWrapperFor(Class iface) throws SQLException { - if (null == wrapper) { //Best to log error. return false; @@ -50,7 +48,7 @@ public boolean isWrapperFor(Class iface) throws SQLException { if (iface == this.getClass()) { return true; } - + if (!(wrapper instanceof WrapperProxy)) { if (iface.isInstance(wrapper)) { return true; @@ -63,7 +61,6 @@ public boolean isWrapperFor(Class iface) throws SQLException { @SuppressWarnings("unchecked") @Override public T unwrap(Class iface) throws SQLException { - if (null == wrapper) { //Best to log error. return null; @@ -80,14 +77,13 @@ public T unwrap(Class iface) throws SQLException { if (iface == this.getClass()) { return (T) this; } - + if (!(wrapper instanceof WrapperProxy)) { if (iface.isInstance(wrapper)) { return (T) wrapper; } } - return wrapper.unwrap(iface); } diff --git a/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java b/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java index c49bc7e11c..ae3482c8c7 100644 --- a/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java +++ b/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java @@ -15,30 +15,29 @@ */ package com.alibaba.druid.pool; -import java.sql.PreparedStatement; - import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey; +import java.sql.PreparedStatement; + /** * @author wenshao [szujobs@hotmail.com] */ public final class PreparedStatementHolder { - public final PreparedStatementKey key; - public final PreparedStatement statement; - private int hitCount = 0; + public final PreparedStatement statement; + private int hitCount; - private int fetchRowPeak = -1; + private int fetchRowPeak = -1; - private int defaultRowPrefetch = -1; - private int rowPrefetch = -1; + private int defaultRowPrefetch = -1; + private int rowPrefetch = -1; - private boolean enterOracleImplicitCache = false; + private boolean enterOracleImplicitCache; - private int inUseCount = 0; - private boolean pooling = false; + private int inUseCount; + private boolean pooling; - public PreparedStatementHolder(PreparedStatementKey key, PreparedStatement stmt){ + public PreparedStatementHolder(PreparedStatementKey key, PreparedStatement stmt) { this.key = key; this.statement = stmt; } diff --git a/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java b/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java index a25c38c436..325bc155c3 100644 --- a/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java +++ b/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java @@ -15,13 +15,6 @@ */ package com.alibaba.druid.pool; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Map.Entry; - import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey; import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; @@ -29,17 +22,23 @@ import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.OracleUtils; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Map.Entry; + /** * @author wenshao [szujobs@hotmail.com] */ public class PreparedStatementPool { + private static final Log LOG = LogFactory.getLog(PreparedStatementPool.class); - private final static Log LOG = LogFactory.getLog(PreparedStatementPool.class); - - private final LRUCache map; + private final LRUCache map; private final DruidAbstractDataSource dataSource; - public PreparedStatementPool(DruidConnectionHolder holder){ + public PreparedStatementPool(DruidConnectionHolder holder) { this.dataSource = holder.getDataSource(); int initCapacity = holder.getDataSource().getMaxPoolPreparedStatementPerConnectionSize(); if (initCapacity <= 0) { @@ -117,10 +116,10 @@ public void put(PreparedStatementHolder stmtHolder) throws SQLException { PreparedStatementProxy stmtProxy = (PreparedStatementProxy) stmtHolder.statement; if (stmtProxy instanceof CallableStatementProxy) { message = "{conn-" + stmtProxy.getConnectionProxy().getId() + ", cstmt-" + stmtProxy.getId() - + "} enter cache"; + + "} enter cache"; } else { message = "{conn-" + stmtProxy.getConnectionProxy().getId() + ", pstmt-" + stmtProxy.getId() - + "} enter cache"; + + "} enter cache"; } } else { message = "stmt enter cache"; @@ -148,10 +147,10 @@ public void closeRemovedStatement(PreparedStatementHolder holder) { PreparedStatementProxy stmtProxy = (PreparedStatementProxy) holder.statement; if (stmtProxy instanceof CallableStatementProxy) { message = "{conn-" + stmtProxy.getConnectionProxy().getId() + ", cstmt-" + stmtProxy.getId() - + "} exit cache"; + + "} exit cache"; } else { message = "{conn-" + stmtProxy.getConnectionProxy().getId() + ", pstmt-" + stmtProxy.getId() - + "} exit cache"; + + "} exit cache"; } } else { message = "stmt exit cache"; @@ -184,10 +183,9 @@ public int size() { } public class LRUCache extends LinkedHashMap { - private static final long serialVersionUID = 1L; - public LRUCache(int maxSize){ + public LRUCache(int maxSize) { super(maxSize, 0.75f, true); } diff --git a/src/main/java/com/alibaba/druid/pool/ValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/ValidConnectionChecker.java index 334f72a3d5..3083132e61 100644 --- a/src/main/java/com/alibaba/druid/pool/ValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/ValidConnectionChecker.java @@ -19,9 +19,8 @@ import java.util.Properties; public interface ValidConnectionChecker { - boolean isValidConnection(Connection c, String query, int validationQueryTimeout) throws Exception; - + /** * @param properties * @since 0.2.21 diff --git a/src/main/java/com/alibaba/druid/pool/ValidConnectionCheckerAdapter.java b/src/main/java/com/alibaba/druid/pool/ValidConnectionCheckerAdapter.java index 87e22bb761..8ba3cb37a4 100644 --- a/src/main/java/com/alibaba/druid/pool/ValidConnectionCheckerAdapter.java +++ b/src/main/java/com/alibaba/druid/pool/ValidConnectionCheckerAdapter.java @@ -15,25 +15,24 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.util.JdbcUtils; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; import java.util.Properties; -import com.alibaba.druid.util.JdbcUtils; - /** * @author wenshao [szujobs@hotmail.com] * @since 0.2.21 */ public class ValidConnectionCheckerAdapter implements ValidConnectionChecker { - @Override public boolean isValidConnection(Connection conn, String query, int validationQueryTimeout) throws Exception { if (query == null || query.length() == 0) { return true; } - + Statement stmt = null; ResultSet rs = null; try { @@ -51,8 +50,6 @@ public boolean isValidConnection(Connection conn, String query, int validationQu @Override public void configFromProperties(Properties properties) { - } - } diff --git a/src/main/java/com/alibaba/druid/pool/WrapperAdapter.java b/src/main/java/com/alibaba/druid/pool/WrapperAdapter.java index 41d2212d1e..d589505d6a 100644 --- a/src/main/java/com/alibaba/druid/pool/WrapperAdapter.java +++ b/src/main/java/com/alibaba/druid/pool/WrapperAdapter.java @@ -18,8 +18,7 @@ import java.sql.Wrapper; public class WrapperAdapter implements Wrapper { - - public WrapperAdapter(){ + public WrapperAdapter() { } @Override diff --git a/src/main/java/com/alibaba/druid/pool/ha/DataSourceCreator.java b/src/main/java/com/alibaba/druid/pool/ha/DataSourceCreator.java index ea9b9b3203..828eb71161 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/DataSourceCreator.java +++ b/src/main/java/com/alibaba/druid/pool/ha/DataSourceCreator.java @@ -15,17 +15,16 @@ */ package com.alibaba.druid.pool.ha; -import java.sql.SQLException; - import com.alibaba.druid.pool.DruidDataSource; +import java.sql.SQLException; + /** * An utility class to create DruidDataSource dynamically. * * @author DigitalSonic */ public class DataSourceCreator { - public static DruidDataSource create(String name, String url, String username, String password, HighAvailableDataSource haDataSource) throws SQLException { DruidDataSource dataSource = new DruidDataSource(); diff --git a/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java b/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java index 52db11f29c..e05e54427e 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java @@ -15,6 +15,21 @@ */ package com.alibaba.druid.pool.ha; +import com.alibaba.druid.filter.Filter; +import com.alibaba.druid.pool.DruidAbstractDataSource; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.WrapperAdapter; +import com.alibaba.druid.pool.ha.node.FileNodeListener; +import com.alibaba.druid.pool.ha.node.NodeListener; +import com.alibaba.druid.pool.ha.node.PoolUpdater; +import com.alibaba.druid.pool.ha.selector.DataSourceSelector; +import com.alibaba.druid.pool.ha.selector.DataSourceSelectorEnum; +import com.alibaba.druid.pool.ha.selector.DataSourceSelectorFactory; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; + +import javax.sql.DataSource; + import java.io.PrintWriter; import java.sql.Connection; import java.sql.DriverManager; @@ -29,34 +44,19 @@ import java.util.concurrent.CopyOnWriteArraySet; import java.util.logging.Logger; -import javax.sql.DataSource; - -import com.alibaba.druid.filter.Filter; -import com.alibaba.druid.pool.DruidAbstractDataSource; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.WrapperAdapter; -import com.alibaba.druid.pool.ha.node.FileNodeListener; -import com.alibaba.druid.pool.ha.node.NodeListener; -import com.alibaba.druid.pool.ha.node.PoolUpdater; -import com.alibaba.druid.pool.ha.selector.DataSourceSelector; -import com.alibaba.druid.pool.ha.selector.DataSourceSelectorEnum; -import com.alibaba.druid.pool.ha.selector.DataSourceSelectorFactory; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; - /** * DataSource class which contains multiple DataSource objects. * * @author DigitalSonic */ public class HighAvailableDataSource extends WrapperAdapter implements DataSource { - private final static Log LOG = LogFactory.getLog(HighAvailableDataSource.class); - private final static String DEFAULT_DATA_SOURCE_FILE = "ha-datasource.properties"; + private static final Log LOG = LogFactory.getLog(HighAvailableDataSource.class); + private static final String DEFAULT_DATA_SOURCE_FILE = "ha-datasource.properties"; // Properties copied from DruidAbstractDataSource BEGIN private String driverClassName; private Properties connectProperties = new Properties(); - private String connectionProperties = null; + private String connectionProperties; private int initialSize = DruidAbstractDataSource.DEFAULT_INITIAL_SIZE; private int maxActive = DruidAbstractDataSource.DEFAULT_MAX_ACTIVE_SIZE; @@ -69,8 +69,8 @@ public class HighAvailableDataSource extends WrapperAdapter implements DataSourc private boolean testOnReturn = DruidAbstractDataSource.DEFAULT_TEST_ON_RETURN; private boolean testWhileIdle = DruidAbstractDataSource.DEFAULT_WHILE_IDLE; - private boolean poolPreparedStatements = false; - private boolean sharePreparedStatements = false; + private boolean poolPreparedStatements; + private boolean sharePreparedStatements; private int maxPoolPreparedStatementPerConnectionSize = 10; private int queryTimeout; @@ -97,9 +97,9 @@ public class HighAvailableDataSource extends WrapperAdapter implements DataSourc private String dataSourceFile = DEFAULT_DATA_SOURCE_FILE; private String propertyPrefix = ""; private int poolPurgeIntervalSeconds = PoolUpdater.DEFAULT_INTERVAL; - private boolean allowEmptyPoolWhenUpdate = false; + private boolean allowEmptyPoolWhenUpdate; - private volatile boolean inited = false; + private volatile boolean inited; private PoolUpdater poolUpdater = new PoolUpdater(this); private NodeListener nodeListener; diff --git a/src/main/java/com/alibaba/druid/pool/ha/PropertiesUtils.java b/src/main/java/com/alibaba/druid/pool/ha/PropertiesUtils.java index 06ad20928e..6bd36bdb91 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/PropertiesUtils.java +++ b/src/main/java/com/alibaba/druid/pool/ha/PropertiesUtils.java @@ -17,16 +17,11 @@ import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.StringUtils; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Properties; -import java.util.Set; +import java.util.*; /** * Utilities for Properties. @@ -34,7 +29,7 @@ * @author DigitalSonic */ public class PropertiesUtils { - private final static Log LOG = LogFactory.getLog(PropertiesUtils.class); + private static final Log LOG = LogFactory.getLog(PropertiesUtils.class); /** * Load properties from the given file into Properties. @@ -49,7 +44,7 @@ public static Properties loadProperties(String file) { try { LOG.debug("Trying to load " + file + " from FileSystem."); is = new FileInputStream(file); - } catch(FileNotFoundException e) { + } catch (FileNotFoundException e) { LOG.debug("Trying to load " + file + " from Classpath."); try { is = PropertiesUtils.class.getResourceAsStream(file); @@ -60,7 +55,7 @@ public static Properties loadProperties(String file) { if (is != null) { try { properties.load(is); - } catch(Exception e) { + } catch (Exception e) { LOG.error("Exception occurred while loading " + file, e); } finally { if (is != null) { diff --git a/src/main/java/com/alibaba/druid/pool/ha/node/FileNodeListener.java b/src/main/java/com/alibaba/druid/pool/ha/node/FileNodeListener.java index 957d066196..06d47f770d 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/node/FileNodeListener.java +++ b/src/main/java/com/alibaba/druid/pool/ha/node/FileNodeListener.java @@ -33,10 +33,10 @@ * @author DigitalSonic */ public class FileNodeListener extends NodeListener { - private final static Log LOG = LogFactory.getLog(FileNodeListener.class); + private static final Log LOG = LogFactory.getLog(FileNodeListener.class); private Lock lock = new ReentrantLock(); - private String file = null; + private String file; private int intervalSeconds = 60; private ScheduledExecutorService executor; diff --git a/src/main/java/com/alibaba/druid/pool/ha/node/NodeListener.java b/src/main/java/com/alibaba/druid/pool/ha/node/NodeListener.java index 8fd6aef664..fa524621d4 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/node/NodeListener.java +++ b/src/main/java/com/alibaba/druid/pool/ha/node/NodeListener.java @@ -19,11 +19,7 @@ import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; -import java.util.Date; -import java.util.List; -import java.util.Observable; -import java.util.Observer; -import java.util.Properties; +import java.util.*; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -34,12 +30,12 @@ * @see Observable */ public abstract class NodeListener extends Observable { - private final static Log LOG = LogFactory.getLog(NodeListener.class); + private static final Log LOG = LogFactory.getLog(NodeListener.class); private String prefix = ""; private Properties properties = new Properties(); - private Date lastUpdateTime = null; - private Observer observer = null; + private Date lastUpdateTime; + private Observer observer; private Lock lock = new ReentrantLock(); /** diff --git a/src/main/java/com/alibaba/druid/pool/ha/node/PoolUpdater.java b/src/main/java/com/alibaba/druid/pool/ha/node/PoolUpdater.java index f46e489d8e..0669d8bc15 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/node/PoolUpdater.java +++ b/src/main/java/com/alibaba/druid/pool/ha/node/PoolUpdater.java @@ -23,11 +23,8 @@ import com.alibaba.druid.util.JdbcUtils; import javax.sql.DataSource; -import java.util.HashSet; -import java.util.Map; -import java.util.Observable; -import java.util.Observer; -import java.util.Set; + +import java.util.*; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -41,16 +38,16 @@ * @author DigitalSonic */ public class PoolUpdater implements Observer { - public final static int DEFAULT_INTERVAL = 60; - private final static Log LOG = LogFactory.getLog(PoolUpdater.class); + public static final int DEFAULT_INTERVAL = 60; + private static final Log LOG = LogFactory.getLog(PoolUpdater.class); private Set nodesToDel = new CopyOnWriteArraySet(); private HighAvailableDataSource highAvailableDataSource; private Lock lock = new ReentrantLock(); private ScheduledExecutorService executor; private int intervalSeconds = DEFAULT_INTERVAL; - private volatile boolean inited = false; - private boolean allowEmptyPool = false; + private volatile boolean inited; + private boolean allowEmptyPool; public PoolUpdater(HighAvailableDataSource highAvailableDataSource) { setHighAvailableDataSource(highAvailableDataSource); diff --git a/src/main/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListener.java b/src/main/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListener.java index 58c17fbe8a..3f5a257161 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListener.java +++ b/src/main/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListener.java @@ -63,11 +63,11 @@ * @author DigitalSonic */ public class ZookeeperNodeListener extends NodeListener { - private final static Log LOG = LogFactory.getLog(ZookeeperNodeListener.class); + private static final Log LOG = LogFactory.getLog(ZookeeperNodeListener.class); private String zkConnectString; private String path = "/ha-druid-datasources"; private Lock lock = new ReentrantLock(); - private boolean privateZkClient = false; // Should I close the client? + private boolean privateZkClient; // Should I close the client? private PathChildrenCache cache; private CuratorFramework client; /** diff --git a/src/main/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeRegister.java b/src/main/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeRegister.java index a2b2e742fa..2901d533fa 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeRegister.java +++ b/src/main/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeRegister.java @@ -35,12 +35,12 @@ * @author DigitalSonic */ public class ZookeeperNodeRegister { - private final static Log LOG = LogFactory.getLog(ZookeeperNodeRegister.class); + private static final Log LOG = LogFactory.getLog(ZookeeperNodeRegister.class); private String zkConnectString; private String path = "/ha-druid-datasources"; private CuratorFramework client; private GroupMember member; - private boolean privateZkClient = false; // Should I close the client? + private boolean privateZkClient; // Should I close the client? private Lock lock = new ReentrantLock(); /** @@ -84,7 +84,7 @@ public boolean register(String nodeId, List payload) { String payloadString = getPropertiesString(payload); member = new GroupMember(client, path, nodeId, payloadString.getBytes()); member.start(); - LOG.info("Register Node["+ nodeId + "] in path[" + path + "]."); + LOG.info("Register Node[" + nodeId + "] in path[" + path + "]."); return true; } finally { lock.unlock(); @@ -117,7 +117,7 @@ private void createPathIfNotExisted() { LOG.info("Path[" + path + "] is NOT existed, create it."); client.create().creatingParentsIfNeeded().forPath(path); } - } catch(Exception e) { + } catch (Exception e) { LOG.error("Can NOT check the path.", e); } } diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/DataSourceSelectorEnum.java b/src/main/java/com/alibaba/druid/pool/ha/selector/DataSourceSelectorEnum.java index 99f0f2ad88..72daa034c4 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/selector/DataSourceSelectorEnum.java +++ b/src/main/java/com/alibaba/druid/pool/ha/selector/DataSourceSelectorEnum.java @@ -29,7 +29,7 @@ public enum DataSourceSelectorEnum { RANDOM("random", RandomDataSourceSelector.class), STICKY_RANDOM("stickyRandom", StickyRandomDataSourceSelector.class); - private final static Log LOG = LogFactory.getLog(DataSourceSelectorEnum.class); + private static final Log LOG = LogFactory.getLog(DataSourceSelectorEnum.class); private String name; private Class clazz; diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelector.java b/src/main/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelector.java index ca26857e15..2ee84fc776 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelector.java +++ b/src/main/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelector.java @@ -15,11 +15,11 @@ */ package com.alibaba.druid.pool.ha.selector; -import java.util.Map; +import com.alibaba.druid.pool.ha.HighAvailableDataSource; import javax.sql.DataSource; -import com.alibaba.druid.pool.ha.HighAvailableDataSource; +import java.util.Map; /** * Use the given name in ThreadLocal variable to choose DataSource. diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceRecoverThread.java b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceRecoverThread.java index e21aed791f..b2a1358756 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceRecoverThread.java +++ b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceRecoverThread.java @@ -15,15 +15,15 @@ */ package com.alibaba.druid.pool.ha.selector; -import java.sql.Connection; - -import javax.sql.DataSource; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.JdbcUtils; +import javax.sql.DataSource; + +import java.sql.Connection; + /** * A Thread trying to test if DataSource in blacklist has been recovered. * @@ -31,11 +31,11 @@ */ public class RandomDataSourceRecoverThread implements Runnable { public static final int DEFAULT_RECOVER_INTERVAL_SECONDS = 120; - private final static Log LOG = LogFactory.getLog(RandomDataSourceRecoverThread.class); + private static final Log LOG = LogFactory.getLog(RandomDataSourceRecoverThread.class); private RandomDataSourceSelector selector; private int recoverIntervalSeconds = DEFAULT_RECOVER_INTERVAL_SECONDS; - private int validationSleepSeconds = 0; + private int validationSleepSeconds; public RandomDataSourceRecoverThread(RandomDataSourceSelector selector) { this.selector = selector; @@ -71,7 +71,7 @@ private void tryOneDataSource(DruidDataSource dataSource) { dataSource.validateConnection(connection); LOG.info(dataSource.getName() + " is available now."); selector.removeBlacklist(dataSource); - } catch(Exception e) { + } catch (Exception e) { LOG.warn("DataSource[" + dataSource.getName() + "] is still unavailable. Exception: " + e.getMessage()); } finally { diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java index a0a72684d8..a02431e960 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java +++ b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java @@ -15,22 +15,16 @@ */ package com.alibaba.druid.pool.ha.selector; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Random; -import java.util.concurrent.CopyOnWriteArrayList; - -import javax.sql.DataSource; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.ha.HighAvailableDataSource; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; +import javax.sql.DataSource; + +import java.util.*; +import java.util.concurrent.CopyOnWriteArrayList; + /** * A selector which uses java.util.Random to choose DataSource. * @@ -43,7 +37,7 @@ public class RandomDataSourceSelector implements DataSourceSelector { public static final String PROP_VALIDATION_SLEEP = PROP_PREFIX + "validationSleepSeconds"; public static final String PROP_BLACKLIST_THRESHOLD = PROP_PREFIX + "blacklistThreshold"; - private final static Log LOG = LogFactory.getLog(RandomDataSourceSelector.class); + private static final Log LOG = LogFactory.getLog(RandomDataSourceSelector.class); private Random random = new Random(); private List blacklist = new CopyOnWriteArrayList(); @@ -55,7 +49,7 @@ public class RandomDataSourceSelector implements DataSourceSelector { private int checkingIntervalSeconds = RandomDataSourceValidateThread.DEFAULT_CHECKING_INTERVAL_SECONDS; private int recoveryIntervalSeconds = RandomDataSourceRecoverThread.DEFAULT_RECOVER_INTERVAL_SECONDS; - private int validationSleepSeconds = 0; + private int validationSleepSeconds; private int blacklistThreshold = RandomDataSourceValidateThread.DEFAULT_BLACKLIST_THRESHOLD; public RandomDataSourceSelector(HighAvailableDataSource highAvailableDataSource) { @@ -238,7 +232,7 @@ private void removeBusyDataSource(Collection dataSourceSet) { } private DataSource getRandomDataSource(Collection dataSourceSet) { - DataSource[] dataSources = dataSourceSet.toArray(new DataSource[] {}); + DataSource[] dataSources = dataSourceSet.toArray(new DataSource[]{}); if (dataSources != null && dataSources.length > 0) { return dataSources[random.nextInt(dataSourceSet.size())]; } diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceValidateThread.java b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceValidateThread.java index e6bb1f1b47..ad5de28105 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceValidateThread.java +++ b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceValidateThread.java @@ -15,21 +15,6 @@ */ package com.alibaba.druid.pool.ha.selector; -import java.sql.Connection; -import java.sql.Driver; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import javax.sql.DataSource; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.DataSourceProxy; import com.alibaba.druid.support.logging.Log; @@ -37,6 +22,16 @@ import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.StringUtils; +import javax.sql.DataSource; + +import java.sql.Connection; +import java.sql.Driver; +import java.util.*; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + /** * A Thread trying to test all DataSource provided by HADataSource. * If a DataSource failed this test for 3 times (default value), it will be put into a blacklist. @@ -47,11 +42,11 @@ public class RandomDataSourceValidateThread implements Runnable { public static final int DEFAULT_CHECKING_INTERVAL_SECONDS = 10; public static final int DEFAULT_BLACKLIST_THRESHOLD = 3; - private final static Log LOG = LogFactory.getLog(RandomDataSourceValidateThread.class); + private static final Log LOG = LogFactory.getLog(RandomDataSourceValidateThread.class); private static Map successTimes = new ConcurrentHashMap(); private int checkingIntervalSeconds = DEFAULT_CHECKING_INTERVAL_SECONDS; // This value should NOT be too small. - private int validationSleepSeconds = 0; + private int validationSleepSeconds; private int blacklistThreshold = DEFAULT_BLACKLIST_THRESHOLD; private RandomDataSourceSelector selector; private ExecutorService checkExecutor = Executors.newFixedThreadPool(5); diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/StickyRandomDataSourceSelector.java b/src/main/java/com/alibaba/druid/pool/ha/selector/StickyRandomDataSourceSelector.java index 869a4b1404..7e4ba0f008 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/selector/StickyRandomDataSourceSelector.java +++ b/src/main/java/com/alibaba/druid/pool/ha/selector/StickyRandomDataSourceSelector.java @@ -30,7 +30,7 @@ * @see StickyDataSourceHolder */ public class StickyRandomDataSourceSelector extends RandomDataSourceSelector { - private final static Log LOG = LogFactory.getLog(StickyRandomDataSourceSelector.class); + private static final Log LOG = LogFactory.getLog(StickyRandomDataSourceSelector.class); private ThreadLocal holders = new ThreadLocal(); diff --git a/src/main/java/com/alibaba/druid/pool/vendor/DB2ExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/DB2ExceptionSorter.java index 6f2776b49b..fbb34874b6 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/DB2ExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/DB2ExceptionSorter.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.pool.vendor; +import com.alibaba.druid.pool.ExceptionSorter; + import java.sql.SQLException; import java.sql.SQLRecoverableException; import java.util.Properties; -import com.alibaba.druid.pool.ExceptionSorter; - public class DB2ExceptionSorter implements ExceptionSorter { - @Override public boolean isExceptionFatal(SQLException e) { if (e instanceof SQLRecoverableException) { @@ -41,7 +40,7 @@ public boolean isExceptionFatal(SQLException e) { case -516: // THE DESCRIBE STATEMENT DOES NOT SPECIFY A PREPARED STATEMENT case -518: // THE EXECUTE STATEMENT DOES NOT IDENTIFY A VALID PREPARED STATEMENT case -525: // THE SQL STATEMENT CANNOT BE EXECUTED BECAUSE IT WAS IN ERROR AT BIND TIME FOR SECTION = sectno - // PACKAGE = pkgname CONSISTENCY TOKEN = contoken + // PACKAGE = pkgname CONSISTENCY TOKEN = contoken case -909: // THE OBJECT HAS BEEN DELETED OR ALTERED case -918: // THE SQL STATEMENT CANNOT BE EXECUTED BECAUSE A CONNECTION HAS BEEN LOST case -924: // DB2 CONNECTION INTERNAL ERROR, function-code,return-code,reason-code @@ -54,7 +53,6 @@ public boolean isExceptionFatal(SQLException e) { @Override public void configFromProperties(Properties properties) { - } } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/InformixExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/InformixExceptionSorter.java index 5b646519ef..4d033b54cf 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/InformixExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/InformixExceptionSorter.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.pool.vendor; +import com.alibaba.druid.pool.ExceptionSorter; + import java.io.Serializable; import java.sql.SQLException; import java.sql.SQLRecoverableException; import java.util.Properties; -import com.alibaba.druid.pool.ExceptionSorter; - public class InformixExceptionSorter implements ExceptionSorter, Serializable { - private static final long serialVersionUID = -5175884111768095263L; public boolean isExceptionFatal(SQLException e) { @@ -55,9 +54,8 @@ public boolean isExceptionFatal(SQLException e) { return false; } - + public void configFromProperties(Properties properties) { - } } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java index 200167b826..dd13e581bc 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java @@ -15,34 +15,34 @@ */ package com.alibaba.druid.pool.vendor; -import java.io.Serializable; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; - import com.alibaba.druid.pool.ValidConnectionChecker; import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.StringUtils; +import java.io.Serializable; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; + /** * A MSSQLValidConnectionChecker. */ public class MSSQLValidConnectionChecker extends ValidConnectionCheckerAdapter implements ValidConnectionChecker, Serializable { - private static final long serialVersionUID = 1L; private static final String DEFAULT_VALIDATION_QUERY = "SELECT 1"; - public MSSQLValidConnectionChecker(){ - + public MSSQLValidConnectionChecker() { } - public boolean isValidConnection(final Connection c, String validateQuery, int validationQueryTimeout) throws Exception { + public boolean isValidConnection(final Connection c, + String validateQuery, + int validationQueryTimeout) throws Exception { if (c.isClosed()) { return false; } - if(StringUtils.isEmpty(validateQuery)) { + if (StringUtils.isEmpty(validateQuery)) { validateQuery = DEFAULT_VALIDATION_QUERY; } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MockExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/MockExceptionSorter.java index 60ed5dd3a5..5b3693216b 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MockExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MockExceptionSorter.java @@ -15,17 +15,16 @@ */ package com.alibaba.druid.pool.vendor; -import java.sql.SQLException; -import java.util.Properties; - import com.alibaba.druid.mock.MockConnectionClosedException; import com.alibaba.druid.pool.ExceptionSorter; -public class MockExceptionSorter implements ExceptionSorter { +import java.sql.SQLException; +import java.util.Properties; - private final static MockExceptionSorter instance = new MockExceptionSorter(); +public class MockExceptionSorter implements ExceptionSorter { + private static final MockExceptionSorter instance = new MockExceptionSorter(); - public final static MockExceptionSorter getInstance() { + public static final MockExceptionSorter getInstance() { return instance; } @@ -35,6 +34,5 @@ public boolean isExceptionFatal(SQLException e) { } public void configFromProperties(Properties properties) { - } } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java index 2e50329c3d..0488c420ba 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.pool.vendor; +import com.alibaba.druid.pool.ExceptionSorter; + import java.net.SocketTimeoutException; import java.sql.SQLException; import java.sql.SQLRecoverableException; import java.util.Properties; -import com.alibaba.druid.pool.ExceptionSorter; - public class MySqlExceptionSorter implements ExceptionSorter { - @Override public boolean isExceptionFatal(SQLException e) { if (e instanceof SQLRecoverableException) { @@ -36,7 +35,7 @@ public boolean isExceptionFatal(SQLException e) { if (sqlState != null && sqlState.startsWith("08")) { return true; } - + switch (errorCode) { // Communications Errors case 1040: // ER_CON_COUNT_ERROR @@ -46,18 +45,18 @@ public boolean isExceptionFatal(SQLException e) { case 1081: // ER_IPSOCK_ERROR case 1129: // ER_HOST_IS_BLOCKED case 1130: // ER_HOST_NOT_PRIVILEGED - // Authentication Errors + // Authentication Errors case 1045: // ER_ACCESS_DENIED_ERROR - // Resource errors + // Resource errors case 1004: // ER_CANT_CREATE_FILE case 1005: // ER_CANT_CREATE_TABLE case 1015: // ER_CANT_LOCK case 1021: // ER_DISK_FULL case 1041: // ER_OUT_OF_RESOURCES - // Out-of-memory errors + // Out-of-memory errors case 1037: // ER_OUTOFMEMORY case 1038: // ER_OUT_OF_SORTMEMORY - // Access denied + // Access denied case 1142: // ER_TABLEACCESS_DENIED_ERROR case 1227: // ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -68,12 +67,12 @@ public boolean isExceptionFatal(SQLException e) { default: break; } - + // for oceanbase if (errorCode >= -9000 && errorCode <= -8000) { return true; } - + String className = e.getClass().getName(); if (className.endsWith(".CommunicationsException")) { return true; @@ -85,7 +84,7 @@ public boolean isExceptionFatal(SQLException e) { && message.endsWith("is still active. No statements may be issued when any streaming result sets are open and in use on a given connection. Ensure that you have called .close() on any active streaming result sets before attempting more queries.")) { return true; } - + final String errorText = message.toUpperCase(); if ((errorCode == 0 && (errorText.contains("COMMUNICATIONS LINK FAILURE")) // @@ -109,13 +108,12 @@ public boolean isExceptionFatal(SQLException e) { cause = cause.getCause(); } - + return false; } @Override public void configFromProperties(Properties properties) { - } } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java index c988727fca..4247ee5f94 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java @@ -15,15 +15,6 @@ */ package com.alibaba.druid.pool.vendor; -import java.io.Serializable; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Properties; - import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.ValidConnectionChecker; import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; @@ -33,23 +24,31 @@ import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.Utils; -public class MySqlValidConnectionChecker extends ValidConnectionCheckerAdapter implements ValidConnectionChecker, Serializable { +import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Properties; +public class MySqlValidConnectionChecker extends ValidConnectionCheckerAdapter implements ValidConnectionChecker, Serializable { public static final int DEFAULT_VALIDATION_QUERY_TIMEOUT = 1; public static final String DEFAULT_VALIDATION_QUERY = "SELECT 1"; private static final long serialVersionUID = 1L; - private static final Log LOG = LogFactory.getLog(MySqlValidConnectionChecker.class); + private static final Log LOG = LogFactory.getLog(MySqlValidConnectionChecker.class); private Class clazz; - private Method ping; - private boolean usePingMethod = false; + private Method ping; + private boolean usePingMethod; public MySqlValidConnectionChecker() { this(false); } - public MySqlValidConnectionChecker(boolean usePingMethod){ + public MySqlValidConnectionChecker(boolean usePingMethod) { try { clazz = Utils.loadClass("com.mysql.jdbc.MySQLConnection"); if (clazz == null) { @@ -92,7 +91,9 @@ public void setUsePingMethod(boolean usePingMethod) { this.usePingMethod = usePingMethod; } - public boolean isValidConnection(Connection conn, String validateQuery, int validationQueryTimeout) throws Exception { + public boolean isValidConnection(Connection conn, + String validateQuery, + int validationQueryTimeout) throws Exception { if (conn.isClosed()) { return false; } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/NullExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/NullExceptionSorter.java index 4ed426527b..4720894a6a 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/NullExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/NullExceptionSorter.java @@ -15,16 +15,15 @@ */ package com.alibaba.druid.pool.vendor; +import com.alibaba.druid.pool.ExceptionSorter; + import java.sql.SQLException; import java.util.Properties; -import com.alibaba.druid.pool.ExceptionSorter; - public class NullExceptionSorter implements ExceptionSorter { + private static final NullExceptionSorter instance = new NullExceptionSorter(); - private final static NullExceptionSorter instance = new NullExceptionSorter(); - - public final static NullExceptionSorter getInstance() { + public static final NullExceptionSorter getInstance() { return instance; } @@ -34,6 +33,5 @@ public boolean isExceptionFatal(SQLException e) { } public void configFromProperties(Properties properties) { - } } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OceanBaseOracleExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/OceanBaseOracleExceptionSorter.java index dcc67d18ac..42d42f2246 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/OceanBaseOracleExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/OceanBaseOracleExceptionSorter.java @@ -1,19 +1,16 @@ package com.alibaba.druid.pool.vendor; -import java.io.Serializable; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; + import java.sql.SQLException; import java.sql.SQLRecoverableException; import java.util.HashSet; import java.util.Properties; import java.util.Set; -import com.alibaba.druid.pool.ExceptionSorter; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; - public class OceanBaseOracleExceptionSorter extends OracleExceptionSorter { - - private final static Log LOG = LogFactory.getLog(OracleExceptionSorter.class); + private static final Log LOG = LogFactory.getLog(OracleExceptionSorter.class); private static final long serialVersionUID = -9146226891418913174L; private Set fatalErrorCodes = new HashSet(); @@ -138,7 +135,8 @@ public boolean isExceptionFatal(SQLException e) { || error_text.indexOf("COULD NOT CREATE CONNECTION") > -1 || error_text.indexOf("ACCESS DENIED FOR USER") > -1 || error_text.indexOf("NO DATASOURCE") > -1 - || error_text.indexOf("NO ALIVE DATASOURCE") > -1) {// errorCode忽略并且异常信息为连接出错 + || error_text.indexOf("NO ALIVE DATASOURCE") > -1) { + // errorCode忽略并且异常信息为连接出错 return true; } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OceanBaseValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/OceanBaseValidConnectionChecker.java index e699482638..6bec16870a 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/OceanBaseValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/OceanBaseValidConnectionChecker.java @@ -25,38 +25,49 @@ import java.sql.Statement; public class OceanBaseValidConnectionChecker extends ValidConnectionCheckerAdapter implements ValidConnectionChecker { - private String oracleModeValidateQuery = "SELECT 'x' FROM DUAL"; - private String mysqlModeValidateQuery = "SELECT 'x'"; - private DbType dbType; - public OceanBaseValidConnectionChecker() { configFromProperties(System.getProperties()); dbType = null; } - public OceanBaseValidConnectionChecker(DbType dbType) {this.dbType = dbType;configFromProperties(System.getProperties()); } - public boolean isValidConnection(final Connection c, String validateQuery, int validationQueryTimeout) throws Exception { - if (c.isClosed()) { - return false; + private String oracleModeValidateQuery = "SELECT 'x' FROM DUAL"; + private String mysqlModeValidateQuery = "SELECT 'x'"; + private DbType dbType; + + public OceanBaseValidConnectionChecker() { + configFromProperties(System.getProperties()); + dbType = null; } - if (validateQuery == null || validateQuery.isEmpty()) { - if(dbType != null) { - if(dbType == DbType.oceanbase) { - validateQuery = mysqlModeValidateQuery; - } else { - validateQuery = oracleModeValidateQuery; - } - } + + public OceanBaseValidConnectionChecker(DbType dbType) { + this.dbType = dbType; + configFromProperties(System.getProperties()); } - Statement stmt = null; - - try { - stmt = c.createStatement(); - if (validationQueryTimeout > 0) { - stmt.setQueryTimeout(validationQueryTimeout); - } - stmt.execute(validateQuery); - return true; - } catch (SQLException e) { - throw e; - } finally { - JdbcUtils.close(stmt); + public boolean isValidConnection(final Connection c, + String validateQuery, + int validationQueryTimeout) throws Exception { + if (c.isClosed()) { + return false; + } + if (validateQuery == null || validateQuery.isEmpty()) { + if (dbType != null) { + if (dbType == DbType.oceanbase) { + validateQuery = mysqlModeValidateQuery; + } else { + validateQuery = oracleModeValidateQuery; + } + } + } + + Statement stmt = null; + + try { + stmt = c.createStatement(); + if (validationQueryTimeout > 0) { + stmt.setQueryTimeout(validationQueryTimeout); + } + stmt.execute(validateQuery); + return true; + } catch (SQLException e) { + throw e; + } finally { + JdbcUtils.close(stmt); + } } - } } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java index ba4e803969..b89c81a667 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java @@ -15,6 +15,10 @@ */ package com.alibaba.druid.pool.vendor; +import com.alibaba.druid.pool.ExceptionSorter; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; + import java.io.Serializable; import java.sql.SQLException; import java.sql.SQLRecoverableException; @@ -22,25 +26,20 @@ import java.util.Properties; import java.util.Set; -import com.alibaba.druid.pool.ExceptionSorter; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; - /** * Implementation of ExceptionSorter for Oracle. */ public class OracleExceptionSorter implements ExceptionSorter, Serializable { - - private final static Log LOG = LogFactory.getLog(OracleExceptionSorter.class); + private static final Log LOG = LogFactory.getLog(OracleExceptionSorter.class); private static final long serialVersionUID = -9146226891418913174L; - private Set fatalErrorCodes = new HashSet(); + private Set fatalErrorCodes = new HashSet(); - public OracleExceptionSorter(){ + public OracleExceptionSorter() { configFromProperties(System.getProperties()); } - + public void configFromProperties(Properties properties) { if (properties == null) { return; @@ -100,11 +99,11 @@ public boolean isExceptionFatal(final SQLException e) { case 3136: // inbound connection timed out case 3138: // Connection terminated due to security policy violation case 3142: // Connection was lost for the specified session and serial number. This is either due to session - // being killed or network problems. + // being killed or network problems. case 3143: // Connection was lost for the specified process ID and thread ID. This is either due to session - // being killed or network problems. + // being killed or network problems. case 3144: // Connection was lost for the specified process ID. This is either due to session being killed - // or network problems. + // or network problems. case 3145: // I/O streaming direction error case 3149: // Invalid Oracle error code, Cause: An invalid Oracle error code was received by the server. @@ -150,10 +149,10 @@ public boolean isExceptionFatal(final SQLException e) { if ((error_code < 20000 || error_code >= 21000)) { if ((error_text.contains("SOCKET")) // for control socket error - || (error_text.contains("套接字")) // for control socket error - || (error_text.contains("CONNECTION HAS ALREADY BEEN CLOSED")) // - || (error_text.contains("BROKEN PIPE")) // - || (error_text.contains("管道已结束")) // + || (error_text.contains("套接字")) // for control socket error + || (error_text.contains("CONNECTION HAS ALREADY BEEN CLOSED")) // + || (error_text.contains("BROKEN PIPE")) // + || (error_text.contains("管道已结束")) // ) { return true; } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java index 60435e1943..f52756033d 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java @@ -15,28 +15,26 @@ */ package com.alibaba.druid.pool.vendor; -import java.io.Serializable; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; -import java.util.Properties; - import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.ValidConnectionChecker; import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; import com.alibaba.druid.util.JdbcUtils; -public class OracleValidConnectionChecker extends ValidConnectionCheckerAdapter implements ValidConnectionChecker, Serializable { - - private static final long serialVersionUID = -2227528634302168877L; +import java.io.Serializable; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; +import java.util.Properties; +public class OracleValidConnectionChecker extends ValidConnectionCheckerAdapter implements ValidConnectionChecker, Serializable { + private static final long serialVersionUID = -2227528634302168877L; - private int timeout = 1; + private int timeout = 1; - private String defaultValidateQuery = "SELECT 'x' FROM DUAL"; + private String defaultValidateQuery = "SELECT 'x' FROM DUAL"; - public OracleValidConnectionChecker(){ + public OracleValidConnectionChecker() { configFromProperties(System.getProperties()); } @@ -57,7 +55,9 @@ public void setTimeout(int seconds) { this.timeout = seconds; } - public boolean isValidConnection(Connection conn, String validateQuery, int validationQueryTimeout) throws Exception { + public boolean isValidConnection(Connection conn, + String validateQuery, + int validationQueryTimeout) throws Exception { if (validateQuery == null || validateQuery.isEmpty()) { validateQuery = this.defaultValidateQuery; } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/PGExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/PGExceptionSorter.java index c8758d7d94..1fce27b9b4 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/PGExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/PGExceptionSorter.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.pool.vendor; +import com.alibaba.druid.pool.ExceptionSorter; + import java.sql.SQLException; import java.sql.SQLRecoverableException; import java.util.Properties; -import com.alibaba.druid.pool.ExceptionSorter; - public class PGExceptionSorter implements ExceptionSorter { - @Override public boolean isExceptionFatal(SQLException e) { if (e instanceof SQLRecoverableException) { @@ -33,18 +32,17 @@ public boolean isExceptionFatal(SQLException e) { if (sqlState == null) { return false; } - + // org.postgresql.util.PSQLState if (sqlState.startsWith("08")) { return true; } - + return false; } @Override public void configFromProperties(Properties properties) { - } } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/PGValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/PGValidConnectionChecker.java index a7e4bbcd5a..93414337d2 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/PGValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/PGValidConnectionChecker.java @@ -27,18 +27,19 @@ import java.sql.Statement; public class PGValidConnectionChecker extends ValidConnectionCheckerAdapter implements ValidConnectionChecker, Serializable { + private static final long serialVersionUID = -2227528634302168877L; - private static final long serialVersionUID = -2227528634302168877L; + private int defaultQueryTimeout = 1; - private int defaultQueryTimeout = 1; + private String defaultValidateQuery = "SELECT 'x'"; - private String defaultValidateQuery = "SELECT 'x'"; - - public PGValidConnectionChecker(){ + public PGValidConnectionChecker() { configFromProperties(System.getProperties()); } - public boolean isValidConnection(Connection conn, String validateQuery, int validationQueryTimeout) throws Exception { + public boolean isValidConnection(Connection conn, + String validateQuery, + int validationQueryTimeout) throws Exception { if (validateQuery == null || validateQuery.isEmpty()) { validateQuery = this.defaultValidateQuery; } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/PhoenixExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/PhoenixExceptionSorter.java index 7d199c3cbd..2261695a23 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/PhoenixExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/PhoenixExceptionSorter.java @@ -20,14 +20,14 @@ import com.alibaba.druid.support.logging.LogFactory; import java.sql.SQLException; -import java.sql.SQLRecoverableException; import java.util.Properties; public class PhoenixExceptionSorter implements ExceptionSorter { - private final static Log LOG = LogFactory.getLog(OracleExceptionSorter.class); + private static final Log LOG = LogFactory.getLog(OracleExceptionSorter.class); /** * 解决phoenix 的错误 --Connection is null or closed + * * @param e the exception * @return */ @@ -37,13 +37,12 @@ public boolean isExceptionFatal(SQLException e) { LOG.error("剔除phoenix不可用的连接", e); return true; } - + return false; } @Override public void configFromProperties(Properties properties) { - } } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/SybaseExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/SybaseExceptionSorter.java index 7f0712b42b..ff126035db 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/SybaseExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/SybaseExceptionSorter.java @@ -15,17 +15,16 @@ */ package com.alibaba.druid.pool.vendor; +import com.alibaba.druid.pool.ExceptionSorter; + import java.io.Serializable; import java.sql.SQLException; import java.sql.SQLRecoverableException; import java.util.Properties; -import com.alibaba.druid.pool.ExceptionSorter; - public class SybaseExceptionSorter implements ExceptionSorter, Serializable { - private static final long serialVersionUID = 2742592563671255116L; - + public SybaseExceptionSorter() { this.configFromProperties(System.getProperties()); } @@ -44,15 +43,14 @@ public boolean isExceptionFatal(SQLException e) { errorText = errorText.toUpperCase(); if ((errorText.contains("JZ0C0")) || // ERR_CONNECTION_DEAD - (errorText.contains("JZ0C1")) // ERR_IOE_KILLED_CONNECTION + (errorText.contains("JZ0C1")) // ERR_IOE_KILLED_CONNECTION ) { result = true; } return result; } - + public void configFromProperties(Properties properties) { - } } diff --git a/src/main/java/com/alibaba/druid/pool/xa/DruidPooledXAConnection.java b/src/main/java/com/alibaba/druid/pool/xa/DruidPooledXAConnection.java index b8458d4028..c96a067e6e 100644 --- a/src/main/java/com/alibaba/druid/pool/xa/DruidPooledXAConnection.java +++ b/src/main/java/com/alibaba/druid/pool/xa/DruidPooledXAConnection.java @@ -15,22 +15,21 @@ */ package com.alibaba.druid.pool.xa; -import java.sql.Connection; -import java.sql.SQLException; +import com.alibaba.druid.pool.DruidPooledConnection; import javax.sql.ConnectionEventListener; import javax.sql.StatementEventListener; import javax.sql.XAConnection; import javax.transaction.xa.XAResource; -import com.alibaba.druid.pool.DruidPooledConnection; +import java.sql.Connection; +import java.sql.SQLException; public class DruidPooledXAConnection implements XAConnection { - private DruidPooledConnection pooledConnection; - private XAConnection xaConnection; + private XAConnection xaConnection; - public DruidPooledXAConnection(DruidPooledConnection pooledConnection, XAConnection xaConnection){ + public DruidPooledXAConnection(DruidPooledConnection pooledConnection, XAConnection xaConnection) { this.pooledConnection = pooledConnection; this.xaConnection = xaConnection; diff --git a/src/main/java/com/alibaba/druid/pool/xa/DruidXADataSource.java b/src/main/java/com/alibaba/druid/pool/xa/DruidXADataSource.java index f446d19aaf..bc65b2947a 100644 --- a/src/main/java/com/alibaba/druid/pool/xa/DruidXADataSource.java +++ b/src/main/java/com/alibaba/druid/pool/xa/DruidXADataSource.java @@ -15,31 +15,26 @@ */ package com.alibaba.druid.pool.xa; -import java.sql.Connection; -import java.sql.SQLException; - -import javax.sql.XAConnection; -import javax.sql.XADataSource; -import javax.transaction.xa.XAException; - import com.alibaba.druid.DbType; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.H2Utils; -import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.util.MySqlUtils; -import com.alibaba.druid.util.OracleUtils; -import com.alibaba.druid.util.PGUtils; +import com.alibaba.druid.util.*; -public class DruidXADataSource extends DruidDataSource implements XADataSource { +import javax.sql.XAConnection; +import javax.sql.XADataSource; +import javax.transaction.xa.XAException; - private final static Log LOG = LogFactory.getLog(DruidXADataSource.class); +import java.sql.Connection; +import java.sql.SQLException; + +public class DruidXADataSource extends DruidDataSource implements XADataSource { + private static final Log LOG = LogFactory.getLog(DruidXADataSource.class); private static final long serialVersionUID = 1L; - private Object h2Factory = null; + private Object h2Factory; @Override public XAConnection getXAConnection() throws SQLException { diff --git a/src/main/java/com/alibaba/druid/pool/xa/JtdsXAConnection.java b/src/main/java/com/alibaba/druid/pool/xa/JtdsXAConnection.java index 756b1d3112..d3b64b857e 100644 --- a/src/main/java/com/alibaba/druid/pool/xa/JtdsXAConnection.java +++ b/src/main/java/com/alibaba/druid/pool/xa/JtdsXAConnection.java @@ -15,26 +15,24 @@ */ package com.alibaba.druid.pool.xa; -import java.sql.Connection; -import java.sql.SQLException; +import com.alibaba.druid.util.JdbcUtils; +import net.sourceforge.jtds.jdbc.XASupport; import javax.sql.ConnectionEventListener; import javax.sql.StatementEventListener; import javax.sql.XAConnection; import javax.transaction.xa.XAResource; -import com.alibaba.druid.util.JdbcUtils; - -import net.sourceforge.jtds.jdbc.XASupport; +import java.sql.Connection; +import java.sql.SQLException; public class JtdsXAConnection implements XAConnection { - - private Connection connection; + private Connection connection; private final XAResource resource; - private final int xaConnectionId; + private final int xaConnectionId; - public JtdsXAConnection(Connection connection) throws SQLException{ + public JtdsXAConnection(Connection connection) throws SQLException { this.resource = new JtdsXAResource(this, connection); this.connection = connection; this.xaConnectionId = XASupport.xa_open(connection); @@ -56,28 +54,24 @@ public void close() throws SQLException { } catch (SQLException e) { // Ignore close errors } - + JdbcUtils.close(connection); } @Override public void addConnectionEventListener(ConnectionEventListener listener) { - } @Override public void removeConnectionEventListener(ConnectionEventListener listener) { - } @Override public void addStatementEventListener(StatementEventListener listener) { - } @Override public void removeStatementEventListener(StatementEventListener listener) { - } @Override diff --git a/src/main/java/com/alibaba/druid/pool/xa/JtdsXAResource.java b/src/main/java/com/alibaba/druid/pool/xa/JtdsXAResource.java index 4e78ba2d3f..f5418be87c 100644 --- a/src/main/java/com/alibaba/druid/pool/xa/JtdsXAResource.java +++ b/src/main/java/com/alibaba/druid/pool/xa/JtdsXAResource.java @@ -15,29 +15,27 @@ */ package com.alibaba.druid.pool.xa; -import java.lang.reflect.Method; -import java.sql.Connection; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import net.sourceforge.jtds.jdbc.XASupport; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; - -import net.sourceforge.jtds.jdbc.XASupport; +import java.lang.reflect.Method; +import java.sql.Connection; public class JtdsXAResource implements XAResource { + private static final Log LOG = LogFactory.getLog(JtdsXAResource.class); - private final static Log LOG = LogFactory.getLog(JtdsXAResource.class); - - private final Connection connection; + private final Connection connection; private final JtdsXAConnection xaConnection; - private String rmHost; + private String rmHost; - private static Method method; + private static Method method; - public JtdsXAResource(JtdsXAConnection xaConnection, Connection connection){ + public JtdsXAResource(JtdsXAConnection xaConnection, Connection connection) { this.xaConnection = xaConnection; this.connection = connection; diff --git a/src/main/java/com/alibaba/druid/proxy/DruidDriver.java b/src/main/java/com/alibaba/druid/proxy/DruidDriver.java index dee4064d69..e9a330a860 100644 --- a/src/main/java/com/alibaba/druid/proxy/DruidDriver.java +++ b/src/main/java/com/alibaba/druid/proxy/DruidDriver.java @@ -15,25 +15,6 @@ */ package com.alibaba.druid.proxy; -import java.lang.management.ManagementFactory; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.sql.Connection; -import java.sql.Driver; -import java.sql.DriverManager; -import java.sql.DriverPropertyInfo; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.logging.Logger; - -import javax.management.MBeanServer; -import javax.management.ObjectName; - import com.alibaba.druid.VERSION; import com.alibaba.druid.filter.Filter; import com.alibaba.druid.filter.FilterManager; @@ -47,35 +28,48 @@ import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.Utils; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import java.lang.management.ManagementFactory; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.sql.*; +import java.util.Properties; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.logging.Logger; + /** * @author wenshao [szujobs@hotmail.com] */ public class DruidDriver implements Driver, DruidDriverMBean { + private static Log LOG; // lazy init - private static Log LOG; // lazy init + private static final DruidDriver instance = new DruidDriver(); - private final static DruidDriver instance = new DruidDriver(); + private static final ConcurrentMap proxyDataSources = new ConcurrentHashMap(16, 0.75f, 1); + private static final AtomicInteger dataSourceIdSeed = new AtomicInteger(0); + private static final AtomicInteger sqlStatIdSeed = new AtomicInteger(0); - private final static ConcurrentMap proxyDataSources = new ConcurrentHashMap(16, 0.75f, 1); - private final static AtomicInteger dataSourceIdSeed = new AtomicInteger(0); - private final static AtomicInteger sqlStatIdSeed = new AtomicInteger(0); + public static final String DEFAULT_PREFIX = "jdbc:wrap-jdbc:"; + public static final String DRIVER_PREFIX = "driver="; + public static final String PASSWORD_CALLBACK_PREFIX = "passwordCallback="; + public static final String NAME_PREFIX = "name="; + public static final String JMX_PREFIX = "jmx="; + public static final String FILTERS_PREFIX = "filters="; - public final static String DEFAULT_PREFIX = "jdbc:wrap-jdbc:"; - public final static String DRIVER_PREFIX = "driver="; - public final static String PASSWORD_CALLBACK_PREFIX = "passwordCallback="; - public final static String NAME_PREFIX = "name="; - public final static String JMX_PREFIX = "jmx="; - public final static String FILTERS_PREFIX = "filters="; + private final AtomicLong connectCount = new AtomicLong(0); - private final AtomicLong connectCount = new AtomicLong(0); + private String acceptPrefix = DEFAULT_PREFIX; - private String acceptPrefix = DEFAULT_PREFIX; + private int majorVersion = 4; - private int majorVersion = 4; + private int minorVersion; - private int minorVersion = 0; - - private final static String MBEAN_NAME = "com.alibaba.druid:type=DruidDriver"; + private static final String MBEAN_NAME = "com.alibaba.druid:type=DruidDriver"; static { AccessController.doPrivileged(new PrivilegedAction() { @@ -110,15 +104,14 @@ public static boolean registerDriver(Driver driver) { if (LOG == null) { LOG = LogFactory.getLog(DruidDriver.class); } - + LOG.error("registerDriver error", e); } return false; } - public DruidDriver(){ - + public DruidDriver() { } public static DruidDriver getInstance() { @@ -162,7 +155,7 @@ public Connection connect(String url, Properties info) throws SQLException { /** * 参数定义： com.alibaba.druid.log.LogFilter=filter com.alibaba.druid.log.LogFilter.p1=prop-value * com.alibaba.druid.log.LogFilter.p2=prop-value - * + * * @param url * @return * @throws SQLException diff --git a/src/main/java/com/alibaba/druid/proxy/DruidDriverMBean.java b/src/main/java/com/alibaba/druid/proxy/DruidDriverMBean.java index f692834e11..acb8ebff57 100644 --- a/src/main/java/com/alibaba/druid/proxy/DruidDriverMBean.java +++ b/src/main/java/com/alibaba/druid/proxy/DruidDriverMBean.java @@ -22,7 +22,7 @@ public interface DruidDriverMBean { String getDruidVersion(); long getConnectCount(); - + void resetStat(); String getAcceptPrefix(); diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/CallableStatementProxy.java b/src/main/java/com/alibaba/druid/proxy/jdbc/CallableStatementProxy.java index 2c0e5cefd1..377d5caaf5 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/CallableStatementProxy.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/CallableStatementProxy.java @@ -21,6 +21,5 @@ * @author wenshao [szujobs@hotmail.com] */ public interface CallableStatementProxy extends CallableStatement, PreparedStatementProxy { - CallableStatement getRawObject(); } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/CallableStatementProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/CallableStatementProxyImpl.java index 51fd625cc4..11ab78205e 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/CallableStatementProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/CallableStatementProxyImpl.java @@ -18,27 +18,16 @@ import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; -import java.sql.Array; -import java.sql.Blob; -import java.sql.CallableStatement; -import java.sql.Clob; -import java.sql.NClob; -import java.sql.PreparedStatement; -import java.sql.Ref; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.SQLXML; +import java.sql.*; import java.util.Calendar; /** * @author wenshao [szujobs@hotmail.com] */ public class CallableStatementProxyImpl extends PreparedStatementProxyImpl implements CallableStatementProxy { - private final CallableStatement statement; - public CallableStatementProxyImpl(ConnectionProxy connection, CallableStatement statement, String sql, long id){ + public CallableStatementProxyImpl(ConnectionProxy connection, CallableStatement statement, String sql, long id) { super(connection, statement, sql, id); this.statement = statement; } @@ -615,7 +604,7 @@ public T unwrap(Class iface) throws SQLException { if (iface == PreparedStatement.class || iface == CallableStatement.class) { return (T) statement; } - + return super.unwrap(iface); } } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/ClobProxy.java b/src/main/java/com/alibaba/druid/proxy/jdbc/ClobProxy.java index 7d657443ac..c0599dfc44 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/ClobProxy.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/ClobProxy.java @@ -21,7 +21,6 @@ * @author wenshao [szujobs@hotmail.com] */ public interface ClobProxy extends Clob { - ConnectionProxy getConnectionWrapper(); Clob getRawClob(); diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/ClobProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/ClobProxyImpl.java index 655d9c4ea7..00cfc4e59b 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/ClobProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/ClobProxyImpl.java @@ -15,6 +15,9 @@ */ package com.alibaba.druid.proxy.jdbc; +import com.alibaba.druid.filter.FilterChain; +import com.alibaba.druid.filter.FilterChainImpl; + import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; @@ -22,24 +25,20 @@ import java.sql.Clob; import java.sql.SQLException; -import com.alibaba.druid.filter.FilterChain; -import com.alibaba.druid.filter.FilterChainImpl; - /** * @author wenshao [szujobs@hotmail.com] */ public class ClobProxyImpl implements ClobProxy { - - protected final Clob clob; + protected final Clob clob; protected final ConnectionProxy connection; protected final DataSourceProxy dataSource; - public ClobProxyImpl(DataSourceProxy dataSource, ConnectionProxy connection, Clob clob){ + public ClobProxyImpl(DataSourceProxy dataSource, ConnectionProxy connection, Clob clob) { if (clob == null) { throw new IllegalArgumentException("clob is null"); } - + this.dataSource = dataSource; this.connection = connection; this.clob = clob; diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxy.java b/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxy.java index 0ea9e4f418..cd8a5d8f08 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxy.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxy.java @@ -23,7 +23,6 @@ * @author wenshao [szujobs@hotmail.com] */ public interface ConnectionProxy extends Connection, WrapperProxy { - Connection getRawObject(); Properties getProperties(); @@ -33,6 +32,6 @@ public interface ConnectionProxy extends Connection, WrapperProxy { Date getConnectedTime(); TransactionInfo getTransactionInfo(); - + int getCloseCount(); } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java index 2c7544b31d..98ff65d1eb 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java @@ -15,49 +15,34 @@ */ package com.alibaba.druid.proxy.jdbc; -import java.sql.Array; -import java.sql.Blob; -import java.sql.CallableStatement; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.NClob; -import java.sql.PreparedStatement; -import java.sql.SQLClientInfoException; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.SQLXML; -import java.sql.Savepoint; -import java.sql.Statement; -import java.sql.Struct; +import com.alibaba.druid.filter.FilterChainImpl; +import com.alibaba.druid.filter.stat.StatFilter; + +import java.sql.*; import java.util.Date; import java.util.Map; import java.util.Properties; import java.util.concurrent.Executor; -import com.alibaba.druid.filter.FilterChainImpl; -import com.alibaba.druid.filter.stat.StatFilter; - /** * @author wenshao [szujobs@hotmail.com] */ public class ConnectionProxyImpl extends WrapperProxyImpl implements ConnectionProxy { - - private final Connection connection; + private final Connection connection; private final DataSourceProxy dataSource; - private final Properties properties; + private final Properties properties; - private final long connectedTime; + private final long connectedTime; - private TransactionInfo transactionInfo; + private TransactionInfo transactionInfo; - private int closeCount; + private int closeCount; - private FilterChainImpl filterChain = null; + private FilterChainImpl filterChain; - public ConnectionProxyImpl(DataSourceProxy dataSource, Connection connection, Properties properties, long id){ + public ConnectionProxyImpl(DataSourceProxy dataSource, Connection connection, Properties properties, long id) { super(connection, id); this.dataSource = dataSource; this.connection = connection; @@ -192,7 +177,7 @@ public Statement createStatement(int resultSetType, // ) throws SQLException { FilterChainImpl chain = createChain(); Statement stmt = chain.connection_createStatement(this, resultSetType, resultSetConcurrency, - resultSetHoldability); + resultSetHoldability); recycleFilterChain(chain); return stmt; } @@ -330,7 +315,7 @@ public CallableStatement prepareCall(String sql, int resultSetType, int resultSe int resultSetHoldability) throws SQLException { FilterChainImpl chain = createChain(); CallableStatement stmt = chain.connection_prepareCall(this, sql, resultSetType, resultSetConcurrency, - resultSetHoldability); + resultSetHoldability); recycleFilterChain(chain); return stmt; } @@ -369,7 +354,7 @@ public PreparedStatement prepareStatement(String sql, String[] columnNames) thro @Override public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { FilterChainImpl chain = createChain(); PreparedStatement stmt = chain.connection_prepareStatement(this, sql, resultSetType, resultSetConcurrency); recycleFilterChain(chain); @@ -381,7 +366,7 @@ public PreparedStatement prepareStatement(String sql, int resultSetType, int res int resultSetHoldability) throws SQLException { FilterChainImpl chain = createChain(); PreparedStatement stmt = chain.connection_prepareStatement(this, sql, resultSetType, resultSetConcurrency, - resultSetHoldability); + resultSetHoldability); recycleFilterChain(chain); return stmt; } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxy.java b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxy.java index abba6aac0f..2dcae52af7 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxy.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxy.java @@ -15,18 +15,17 @@ */ package com.alibaba.druid.proxy.jdbc; +import com.alibaba.druid.filter.Filter; +import com.alibaba.druid.stat.JdbcDataSourceStat; + import java.sql.Driver; import java.util.List; import java.util.Properties; -import com.alibaba.druid.filter.Filter; -import com.alibaba.druid.stat.JdbcDataSourceStat; - /** * @author wenshao [szujobs@hotmail.com] */ public interface DataSourceProxy { - JdbcDataSourceStat getDataSourceStat(); String getName(); diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyConfig.java b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyConfig.java index 40e2eafe1d..1953d38536 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyConfig.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyConfig.java @@ -15,30 +15,29 @@ */ package com.alibaba.druid.proxy.jdbc; -import java.util.ArrayList; -import java.util.List; +import com.alibaba.druid.filter.Filter; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; -import com.alibaba.druid.filter.Filter; +import java.util.ArrayList; +import java.util.List; /** * @author wenshao [szujobs@hotmail.com] */ public class DataSourceProxyConfig { - - private String rawUrl; - private String url; - private String rawDriverClassName; - private String name; - private boolean jmx; - - private PasswordCallback passwordCallback; - private NameCallback userCallback; + private String rawUrl; + private String url; + private String rawDriverClassName; + private String name; + private boolean jmx; + + private PasswordCallback passwordCallback; + private NameCallback userCallback; private final List filters = new ArrayList(); - public DataSourceProxyConfig(){ + public DataSourceProxyConfig() { } public boolean isJmxOption() { diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java index 236ec62b7a..5c062bab8b 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java @@ -15,21 +15,6 @@ */ package com.alibaba.druid.proxy.jdbc; -import java.sql.Driver; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.atomic.AtomicLong; - -import javax.management.JMException; -import javax.management.openmbean.CompositeDataSupport; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.PasswordCallback; - import com.alibaba.druid.filter.Filter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.filter.FilterChainImpl; @@ -38,32 +23,41 @@ import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.Utils; +import javax.management.JMException; +import javax.management.openmbean.CompositeDataSupport; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; + +import java.sql.Driver; +import java.sql.SQLException; +import java.util.*; +import java.util.concurrent.atomic.AtomicLong; + /** * @author wenshao [szujobs@hotmail.com] */ public class DataSourceProxyImpl implements DataSourceProxy, DataSourceProxyImplMBean { - - private final Driver rawDriver; + private final Driver rawDriver; private final DataSourceProxyConfig config; - private long id; + private long id; - private final long createdTimeMillis = System.currentTimeMillis(); + private final long createdTimeMillis = System.currentTimeMillis(); - private Properties properties; + private Properties properties; - private String dbType; + private String dbType; - private final AtomicLong connectionIdSeed = new AtomicLong(10000); - private final AtomicLong statementIdSeed = new AtomicLong(20000); - private final AtomicLong resultSetIdSeed = new AtomicLong(50000); - private final AtomicLong metaDataIdSeed = new AtomicLong(100000); - private final AtomicLong transactionIdSeed = new AtomicLong(0); + private final AtomicLong connectionIdSeed = new AtomicLong(10000); + private final AtomicLong statementIdSeed = new AtomicLong(20000); + private final AtomicLong resultSetIdSeed = new AtomicLong(50000); + private final AtomicLong metaDataIdSeed = new AtomicLong(100000); + private final AtomicLong transactionIdSeed = new AtomicLong(0); - private final JdbcDataSourceStat dataSourceStat; + private final JdbcDataSourceStat dataSourceStat; - public DataSourceProxyImpl(Driver rawDriver, DataSourceProxyConfig config){ + public DataSourceProxyImpl(Driver rawDriver, DataSourceProxyConfig config) { super(); this.rawDriver = rawDriver; this.config = config; diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImplMBean.java b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImplMBean.java index c446c45164..9ed6f1f2ec 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImplMBean.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImplMBean.java @@ -21,7 +21,6 @@ * @author wenshao [szujobs@hotmail.com] */ public interface DataSourceProxyImplMBean { - String getName(); String getUrl(); diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/DatabaseMetaDataProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/DatabaseMetaDataProxyImpl.java index 3b569511a5..66b64baef6 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/DatabaseMetaDataProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/DatabaseMetaDataProxyImpl.java @@ -15,11 +15,7 @@ */ package com.alibaba.druid.proxy.jdbc; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.ResultSet; -import java.sql.RowIdLifetime; -import java.sql.SQLException; +import java.sql.*; /** * Created by wenshao on 26/05/2017. @@ -622,17 +618,25 @@ public boolean dataDefinitionIgnoredInTransactions() throws SQLException { } @Override - public ResultSet getProcedures(String catalog, String schemaPattern, String procedureNamePattern) throws SQLException { + public ResultSet getProcedures(String catalog, + String schemaPattern, + String procedureNamePattern) throws SQLException { return metaData.getProcedures(catalog, schemaPattern, procedureNamePattern); } @Override - public ResultSet getProcedureColumns(String catalog, String schemaPattern, String procedureNamePattern, String columnNamePattern) throws SQLException { + public ResultSet getProcedureColumns(String catalog, + String schemaPattern, + String procedureNamePattern, + String columnNamePattern) throws SQLException { return metaData.getProcedureColumns(catalog, schemaPattern, procedureNamePattern, columnNamePattern); } @Override - public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) throws SQLException { + public ResultSet getTables(String catalog, + String schemaPattern, + String tableNamePattern, + String[] types) throws SQLException { return metaData.getTables(catalog, schemaPattern, tableNamePattern, types); } @@ -652,22 +656,34 @@ public ResultSet getTableTypes() throws SQLException { } @Override - public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException { + public ResultSet getColumns(String catalog, + String schemaPattern, + String tableNamePattern, + String columnNamePattern) throws SQLException { return metaData.getColumns(catalog, schemaPattern, tableNamePattern, columnNamePattern); } @Override - public ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnNamePattern) throws SQLException { + public ResultSet getColumnPrivileges(String catalog, + String schema, + String table, + String columnNamePattern) throws SQLException { return metaData.getColumnPrivileges(catalog, schema, table, columnNamePattern); } @Override - public ResultSet getTablePrivileges(String catalog, String schemaPattern, String tableNamePattern) throws SQLException { + public ResultSet getTablePrivileges(String catalog, + String schemaPattern, + String tableNamePattern) throws SQLException { return metaData.getTablePrivileges(catalog, schemaPattern, tableNamePattern); } @Override - public ResultSet getBestRowIdentifier(String catalog, String schema, String table, int scope, boolean nullable) throws SQLException { + public ResultSet getBestRowIdentifier(String catalog, + String schema, + String table, + int scope, + boolean nullable) throws SQLException { return metaData.getBestRowIdentifier(catalog, schema, table, scope, nullable); } @@ -692,7 +708,12 @@ public ResultSet getExportedKeys(String catalog, String schema, String table) th } @Override - public ResultSet getCrossReference(String parentCatalog, String parentSchema, String parentTable, String foreignCatalog, String foreignSchema, String foreignTable) throws SQLException { + public ResultSet getCrossReference(String parentCatalog, + String parentSchema, + String parentTable, + String foreignCatalog, + String foreignSchema, + String foreignTable) throws SQLException { return metaData.getCrossReference(parentCatalog, parentSchema, parentTable, foreignCatalog, foreignSchema, foreignTable); } @@ -702,7 +723,11 @@ public ResultSet getTypeInfo() throws SQLException { } @Override - public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate) throws SQLException { + public ResultSet getIndexInfo(String catalog, + String schema, + String table, + boolean unique, + boolean approximate) throws SQLException { return metaData.getIndexInfo(catalog, schema, table, unique, approximate); } @@ -767,7 +792,10 @@ public boolean supportsBatchUpdates() throws SQLException { } @Override - public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePattern, int[] types) throws SQLException { + public ResultSet getUDTs(String catalog, + String schemaPattern, + String typeNamePattern, + int[] types) throws SQLException { return metaData.getUDTs(catalog, schemaPattern, typeNamePattern, types); } @@ -807,7 +835,10 @@ public ResultSet getSuperTables(String catalog, String schemaPattern, String tab } @Override - public ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern, String attributeNamePattern) throws SQLException { + public ResultSet getAttributes(String catalog, + String schemaPattern, + String typeNamePattern, + String attributeNamePattern) throws SQLException { return metaData.getAttributes(catalog, schemaPattern, typeNamePattern, attributeNamePattern); } @@ -882,16 +913,24 @@ public ResultSet getClientInfoProperties() throws SQLException { } @Override - public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) throws SQLException { + public ResultSet getFunctions(String catalog, + String schemaPattern, + String functionNamePattern) throws SQLException { return metaData.getFunctions(catalog, schemaPattern, functionNamePattern); } @Override - public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern, String columnNamePattern) throws SQLException { + public ResultSet getFunctionColumns(String catalog, + String schemaPattern, + String functionNamePattern, + String columnNamePattern) throws SQLException { return metaData.getFunctionColumns(catalog, schemaPattern, functionNamePattern, columnNamePattern); } - public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException { + public ResultSet getPseudoColumns(String catalog, + String schemaPattern, + String tableNamePattern, + String columnNamePattern) throws SQLException { return metaData.getPseudoColumns(catalog, schemaPattern, tableNamePattern, columnNamePattern); } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameter.java b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameter.java index d7200d90d7..7614f2233d 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameter.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameter.java @@ -21,22 +21,20 @@ * @author wenshao [szujobs@hotmail.com] */ public interface JdbcParameter { - - public static final int BinaryInputStream = 10001; - public static final int AsciiInputStream = 10002; - public static final int CharacterInputStream = 10003; + public static final int BinaryInputStream = 10001; + public static final int AsciiInputStream = 10002; + public static final int CharacterInputStream = 10003; public static final int NCharacterInputStream = 10004; - public static final int URL = 10005; + public static final int URL = 10005; public static interface TYPE { - - public static final int BinaryInputStream = 10001; - public static final int AsciiInputStream = 10002; - public static final int CharacterInputStream = 10003; + public static final int BinaryInputStream = 10001; + public static final int AsciiInputStream = 10002; + public static final int CharacterInputStream = 10003; public static final int NCharacterInputStream = 10004; - public static final int URL = 10005; - public static final int UnicodeStream = 10006; - public static final int BYTES = 10007; + public static final int URL = 10005; + public static final int UnicodeStream = 10006; + public static final int BYTES = 10007; } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterDate.java b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterDate.java index 5095a59494..d0530b4620 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterDate.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterDate.java @@ -22,7 +22,7 @@ public final class JdbcParameterDate implements JdbcParameter { private final Date value; - public JdbcParameterDate(Date value){ + public JdbcParameterDate(Date value) { this.value = value; } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterDecimal.java b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterDecimal.java index 5afbb29a75..35ec440bbf 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterDecimal.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterDecimal.java @@ -20,14 +20,13 @@ import java.util.Calendar; public final class JdbcParameterDecimal implements JdbcParameter { - - private final BigDecimal value; + private final BigDecimal value; public static JdbcParameterDecimal NULL = new JdbcParameterDecimal(null); public static JdbcParameterDecimal ZERO = new JdbcParameterDecimal(BigDecimal.ZERO); public static JdbcParameterDecimal TEN = new JdbcParameterDecimal(BigDecimal.TEN); - - private JdbcParameterDecimal(BigDecimal value){ + + private JdbcParameterDecimal(BigDecimal value) { this.value = value; } @@ -35,15 +34,15 @@ public static JdbcParameterDecimal valueOf(BigDecimal x) { if (x == null) { return NULL; } - + if (0 == (x.compareTo(BigDecimal.ZERO))) { return ZERO; } - + if (0 == (x.compareTo(BigDecimal.TEN))) { return TEN; } - + return new JdbcParameterDecimal(x); } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterImpl.java index 4eaecd0448..909e110527 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterImpl.java @@ -18,14 +18,13 @@ import java.util.Calendar; public final class JdbcParameterImpl implements JdbcParameter { - - private final int sqlType; - private final Object value; - private final long length; + private final int sqlType; + private final Object value; + private final long length; private final Calendar calendar; - private final int scaleOrLength; + private final int scaleOrLength; - public JdbcParameterImpl(int sqlType, Object value, long length, Calendar calendar, int scaleOrLength){ + public JdbcParameterImpl(int sqlType, Object value, long length, Calendar calendar, int scaleOrLength) { this.sqlType = sqlType; this.value = value; this.length = length; @@ -33,19 +32,19 @@ public JdbcParameterImpl(int sqlType, Object value, long length, Calendar calend this.scaleOrLength = scaleOrLength; } - public JdbcParameterImpl(int sqlType, Object value, long length, Calendar calendar){ + public JdbcParameterImpl(int sqlType, Object value, long length, Calendar calendar) { this(sqlType, value, -1, null, -1); } - public JdbcParameterImpl(int sqlType, Object value){ + public JdbcParameterImpl(int sqlType, Object value) { this(sqlType, value, -1, null); } - public JdbcParameterImpl(int sqlType, Object value, long length){ + public JdbcParameterImpl(int sqlType, Object value, long length) { this(sqlType, value, length, null); } - public JdbcParameterImpl(int sqlType, Object value, Calendar calendar){ + public JdbcParameterImpl(int sqlType, Object value, Calendar calendar) { this(sqlType, value, -1, calendar); } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterInt.java b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterInt.java index 72627a1769..cd4a888e7a 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterInt.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterInt.java @@ -19,9 +19,8 @@ import java.util.Calendar; public final class JdbcParameterInt implements JdbcParameter { - private static JdbcParameterInt[] cache; - + static { int cacheSize = 127; cache = new JdbcParameterInt[cacheSize]; @@ -32,15 +31,15 @@ public final class JdbcParameterInt implements JdbcParameter { private final int value; - private JdbcParameterInt(int value){ + private JdbcParameterInt(int value) { this.value = value; } - + public static JdbcParameterInt valueOf(int value) { if (value >= 0 && value < cache.length) { return cache[value]; } - + return new JdbcParameterInt(value); } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterLong.java b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterLong.java index a8ef973fdd..0cf85dfe3b 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterLong.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterLong.java @@ -20,7 +20,7 @@ public final class JdbcParameterLong implements JdbcParameter { private static JdbcParameterLong[] cache; - + static { int cacheSize = 127; cache = new JdbcParameterLong[cacheSize]; @@ -28,18 +28,18 @@ public final class JdbcParameterLong implements JdbcParameter { cache[i] = new JdbcParameterLong(i); } } - + private final long value; - private JdbcParameterLong(long value){ + private JdbcParameterLong(long value) { this.value = value; } - + public static JdbcParameterLong valueOf(long value) { if (value >= 0 && value < cache.length) { return cache[(int) value]; } - + return new JdbcParameterLong(value); } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterNull.java b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterNull.java index ddd3f00e6c..c6a5cc8a17 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterNull.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterNull.java @@ -19,33 +19,32 @@ import java.util.Calendar; public final class JdbcParameterNull implements JdbcParameter { + private final int sqlType; - private final int sqlType; + public static final JdbcParameterNull CHAR = new JdbcParameterNull(Types.CHAR); + public static final JdbcParameterNull VARCHAR = new JdbcParameterNull(Types.VARCHAR); + public static final JdbcParameterNull NVARCHAR = new JdbcParameterNull(Types.NVARCHAR); - public final static JdbcParameterNull CHAR = new JdbcParameterNull(Types.CHAR); - public final static JdbcParameterNull VARCHAR = new JdbcParameterNull(Types.VARCHAR); - public final static JdbcParameterNull NVARCHAR = new JdbcParameterNull(Types.NVARCHAR); + public static final JdbcParameterNull BINARY = new JdbcParameterNull(Types.BINARY); + public static final JdbcParameterNull VARBINARY = new JdbcParameterNull(Types.VARBINARY); - public final static JdbcParameterNull BINARY = new JdbcParameterNull(Types.BINARY); - public final static JdbcParameterNull VARBINARY = new JdbcParameterNull(Types.VARBINARY); + public static final JdbcParameterNull TINYINT = new JdbcParameterNull(Types.TINYINT); + public static final JdbcParameterNull SMALLINT = new JdbcParameterNull(Types.SMALLINT); + public static final JdbcParameterNull INTEGER = new JdbcParameterNull(Types.INTEGER); + public static final JdbcParameterNull BIGINT = new JdbcParameterNull(Types.BIGINT); - public final static JdbcParameterNull TINYINT = new JdbcParameterNull(Types.TINYINT); - public final static JdbcParameterNull SMALLINT = new JdbcParameterNull(Types.SMALLINT); - public final static JdbcParameterNull INTEGER = new JdbcParameterNull(Types.INTEGER); - public final static JdbcParameterNull BIGINT = new JdbcParameterNull(Types.BIGINT); + public static final JdbcParameterNull DECIMAL = new JdbcParameterNull(Types.DECIMAL); + public static final JdbcParameterNull NUMERIC = new JdbcParameterNull(Types.NUMERIC); + public static final JdbcParameterNull FLOAT = new JdbcParameterNull(Types.FLOAT); + public static final JdbcParameterNull DOUBLE = new JdbcParameterNull(Types.DOUBLE); - public final static JdbcParameterNull DECIMAL = new JdbcParameterNull(Types.DECIMAL); - public final static JdbcParameterNull NUMERIC = new JdbcParameterNull(Types.NUMERIC); - public final static JdbcParameterNull FLOAT = new JdbcParameterNull(Types.FLOAT); - public final static JdbcParameterNull DOUBLE = new JdbcParameterNull(Types.DOUBLE); + public static final JdbcParameterNull NULL = new JdbcParameterNull(Types.NULL); - public final static JdbcParameterNull NULL = new JdbcParameterNull(Types.NULL); + public static final JdbcParameterNull DATE = new JdbcParameterNull(Types.DATE); + public static final JdbcParameterNull TIME = new JdbcParameterNull(Types.TIME); + public static final JdbcParameterNull TIMESTAMP = new JdbcParameterNull(Types.TIMESTAMP); - public final static JdbcParameterNull DATE = new JdbcParameterNull(Types.DATE); - public final static JdbcParameterNull TIME = new JdbcParameterNull(Types.TIME); - public final static JdbcParameterNull TIMESTAMP = new JdbcParameterNull(Types.TIMESTAMP); - - private JdbcParameterNull(int sqlType){ + private JdbcParameterNull(int sqlType) { this.sqlType = sqlType; } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterString.java b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterString.java index 1806c980ab..a1cbd7966a 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterString.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterString.java @@ -19,12 +19,11 @@ import java.util.Calendar; public final class JdbcParameterString implements JdbcParameter { - private final String value; - public final static JdbcParameterString empty = new JdbcParameterString(""); + public static final JdbcParameterString empty = new JdbcParameterString(""); - public JdbcParameterString(String value){ + public JdbcParameterString(String value) { this.value = value; } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterTimestamp.java b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterTimestamp.java index 6ed0e0d09b..68edc78a28 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterTimestamp.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterTimestamp.java @@ -20,10 +20,9 @@ import java.util.Calendar; public final class JdbcParameterTimestamp implements JdbcParameter { - private final Timestamp value; - public JdbcParameterTimestamp(Timestamp value){ + public JdbcParameterTimestamp(Timestamp value) { this.value = value; } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/NClobProxy.java b/src/main/java/com/alibaba/druid/proxy/jdbc/NClobProxy.java index 681fcc690c..1e7f866f54 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/NClobProxy.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/NClobProxy.java @@ -18,6 +18,5 @@ import java.sql.NClob; public interface NClobProxy extends ClobProxy, NClob { - NClob getRawNClob(); } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/NClobProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/NClobProxyImpl.java index b817c056b0..538c28edb4 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/NClobProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/NClobProxyImpl.java @@ -15,16 +15,15 @@ */ package com.alibaba.druid.proxy.jdbc; -import java.sql.NClob; - import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.filter.FilterChainImpl; -public class NClobProxyImpl extends ClobProxyImpl implements NClobProxy { +import java.sql.NClob; +public class NClobProxyImpl extends ClobProxyImpl implements NClobProxy { private final NClob nclob; - public NClobProxyImpl(DataSourceProxy dataSource, ConnectionProxy connection, NClob clob){ + public NClobProxyImpl(DataSourceProxy dataSource, ConnectionProxy connection, NClob clob) { super(dataSource, connection, clob); this.nclob = clob; } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/PreparedStatementProxy.java b/src/main/java/com/alibaba/druid/proxy/jdbc/PreparedStatementProxy.java index 55d643d9a9..81e46c6031 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/PreparedStatementProxy.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/PreparedStatementProxy.java @@ -22,10 +22,9 @@ * @author wenshao [szujobs@hotmail.com] */ public interface PreparedStatementProxy extends PreparedStatement, StatementProxy { - String getSql(); PreparedStatement getRawObject(); - + Map getParameters(); } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/PreparedStatementProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/PreparedStatementProxyImpl.java index 7493dd655e..f65e6f3a1b 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/PreparedStatementProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/PreparedStatementProxyImpl.java @@ -15,64 +15,49 @@ */ package com.alibaba.druid.proxy.jdbc; +import com.alibaba.druid.proxy.jdbc.JdbcParameter.TYPE; + import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; import java.net.URL; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Date; -import java.sql.NClob; -import java.sql.ParameterMetaData; -import java.sql.PreparedStatement; -import java.sql.Ref; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLXML; -import java.sql.Time; -import java.sql.Timestamp; -import java.sql.Types; +import java.sql.*; import java.util.Arrays; import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import com.alibaba.druid.proxy.jdbc.JdbcParameter.TYPE; - /** * @author wenshao [szujobs@hotmail.com] */ public class PreparedStatementProxyImpl extends StatementProxyImpl implements PreparedStatementProxy { - private PreparedStatement statement; - protected final String sql; - private JdbcParameter[] parameters; - private int parametersSize; - private Map paramMap; + private PreparedStatement statement; + protected final String sql; + private JdbcParameter[] parameters; + private int parametersSize; + private Map paramMap; - public PreparedStatementProxyImpl(ConnectionProxy connection, PreparedStatement statement, String sql, long id){ + public PreparedStatementProxyImpl(ConnectionProxy connection, PreparedStatement statement, String sql, long id) { super(connection, statement, id); this.statement = statement; this.sql = sql; char quote = 0; int paramCount = 0; - for (int i = 0; i < sql.length();++i) { + for (int i = 0; i < sql.length(); ++i) { char ch = sql.charAt(i); if (ch == '\'') { if (quote == 0) { quote = ch; } else if (quote == '\'') { - quote =0; + quote = 0; } } else if (ch == '"') { if (quote == 0) { quote = ch; } else if (quote == '"') { - quote =0; + quote = 0; } } @@ -91,7 +76,7 @@ public Map getParameters() { paramMap.put(i, parameters[i]); } } - + return paramMap; } @@ -116,7 +101,7 @@ public void setParameter(int jdbcIndex, JdbcParameter parameter) { parameters = Arrays.copyOf(parameters, newCapacity); } parameters[index] = parameter; - + if (paramMap != null) { paramMap = null; } @@ -344,8 +329,10 @@ public void setClob(int parameterIndex, Reader x, long length) throws SQLExcepti @Override public void setDate(int parameterIndex, Date x) throws SQLException { - setParameter(parameterIndex - , createParameter(x)); + setParameter( + parameterIndex, + createParameter(x) + ); createChain() .preparedStatement_setDate(this, parameterIndex, x); @@ -353,8 +340,10 @@ public void setDate(int parameterIndex, Date x) throws SQLException { @Override public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException { - setParameter(parameterIndex - , createParameter(Types.DATE, x, cal)); + setParameter( + parameterIndex, + createParameter(Types.DATE, x, cal) + ); createChain() .preparedStatement_setDate(this, parameterIndex, x, cal); @@ -362,8 +351,10 @@ public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLExceptio @Override public void setDouble(int parameterIndex, double x) throws SQLException { - setParameter(parameterIndex - , createParameter(Types.DOUBLE, x)); + setParameter( + parameterIndex, + createParameter(Types.DOUBLE, x) + ); createChain() .preparedStatement_setDouble(this, parameterIndex, x); @@ -371,16 +362,20 @@ public void setDouble(int parameterIndex, double x) throws SQLException { @Override public void setFloat(int parameterIndex, float x) throws SQLException { - setParameter(parameterIndex - , createParameter(Types.FLOAT, x)); + setParameter( + parameterIndex, + createParameter(Types.FLOAT, x) + ); createChain().preparedStatement_setFloat(this, parameterIndex, x); } @Override public void setInt(int parameterIndex, int x) throws SQLException { - setParameter(parameterIndex - , createParemeter(x)); + setParameter( + parameterIndex, + createParemeter(x) + ); createChain() .preparedStatement_setInt(this, parameterIndex, x); @@ -388,8 +383,10 @@ public void setInt(int parameterIndex, int x) throws SQLException { @Override public void setLong(int parameterIndex, long x) throws SQLException { - setParameter(parameterIndex - , createParameter(x)); + setParameter( + parameterIndex, + createParameter(x) + ); createChain() .preparedStatement_setLong(this, parameterIndex, x); @@ -397,8 +394,10 @@ public void setLong(int parameterIndex, long x) throws SQLException { @Override public void setNCharacterStream(int parameterIndex, Reader x) throws SQLException { - setParameter(parameterIndex - , createParameter(TYPE.NCharacterInputStream, x)); + setParameter( + parameterIndex, + createParameter(TYPE.NCharacterInputStream, x) + ); createChain() .preparedStatement_setNCharacterStream(this, parameterIndex, x); @@ -626,8 +625,10 @@ public void setShort(int parameterIndex, short x) throws SQLException { @Override public void setString(int parameterIndex, String x) throws SQLException { - setParameter(parameterIndex - , createParameter(x)); + setParameter( + parameterIndex, + createParameter(x) + ); createChain() .preparedStatement_setString(this, parameterIndex, x); @@ -714,7 +715,7 @@ private JdbcParameter createParameter(java.util.Date x) { if (x == null) { return JdbcParameterNull.DATE; } - + return new JdbcParameterDate(x); } @@ -722,7 +723,7 @@ private JdbcParameter createParameter(BigDecimal x) { if (x == null) { return JdbcParameterNull.DECIMAL; } - + return JdbcParameterDecimal.valueOf(x); } @@ -734,7 +735,7 @@ private JdbcParameter createParameter(String x) { if (x.length() == 0) { return JdbcParameterString.empty; } - + return new JdbcParameterString(x); } @@ -742,7 +743,7 @@ private JdbcParameter createParameter(Timestamp x) { if (x == null) { return JdbcParameterNull.TIMESTAMP; } - + return new JdbcParameterTimestamp(x); } @@ -750,7 +751,7 @@ private JdbcParameter createParameter(Object x, int sqlType, int scaleOrLength) if (x == null) { return JdbcParameterNull.valueOf(sqlType); } - + return new JdbcParameterImpl(sqlType, x, -1, null, scaleOrLength); } @@ -758,7 +759,7 @@ private JdbcParameter createParameter(int sqlType, Object value, long length) { if (value == null) { return JdbcParameterNull.valueOf(sqlType); } - + return new JdbcParameterImpl(sqlType, value, length); } @@ -766,7 +767,7 @@ private JdbcParameter createParameter(int sqlType, Object value) { if (value == null) { return JdbcParameterNull.valueOf(sqlType); } - + return new JdbcParameterImpl(sqlType, value); } @@ -774,7 +775,7 @@ public JdbcParameter createParameter(int sqlType, Object value, Calendar calenda if (value == null) { return JdbcParameterNull.valueOf(sqlType); } - + return new JdbcParameterImpl(sqlType, value, calendar); } } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetMetaDataProxy.java b/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetMetaDataProxy.java index 83498a4ecc..4aa4e92168 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetMetaDataProxy.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetMetaDataProxy.java @@ -22,7 +22,6 @@ * @author kiki */ public interface ResultSetMetaDataProxy extends ResultSetMetaData, WrapperProxy { - ResultSetMetaData getResultSetMetaDataRaw(); ResultSetProxy getResultSetProxy(); diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetMetaDataProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetMetaDataProxyImpl.java index 8f22380622..307e368a41 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetMetaDataProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetMetaDataProxyImpl.java @@ -16,22 +16,21 @@ package com.alibaba.druid.proxy.jdbc; +import com.alibaba.druid.filter.FilterChainImpl; + import java.sql.ResultSetMetaData; import java.sql.SQLException; -import com.alibaba.druid.filter.FilterChainImpl; - /** * @author kiki */ public class ResultSetMetaDataProxyImpl extends WrapperProxyImpl implements ResultSetMetaDataProxy { - private final ResultSetMetaData metaData; - private final ResultSetProxy resultSet; + private final ResultSetProxy resultSet; - private FilterChainImpl filterChain = null; + private FilterChainImpl filterChain; - public ResultSetMetaDataProxyImpl(ResultSetMetaData metaData, long id, ResultSetProxy resultSet){ + public ResultSetMetaDataProxyImpl(ResultSetMetaData metaData, long id, ResultSetProxy resultSet) { super(metaData, id); this.metaData = metaData; this.resultSet = resultSet; @@ -199,7 +198,6 @@ public boolean isDefinitelyWritable(int column) throws SQLException { @Override public String getColumnClassName(int column) throws SQLException { - FilterChainImpl chain = createChain(); String value = chain.resultSetMetaData_getColumnClassName(this, column); recycleFilterChain(chain); diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetProxy.java b/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetProxy.java index 19bb846c43..38abfe65a4 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetProxy.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetProxy.java @@ -15,17 +15,16 @@ */ package com.alibaba.druid.proxy.jdbc; +import com.alibaba.druid.stat.JdbcSqlStat; + import java.sql.ResultSet; import java.util.List; import java.util.Map; -import com.alibaba.druid.stat.JdbcSqlStat; - /** * @author wenshao [szujobs@hotmail.com] */ public interface ResultSetProxy extends ResultSet, WrapperProxy { - ResultSet getResultSetRaw(); StatementProxy getStatementProxy(); diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetProxyImpl.java index 7c8f2baec2..6d23beac83 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/ResultSetProxyImpl.java @@ -15,60 +15,45 @@ */ package com.alibaba.druid.proxy.jdbc; +import com.alibaba.druid.filter.FilterChainImpl; +import com.alibaba.druid.stat.JdbcSqlStat; + import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; import java.net.URL; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Date; -import java.sql.NClob; -import java.sql.Ref; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.SQLXML; -import java.sql.Statement; -import java.sql.Time; -import java.sql.Timestamp; +import java.sql.*; import java.util.Calendar; import java.util.List; import java.util.Map; -import com.alibaba.druid.filter.FilterChainImpl; -import com.alibaba.druid.stat.JdbcSqlStat; - /** * @author wenshao [szujobs@hotmail.com] */ public class ResultSetProxyImpl extends WrapperProxyImpl implements ResultSetProxy { + private final ResultSet resultSet; + private final StatementProxy statement; + private final String sql; - private final ResultSet resultSet; - private final StatementProxy statement; - private final String sql; - - protected int cursorIndex = 0; - protected int fetchRowCount = 0; - protected long constructNano; - protected final JdbcSqlStat sqlStat; - private int closeCount = 0; + protected int cursorIndex; + protected int fetchRowCount; + protected long constructNano; + protected final JdbcSqlStat sqlStat; + private int closeCount; - private long readStringLength = 0; - private long readBytesLength = 0; + private long readStringLength; + private long readBytesLength; - private int openInputStreamCount = 0; - private int openReaderCount = 0; + private int openInputStreamCount; + private int openReaderCount; - private Map logicColumnMap = null; - private Map physicalColumnMap = null; - private List hiddenColumns = null; + private Map logicColumnMap; + private Map physicalColumnMap; + private List hiddenColumns; - private FilterChainImpl filterChain = null; + private FilterChainImpl filterChain; - public ResultSetProxyImpl(StatementProxy statement, ResultSet resultSet, long id, String sql){ + public ResultSetProxyImpl(StatementProxy statement, ResultSet resultSet, long id, String sql) { super(resultSet, id); this.statement = statement; this.resultSet = resultSet; diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/StatementExecuteType.java b/src/main/java/com/alibaba/druid/proxy/jdbc/StatementExecuteType.java index 548316f69a..ac2940874f 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/StatementExecuteType.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/StatementExecuteType.java @@ -16,8 +16,8 @@ package com.alibaba.druid.proxy.jdbc; public enum StatementExecuteType { - Execute, - ExecuteBatch, - ExecuteQuery, - ExecuteUpdate + Execute, + ExecuteBatch, + ExecuteQuery, + ExecuteUpdate } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxy.java b/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxy.java index 6be98f95e9..8080da098c 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxy.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxy.java @@ -15,17 +15,16 @@ */ package com.alibaba.druid.proxy.jdbc; +import com.alibaba.druid.stat.JdbcSqlStat; + import java.sql.Statement; import java.util.List; import java.util.Map; -import com.alibaba.druid.stat.JdbcSqlStat; - /** * @author wenshao [szujobs@hotmail.com] */ public interface StatementProxy extends Statement, WrapperProxy { - ConnectionProxy getConnectionProxy(); Statement getRawObject(); @@ -33,27 +32,32 @@ public interface StatementProxy extends Statement, WrapperProxy { List getBatchSqlList(); String getBatchSql(); - + JdbcSqlStat getSqlStat(); - + StatementExecuteType getLastExecuteType(); - + void setSqlStat(JdbcSqlStat sqlStat); String getLastExecuteSql(); - + long getLastExecuteStartNano(); + void setLastExecuteStartNano(long lastExecuteStartNano); + void setLastExecuteStartNano(); - + long getLastExecuteTimeNano(); + void setLastExecuteTimeNano(long nano); + void setLastExecuteTimeNano(); - + Map getParameters(); - + int getParametersSize(); + JdbcParameter getParameter(int i); - + boolean isFirstResultSet(); } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java index 8621e13b81..2b91ff071e 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java @@ -15,38 +15,32 @@ */ package com.alibaba.druid.proxy.jdbc; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.SQLWarning; -import java.sql.Statement; +import com.alibaba.druid.filter.FilterChainImpl; +import com.alibaba.druid.stat.JdbcSqlStat; + +import java.sql.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import com.alibaba.druid.filter.FilterChainImpl; -import com.alibaba.druid.stat.JdbcSqlStat; - /** * @author wenshao [szujobs@hotmail.com] */ public class StatementProxyImpl extends WrapperProxyImpl implements StatementProxy { - - private final ConnectionProxy connection; - protected Statement statement; - protected String lastExecuteSql; - protected long lastExecuteStartNano; - protected long lastExecuteTimeNano; - protected JdbcSqlStat sqlStat; - protected boolean firstResultSet; - protected ArrayList batchSqlList; - protected StatementExecuteType lastExecuteType; - protected Integer updateCount; - private FilterChainImpl filterChain; - - public StatementProxyImpl(ConnectionProxy connection, Statement statement, long id){ + private final ConnectionProxy connection; + protected Statement statement; + protected String lastExecuteSql; + protected long lastExecuteStartNano; + protected long lastExecuteTimeNano; + protected JdbcSqlStat sqlStat; + protected boolean firstResultSet; + protected ArrayList batchSqlList; + protected StatementExecuteType lastExecuteType; + protected Integer updateCount; + private FilterChainImpl filterChain; + + public StatementProxyImpl(ConnectionProxy connection, Statement statement, long id) { super(statement, id); this.connection = connection; this.statement = statement; diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/TransactionInfo.java b/src/main/java/com/alibaba/druid/proxy/jdbc/TransactionInfo.java index 7597accf17..6c4839af4a 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/TransactionInfo.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/TransactionInfo.java @@ -17,8 +17,7 @@ // compatible for druid 0.1.19 public class TransactionInfo extends com.alibaba.druid.util.TransactionInfo { - - public TransactionInfo(long id){ + public TransactionInfo(long id) { super(id); } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/WrapperProxy.java b/src/main/java/com/alibaba/druid/proxy/jdbc/WrapperProxy.java index 1999535d0a..cdc24809a6 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/WrapperProxy.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/WrapperProxy.java @@ -22,7 +22,6 @@ * @author wenshao [szujobs@hotmail.com] */ public interface WrapperProxy extends Wrapper { - long getId(); Object getRawObject(); diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/WrapperProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/WrapperProxyImpl.java index 4ba91fd646..7eb1da6805 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/WrapperProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/WrapperProxyImpl.java @@ -15,25 +15,24 @@ */ package com.alibaba.druid.proxy.jdbc; +import com.alibaba.druid.filter.FilterChain; + import java.sql.SQLException; import java.sql.Wrapper; import java.util.HashMap; import java.util.Map; -import com.alibaba.druid.filter.FilterChain; - /** * @author wenshao [szujobs@hotmail.com] */ public abstract class WrapperProxyImpl implements WrapperProxy { + private final Wrapper raw; - private final Wrapper raw; - - private final long id; + private final long id; private Map attributes; // 不需要线程安全 - public WrapperProxyImpl(Wrapper wrapper, long id){ + public WrapperProxyImpl(Wrapper wrapper, long id) { this.raw = wrapper; this.id = id; } @@ -74,20 +73,20 @@ public T unwrap(Class iface) throws SQLException { return createChain().unwrap(raw, iface); } - + public int getAttributesSize() { if (attributes == null) { return 0; } - + return attributes.size(); } - + public void clearAttributes() { if (this.attributes == null) { return; } - + this.attributes.clear(); } @@ -97,7 +96,7 @@ public Map getAttributes() { } return this.attributes; } - + public void putAttribute(String key, Object value) { if (attributes == null) { attributes = new HashMap(4); @@ -105,12 +104,12 @@ public void putAttribute(String key, Object value) { this.attributes.put(key, value); } - public Object getAttribute(String key){ + public Object getAttribute(String key) { if (attributes == null) { return null; } - + return this.attributes.get(key); } - + } diff --git a/src/main/java/com/alibaba/druid/sql/PagerUtils.java b/src/main/java/com/alibaba/druid/sql/PagerUtils.java index 527f458115..51b0cb19d0 100644 --- a/src/main/java/com/alibaba/druid/sql/PagerUtils.java +++ b/src/main/java/com/alibaba/druid/sql/PagerUtils.java @@ -34,7 +34,6 @@ import java.util.List; public class PagerUtils { - public static String count(String sql, DbType dbType) { List stmtList = SQLUtils.parseStatements(sql, dbType); @@ -176,7 +175,11 @@ private static boolean limitQueryBlock(SQLSelect select, DbType dbType, int offs } } - private static boolean limitSQLQueryBlock(SQLSelectQueryBlock queryBlock, DbType dbType, int offset, int count, boolean check) { + private static boolean limitSQLQueryBlock(SQLSelectQueryBlock queryBlock, + DbType dbType, + int offset, + int count, + boolean check) { SQLLimit limit = queryBlock.getLimit(); if (limit != null) { if (offset > 0) { @@ -205,13 +208,13 @@ private static boolean limitSQLQueryBlock(SQLSelectQueryBlock queryBlock, DbType private static boolean limitDB2(SQLSelect select, DbType dbType, int offset, int count, boolean check) { SQLSelectQuery query = select.getQuery(); - SQLBinaryOpExpr gt = new SQLBinaryOpExpr(new SQLIdentifierExpr("ROWNUM"), // - SQLBinaryOperator.GreaterThan, // - new SQLNumberExpr(offset), // + SQLBinaryOpExpr gt = new SQLBinaryOpExpr(new SQLIdentifierExpr("ROWNUM"), + SQLBinaryOperator.GreaterThan, + new SQLNumberExpr(offset), DbType.db2); - SQLBinaryOpExpr lteq = new SQLBinaryOpExpr(new SQLIdentifierExpr("ROWNUM"), // - SQLBinaryOperator.LessThanOrEqual, // - new SQLNumberExpr(count + offset), // + SQLBinaryOpExpr lteq = new SQLBinaryOpExpr(new SQLIdentifierExpr("ROWNUM"), + SQLBinaryOperator.LessThanOrEqual, + new SQLNumberExpr(count + offset), DbType.db2); SQLBinaryOpExpr pageCondition = new SQLBinaryOpExpr(gt, SQLBinaryOperator.BooleanAnd, lteq, DbType.db2); @@ -231,15 +234,15 @@ private static boolean limitDB2(SQLSelect select, DbType dbType, int offset, int SQLAggregateExpr aggregateExpr = new SQLAggregateExpr("ROW_NUMBER"); SQLOrderBy orderBy = select.getOrderBy(); - + if (orderBy == null && select.getQuery() instanceof SQLSelectQueryBlock) { SQLSelectQueryBlock selectQueryBlcok = (SQLSelectQueryBlock) select.getQuery(); orderBy = selectQueryBlcok.getOrderBy(); selectQueryBlcok.setOrderBy(null); } else { - select.setOrderBy(null); + select.setOrderBy(null); } - + aggregateExpr.setOver(new SQLOver(orderBy)); queryBlock.getSelectList().add(new SQLSelectItem(aggregateExpr, "ROWNUM")); @@ -284,13 +287,13 @@ private static boolean limitDB2(SQLSelect select, DbType dbType, int offset, int private static boolean limitSQLServer(SQLSelect select, DbType dbType, int offset, int count, boolean check) { SQLSelectQuery query = select.getQuery(); - SQLBinaryOpExpr gt = new SQLBinaryOpExpr(new SQLIdentifierExpr("ROWNUM"), // - SQLBinaryOperator.GreaterThan, // - new SQLNumberExpr(offset), // + SQLBinaryOpExpr gt = new SQLBinaryOpExpr(new SQLIdentifierExpr("ROWNUM"), + SQLBinaryOperator.GreaterThan, + new SQLNumberExpr(offset), DbType.sqlserver); - SQLBinaryOpExpr lteq = new SQLBinaryOpExpr(new SQLIdentifierExpr("ROWNUM"), // - SQLBinaryOperator.LessThanOrEqual, // - new SQLNumberExpr(count + offset), // + SQLBinaryOpExpr lteq = new SQLBinaryOpExpr(new SQLIdentifierExpr("ROWNUM"), + SQLBinaryOperator.LessThanOrEqual, + new SQLNumberExpr(count + offset), DbType.sqlserver); SQLBinaryOpExpr pageCondition = new SQLBinaryOpExpr(gt, SQLBinaryOperator.BooleanAnd, lteq, DbType.sqlserver); @@ -314,7 +317,7 @@ private static boolean limitSQLServer(SQLSelect select, DbType dbType, int offse if (orderBy != null) { aggregateExpr.setOver(new SQLOver(orderBy)); select.setOrderBy(null); - } else if (queryBlock.getOrderBy() != null){ + } else if (queryBlock.getOrderBy() != null) { aggregateExpr.setOver(new SQLOver(queryBlock.getOrderBy())); queryBlock.setOrderBy(null); } @@ -373,7 +376,6 @@ private static boolean limitOracle(SQLSelect select, DbType dbType, int offset, if (queryBlock.getGroupBy() == null && orderBy == null && offset <= 0) { - SQLExpr where = queryBlock.getWhere(); if (check && where instanceof SQLBinaryOpExpr) { SQLBinaryOpExpr binaryOpWhere = (SQLBinaryOpExpr) where; @@ -391,16 +393,16 @@ private static boolean limitOracle(SQLSelect select, DbType dbType, int offset, } } - SQLExpr condition = new SQLBinaryOpExpr(new SQLIdentifierExpr("ROWNUM"), // - SQLBinaryOperator.LessThanOrEqual, // - new SQLNumberExpr(count), // + SQLExpr condition = new SQLBinaryOpExpr(new SQLIdentifierExpr("ROWNUM"), + SQLBinaryOperator.LessThanOrEqual, + new SQLNumberExpr(count), DbType.oracle); if (queryBlock.getWhere() == null) { queryBlock.setWhere(condition); } else { - queryBlock.setWhere(new SQLBinaryOpExpr(queryBlock.getWhere(), // - SQLBinaryOperator.BooleanAnd, // - condition, // + queryBlock.setWhere(new SQLBinaryOpExpr(queryBlock.getWhere(), + SQLBinaryOperator.BooleanAnd, + condition, DbType.oracle)); } @@ -413,9 +415,9 @@ private static boolean limitOracle(SQLSelect select, DbType dbType, int offset, countQueryBlock.getSelectList().add(new SQLSelectItem(new SQLIdentifierExpr("ROWNUM"), "RN")); countQueryBlock.setFrom(new SQLSubqueryTableSource(select.clone(), "XX")); - countQueryBlock.setWhere(new SQLBinaryOpExpr(new SQLIdentifierExpr("ROWNUM"), // - SQLBinaryOperator.LessThanOrEqual, // - new SQLNumberExpr(count + offset), // + countQueryBlock.setWhere(new SQLBinaryOpExpr(new SQLIdentifierExpr("ROWNUM"), + SQLBinaryOperator.LessThanOrEqual, + new SQLNumberExpr(count + offset), DbType.oracle)); select.setOrderBy(null); @@ -427,16 +429,20 @@ private static boolean limitOracle(SQLSelect select, DbType dbType, int offset, OracleSelectQueryBlock offsetQueryBlock = new OracleSelectQueryBlock(); offsetQueryBlock.getSelectList().add(new SQLSelectItem(new SQLAllColumnExpr())); offsetQueryBlock.setFrom(new SQLSubqueryTableSource(new SQLSelect(countQueryBlock), "XXX")); - offsetQueryBlock.setWhere(new SQLBinaryOpExpr(new SQLIdentifierExpr("RN"), // - SQLBinaryOperator.GreaterThan, // - new SQLNumberExpr(offset), // + offsetQueryBlock.setWhere(new SQLBinaryOpExpr(new SQLIdentifierExpr("RN"), + SQLBinaryOperator.GreaterThan, + new SQLNumberExpr(offset), DbType.oracle)); select.setQuery(offsetQueryBlock); return true; } - private static boolean limitMySqlQueryBlock(SQLSelectQueryBlock queryBlock, DbType dbType, int offset, int count, boolean check) { + private static boolean limitMySqlQueryBlock(SQLSelectQueryBlock queryBlock, + DbType dbType, + int offset, + int count, + boolean check) { SQLLimit limit = queryBlock.getLimit(); if (limit != null) { if (offset > 0) { @@ -491,7 +497,7 @@ private static String count(SQLSelect select, DbType dbType) { } return createCountUseSubQuery(select, dbType); } - + int option = queryBlock.getDistionOption(); if (option == SQLSetQuantifier.DISTINCT && selectList.size() >= 1) { @@ -584,9 +590,8 @@ private static void clearOrderBy(SQLSelectQuery query) { clearOrderBy(union.getRight()); } } - + /** - * * @param sql * @param dbType * @return if not exists limit, return -1; @@ -636,7 +641,7 @@ public static int getLimit(String sql, DbType dbType) { return -1; } } - + return -1; } @@ -644,7 +649,6 @@ public static boolean hasUnorderedLimit(String sql, DbType dbType) { List stmtList = SQLUtils.parseStatements(sql, dbType); if (JdbcUtils.isMysqlDbType(dbType)) { - MySqlUnorderedLimitDetectVisitor visitor = new MySqlUnorderedLimitDetectVisitor(); for (SQLStatement stmt : stmtList) { @@ -737,7 +741,6 @@ public boolean visit(SQLBinaryOpExpr x) { } } - if (selectQuery != null) { SQLOrderBy orderBy = selectQuery.getOrderBy(); diff --git a/src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java b/src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java index f79006f969..b81ef68b36 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java @@ -18,26 +18,8 @@ import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLDataTypeImpl; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; -import com.alibaba.druid.sql.ast.expr.SQLCaseExpr; -import com.alibaba.druid.sql.ast.expr.SQLCharExpr; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntervalExpr; -import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; -import com.alibaba.druid.sql.ast.expr.SQLNullExpr; -import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr; -import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; -import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; -import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; -import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; -import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource; -import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; -import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; -import com.alibaba.druid.sql.ast.statement.SQLTableSource; -import com.alibaba.druid.sql.ast.statement.SQLWithSubqueryClause; +import com.alibaba.druid.sql.ast.expr.*; +import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleWithSubqueryEntry; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleSysdateExpr; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectJoin; @@ -204,7 +186,6 @@ public static SQLDataType transformOracleToMySql(SQLDataType x) { } else if (nameHash == FnvHash.Constants.DEC || nameHash == FnvHash.Constants.DECIMAL) { - dataType = x.clone(); dataType.setName("decimal"); @@ -385,7 +366,7 @@ public static SQLDataType transformOracleToAliyunAds(SQLDataType x) { || dataTypeName.equals("long") || dataTypeName.equals("long raw") || dataTypeName.equals("raw") - ) { + ) { dataType = new SQLCharacterDataType("varchar"); } else if (dataTypeName.equals("number") || dataTypeName.equals("decimal") @@ -815,7 +796,6 @@ public static SQLSelectQueryBlock transformOracleToPostgresql(SQLSelectQueryBloc return x; } - public static SQLDataType transformOracleToPPAS(SQLDataType x) { final String name = x.getName(); final long nameHash = x.nameHashCode64(); diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java index 7fc4bf491d..0430067468 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java @@ -64,9 +64,9 @@ import java.util.TimeZone; public class SQLUtils { - public final static Charset UTF8 = Charset.forName("UTF-8"); + public static final Charset UTF8 = Charset.forName("UTF-8"); - private final static SQLParserFeature[] FORMAT_DEFAULT_FEATURES = { + private static final SQLParserFeature[] FORMAT_DEFAULT_FEATURES = { SQLParserFeature.KeepComments, SQLParserFeature.EnableSQLBinaryOpExprGroup }; @@ -75,7 +75,7 @@ public class SQLUtils { public static FormatOption DEFAULT_LCASE_FORMAT_OPTION = new FormatOption(false, true); - private final static Log LOG = LogFactory.getLog(SQLUtils.class); + private static final Log LOG = LogFactory.getLog(SQLUtils.class); public static String toSQLString(SQLObject sqlObject, String dbType) { return toSQLString(sqlObject, DbType.valueOf(dbType)); @@ -89,7 +89,10 @@ public static String toSQLString(SQLObject sqlObject, DbType dbType, FormatOptio return toSQLString(sqlObject, dbType, option, null); } - public static String toSQLString(SQLObject sqlObject, DbType dbType, FormatOption option, VisitorFeature... features) { + public static String toSQLString(SQLObject sqlObject, + DbType dbType, + FormatOption option, + VisitorFeature... features) { StringBuilder out = new StringBuilder(); SQLASTOutputVisitor visitor = createOutputVisitor(out, dbType); @@ -146,13 +149,14 @@ public static String toOdpsString(SQLObject sqlObject, FormatOption option) { return toSQLString(sqlObject, DbType.odps, option); } - public static String toAntsparkString(SQLObject sqlObject){ - return toAntsparkString(sqlObject,null); + public static String toAntsparkString(SQLObject sqlObject) { + return toAntsparkString(sqlObject, null); } public static String toAntsparkString(SQLObject sqlObject, FormatOption option) { return toSQLString(sqlObject, DbType.antspark, option); } + public static String toMySqlString(SQLObject sqlObject) { return toMySqlString(sqlObject, (FormatOption) null); } @@ -209,9 +213,9 @@ public static String formatPresto(String sql) { } public static String formatPresto(String sql, FormatOption option) { - SQLParserFeature[] features = { SQLParserFeature.KeepComments, - SQLParserFeature.EnableSQLBinaryOpExprGroup, - SQLParserFeature.KeepNameQuotes}; + SQLParserFeature[] features = {SQLParserFeature.KeepComments, + SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.KeepNameQuotes}; return format(sql, DbType.mysql, null, option, features); } @@ -272,7 +276,7 @@ public static SQLExpr toSQLExpr(String sql, DbType dbType) { SQLExpr expr = parser.expr(); if (parser.getLexer().token() != Token.EOF) { - throw new ParserException("illegal sql expr : " + sql +", " +parser.getLexer().info()); + throw new ParserException("illegal sql expr : " + sql + ", " + parser.getLexer().info()); } return expr; @@ -364,15 +368,20 @@ public static String toSQLString(List statementList, DbType dbType return toSQLString(statementList, dbType, parameters, null, null); } - public static String toSQLString(List statementList, DbType dbType, List parameters, FormatOption option) { + public static String toSQLString(List statementList, + DbType dbType, + List parameters, + FormatOption option) { return toSQLString(statementList, dbType, parameters, option, null); } - public static String toSQLString(List statementList - , DbType dbType - , List parameters - , FormatOption option - , Map tableMapping) { + public static String toSQLString( + List statementList, + DbType dbType, + List parameters, + FormatOption option, + Map tableMapping + ) { StringBuilder out = new StringBuilder(); SQLASTOutputVisitor visitor = createFormatOutputVisitor(out, statementList, dbType); if (parameters != null) { @@ -405,7 +414,7 @@ public static String toSQLString(List statementList } List comments = preStmt.getAfterCommentsDirect(); - if (comments != null){ + if (comments != null) { for (int j = 0; j < comments.size(); ++j) { String comment = comments.get(j); if (j != 0) { @@ -437,7 +446,7 @@ public static String toSQLString(List statementList if (i == size - 1) { List comments = stmt.getAfterCommentsDirect(); - if (comments != null){ + if (comments != null) { for (int j = 0; j < comments.size(); ++j) { String comment = comments.get(j); if (j != 0) { @@ -456,8 +465,8 @@ public static SQLASTOutputVisitor createOutputVisitor(Appendable out, DbType dbT return createFormatOutputVisitor(out, null, dbType); } - public static SQLASTOutputVisitor createFormatOutputVisitor(Appendable out, // - List statementList, // + public static SQLASTOutputVisitor createFormatOutputVisitor(Appendable out, + List statementList, DbType dbType) { if (dbType == null) { if (statementList != null && statementList.size() > 0) { @@ -588,7 +597,6 @@ public static List parseStatements(String sql, String dbType) { return parseStatements(sql, dbType, new SQLParserFeature[0]); } - public static List parseStatements(String sql, DbType dbType) { return parseStatements(sql, dbType, new SQLParserFeature[0]); } @@ -630,32 +638,40 @@ public static SQLStatement parseSingleMysqlStatement(String sql) { } /** - * @author owenludong.lud * @param columnName * @param tableAlias - * @param pattern if pattern is null,it will be set {%Y-%m-%d %H:%i:%s} as mysql default value and set {yyyy-mm-dd - * hh24:mi:ss} as oracle default value - * @param dbType {@link DbType} if dbType is null ,it will be set the mysql as a default value + * @param pattern if pattern is null,it will be set {%Y-%m-%d %H:%i:%s} as mysql default value and set {yyyy-mm-dd + * hh24:mi:ss} as oracle default value + * @param dbType {@link DbType} if dbType is null ,it will be set the mysql as a default value + * @author owenludong.lud */ public static String buildToDate(String columnName, String tableAlias, String pattern, DbType dbType) { StringBuilder sql = new StringBuilder(); - if (StringUtils.isEmpty(columnName)) return ""; + if (StringUtils.isEmpty(columnName)) { + return ""; + } if (dbType == null) { dbType = DbType.mysql; } String formatMethod = ""; if (JdbcUtils.isMysqlDbType(dbType)) { formatMethod = "STR_TO_DATE"; - if (StringUtils.isEmpty(pattern)) pattern = "%Y-%m-%d %H:%i:%s"; + if (StringUtils.isEmpty(pattern)) { + pattern = "%Y-%m-%d %H:%i:%s"; + } } else if (DbType.oracle == dbType) { formatMethod = "TO_DATE"; - if (StringUtils.isEmpty(pattern)) pattern = "yyyy-mm-dd hh24:mi:ss"; + if (StringUtils.isEmpty(pattern)) { + pattern = "yyyy-mm-dd hh24:mi:ss"; + } } else { return ""; // expand date's handle method for other database } sql.append(formatMethod).append("("); - if (!StringUtils.isEmpty(tableAlias)) sql.append(tableAlias).append("."); + if (!StringUtils.isEmpty(tableAlias)) { + sql.append(tableAlias).append("."); + } sql.append(columnName).append(","); sql.append("'"); sql.append(pattern); @@ -823,11 +839,12 @@ public static void addSelectItem(SQLSelectQueryBlock queryBlock, SQLExpr expr, S } public static class FormatOption { - private int features = VisitorFeature.of(VisitorFeature.OutputUCase - , VisitorFeature.OutputPrettyFormat); + private int features = VisitorFeature.of( + VisitorFeature.OutputUCase, + VisitorFeature.OutputPrettyFormat + ); public FormatOption() { - } public FormatOption(VisitorFeature... features) { @@ -899,7 +916,7 @@ public static long hash(String sql, DbType dbType) { StringBuilder buf = new StringBuilder(sql.length()); - for (;;) { + for (; ; ) { lexer.nextToken(); Token token = lexer.token(); @@ -912,7 +929,7 @@ public static long hash(String sql, DbType dbType) { } if (buf.length() != 0) { - + // skip } } @@ -926,7 +943,7 @@ public static SQLExpr not(SQLExpr expr) { SQLBinaryOperator notOp = null; - switch (op){ + switch (op) { case Equality: notOp = SQLBinaryOperator.LessThanOrGreater; break; @@ -955,7 +972,6 @@ public static SQLExpr not(SQLExpr expr) { break; } - if (notOp != null) { return new SQLBinaryOpExpr(binaryOpExpr.getLeft(), notOp, binaryOpExpr.getRight()); } @@ -1011,7 +1027,7 @@ private static String _normalize(String name, DbType dbType, boolean isForced, b } } - if(!isForced) { + if (!isForced) { if (DbType.oracle == dbType) { if (OracleUtils.isKeyword(normalizeName)) { return name; @@ -1139,7 +1155,6 @@ public static boolean replaceInParent(SQLSelectQuery cmp, SQLSelectQuery dest) { return false; } - if (parent instanceof SQLUnionQuery) { return ((SQLUnionQuery) parent).replace(cmp, dest); } @@ -1162,6 +1177,7 @@ public static String desensitizeTable(String tableName) { /** * 重新排序建表语句，解决建表语句的依赖关系 + * * @param sql * @param dbType */ @@ -1172,10 +1188,9 @@ public static String sort(String sql, DbType dbType) { } /** - * * @param query * @param dbType - * @return 0：sql.toString, 1: + * @return 0：sql.toString, 1: */ public static Object[] clearLimit(String query, DbType dbType) { List stmtList = SQLUtils.parseStatements(query, dbType); @@ -1211,7 +1226,7 @@ public static Object[] clearLimit(String query, DbType dbType) { } String sql = SQLUtils.toSQLString(stmtList, dbType); - return new Object[]{ sql, limit}; + return new Object[]{sql, limit}; } private static SQLLimit clearLimit(SQLSelectQueryBlock queryBlock) { @@ -1291,12 +1306,12 @@ public static List splitInsertValues(DbType dbType, String i insertTemplate.getValuesList().clear(); int batchCount = 0; - if( totalSize % size == 0) { + if (totalSize % size == 0) { batchCount = totalSize / size; } else { batchCount = (totalSize / size) + 1; } - for (int i = 0; i < batchCount; i++){ + for (int i = 0; i < batchCount; i++) { SQLInsertStatement subInsertStatement = new SQLInsertStatement(); insertTemplate.cloneTo(subInsertStatement); @@ -1313,7 +1328,6 @@ public static List splitInsertValues(DbType dbType, String i } static class TimeZoneVisitor extends SQLASTVisitorAdapter { - private TimeZone from; private TimeZone to; @@ -1334,4 +1348,3 @@ public boolean visit(SQLTimestampExpr x) { } } - diff --git a/src/main/java/com/alibaba/druid/sql/ast/AutoIncrementType.java b/src/main/java/com/alibaba/druid/sql/ast/AutoIncrementType.java index 361c36d44b..94ad3fc9bb 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/AutoIncrementType.java +++ b/src/main/java/com/alibaba/druid/sql/ast/AutoIncrementType.java @@ -10,9 +10,8 @@ public String getKeyword() { return this.keyword; } - private AutoIncrementType(String keyword){ + private AutoIncrementType(String keyword) { this.keyword = keyword; } - } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLAdhocTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/SQLAdhocTableSource.java index 346a953e26..e774632d8a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLAdhocTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLAdhocTableSource.java @@ -2,7 +2,6 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.ast.statement.SQLTableSourceImpl; -import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateTableStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAdhocTableSource extends SQLTableSourceImpl { diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLAnnIndex.java b/src/main/java/com/alibaba/druid/sql/ast/SQLAnnIndex.java index 19bce7ce00..9e0e7978a9 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLAnnIndex.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLAnnIndex.java @@ -3,8 +3,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAnnIndex extends SQLObjectImpl { - private int indexType; - private int rtIndexType; + private int indexType; + private int rtIndexType; private Distance distance; public SQLAnnIndex clone() { @@ -17,9 +17,7 @@ public SQLAnnIndex clone() { @Override protected void accept0(SQLASTVisitor v) { - if (v.visit(this)) { - - } + v.visit(this); v.endVisit(this); } @@ -83,7 +81,7 @@ public static enum IndexType { public final int mask; - IndexType(int ordinal){ + IndexType(int ordinal) { mask = (1 << ordinal); } @@ -98,8 +96,7 @@ private static int of(String type) { if (item.trim().equalsIgnoreCase("Flat")) { v |= Flat.mask; } else if (item.trim().equalsIgnoreCase("FastIndex") - || item.trim().equalsIgnoreCase("FAST_INDEX")) - { + || item.trim().equalsIgnoreCase("FAST_INDEX")) { v |= FastIndex.mask; } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLArrayDataType.java b/src/main/java/com/alibaba/druid/sql/ast/SQLArrayDataType.java index acc0860a70..660acd2ea8 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLArrayDataType.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLArrayDataType.java @@ -12,8 +12,8 @@ public class SQLArrayDataType extends SQLObjectImpl implements SQLDataType { public static final SQLArrayDataType ARRYA_CHAR = new SQLArrayDataType(SQLCharExpr.DATA_TYPE); - private DbType dbType; - private SQLDataType componentType; + private DbType dbType; + private SQLDataType componentType; private List arguments = new ArrayList(); public SQLArrayDataType(SQLDataType componentType) { 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 290aac213d..8a98c874f6 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLCommentHint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLCommentHint.java @@ -15,18 +15,15 @@ */ package com.alibaba.druid.sql.ast; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCommentHint extends SQLObjectImpl implements SQLHint { - private String text; - public SQLCommentHint(){ - + public SQLCommentHint() { } - public SQLCommentHint(String text){ + public SQLCommentHint(String text) { this.text = text; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentTimeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentTimeExpr.java index faadcaa117..d5eac1a62b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentTimeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentTimeExpr.java @@ -25,8 +25,12 @@ public Type getType() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (getClass() != o.getClass()) { + return false; + } SQLCurrentTimeExpr that = (SQLCurrentTimeExpr) o; @@ -50,16 +54,14 @@ public static enum Type { CURRENT_TIMESTAMP("CURRENT_TIMESTAMP"), LOCALTIME("LOCALTIME"), LOCALTIMESTAMP("LOCALTIMESTAMP"), - SYSDATE("SYSDATE"), - ; + SYSDATE("SYSDATE"); public final String name; - public final String name_lower; + public final String nameLCase; - Type(String name) - { + Type(String name) { this.name = name; - this.name_lower = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentUserExpr.java b/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentUserExpr.java index 8a975220ad..e9fc2e7d0c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentUserExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLCurrentUserExpr.java @@ -3,7 +3,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCurrentUserExpr extends SQLExprImpl { - public SQLCurrentUserExpr() { } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLDataType.java b/src/main/java/com/alibaba/druid/sql/ast/SQLDataType.java index c21b481a24..c9866094f7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLDataType.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLDataType.java @@ -20,7 +20,6 @@ import java.util.List; public interface SQLDataType extends SQLObject { - String getName(); long nameHashCode64(); @@ -30,14 +29,17 @@ public interface SQLDataType extends SQLObject { List getArguments(); Boolean getWithTimeZone(); - void setWithTimeZone(Boolean value); + + void setWithTimeZone(Boolean value); boolean isWithLocalTimeZone(); + void setWithLocalTimeZone(boolean value); SQLDataType clone(); void setDbType(DbType dbType); + DbType getDbType(); int jdbcType(); @@ -69,7 +71,10 @@ interface Constants { } boolean isInt(); + boolean isNumberic(); + public boolean isString(); + public boolean hasKeyLength(); } 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 0eff1cf76c..efcc8810e2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java @@ -26,25 +26,23 @@ import java.util.List; public class SQLDataTypeImpl extends SQLObjectImpl implements SQLDataType, SQLDbTypedObject { - - private String name; - private long nameHashCode64; + private String name; + private long nameHashCode64; protected final List arguments = new ArrayList(); - private Boolean withTimeZone; - private boolean withLocalTimeZone = false; - private DbType dbType; + private Boolean withTimeZone; + private boolean withLocalTimeZone; + private DbType dbType; - private boolean unsigned; - private boolean zerofill; + private boolean unsigned; + private boolean zerofill; // for oracle - private SQLExpr indexBy; - - public SQLDataTypeImpl(){ + private SQLExpr indexBy; + public SQLDataTypeImpl() { } - public SQLDataTypeImpl(String name){ + public SQLDataTypeImpl(String name) { this.name = name; } @@ -97,7 +95,7 @@ public void setName(String name) { public List getArguments() { return this.arguments; } - + public void addArgument(SQLExpr argument) { if (argument != null) { argument.setParent(this); @@ -107,13 +105,19 @@ public void addArgument(SQLExpr argument) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLDataTypeImpl dataType = (SQLDataTypeImpl) o; - if (name != null ? !name.equals(dataType.name) : dataType.name != null) return false; - if (!arguments.equals(dataType.arguments)){ + if (name != null ? !name.equals(dataType.name) : dataType.name != null) { + return false; + } + if (!arguments.equals(dataType.arguments)) { return false; } return withTimeZone != null ? withTimeZone.equals(dataType.withTimeZone) : dataType.withTimeZone == null; @@ -122,7 +126,7 @@ public boolean equals(Object o) { @Override public int hashCode() { long value = nameHashCode64(); - return (int)(value ^ (value >>> 32)); + return (int) (value ^ (value >>> 32)); } @Override @@ -315,7 +319,6 @@ public int jdbcType() { return Types.NCLOB; } - if (nameNash == FnvHash.Constants.TINYBLOB) { return Types.VARBINARY; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeRefExpr.java b/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeRefExpr.java index 2201e8a2f2..740401c7f0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeRefExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeRefExpr.java @@ -22,8 +22,12 @@ public void setDataType(SQLDataType x) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLDataTypeRefExpr that = (SQLDataTypeRefExpr) o; diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLDbTypedObject.java b/src/main/java/com/alibaba/druid/sql/ast/SQLDbTypedObject.java index 625a5fcacc..5a3a96729d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLDbTypedObject.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLDbTypedObject.java @@ -16,7 +16,6 @@ package com.alibaba.druid.sql.ast; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; public interface SQLDbTypedObject extends SQLObject { DbType getDbType(); diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLDeclareItem.java b/src/main/java/com/alibaba/druid/sql/ast/SQLDeclareItem.java index f108387d57..f58b4c93a3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLDeclareItem.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLDeclareItem.java @@ -22,21 +22,19 @@ import java.util.List; public class SQLDeclareItem extends SQLObjectImpl implements SQLObjectWithDataType, SQLReplaceable { + protected Type type; - protected Type type; + protected SQLName name; - protected SQLName name; + protected SQLDataType dataType; - protected SQLDataType dataType; - - protected SQLExpr value; + protected SQLExpr value; protected List tableElementList = new ArrayList(); - protected transient SQLObject resolvedObject; + protected transient SQLObject resolvedObject; public SQLDeclareItem() { - } public SQLDeclareItem(SQLName name, SQLDataType dataType) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLExpr.java b/src/main/java/com/alibaba/druid/sql/ast/SQLExpr.java index 79884b0db1..41d46d272e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLExpr.java @@ -18,8 +18,11 @@ import java.util.List; public interface SQLExpr extends SQLObject, Cloneable { - SQLExpr clone(); + SQLExpr clone(); + SQLDataType computeDataType(); + List getChildren(); + SQLCommentHint getHint(); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLExprComparor.java b/src/main/java/com/alibaba/druid/sql/ast/SQLExprComparor.java index 479b5f43b0..9bab7ff0fe 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLExprComparor.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLExprComparor.java @@ -3,7 +3,7 @@ import java.util.Comparator; public class SQLExprComparor implements Comparator { - public final static SQLExprComparor instance = new SQLExprComparor(); + public static final SQLExprComparor instance = new SQLExprComparor(); @Override public int compare(SQLExpr a, SQLExpr b) { 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 380875eabc..afbe333629 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java @@ -18,9 +18,7 @@ import java.util.List; public abstract class SQLExprImpl extends SQLObjectImpl implements SQLExpr { - - public SQLExprImpl(){ - + public SQLExprImpl() { } public abstract boolean equals(Object o); diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLHint.java b/src/main/java/com/alibaba/druid/sql/ast/SQLHint.java index 0191d19b1d..7576fa6136 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLHint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLHint.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.sql.ast; - public interface SQLHint extends SQLObject { SQLHint clone(); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLIndex.java b/src/main/java/com/alibaba/druid/sql/ast/SQLIndex.java index f6ff611309..457f4adf5a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLIndex.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLIndex.java @@ -1,12 +1,11 @@ package com.alibaba.druid.sql.ast; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; import java.util.List; public interface SQLIndex extends SQLObject { List getCovering(); + List getColumns(); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLIndexDefinition.java b/src/main/java/com/alibaba/druid/sql/ast/SQLIndexDefinition.java index c75cebf781..d125899abe 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLIndexDefinition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLIndexDefinition.java @@ -16,7 +16,6 @@ * Date 2019-06-04 11:27 */ public class SQLIndexDefinition extends SQLObjectImpl implements SQLIndex { - /** * [CONSTRAINT [symbol]] [GLOBAL|LOCAL] [FULLTEXT|SPATIAL|UNIQUE|PRIMARY] [INDEX|KEY] * [index_name] [index_type] (key_part,...) [COVERING (col_name,...)] [index_option] ... diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLIndexOptions.java b/src/main/java/com/alibaba/druid/sql/ast/SQLIndexOptions.java index 71363e84cf..b0afbeaed8 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLIndexOptions.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLIndexOptions.java @@ -13,7 +13,6 @@ * Date 2019-06-04 11:48 */ public class SQLIndexOptions extends SQLObjectImpl { - private String indexType; // Using btree/hash private SQLExpr keyBlockSize; private String parserName; @@ -25,7 +24,6 @@ public class SQLIndexOptions extends SQLObjectImpl { private List otherOptions = new ArrayList(); public SQLIndexOptions() { - } public String getIndexType() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLJSONValueExpr.java b/src/main/java/com/alibaba/druid/sql/ast/SQLJSONValueExpr.java index c01bbbfd4d..3dcbf127c4 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLJSONValueExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLJSONValueExpr.java @@ -18,7 +18,6 @@ public int hashCode() { @Override protected void accept0(SQLASTVisitor v) { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLKeep.java b/src/main/java/com/alibaba/druid/sql/ast/SQLKeep.java index 935d4596c8..90f399910c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLKeep.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLKeep.java @@ -18,8 +18,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public final class SQLKeep extends SQLObjectImpl { - - protected DenseRank denseRank; + protected DenseRank denseRank; protected SQLOrderBy orderBy; @@ -50,7 +49,6 @@ public void setOrderBy(SQLOrderBy orderBy) { this.orderBy = orderBy; } - public SQLKeep clone() { SQLKeep x = new SQLKeep(); @@ -64,7 +62,7 @@ public SQLKeep clone() { } public static enum DenseRank { - FIRST, // - LAST + FIRST, + LAST } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLLimit.java b/src/main/java/com/alibaba/druid/sql/ast/SQLLimit.java index 2bc82adeae..b561d2762d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLLimit.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLLimit.java @@ -15,12 +15,12 @@ */ package com.alibaba.druid.sql.ast; -import java.util.ArrayList; -import java.util.List; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; /** * Created by wenshao on 16/9/25. @@ -31,7 +31,6 @@ public final class SQLLimit extends SQLObjectImpl implements SQLReplaceable { private List by; public SQLLimit() { - } public SQLLimit(int rowCount) { @@ -47,7 +46,6 @@ public SQLLimit(SQLExpr offset, SQLExpr rowCount) { this.setRowCount(rowCount); } - public SQLExpr getRowCount() { return rowCount; } @@ -179,12 +177,18 @@ public boolean replace(SQLExpr expr, SQLExpr target) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLLimit limit = (SQLLimit) o; - if (rowCount != null ? !rowCount.equals(limit.rowCount) : limit.rowCount != null) return false; + if (rowCount != null ? !rowCount.equals(limit.rowCount) : limit.rowCount != null) { + return false; + } return offset != null ? offset.equals(limit.offset) : limit.offset == null; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLMapDataType.java b/src/main/java/com/alibaba/druid/sql/ast/SQLMapDataType.java index c276bf2799..cbf6c3a552 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLMapDataType.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLMapDataType.java @@ -17,7 +17,6 @@ public class SQLMapDataType extends SQLObjectImpl implements SQLDataType { private SQLDataType valueType; public SQLMapDataType() { - } public SQLMapDataType(SQLDataType keyType, SQLDataType valueType) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLName.java b/src/main/java/com/alibaba/druid/sql/ast/SQLName.java index d1c1b524c6..c26560cd50 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLName.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLName.java @@ -18,10 +18,13 @@ import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; public interface SQLName extends SQLExpr { - String getSimpleName(); + String getSimpleName(); + SQLName clone(); - long nameHashCode64(); - long hashCode64(); + + long nameHashCode64(); + + long hashCode64(); SQLColumnDefinition getResolvedColumn(); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLObject.java b/src/main/java/com/alibaba/druid/sql/ast/SQLObject.java index bbc098bf7b..7342c4c16e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLObject.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLObject.java @@ -21,26 +21,41 @@ import java.util.Map; public interface SQLObject { - void accept(SQLASTVisitor visitor); - SQLObject clone(); + void accept(SQLASTVisitor visitor); - SQLObject getParent(); - void setParent(SQLObject parent); + SQLObject clone(); + + SQLObject getParent(); + + void setParent(SQLObject parent); Map getAttributes(); - boolean containsAttribute(String name); - Object getAttribute(String name); - void putAttribute(String name, Object value); + + boolean containsAttribute(String name); + + Object getAttribute(String name); + + void putAttribute(String name, Object value); + Map getAttributesDirect(); - void output(StringBuffer buf); - void output(Appendable buf); - - void addBeforeComment(String comment); - void addBeforeComment(List comments); - List getBeforeCommentsDirect(); - void addAfterComment(String comment); - void addAfterComment(List comments); - List getAfterCommentsDirect(); - boolean hasBeforeComment(); - boolean hasAfterComment(); + + void output(StringBuffer buf); + + void output(Appendable buf); + + void addBeforeComment(String comment); + + void addBeforeComment(List comments); + + List getBeforeCommentsDirect(); + + void addAfterComment(String comment); + + void addAfterComment(List comments); + + List getAfterCommentsDirect(); + + boolean hasBeforeComment(); + + boolean hasAfterComment(); } 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 0f2241039a..c9dc37326e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLObjectImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLObjectImpl.java @@ -28,15 +28,14 @@ import java.util.Map; public abstract class SQLObjectImpl implements SQLObject { - - protected SQLObject parent; + protected SQLObject parent; protected Map attributes; - protected SQLCommentHint hint; + protected SQLCommentHint hint; protected int sourceLine; protected int sourceColumn; - public SQLObjectImpl(){ + public SQLObjectImpl() { } public final void accept(SQLASTVisitor visitor) { @@ -141,32 +140,32 @@ public void putAttribute(String name, Object value) { public Map getAttributesDirect() { return attributes; } - + @SuppressWarnings("unchecked") public void addBeforeComment(String comment) { if (comment == null) { return; } - + if (attributes == null) { attributes = new HashMap(1); } - + List comments = (List) attributes.get("rowFormat.before_comment"); if (comments == null) { comments = new ArrayList(2); attributes.put("rowFormat.before_comment", comments); } - + comments.add(comment); } - + @SuppressWarnings("unchecked") public void addBeforeComment(List comments) { if (attributes == null) { attributes = new HashMap(1); } - + List attrComments = (List) attributes.get("rowFormat.before_comment"); if (attrComments == null) { attributes.put("rowFormat.before_comment", comments); @@ -174,31 +173,31 @@ public void addBeforeComment(List comments) { attrComments.addAll(comments); } } - + @SuppressWarnings("unchecked") public List getBeforeCommentsDirect() { if (attributes == null) { return null; } - + return (List) attributes.get("rowFormat.before_comment"); } - + @SuppressWarnings("unchecked") public void addAfterComment(String comment) { if (attributes == null) { attributes = new HashMap(1); } - + List comments = (List) attributes.get("rowFormat.after_comment"); if (comments == null) { comments = new ArrayList(2); attributes.put("rowFormat.after_comment", comments); } - + comments.add(comment); } - + @SuppressWarnings("unchecked") public void addAfterComment(List comments) { if (comments == null) { @@ -208,7 +207,7 @@ public void addAfterComment(List comments) { if (attributes == null) { attributes = new HashMap(1); } - + List attrComments = (List) attributes.get("rowFormat.after_comment"); if (attrComments == null) { attributes.put("rowFormat.after_comment", comments); @@ -216,16 +215,16 @@ public void addAfterComment(List comments) { attrComments.addAll(comments); } } - + @SuppressWarnings("unchecked") public List getAfterCommentsDirect() { if (attributes == null) { return null; } - + return (List) attributes.get("rowFormat.after_comment"); } - + public boolean hasBeforeComment() { if (attributes == null) { return false; @@ -236,10 +235,10 @@ public boolean hasBeforeComment() { if (comments == null) { return false; } - + return !comments.isEmpty(); } - + public boolean hasAfterComment() { if (attributes == null) { return false; @@ -249,7 +248,7 @@ public boolean hasAfterComment() { if (comments == null) { return false; } - + return !comments.isEmpty(); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLObjectWithDataType.java b/src/main/java/com/alibaba/druid/sql/ast/SQLObjectWithDataType.java index f3a731447e..f21ebdc0e1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLObjectWithDataType.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLObjectWithDataType.java @@ -17,5 +17,6 @@ public interface SQLObjectWithDataType extends SQLObject { SQLDataType getDataType(); + void setDataType(SQLDataType dataType); } 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 cc8f75204d..4e3c5e9688 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java @@ -22,22 +22,20 @@ import java.util.List; public final class SQLOrderBy extends SQLObjectImpl implements SQLReplaceable { - protected final List items = new ArrayList(); - + // for postgres private boolean siblings; - public SQLOrderBy(){ - + public SQLOrderBy() { } - public SQLOrderBy(SQLExpr expr){ + public SQLOrderBy(SQLExpr expr) { SQLSelectOrderByItem item = new SQLSelectOrderByItem(expr); addItem(item); } - public SQLOrderBy(SQLExpr expr, SQLOrderingSpecification type){ + public SQLOrderBy(SQLExpr expr, SQLOrderingSpecification type) { SQLSelectOrderByItem item = new SQLSelectOrderByItem(expr, type); addItem(item); } @@ -56,7 +54,7 @@ public void addItem(SQLExpr item) { public List getItems() { return this.items; } - + public boolean isSiblings() { return this.siblings; } @@ -78,12 +76,18 @@ protected void accept0(SQLASTVisitor v) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLOrderBy order = (SQLOrderBy) o; - if (siblings != order.siblings) return false; + if (siblings != order.siblings) { + return false; + } return items.equals(order.items); } @@ -103,9 +107,8 @@ public void addItem(SQLExpr expr, SQLOrderingSpecification type) { @Override public boolean replace(SQLExpr expr, SQLExpr target) { - for (SQLSelectOrderByItem item : items) { - if(item.replace(expr, target)) { + if (item.replace(expr, target)) { return true; } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderingSpecification.java b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderingSpecification.java index 90845d03ea..1c60196f0b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderingSpecification.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderingSpecification.java @@ -17,12 +17,12 @@ public enum SQLOrderingSpecification { ASC("ASC"), DESC("DESC"); - + public final String name; - public final String name_lcase; + public final String nameLCase; - private SQLOrderingSpecification(String name){ + private SQLOrderingSpecification(String name) { this.name = name; - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } } 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 e6ae03da05..8f7e9305fc 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java @@ -21,34 +21,32 @@ * limitations under the License. */ public class SQLOver extends SQLObjectImpl implements SQLReplaceable { - protected final List partitionBy = new ArrayList(); - protected SQLOrderBy orderBy; - protected SQLOrderBy distributeBy; - protected SQLOrderBy sortBy; - protected SQLOrderBy clusterBy; + protected SQLOrderBy orderBy; + protected SQLOrderBy distributeBy; + protected SQLOrderBy sortBy; + protected SQLOrderBy clusterBy; // for db2 - protected SQLName of; - - protected WindowingType windowingType; + protected SQLName of; - protected boolean windowingPreceding; - protected boolean windowingFollowing; + protected WindowingType windowingType; - protected SQLExpr windowingBetweenBegin; - protected WindowingBound windowingBetweenBeginBound; + protected boolean windowingPreceding; + protected boolean windowingFollowing; - protected SQLExpr windowingBetweenEnd; - protected WindowingBound windowingBetweenEndBound; + protected SQLExpr windowingBetweenBegin; + protected WindowingBound windowingBetweenBeginBound; - protected boolean excludeCurrentRow; + protected SQLExpr windowingBetweenEnd; + protected WindowingBound windowingBetweenEndBound; - public SQLOver(){ + protected boolean excludeCurrentRow; + public SQLOver() { } - public SQLOver(SQLOrderBy orderBy){ + public SQLOver(SQLOrderBy orderBy) { this.setOrderBy(orderBy); } @@ -211,22 +209,42 @@ public void setExcludeCurrentRow(boolean excludeCurrentRow) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLOver sqlOver = (SQLOver) o; - if (windowingPreceding != sqlOver.windowingPreceding) return false; - if (windowingFollowing != sqlOver.windowingFollowing) return false; - if (!partitionBy.equals(sqlOver.partitionBy)) return false; - if (orderBy != null ? !orderBy.equals(sqlOver.orderBy) : sqlOver.orderBy != null) return false; - if (of != null ? !of.equals(sqlOver.of) : sqlOver.of != null) return false; - if (windowingType != sqlOver.windowingType) return false; - if (windowingBetweenBegin != null ? !windowingBetweenBegin.equals(sqlOver.windowingBetweenBegin) : sqlOver.windowingBetweenBegin != null) + if (windowingPreceding != sqlOver.windowingPreceding) { return false; - if (windowingBetweenBeginBound != sqlOver.windowingBetweenBeginBound) return false; - if (windowingBetweenEnd != null ? !windowingBetweenEnd.equals(sqlOver.windowingBetweenEnd) : sqlOver.windowingBetweenEnd != null) + } + if (windowingFollowing != sqlOver.windowingFollowing) { + return false; + } + if (!partitionBy.equals(sqlOver.partitionBy)) { + return false; + } + if (orderBy != null ? !orderBy.equals(sqlOver.orderBy) : sqlOver.orderBy != null) { + return false; + } + if (of != null ? !of.equals(sqlOver.of) : sqlOver.of != null) { return false; + } + if (windowingType != sqlOver.windowingType) { + return false; + } + if (windowingBetweenBegin != null ? !windowingBetweenBegin.equals(sqlOver.windowingBetweenBegin) : sqlOver.windowingBetweenBegin != null) { + return false; + } + if (windowingBetweenBeginBound != sqlOver.windowingBetweenBeginBound) { + return false; + } + if (windowingBetweenEnd != null ? !windowingBetweenEnd.equals(sqlOver.windowingBetweenEnd) : sqlOver.windowingBetweenEnd != null) { + return false; + } return windowingBetweenEndBound == sqlOver.windowingBetweenEndBound; } @@ -307,14 +325,14 @@ public static enum WindowingType { ROWS("ROWS"), RANGE("RANGE"); public final String name; - public final String name_lower; + public final String nameLCase; + private WindowingType(String name) { this.name = name; - this.name_lower = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } } - public static enum WindowingBound { UNBOUNDED_PRECEDING("UNBOUNDED PRECEDING"), PRECEDING("PRECEDING"), @@ -323,10 +341,11 @@ public static enum WindowingBound { UNBOUNDED_FOLLOWING("UNBOUNDED FOLLOWING"); public final String name; - public final String name_lower; + public final String nameLCase; + private WindowingBound(String name) { this.name = name; - this.name_lower = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLParameter.java b/src/main/java/com/alibaba/druid/sql/ast/SQLParameter.java index 3551240867..6a69363703 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLParameter.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLParameter.java @@ -21,17 +21,17 @@ import java.util.List; public final class SQLParameter extends SQLObjectImpl implements SQLObjectWithDataType { - private SQLName name; - private SQLDataType dataType; - private SQLExpr defaultValue; - private ParameterType paramType; - private boolean noCopy = false; - private boolean constant = false; - private SQLName cursorName; + private SQLName name; + private SQLDataType dataType; + private SQLExpr defaultValue; + private ParameterType paramType; + private boolean noCopy; + private boolean constant; + private SQLName cursorName; private final List cursorParameters = new ArrayList(); - private boolean order; - private boolean map; - private boolean member; + private boolean order; + private boolean map; + private boolean member; public SQLExpr getDefaultValue() { return defaultValue; @@ -65,7 +65,7 @@ public void setDataType(SQLDataType dataType) { } this.dataType = dataType; } - + public ParameterType getParamType() { return paramType; } @@ -83,9 +83,9 @@ public void accept0(SQLASTVisitor visitor) { } visitor.endVisit(this); } - + public static enum ParameterType { - DEFAULT, // + DEFAULT, IN, // in OUT, // out INOUT// inout diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLPartition.java b/src/main/java/com/alibaba/druid/sql/ast/SQLPartition.java index 832777d839..c530e599d3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLPartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLPartition.java @@ -23,22 +23,21 @@ import java.util.List; public class SQLPartition extends OracleSegmentAttributesImpl implements OracleSegmentAttributes { + protected SQLName name; - protected SQLName name; - - protected SQLExpr subPartitionsCount; + protected SQLExpr subPartitionsCount; protected List subPartitions = new ArrayList(); - protected SQLPartitionValue values; - + protected SQLPartitionValue values; + // for mysql - protected SQLExpr dataDirectory; - protected SQLExpr indexDirectory; - protected SQLExpr maxRows; - protected SQLExpr minRows; - protected SQLExpr engine; - protected SQLExpr comment; + protected SQLExpr dataDirectory; + protected SQLExpr indexDirectory; + protected SQLExpr maxRows; + protected SQLExpr minRows; + protected SQLExpr engine; + protected SQLExpr comment; // for oracle protected boolean segmentCreationImmediate; @@ -48,7 +47,6 @@ public class SQLPartition extends OracleSegmentAttributesImpl implements OracleS private SQLExpr locality; - public SQLExpr getLocality() { return locality; } @@ -96,7 +94,7 @@ public void setValues(SQLPartitionValue values) { public List getSubPartitions() { return subPartitions; } - + public void addSubPartition(SQLSubPartition partition) { if (partition != null) { partition.setParent(this); @@ -169,7 +167,7 @@ public void setComment(SQLExpr comment) { } this.comment = comment; } - + protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, name); diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionBy.java b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionBy.java index 400e6cb1bd..06a33b26d0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionBy.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionBy.java @@ -22,12 +22,12 @@ import java.util.List; public abstract class SQLPartitionBy extends SQLObjectImpl { - protected SQLSubPartitionBy subPartitionBy; - protected SQLExpr partitionsCount; - protected boolean linear; + protected SQLSubPartitionBy subPartitionBy; + protected SQLExpr partitionsCount; + protected boolean linear; protected List partitions = new ArrayList(); - protected List storeIn = new ArrayList(); - protected List columns = new ArrayList(); + protected List storeIn = new ArrayList(); + protected List columns = new ArrayList(); protected SQLIntegerExpr lifecycle; @@ -117,7 +117,7 @@ public boolean isPartitionByColumn(long columnNameHashCode64) { for (SQLExpr column : columns) { if (column instanceof SQLIdentifierExpr && ((SQLIdentifierExpr) column) - .nameHashCode64() == columnNameHashCode64) { + .nameHashCode64() == columnNameHashCode64) { return true; } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByHash.java b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByHash.java index 2615ad40ef..844e4acdff 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByHash.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByHash.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLPartitionByHash extends SQLPartitionBy { - // for aliyun ads protected boolean key; protected boolean unique; diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByRange.java b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByRange.java index ec2ddea3df..f94bdf5ab3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByRange.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByRange.java @@ -18,10 +18,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLPartitionByRange extends SQLPartitionBy { - protected SQLExpr interval; + protected SQLExpr interval; public SQLPartitionByRange() { - } public SQLExpr getInterval() { @@ -32,7 +31,7 @@ public void setInterval(SQLExpr interval) { if (interval != null) { interval.setParent(this); } - + this.interval = interval; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByValue.java b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByValue.java index 91c050b666..c45bc7e884 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByValue.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByValue.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLPartitionByValue extends SQLPartitionBy { - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionSpec.java b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionSpec.java index b27b5f6333..c580c6cf86 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionSpec.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionSpec.java @@ -1,10 +1,10 @@ package com.alibaba.druid.sql.ast; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + import java.util.ArrayList; import java.util.List; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; - public class SQLPartitionSpec extends SQLObjectImpl implements Cloneable { private List items = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionValue.java b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionValue.java index 14e71e99ec..548f28a7b0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionValue.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionValue.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.sql.ast; -import com.alibaba.druid.sql.dialect.oracle.ast.OracleSegmentAttributes; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSegmentAttributesImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -23,11 +22,10 @@ import java.util.List; public class SQLPartitionValue extends OracleSegmentAttributesImpl { - - protected Operator operator; + protected Operator operator; protected final List items = new ArrayList(); - public SQLPartitionValue(Operator operator){ + public SQLPartitionValue(Operator operator) { super(); this.operator = operator; } @@ -35,7 +33,7 @@ public SQLPartitionValue(Operator operator){ public List getItems() { return items; } - + public void addItem(SQLExpr item) { if (item != null) { item.setParent(this); @@ -48,9 +46,9 @@ public Operator getOperator() { } public static enum Operator { - LessThan, // - In, // - List + LessThan, + In, + List } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLRowDataType.java b/src/main/java/com/alibaba/druid/sql/ast/SQLRowDataType.java index 0dc0c87829..c9ce9293bb 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLRowDataType.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLRowDataType.java @@ -1,9 +1,9 @@ package com.alibaba.druid.sql.ast; import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.ast.SQLStructDataType.Field; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.util.FnvHash; -import com.alibaba.druid.sql.ast.SQLStructDataType.Field; import java.sql.Types; import java.util.ArrayList; @@ -15,7 +15,6 @@ public class SQLRowDataType extends SQLObjectImpl implements SQLDataType { private List fields = new ArrayList(); public SQLRowDataType() { - } public SQLRowDataType(DbType dbType) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLSetQuantifier.java b/src/main/java/com/alibaba/druid/sql/ast/SQLSetQuantifier.java index 1a9a2e54d5..4263dc1fc1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLSetQuantifier.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLSetQuantifier.java @@ -16,13 +16,12 @@ package com.alibaba.druid.sql.ast; public interface SQLSetQuantifier { - // SQL 92 - public final static int ALL = 1; - public final static int DISTINCT = 2; + public static final int ALL = 1; + public static final int DISTINCT = 2; - public final static int UNIQUE = 3; - public final static int DISTINCTROW = 4; + public static final int UNIQUE = 3; + public static final int DISTINCTROW = 4; // } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLStatement.java b/src/main/java/com/alibaba/druid/sql/ast/SQLStatement.java index 364b8ba82d..23782c2352 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLStatement.java @@ -21,16 +21,25 @@ import java.util.List; public interface SQLStatement extends SQLObject, SQLDbTypedObject { - DbType getDbType(); - boolean isAfterSemi(); - void setAfterSemi(boolean afterSemi); + DbType getDbType(); + + boolean isAfterSemi(); + + void setAfterSemi(boolean afterSemi); + SQLStatement clone(); + List getChildren(); + List getHeadHintsDirect(); + void setHeadHints(List headHints); String toString(); + String toString(VisitorFeature... features); + String toLowerCaseString(); + String toParameterizedString(); } 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 0bf292a16d..2cc5e06c9c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java @@ -24,18 +24,17 @@ import java.util.List; public abstract class SQLStatementImpl extends SQLObjectImpl implements SQLStatement { - protected DbType dbType; - protected boolean afterSemi; + protected DbType dbType; + protected boolean afterSemi; protected List headHints; - public SQLStatementImpl(){ - + public SQLStatementImpl() { } - - public SQLStatementImpl(DbType dbType){ + + public SQLStatementImpl(DbType dbType) { this.dbType = dbType; } - + public DbType getDbType() { return dbType; } @@ -48,7 +47,6 @@ public String toString() { return SQLUtils.toSQLString(this, dbType); } - public String toString(VisitorFeature... features) { return SQLUtils.toSQLString(this, dbType, null, features); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLStructDataType.java b/src/main/java/com/alibaba/druid/sql/ast/SQLStructDataType.java index 0ce9cb1199..193d35e406 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLStructDataType.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLStructDataType.java @@ -14,7 +14,6 @@ public class SQLStructDataType extends SQLObjectImpl implements SQLDataType { private List fields = new ArrayList(); public SQLStructDataType() { - } public SQLStructDataType(DbType dbType) { @@ -108,6 +107,7 @@ public int jdbcType() { public boolean isInt() { return false; } + @Override public boolean isNumberic() { return false; @@ -124,9 +124,9 @@ public boolean hasKeyLength() { } public static class Field extends SQLObjectImpl { - private SQLName name; + private SQLName name; private SQLDataType dataType; - private String comment; + private String comment; public Field(SQLName name, SQLDataType dataType) { setName(name); diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartition.java b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartition.java index db5cf257d3..9c7a9d0a04 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartition.java @@ -19,17 +19,17 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSubPartition extends OracleSegmentAttributesImpl { - protected SQLName name; + protected SQLName name; protected SQLPartitionValue values; - protected SQLName tableSpace; + protected SQLName tableSpace; // for mysql - protected SQLExpr dataDirectory; - protected SQLExpr indexDirectory; - protected SQLExpr maxRows; - protected SQLExpr minRows; - protected SQLExpr engine; - protected SQLExpr comment; + protected SQLExpr dataDirectory; + protected SQLExpr indexDirectory; + protected SQLExpr maxRows; + protected SQLExpr minRows; + protected SQLExpr engine; + protected SQLExpr comment; public SQLName getName() { return name; @@ -41,7 +41,7 @@ public void setName(SQLName name) { } this.name = name; } - + public SQLPartitionValue getValues() { return values; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionBy.java b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionBy.java index 4337df4ba4..0e12b4a285 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionBy.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionBy.java @@ -22,10 +22,9 @@ import java.util.List; public abstract class SQLSubPartitionBy extends SQLObjectImpl { - - protected SQLExpr subPartitionsCount; - protected boolean linear; - protected List options = new ArrayList(); + protected SQLExpr subPartitionsCount; + protected boolean linear; + protected List options = new ArrayList(); protected List subPartitionTemplate = new ArrayList(); protected SQLIntegerExpr lifecycle; diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByHash.java b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByHash.java index 8efba1f290..0ee6d49783 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByHash.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByHash.java @@ -18,11 +18,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSubPartitionByHash extends SQLSubPartitionBy { - protected SQLExpr expr; // for aliyun ads - private boolean key; + private boolean key; public SQLExpr getExpr() { return expr; diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByList.java b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByList.java index e11b6c560c..7adfce4ca0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByList.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLSubPartitionByList.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSubPartitionByList extends SQLSubPartitionBy { - protected SQLName column; @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLTableDataType.java b/src/main/java/com/alibaba/druid/sql/ast/SQLTableDataType.java index 65388f7b3b..55e335c104 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLTableDataType.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLTableDataType.java @@ -15,7 +15,6 @@ public class SQLTableDataType extends SQLObjectImpl implements SQLDataType { private List columns = new ArrayList(); public SQLTableDataType() { - } public SQLTableDataType(DbType dbType) { @@ -104,6 +103,7 @@ public int jdbcType() { public boolean isInt() { return false; } + @Override public boolean isNumberic() { return false; diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLZOrderBy.java b/src/main/java/com/alibaba/druid/sql/ast/SQLZOrderBy.java index 3b350b9723..86d5e3f6f7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLZOrderBy.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLZOrderBy.java @@ -22,22 +22,20 @@ import java.util.List; public final class SQLZOrderBy extends SQLObjectImpl implements SQLReplaceable { - protected final List items = new ArrayList(); // for postgres - private boolean sibings; - - public SQLZOrderBy(){ + private boolean sibings; + public SQLZOrderBy() { } - public SQLZOrderBy(SQLExpr expr){ + public SQLZOrderBy(SQLExpr expr) { SQLSelectOrderByItem item = new SQLSelectOrderByItem(expr); addItem(item); } - public SQLZOrderBy(SQLExpr expr, SQLOrderingSpecification type){ + public SQLZOrderBy(SQLExpr expr, SQLOrderingSpecification type) { SQLSelectOrderByItem item = new SQLSelectOrderByItem(expr, type); addItem(item); } @@ -56,7 +54,7 @@ public void addItem(SQLExpr item) { public List getItems() { return this.items; } - + public boolean isSibings() { return this.sibings; } @@ -78,12 +76,18 @@ protected void accept0(SQLASTVisitor v) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLZOrderBy order = (SQLZOrderBy) o; - if (sibings != order.sibings) return false; + if (sibings != order.sibings) { + return false; + } return items.equals(order.items); } @@ -103,9 +107,8 @@ public void addItem(SQLExpr expr, SQLOrderingSpecification type) { @Override public boolean replace(SQLExpr expr, SQLExpr target) { - for (SQLSelectOrderByItem item : items) { - if(item.replace(expr, target)) { + if (item.replace(expr, target)) { return true; } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/TDDLHint.java b/src/main/java/com/alibaba/druid/sql/ast/TDDLHint.java index 3c893f0887..0e12153f1c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/TDDLHint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/TDDLHint.java @@ -35,7 +35,6 @@ public TDDLHint(String text) { return; } - lexer.nextToken(); switch (lexer.token()) { @@ -53,13 +52,13 @@ public TDDLHint(String text) { return; } - for(;;) { + for (; ; ) { if (lexer.token() == Token.AND) { lexer.nextToken(); } String name = lexer.stringVal(); - long hash = lexer.hash_lower(); + long hash = lexer.hashLCase(); if (lexer.identifierEquals(FnvHash.Constants.NODE)) { lexer.nextToken(); @@ -97,7 +96,7 @@ public TDDLHint(String text) { } continue; - } else if (lexer.token() == Token.EOF){ + } else if (lexer.token() == Token.EOF) { Function function = new Function(name); functions.add(function); break; @@ -173,7 +172,6 @@ public TDDLHint(String text) { continue; } - Function function = new Function(name); functions.add(function); @@ -209,7 +207,7 @@ public TDDLHint(String text) { SQLExpr value = null; String keyVal = lexer.stringVal(); - long keyHash = lexer.hash_lower(); + long keyHash = lexer.hashLCase(); lexer.nextToken(); @@ -281,7 +279,7 @@ public Type getType() { } public static class Function { - private final String name; + private final String name; private final List arguments = new ArrayList(); public Function(String name) { @@ -298,7 +296,7 @@ public List getArguments() { } public static class Argument { - private final SQLExpr name; + private final SQLExpr name; private final SQLExpr value; public Argument(SQLExpr name, SQLExpr value) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java index ea52032630..c3d70ade5f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java @@ -26,28 +26,28 @@ import java.util.Map; public class SQLAggregateExpr extends SQLMethodInvokeExpr implements Serializable, SQLReplaceable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 1L; + protected SQLAggregateOption option; - protected SQLAggregateOption option; + protected SQLKeep keep; + protected SQLExpr filter; + protected SQLOver over; + protected SQLName overRef; + protected SQLOrderBy orderBy; + protected boolean withinGroup; + protected Boolean ignoreNulls; - protected SQLKeep keep; - protected SQLExpr filter; - protected SQLOver over; - protected SQLName overRef; - protected SQLOrderBy orderBy; - protected boolean withinGroup = false; - protected Boolean ignoreNulls = false; - - public SQLAggregateExpr(String methodName){ + public SQLAggregateExpr(String methodName) { this.methodName = methodName; } - public SQLAggregateExpr(String methodName, SQLAggregateOption option){ + + public SQLAggregateExpr(String methodName, SQLAggregateOption option) { this.methodName = methodName; this.option = option; } - public SQLAggregateExpr(String methodName, SQLAggregateOption option, SQLExpr... arguments){ + public SQLAggregateExpr(String methodName, SQLAggregateOption option, SQLExpr... arguments) { this.methodName = methodName; this.option = option; if (arguments != null) { @@ -146,7 +146,6 @@ public String toString() { return SQLUtils.toSQLString(this); } - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { @@ -214,18 +213,36 @@ public void setFilter(SQLExpr x) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } SQLAggregateExpr that = (SQLAggregateExpr) o; - if (option != that.option) return false; - if (keep != null ? !keep.equals(that.keep) : that.keep != null) return false; - if (filter != null ? !filter.equals(that.filter) : that.filter != null) return false; - if (over != null ? !over.equals(that.over) : that.over != null) return false; - if (overRef != null ? !overRef.equals(that.overRef) : that.overRef != null) return false; - if (orderBy != null ? !orderBy.equals(that.orderBy) : that.orderBy != null) return false; + if (option != that.option) { + return false; + } + if (keep != null ? !keep.equals(that.keep) : that.keep != null) { + return false; + } + if (filter != null ? !filter.equals(that.filter) : that.filter != null) { + return false; + } + if (over != null ? !over.equals(that.over) : that.over != null) { + return false; + } + if (overRef != null ? !overRef.equals(that.overRef) : that.overRef != null) { + return false; + } + if (orderBy != null ? !orderBy.equals(that.orderBy) : that.orderBy != null) { + return false; + } return ignoreNulls != null ? ignoreNulls.equals(that.ignoreNulls) : that.ignoreNulls == null; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateOption.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateOption.java index 1b56987c11..589e8ca2d4 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateOption.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateOption.java @@ -16,8 +16,7 @@ package com.alibaba.druid.sql.ast.expr; public enum SQLAggregateOption { - - DISTINCT, ALL, UNIQUE, // + DISTINCT, ALL, UNIQUE, DEDUPLICATION // just for nut 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 f9c0bc4a74..d3eec5f24f 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 @@ -27,8 +27,7 @@ public final class SQLAllColumnExpr extends SQLExprImpl { private transient SQLTableSource resolvedTableSource; - public SQLAllColumnExpr(){ - + public SQLAllColumnExpr() { } public void output(Appendable buf) { 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 5c83398ea1..d3453a6202 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 @@ -18,22 +18,18 @@ import com.alibaba.druid.sql.ast.SQLExprImpl; import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.statement.SQLSelect; -import com.alibaba.druid.sql.dialect.postgresql.visitor.PGOutputVisitor; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.Collections; import java.util.List; public final class SQLAllExpr extends SQLExprImpl { - public SQLSelect subQuery; - public SQLAllExpr(){ - + public SQLAllExpr() { } - public SQLAllExpr(SQLSelect select){ + public SQLAllExpr(SQLSelect select) { setSubQuery(select); } 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 41fc4badda..97ae45d2bb 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,21 +21,18 @@ import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.ast.statement.SQLSelectItem; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.Collections; import java.util.List; public class SQLAnyExpr extends SQLExprImpl { - public SQLSelect subQuery; - public SQLAnyExpr(){ - + public SQLAnyExpr() { } - public SQLAnyExpr(SQLSelect select){ + public SQLAnyExpr(SQLSelect select) { setSubQuery(select); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLArrayExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLArrayExpr.java index 9f9253d7e5..611ad6ad7f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLArrayExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLArrayExpr.java @@ -15,19 +15,20 @@ */ package com.alibaba.druid.sql.ast.expr; -import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLExprImpl; +import com.alibaba.druid.sql.ast.SQLObject; +import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; -public class SQLArrayExpr extends SQLExprImpl implements SQLReplaceable { - - private SQLExpr expr; +public class SQLArrayExpr extends SQLExprImpl implements SQLReplaceable { + private SQLExpr expr; private List values = new ArrayList(); public SQLArrayExpr() { - } public SQLArrayExpr clone() { @@ -100,20 +101,33 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null) return false; - if (getClass() != obj.getClass()) return false; + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } SQLArrayExpr other = (SQLArrayExpr) obj; if (expr == null) { - if (other.expr != null) return false; - } else if (!expr.equals(other.expr)) return false; + if (other.expr != null) { + return false; + } + } else if (!expr.equals(other.expr)) { + return false; + } if (values == null) { - if (other.values != null) return false; - } else if (!values.equals(other.values)) return false; + if (other.values != null) { + return false; + } + } else if (!values.equals(other.values)) { + return false; + } return true; } - @Override public boolean replace(SQLExpr expr, SQLExpr target) { for (int i = 0; i < values.size(); i++) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBetweenExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBetweenExpr.java index 4a7e5f2b89..51e8adf43b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBetweenExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBetweenExpr.java @@ -15,11 +15,7 @@ */ package com.alibaba.druid.sql.ast.expr; -import com.alibaba.druid.sql.ast.SQLDataType; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.SQLReplaceable; +import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.io.Serializable; @@ -27,15 +23,13 @@ import java.util.List; public class SQLBetweenExpr extends SQLExprImpl implements SQLReplaceable, Serializable { - private static final long serialVersionUID = 1L; - public SQLExpr testExpr; - private boolean not; - public SQLExpr beginExpr; - public SQLExpr endExpr; - - public SQLBetweenExpr(){ + public SQLExpr testExpr; + private boolean not; + public SQLExpr beginExpr; + public SQLExpr endExpr; + public SQLBetweenExpr() { } public SQLBetweenExpr clone() { @@ -53,13 +47,13 @@ public SQLBetweenExpr clone() { return x; } - public SQLBetweenExpr(SQLExpr testExpr, SQLExpr beginExpr, SQLExpr endExpr){ + public SQLBetweenExpr(SQLExpr testExpr, SQLExpr beginExpr, SQLExpr endExpr) { setTestExpr(testExpr); setBeginExpr(beginExpr); setEndExpr(endExpr); } - public SQLBetweenExpr(SQLExpr testExpr, boolean not, SQLExpr beginExpr, SQLExpr endExpr){ + public SQLBetweenExpr(SQLExpr testExpr, boolean not, SQLExpr beginExpr, SQLExpr endExpr) { this(testExpr, beginExpr, endExpr); this.not = not; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBigIntExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBigIntExpr.java index 5c3f6a3ddf..ee68794600 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBigIntExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBigIntExpr.java @@ -22,19 +22,17 @@ import java.util.List; public class SQLBigIntExpr extends SQLNumericLiteralExpr implements SQLValuableExpr { - private Long value; - public SQLBigIntExpr(){ - + public SQLBigIntExpr() { } - public SQLBigIntExpr(Long value){ + public SQLBigIntExpr(Long value) { super(); this.value = value; } - public SQLBigIntExpr(String value){ + public SQLBigIntExpr(String value) { super(); this.value = Long.valueOf(value); } @@ -67,6 +65,7 @@ protected void accept0(SQLASTVisitor visitor) { visitor.endVisit(this); } + @Override public int hashCode() { final int prime = 31; diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java index 562f234e97..b97ebef225 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java @@ -27,16 +27,14 @@ import java.util.List; public class SQLBinaryExpr extends SQLExprImpl implements SQLLiteralExpr, SQLValuableExpr { - private String text; private transient Number val; - public SQLBinaryExpr(){ - + public SQLBinaryExpr() { } - public SQLBinaryExpr(String value){ + public SQLBinaryExpr(String value) { super(); this.text = value; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java index c058adddbc..e2eb80cb21 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java @@ -30,29 +30,25 @@ import java.util.List; public class SQLBinaryOpExpr extends SQLExprImpl implements SQLReplaceable, Serializable, SQLDbTypedObject, Comparable { - - private static final long serialVersionUID = 1L; - protected SQLExpr left; - protected SQLExpr right; + private static final long serialVersionUID = 1L; + protected SQLExpr left; + protected SQLExpr right; protected SQLBinaryOperator operator; - protected DbType dbType; - - + protected DbType dbType; - private boolean parenthesized = false; + private boolean parenthesized; // only for parameterized output protected transient List mergedList; - public SQLBinaryOpExpr(){ - + public SQLBinaryOpExpr() { } - public SQLBinaryOpExpr(DbType dbType){ + public SQLBinaryOpExpr(DbType dbType) { this.dbType = dbType; } - public SQLBinaryOpExpr(SQLExpr left, SQLBinaryOperator operator, SQLExpr right){ + public SQLBinaryOpExpr(SQLExpr left, SQLBinaryOperator operator, SQLExpr right) { if (left != null) { left.setParent(this); } @@ -76,8 +72,8 @@ public SQLBinaryOpExpr(SQLExpr left, SQLBinaryOperator operator, SQLExpr right){ } } } - - public SQLBinaryOpExpr(SQLExpr left, SQLBinaryOperator operator, SQLExpr right, DbType dbType){ + + public SQLBinaryOpExpr(SQLExpr left, SQLBinaryOperator operator, SQLExpr right, DbType dbType) { if (left != null) { left.setParent(this); } @@ -104,7 +100,7 @@ public SQLBinaryOpExpr(SQLExpr left, SQLBinaryOperator operator, SQLExpr right, this.dbType = dbType; } - public SQLBinaryOpExpr(SQLExpr left, SQLExpr right, SQLBinaryOperator operator){ + public SQLBinaryOpExpr(SQLExpr left, SQLExpr right, SQLBinaryOperator operator) { if (left != null) { left.setParent(this); } @@ -205,16 +201,15 @@ public boolean equals(Object obj) { return operator == other.operator && SQLExprUtils.equals(left, other.left) - && SQLExprUtils.equals(right, other.right); + && SQLExprUtils.equals(right, other.right); } public boolean equals(SQLBinaryOpExpr other) { return operator == other.operator && SQLExprUtils.equals(left, other.left) - && SQLExprUtils.equals(right, other.right); + && SQLExprUtils.equals(right, other.right); } - public boolean equalsIgoreOrder(SQLBinaryOpExpr other) { if (this == other) { return true; @@ -228,9 +223,9 @@ public boolean equalsIgoreOrder(SQLBinaryOpExpr other) { } return (Utils.equals(this.left, other.left) - && Utils.equals(this.right, other.right)) + && Utils.equals(this.right, other.right)) || (Utils.equals(this.left, other.right) - && Utils.equals(this.right, other.left)); + && Utils.equals(this.right, other.left)); } public SQLBinaryOpExpr clone() { @@ -331,7 +326,7 @@ public static void split(List outList, SQLExpr expr, SQLBinaryOperator List rightList = new ArrayList(); rightList.add(binaryExpr.getRight()); - for (SQLExpr left = binaryExpr.getLeft();;) { + for (SQLExpr left = binaryExpr.getLeft(); ; ) { if (left instanceof SQLBinaryOpExpr) { SQLBinaryOpExpr leftBinary = (SQLBinaryOpExpr) left; if (leftBinary.operator == op) { @@ -348,7 +343,7 @@ public static void split(List outList, SQLExpr expr, SQLBinaryOperator } for (int i = rightList.size() - 1; i >= 0; --i) { - SQLExpr right = rightList.get(i); + SQLExpr right = rightList.get(i); if (right instanceof SQLBinaryOpExpr) { SQLBinaryOpExpr binaryRight = (SQLBinaryOpExpr) right; @@ -625,8 +620,7 @@ public SQLDataType computeDataType() { } if (leftDataType.isInt() - && rightDataType.nameHashCode64() == FnvHash.Constants.INTERVAL) - { + && rightDataType.nameHashCode64() == FnvHash.Constants.INTERVAL) { return rightDataType; } @@ -696,6 +690,7 @@ public boolean conditionContainsColumn(String column) { /** * only for parameterized output + * * @param v * @param x * @return @@ -703,7 +698,7 @@ public boolean conditionContainsColumn(String column) { public static SQLBinaryOpExpr merge(ParameterizedVisitor v, SQLBinaryOpExpr x) { SQLObject parent = x.parent; - for (;;) { + for (; ; ) { if (x.right instanceof SQLBinaryOpExpr) { SQLBinaryOpExpr rightBinary = (SQLBinaryOpExpr) x.right; if (x.left instanceof SQLBinaryOpExpr) { @@ -765,6 +760,7 @@ public static SQLBinaryOpExpr merge(ParameterizedVisitor v, SQLBinaryOpExpr x) { /** * only for parameterized output + * * @param item * @return */ @@ -777,6 +773,7 @@ private void addMergedItem(SQLBinaryOpExpr item) { /** * only for parameterized output + * * @return */ public List getMergedList() { @@ -785,6 +782,7 @@ public List getMergedList() { /** * only for parameterized output + * * @param a * @param b * @return @@ -841,9 +839,9 @@ public boolean isLeftFunctionAndRightLiteral() { public boolean isNameAndLiteral() { return (left instanceof SQLLiteralExpr - && right instanceof SQLName) + && right instanceof SQLName) || (left instanceof SQLName - && right instanceof SQLLiteralExpr); + && right instanceof SQLLiteralExpr); } public boolean isBothName() { @@ -877,23 +875,34 @@ public boolean isLeftLiteralAndRightName() { } public static SQLBinaryOpExpr conditionEq(String column, String value) { - return new SQLBinaryOpExpr(SQLUtils.toSQLExpr(column) - , SQLBinaryOperator.Equality, new SQLCharExpr(value)); + return new SQLBinaryOpExpr( + SQLUtils.toSQLExpr(column), + SQLBinaryOperator.Equality, new SQLCharExpr(value) + ); } public static SQLBinaryOpExpr conditionEq(String column, int value) { - return new SQLBinaryOpExpr(SQLUtils.toSQLExpr(column) - , SQLBinaryOperator.Equality, new SQLIntegerExpr(value)); + return new SQLBinaryOpExpr( + SQLUtils.toSQLExpr(column), + SQLBinaryOperator.Equality, + new SQLIntegerExpr(value) + ); } public static SQLBinaryOpExpr conditionLike(String column, String value) { - return new SQLBinaryOpExpr(SQLUtils.toSQLExpr(column) - , SQLBinaryOperator.Like, new SQLCharExpr(value)); + return new SQLBinaryOpExpr( + SQLUtils.toSQLExpr(column), + SQLBinaryOperator.Like, + new SQLCharExpr(value) + ); } public static SQLBinaryOpExpr conditionLike(String column, SQLExpr value) { - return new SQLBinaryOpExpr(SQLUtils.toSQLExpr(column) - , SQLBinaryOperator.Like, value); + return new SQLBinaryOpExpr( + SQLUtils.toSQLExpr(column), + SQLBinaryOperator.Like, + value + ); } public static SQLBinaryOpExpr eq(SQLExpr a, SQLExpr b) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExprGroup.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExprGroup.java index 2944f9bda5..ecf7fec2f1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExprGroup.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExprGroup.java @@ -29,8 +29,8 @@ public class SQLBinaryOpExprGroup extends SQLExprImpl implements SQLReplaceable { private final SQLBinaryOperator operator; - private final List items = new ArrayList(); - private DbType dbType; + private final List items = new ArrayList(); + private DbType dbType; public SQLBinaryOpExprGroup(SQLBinaryOperator operator) { this.operator = operator; @@ -43,12 +43,18 @@ public SQLBinaryOpExprGroup(SQLBinaryOperator operator, DbType dbType) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLBinaryOpExprGroup that = (SQLBinaryOpExprGroup) o; - if (operator != that.operator) return false; + if (operator != that.operator) { + return false; + } return items.equals(that.items); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java index 93a6f793b0..99b88fce61 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java @@ -16,45 +16,45 @@ package com.alibaba.druid.sql.ast.expr; /** - * * 二元操作符 + * * @author wenshao 2011-5-20 下午12:32:02 */ public enum SQLBinaryOperator { - Union("UNION", 0), + Union("UNION", 0), COLLATE("COLLATE", 20), BitwiseXor("^", 50), BitwiseXorEQ("^=", 110), - Multiply("*", 60), + Multiply("*", 60), Divide("/", 60), DIV("DIV", 60), // mysql integer division - Modulus("%", 60), + Modulus("%", 60), Mod("MOD", 60), - - Add("+", 70), - Subtract("-", 70), - - SubGt("->", 20), - SubGtGt("->>", 20), - PoundGt("#>", 20), + + Add("+", 70), + Subtract("-", 70), + + SubGt("->", 20), + SubGtGt("->>", 20), + PoundGt("#>", 20), PoundGtGt("#>>", 20), QuesQues("??", 20), QuesBar("?|", 20), QuesAmp("?&", 20), - LeftShift("<<", 80), - RightShift(">>", 80), + LeftShift("<<", 80), + RightShift(">>", 80), - BitwiseAnd("&", 90), + BitwiseAnd("&", 90), BitwiseOr("|", 100), - - GreaterThan(">", 110), - GreaterThanOrEqual(">=", 110), - Is("IS", 110), - LessThan("<", 110), - LessThanOrEqual("<=", 110), - LessThanOrEqualOrGreaterThan("<=>",110), + + GreaterThan(">", 110), + GreaterThanOrEqual(">=", 110), + Is("IS", 110), + LessThan("<", 110), + LessThanOrEqual("<=", 110), + LessThanOrEqualOrGreaterThan("<=>", 110), LessThanOrGreater("<>", 110), IsDistinctFrom("IS DISTINCT FROM", 110), @@ -79,50 +79,49 @@ public enum SQLBinaryOperator { RLike("RLIKE", 110), NotRLike("NOT RLIKE", 110), - - NotEqual("!=", 110), + + NotEqual("!=", 110), NotLessThan("!<", 110), - NotGreaterThan("!>", 110), - IsNot("IS NOT", 110), - Escape("ESCAPE", 110), + NotGreaterThan("!>", 110), + IsNot("IS NOT", 110), + Escape("ESCAPE", 110), RegExp("REGEXP", 110), - NotRegExp("NOT REGEXP", 110), + NotRegExp("NOT REGEXP", 110), Equality("=", 110), - - BitwiseNot("!", 130), - Concat("||", 140), - - BooleanAnd("AND", 140), - BooleanXor("XOR", 150), - BooleanOr("OR", 160), + + BitwiseNot("!", 130), + Concat("||", 140), + + BooleanAnd("AND", 140), + BooleanXor("XOR", 150), + BooleanOr("OR", 160), Assignment(":=", 169), PG_And("&&", 140), - PG_ST_DISTANCE("<->", 20), - ; + PG_ST_DISTANCE("<->", 20); public static int getPriority(SQLBinaryOperator operator) { return 0; } public final String name; - public final String name_lcase; - public final int priority; + public final String nameLCase; + public final int priority; - SQLBinaryOperator(String name, int priority){ + SQLBinaryOperator(String name, int priority) { this.name = name; - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); this.priority = priority; } - + public String getName() { return this.name; } - + public int getPriority() { return this.priority; } - + public boolean isRelational() { switch (this) { case Equality: @@ -148,7 +147,7 @@ public boolean isRelational() { return false; } } - + public boolean isLogical() { return this == BooleanAnd || this == BooleanOr || this == BooleanXor; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBooleanExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBooleanExpr.java index f4bb53e625..514e3bb0e7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBooleanExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBooleanExpr.java @@ -31,11 +31,10 @@ public final class SQLBooleanExpr extends SQLExprImpl implements SQLExpr, SQLLit private boolean value; - public SQLBooleanExpr(){ - + public SQLBooleanExpr() { } - public SQLBooleanExpr(boolean value){ + public SQLBooleanExpr(boolean value) { this.value = value; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseExpr.java index 9c55c670a5..27bde999f7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseExpr.java @@ -18,7 +18,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.io.Serializable; @@ -26,14 +25,12 @@ import java.util.List; public class SQLCaseExpr extends SQLExprImpl implements SQLReplaceable, Serializable { - private static final long serialVersionUID = 1L; - private final List items = new ArrayList(); - private SQLExpr valueExpr; - private SQLExpr elseExpr; - - public SQLCaseExpr(){ + private final List items = new ArrayList(); + private SQLExpr valueExpr; + private SQLExpr elseExpr; + public SQLCaseExpr() { } public SQLExpr getValueExpr() { @@ -121,17 +118,14 @@ public boolean replace(SQLExpr expr, SQLExpr target) { } public static class Item extends SQLObjectImpl implements SQLReplaceable, Serializable { - private static final long serialVersionUID = 1L; - private SQLExpr conditionExpr; - private SQLExpr valueExpr; - - public Item(){ + private SQLExpr conditionExpr; + private SQLExpr valueExpr; + public Item() { } - public Item(SQLExpr conditionExpr, SQLExpr valueExpr){ - + public Item(SQLExpr conditionExpr, SQLExpr valueExpr) { setConditionExpr(conditionExpr); setValueExpr(valueExpr); } @@ -182,20 +176,33 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null) return false; - if (getClass() != obj.getClass()) return false; + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } Item other = (Item) obj; if (conditionExpr == null) { - if (other.conditionExpr != null) return false; - } else if (!conditionExpr.equals(other.conditionExpr)) return false; + if (other.conditionExpr != null) { + return false; + } + } else if (!conditionExpr.equals(other.conditionExpr)) { + return false; + } if (valueExpr == null) { - if (other.valueExpr != null) return false; - } else if (!valueExpr.equals(other.valueExpr)) return false; + if (other.valueExpr != null) { + return false; + } + } else if (!valueExpr.equals(other.valueExpr)) { + return false; + } return true; } - public Item clone() { Item x = new Item(); if (conditionExpr != null) { @@ -265,7 +272,6 @@ public boolean equals(Object obj) { return true; } - public SQLCaseExpr clone() { SQLCaseExpr x = new SQLCaseExpr(); @@ -295,7 +301,7 @@ public SQLDataType computeDataType() { } } - if(elseExpr != null) { + if (elseExpr != null) { return elseExpr.computeDataType(); } @@ -303,6 +309,6 @@ public SQLDataType computeDataType() { } public String toString() { - return SQLUtils.toSQLString(this, (DbType)null); + return SQLUtils.toSQLString(this, (DbType) null); } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseStatement.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseStatement.java index 90be09386c..459228e2b1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseStatement.java @@ -23,12 +23,11 @@ import java.util.List; public class SQLCaseStatement extends SQLStatementImpl implements Serializable { - private final List items = new ArrayList(); - private SQLExpr valueExpr; - private List elseStatements = new ArrayList(); - - public SQLCaseStatement(){ + private final List items = new ArrayList(); + private SQLExpr valueExpr; + private List elseStatements = new ArrayList(); + public SQLCaseStatement() { } public SQLExpr getValueExpr() { @@ -94,17 +93,14 @@ public List getChildren() { } public static class Item extends SQLObjectImpl implements Serializable { - private static final long serialVersionUID = 1L; - private SQLExpr conditionExpr; - private SQLStatement statement; - - public Item(){ + private SQLExpr conditionExpr; + private SQLStatement statement; + public Item() { } - public Item(SQLExpr conditionExpr, SQLStatement statement){ - + public Item(SQLExpr conditionExpr, SQLStatement statement) { setConditionExpr(conditionExpr); setStatement(statement); } @@ -155,16 +151,30 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null) return false; - if (getClass() != obj.getClass()) return false; + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } Item other = (Item) obj; if (conditionExpr == null) { - if (other.conditionExpr != null) return false; - } else if (!conditionExpr.equals(other.conditionExpr)) return false; + if (other.conditionExpr != null) { + return false; + } + } else if (!conditionExpr.equals(other.conditionExpr)) { + return false; + } if (statement == null) { - if (other.statement != null) return false; - } else if (!statement.equals(other.statement)) return false; + if (other.statement != null) { + return false; + } + } else if (!statement.equals(other.statement)) { + return false; + } return true; } @@ -172,13 +182,21 @@ public boolean equals(Object obj) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLCaseStatement that = (SQLCaseStatement) o; - if (!items.equals(that.items)) return false; - if (valueExpr != null ? !valueExpr.equals(that.valueExpr) : that.valueExpr != null) return false; + if (!items.equals(that.items)) { + return false; + } + if (valueExpr != null ? !valueExpr.equals(that.valueExpr) : that.valueExpr != null) { + return false; + } return elseStatements != null ? elseStatements.equals(that.elseStatements) : that.elseStatements == null; } 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 b4c83f93e8..6292757bdb 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 @@ -23,12 +23,11 @@ import java.util.List; public class SQLCastExpr extends SQLExprImpl implements SQLObjectWithDataType, SQLReplaceable { - protected boolean isTry; - protected SQLExpr expr; + protected boolean isTry; + protected SQLExpr expr; protected SQLDataType dataType; - public SQLCastExpr(){ - + public SQLCastExpr() { } public SQLCastExpr(SQLExpr expr, SQLDataType dataType) { @@ -86,13 +85,21 @@ public List getChildren() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLCastExpr castExpr = (SQLCastExpr) o; - if (isTry != castExpr.isTry) return false; - if (expr != null ? !expr.equals(castExpr.expr) : castExpr.expr != null) return false; + if (isTry != castExpr.isTry) { + return false; + } + if (expr != null ? !expr.equals(castExpr.expr) : castExpr.expr != null) { + return false; + } return dataType != null ? dataType.equals(castExpr.dataType) : castExpr.dataType == null; } 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 1038ea1f78..9e72e917cb 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 @@ -28,15 +28,14 @@ public class SQLCharExpr extends SQLTextLiteralExpr implements SQLValuableExpr, Comparable { public static final SQLDataType DATA_TYPE = new SQLCharacterDataType("char"); - public SQLCharExpr(){ - + public SQLCharExpr() { } - public SQLCharExpr(String text){ + public SQLCharExpr(String text) { this.text = text; } - public SQLCharExpr(String text, SQLObject parent){ + public SQLCharExpr(String text, SQLObject parent) { this.text = text; this.parent = parent; } @@ -54,7 +53,7 @@ protected void accept0(SQLASTVisitor visitor) { public Object getValue() { return this.text; } - + public String toString() { return SQLUtils.toSQLString(this); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLContainsExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLContainsExpr.java index 749088a08f..e51f9eabc1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLContainsExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLContainsExpr.java @@ -23,14 +23,12 @@ import java.util.List; public final class SQLContainsExpr extends SQLExprImpl implements SQLReplaceable, Serializable { - private static final long serialVersionUID = 1L; - private boolean not = false; + private boolean not; private SQLExpr expr; private List targetList = new ArrayList(); public SQLContainsExpr() { - } public SQLContainsExpr(SQLExpr expr) { 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 5ad079c0fe..afefedebe8 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 @@ -24,14 +24,12 @@ import java.util.List; public class SQLCurrentOfCursorExpr extends SQLExprImpl implements SQLReplaceable { - private SQLName cursorName; - public SQLCurrentOfCursorExpr(){ - + public SQLCurrentOfCursorExpr() { } - public SQLCurrentOfCursorExpr(SQLName cursorName){ + public SQLCurrentOfCursorExpr(SQLName cursorName) { this.cursorName = cursorName; } @@ -78,7 +76,6 @@ public List getChildren() { return Collections.singletonList(this.cursorName); } - @Override public int hashCode() { final int prime = 31; diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateExpr.java index 02a080b430..3d9c8d9e35 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateExpr.java @@ -17,7 +17,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.util.MySqlUtils; @@ -30,8 +29,7 @@ public class SQLDateExpr extends SQLExprImpl implements SQLLiteralExpr, SQLValua private String literal; - public SQLDateExpr(){ - + public SQLDateExpr() { } public SQLDateExpr(String literal) { @@ -77,7 +75,7 @@ public String getValue() { } public Date getDate() { - return getDate(null); + return getDate(null); } public Date getDate(TimeZone timeZone) { @@ -203,16 +201,18 @@ public List getChildren() { return Collections.emptyList(); } - public static long supportDbTypes = DbType.of(DbType.mysql - , DbType.oracle - , DbType.presto - , DbType.trino - , DbType.postgresql - , DbType.ads - , DbType.hive - , DbType.odps - , DbType.mariadb - , DbType.tidb); + public static long supportDbTypes = DbType.of( + DbType.mysql, + DbType.oracle, + DbType.presto, + DbType.trino, + DbType.postgresql, + DbType.ads, + DbType.hive, + DbType.odps, + DbType.mariadb, + DbType.tidb + ); public static boolean isSupport(DbType dbType) { return (dbType.mask & supportDbTypes) != 0; @@ -251,7 +251,7 @@ public static boolean check(String str) { return false; } - if(c4 != '-') { + if (c4 != '-') { return false; } @@ -356,16 +356,16 @@ public static String format(Calendar calendar) { int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH); char[] chars = new char[10]; - chars[0] = (char) (year/1000 + '0'); - chars[1] = (char) ((year/100)%10 + '0'); - chars[2] = (char) ((year/10)%10 + '0'); - chars[3] = (char) (year%10 + '0'); + chars[0] = (char) (year / 1000 + '0'); + chars[1] = (char) ((year / 100) % 10 + '0'); + chars[2] = (char) ((year / 10) % 10 + '0'); + chars[3] = (char) (year % 10 + '0'); chars[4] = '-'; - chars[5] = (char) (month/10 + '0'); - chars[6] = (char) (month%10 + '0'); + chars[5] = (char) (month / 10 + '0'); + chars[6] = (char) (month % 10 + '0'); chars[7] = '-'; - chars[8] = (char) (dayOfMonth/10 + '0'); - chars[9] = (char) (dayOfMonth%10 + '0'); + chars[8] = (char) (dayOfMonth / 10 + '0'); + chars[9] = (char) (dayOfMonth % 10 + '0'); return new String(chars); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateTimeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateTimeExpr.java index c3f77740e8..f6fdd2ed1d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateTimeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateTimeExpr.java @@ -30,12 +30,10 @@ public class SQLDateTimeExpr extends SQLExprImpl implements SQLLiteralExpr, SQLV private SQLExpr literal; - public SQLDateTimeExpr(){ - + public SQLDateTimeExpr() { } - - public SQLDateTimeExpr(Date now, TimeZone timeZone){ + public SQLDateTimeExpr(Date now, TimeZone timeZone) { setLiteral(now, timeZone); } @@ -144,13 +142,14 @@ public List getChildren() { return Collections.emptyList(); } - public static long supportDbTypes = DbType.of(DbType.mysql - , DbType.oracle - , DbType.presto - , DbType.trino - , DbType.postgresql - , DbType.mariadb - , DbType.tidb + public static long supportDbTypes = DbType.of( + DbType.mysql, + DbType.oracle, + DbType.presto, + DbType.trino, + DbType.postgresql, + DbType.mariadb, + DbType.tidb ); public static boolean isSupport(DbType dbType) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDbLinkExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDbLinkExpr.java index 7a2936e4d0..a084dafdf0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDbLinkExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDbLinkExpr.java @@ -17,9 +17,6 @@ import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; -import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExpr; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.util.FnvHash; @@ -27,16 +24,13 @@ import java.util.List; public class SQLDbLinkExpr extends SQLExprImpl implements SQLName, SQLExpr, SQLReplaceable { - private SQLExpr expr; - private String dbLink; - - private long dbLinkHashCode64; - private long hashCode64; - + private String dbLink; - public SQLDbLinkExpr(){ + private long dbLinkHashCode64; + private long hashCode64; + public SQLDbLinkExpr() { } public String getSimpleName() { @@ -85,7 +79,7 @@ public List getChildren() { @Override public int hashCode() { long value = hashCode64(); - return (int)(value ^ (value >>> 32)); + return (int) (value ^ (value >>> 32)); } @Override @@ -129,7 +123,7 @@ public long hashCode64() { hash ^= '@'; hash *= FnvHash.PRIME; - } else if (expr == null){ + } else if (expr == null) { hash = FnvHash.BASIC; } else { hash = FnvHash.fnv1a_64_lower(expr.toString()); diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDecimalExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDecimalExpr.java index e8fda61f93..632ac8864c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDecimalExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDecimalExpr.java @@ -25,21 +25,20 @@ import java.util.List; public class SQLDecimalExpr extends SQLNumericLiteralExpr implements SQLValuableExpr, Comparable { - public final static SQLDataType DATA_TYPE = new SQLDataTypeImpl("DECIMAL"); + public static final SQLDataType DATA_TYPE = new SQLDataTypeImpl("DECIMAL"); - private BigDecimal value; - private transient String literal; - - public SQLDecimalExpr(){ + private BigDecimal value; + private transient String literal; + public SQLDecimalExpr() { } - public SQLDecimalExpr(BigDecimal value){ + public SQLDecimalExpr(BigDecimal value) { super(); this.value = value; } - public SQLDecimalExpr(String value){ + public SQLDecimalExpr(String value) { super(); this.value = new BigDecimal(value); this.literal = value; @@ -76,6 +75,7 @@ protected void accept0(SQLASTVisitor visitor) { visitor.endVisit(this); } + @Override public int hashCode() { final int prime = 31; 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 c9c0babe74..bc30b6a6f8 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 @@ -23,7 +23,6 @@ import java.util.List; public class SQLDefaultExpr extends SQLExprImpl implements SQLLiteralExpr { - @Override public boolean equals(Object o) { return o instanceof SQLDefaultExpr; diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDoubleExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDoubleExpr.java index 85b0cae5cc..ca13982b95 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDoubleExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDoubleExpr.java @@ -24,20 +24,19 @@ import java.util.List; public class SQLDoubleExpr extends SQLNumericLiteralExpr implements SQLValuableExpr, Comparable { - public final static SQLDataType DATA_TYPE = new SQLDataTypeImpl("DOUBLE"); + public static final SQLDataType DATA_TYPE = new SQLDataTypeImpl("DOUBLE"); private double value; - public SQLDoubleExpr(){ - + public SQLDoubleExpr() { } - public SQLDoubleExpr(String value){ + public SQLDoubleExpr(String value) { super(); this.value = Double.parseDouble(value); } - public SQLDoubleExpr(double value){ + public SQLDoubleExpr(double value) { super(); this.value = value; } @@ -72,8 +71,12 @@ protected void accept0(SQLASTVisitor visitor) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLDoubleExpr that = (SQLDoubleExpr) o; diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLExistsExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLExistsExpr.java index 87dbf50ce5..3a5a99e144 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLExistsExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLExistsExpr.java @@ -24,20 +24,18 @@ import java.util.List; public final class SQLExistsExpr extends SQLExprImpl implements Serializable { - private static final long serialVersionUID = 1L; - public boolean not = false; - public SQLSelect subQuery; - - public SQLExistsExpr(){ + public boolean not; + public SQLSelect subQuery; + public SQLExistsExpr() { } - public SQLExistsExpr(SQLSelect subQuery){ + public SQLExistsExpr(SQLSelect subQuery) { this.setSubQuery(subQuery); } - public SQLExistsExpr(SQLSelect subQuery, boolean not){ + public SQLExistsExpr(SQLSelect subQuery, boolean not) { this.setSubQuery(subQuery); this.not = not; } @@ -110,7 +108,7 @@ public boolean equals(Object obj) { return true; } - public SQLExistsExpr clone () { + public SQLExistsExpr clone() { SQLExistsExpr x = new SQLExistsExpr(); x.not = not; diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLExprUtils.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLExprUtils.java index af4b157c6b..1cdb0d9abc 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLExprUtils.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLExprUtils.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.SQLDataTypeImpl; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.parser.ParserException; -import com.alibaba.druid.util.FnvHash; import java.math.BigDecimal; import java.math.BigInteger; @@ -32,7 +31,6 @@ import java.util.TimeZone; public class SQLExprUtils { - public static boolean equals(SQLExpr a, SQLExpr b) { if (a == b) { return true; @@ -133,8 +131,7 @@ public static String quote(String str, DbType dbType, char quote) { } else if (quote == '"') { if (dbType == DbType.oracle || dbType == DbType.presto || dbType == DbType.trino) { expr = new SQLIdentifierExpr(str); - } - else { + } else { expr = new SQLCharExpr(str); } } else if (quote == '\'') { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLExtractExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLExtractExpr.java index e93589fba6..66fbca1f79 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLExtractExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLExtractExpr.java @@ -25,11 +25,10 @@ import java.util.List; public class SQLExtractExpr extends SQLExprImpl implements SQLReplaceable { - - private SQLExpr value; + private SQLExpr value; private SQLIntervalUnit unit; - public SQLExtractExpr(){ + public SQLExtractExpr() { } public SQLExtractExpr clone() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLFlashbackExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLFlashbackExpr.java index 08f9eeeb6d..581d586402 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLFlashbackExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLFlashbackExpr.java @@ -29,7 +29,6 @@ public class SQLFlashbackExpr extends SQLExprImpl implements SQLReplaceable { private SQLExpr expr; public SQLFlashbackExpr() { - } public SQLFlashbackExpr(Type type, SQLExpr expr) { @@ -91,12 +90,18 @@ public SQLFlashbackExpr clone() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLFlashbackExpr that = (SQLFlashbackExpr) o; - if (type != that.type) return false; + if (type != that.type) { + return false; + } return expr != null ? expr.equals(that.expr) : that.expr == null; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLFloatExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLFloatExpr.java index 113d640c72..d2d301dda7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLFloatExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLFloatExpr.java @@ -24,20 +24,19 @@ import java.util.List; public class SQLFloatExpr extends SQLNumericLiteralExpr implements SQLValuableExpr, Comparable { - public final static SQLDataType DATA_TYPE = new SQLDataTypeImpl("FLOAT"); + public static final SQLDataType DATA_TYPE = new SQLDataTypeImpl("FLOAT"); private float value; - public SQLFloatExpr(){ - + public SQLFloatExpr() { } - public SQLFloatExpr(String value){ + public SQLFloatExpr(String value) { super(); this.value = Float.parseFloat(value); } - public SQLFloatExpr(float value){ + public SQLFloatExpr(float value) { super(); this.value = value; } @@ -72,8 +71,12 @@ protected void accept0(SQLASTVisitor visitor) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLFloatExpr that = (SQLFloatExpr) o; diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLGroupingSetExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLGroupingSetExpr.java index d0a2fd8a06..ddbd669419 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLGroupingSetExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLGroupingSetExpr.java @@ -24,7 +24,6 @@ import java.util.List; public class SQLGroupingSetExpr extends SQLExprImpl implements SQLReplaceable { - private final List parameters = new ArrayList(); public SQLGroupingSetExpr clone() { @@ -40,7 +39,7 @@ public SQLGroupingSetExpr clone() { public List getParameters() { return parameters; } - + public void addParameter(SQLExpr parameter) { if (parameter != null) { parameter.setParent(this); 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 4f3b738524..2d6ae2c863 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 @@ -15,8 +15,8 @@ */ package com.alibaba.druid.sql.ast.expr; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.FastsqlException; +import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExprImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.util.HexBin; @@ -24,10 +24,9 @@ import java.io.IOException; public class SQLHexExpr extends SQLExprImpl implements SQLLiteralExpr, SQLValuableExpr { - private final String hex; - public SQLHexExpr(String hex){ + public SQLHexExpr(String hex) { this.hex = hex; } @@ -89,7 +88,7 @@ public byte[] toBytes() { return HexBin.decode(this.hex); } - public SQLHexExpr clone () { + public SQLHexExpr clone() { return new SQLHexExpr(hex); } @@ -97,7 +96,6 @@ public byte[] getValue() { return toBytes(); } - public SQLCharExpr toCharExpr() { byte[] bytes = toBytes(); if (bytes == null) { 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 3fc440cd57..912edcf5ac 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 @@ -27,21 +27,20 @@ import java.util.List; public final class SQLIdentifierExpr extends SQLExprImpl implements SQLName, Comparable { - protected String name; - private long hashCode64; + protected String name; + private long hashCode64; - private SQLObject resolvedColumn; - private SQLObject resolvedOwnerObject; - - public SQLIdentifierExpr(){ + private SQLObject resolvedColumn; + private SQLObject resolvedOwnerObject; + public SQLIdentifierExpr() { } - public SQLIdentifierExpr(String name){ + public SQLIdentifierExpr(String name) { this.name = name; } - public SQLIdentifierExpr(String name, long hash_lower){ + public SQLIdentifierExpr(String name, long hash_lower) { this.name = name; this.hashCode64 = hash_lower; } @@ -102,7 +101,7 @@ protected void accept0(SQLASTVisitor visitor) { @Override public int hashCode() { long value = hashCode64(); - return (int)(value ^ (value >>> 32)); + return (int) (value ^ (value >>> 32)); } @Override @@ -134,7 +133,7 @@ public SQLIdentifierExpr clone() { public SQLIdentifierExpr simplify() { String normalized = SQLUtils.normalize(name); if (normalized != name) { - return new SQLIdentifierExpr(normalized, hashCode64); + return new SQLIdentifierExpr(normalized, hashCode64); } return this; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInListExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInListExpr.java index bd9fe9524c..b5233fa376 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInListExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInListExpr.java @@ -25,9 +25,8 @@ import java.util.List; public final class SQLInListExpr extends SQLExprImpl implements SQLReplaceable, Serializable { - private static final long serialVersionUID = 1L; - private boolean not = false; + private boolean not; private SQLExpr expr; private List targetList = new ArrayList(); @@ -35,7 +34,6 @@ public final class SQLInListExpr extends SQLExprImpl implements SQLReplaceable, protected SQLCommentHint hint; public SQLInListExpr() { - } public SQLInListExpr(SQLExpr expr) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java index 8135a585fe..2249f009da 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java @@ -15,11 +15,9 @@ */ package com.alibaba.druid.sql.ast.expr; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.io.Serializable; @@ -27,12 +25,11 @@ import java.util.List; public class SQLInSubQueryExpr extends SQLExprImpl implements Serializable, SQLReplaceable { - private static final long serialVersionUID = 1L; - private boolean not = false; - private SQLExpr expr; + private boolean not; + private SQLExpr expr; - public SQLSelect subQuery; + public SQLSelect subQuery; // for ads query hint public SQLCommentHint hint; @@ -40,15 +37,14 @@ public class SQLInSubQueryExpr extends SQLExprImpl implements Serializable, SQLR // for clickhouse private boolean global; - public SQLInSubQueryExpr(){ - + public SQLInSubQueryExpr() { } - public SQLInSubQueryExpr(SQLSelect select){ + public SQLInSubQueryExpr(SQLSelect select) { setSubQuery(select); } - public SQLInSubQueryExpr(SQLExpr expr, SQLSelectQueryBlock queryBlock){ + public SQLInSubQueryExpr(SQLExpr expr, SQLSelectQueryBlock queryBlock) { setExpr(expr); setSubQuery(new SQLSelect(queryBlock)); } @@ -85,7 +81,6 @@ public void setExpr(SQLExpr expr) { this.expr = expr; } - public SQLSelect getSubQuery() { return this.subQuery; } 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 83fae96cd1..03289446e6 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 @@ -32,18 +32,16 @@ public class SQLIntegerExpr extends SQLNumericLiteralExpr implements SQLValuable private Number number; private String type; - public SQLIntegerExpr(Number number){ + public SQLIntegerExpr(Number number) { this.number = number; } - - public SQLIntegerExpr(Number number, SQLObject parent){ + public SQLIntegerExpr(Number number, SQLObject parent) { this.number = number; this.parent = parent; } - public SQLIntegerExpr(){ - + public SQLIntegerExpr() { } public Number getNumber() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalExpr.java index 188b7201d0..e44f30ccbd 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalExpr.java @@ -26,13 +26,13 @@ public class SQLIntervalExpr extends SQLExprImpl implements SQLReplaceable { public static final SQLDataType DATA_TYPE = new SQLDataTypeImpl("interval"); - private SQLExpr value; - private SQLIntervalUnit unit; + private SQLExpr value; + private SQLIntervalUnit unit; - public SQLIntervalExpr(){ + public SQLIntervalExpr() { } - public SQLIntervalExpr(SQLExpr value, SQLIntervalUnit unit){ + public SQLIntervalExpr(SQLExpr value, SQLIntervalUnit unit) { setValue(value); this.unit = unit; } @@ -136,7 +136,6 @@ public boolean equals(Object obj) { return true; } - public SQLDataType computeDataType() { return DATA_TYPE; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalUnit.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalUnit.java index 7044391e14..6415944cce 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalUnit.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalUnit.java @@ -47,20 +47,19 @@ public enum SQLIntervalUnit { TIMEZONE_HOUR, TIMEZONE_MINUTE, DOY, - YEAR_TO_MONTH("YEAR TO MONTH") - ; + YEAR_TO_MONTH("YEAR TO MONTH"); public final String name; - public final String name_lcase; + public final String nameLCase; SQLIntervalUnit(String name) { this.name = name; - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } SQLIntervalUnit() { this.name = name(); - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } public static boolean add(Calendar calendar, int intervalInt, SQLIntervalUnit unit) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLJSONExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLJSONExpr.java index 4f2eaca095..893ff84514 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLJSONExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLJSONExpr.java @@ -28,13 +28,12 @@ public class SQLJSONExpr extends SQLExprImpl implements SQLValuableExpr { public static final SQLDataType DATA_TYPE = new SQLDataTypeImpl("JSON"); - protected String literal; - - public SQLJSONExpr(){ + protected String literal; + public SQLJSONExpr() { } - public SQLJSONExpr(String literal){ + public SQLJSONExpr(String literal) { this.literal = literal; } @@ -57,8 +56,12 @@ public void setLiteral(String literal) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLJSONExpr that = (SQLJSONExpr) o; 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 c8ffce8e11..733e87c3b5 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 @@ -23,8 +23,7 @@ import java.util.ArrayList; import java.util.List; -public class SQLListExpr extends SQLExprImpl implements SQLReplaceable { - +public class SQLListExpr extends SQLExprImpl implements SQLReplaceable { private final List items; public SQLListExpr() { @@ -42,7 +41,7 @@ public SQLListExpr(SQLExpr... items) { public List getItems() { return items; } - + public void addItem(SQLExpr item) { if (item != null) { item.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMatchAgainstExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMatchAgainstExpr.java index 3d1a30f386..8730723eda 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMatchAgainstExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMatchAgainstExpr.java @@ -15,20 +15,21 @@ */ package com.alibaba.druid.sql.ast.expr; -import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLExprImpl; +import com.alibaba.druid.sql.ast.SQLObject; +import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class SQLMatchAgainstExpr extends SQLExprImpl implements SQLReplaceable { - - private List columns = new ArrayList(); - private SQLExpr against; + private List columns = new ArrayList(); + private SQLExpr against; private SearchModifier searchModifier; public SQLMatchAgainstExpr() { - } public SQLMatchAgainstExpr clone() { @@ -91,21 +92,21 @@ public void setSearchModifier(SearchModifier searchModifier) { } public static enum SearchModifier { - IN_BOOLEAN_MODE("IN BOOLEAN MODE"), // - IN_NATURAL_LANGUAGE_MODE("IN NATURAL LANGUAGE MODE"), // + IN_BOOLEAN_MODE("IN BOOLEAN MODE"), + IN_NATURAL_LANGUAGE_MODE("IN NATURAL LANGUAGE MODE"), IN_NATURAL_LANGUAGE_MODE_WITH_QUERY_EXPANSION("IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION"), WITH_QUERY_EXPANSION("WITH QUERY EXPANSION"); public final String name; - public final String name_lcase; + public final String nameLCase; - SearchModifier(){ + SearchModifier() { this(null); } - SearchModifier(String name){ + SearchModifier(String name) { this.name = name; - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java index d65d76a4ee..f58b5668c0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java @@ -18,7 +18,6 @@ import com.alibaba.druid.FastsqlException; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.util.FnvHash; @@ -30,39 +29,36 @@ import java.util.Map; public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, Serializable { - - private static final long serialVersionUID = 1L; - - protected final List arguments = new ArrayList(); - protected String methodName; - protected long methodNameHashCode64; - protected SQLExpr owner; - protected SQLExpr from; - protected SQLExpr using; - protected SQLExpr _for; - protected String trimOption; + private static final long serialVersionUID = 1L; + + protected final List arguments = new ArrayList(); + protected String methodName; + protected long methodNameHashCode64; + protected SQLExpr owner; + protected SQLExpr from; + protected SQLExpr using; + protected SQLExpr hasFor; + protected String trimOption; protected transient SQLDataType resolvedReturnDataType; - public SQLMethodInvokeExpr(){ - + public SQLMethodInvokeExpr() { } - public SQLMethodInvokeExpr(String methodName){ + public SQLMethodInvokeExpr(String methodName) { this.methodName = methodName; } - public SQLMethodInvokeExpr(String methodName, long methodNameHashCode64){ + public SQLMethodInvokeExpr(String methodName, long methodNameHashCode64) { this.methodName = methodName; this.methodNameHashCode64 = methodNameHashCode64; } - public SQLMethodInvokeExpr(String methodName, SQLExpr owner){ - + public SQLMethodInvokeExpr(String methodName, SQLExpr owner) { this.methodName = methodName; setOwner(owner); } - public SQLMethodInvokeExpr(String methodName, SQLExpr owner, SQLExpr... params){ + public SQLMethodInvokeExpr(String methodName, SQLExpr owner, SQLExpr... params) { this.methodName = methodName; setOwner(owner); for (SQLExpr param : params) { @@ -97,6 +93,7 @@ public void setMethodName(String methodName) { /** * instead of getArguments + * * @deprecated */ public List getParameters() { @@ -116,6 +113,7 @@ public void setArgument(int i, SQLExpr arg) { /** * deprecated, instead of addArgument + * * @deprecated */ public void addParameter(SQLExpr param) { @@ -154,8 +152,6 @@ public void setFrom(SQLExpr x) { this.from = x; } - - public void output(Appendable buf) { try { if (this.owner != null) { @@ -199,8 +195,8 @@ protected void accept0(SQLASTVisitor visitor) { this.using.accept(visitor); } - if (this._for != null) { - this._for.accept(visitor); + if (this.hasFor != null) { + this.hasFor.accept(visitor); } } @@ -238,8 +234,8 @@ protected void accept0(OracleASTVisitor visitor) { this.using.accept(visitor); } - if (this._for != null) { - this._for.accept(visitor); + if (this.hasFor != null) { + this.hasFor.accept(visitor); } } @@ -248,16 +244,24 @@ protected void accept0(OracleASTVisitor visitor) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLMethodInvokeExpr that = (SQLMethodInvokeExpr) o; if (methodNameHashCode64() != that.methodNameHashCode64()) { return false; } - if (owner != null ? !owner.equals(that.owner) : that.owner != null) return false; - if (!arguments.equals(that.arguments)) return false; + if (owner != null ? !owner.equals(that.owner) : that.owner != null) { + return false; + } + if (!arguments.equals(that.arguments)) { + return false; + } return from != null ? from.equals(that.from) : that.from == null; } @@ -336,7 +340,7 @@ public boolean replace(SQLExpr expr, SQLExpr target) { return true; } - if (_for == expr) { + if (hasFor == expr) { setFor(target); return true; } @@ -376,14 +380,14 @@ public SQLDataType computeDataType() { long nameHash = this.methodNameHashCode64(); if (nameHash == FnvHash.Constants.TO_DATE || nameHash == FnvHash.Constants.ADD_MONTHS - ) { + ) { return resolvedReturnDataType = SQLDateExpr.DATA_TYPE; } if (nameHash == FnvHash.Constants.DATE_PARSE) { return resolvedReturnDataType = SQLTimestampExpr.DATA_TYPE; } if (nameHash == FnvHash.Constants.CURRENT_TIME - || nameHash == FnvHash.Constants.CURTIME ) { + || nameHash == FnvHash.Constants.CURTIME) { return resolvedReturnDataType = SQLTimeExpr.DATA_TYPE; } @@ -463,12 +467,11 @@ public SQLDataType computeDataType() { || nameHash == FnvHash.Constants.DATE_SUB || nameHash == FnvHash.Constants.DATE || nameHash == FnvHash.Constants.STR_TO_DATE - || nameHash == FnvHash.Constants.CURRENT_DATE) - { + || nameHash == FnvHash.Constants.CURRENT_DATE) { return resolvedReturnDataType = SQLDateExpr.DATA_TYPE; } - if (nameHash == FnvHash.Constants.UNIX_TIMESTAMP ) { + if (nameHash == FnvHash.Constants.UNIX_TIMESTAMP) { return resolvedReturnDataType = SQLIntegerExpr.DATA_TYPE; } @@ -482,7 +485,6 @@ public SQLDataType computeDataType() { return resolvedReturnDataType = SQLTimestampExpr.DATA_TYPE; } - return null; } @@ -498,14 +500,14 @@ public void setUsing(SQLExpr x) { } public SQLExpr getFor() { - return _for; + return hasFor; } public void setFor(SQLExpr x) { if (x != null) { x.setParent(this); } - this._for = x; + this.hasFor = x; } public String getTrimOption() { 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 a3616f3140..0a285b0f62 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 @@ -26,14 +26,14 @@ public class SQLNCharExpr extends SQLTextLiteralExpr { private static SQLDataType defaultDataType = new SQLCharacterDataType("nvarchar"); - public SQLNCharExpr(){ - + public SQLNCharExpr() { } - public SQLNCharExpr(String text){ + public SQLNCharExpr(String text) { this.text = text; } - public SQLNCharExpr(String text, SQLObject parent){ + + public SQLNCharExpr(String text, SQLObject parent) { this.text = text; this.parent = parent; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNotExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNotExpr.java index 1d367ba112..e362a36dd8 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNotExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNotExpr.java @@ -28,15 +28,13 @@ import java.util.List; public final class SQLNotExpr extends SQLExprImpl implements Serializable, SQLReplaceable { - private static final long serialVersionUID = 1L; - public SQLExpr expr; - - public SQLNotExpr(){ + public SQLExpr expr; + public SQLNotExpr() { } - public SQLNotExpr(SQLExpr expr){ + public SQLNotExpr(SQLExpr expr) { if (expr != null) { expr.setParent(this); } 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 5bb37598ff..e83b79a94e 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 @@ -27,12 +27,10 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE_NULL; public final class SQLNullExpr extends SQLExprImpl implements SQLLiteralExpr, SQLValuableExpr { - - public SQLNullExpr(){ - + public SQLNullExpr() { } - public SQLNullExpr(SQLObject parent){ + public SQLNullExpr(SQLObject parent) { this.parent = parent; } 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 d8e23e3f68..ac1a119f39 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 @@ -25,29 +25,28 @@ import java.math.BigDecimal; public class SQLNumberExpr extends SQLNumericLiteralExpr implements SQLValuableExpr { - public final static SQLDataType DATA_TYPE_NUMBER = new SQLDataTypeImpl("number"); + public static final SQLDataType DATA_TYPE_NUMBER = new SQLDataTypeImpl("number"); - public final static SQLDataType DATA_TYPE_DOUBLE = new SQLDataTypeImpl("double"); - public final static SQLDataType DATA_TYPE_BIGINT = SQLIntegerExpr.DATA_TYPE; + public static final SQLDataType DATA_TYPE_DOUBLE = new SQLDataTypeImpl("double"); + public static final SQLDataType DATA_TYPE_BIGINT = SQLIntegerExpr.DATA_TYPE; private Number number; private char[] chars; - public SQLNumberExpr(){ - + public SQLNumberExpr() { } - public SQLNumberExpr(Number number){ + public SQLNumberExpr(Number number) { this.number = number; } - public SQLNumberExpr(char[] chars, SQLObject parent){ + public SQLNumberExpr(char[] chars, SQLObject parent) { this.chars = chars; this.parent = parent; } - public SQLNumberExpr(char[] chars){ + public SQLNumberExpr(char[] chars) { this.chars = chars; } 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 c8a85b1cfc..a97de53f67 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 @@ -21,9 +21,7 @@ import java.util.List; public abstract class SQLNumericLiteralExpr extends SQLExprImpl implements SQLLiteralExpr { - - public SQLNumericLiteralExpr(){ - + public SQLNumericLiteralExpr() { } public abstract Number getNumber(); 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 21c8ec7d24..5bb55904b4 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 @@ -27,36 +27,35 @@ import java.util.List; public final class SQLPropertyExpr extends SQLExprImpl implements SQLName, SQLReplaceable, Comparable { - private SQLExpr owner; - private String name; + private SQLExpr owner; + private String name; - protected long nameHashCod64; - protected long hashCode64; + protected long nameHashCod64; + protected long hashCode64; - protected SQLObject resolvedColumn; - protected SQLObject resolvedOwnerObject; + protected SQLObject resolvedColumn; + protected SQLObject resolvedOwnerObject; - public SQLPropertyExpr(String owner2, String owner, String name){ + public SQLPropertyExpr(String owner2, String owner, String name) { this(new SQLPropertyExpr(owner2, owner), name); } - public SQLPropertyExpr(String owner, String name){ + public SQLPropertyExpr(String owner, String name) { this(new SQLIdentifierExpr(owner), name); } - public SQLPropertyExpr(SQLExpr owner, String name){ + public SQLPropertyExpr(SQLExpr owner, String name) { setOwner(owner); this.name = name; } - public SQLPropertyExpr(SQLExpr owner, String name, long nameHashCod64){ + public SQLPropertyExpr(SQLExpr owner, String name, long nameHashCod64) { setOwner(owner); this.name = name; this.nameHashCod64 = nameHashCod64; } - public SQLPropertyExpr(){ - + public SQLPropertyExpr() { } public String getSimpleName() { @@ -105,7 +104,7 @@ protected void computeHashCode64() { hash ^= '.'; hash *= FnvHash.PRIME; - } else if (owner == null){ + } else if (owner == null) { hash = FnvHash.BASIC; } else { hash = FnvHash.fnv1a_64_lower(owner.toString()); @@ -174,7 +173,7 @@ public List getChildren() { @Override public int hashCode() { long hash = hashCode64(); - return (int)(hash ^ (hash >>> 32)); + return (int) (hash ^ (hash >>> 32)); } public long hashCode64() { @@ -224,7 +223,7 @@ public boolean equals(Object obj) { } else if (!owner.equals(other.owner)) { return false; } - + return true; } @@ -260,7 +259,6 @@ public long nameHashCode64() { } public String normalizedName() { - String ownerName; if (owner instanceof SQLIdentifierExpr) { ownerName = ((SQLIdentifierExpr) owner).normalizedName(); @@ -287,7 +285,7 @@ public SQLColumnDefinition getResolvedColumn() { return ((SQLPropertyExpr) expr).getResolvedColumn(); } } - + return null; } @@ -368,7 +366,7 @@ public SQLDataType computeDataType() { } else if (resolvedOwnerObject instanceof SQLExprTableSource) { SQLExpr expr = ((SQLExprTableSource) resolvedOwnerObject).getExpr(); if (expr != null) { - + // skip } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLQueryExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLQueryExpr.java index da9155c04e..050a8e5120 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLQueryExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLQueryExpr.java @@ -28,15 +28,13 @@ import java.util.List; public class SQLQueryExpr extends SQLExprImpl implements Serializable { - private static final long serialVersionUID = 1L; - public SQLSelect subQuery; - - public SQLQueryExpr(){ + public SQLSelect subQuery; + public SQLQueryExpr() { } - public SQLQueryExpr(SQLSelect select){ + public SQLQueryExpr(SQLSelect select) { setSubQuery(select); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLRealExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLRealExpr.java index 531d954b50..665ce8cae6 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLRealExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLRealExpr.java @@ -16,22 +16,18 @@ package com.alibaba.druid.sql.ast.expr; import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExpr; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.Collections; import java.util.List; public class SQLRealExpr extends SQLNumericLiteralExpr implements SQLValuableExpr { - private float value; - public SQLRealExpr(){ - + public SQLRealExpr() { } - public SQLRealExpr(float value){ + public SQLRealExpr(float value) { super(); this.value = value; } @@ -75,8 +71,12 @@ public void setValue(float value) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLRealExpr that = (SQLRealExpr) o; diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSequenceExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSequenceExpr.java index f3c5434323..c2d6de1d05 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSequenceExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSequenceExpr.java @@ -22,15 +22,13 @@ import java.util.List; public class SQLSequenceExpr extends SQLExprImpl implements SQLReplaceable { - - private SQLName sequence; + private SQLName sequence; private Function function; - public SQLSequenceExpr(){ - + public SQLSequenceExpr() { } - public SQLSequenceExpr(SQLName sequence, Function function){ + public SQLSequenceExpr(SQLName sequence, Function function) { this.sequence = sequence; this.function = function; } @@ -64,14 +62,14 @@ public boolean replace(SQLExpr expr, SQLExpr target) { } public static enum Function { - NextVal("NEXTVAL"), CurrVal("CURRVAL"), PrevVal("PREVVAL"); + NextVal("NEXTVAL"), CurrVal("CURRVAL"), PrevVal("PREVVAL"); public final String name; - public final String name_lcase; + public final String nameLCase; - private Function(String name){ + private Function(String name) { this.name = name; - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } } @@ -106,14 +104,26 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null) return false; - if (getClass() != obj.getClass()) return false; + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } SQLSequenceExpr other = (SQLSequenceExpr) obj; - if (function != other.function) return false; + if (function != other.function) { + return false; + } if (sequence == null) { - if (other.sequence != null) return false; - } else if (!sequence.equals(other.sequence)) return false; + if (other.sequence != null) { + return false; + } + } else if (!sequence.equals(other.sequence)) { + return false; + } return true; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSizeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSizeExpr.java index 90a99b06e4..dc0e31f799 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSizeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSizeExpr.java @@ -25,15 +25,13 @@ import java.util.List; public class SQLSizeExpr extends SQLExprImpl { - private SQLExpr value; - private Unit unit; - - public SQLSizeExpr(){ + private Unit unit; + public SQLSizeExpr() { } - public SQLSizeExpr(String value, char unit){ + public SQLSizeExpr(String value, char unit) { this.unit = Unit.valueOf(Character.toString(unit).toUpperCase()); if (value.indexOf('.') == -1) { this.value = new SQLIntegerExpr(Integer.parseInt(value)); @@ -42,7 +40,7 @@ public SQLSizeExpr(String value, char unit){ } } - public SQLSizeExpr(SQLExpr value, Unit unit){ + public SQLSizeExpr(SQLExpr value, Unit unit) { super(); this.value = value; this.unit = unit; @@ -95,12 +93,18 @@ public SQLSizeExpr clone() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLSizeExpr that = (SQLSizeExpr) o; - if (value != null ? !value.equals(that.value) : that.value != null) return false; + if (value != null ? !value.equals(that.value) : that.value != null) { + return false; + } return unit == that.unit; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSmallIntExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSmallIntExpr.java index ed13eb812f..70a563c959 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSmallIntExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSmallIntExpr.java @@ -22,19 +22,17 @@ import java.util.List; public class SQLSmallIntExpr extends SQLNumericLiteralExpr implements SQLValuableExpr { - private Short value; - public SQLSmallIntExpr(){ - + public SQLSmallIntExpr() { } - public SQLSmallIntExpr(short value){ + public SQLSmallIntExpr(short value) { super(); this.value = value; } - public SQLSmallIntExpr(String value){ + public SQLSmallIntExpr(String value) { if (value.startsWith("--")) { value = value.substring(2); } @@ -69,6 +67,7 @@ protected void accept0(SQLASTVisitor visitor) { visitor.endVisit(this); } + @Override public int hashCode() { final int prime = 31; 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 fed832c927..298979f3c1 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 @@ -27,14 +27,12 @@ import java.util.List; public final class SQLSomeExpr extends SQLExprImpl { - public SQLSelect subQuery; - public SQLSomeExpr(){ - + public SQLSomeExpr() { } - public SQLSomeExpr(SQLSelect select){ + public SQLSomeExpr(SQLSelect select) { this.setSubQuery(select); } 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 da56a33192..c1a9803737 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 @@ -21,14 +21,12 @@ import java.util.List; public abstract class SQLTextLiteralExpr extends SQLExprImpl implements SQLLiteralExpr { - protected String text; - public SQLTextLiteralExpr(){ - + public SQLTextLiteralExpr() { } - public SQLTextLiteralExpr(String text){ + public SQLTextLiteralExpr(String text) { this.text = text; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTimeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTimeExpr.java index b1f87e66e9..3f7a5c2d91 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTimeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTimeExpr.java @@ -17,7 +17,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.text.SimpleDateFormat; @@ -31,12 +30,10 @@ public class SQLTimeExpr extends SQLExprImpl implements SQLLiteralExpr, SQLValua private SQLExpr literal; - public SQLTimeExpr(){ - + public SQLTimeExpr() { } - - public SQLTimeExpr(Date now, TimeZone timeZone){ + public SQLTimeExpr(Date now, TimeZone timeZone) { setLiteral(now, timeZone); } @@ -145,13 +142,14 @@ public List getChildren() { return Collections.emptyList(); } - public static long supportDbTypes = DbType.of(DbType.mysql - , DbType.oracle - , DbType.presto - , DbType.trino - , DbType.postgresql - , DbType.mariadb - , DbType.tidb + public static long supportDbTypes = DbType.of( + DbType.mysql, + DbType.oracle, + DbType.presto, + DbType.trino, + DbType.postgresql, + DbType.mariadb, + DbType.tidb ); public static boolean isSupport(DbType dbType) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTimestampExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTimestampExpr.java index 795a3f39b2..6b7885cff9 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTimestampExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTimestampExpr.java @@ -30,23 +30,22 @@ public class SQLTimestampExpr extends SQLExprImpl implements SQLValuableExpr, SQLLiteralExpr { public static final SQLDataType DATA_TYPE = new SQLDataTypeImpl("timestamp"); - protected String literal; - protected String timeZone; - protected boolean withTimeZone = false; + protected String literal; + protected String timeZone; + protected boolean withTimeZone; - public SQLTimestampExpr(){ - + public SQLTimestampExpr() { } - public SQLTimestampExpr(String literal){ + public SQLTimestampExpr(String literal) { this.literal = literal; } - public SQLTimestampExpr(Date date){ + public SQLTimestampExpr(Date date) { setLiteral(date); } - public SQLTimestampExpr(Date date, TimeZone timeZone){ + public SQLTimestampExpr(Date date, TimeZone timeZone) { setLiteral(date, timeZone); } @@ -294,21 +293,21 @@ public static boolean check(String str) { return false; } - if(c4 != '-') { + if (c4 != '-') { return false; } final int month, day; char M0 = 0, M1 = 0, d0 = 0, d1 = 0; if (c8 == ' ') { - if(c6 != '-') { + if (c6 != '-') { return false; } M1 = c5; d1 = c7; } else if (c9 == ' ') { - if(c6 == '-') { + if (c6 == '-') { M1 = c5; d0 = c7; d1 = c8; @@ -483,7 +482,7 @@ public static boolean check(String str) { m1 = x3; h1 = x5; h0 = x6; - } else if (x5 == ':'){ + } else if (x5 == ':') { m1 = x3; m0 = x4; h0 = 0; diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTinyIntExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTinyIntExpr.java index 8308fa5132..4b434f43ba 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTinyIntExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTinyIntExpr.java @@ -22,19 +22,17 @@ import java.util.List; public class SQLTinyIntExpr extends SQLNumericLiteralExpr implements SQLValuableExpr { - private Byte value; - public SQLTinyIntExpr(){ - + public SQLTinyIntExpr() { } - public SQLTinyIntExpr(Byte value){ + public SQLTinyIntExpr(Byte value) { super(); this.value = value; } - public SQLTinyIntExpr(String value){ + public SQLTinyIntExpr(String value) { super(); if (value.startsWith("--")) { value = value.substring(2); @@ -70,6 +68,7 @@ protected void accept0(SQLASTVisitor visitor) { visitor.endVisit(this); } + @Override public int hashCode() { final int prime = 31; diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLUnaryExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLUnaryExpr.java index 307daf1be6..0b1452a74a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLUnaryExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLUnaryExpr.java @@ -23,16 +23,14 @@ import java.util.List; public class SQLUnaryExpr extends SQLExprImpl implements Serializable, SQLReplaceable { - private static final long serialVersionUID = 1L; - private SQLExpr expr; - private SQLUnaryOperator operator; - - public SQLUnaryExpr(){ + private SQLExpr expr; + private SQLUnaryOperator operator; + public SQLUnaryExpr() { } - public SQLUnaryExpr(SQLUnaryOperator operator, SQLExpr expr){ + public SQLUnaryExpr(SQLUnaryOperator operator, SQLExpr expr) { this.operator = operator; this.setExpr(expr); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLUnaryOperator.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLUnaryOperator.java index abad98ea6c..15244bb5d0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLUnaryOperator.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLUnaryOperator.java @@ -16,21 +16,21 @@ package com.alibaba.druid.sql.ast.expr; public enum SQLUnaryOperator { - Plus("+"), // - Negative("-"), // - Not("!"), // - Compl("~"), // - Prior("PRIOR"), // - ConnectByRoot("CONNECT BY"), // - BINARY("BINARY"), // - RAW("RAW"), // + Plus("+"), + Negative("-"), + Not("!"), + Compl("~"), + Prior("PRIOR"), + ConnectByRoot("CONNECT BY"), + BINARY("BINARY"), + RAW("RAW"), NOT("NOT"), - Pound("#") // Number of points in path or polygon - ; + // Number of points in path or polygon + Pound("#"); public final String name; - SQLUnaryOperator(String name){ + SQLUnaryOperator(String name) { this.name = name; } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuableExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuableExpr.java index 1580527f8f..bf08d0d80e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuableExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuableExpr.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.ast.SQLExpr; public interface SQLValuableExpr extends SQLExpr { - Object getValue(); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuesExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuesExpr.java index 01c2e24373..020543a032 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuesExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuesExpr.java @@ -2,7 +2,6 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -26,8 +25,12 @@ protected void accept0(SQLASTVisitor visitor) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLValuesExpr that = (SQLValuesExpr) o; 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 b9b5692ac5..7a6a865857 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 @@ -27,35 +27,33 @@ import java.util.Map; public class SQLVariantRefExpr extends SQLExprImpl { + private String name; - private String name; + private boolean global; + private boolean session; - private boolean global = false; - private boolean session = false; + private int index = -1; - private int index = -1; - - public SQLVariantRefExpr(String name){ + public SQLVariantRefExpr(String name) { this.name = name; } - public SQLVariantRefExpr(String name, SQLObject parent){ + public SQLVariantRefExpr(String name, SQLObject parent) { this.name = name; this.parent = parent; } - public SQLVariantRefExpr(String name, boolean global){ + public SQLVariantRefExpr(String name, boolean global) { this(name, global, false); } - public SQLVariantRefExpr(String name, boolean global, boolean session){ + public SQLVariantRefExpr(String name, boolean global, boolean session) { this.name = name; this.global = global; this.session = session; } - public SQLVariantRefExpr(){ - + public SQLVariantRefExpr() { } public int getIndex() { @@ -136,7 +134,7 @@ public void setSession(boolean session) { } public SQLVariantRefExpr clone() { - SQLVariantRefExpr var = new SQLVariantRefExpr(name, global, session); + SQLVariantRefExpr var = new SQLVariantRefExpr(name, global, session); if (attributes != null) { var.attributes = new HashMap(attributes.size()); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterCharacter.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterCharacter.java index 7743f6ab9a..522fb2ca42 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterCharacter.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterCharacter.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterCharacter extends SQLObjectImpl implements SQLAlterTableItem { - private SQLExpr characterSet; private SQLExpr collate; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterDatabaseItem.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterDatabaseItem.java index f8e9654af0..a7413dfc6d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterDatabaseItem.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterDatabaseItem.java @@ -18,5 +18,4 @@ import com.alibaba.druid.sql.ast.SQLObject; public interface SQLAlterDatabaseItem extends SQLObject { - } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterDatabaseStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterDatabaseStatement.java index 0e1ac3ef08..11222532fb 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterDatabaseStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterDatabaseStatement.java @@ -26,18 +26,17 @@ import java.util.List; public class SQLAlterDatabaseStatement extends SQLStatementImpl implements SQLAlterStatement { - private SQLName name; - private boolean upgradeDataDirectoryName; + private SQLName name; + private boolean upgradeDataDirectoryName; private SQLAlterCharacter character; private SQLAlterDatabaseItem item; private List properties = new ArrayList(); - + public SQLAlterDatabaseStatement() { - } - + public SQLAlterDatabaseStatement(DbType dbType) { this.setDbType(dbType); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterIndexStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterIndexStatement.java index 65ff4e9e99..46de2071cb 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterIndexStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterIndexStatement.java @@ -16,10 +16,6 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl; -import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleAlterStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleStatementImpl; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; @@ -36,7 +32,7 @@ public class SQLAlterIndexStatement extends SQLStatementImpl implements SQLAlter private Rebuild rebuild; private SQLExpr parallel; private List partitions = new ArrayList(); - protected SQLPartitionBy dbPartitionBy; + protected SQLPartitionBy dbPartitionBy; @Override public void accept0(SQLASTVisitor visitor) { @@ -116,7 +112,6 @@ public void setUnusable(boolean unusable) { } public static class Rebuild extends SQLObjectImpl { - private SQLObject option; public SQLObject getOption() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterMaterializedViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterMaterializedViewStatement.java index 37d6c9672e..3efc06075b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterMaterializedViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterMaterializedViewStatement.java @@ -44,7 +44,6 @@ public class SQLAlterMaterializedViewStatement extends SQLStatementImpl implemen protected boolean refreshOnOverWrite; private boolean rebuild; - public SQLName getName() { return name; } @@ -56,7 +55,6 @@ public void setName(SQLName name) { this.name = name; } - public boolean isRefresh() { return refreshFast || refreshComplete || refreshForce || refreshOnDemand || refreshOnCommit || refreshStartWith || refreshNext || refreshOnOverWrite; } @@ -133,7 +131,6 @@ public void setEnableQueryRewrite(Boolean enableQueryRewrite) { this.enableQueryRewrite = enableQueryRewrite; } - public SQLExpr getStartWith() { return startWith; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterOutlineStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterOutlineStatement.java index 5dc253cc4c..51b4264fe1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterOutlineStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterOutlineStatement.java @@ -32,11 +32,10 @@ public class SQLAlterOutlineStatement extends SQLStatementImpl implements SQLAlt private boolean enable; public SQLAlterOutlineStatement() { - } public SQLAlterOutlineStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterProcedureStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterProcedureStatement.java index 38ac83deef..aa0d656c7a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterProcedureStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterProcedureStatement.java @@ -20,11 +20,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterProcedureStatement extends SQLStatementImpl implements SQLAlterStatement { - private SQLExpr name; - private boolean compile = false; - private boolean reuseSettings = false; + private boolean compile; + private boolean reuseSettings; private SQLExpr comment; private boolean languageSql; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSequenceStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSequenceStatement.java index b319074c7d..24830e784c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSequenceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSequenceStatement.java @@ -35,7 +35,6 @@ public class SQLAlterSequenceStatement extends SQLStatementImpl implements SQLAl private boolean changeToTime; public SQLAlterSequenceStatement() { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSystemGetConfigStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSystemGetConfigStatement.java index 3736dc1e87..829ca970c1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSystemGetConfigStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSystemGetConfigStatement.java @@ -22,7 +22,6 @@ public class SQLAlterSystemGetConfigStatement extends SQLStatementImpl implements SQLAlterStatement { private SQLName name; - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSystemSetConfigStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSystemSetConfigStatement.java index 8c3a50db65..79503990d5 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSystemSetConfigStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSystemSetConfigStatement.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddClusteringKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddClusteringKey.java index 70962949fc..8deea7a2d9 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddClusteringKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddClusteringKey.java @@ -15,22 +15,18 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlTableIndex; +import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -import com.alibaba.druid.util.FnvHash; import java.util.ArrayList; import java.util.List; public class SQLAlterTableAddClusteringKey extends SQLObjectImpl implements SQLAlterTableItem { - private SQLName name; + private SQLName name; private final List columns = new ArrayList(); public SQLAlterTableAddClusteringKey() { - } @Override 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 693e3b177d..037e2c5ec5 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 @@ -17,7 +17,6 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObjectImpl; -import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; @@ -34,7 +33,6 @@ public class SQLAlterTableAddColumn extends SQLObjectImpl implements SQLAlterTab private boolean cascade; public SQLAlterTableAddColumn() { - } @Override @@ -48,7 +46,7 @@ protected void accept0(SQLASTVisitor visitor) { public List getColumns() { return columns; } - + public void addColumn(SQLColumnDefinition column) { if (column != null) { column.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddConstraint.java index 2f18ceaa85..4fdfe23891 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddConstraint.java @@ -19,15 +19,13 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableAddConstraint extends SQLObjectImpl implements SQLAlterTableItem { - private SQLConstraint constraint; - private boolean withNoCheck = false; - - public SQLAlterTableAddConstraint(){ + private boolean withNoCheck; + public SQLAlterTableAddConstraint() { } - public SQLAlterTableAddConstraint(SQLConstraint constraint){ + public SQLAlterTableAddConstraint(SQLConstraint constraint) { this.setConstraint(constraint); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddExtPartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddExtPartition.java index 71a92e645f..7d8a11d462 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddExtPartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddExtPartition.java @@ -35,4 +35,4 @@ public void setExPartition(MySqlExtPartition x) { public MySqlExtPartition getExtPartition() { return extPartition; } -} \ No newline at end of file +} 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 9705c0404a..a941b1f429 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 @@ -16,16 +16,13 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlTableIndex; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -import com.alibaba.druid.util.FnvHash; import java.util.List; public class SQLAlterTableAddIndex extends SQLObjectImpl implements SQLAlterTableItem, SQLIndex { - private SQLIndexDefinition indexDefinition = new SQLIndexDefinition(); public SQLAlterTableAddIndex() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddPartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddPartition.java index 20ff7f91c9..daa93ed74c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddPartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddPartition.java @@ -24,11 +24,10 @@ import java.util.List; public class SQLAlterTableAddPartition extends SQLObjectImpl implements SQLAlterTableItem { - - private boolean ifNotExists = false; - private final List partitions = new ArrayList(4); - private SQLExpr partitionCount; - private SQLExpr location; // hive + private boolean ifNotExists; + private final List partitions = new ArrayList(4); + private SQLExpr partitionCount; + private SQLExpr location; // hive public List getPartitions() { return partitions; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddSupplemental.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddSupplemental.java index c307fbfd3f..8e7002d189 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddSupplemental.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddSupplemental.java @@ -19,14 +19,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableAddSupplemental extends SQLObjectImpl implements SQLAlterTableItem { - private SQLTableElement element; - public SQLAlterTableAddSupplemental(){ - + public SQLAlterTableAddSupplemental() { } - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { 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 8c66b87335..702615929b 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 @@ -23,16 +23,16 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableAlterColumn extends SQLObjectImpl implements SQLAlterTableItem { - private SQLName originColumn; + private SQLName originColumn; private SQLColumnDefinition column; - private boolean setNotNull; - private boolean dropNotNull; - private SQLExpr setDefault; - private boolean dropDefault; - private boolean first; - private SQLName after; - private SQLDataType dataType; - private boolean toFirst; + private boolean setNotNull; + private boolean dropNotNull; + private SQLExpr setDefault; + private boolean dropDefault; + private boolean first; + private SQLName after; + private SQLDataType dataType; + private boolean toFirst; @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterIndex.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterIndex.java index 0d047d0b1b..e2fa42fa2e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterIndex.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterIndex.java @@ -23,7 +23,6 @@ import java.util.List; public class SQLAlterTableAlterIndex extends SQLObjectImpl implements SQLAlterTableItem, SQLIndex { - private SQLIndexDefinition indexDefinition = new SQLIndexDefinition(); public SQLAlterTableAlterIndex() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAnalyzePartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAnalyzePartition.java index 5b1a4de7c0..d51d290d6a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAnalyzePartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAnalyzePartition.java @@ -23,13 +23,12 @@ import java.util.List; public class SQLAlterTableAnalyzePartition extends SQLObjectImpl implements SQLAlterTableItem { - private final List partitions = new ArrayList(4); public List getPartitions() { return partitions; } - + public void addPartition(SQLName partition) { if (partition != null) { partition.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableArchivePartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableArchivePartition.java index dd0fc01ab8..0d24d0035a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableArchivePartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableArchivePartition.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -28,7 +27,7 @@ public class SQLAlterTableArchivePartition extends SQLObjectImpl implements SQLA public List getPartitions() { return partitions; } - + public void addPartition(SQLAssignItem partition) { if (partition != null) { partition.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableBlockSize.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableBlockSize.java index 8d3fd158d9..7dde158f5a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableBlockSize.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableBlockSize.java @@ -20,11 +20,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableBlockSize extends SQLObjectImpl implements SQLAlterTableItem { - private SQLIntegerExpr size; - public SQLAlterTableBlockSize(){ - + public SQLAlterTableBlockSize() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableChangeOwner.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableChangeOwner.java index b05b95fa3d..db23c4e5e8 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableChangeOwner.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableChangeOwner.java @@ -32,9 +32,7 @@ public List getPartition() { @Override protected void accept0(SQLASTVisitor visitor) { - if (visitor.visit(this)) { - - } + visitor.visit(this); visitor.endVisit(this); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableCheckPartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableCheckPartition.java index ee99695799..3229651c34 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableCheckPartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableCheckPartition.java @@ -23,13 +23,12 @@ import java.util.List; public class SQLAlterTableCheckPartition extends SQLObjectImpl implements SQLAlterTableItem { - private final List partitions = new ArrayList(4); public List getPartitions() { return partitions; } - + public void addPartition(SQLName partition) { if (partition != null) { partition.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableCoalescePartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableCoalescePartition.java index d1a4ab2125..69f6815f87 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableCoalescePartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableCoalescePartition.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableCoalescePartition extends SQLObjectImpl implements SQLAlterTableItem { - private SQLExpr count; public SQLExpr getCount() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableCompression.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableCompression.java index 390863f174..8fc88c3b55 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableCompression.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableCompression.java @@ -17,15 +17,12 @@ import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableCompression extends SQLObjectImpl implements SQLAlterTableItem { - private SQLCharExpr name; - public SQLAlterTableCompression(){ - + public SQLAlterTableCompression() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableConvertCharSet.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableConvertCharSet.java index 6e84f0e541..0f57a84e40 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableConvertCharSet.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableConvertCharSet.java @@ -20,12 +20,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableConvertCharSet extends SQLObjectImpl implements SQLAlterTableItem { - private SQLExpr charset; private SQLExpr collate; - + public SQLAlterTableConvertCharSet() { - } public SQLExpr getCharset() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDeleteByCondition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDeleteByCondition.java index 3185ef7d29..ae07bf40d5 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDeleteByCondition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDeleteByCondition.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDeleteByCondition extends SQLObjectImpl implements SQLAlterTableItem { - private SQLExpr where; public SQLExpr getWhere() { @@ -36,7 +35,7 @@ public void setWhere(SQLExpr where) { @Override protected void accept0(SQLASTVisitor visitor) { - if(visitor.visit(this)) { + if (visitor.visit(this)) { acceptChild(visitor, where); } visitor.endVisit(this); 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 592c73c4f8..fe9826f676 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 @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDisableConstraint extends SQLObjectImpl implements SQLAlterTableItem { - private SQLName constraintName; @Override 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 a78c3a4e48..31516ce9db 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDisableKeys extends SQLObjectImpl implements SQLAlterTableItem { - @Override protected void accept0(SQLASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableLifecycle.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableLifecycle.java index 08091d0832..ca96a2f28c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableLifecycle.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableLifecycle.java @@ -22,7 +22,6 @@ import java.util.List; public class SQLAlterTableDisableLifecycle extends SQLObjectImpl implements SQLAlterTableItem { - private final List partition = new ArrayList(4); public List getPartition() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDiscardPartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDiscardPartition.java index 182b7d357b..a3e94690fb 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDiscardPartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDiscardPartition.java @@ -23,19 +23,17 @@ import java.util.List; public class SQLAlterTableDiscardPartition extends SQLObjectImpl implements SQLAlterTableItem { - private final List partitions = new ArrayList(4); private boolean tablespace; public SQLAlterTableDiscardPartition() { - } public List getPartitions() { return partitions; } - + public void addPartition(SQLName partition) { if (partition != null) { partition.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropClusteringKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropClusteringKey.java index 040cfd41de..410dd5e571 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropClusteringKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropClusteringKey.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDropClusteringKey extends SQLObjectImpl implements SQLAlterTableItem { - private SQLName keyName; public SQLName getKeyName() { @@ -33,7 +32,7 @@ public void setKeyName(SQLName keyName) { @Override protected void accept0(SQLASTVisitor visitor) { - if(visitor.visit(this)) { + if (visitor.visit(this)) { acceptChild(visitor, keyName); } visitor.endVisit(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 cb5c4ce103..e389064d95 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 @@ -23,13 +23,11 @@ import java.util.List; public class SQLAlterTableDropColumnItem extends SQLObjectImpl implements SQLAlterTableItem { - private List columns = new ArrayList(); - private boolean cascade = false; - - public SQLAlterTableDropColumnItem(){ + private boolean cascade; + public SQLAlterTableDropColumnItem() { } @Override @@ -43,7 +41,7 @@ protected void accept0(SQLASTVisitor visitor) { public List getColumns() { return columns; } - + public void addColumn(SQLName column) { if (column != null) { column.setParent(this); 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 f9a91b7262..c3dd388f61 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 @@ -20,11 +20,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDropConstraint extends SQLObjectImpl implements SQLAlterTableItem { - private SQLName constraintName; - protected boolean cascade = false; - protected boolean restrict = false; + protected boolean cascade; + protected boolean restrict; public boolean isCascade() { return cascade; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropExtPartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropExtPartition.java index 732a3777da..008ff08662 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropExtPartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropExtPartition.java @@ -10,7 +10,7 @@ * @author shicai.xsc 2018/9/17 上午10:35 * @since 5.0.0.0 */ -public class SQLAlterTableDropExtPartition extends SQLObjectImpl implements SQLAlterTableItem, MySqlObject { +public class SQLAlterTableDropExtPartition extends SQLObjectImpl implements SQLAlterTableItem, MySqlObject { private MySqlExtPartition extPartition; @Override @@ -35,4 +35,4 @@ public void setExPartition(MySqlExtPartition x) { public MySqlExtPartition getExtPartition() { return extPartition; } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeignKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeignKey.java index 4c651848de..c99aed386b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeignKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeignKey.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDropForeignKey extends SQLObjectImpl implements SQLAlterTableItem { - private SQLName indexName; public SQLName getIndexName() { 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 523a7ea086..b19e0db83d 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 @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDropIndex extends SQLObjectImpl implements SQLAlterTableItem { - private SQLName indexName; public SQLName getIndexName() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropKey.java index a47d007153..ec32ca4a5e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropKey.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDropKey extends SQLObjectImpl implements SQLAlterTableItem { - private SQLName keyName; public SQLName getKeyName() { @@ -33,7 +32,7 @@ public void setKeyName(SQLName keyName) { @Override protected void accept0(SQLASTVisitor visitor) { - if(visitor.visit(this)) { + if (visitor.visit(this)) { acceptChild(visitor, keyName); } visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropPartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropPartition.java index 315706b6e7..45a7d093bf 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropPartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropPartition.java @@ -16,7 +16,6 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -24,14 +23,14 @@ import java.util.List; public class SQLAlterTableDropPartition extends SQLObjectImpl implements SQLAlterTableItem { - private boolean ifExists = false; + private boolean ifExists; private boolean purge; private final List partitions = new ArrayList(4); public List getPartitions() { return partitions; } - + public void addPartition(SQLExpr partition) { if (partition != null) { partition.setParent(this); 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 4cd2398411..74ee75711d 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableDropPrimaryKey extends SQLObjectImpl implements SQLAlterTableItem { - @Override protected void accept0(SQLASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropSubpartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropSubpartition.java index 87393117dc..43454d1bc7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropSubpartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropSubpartition.java @@ -23,12 +23,10 @@ import java.util.List; public class SQLAlterTableDropSubpartition extends SQLObjectImpl implements SQLAlterTableItem { - private List partitionIds = new ArrayList(); private List subpartitionIds = new ArrayList(); - public SQLAlterTableDropSubpartition(){ - + public SQLAlterTableDropSubpartition() { } @Override 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 04cd577086..a55fa9204b 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 @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableEnableConstraint extends SQLObjectImpl implements SQLAlterTableItem { - private SQLName constraintName; @Override 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 5acf08498b..d203dc4dec 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableEnableKeys extends SQLObjectImpl implements SQLAlterTableItem { - @Override protected void accept0(SQLASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableLifecycle.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableLifecycle.java index 89b2b821b9..7278bf71a4 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableLifecycle.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableLifecycle.java @@ -22,7 +22,6 @@ import java.util.List; public class SQLAlterTableEnableLifecycle extends SQLObjectImpl implements SQLAlterTableItem { - private final List partition = new ArrayList(4); public List getPartition() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableExchangePartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableExchangePartition.java index dbbab4fdec..cb703447ac 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableExchangePartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableExchangePartition.java @@ -18,19 +18,17 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObjectImpl; -import com.alibaba.druid.sql.ast.SQLPartition; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class SQLAlterTableExchangePartition extends SQLObjectImpl implements SQLAlterTableItem { - private List partitions = new ArrayList(); - private SQLExprTableSource table; - private Boolean validation; + private List partitions = new ArrayList(); + private SQLExprTableSource table; + private Boolean validation; public SQLAlterTableExchangePartition() { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableGroupStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableGroupStatement.java index cf82e50924..b6be8451c0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableGroupStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableGroupStatement.java @@ -17,7 +17,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -25,12 +24,11 @@ import java.util.List; public class SQLAlterTableGroupStatement extends SQLStatementImpl implements SQLAlterStatement { - private SQLName name; + private SQLName name; private List options = new ArrayList(); public SQLAlterTableGroupStatement() { - } public SQLAlterTableGroupStatement(DbType dbType) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableImportPartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableImportPartition.java index c1f9f313ec..94d25839dc 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableImportPartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableImportPartition.java @@ -23,7 +23,6 @@ import java.util.List; public class SQLAlterTableImportPartition extends SQLObjectImpl implements SQLAlterTableItem { - private final List partitions = new ArrayList(4); private boolean tablespace; @@ -31,7 +30,7 @@ public class SQLAlterTableImportPartition extends SQLObjectImpl implements SQLAl public List getPartitions() { return partitions; } - + public void addPartition(SQLName partition) { if (partition != null) { partition.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableItem.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableItem.java index 6138e0ce10..a53b438845 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableItem.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableItem.java @@ -18,5 +18,4 @@ import com.alibaba.druid.sql.ast.SQLObject; public interface SQLAlterTableItem extends SQLObject { - } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableMergePartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableMergePartition.java index 9901cc6bf7..d4cc6b88d4 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableMergePartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableMergePartition.java @@ -23,9 +23,8 @@ import java.util.List; public class SQLAlterTableMergePartition extends SQLObjectImpl implements SQLAlterTableItem { - - private final List partitions = new ArrayList(4); - private boolean ifExists = false; + private final List partitions = new ArrayList(4); + private boolean ifExists; private SQLPartitionSpec overwritePartition; private boolean purge; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableOptimizePartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableOptimizePartition.java index e56ccea123..9ad7162160 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableOptimizePartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableOptimizePartition.java @@ -23,13 +23,12 @@ import java.util.List; public class SQLAlterTableOptimizePartition extends SQLObjectImpl implements SQLAlterTableItem { - private final List partitions = new ArrayList(4); public List getPartitions() { return partitions; } - + public void addPartition(SQLName partition) { if (partition != null) { partition.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTablePartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTablePartition.java index d8f6205a44..e9941e2010 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTablePartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTablePartition.java @@ -15,7 +15,6 @@ * @version : SQLAlterTablePartition.java, v 0.1 2019年11月14日 21:50 gouzhiwen Exp $ */ public class SQLAlterTablePartition extends SQLObjectImpl implements SQLAlterTableItem { - private final List partition = new ArrayList(4); public List getPartition() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTablePartitionCount.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTablePartitionCount.java index b76c27255b..dad31812c9 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTablePartitionCount.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTablePartitionCount.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTablePartitionCount extends SQLObjectImpl implements SQLAlterTableItem { - private SQLIntegerExpr count; - public SQLAlterTablePartitionCount(){ - + public SQLAlterTablePartitionCount() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTablePartitionLifecycle.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTablePartitionLifecycle.java index 36f4e84538..2184ff48c2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTablePartitionLifecycle.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTablePartitionLifecycle.java @@ -20,11 +20,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTablePartitionLifecycle extends SQLObjectImpl implements SQLAlterTableItem { - private SQLIntegerExpr lifecycle; - public SQLAlterTablePartitionLifecycle(){ - + public SQLAlterTablePartitionLifecycle() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableReOrganizePartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableReOrganizePartition.java index ce7118860b..75b25f9c3b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableReOrganizePartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableReOrganizePartition.java @@ -24,10 +24,9 @@ import java.util.List; public class SQLAlterTableReOrganizePartition extends SQLObjectImpl implements SQLAlterTableItem { + private final List names = new ArrayList(); - private final List names = new ArrayList(); - - private final List partitions = new ArrayList(4); + private final List partitions = new ArrayList(4); public List getPartitions() { return partitions; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRebuildPartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRebuildPartition.java index 70652cb7a8..82f48ed452 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRebuildPartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRebuildPartition.java @@ -23,13 +23,12 @@ import java.util.List; public class SQLAlterTableRebuildPartition extends SQLObjectImpl implements SQLAlterTableItem { - private final List partitions = new ArrayList(4); public List getPartitions() { return partitions; } - + public void addPartition(SQLName partition) { if (partition != null) { partition.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRecoverPartitions.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRecoverPartitions.java index a2dadb1aa3..5032be7745 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRecoverPartitions.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRecoverPartitions.java @@ -23,13 +23,12 @@ import java.util.List; public class SQLAlterTableRecoverPartitions extends SQLObjectImpl implements SQLAlterTableItem { - private final List partitions = new ArrayList(4); public List getPartitions() { return partitions; } - + public void addPartition(SQLName partition) { if (partition != null) { partition.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRename.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRename.java index 3adc382391..b9eaf89b1f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRename.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRename.java @@ -21,11 +21,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableRename extends SQLObjectImpl implements SQLAlterTableItem { - protected SQLExprTableSource to; public SQLAlterTableRename() { - } public SQLAlterTableRename(SQLExpr to) { 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 b74ead989a..03e774a560 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 @@ -20,12 +20,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableRenameColumn extends SQLObjectImpl implements SQLAlterTableItem { - private SQLName column; private SQLName to; - public SQLAlterTableRenameColumn(){ - + public SQLAlterTableRenameColumn() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRenameIndex.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRenameIndex.java index 5b313dc743..3cbcad1ab7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRenameIndex.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRenameIndex.java @@ -16,28 +16,21 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLObjectImpl; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem; -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; public class SQLAlterTableRenameIndex extends SQLObjectImpl implements SQLAlterTableItem { - private SQLName name; private SQLName to; - public SQLAlterTableRenameIndex(SQLName name, SQLName to){ + public SQLAlterTableRenameIndex(SQLName name, SQLName to) { this.setName(name); this.setTo(to); } - public SQLAlterTableRenameIndex(){ + public SQLAlterTableRenameIndex() { } - public void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, name); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRenamePartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRenamePartition.java index 6bb07315a1..8be0f8137d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRenamePartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRenamePartition.java @@ -22,11 +22,10 @@ import java.util.List; public class SQLAlterTableRenamePartition extends SQLObjectImpl implements SQLAlterTableItem { - - private boolean ifNotExists = false; + private boolean ifNotExists; private final List partition = new ArrayList(4); - private final List to = new ArrayList(4); + private final List to = new ArrayList(4); public List getPartition() { return partition; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRepairPartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRepairPartition.java index b125f57b78..5a1a6982b3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRepairPartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableRepairPartition.java @@ -23,13 +23,12 @@ import java.util.List; public class SQLAlterTableRepairPartition extends SQLObjectImpl implements SQLAlterTableItem { - private final List partitions = new ArrayList(4); public List getPartitions() { return partitions; } - + public void addPartition(SQLName partition) { if (partition != null) { partition.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableReplaceColumn.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableReplaceColumn.java index b5f40973e3..9b848cf781 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableReplaceColumn.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableReplaceColumn.java @@ -23,10 +23,8 @@ import java.util.List; public class SQLAlterTableReplaceColumn extends SQLObjectImpl implements SQLAlterTableItem { - private final List columns = new ArrayList(); - - + // for mysql private SQLName firstColumn; private SQLName afterColumn; @@ -44,7 +42,7 @@ protected void accept0(SQLASTVisitor visitor) { public List getColumns() { return columns; } - + public void addColumn(SQLColumnDefinition column) { if (column != null) { column.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetComment.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetComment.java index 854738afca..96fc1ba93f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetComment.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetComment.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableSetComment extends SQLObjectImpl implements SQLAlterTableItem { - private SQLExpr comment; public SQLExpr getComment() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetLifecycle.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetLifecycle.java index 3b2153edee..2912efd9ba 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetLifecycle.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetLifecycle.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableSetLifecycle extends SQLObjectImpl implements SQLAlterTableItem { - private SQLExpr lifecycle; public SQLExpr getLifecycle() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetLocation.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetLocation.java index 8c97a538ad..84d3797211 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetLocation.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetLocation.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableSetLocation extends SQLObjectImpl implements SQLAlterTableItem { - private SQLExpr location; public SQLExpr getLocation() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetOption.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetOption.java index d977bc6100..c7e865e865 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetOption.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSetOption.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -28,7 +27,6 @@ public class SQLAlterTableSetOption extends SQLObjectImpl implements SQLAlterTab private SQLName on; public SQLAlterTableSetOption() { - } public List getOptions() { 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 a3225145c5..2da947b7a2 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 @@ -16,11 +16,7 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.SQLPartitionBy; -import com.alibaba.druid.sql.ast.SQLStatementImpl; +import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -29,39 +25,37 @@ import java.util.List; public class SQLAlterTableStatement extends SQLStatementImpl implements SQLDDLStatement, SQLAlterStatement { - - private SQLExprTableSource tableSource; - private List items = new ArrayList(); + private SQLExprTableSource tableSource; + private List items = new ArrayList(); // for mysql - private boolean ignore = false; - private boolean online = false; - private boolean offline = false; + private boolean ignore; + private boolean online; + private boolean offline; - private boolean updateGlobalIndexes = false; - private boolean invalidateGlobalIndexes = false; + private boolean updateGlobalIndexes; + private boolean invalidateGlobalIndexes; - private boolean removePatiting = false; - private boolean upgradePatiting = false; - private List tableOptions = new ArrayList(); - private SQLPartitionBy partition = null; + private boolean removePatiting; + private boolean upgradePatiting; + private List tableOptions = new ArrayList(); + private SQLPartitionBy partition; // odps - private boolean mergeSmallFiles = false; - protected boolean range; - protected final List clusteredBy = new ArrayList(); - protected final List sortedBy = new ArrayList(); - protected int buckets; - protected int shards; - - private boolean ifExists = false; - private boolean notClustered = false; + private boolean mergeSmallFiles; + protected boolean range; + protected final List clusteredBy = new ArrayList(); + protected final List sortedBy = new ArrayList(); + protected int buckets; + protected int shards; - public SQLAlterTableStatement(){ + private boolean ifExists; + private boolean notClustered; + public SQLAlterTableStatement() { } - public SQLAlterTableStatement(DbType dbType){ + public SQLAlterTableStatement(DbType dbType) { super(dbType); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSubpartitionAvailablePartitionNum.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSubpartitionAvailablePartitionNum.java index 3bb253c45c..f4d5acdce9 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSubpartitionAvailablePartitionNum.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSubpartitionAvailablePartitionNum.java @@ -15,13 +15,11 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableSubpartitionAvailablePartitionNum extends SQLObjectImpl implements SQLAlterTableItem { - private SQLIntegerExpr number; public SQLIntegerExpr getNumber() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSubpartitionLifecycle.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSubpartitionLifecycle.java index 614eb2eece..ba114dc4a3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSubpartitionLifecycle.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableSubpartitionLifecycle.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -24,12 +23,10 @@ import java.util.List; public class SQLAlterTableSubpartitionLifecycle extends SQLObjectImpl implements SQLAlterTableItem { - private List partitionIds = new ArrayList(); private List subpartitionLifeCycle = new ArrayList(); - public SQLAlterTableSubpartitionLifecycle(){ - + public SQLAlterTableSubpartitionLifecycle() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableTouch.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableTouch.java index 263d89be58..8b61c8ccf0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableTouch.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableTouch.java @@ -22,7 +22,6 @@ import java.util.List; public class SQLAlterTableTouch extends SQLObjectImpl implements SQLAlterTableItem { - private final List partition = new ArrayList(4); public List getPartition() { @@ -31,9 +30,7 @@ public List getPartition() { @Override protected void accept0(SQLASTVisitor visitor) { - if (visitor.visit(this)) { - - } + visitor.visit(this); visitor.endVisit(this); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableTruncatePartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableTruncatePartition.java index 0fd1212433..7e32cb5291 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableTruncatePartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableTruncatePartition.java @@ -23,13 +23,12 @@ import java.util.List; public class SQLAlterTableTruncatePartition extends SQLObjectImpl implements SQLAlterTableItem { - private final List partitions = new ArrayList(4); public List getPartitions() { return partitions; } - + public void addPartition(SQLName partition) { if (partition != null) { partition.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableUnarchivePartition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableUnarchivePartition.java index d31bf52dfb..4f6068554a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableUnarchivePartition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableUnarchivePartition.java @@ -27,7 +27,7 @@ public class SQLAlterTableUnarchivePartition extends SQLObjectImpl implements SQ public List getPartitions() { return partitions; } - + public void addPartition(SQLAssignItem partition) { if (partition != null) { partition.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterViewRenameStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterViewRenameStatement.java index 8d9918cb26..5792701540 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterViewRenameStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterViewRenameStatement.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterViewRenameStatement extends SQLStatementImpl implements SQLAlterStatement { - private SQLName name; private SQLName to; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterViewStatement.java index b82ad34861..28290a3d26 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterViewStatement.java @@ -30,15 +30,14 @@ import java.util.List; public class SQLAlterViewStatement extends SQLStatementImpl implements SQLCreateStatement { - - private boolean force = false; + private boolean force; // protected SQLName name; protected SQLSelect subQuery; - protected boolean ifNotExists = false; + protected boolean ifNotExists; - protected String algorithm; - protected SQLName definer; - protected String sqlSecurity; + protected String algorithm; + protected SQLName definer; + protected String sqlSecurity; protected SQLExprTableSource tableSource; @@ -51,11 +50,10 @@ public class SQLAlterViewStatement extends SQLStatementImpl implements SQLCreate private SQLLiteralExpr comment; - public SQLAlterViewStatement(){ - + public SQLAlterViewStatement() { } - public SQLAlterViewStatement(DbType dbType){ + public SQLAlterViewStatement(DbType dbType) { super(dbType); } @@ -159,7 +157,7 @@ public void setSubQuery(SQLSelect subQuery) { public List getColumns() { return columns; } - + public void addColumn(SQLTableElement column) { if (column != null) { column.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAnalyzeTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAnalyzeTableStatement.java index 86e7992262..458ddce04d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAnalyzeTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAnalyzeTableStatement.java @@ -19,32 +19,27 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.statement.SQLAssignItem; -import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; -import com.alibaba.druid.sql.dialect.odps.ast.OdpsStatementImpl; -import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class SQLAnalyzeTableStatement extends SQLStatementImpl { - protected final List tableSources = new ArrayList(); + protected final List tableSources = new ArrayList(); - private SQLPartitionRef partition; - private boolean forColums = false; - private List columns = new ArrayList<>(); - private boolean cacheMetadata; - private boolean noscan; - private boolean computeStatistics; + private SQLPartitionRef partition; + private boolean forColums; + private List columns = new ArrayList<>(); + private boolean cacheMetadata; + private boolean noscan; + private boolean computeStatistics; - private SQLIdentifierExpr adbSchema; // for ADB + private SQLIdentifierExpr adbSchema; // for ADB private List adbColumns = new ArrayList(); // for ADB private List adbColumnsGroup = new ArrayList(); // for ADB private SQLExpr adbWhere; // for ADB public SQLAnalyzeTableStatement() { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLArchiveTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLArchiveTableStatement.java index d166d063ac..a04c1a220c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLArchiveTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLArchiveTableStatement.java @@ -15,15 +15,8 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.DbType; -import com.alibaba.druid.FastsqlException; -import com.alibaba.druid.sql.ast.SQLCommentHint; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.ast.expr.SQLBigIntExpr; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -75,7 +68,6 @@ public List getSpIdList() { return spIdList; } - public List getpIdList() { return pIdList; } 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 105a5e7838..595b1cd79d 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 @@ -15,28 +15,35 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLExprImpl; +import com.alibaba.druid.sql.ast.SQLObject; +import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.List; public class SQLAssignItem extends SQLExprImpl implements SQLReplaceable { - private SQLExpr target; private SQLExpr value; - public SQLAssignItem(){ + public SQLAssignItem() { } @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLAssignItem that = (SQLAssignItem) o; - if (target != null ? !target.equals(that.target) : that.target != null) return false; + if (target != null ? !target.equals(that.target) : that.target != null) { + return false; + } return value != null ? value.equals(that.value) : that.value == null; } @@ -47,7 +54,7 @@ public int hashCode() { return result; } - public SQLAssignItem(SQLExpr target, SQLExpr value){ + public SQLAssignItem(SQLExpr target, SQLExpr value) { setTarget(target); setValue(value); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLBackupStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLBackupStatement.java index c43608e9ff..f6555a2b2d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLBackupStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLBackupStatement.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLBlockStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLBlockStatement.java index ec4275e2f0..b8bedf13d1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLBlockStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLBlockStatement.java @@ -24,15 +24,14 @@ import java.util.List; public class SQLBlockStatement extends SQLStatementImpl { - private String labelName; - private String endLabel; - private List parameters = new ArrayList(); + private String labelName; + private String endLabel; + private List parameters = new ArrayList(); private List statementList = new ArrayList(); - public SQLStatement exception; - private boolean endOfCommit; + public SQLStatement exception; + private boolean endOfCommit; public SQLBlockStatement() { - } public List getStatementList() { @@ -42,7 +41,7 @@ public List getStatementList() { public void setStatementList(List statementList) { this.statementList = statementList; } - + public String getLabelName() { return labelName; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLBuildTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLBuildTableStatement.java index 4862db75e7..4114259141 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLBuildTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLBuildTableStatement.java @@ -23,8 +23,8 @@ public class SQLBuildTableStatement extends SQLStatementImpl { private SQLName table; private SQLIntegerExpr version; - private boolean withSplit = false; - private boolean force = false; + private boolean withSplit; + private boolean force; @Override protected void accept0(SQLASTVisitor visitor) { 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 ebada1da76..e5cad9ef4f 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 @@ -27,21 +27,19 @@ import java.util.List; public class SQLCallStatement extends SQLStatementImpl { + private boolean brace; - private boolean brace = false; + private SQLVariantRefExpr outParameter; - private SQLVariantRefExpr outParameter; - - private SQLName procedureName; + private SQLName procedureName; private final List parameters = new ArrayList(); - + public SQLCallStatement() { - } - + public SQLCallStatement(DbType dbType) { - super (dbType); + super(dbType); } public SQLVariantRefExpr getOutParameter() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCancelJobStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCancelJobStatement.java index 7626d7d8ce..07e097744e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCancelJobStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCancelJobStatement.java @@ -17,12 +17,11 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCancelJobStatement extends SQLStatementImpl { private SQLName jobName; - private boolean isImport = false; + private boolean isImport; @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharacterDataType.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharacterDataType.java index 11e427b7e2..9541e24cae 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharacterDataType.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharacterDataType.java @@ -27,23 +27,22 @@ import java.util.List; public class SQLCharacterDataType extends SQLDataTypeImpl { + private String charSetName; + private String collate; - private String charSetName; - private String collate; - - private String charType; - private boolean hasBinary; + private String charType; + private boolean hasBinary; public List hints; - public final static String CHAR_TYPE_BYTE = "BYTE"; - public final static String CHAR_TYPE_CHAR = "CHAR"; + public static final String CHAR_TYPE_BYTE = "BYTE"; + public static final String CHAR_TYPE_CHAR = "CHAR"; - public SQLCharacterDataType(String name){ + public SQLCharacterDataType(String name) { super(name); } - public SQLCharacterDataType(String name, int precision){ + public SQLCharacterDataType(String name, int precision) { super(name, precision); } @@ -54,7 +53,7 @@ public String getCharSetName() { public void setCharSetName(String charSetName) { this.charSetName = charSetName; } - + public boolean isHasBinary() { return hasBinary; } @@ -112,7 +111,6 @@ protected void accept0(SQLASTVisitor visitor) { visitor.endVisit(this); } - public SQLCharacterDataType clone() { SQLCharacterDataType x = new SQLCharacterDataType(getName()); 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 085c713657..a8aafc2b74 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 @@ -21,15 +21,13 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCheck extends SQLConstraintImpl implements SQLTableElement, SQLTableConstraint, SQLReplaceable { - private SQLExpr expr; private Boolean enforced; - public SQLCheck(){ - + public SQLCheck() { } - public SQLCheck(SQLExpr expr){ + public SQLCheck(SQLExpr expr) { this.setExpr(expr); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCloneTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCloneTableStatement.java index 1d37fdfb08..1a7ffb1a21 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCloneTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCloneTableStatement.java @@ -24,18 +24,16 @@ import java.util.List; public class SQLCloneTableStatement extends SQLStatementImpl { - protected SQLExprTableSource from; protected List partitions = new ArrayList<>(); protected SQLExprTableSource to; - protected boolean ifExistsOverwrite = false; - protected boolean ifExistsIgnore = false; + protected boolean ifExistsOverwrite; + protected boolean ifExistsIgnore; public SQLCloneTableStatement() { - } public SQLCloneTableStatement(SQLExpr to) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCloseStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCloseStatement.java index b3662d7f82..abc7a744e3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCloseStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCloseStatement.java @@ -25,41 +25,40 @@ import java.util.List; /** - * * MySql cursor close statement + * * @author zz [455910092@qq.com] */ -public class SQLCloseStatement extends SQLStatementImpl{ - - //cursor name - private SQLName cursorName; - - public SQLName getCursorName() { - return cursorName; - } +public class SQLCloseStatement extends SQLStatementImpl { + //cursor name + private SQLName cursorName; + + public SQLName getCursorName() { + return cursorName; + } + + public void setCursorName(String cursorName) { + setCursorName(new SQLIdentifierExpr(cursorName)); + } + + public void setCursorName(SQLName cursorName) { + if (cursorName != null) { + cursorName.setParent(this); + } + this.cursorName = cursorName; + } - public void setCursorName(String cursorName) { - setCursorName(new SQLIdentifierExpr(cursorName)); - } - - public void setCursorName(SQLName cursorName) { - if (cursorName != null) { - cursorName.setParent(this); - } - this.cursorName = cursorName; - } + @Override + protected void accept0(SQLASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, cursorName); + } + visitor.endVisit(this); - @Override - protected void accept0(SQLASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, cursorName); - } - visitor.endVisit(this); - - } + } - @Override - public List getChildren() { - return Collections.emptyList(); - } + @Override + public List getChildren() { + return Collections.emptyList(); + } } 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 1c692581e2..f98e82279e 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 @@ -21,15 +21,13 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLColumnCheck extends SQLConstraintImpl implements SQLColumnConstraint, SQLReplaceable { - private SQLExpr expr; protected Boolean enforced; - public SQLColumnCheck(){ - + public SQLColumnCheck() { } - public SQLColumnCheck(SQLExpr expr){ + public SQLColumnCheck(SQLExpr expr) { this.setExpr(expr); } 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 f4d968d4e5..281c84e70e 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 @@ -28,56 +28,54 @@ import java.util.List; public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElement, SQLObjectWithDataType, SQLReplaceable, SQLDbTypedObject { - protected DbType dbType; + protected DbType dbType; - protected SQLName name; - protected SQLDataType dataType; - protected SQLExpr defaultExpr; - protected final List constraints = new ArrayList(0); - protected SQLExpr comment; + protected SQLName name; + protected SQLDataType dataType; + protected SQLExpr defaultExpr; + protected final List constraints = new ArrayList(0); + protected SQLExpr comment; - protected Boolean enable; - protected Boolean validate; - protected Boolean rely; + protected Boolean enable; + protected Boolean validate; + protected Boolean rely; // for mysql - protected boolean autoIncrement = false; - protected SQLExpr onUpdate; - protected SQLExpr format; - protected SQLExpr storage; - protected SQLExpr charsetExpr; - protected SQLExpr collateExpr; - protected SQLExpr asExpr; - protected boolean stored = false; - protected boolean virtual = false; - protected boolean visible = false; - protected AutoIncrementType sequenceType; - protected boolean preSort = false; // for ads - protected int preSortOrder = 0; // for ads - - protected Identity identity; + protected boolean autoIncrement; + protected SQLExpr onUpdate; + protected SQLExpr format; + protected SQLExpr storage; + protected SQLExpr charsetExpr; + protected SQLExpr collateExpr; + protected SQLExpr asExpr; + protected boolean stored; + protected boolean virtual; + protected boolean visible; + protected AutoIncrementType sequenceType; + protected boolean preSort; // for ads + protected int preSortOrder; // for ads + protected Identity identity; // for ads - protected SQLExpr generatedAlawsAs; - protected SQLExpr delimiter; // for ads - protected SQLExpr delimiterTokenizer; // for ads3.0 multivalue - protected SQLExpr nlpTokenizer; // for ads3.0 multivalue - protected SQLExpr valueType; // for ads3.0 multivalue - protected boolean disableIndex = false; //for ads - protected SQLExpr jsonIndexAttrsExpr; // for ads - protected SQLAnnIndex annIndex; - private SQLExpr unitCount; - private SQLExpr unitIndex; - private SQLExpr step; - private SQLCharExpr encode; - private SQLCharExpr compression; + protected SQLExpr generatedAlawsAs; + protected SQLExpr delimiter; // for ads + protected SQLExpr delimiterTokenizer; // for ads3.0 multivalue + protected SQLExpr nlpTokenizer; // for ads3.0 multivalue + protected SQLExpr valueType; // for ads3.0 multivalue + protected boolean disableIndex; //for ads + protected SQLExpr jsonIndexAttrsExpr; // for ads + protected SQLAnnIndex annIndex; + private SQLExpr unitCount; + private SQLExpr unitIndex; + private SQLExpr step; + private SQLCharExpr encode; + private SQLCharExpr compression; // for aliyun data lake anlytics - private List mappedBy; - private List colProperties; - - public SQLColumnDefinition(){ + private List mappedBy; + private List colProperties; + public SQLColumnDefinition() { } public Identity getIdentity() { @@ -236,7 +234,7 @@ public boolean isPartitionBy() { return partitioning.isPartitionByColumn( nameHashCode64()); } - + public void addConstraint(SQLColumnConstraint constraint) { if (constraint != null) { constraint.setParent(this); @@ -385,7 +383,6 @@ public void setUnitCount(SQLExpr unitCount) { } public static class Identity extends SQLObjectImpl { - private Integer seed; private Integer increment; @@ -395,8 +392,7 @@ public static class Identity extends SQLObjectImpl { private Integer minValue; private Integer maxValue; - public Identity(){ - + public Identity() { } public Integer getSeed() { @@ -453,7 +449,7 @@ public void accept0(SQLASTVisitor visitor) { visitor.endVisit(this); } - public Identity clone () { + public Identity clone() { Identity x = new Identity(); x.seed = seed; x.increment = increment; @@ -481,7 +477,7 @@ public SQLColumnDefinition clone() { SQLColumnDefinition x = new SQLColumnDefinition(); x.setDbType(dbType); - if(name != null) { + if (name != null) { x.setName(name.clone()); } @@ -601,7 +597,6 @@ public void simplify() { validate = null; rely = null; - if (this.name instanceof SQLIdentifierExpr) { SQLIdentifierExpr identExpr = (SQLIdentifierExpr) this.name; String columnName = identExpr.getName(); 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 ec030d4afa..5008c6d50b 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,7 +19,6 @@ public class SQLColumnPrimaryKey extends SQLConstraintImpl implements SQLColumnConstraint { public SQLColumnPrimaryKey() { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnReference.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnReference.java index 987601b6b3..0cfdb205f3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnReference.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnReference.java @@ -22,8 +22,7 @@ import java.util.List; public class SQLColumnReference extends SQLConstraintImpl implements SQLColumnConstraint { - - private SQLName table; + private SQLName table; private List columns = new ArrayList(); private SQLForeignKeyImpl.Match referenceMatch; @@ -31,7 +30,6 @@ public class SQLColumnReference extends SQLConstraintImpl implements SQLColumnCo protected SQLForeignKeyImpl.Option onDelete; public SQLColumnReference() { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnUniqueKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnUniqueKey.java index 681c29736c..bcf095024d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnUniqueKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnUniqueKey.java @@ -15,14 +15,11 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLColumnUniqueKey extends SQLConstraintImpl implements SQLColumnConstraint, SQLReplaceable { public SQLColumnUniqueKey() { - } @Override 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 22baf4fd7a..e340d4122e 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 @@ -25,14 +25,13 @@ import java.util.List; public class SQLCommentStatement extends SQLStatementImpl { - public static enum Type { TABLE, COLUMN } private SQLExprTableSource on; - private Type type; - private SQLExpr comment; + private Type type; + private SQLExpr comment; public SQLExpr getComment() { return comment; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCommitStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCommitStatement.java index c3c3deb6e6..a7b8a3720a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCommitStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCommitStatement.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCommitStatement extends SQLStatementImpl { - // oracle private boolean write; private Boolean wait; private Boolean immediate; // mysql - private boolean work = false; + private boolean work; private Boolean chain; private Boolean release; @@ -36,7 +35,6 @@ public class SQLCommitStatement extends SQLStatementImpl { private SQLExpr delayedDurability; public SQLCommitStatement() { - } public SQLCommitStatement clone() { @@ -48,7 +46,7 @@ public SQLCommitStatement clone() { x.chain = chain; x.release = release; - if(transactionName != null) { + if (transactionName != null) { x.setTransactionName(transactionName.clone()); } if (delayedDurability != null) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraint.java index 222c9021ab..66b8a2c657 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraint.java @@ -20,12 +20,12 @@ import com.alibaba.druid.sql.ast.SQLObject; public interface SQLConstraint extends SQLObject { - SQLName getName(); void setName(SQLName value); SQLExpr getComment(); + void setComment(SQLExpr x); void simplify(); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraintImpl.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraintImpl.java index fa0c7d770f..1f79155e3e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraintImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraintImpl.java @@ -23,7 +23,7 @@ import java.util.List; public abstract class SQLConstraintImpl extends SQLObjectImpl implements SQLConstraint, SQLDbTypedObject { - protected DbType dbType; + protected DbType dbType; private SQLName name; protected Boolean enable; protected Boolean validate; @@ -32,8 +32,7 @@ public abstract class SQLConstraintImpl extends SQLObjectImpl implements SQLCons public List hints; - public SQLConstraintImpl(){ - + public SQLConstraintImpl() { } public void cloneTo(SQLConstraintImpl x) { @@ -54,7 +53,6 @@ public void setHints(List hints) { this.hints = hints; } - public SQLName getName() { return 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 b4bec1ea30..7bcb14d4c2 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 @@ -28,22 +28,22 @@ import java.util.Map; public class SQLCreateDatabaseStatement extends SQLStatementImpl implements SQLCreateStatement { - protected SQLName name; - protected String characterSet; - protected String collate; - protected List hints; - protected boolean ifNotExists = false; - protected SQLExpr comment; - protected SQLExpr location; // hive - protected final List dbProperties = new ArrayList(); - protected Map options = new HashMap(); // for ads - protected String user; - - protected SQLExpr password; // drds + protected SQLName name; + protected String characterSet; + protected String collate; + protected List hints; + protected boolean ifNotExists; + protected SQLExpr comment; + protected SQLExpr location; // hive + protected final List dbProperties = new ArrayList(); + protected Map options = new HashMap(); // for ads + protected String user; + + protected SQLExpr password; // drds protected final List storedOn = new ArrayList(); // drds protected final List> storedBy = new ArrayList>(); // drds stored by - protected SQLExpr storedAs; // drds - protected SQLExpr storedIn; // drds + protected SQLExpr storedAs; // drds + protected SQLExpr storedIn; // drds //adb protected boolean physical; @@ -51,8 +51,8 @@ public class SQLCreateDatabaseStatement extends SQLStatementImpl implements SQLC public SQLCreateDatabaseStatement() { } - public SQLCreateDatabaseStatement(DbType dbType){ - super (dbType); + public SQLCreateDatabaseStatement(DbType dbType) { + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateFunctionStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateFunctionStatement.java index 1a5df62852..f2f6cd5ce9 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateFunctionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateFunctionStatement.java @@ -28,35 +28,34 @@ public class SQLCreateFunctionStatement extends SQLStatementImpl implements SQLCreateStatement, SQLObjectWithDataType { protected SQLName definer; - protected boolean create = true; - protected boolean orReplace; - protected SQLName name; - protected SQLStatement block; + protected boolean create = true; + protected boolean orReplace; + protected SQLName name; + protected SQLStatement block; protected List parameters = new ArrayList(); // for oracle - private String javaCallSpec; + private String javaCallSpec; - private SQLName authid; + private SQLName authid; - SQLDataType returnDataType; + SQLDataType returnDataType; // for mysql - private String comment; - private boolean deterministic = false; - private boolean parallelEnable; - private boolean aggregate; - private SQLName using; - private boolean pipelined; - private boolean resultCache; - private String wrappedSource; - private String language; - private boolean temporary; - protected boolean ifNotExists = false; + private String comment; + private boolean deterministic; + private boolean parallelEnable; + private boolean aggregate; + private SQLName using; + private boolean pipelined; + private boolean resultCache; + private String wrappedSource; + private String language; + private boolean temporary; + protected boolean ifNotExists; public SQLCreateFunctionStatement() { - } public SQLCreateFunctionStatement clone() { @@ -236,7 +235,6 @@ public void setDataType(SQLDataType dataType) { this.setReturnDataType(dataType); } - public boolean isParallelEnable() { return parallelEnable; } 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 cc2557fb61..b75e1d25f5 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 @@ -25,7 +25,6 @@ import java.util.List; public class SQLCreateIndexStatement extends SQLStatementImpl implements SQLCreateStatement, SQLIndex { - private SQLIndexDefinition indexDefinition = new SQLIndexDefinition(); private boolean concurrently; // for pg @@ -159,7 +158,6 @@ public String getSchema() { return null; } - public SQLCreateIndexStatement clone() { SQLCreateIndexStatement x = new SQLCreateIndexStatement(); indexDefinition.cloneTo(x.indexDefinition); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateProcedureStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateProcedureStatement.java index cbb791d209..1df97ec418 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateProcedureStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateProcedureStatement.java @@ -26,31 +26,30 @@ import java.util.List; public class SQLCreateProcedureStatement extends SQLStatementImpl implements SQLCreateStatement { + private SQLName definer; - private SQLName definer; - - private boolean create = true; - private boolean orReplace; - private SQLName name; - private SQLStatement block; + private boolean create = true; + private boolean orReplace; + private SQLName name; + private SQLStatement block; private List parameters = new ArrayList(); // for oracle - private String javaCallSpec; + private String javaCallSpec; - private SQLName authid; + private SQLName authid; // for mysql - private boolean deterministic; - private boolean containsSql; - private boolean noSql; - private boolean readSqlData; - private boolean modifiesSqlData; - private boolean languageSql; + private boolean deterministic; + private boolean containsSql; + private boolean noSql; + private boolean readSqlData; + private boolean modifiesSqlData; + private boolean languageSql; - private String wrappedSource; + private String wrappedSource; - private SQLCharExpr comment; + private SQLCharExpr comment; @Override public void accept0(SQLASTVisitor visitor) { @@ -113,7 +112,7 @@ public void setOrReplace(boolean orReplace) { public SQLName getDefiner() { return definer; } - + public void setDefiner(SQLName definer) { this.definer = definer; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateRoleStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateRoleStatement.java index defe6d5f86..d9ece14944 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateRoleStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateRoleStatement.java @@ -16,7 +16,6 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLStatementImpl; @@ -26,14 +25,14 @@ import java.util.List; public class SQLCreateRoleStatement extends SQLStatementImpl implements SQLCreateStatement { - private SQLName name; - protected boolean ifNotExists = false; + private SQLName name; + protected boolean ifNotExists; - public SQLCreateRoleStatement(){ + public SQLCreateRoleStatement() { } - public SQLCreateRoleStatement(DbType dbType){ - super (dbType); + public SQLCreateRoleStatement(DbType dbType) { + super(dbType); } @Override @@ -64,7 +63,7 @@ public void setName(SQLName name) { public boolean isIfNotExists() { return ifNotExists; } - + public void setIfNotExists(boolean ifNotExists) { this.ifNotExists = ifNotExists; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateSequenceStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateSequenceStatement.java index 8704f528ca..263da1f758 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateSequenceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateSequenceStatement.java @@ -54,7 +54,6 @@ public class SQLCreateSequenceStatement extends SQLStatementImpl implements SQLC private SQLExpr step; public SQLCreateSequenceStatement() { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableGroupStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableGroupStatement.java index 6a053d849a..17d89d99fe 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableGroupStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableGroupStatement.java @@ -17,7 +17,10 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.ast.SQLObject; +import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; @@ -28,18 +31,17 @@ public class SQLCreateTableGroupStatement extends SQLStatementImpl implements SQLCreateStatement { protected SQLName name; - protected boolean ifNotExists = false; + protected boolean ifNotExists; protected SQLExpr partitionNum; - - public SQLCreateTableGroupStatement(){ + public SQLCreateTableGroupStatement() { } - public SQLCreateTableGroupStatement(DbType dbType){ - super (dbType); + public SQLCreateTableGroupStatement(DbType dbType) { + super(dbType); } - public String getSchemaName(){ + public String getSchemaName() { if (name instanceof SQLPropertyExpr) { return SQLUtils.toMySqlString(((SQLPropertyExpr) name).getOwner()); } @@ -102,7 +104,7 @@ public void setName(SQLName name) { public boolean isIfNotExists() { return ifNotExists; } - + public void setIfNotExists(boolean ifNotExists) { this.ifNotExists = ifNotExists; } 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 9b51252cce..040b74c94d 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 @@ -34,52 +34,50 @@ import java.util.*; public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLStatement, SQLCreateStatement { - - protected boolean ifNotExists = false; - protected Type type; - protected SQLExprTableSource tableSource; - protected List tableElementList = new ArrayList(); + protected boolean ifNotExists; + protected Type type; + protected SQLExprTableSource tableSource; + protected List tableElementList = new ArrayList(); // for postgresql - protected SQLExprTableSource inherits; - protected SQLSelect select; - protected SQLExpr comment; - protected SQLExprTableSource like; + protected SQLExprTableSource inherits; + protected SQLSelect select; + protected SQLExpr comment; + protected SQLExprTableSource like; - protected Boolean compress; - protected Boolean logging; + protected Boolean compress; + protected Boolean logging; - protected SQLName tablespace; - protected SQLPartitionBy partitioning; - protected SQLExpr storedAs; - protected SQLExpr location; + protected SQLName tablespace; + protected SQLPartitionBy partitioning; + protected SQLExpr storedAs; + protected SQLExpr location; - protected boolean onCommitPreserveRows; - protected boolean onCommitDeleteRows; - protected boolean external; + protected boolean onCommitPreserveRows; + protected boolean onCommitDeleteRows; + protected boolean external; // for odps & hive - protected SQLExternalRecordFormat rowFormat; - protected final List partitionColumns = new ArrayList(2); - protected ClusteringType clusteringType; - protected final List clusteredBy = new ArrayList(); - protected final List sortedBy = new ArrayList(); - protected int buckets; - protected int shards; - protected final List tableOptions = new ArrayList(); - protected final List tblProperties = new ArrayList(); - - protected boolean replace = false; - protected boolean ignore = false; - protected boolean single = false; // polardbx - protected boolean dimension; - protected SQLExpr engine; - - public SQLCreateTableStatement(){ - - } - - public SQLCreateTableStatement(DbType dbType){ + protected SQLExternalRecordFormat rowFormat; + protected final List partitionColumns = new ArrayList(2); + protected ClusteringType clusteringType; + protected final List clusteredBy = new ArrayList(); + protected final List sortedBy = new ArrayList(); + protected int buckets; + protected int shards; + protected final List tableOptions = new ArrayList(); + protected final List tblProperties = new ArrayList(); + + protected boolean replace; + protected boolean ignore; + protected boolean single; // polardbx + protected boolean dimension; + protected SQLExpr engine; + + public SQLCreateTableStatement() { + } + + public SQLCreateTableStatement(DbType dbType) { super(dbType); } @@ -191,7 +189,7 @@ public void setType(Type type) { } public static enum Type { - GLOBAL_TEMPORARY, LOCAL_TEMPORARY, TEMPORARY, SHADOW + GLOBAL_TEMPORARY, LOCAL_TEMPORARY, TEMPORARY, SHADOW } public List getTableElementList() { @@ -239,12 +237,11 @@ public List getColumnNames(boolean normalized) { public List getColumnComments() { List comments = new ArrayList(); for (SQLColumnDefinition definition : getColumnDefinitions()) { - comments.add(((SQLCharExpr)definition.getComment()).getText()); + comments.add(((SQLCharExpr) definition.getComment()).getText()); } return comments; } - public List getPrimaryKeyNames() { List keys = new ArrayList(); for (SQLTableElement element : this.tableElementList) { @@ -258,8 +255,6 @@ public List getPrimaryKeyNames() { return keys; } - - public void addColumn(String columnName, String dataType) { SQLColumnDefinition column = new SQLColumnDefinition(); column.setName(columnName); @@ -380,7 +375,7 @@ public void addBodyBeforeComment(List comments) { if (attributes == null) { attributes = new HashMap(1); } - + List attrComments = (List) attributes.get("rowFormat.body_before_comment"); if (attrComments == null) { attributes.put("rowFormat.body_before_comment", comments); @@ -388,22 +383,22 @@ public void addBodyBeforeComment(List comments) { attrComments.addAll(comments); } } - + @SuppressWarnings("unchecked") public List getBodyBeforeCommentsDirect() { if (attributes == null) { return null; } - + return (List) attributes.get("rowFormat.body_before_comment"); } - + public boolean hasBodyBeforeComment() { List comments = getBodyBeforeCommentsDirect(); if (comments == null) { return false; } - + return !comments.isEmpty(); } @@ -882,7 +877,7 @@ public boolean apply(SQLCommentStatement x) { SQLColumnDefinition column = this.findColumn( - propertyExpr.nameHashCode64()); + propertyExpr.nameHashCode64()); if (column != null) { column.setComment(comment.clone()); @@ -1109,8 +1104,6 @@ private boolean apply(SQLAlterTableDropColumnItem item) { } } - - return true; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTriggerStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTriggerStatement.java index a58fb9a29e..3c7e6abe6d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTriggerStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTriggerStatement.java @@ -23,32 +23,30 @@ import java.util.List; public class SQLCreateTriggerStatement extends SQLStatementImpl implements SQLCreateStatement { + private SQLName name; + private boolean orReplace; + private TriggerType triggerType; - private SQLName name; - private boolean orReplace = false; - private TriggerType triggerType; + private SQLName definer; - private SQLName definer; + private boolean update; + private boolean delete; + private boolean insert; - private boolean update; - private boolean delete; - private boolean insert; + private SQLExprTableSource on; - private SQLExprTableSource on; + private boolean forEachRow; - private boolean forEachRow = false; + private List updateOfColumns = new ArrayList(); - private List updateOfColumns = new ArrayList(); + private SQLExpr when; + private SQLStatement body; - private SQLExpr when; - private SQLStatement body; - public SQLCreateTriggerStatement() { - } - + public SQLCreateTriggerStatement(DbType dbType) { - super (dbType); + super(dbType); } protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateUserStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateUserStatement.java index 30f897fa22..4745a95491 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateUserStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateUserStatement.java @@ -28,7 +28,6 @@ public class SQLCreateUserStatement extends SQLStatementImpl { private SQLName defaultTableSpace; public SQLCreateUserStatement() { - } public SQLName getUser() { 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 7631c1641a..560de1b250 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,16 +25,15 @@ import java.util.List; public class SQLCreateViewStatement extends SQLStatementImpl implements SQLCreateStatement { - - private boolean orReplace = false; - private boolean force = false; + private boolean orReplace; + private boolean force; // protected SQLName name; protected SQLSelect subQuery; - protected boolean ifNotExists = false; + protected boolean ifNotExists; - protected String algorithm; - protected SQLName definer; - protected String sqlSecurity; + protected String algorithm; + protected SQLName definer; + protected String sqlSecurity; protected SQLExprTableSource tableSource; @@ -56,11 +55,10 @@ public class SQLCreateViewStatement extends SQLStatementImpl implements SQLCreat private SQLBlockStatement script; - public SQLCreateViewStatement(){ - + public SQLCreateViewStatement() { } - public SQLCreateViewStatement(DbType dbType){ + public SQLCreateViewStatement(DbType dbType) { super(dbType); } @@ -172,7 +170,7 @@ public void setSubQuery(SQLSelect subQuery) { public List getColumns() { return columns; } - + public void addColumn(SQLTableElement column) { if (column != null) { column.setParent(this); @@ -275,12 +273,11 @@ public List getChildren() { } public static enum Level { - CASCADED, LOCAL + CASCADED, LOCAL } public static class Column extends SQLObjectImpl { - - private SQLExpr expr; + private SQLExpr expr; private SQLCharExpr comment; public SQLExpr getExpr() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDDLStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDDLStatement.java index 39376286ae..b5b1b4949f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDDLStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDDLStatement.java @@ -17,7 +17,5 @@ import com.alibaba.druid.sql.ast.SQLStatement; - public interface SQLDDLStatement extends SQLStatement { - } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeclareStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeclareStatement.java index 3fe1393da3..482017202d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeclareStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeclareStatement.java @@ -22,11 +22,9 @@ import java.util.List; public class SQLDeclareStatement extends SQLStatementImpl { - protected List items = new ArrayList(); - - public SQLDeclareStatement() { + public SQLDeclareStatement() { } public SQLDeclareStatement(SQLName name, SQLDataType dataType) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDefault.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDefault.java index 88680876f3..6dc143a106 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDefault.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDefault.java @@ -21,16 +21,14 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLDefault extends SQLConstraintImpl implements SQLTableElement, SQLTableConstraint, SQLReplaceable { - private SQLExpr expr; private SQLExpr column; - private boolean withValues = false; - - public SQLDefault(){ + private boolean withValues; + public SQLDefault() { } - public SQLDefault(SQLExpr expr, SQLExpr column){ + public SQLDefault(SQLExpr expr, SQLExpr column) { this.setExpr(expr); this.setColumn(column); } 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 a5ef574d14..fd6d027627 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 @@ -28,21 +28,20 @@ import java.util.List; public class SQLDeleteStatement extends SQLStatementImpl implements SQLReplaceable { - protected SQLWithSubqueryClause with; + protected SQLWithSubqueryClause with; protected SQLTableSource tableSource; - protected SQLExpr where; + protected SQLExpr where; protected SQLTableSource from; protected SQLTableSource using; - protected boolean only = false; - - public SQLDeleteStatement(){ + protected boolean only; + public SQLDeleteStatement() { } - - public SQLDeleteStatement(DbType dbType){ - super (dbType); + + public SQLDeleteStatement(DbType dbType) { + super(dbType); } protected void cloneTo(SQLDeleteStatement x) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDescribeStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDescribeStatement.java index c08a90090a..11494fb2ea 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDescribeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDescribeStatement.java @@ -23,7 +23,6 @@ import java.util.List; public class SQLDescribeStatement extends SQLStatementImpl implements SQLReplaceable { - protected SQLName object; protected SQLName column; protected boolean extended; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropCatalogStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropCatalogStatement.java index c9c0f44846..c69157349c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropCatalogStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropCatalogStatement.java @@ -16,24 +16,25 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLObject; +import com.alibaba.druid.sql.ast.SQLReplaceable; +import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class SQLDropCatalogStatement extends SQLStatementImpl implements SQLDropStatement, SQLReplaceable { - private SQLExpr name; private boolean ifExists; private boolean external; public SQLDropCatalogStatement() { - } public SQLDropCatalogStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropDatabaseStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropDatabaseStatement.java index 61df6fb7cb..d8e15cc107 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropDatabaseStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropDatabaseStatement.java @@ -26,7 +26,6 @@ import java.util.List; public class SQLDropDatabaseStatement extends SQLStatementImpl implements SQLDropStatement, SQLReplaceable { - private SQLExpr database; private boolean ifExists; private Boolean restrict; @@ -36,11 +35,10 @@ public class SQLDropDatabaseStatement extends SQLStatementImpl implements SQLDro private boolean physical; public SQLDropDatabaseStatement() { - } - + public SQLDropDatabaseStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropEventStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropEventStatement.java index 44b4220e88..4f45bd0ecc 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropEventStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropEventStatement.java @@ -25,16 +25,14 @@ import java.util.List; public class SQLDropEventStatement extends SQLStatementImpl implements SQLDropStatement { - private SQLExpr name; private boolean ifExists; public SQLDropEventStatement() { - } public SQLDropEventStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropFunctionStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropFunctionStatement.java index c740bb9d11..87447a0397 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropFunctionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropFunctionStatement.java @@ -23,17 +23,15 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLDropFunctionStatement extends SQLStatementImpl implements SQLDropStatement, SQLReplaceable { - private SQLName name; private boolean ifExists; private boolean temporary; public SQLDropFunctionStatement() { - } - + public SQLDropFunctionStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override 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 ff1259bf24..70118e4fb8 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 @@ -23,20 +23,18 @@ import java.util.List; public class SQLDropIndexStatement extends SQLStatementImpl implements SQLDropStatement, SQLReplaceable { - - private SQLName indexName; + private SQLName indexName; private SQLExprTableSource tableName; - private SQLExpr algorithm; - private SQLExpr lockOption; + private SQLExpr algorithm; + private SQLExpr lockOption; private boolean ifExists; - + public SQLDropIndexStatement() { - } - + public SQLDropIndexStatement(DbType dbType) { - super (dbType); + super(dbType); } public SQLName getIndexName() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropLogFileGroupStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropLogFileGroupStatement.java index 5baa4ea454..bcb934142c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropLogFileGroupStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropLogFileGroupStatement.java @@ -25,16 +25,14 @@ import java.util.List; public class SQLDropLogFileGroupStatement extends SQLStatementImpl implements SQLDropStatement { - private SQLExpr name; private SQLExpr engine; public SQLDropLogFileGroupStatement() { - } public SQLDropLogFileGroupStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropMaterializedViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropMaterializedViewStatement.java index 3ca647ad37..254783e3a5 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropMaterializedViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropMaterializedViewStatement.java @@ -25,16 +25,14 @@ import java.util.List; public class SQLDropMaterializedViewStatement extends SQLStatementImpl implements SQLDropStatement { - private SQLExpr name; private boolean ifExists; public SQLDropMaterializedViewStatement() { - } public SQLDropMaterializedViewStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropOutlineStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropOutlineStatement.java index e6550cdc0e..10d2af094d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropOutlineStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropOutlineStatement.java @@ -25,16 +25,14 @@ import java.util.List; public class SQLDropOutlineStatement extends SQLStatementImpl implements SQLDropStatement { - private SQLExpr name; private boolean ifExists; public SQLDropOutlineStatement() { - } public SQLDropOutlineStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropProcedureStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropProcedureStatement.java index 38c821b2ec..59d5c8bbbd 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropProcedureStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropProcedureStatement.java @@ -21,16 +21,14 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLDropProcedureStatement extends SQLStatementImpl implements SQLDropStatement { - private SQLName name; private boolean ifExists; - + public SQLDropProcedureStatement() { - } - + public SQLDropProcedureStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropResourceGroupStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropResourceGroupStatement.java index ca9cdd9d69..e15698e63a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropResourceGroupStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropResourceGroupStatement.java @@ -26,16 +26,14 @@ public class SQLDropResourceGroupStatement extends SQLStatementImpl implements SQLDropStatement { - private SQLExpr name; private boolean ifExists; public SQLDropResourceGroupStatement() { - } public SQLDropResourceGroupStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropResourceStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropResourceStatement.java index e1eb1d81f3..f24abde326 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropResourceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropResourceStatement.java @@ -25,16 +25,14 @@ import java.util.List; public class SQLDropResourceStatement extends SQLStatementImpl implements SQLDropStatement { - private SQLExpr name; private boolean ifExists; public SQLDropResourceStatement() { - } public SQLDropResourceStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropRoleStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropRoleStatement.java index 01a84d3e88..36ede1af29 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropRoleStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropRoleStatement.java @@ -23,14 +23,14 @@ import java.util.List; public class SQLDropRoleStatement extends SQLStatementImpl implements SQLCreateStatement, SQLReplaceable { - private SQLName name; - protected boolean ifNotExists = false; + private SQLName name; + protected boolean ifNotExists; - public SQLDropRoleStatement(){ + public SQLDropRoleStatement() { } - public SQLDropRoleStatement(DbType dbType){ - super (dbType); + public SQLDropRoleStatement(DbType dbType) { + super(dbType); } @Override @@ -61,7 +61,7 @@ public void setName(SQLName name) { public boolean isIfNotExists() { return ifNotExists; } - + public void setIfNotExists(boolean ifNotExists) { this.ifNotExists = ifNotExists; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSequenceStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSequenceStatement.java index b1050f0cb2..ea38040b5d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSequenceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSequenceStatement.java @@ -24,16 +24,14 @@ import java.util.List; public class SQLDropSequenceStatement extends SQLStatementImpl implements SQLDropStatement, SQLReplaceable { - private SQLName name; private boolean ifExists; - + public SQLDropSequenceStatement() { - } - + public SQLDropSequenceStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropServerStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropServerStatement.java index 20e7b1a831..7bb871b69e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropServerStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropServerStatement.java @@ -23,16 +23,14 @@ import java.util.List; public class SQLDropServerStatement extends SQLStatementImpl implements SQLDropStatement, SQLReplaceable { - private SQLExpr name; private boolean ifExists; public SQLDropServerStatement() { - } public SQLDropServerStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSynonymStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSynonymStatement.java index 548ebc91a4..bd3b419451 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSynonymStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSynonymStatement.java @@ -24,18 +24,16 @@ import java.util.List; public class SQLDropSynonymStatement extends SQLStatementImpl implements SQLDropStatement, SQLReplaceable { - private SQLName name; private boolean ifExists; private boolean isPublic; private boolean force; public SQLDropSynonymStatement() { - } public SQLDropSynonymStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableGroupStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableGroupStatement.java index 6d268fe12d..6d45dfe512 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableGroupStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableGroupStatement.java @@ -23,15 +23,14 @@ import java.util.List; public class SQLDropTableGroupStatement extends SQLStatementImpl implements SQLDropStatement, SQLReplaceable { - protected SQLName name; - protected boolean ifExists = false; + protected boolean ifExists; - public SQLDropTableGroupStatement(){ + public SQLDropTableGroupStatement() { } - public SQLDropTableGroupStatement(DbType dbType){ - super (dbType); + public SQLDropTableGroupStatement(DbType dbType) { + super(dbType); } @Override @@ -74,7 +73,7 @@ public String getTableGroupName() { public boolean isIfExists() { return ifExists; } - + public void setIfExists(boolean ifNotExists) { this.ifExists = ifNotExists; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableSpaceStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableSpaceStatement.java index 115ee9d692..2fa531510f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableSpaceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableSpaceStatement.java @@ -23,17 +23,15 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLDropTableSpaceStatement extends SQLStatementImpl implements SQLDropStatement, SQLReplaceable { - private SQLName name; private boolean ifExists; private SQLExpr engine; - + public SQLDropTableSpaceStatement() { - } - + public SQLDropTableSpaceStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override 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 094e6cc1ea..797e6b36ae 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 @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; @@ -30,44 +29,43 @@ public class SQLDropTableStatement extends SQLStatementImpl implements SQLDropSt private List hints; protected List tableSources = new ArrayList(); - protected boolean purge; - protected boolean cascade = false; - protected boolean restrict = false; - protected boolean ifExists = false; - private boolean temporary = false; - private boolean external = false; - private boolean isDropPartition; - private SQLExpr where; - - public SQLDropTableStatement(){ + protected boolean purge; + protected boolean cascade; + protected boolean restrict; + protected boolean ifExists; + private boolean temporary; + private boolean external; + private boolean isDropPartition; + private SQLExpr where; + public SQLDropTableStatement() { } - - public SQLDropTableStatement(DbType dbType){ - super (dbType); + + public SQLDropTableStatement(DbType dbType) { + super(dbType); } - public SQLDropTableStatement(SQLName name, DbType dbType){ + public SQLDropTableStatement(SQLName name, DbType dbType) { this(new SQLExprTableSource(name), dbType); } - - public SQLDropTableStatement(SQLName name){ - this (name, null); + + public SQLDropTableStatement(SQLName name) { + this(name, null); } - - public SQLDropTableStatement(SQLExprTableSource tableSource){ - this (tableSource, null); + + public SQLDropTableStatement(SQLExprTableSource tableSource) { + this(tableSource, null); } - public SQLDropTableStatement(SQLExprTableSource tableSource, DbType dbType){ - this (dbType); + public SQLDropTableStatement(SQLExprTableSource tableSource, DbType dbType) { + this(dbType); this.tableSources.add(tableSource); } public List getTableSources() { return tableSources; } - + public void addPartition(SQLExprTableSource tableSource) { if (tableSource != null) { tableSource.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTriggerStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTriggerStatement.java index ebe429cf6e..44d496c85b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTriggerStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTriggerStatement.java @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -23,16 +24,14 @@ import java.util.List; public class SQLDropTriggerStatement extends SQLStatementImpl implements SQLDropStatement, SQLReplaceable { - private SQLName name; private boolean ifExists; public SQLDropTriggerStatement() { - } - + public SQLDropTriggerStatement(DbType dbType) { - super (dbType); + super(dbType); } public SQLName getName() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTypeStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTypeStatement.java index 93ee9c496f..2a1f2e300d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTypeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTypeStatement.java @@ -23,16 +23,14 @@ import java.util.List; public class SQLDropTypeStatement extends SQLStatementImpl implements SQLDropStatement, SQLReplaceable { - private SQLExpr name; private boolean ifExists; public SQLDropTypeStatement() { - } public SQLDropTypeStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropUserStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropUserStatement.java index fe5111f8af..fe421c1bfd 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropUserStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropUserStatement.java @@ -17,7 +17,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -26,17 +25,15 @@ import java.util.List; public class SQLDropUserStatement extends SQLStatementImpl implements SQLDropStatement, SQLReplaceable { - private List users = new ArrayList(2); - protected boolean ifExists = false; - + protected boolean ifExists; + public SQLDropUserStatement() { - } - + public SQLDropUserStatement(DbType dbType) { - super (dbType); + super(dbType); } public boolean isIfExists() { 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 a5ecd361fc..c728730805 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,33 +24,31 @@ import java.util.List; public class SQLDropViewStatement extends SQLStatementImpl implements SQLDropStatement { - protected List tableSources = new ArrayList(); - protected boolean cascade = false; - protected boolean restrict = false; - protected boolean ifExists = false; - - public SQLDropViewStatement(){ + protected boolean cascade; + protected boolean restrict; + protected boolean ifExists; + public SQLDropViewStatement() { } - - public SQLDropViewStatement(DbType dbType){ - super (dbType); + + public SQLDropViewStatement(DbType dbType) { + super(dbType); } - public SQLDropViewStatement(SQLName name){ + public SQLDropViewStatement(SQLName name) { this(new SQLExprTableSource(name)); } - public SQLDropViewStatement(SQLExprTableSource tableSource){ + public SQLDropViewStatement(SQLExprTableSource tableSource) { this.tableSources.add(tableSource); } public List getTableSources() { return tableSources; } - + public void addPartition(SQLExprTableSource tableSource) { if (tableSource != null) { tableSource.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDumpStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDumpStatement.java index b0a50bc9da..21182b3696 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDumpStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDumpStatement.java @@ -10,7 +10,6 @@ public class SQLDumpStatement extends SQLStatementImpl { private SQLSelect select; public SQLDumpStatement() { - } public SQLSelect getSelect() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLErrorLoggingClause.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLErrorLoggingClause.java index 967490a8e2..a799819a95 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLErrorLoggingClause.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLErrorLoggingClause.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLErrorLoggingClause extends SQLObjectImpl { - private SQLName into; private SQLExpr simpleExpression; private SQLExpr limit; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExplainAnalyzeStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExplainAnalyzeStatement.java index d6a2be5832..2c6e46bf14 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExplainAnalyzeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExplainAnalyzeStatement.java @@ -16,9 +16,7 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -29,14 +27,12 @@ public class SQLExplainAnalyzeStatement extends SQLStatementImpl { protected SQLSelect select; public SQLExplainAnalyzeStatement() { - } public SQLExplainAnalyzeStatement(DbType dbType) { - super (dbType); + super(dbType); } - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExplainStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExplainStatement.java index 5cbf3210ab..cfd1e3cfc7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExplainStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExplainStatement.java @@ -26,22 +26,21 @@ import java.util.List; public class SQLExplainStatement extends SQLStatementImpl { - protected String type; - protected String format; - protected boolean extended; - protected boolean dependency; - protected boolean authorization; - protected boolean optimizer; - protected SQLStatement statement; + protected String type; + protected String format; + protected boolean extended; + protected boolean dependency; + protected boolean authorization; + protected boolean optimizer; + protected SQLStatement statement; protected List hints; - protected boolean parenthesis; - + protected boolean parenthesis; + public SQLExplainStatement() { - } - + public SQLExplainStatement(DbType dbType) { - super (dbType); + super(dbType); } public SQLStatement getStatement() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExportDatabaseStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExportDatabaseStatement.java index ee5cdf8225..1f75dcbfb0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExportDatabaseStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExportDatabaseStatement.java @@ -1,14 +1,12 @@ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLExportDatabaseStatement extends SQLStatementImpl { private SQLName db; - private boolean realtime = false; + private boolean realtime; public SQLName getDb() { return db; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExportTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExportTableStatement.java index 03131fadb3..c90590c4b0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExportTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExportTableStatement.java @@ -9,10 +9,10 @@ import java.util.List; public class SQLExportTableStatement extends SQLStatementImpl { - private SQLExprTableSource table; + private SQLExprTableSource table; private List partition = new ArrayList(); - private SQLExpr to; - private SQLExpr forReplication; + private SQLExpr to; + private SQLExpr forReplication; public SQLExportTableStatement() { dbType = DbType.hive; 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 ea4dcbc657..1e886abd85 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 @@ -21,14 +21,12 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; 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); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprStatement.java index 7c3684936c..f7afb8e366 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprStatement.java @@ -21,14 +21,12 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLExprStatement extends SQLStatementImpl implements SQLReplaceable { - private SQLExpr expr; - public SQLExprStatement(){ - + public SQLExprStatement() { } - public SQLExprStatement(SQLExpr expr){ + public SQLExprStatement(SQLExpr expr) { this.expr = expr; } 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 3bd7d7b744..049bd3e5ed 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 @@ -29,16 +29,14 @@ import java.util.List; public class SQLExprTableSource extends SQLTableSourceImpl implements SQLReplaceable { - - protected SQLExpr expr; - protected List partitions; + protected SQLExpr expr; + protected List partitions; protected SQLTableSampling sampling; - protected SchemaObject schemaObject; + protected SchemaObject schemaObject; - protected List columns; + protected List columns; public SQLExprTableSource() { - } public SQLExprTableSource(String tableName) { @@ -163,8 +161,10 @@ public boolean setCatalog(String catalog) { } propertyExpr.setOwner( - new SQLPropertyExpr(catalog - , ((SQLIdentifierExpr) owner).getName()) + new SQLPropertyExpr( + catalog, + ((SQLIdentifierExpr) owner).getName() + ) ); return true; } else if (owner instanceof SQLPropertyExpr) { @@ -207,7 +207,7 @@ public void setSchema(String schema) { propertyExpr.setOwner(schema); } } else { - if(StringUtils.isEmpty(schema)) { + if (StringUtils.isEmpty(schema)) { return; } @@ -493,7 +493,6 @@ public boolean replace(SQLExpr expr, SQLExpr target) { } public long aliasHashCode64() { - if (alias != null) { if (aliasHashCode64 == 0) { aliasHashCode64 = FnvHash.hashCode64(alias); @@ -510,16 +509,30 @@ public long aliasHashCode64() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } SQLExprTableSource that = (SQLExprTableSource) o; - if (expr != null ? !expr.equals(that.expr) : that.expr != null) return false; - if (partitions != null ? !partitions.equals(that.partitions) : that.partitions != null) return false; - if (sampling != null ? !sampling.equals(that.sampling) : that.sampling != null) return false; - if (schemaObject != null ? !schemaObject.equals(that.schemaObject) : that.schemaObject != null) return false; + if (expr != null ? !expr.equals(that.expr) : that.expr != null) { + return false; + } + if (partitions != null ? !partitions.equals(that.partitions) : that.partitions != null) { + return false; + } + if (sampling != null ? !sampling.equals(that.sampling) : that.sampling != null) { + return false; + } + if (schemaObject != null ? !schemaObject.equals(that.schemaObject) : that.schemaObject != null) { + return false; + } return columns != null ? columns.equals(that.columns) : that.columns == null; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExternalRecordFormat.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExternalRecordFormat.java index d44af6cd62..80cd4940da 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExternalRecordFormat.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExternalRecordFormat.java @@ -4,9 +4,6 @@ import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -import java.util.ArrayList; -import java.util.List; - public class SQLExternalRecordFormat extends SQLObjectImpl { private SQLExpr delimitedBy; private SQLExpr terminatedBy; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLFetchStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLFetchStatement.java index abbe61f174..6eaa7cacf4 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLFetchStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLFetchStatement.java @@ -22,11 +22,10 @@ import java.util.List; public class SQLFetchStatement extends SQLStatementImpl implements SQLReplaceable { - - private SQLName cursorName; - private boolean bulkCollect; + private SQLName cursorName; + private boolean bulkCollect; private List into = new ArrayList(); - private SQLLimit limit; + private SQLLimit limit; @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForStatement.java index 0a01eccea5..4009c930e2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForStatement.java @@ -16,7 +16,6 @@ public class SQLForStatement extends SQLStatementImpl { protected List statements = new ArrayList(); public SQLForStatement() { - } public SQLName getIndex() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java index 5150ffc8b4..b22fd8628f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java @@ -20,10 +20,10 @@ import java.util.List; public interface SQLForeignKeyConstraint extends SQLConstraint, SQLTableElement, SQLTableConstraint { - List getReferencingColumns(); SQLExprTableSource getReferencedTable(); + SQLName getReferencedTableName(); void setReferencedTableName(SQLName value); 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 4284ee25b2..6799df1b0f 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 @@ -23,14 +23,13 @@ public class SQLForeignKeyImpl extends SQLConstraintImpl implements SQLForeignKeyConstraint { private SQLExprTableSource referencedTable; - private List referencingColumns = new ArrayList(); - private List referencedColumns = new ArrayList(); - private boolean onDeleteCascade = false; - private boolean onDeleteSetNull = false; - private boolean disableNovalidate = false; - - public SQLForeignKeyImpl(){ + private List referencingColumns = new ArrayList(); + private List referencedColumns = new ArrayList(); + private boolean onDeleteCascade; + private boolean onDeleteSetNull; + private boolean disableNovalidate; + public SQLForeignKeyImpl() { } @Override @@ -104,7 +103,7 @@ protected void accept0(SQLASTVisitor visitor) { acceptChild(visitor, this.getReferencingColumns()); acceptChild(visitor, this.getReferencedColumns()); } - visitor.endVisit(this); + visitor.endVisit(this); } public void cloneTo(SQLForeignKeyImpl x) { @@ -137,37 +136,36 @@ public static enum Match { FULL("FULL"), PARTIAL("PARTIAL"), SIMPLE("SIMPLE"); public final String name; - public final String name_lcase; + public final String nameLCase; - Match(String name){ + Match(String name) { this.name = name; - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } } public static enum On { - DELETE("DELETE"), // + DELETE("DELETE"), UPDATE("UPDATE"); public final String name; - public final String name_lcase; + public final String nameLCase; - On(String name){ + On(String name) { this.name = name; - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } } public static enum Option { - RESTRICT("RESTRICT"), CASCADE("CASCADE"), SET_NULL("SET NULL"), NO_ACTION("NO ACTION"), SET_DEFAULT("SET DEFAULT"); public final String name; - public final String name_lcase; + public final String nameLCase; - Option(String name){ + Option(String name) { this.name = name; - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } public String getText() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLGrantStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLGrantStatement.java index 5c2a63c5c9..34122e5605 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLGrantStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLGrantStatement.java @@ -17,36 +17,30 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class SQLGrantStatement extends SQLPrivilegeStatement { - // mysql - private SQLExpr maxQueriesPerHour; - private SQLExpr maxUpdatesPerHour; - private SQLExpr maxConnectionsPerHour; - private SQLExpr maxUserConnections; - - private boolean adminOption; - - private SQLExpr identifiedBy; - private String identifiedByPassword; - - private boolean withGrantOption; + private SQLExpr maxQueriesPerHour; + private SQLExpr maxUpdatesPerHour; + private SQLExpr maxConnectionsPerHour; + private SQLExpr maxUserConnections; + private boolean adminOption; + private SQLExpr identifiedBy; + private String identifiedByPassword; - public SQLGrantStatement(){ + private boolean withGrantOption; + public SQLGrantStatement() { } - public SQLGrantStatement(DbType dbType){ + public SQLGrantStatement(DbType dbType) { super(dbType); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLIfStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLIfStatement.java index 0349e15527..5e5a387a85 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLIfStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLIfStatement.java @@ -22,11 +22,10 @@ import java.util.List; public class SQLIfStatement extends SQLStatementImpl implements SQLReplaceable { - - private SQLExpr condition; + private SQLExpr condition; private List statements = new ArrayList(); - private List elseIfList = new ArrayList(); - private Else elseItem; + private List elseIfList = new ArrayList(); + private Else elseItem; public SQLIfStatement clone() { SQLIfStatement x = new SQLIfStatement(); @@ -120,7 +119,7 @@ public boolean replace(SQLExpr expr, SQLExpr target) { } public static class ElseIf extends SQLObjectImpl implements SQLReplaceable { - private SQLExpr condition; + private SQLExpr condition; private List statements = new ArrayList(); @Override @@ -178,7 +177,6 @@ public ElseIf clone() { } public static class Else extends SQLObjectImpl { - private List statements = new ArrayList(); @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLImportTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLImportTableStatement.java index 45d8bb5d01..f4aa0f9417 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLImportTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLImportTableStatement.java @@ -2,23 +2,22 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntervalExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class SQLImportTableStatement extends SQLStatementImpl { - private boolean extenal; - private SQLExprTableSource table; + private boolean extenal; + private SQLExprTableSource table; private List partition = new ArrayList(); - private SQLExpr from; - private SQLExpr location; - private SQLIntegerExpr version;// for ads - private boolean usingBuild = false; + private SQLExpr from; + private SQLExpr location; + // for ads + private SQLIntegerExpr version; + private boolean usingBuild; public SQLImportTableStatement() { dbType = DbType.hive; 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 8ca98e207c..2c25e11e3b 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 @@ -19,23 +19,21 @@ import com.alibaba.druid.sql.ast.statement.SQLInsertStatement.ValuesClause; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; public abstract class SQLInsertInto extends SQLStatementImpl implements SQLReplaceable { - protected List insertBeforeComments; + protected List insertBeforeComments; - protected SQLExprTableSource tableSource; - protected final List columns = new ArrayList(); - protected transient String columnsString; - protected transient long columnsStringHash; - protected SQLSelect query; - protected final List valuesList = new ArrayList(); - protected boolean overwrite = false; - protected List partitions; - - public SQLInsertInto(){ + protected SQLExprTableSource tableSource; + protected final List columns = new ArrayList(); + protected transient String columnsString; + protected transient long columnsStringHash; + protected SQLSelect query; + protected final List valuesList = new ArrayList(); + protected boolean overwrite; + protected List partitions; + public SQLInsertInto() { } public void cloneTo(SQLInsertInto x) { @@ -155,7 +153,7 @@ public void setQuery(SQLSelect query) { public List getColumns() { return columns; } - + public void addColumn(SQLExpr column) { if (column != null) { column.setParent(this); @@ -177,7 +175,7 @@ public void setValues(ValuesClause values) { valuesList.set(0, values); } } - + public List getValuesList() { return valuesList; } 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 13fcd692b1..afcddf9438 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; @@ -26,10 +25,9 @@ public class SQLInsertStatement extends SQLInsertInto implements SQLStatement { protected SQLWithSubqueryClause with; - protected boolean upsert = false; // for phoenix - - public SQLInsertStatement(){ + protected boolean upsert; // for phoenix + public SQLInsertStatement() { } public void cloneTo(SQLInsertStatement x) { @@ -84,12 +82,11 @@ public void setUpsert(boolean upsert) { } public static class ValuesClause extends SQLObjectImpl implements SQLReplaceable { - - private final List values; + private final List values; private transient String originalString; - private transient int replaceCount; + private transient int replaceCount; - public ValuesClause(){ + public ValuesClause() { this(new ArrayList()); } @@ -113,15 +110,14 @@ public boolean replace(SQLExpr expr, SQLExpr target) { return false; } - public ValuesClause(List values){ + public ValuesClause(List values) { this.values = values; for (int i = 0; i < values.size(); ++i) { values.get(i).setParent(this); } } - - public ValuesClause(List values, SQLObject parent){ + public ValuesClause(List values, SQLObject parent) { this.values = values; for (int i = 0; i < values.size(); ++i) { Object val = values.get(i); @@ -184,7 +180,7 @@ public void incrementReplaceCount() { public DbType getDbType() { return dbType; } - + public void setDbType(DbType dbType) { this.dbType = dbType; } @@ -199,7 +195,6 @@ public void setAfterSemi(boolean afterSemi) { this.afterSemi = afterSemi; } - public SQLWithSubqueryClause getWith() { return with; } 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 b141b12063..64925b5c6d 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 @@ -19,7 +19,9 @@ import com.alibaba.druid.FastsqlException; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.ast.expr.*; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; +import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; +import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.repository.SchemaResolveVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.util.FnvHash; @@ -29,26 +31,24 @@ import java.util.List; public class SQLJoinTableSource extends SQLTableSourceImpl implements SQLReplaceable { - - protected SQLTableSource left; - protected JoinType joinType; - protected SQLTableSource right; - protected SQLExpr condition; + protected SQLTableSource left; + protected JoinType joinType; + protected SQLTableSource right; + protected SQLExpr condition; protected final List using = new ArrayList(); - protected boolean natural = false; - protected UDJ udj; // for maxcompute - protected boolean asof; // for clickhouse - protected boolean global; // for clickhouse + protected boolean natural; + protected UDJ udj; // for maxcompute + protected boolean asof; // for clickhouse + protected boolean global; // for clickhouse - public SQLJoinTableSource(String alias){ + public SQLJoinTableSource(String alias) { super(alias); } - public SQLJoinTableSource(){ - + public SQLJoinTableSource() { } - public SQLJoinTableSource(SQLTableSource left, JoinType joinType, SQLTableSource right, SQLExpr condition){ + public SQLJoinTableSource(SQLTableSource left, JoinType joinType, SQLTableSource right, SQLExpr condition) { this.setLeft(left); this.setJoinType(joinType); this.setRight(right); @@ -278,30 +278,30 @@ public boolean replace(SQLTableSource cmp, SQLTableSource target) { } public static enum JoinType { - COMMA(","), // - JOIN("JOIN"), // - INNER_JOIN("INNER JOIN"), // - CROSS_JOIN("CROSS JOIN"), // - NATURAL_JOIN("NATURAL JOIN"), // - NATURAL_CROSS_JOIN("NATURAL CROSS JOIN"), // - NATURAL_LEFT_JOIN("NATURAL LEFT JOIN"), // - NATURAL_RIGHT_JOIN("NATURAL RIGHT JOIN"), // - NATURAL_INNER_JOIN("NATURAL INNER JOIN"), // - LEFT_OUTER_JOIN("LEFT JOIN"), // - LEFT_SEMI_JOIN("LEFT SEMI JOIN"), // - LEFT_ANTI_JOIN("LEFT ANTI JOIN"), // - RIGHT_OUTER_JOIN("RIGHT JOIN"), // - FULL_OUTER_JOIN("FULL JOIN"),// - STRAIGHT_JOIN("STRAIGHT_JOIN"), // - OUTER_APPLY("OUTER APPLY"),// + COMMA(","), + JOIN("JOIN"), + INNER_JOIN("INNER JOIN"), + CROSS_JOIN("CROSS JOIN"), + NATURAL_JOIN("NATURAL JOIN"), + NATURAL_CROSS_JOIN("NATURAL CROSS JOIN"), + NATURAL_LEFT_JOIN("NATURAL LEFT JOIN"), + NATURAL_RIGHT_JOIN("NATURAL RIGHT JOIN"), + NATURAL_INNER_JOIN("NATURAL INNER JOIN"), + LEFT_OUTER_JOIN("LEFT JOIN"), + LEFT_SEMI_JOIN("LEFT SEMI JOIN"), + LEFT_ANTI_JOIN("LEFT ANTI JOIN"), + RIGHT_OUTER_JOIN("RIGHT JOIN"), + FULL_OUTER_JOIN("FULL JOIN"), + STRAIGHT_JOIN("STRAIGHT_JOIN"), + OUTER_APPLY("OUTER APPLY"), CROSS_APPLY("CROSS APPLY"); public final String name; - public final String name_lcase; + public final String nameLCase; - JoinType(String name){ + JoinType(String name) { this.name = name; - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } public static String toString(JoinType joinType) { @@ -309,7 +309,6 @@ public static String toString(JoinType joinType) { } } - public void cloneTo(SQLJoinTableSource x) { x.alias = alias; @@ -323,7 +322,7 @@ public void cloneTo(SQLJoinTableSource x) { x.setRight(right.clone()); } - if(condition != null){ + if (condition != null) { x.setCondition(condition.clone()); } @@ -386,7 +385,6 @@ public void rearrangement() { rightJoin.setLeft(a); rightJoin.setRight(b); - boolean on_ab_match = false; if (on_ab instanceof SQLBinaryOpExpr) { SQLBinaryOpExpr on_ab_binaryOpExpr = (SQLBinaryOpExpr) on_ab; @@ -536,7 +534,6 @@ public SQLTableSource findTableSourceWithColumn(String columnName) { return findTableSourceWithColumn(hash, columnName, 0); } - public SQLJoinTableSource findTableSourceWithColumn(SQLName a, SQLName b) { if (left.findTableSourceWithColumn(a) != null && right.findTableSourceWithColumn(b) != null) { @@ -579,7 +576,7 @@ public SQLTableSource findTableSourceWithColumn(long columnNameHash, String name return rightMatch; } - if(rightMatch == null) { + if (rightMatch == null) { return leftMatch; } @@ -672,20 +669,42 @@ public int hashCode() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } SQLJoinTableSource that = (SQLJoinTableSource) o; - if (natural != that.natural) return false; - if (asof != that.asof) return false; - if (global != that.global) return false; - if (left != null ? !left.equals(that.left) : that.left != null) return false; - if (joinType != that.joinType) return false; - if (right != null ? !right.equals(that.right) : that.right != null) return false; - if (condition != null ? !condition.equals(that.condition) : that.condition != null) return false; - if (using != null ? !using.equals(that.using) : that.using != null) return false; + if (natural != that.natural) { + return false; + } + if (asof != that.asof) { + return false; + } + if (global != that.global) { + return false; + } + if (left != null ? !left.equals(that.left) : that.left != null) { + return false; + } + if (joinType != that.joinType) { + return false; + } + if (right != null ? !right.equals(that.right) : that.right != null) { + return false; + } + if (condition != null ? !condition.equals(that.condition) : that.condition != null) { + return false; + } + if (using != null ? !using.equals(that.using) : that.using != null) { + return false; + } return udj != null ? udj.equals(that.udj) : that.udj == null; } @@ -716,7 +735,6 @@ public static class UDJ extends SQLObjectImpl { protected List properties = new ArrayList(); public UDJ() { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLateralViewTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLateralViewTableSource.java index d99bfce45f..f021ea32ae 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLateralViewTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLateralViewTableSource.java @@ -25,7 +25,6 @@ import java.util.List; public class SQLLateralViewTableSource extends SQLTableSourceImpl { - private SQLTableSource tableSource; private boolean outer; @@ -36,7 +35,6 @@ public class SQLLateralViewTableSource extends SQLTableSourceImpl { private SQLExpr on; // odps public SQLLateralViewTableSource() { - } @Override @@ -113,7 +111,6 @@ public SQLTableSource findTableSourceWithColumn(long columnNameHash, String colu @Override public SQLLateralViewTableSource clone() { - SQLLateralViewTableSource x = new SQLLateralViewTableSource(); x.setAlias(this.alias); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLoopStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLoopStatement.java index f71d199923..b405077858 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLoopStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLoopStatement.java @@ -24,7 +24,6 @@ import java.util.List; public class SQLLoopStatement extends SQLStatementImpl { - private String labelName; private final List statements = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLMergeStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLMergeStatement.java index 0ea4a18b9c..946948ab19 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLMergeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLMergeStatement.java @@ -22,15 +22,14 @@ import java.util.List; public class SQLMergeStatement extends SQLStatementImpl { - - private final List hints = new ArrayList(); - - private SQLTableSource into; - private String alias; - private SQLTableSource using; - private SQLExpr on; - private MergeUpdateClause updateClause; - private MergeInsertClause insertClause; + private final List hints = new ArrayList(); + + private SQLTableSource into; + private String alias; + private SQLTableSource using; + private SQLExpr on; + private MergeUpdateClause updateClause; + private MergeInsertClause insertClause; private SQLErrorLoggingClause errorLoggingClause; public void accept0(SQLASTVisitor visitor) { @@ -52,7 +51,7 @@ public String getAlias() { public SQLTableSource getInto() { return into; } - + public void setInto(SQLName into) { this.setInto(new SQLExprTableSource(into)); } @@ -109,11 +108,10 @@ public List getHints() { } public static class MergeUpdateClause extends SQLObjectImpl { - private List items = new ArrayList(); - private SQLExpr where; - private SQLExpr deleteWhere; - private boolean delete; + private SQLExpr where; + private SQLExpr deleteWhere; + private boolean delete; public List getItems() { return items; @@ -166,10 +164,9 @@ public void accept0(SQLASTVisitor visitor) { } public static class MergeInsertClause extends SQLObjectImpl { - private List columns = new ArrayList(); - private List values = new ArrayList(); - private SQLExpr where; + private List values = new ArrayList(); + private SQLExpr where; @Override public void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLNotNullConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLNotNullConstraint.java index e26ddce39a..e6c03d5d66 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLNotNullConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLNotNullConstraint.java @@ -18,9 +18,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLNotNullConstraint extends SQLConstraintImpl implements SQLColumnConstraint { - - public SQLNotNullConstraint(){ - + public SQLNotNullConstraint() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLNullConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLNullConstraint.java index e2f6516d1b..962fcc65b5 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLNullConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLNullConstraint.java @@ -18,8 +18,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLNullConstraint extends SQLConstraintImpl implements SQLColumnConstraint { - - public SQLNullConstraint(){ + public SQLNullConstraint() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLObjectType.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLObjectType.java index ee2d1d733e..47942cb240 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLObjectType.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLObjectType.java @@ -16,30 +16,30 @@ package com.alibaba.druid.sql.ast.statement; public enum SQLObjectType { - TABLE("TABLE"), // - FUNCTION("FUNCTION"), // - PROCEDURE("PROCEDURE"), // - USER("USER"), // - DATABASE("DATABASE"), // - SCHEMA("SCHEMA"), // - ROLE("ROLE"), // - PROJECT("PROJECT"), // - PACKAGE("PACKAGE"), // - RESOURCE("RESOURCE"), // - INSTANCE("INSTANCE"), // - JOB("JOB"), // - VOLUME("VOLUME"), // - OfflineModel("OFFLINEMODEL"), // - SYSTEM("SYSTEM"), // - GLOBAL("GLOBAL"), // - XFLOW("XFLOW") // for odps - ; - + TABLE("TABLE"), + FUNCTION("FUNCTION"), + PROCEDURE("PROCEDURE"), + USER("USER"), + DATABASE("DATABASE"), + SCHEMA("SCHEMA"), + ROLE("ROLE"), + PROJECT("PROJECT"), + PACKAGE("PACKAGE"), + RESOURCE("RESOURCE"), + INSTANCE("INSTANCE"), + JOB("JOB"), + VOLUME("VOLUME"), + OfflineModel("OFFLINEMODEL"), + SYSTEM("SYSTEM"), + GLOBAL("GLOBAL"), + // for odps + XFLOW("XFLOW"); + public final String name; - public final String name_lcase; - + public final String nameLCase; + SQLObjectType(String name) { this.name = name; - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLOpenStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLOpenStatement.java index 138b9b3e3e..741f7177f0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLOpenStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLOpenStatement.java @@ -25,65 +25,62 @@ import java.util.List; /** - * * @author zz [455910092@qq.com] */ -public class SQLOpenStatement extends SQLStatementImpl{ - - //cursor name - private SQLName cursorName; +public class SQLOpenStatement extends SQLStatementImpl { + //cursor name + private SQLName cursorName; - private final List columns = new ArrayList(); + private final List columns = new ArrayList(); - private SQLExpr forExpr; + private SQLExpr forExpr; - private final List using = new ArrayList(); + private final List using = new ArrayList(); - public SQLOpenStatement() { + public SQLOpenStatement() { + } - } - - public SQLName getCursorName() { - return cursorName; - } - - public void setCursorName(String cursorName) { - setCursorName(new SQLIdentifierExpr(cursorName)); - } + public SQLName getCursorName() { + return cursorName; + } - public void setCursorName(SQLName cursorName) { - if (cursorName != null) { - cursorName.setParent(this); - } - this.cursorName = cursorName; - } + public void setCursorName(String cursorName) { + setCursorName(new SQLIdentifierExpr(cursorName)); + } - @Override - protected void accept0(SQLASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, cursorName); - acceptChild(visitor, forExpr); - acceptChild(visitor, columns); - } - visitor.endVisit(this); - } + public void setCursorName(SQLName cursorName) { + if (cursorName != null) { + cursorName.setParent(this); + } + this.cursorName = cursorName; + } - public SQLExpr getFor() { - return forExpr; - } + @Override + protected void accept0(SQLASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, cursorName); + acceptChild(visitor, forExpr); + acceptChild(visitor, columns); + } + visitor.endVisit(this); + } - public void setFor(SQLExpr forExpr) { - if (forExpr != null) { - forExpr.setParent(this); - } - this.forExpr = forExpr; - } + public SQLExpr getFor() { + return forExpr; + } - public List getColumns() { - return columns; - } + public void setFor(SQLExpr forExpr) { + if (forExpr != null) { + forExpr.setParent(this); + } + this.forExpr = forExpr; + } - public List getUsing() { - return using; - } + public List getColumns() { + return columns; + } + + public List getUsing() { + return using; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLOptimizeStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLOptimizeStatement.java index 12ef881cf5..acd137b411 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLOptimizeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLOptimizeStatement.java @@ -24,7 +24,7 @@ import java.util.List; public class SQLOptimizeStatement extends SQLStatementImpl { - protected final List tableSources = new ArrayList(); + protected final List tableSources = new ArrayList(); protected SQLName cluster; boolean isFinal; @@ -65,6 +65,7 @@ public void addTableSource(SQLExprTableSource tableSource) { } this.tableSources.add(tableSource); } + public SQLName getCluster() { return cluster; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPartitionRef.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPartitionRef.java index 2738b0b511..48542a2ef0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPartitionRef.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPartitionRef.java @@ -38,13 +38,11 @@ public void addItem(SQLIdentifierExpr name, SQLExpr value) { } public static class Item extends SQLObjectImpl { - private SQLIdentifierExpr columnName; private SQLExpr value; private SQLBinaryOperator operator; public Item() { - } public Item(SQLIdentifierExpr columnName) { @@ -53,7 +51,6 @@ public Item(SQLIdentifierExpr columnName) { @Override protected void accept0(SQLASTVisitor v) { - } public SQLIdentifierExpr getColumnName() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrimaryKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrimaryKey.java index 2db9271723..296fd425be 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrimaryKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrimaryKey.java @@ -16,5 +16,4 @@ package com.alibaba.druid.sql.ast.statement; public interface SQLPrimaryKey extends SQLUniqueConstraint, SQLTableElement { - } 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 4a405bf7d0..2fe35c0243 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 @@ -18,11 +18,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLPrimaryKeyImpl extends SQLUnique implements SQLPrimaryKey, SQLTableConstraint { - protected boolean disableNovalidate = false; - protected boolean clustered = false; // sql server + protected boolean disableNovalidate; + protected boolean clustered; // sql server public SQLPrimaryKeyImpl() { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrivilegeItem.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrivilegeItem.java index d98602c97e..76e8949331 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrivilegeItem.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrivilegeItem.java @@ -1,13 +1,14 @@ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class SQLPrivilegeItem extends SQLObjectImpl { - private SQLExpr action; private List columns = new ArrayList(); @@ -31,4 +32,4 @@ protected void accept0(SQLASTVisitor v) { } v.endVisit(this); } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrivilegeStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrivilegeStatement.java index 9e374f5b5a..7086f314ef 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrivilegeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPrivilegeStatement.java @@ -77,7 +77,6 @@ public List getPrivileges() { return privileges; } - public SQLObjectType getResourceType() { return resourceType; } @@ -86,5 +85,4 @@ public void setResourceType(SQLObjectType x) { this.resourceType = x; } - } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeLogsStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeLogsStatement.java index fbb0c4554f..137092f794 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeLogsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeLogsStatement.java @@ -17,7 +17,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -30,11 +29,10 @@ public class SQLPurgeLogsStatement extends SQLStatementImpl implements SQLDropSt private SQLExpr before; public SQLPurgeLogsStatement() { - } public SQLPurgeLogsStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeRecyclebinStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeRecyclebinStatement.java index 4fd14c369b..368f08a3b9 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeRecyclebinStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeRecyclebinStatement.java @@ -16,25 +16,20 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLPurgeRecyclebinStatement extends SQLStatementImpl implements SQLDropStatement { - public SQLPurgeRecyclebinStatement() { - } public SQLPurgeRecyclebinStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override protected void accept0(SQLASTVisitor visitor) { - if (visitor.visit(this)) { - - } + visitor.visit(this); visitor.endVisit(this); } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeTableStatement.java index cbd198d66e..7db94cc017 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeTableStatement.java @@ -16,24 +16,20 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLPurgeTableStatement extends SQLStatementImpl implements SQLDropStatement { - private SQLExprTableSource table; private boolean all; private int count; public SQLPurgeTableStatement() { - } public SQLPurgeTableStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeTemporaryOutputStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeTemporaryOutputStatement.java index 98786da184..be8af41bd7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeTemporaryOutputStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLPurgeTemporaryOutputStatement.java @@ -16,7 +16,6 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -25,11 +24,10 @@ public class SQLPurgeTemporaryOutputStatement extends SQLStatementImpl implement private SQLName name; public SQLPurgeTemporaryOutputStatement() { - } public SQLPurgeTemporaryOutputStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRefreshMaterializedViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRefreshMaterializedViewStatement.java index 473611fb95..5afa4f2edf 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRefreshMaterializedViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRefreshMaterializedViewStatement.java @@ -25,15 +25,13 @@ import java.util.List; public class SQLRefreshMaterializedViewStatement extends SQLStatementImpl { - private SQLExpr name; public SQLRefreshMaterializedViewStatement() { - } public SQLRefreshMaterializedViewStatement(DbType dbType) { - super (dbType); + super(dbType); } @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 9bcc6bd78c..9a183cf195 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 @@ -25,15 +25,13 @@ import java.util.List; public class SQLReleaseSavePointStatement extends SQLStatementImpl { - private SQLExpr name; - + public SQLReleaseSavePointStatement() { - } - + public SQLReleaseSavePointStatement(DbType dbType) { - super (dbType); + super(dbType); } public SQLExpr getName() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRenameUserStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRenameUserStatement.java index 66f9ef1f48..9a7272bf3e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRenameUserStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRenameUserStatement.java @@ -1,14 +1,12 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLRenameUserStatement extends SQLStatementImpl { - private SQLName name ; + private SQLName name; private SQLName to; public SQLRenameUserStatement() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReplaceStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReplaceStatement.java index 79b30dcef8..b86e14661b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReplaceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReplaceStatement.java @@ -23,15 +23,15 @@ import java.util.List; public class SQLReplaceStatement extends SQLStatementImpl { - protected boolean lowPriority = false; - protected boolean delayed = false; + protected boolean lowPriority; + protected boolean delayed; - protected SQLExprTableSource tableSource; - protected final List columns = new ArrayList(); - protected List valuesList = new ArrayList(); + protected SQLExprTableSource tableSource; + protected final List columns = new ArrayList(); + protected List valuesList = new ArrayList(); protected SQLQueryExpr query; - protected List hints; + protected List hints; protected List partitions; public SQLName getTableName() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReturnStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReturnStatement.java index 9ee9cd457c..5ea86e8882 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReturnStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReturnStatement.java @@ -25,16 +25,14 @@ import java.util.Collections; import java.util.List; -public class SQLReturnStatement extends SQLStatementImpl implements SQLReplaceable { - +public class SQLReturnStatement extends SQLStatementImpl implements SQLReplaceable { private SQLExpr expr; public SQLReturnStatement() { - } public SQLReturnStatement(DbType dbType) { - super (dbType); + super(dbType); } public SQLExpr getExpr() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRevokeStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRevokeStatement.java index 07b0c55426..823ac43367 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRevokeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRevokeStatement.java @@ -22,14 +22,12 @@ public class SQLRevokeStatement extends SQLPrivilegeStatement { private boolean grantOption; public SQLRevokeStatement() { - } - public SQLRevokeStatement(DbType dbType){ + public SQLRevokeStatement(DbType dbType) { super(dbType); } - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { 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 397427ffcc..964434b2f2 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 @@ -26,20 +26,18 @@ import java.util.List; public class SQLRollbackStatement extends SQLStatementImpl { - private SQLName to; // for mysql private Boolean chain; private Boolean release; private SQLExpr force; - + public SQLRollbackStatement() { - } - + public SQLRollbackStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override 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 f5383a7980..add21a2a56 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 @@ -25,15 +25,13 @@ import java.util.List; public class SQLSavePointStatement extends SQLStatementImpl { - private SQLExpr name; - + public SQLSavePointStatement() { - } - + public SQLSavePointStatement(DbType dbType) { - super (dbType); + super(dbType); } public SQLExpr getName() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLScriptCommitStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLScriptCommitStatement.java index 9c86a62e71..3236ba33a3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLScriptCommitStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLScriptCommitStatement.java @@ -19,9 +19,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLScriptCommitStatement extends SQLStatementImpl { - - public SQLScriptCommitStatement(){ - + public SQLScriptCommitStatement() { } public void accept0(SQLASTVisitor visitor) { 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 36db5a9d80..a5289cbb4d 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 @@ -16,11 +16,9 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; @@ -28,27 +26,25 @@ import java.util.List; public class SQLSelect extends SQLObjectImpl implements SQLDbTypedObject { - protected SQLWithSubqueryClause withSubQuery; - protected SQLSelectQuery query; - protected SQLOrderBy orderBy; - protected SQLLimit limit; + protected SQLSelectQuery query; + protected SQLOrderBy orderBy; + protected SQLLimit limit; - protected List hints; + protected List hints; - protected SQLObject restriction; + protected SQLObject restriction; - protected boolean forBrowse; - protected List forXmlOptions = null; - protected SQLExpr xmlPath; + protected boolean forBrowse; + protected List forXmlOptions; + protected SQLExpr xmlPath; - protected SQLExpr rowCount; - protected SQLExpr offset; + protected SQLExpr rowCount; + protected SQLExpr offset; private SQLHint headHint; - public SQLSelect(){ - + public SQLSelect() { } public List getHints() { @@ -57,7 +53,7 @@ public List getHints() { } return hints; } - + public int getHintsSize() { if (hints == null) { return 0; @@ -65,7 +61,7 @@ public int getHintsSize() { return hints.size(); } - public SQLSelect(SQLSelectQuery query){ + public SQLSelect(SQLSelectQuery query) { this.setQuery(query); } @@ -329,27 +325,48 @@ public SQLSelectQueryBlock getFirstQueryBlock() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLSelect sqlSelect = (SQLSelect) o; - if (forBrowse != sqlSelect.forBrowse) return false; - if (withSubQuery != null ? !withSubQuery.equals(sqlSelect.withSubQuery) : sqlSelect.withSubQuery != null) + if (forBrowse != sqlSelect.forBrowse) { + return false; + } + if (withSubQuery != null ? !withSubQuery.equals(sqlSelect.withSubQuery) : sqlSelect.withSubQuery != null) { return false; + } if (query != null ? !query.equals(sqlSelect.query) : sqlSelect.query != null) { return false; } - if (orderBy != null ? !orderBy.equals(sqlSelect.orderBy) : sqlSelect.orderBy != null) return false; - if (limit != null ? !limit.equals(sqlSelect.limit) : sqlSelect.limit != null) return false; - if (hints != null ? !hints.equals(sqlSelect.hints) : sqlSelect.hints != null) return false; - if (restriction != null ? !restriction.equals(sqlSelect.restriction) : sqlSelect.restriction != null) + if (orderBy != null ? !orderBy.equals(sqlSelect.orderBy) : sqlSelect.orderBy != null) { + return false; + } + if (limit != null ? !limit.equals(sqlSelect.limit) : sqlSelect.limit != null) { return false; - if (forXmlOptions != null ? !forXmlOptions.equals(sqlSelect.forXmlOptions) : sqlSelect.forXmlOptions != null) + } + if (hints != null ? !hints.equals(sqlSelect.hints) : sqlSelect.hints != null) { + return false; + } + if (restriction != null ? !restriction.equals(sqlSelect.restriction) : sqlSelect.restriction != null) { + return false; + } + if (forXmlOptions != null ? !forXmlOptions.equals(sqlSelect.forXmlOptions) : sqlSelect.forXmlOptions != null) { + return false; + } + if (xmlPath != null ? !xmlPath.equals(sqlSelect.xmlPath) : sqlSelect.xmlPath != null) { + return false; + } + if (rowCount != null ? !rowCount.equals(sqlSelect.rowCount) : sqlSelect.rowCount != null) { return false; - if (xmlPath != null ? !xmlPath.equals(sqlSelect.xmlPath) : sqlSelect.xmlPath != null) return false; - if (rowCount != null ? !rowCount.equals(sqlSelect.rowCount) : sqlSelect.rowCount != null) return false; - if (offset != null ? !offset.equals(sqlSelect.offset) : sqlSelect.offset != null) return false; + } + if (offset != null ? !offset.equals(sqlSelect.offset) : sqlSelect.offset != null) { + return false; + } return headHint != null ? headHint.equals(sqlSelect.headHint) : sqlSelect.headHint == null; } 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 d31302a813..37a1bcfb69 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 @@ -27,17 +27,15 @@ import java.util.List; public class SQLSelectGroupByClause extends SQLObjectImpl implements SQLReplaceable { + private final List items = new ArrayList(); + private SQLExpr having; + private boolean withRollUp; + private boolean withCube; - private final List items = new ArrayList(); - private SQLExpr having; - private boolean withRollUp = false; - private boolean withCube = false; - - private boolean distinct = false; - private boolean paren = false; - - public SQLSelectGroupByClause(){ + private boolean distinct; + private boolean paren; + public SQLSelectGroupByClause() { } @Override @@ -73,8 +71,7 @@ public boolean isWithRollUp() { public void setWithRollUp(boolean withRollUp) { this.withRollUp = withRollUp; } - - + public boolean isWithCube() { return withCube; } @@ -186,8 +183,7 @@ public void setParen(boolean paren) { } @Override - public boolean equals(Object o) - { + public boolean equals(Object o) { if (this == o) { return true; } @@ -219,8 +215,7 @@ public boolean equals(Object o) } @Override - public int hashCode() - { + public int hashCode() { int result = items != null ? items.hashCode() : 0; result = 31 * result + (having != null ? having.hashCode() : 0); result = 31 * result + (withRollUp ? 1 : 0); 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 4ea2473366..4ff4d8a17b 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 @@ -32,27 +32,25 @@ import java.util.List; public class SQLSelectItem extends SQLObjectImpl implements SQLReplaceable { - protected SQLExpr expr; - protected String alias; + protected String alias; - protected boolean connectByRoot = false; + protected boolean connectByRoot; protected transient long aliasHashCode64; protected List aliasList; - public SQLSelectItem(){ - + public SQLSelectItem() { } - public SQLSelectItem(SQLExpr expr){ + public SQLSelectItem(SQLExpr expr) { this(expr, null); } - public SQLSelectItem(int value){ + public SQLSelectItem(int value) { this(new SQLIntegerExpr(value), null); } - public SQLSelectItem(SQLExpr expr, String alias){ + public SQLSelectItem(SQLExpr expr, String alias) { this.expr = expr; this.alias = alias; @@ -60,8 +58,8 @@ public SQLSelectItem(SQLExpr expr, String alias){ expr.setParent(this); } } - - public SQLSelectItem(SQLExpr expr, String alias, boolean connectByRoot){ + + public SQLSelectItem(SQLExpr expr, String alias, boolean connectByRoot) { this.connectByRoot = connectByRoot; this.expr = expr; this.alias = alias; @@ -71,7 +69,7 @@ public SQLSelectItem(SQLExpr expr, String alias, boolean connectByRoot){ } } - public SQLSelectItem(SQLExpr expr, List aliasList, boolean connectByRoot){ + public SQLSelectItem(SQLExpr expr, List aliasList, boolean connectByRoot) { this.connectByRoot = connectByRoot; this.expr = expr; this.aliasList = aliasList; @@ -170,7 +168,9 @@ protected void accept0(SQLASTVisitor v) { @Override public boolean equals(Object o) { - if (this == o) return true; + if (this == o) { + return true; + } if (o == null || getClass() != o.getClass()) { return false; } 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 9a518f5522..79a0d00126 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,23 +22,21 @@ import java.util.List; public final class SQLSelectOrderByItem extends SQLObjectImpl implements SQLReplaceable { - - protected SQLExpr expr; - protected String collate; + protected SQLExpr expr; + protected String collate; protected SQLOrderingSpecification type; - protected NullsOrderType nullsOrderType; - - protected transient SQLSelectItem resolvedSelectItem; + protected NullsOrderType nullsOrderType; - public SQLSelectOrderByItem(){ + protected transient SQLSelectItem resolvedSelectItem; + public SQLSelectOrderByItem() { } - public SQLSelectOrderByItem(SQLExpr expr){ + public SQLSelectOrderByItem(SQLExpr expr) { this.setExpr(expr); } - public SQLSelectOrderByItem(SQLExpr expr, SQLOrderingSpecification type){ + public SQLSelectOrderByItem(SQLExpr expr, SQLOrderingSpecification type) { this.setExpr(expr); this.type = type; } @@ -69,7 +67,7 @@ public SQLOrderingSpecification getType() { public void setType(SQLOrderingSpecification type) { this.type = type; } - + public NullsOrderType getNullsOrderType() { return this.nullsOrderType; } @@ -100,17 +98,33 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null) return false; - if (getClass() != obj.getClass()) return false; + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } SQLSelectOrderByItem other = (SQLSelectOrderByItem) obj; if (collate == null) { - if (other.collate != null) return false; - } else if (!collate.equals(other.collate)) return false; + if (other.collate != null) { + return false; + } + } else if (!collate.equals(other.collate)) { + return false; + } if (expr == null) { - if (other.expr != null) return false; - } else if (!expr.equals(other.expr)) return false; - if (type != other.type) return false; + if (other.expr != null) { + return false; + } + } else if (!expr.equals(other.expr)) { + return false; + } + if (type != other.type) { + return false; + } return true; } 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 cab77ce321..c40013d8dc 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,6 +19,7 @@ public interface SQLSelectQuery extends SQLObject { boolean isParenthesized(); + void setParenthesized(boolean parenthesized); SQLSelectQuery clone(); 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 baede12974..48da09a779 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 @@ -30,47 +30,46 @@ import java.util.TreeSet; public class SQLSelectQueryBlock extends SQLSelectQueryBase implements SQLReplaceable, SQLDbTypedObject { - protected int distionOption; - protected final List selectList = new ArrayList(); + protected int distionOption; + protected final List selectList = new ArrayList(); - protected SQLTableSource from; - protected SQLExprTableSource into; - protected SQLExpr where; + protected SQLTableSource from; + protected SQLExprTableSource into; + protected SQLExpr where; // for oracle & oceanbase - protected SQLExpr startWith; - protected SQLExpr connectBy; - protected boolean prior = false; - protected boolean noCycle = false; - protected SQLOrderBy orderBySiblings; - - protected SQLSelectGroupByClause groupBy; - protected List windows; - protected SQLOrderBy orderBy; - protected boolean forUpdate = false; - protected boolean noWait = false; - protected boolean skipLocked = false; - protected boolean forShare = false; - protected SQLExpr waitTime; - protected SQLLimit limit; + protected SQLExpr startWith; + protected SQLExpr connectBy; + protected boolean prior; + protected boolean noCycle; + protected SQLOrderBy orderBySiblings; + + protected SQLSelectGroupByClause groupBy; + protected List windows; + protected SQLOrderBy orderBy; + protected boolean forUpdate; + protected boolean noWait; + protected boolean skipLocked; + protected boolean forShare; + protected SQLExpr waitTime; + protected SQLLimit limit; // for oracle - protected List forUpdateOf; + protected List forUpdateOf; protected List distributeBy; protected List sortBy; protected List clusterBy; - protected String cachedSelectList; // optimized for SelectListCache - protected long cachedSelectListHash; // optimized for SelectListCache + protected String cachedSelectList; // optimized for SelectListCache + protected long cachedSelectListHash; // optimized for SelectListCache - protected DbType dbType; - protected List hints; - - public SQLSelectQueryBlock(){ + protected DbType dbType; + protected List hints; + public SQLSelectQueryBlock() { } - public SQLSelectQueryBlock(DbType dbType){ + public SQLSelectQueryBlock(DbType dbType) { this.dbType = dbType; } @@ -289,7 +288,7 @@ public void addHaving(SQLExpr condition) { groupBy.addHaving(condition); } - + public SQLOrderBy getOrderBy() { return orderBy; } @@ -298,7 +297,7 @@ public void setOrderBy(SQLOrderBy orderBy) { if (orderBy != null) { orderBy.setParent(this); } - + this.orderBy = orderBy; } @@ -425,7 +424,7 @@ public List getSelectList() { public SQLSelectItem getSelectItem(int i) { return this.selectList.get(i); } - + public void addSelectItem(SQLSelectItem item) { this.selectList.add(item); item.setParent(this); @@ -447,12 +446,13 @@ public void addSelectItem(SQLExpr expr, String alias) { } private static class AggregationStatVisitor extends SQLASTVisitorAdapter { - private boolean aggregation = false; + private boolean aggregation; + public boolean visit(SQLAggregateExpr x) { aggregation = true; return false; } - }; + } public boolean hasSelectAggregation() { AggregationStatVisitor v = new AggregationStatVisitor(); @@ -508,7 +508,7 @@ public void setFrom(String tableName, String alias) { } this.setFrom(from); } - + public boolean isForUpdate() { return forUpdate; } @@ -516,7 +516,7 @@ public boolean isForUpdate() { public void setForUpdate(boolean forUpdate) { this.forUpdate = forUpdate; } - + public boolean isNoWait() { return noWait; } @@ -544,7 +544,7 @@ public void setForShare(boolean forShare) { public SQLExpr getWaitTime() { return waitTime; } - + public void setWaitTime(SQLExpr waitTime) { if (waitTime != null) { waitTime.setParent(this); @@ -696,7 +696,7 @@ public void addSortBy(SQLSelectOrderByItem item) { this.sortBy.add(item); } - @Override + @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { for (int i = 0; i < this.selectList.size(); i++) { @@ -768,38 +768,84 @@ protected void accept0(SQLASTVisitor visitor) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLSelectQueryBlock that = (SQLSelectQueryBlock) o; - if (distionOption != that.distionOption) return false; - if (prior != that.prior) return false; - if (noCycle != that.noCycle) return false; - if (parenthesized != that.parenthesized) return false; - if (forUpdate != that.forUpdate) return false; - if (noWait != that.noWait) return false; - if (cachedSelectListHash != that.cachedSelectListHash) return false; + if (distionOption != that.distionOption) { + return false; + } + if (prior != that.prior) { + return false; + } + if (noCycle != that.noCycle) { + return false; + } + if (parenthesized != that.parenthesized) { + return false; + } + if (forUpdate != that.forUpdate) { + return false; + } + if (noWait != that.noWait) { + return false; + } + if (cachedSelectListHash != that.cachedSelectListHash) { + return false; + } if (selectList != null ? !selectList.equals(that.selectList) : that.selectList != null) { return false; } - if (from != null ? !from.equals(that.from) : that.from != null) return false; - if (into != null ? !into.equals(that.into) : that.into != null) return false; - if (where != null ? !where.equals(that.where) : that.where != null) return false; - if (startWith != null ? !startWith.equals(that.startWith) : that.startWith != null) return false; - if (connectBy != null ? !connectBy.equals(that.connectBy) : that.connectBy != null) return false; - if (orderBySiblings != null ? !orderBySiblings.equals(that.orderBySiblings) : that.orderBySiblings != null) + if (from != null ? !from.equals(that.from) : that.from != null) { + return false; + } + if (into != null ? !into.equals(that.into) : that.into != null) { + return false; + } + if (where != null ? !where.equals(that.where) : that.where != null) { + return false; + } + if (startWith != null ? !startWith.equals(that.startWith) : that.startWith != null) { + return false; + } + if (connectBy != null ? !connectBy.equals(that.connectBy) : that.connectBy != null) { + return false; + } + if (orderBySiblings != null ? !orderBySiblings.equals(that.orderBySiblings) : that.orderBySiblings != null) { + return false; + } + if (groupBy != null ? !groupBy.equals(that.groupBy) : that.groupBy != null) { + return false; + } + if (orderBy != null ? !orderBy.equals(that.orderBy) : that.orderBy != null) { + return false; + } + if (waitTime != null ? !waitTime.equals(that.waitTime) : that.waitTime != null) { + return false; + } + if (limit != null ? !limit.equals(that.limit) : that.limit != null) { + return false; + } + if (forUpdateOf != null ? !forUpdateOf.equals(that.forUpdateOf) : that.forUpdateOf != null) { + return false; + } + if (distributeBy != null ? !distributeBy.equals(that.distributeBy) : that.distributeBy != null) { + return false; + } + if (sortBy != null ? !sortBy.equals(that.sortBy) : that.sortBy != null) { return false; - if (groupBy != null ? !groupBy.equals(that.groupBy) : that.groupBy != null) return false; - if (orderBy != null ? !orderBy.equals(that.orderBy) : that.orderBy != null) return false; - if (waitTime != null ? !waitTime.equals(that.waitTime) : that.waitTime != null) return false; - if (limit != null ? !limit.equals(that.limit) : that.limit != null) return false; - if (forUpdateOf != null ? !forUpdateOf.equals(that.forUpdateOf) : that.forUpdateOf != null) return false; - if (distributeBy != null ? !distributeBy.equals(that.distributeBy) : that.distributeBy != null) return false; - if (sortBy != null ? !sortBy.equals(that.sortBy) : that.sortBy != null) return false; - if (cachedSelectList != null ? !cachedSelectList.equals(that.cachedSelectList) : that.cachedSelectList != null) + } + if (cachedSelectList != null ? !cachedSelectList.equals(that.cachedSelectList) : that.cachedSelectList != null) { + return false; + } + if (dbType != that.dbType) { return false; - if (dbType != that.dbType) return false; + } return hints != null ? hints.equals(that.hints) : that.hints == null; } @@ -833,37 +879,81 @@ public int hashCode() { } public boolean equalsForMergeJoin(SQLSelectQueryBlock that) { - if (this == that) return true; - if (that == null) return false; + if (this == that) { + return true; + } + if (that == null) { + return false; + } if (into != null || limit != null || groupBy != null) { return false; } - if (distionOption != that.distionOption) return false; - if (prior != that.prior) return false; - if (noCycle != that.noCycle) return false; - if (parenthesized != that.parenthesized) return false; - if (forUpdate != that.forUpdate) return false; - if (noWait != that.noWait) return false; - if (cachedSelectListHash != that.cachedSelectListHash) return false; - if (selectList != null ? !selectList.equals(that.selectList) : that.selectList != null) return false; - if (from != null ? !from.equals(that.from) : that.from != null) return false; - if (into != null ? !into.equals(that.into) : that.into != null) return false; + if (distionOption != that.distionOption) { + return false; + } + if (prior != that.prior) { + return false; + } + if (noCycle != that.noCycle) { + return false; + } + if (parenthesized != that.parenthesized) { + return false; + } + if (forUpdate != that.forUpdate) { + return false; + } + if (noWait != that.noWait) { + return false; + } + if (cachedSelectListHash != that.cachedSelectListHash) { + return false; + } + if (selectList != null ? !selectList.equals(that.selectList) : that.selectList != null) { + return false; + } + if (from != null ? !from.equals(that.from) : that.from != null) { + return false; + } + if (into != null ? !into.equals(that.into) : that.into != null) { + return false; + } // if (where != null ? !where.equals(that.where) : that.where != null) return false; - if (startWith != null ? !startWith.equals(that.startWith) : that.startWith != null) return false; - if (connectBy != null ? !connectBy.equals(that.connectBy) : that.connectBy != null) return false; - if (orderBySiblings != null ? !orderBySiblings.equals(that.orderBySiblings) : that.orderBySiblings != null) + if (startWith != null ? !startWith.equals(that.startWith) : that.startWith != null) { + return false; + } + if (connectBy != null ? !connectBy.equals(that.connectBy) : that.connectBy != null) { + return false; + } + if (orderBySiblings != null ? !orderBySiblings.equals(that.orderBySiblings) : that.orderBySiblings != null) { + return false; + } + if (groupBy != null ? !groupBy.equals(that.groupBy) : that.groupBy != null) { + return false; + } + if (orderBy != null ? !orderBy.equals(that.orderBy) : that.orderBy != null) { + return false; + } + if (waitTime != null ? !waitTime.equals(that.waitTime) : that.waitTime != null) { return false; - if (groupBy != null ? !groupBy.equals(that.groupBy) : that.groupBy != null) return false; - if (orderBy != null ? !orderBy.equals(that.orderBy) : that.orderBy != null) return false; - if (waitTime != null ? !waitTime.equals(that.waitTime) : that.waitTime != null) return false; - if (limit != null ? !limit.equals(that.limit) : that.limit != null) return false; - if (forUpdateOf != null ? !forUpdateOf.equals(that.forUpdateOf) : that.forUpdateOf != null) return false; - if (distributeBy != null ? !distributeBy.equals(that.distributeBy) : that.distributeBy != null) return false; - if (sortBy != null ? !sortBy.equals(that.sortBy) : that.sortBy != null) return false; - if (cachedSelectList != null ? !cachedSelectList.equals(that.cachedSelectList) : that.cachedSelectList != null) + } + if (limit != null ? !limit.equals(that.limit) : that.limit != null) { + return false; + } + if (forUpdateOf != null ? !forUpdateOf.equals(that.forUpdateOf) : that.forUpdateOf != null) { + return false; + } + if (distributeBy != null ? !distributeBy.equals(that.distributeBy) : that.distributeBy != null) { + return false; + } + if (sortBy != null ? !sortBy.equals(that.sortBy) : that.sortBy != null) { return false; + } + if (cachedSelectList != null ? !cachedSelectList.equals(that.cachedSelectList) : that.cachedSelectList != null) { + return false; + } return dbType == that.dbType; } @@ -988,7 +1078,6 @@ public void cloneTo(SQLSelectQueryBlock x) { } } - x.parenthesized = parenthesized; x.forUpdate = forUpdate; x.noWait = noWait; @@ -1189,7 +1278,6 @@ public SQLObject resolveColum(long columnNameHash) { && ((SQLPropertyExpr) selectItemExpr).getName().equals("*")) { SQLTableSource resolvedTableSource = ((SQLPropertyExpr) selectItemExpr).getResolvedTableSource(); if (resolvedTableSource instanceof SQLSubqueryTableSource) { - boolean isParentTableSource = false; for (SQLObject parent = this.getParent(); parent != null; parent = parent.getParent()) { if (parent == resolvedTableSource) { @@ -1219,7 +1307,6 @@ public SQLObject resolveColum(long columnNameHash) { } } - public void addCondition(String conditionSql) { if (conditionSql == null || conditionSql.length() == 0) { return; 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 096b26041c..fdee49867e 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 @@ -27,22 +27,20 @@ import java.util.List; public class SQLSelectStatement extends SQLStatementImpl { - protected SQLSelect select; - public SQLSelectStatement(){ - + public SQLSelectStatement() { } - public SQLSelectStatement(DbType dbType){ - super (dbType); + public SQLSelectStatement(DbType dbType) { + super(dbType); } - public SQLSelectStatement(SQLSelect select){ + public SQLSelectStatement(SQLSelect select) { this.setSelect(select); } - public SQLSelectStatement(SQLSelect select, DbType dbType){ + public SQLSelectStatement(SQLSelect select, DbType dbType) { this(dbType); this.setSelect(select); } @@ -98,8 +96,12 @@ public List getChildren() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLSelectStatement that = (SQLSelectStatement) o; 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 bddb5d8fba..6138a759f6 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 @@ -34,22 +34,22 @@ public class SQLSetStatement extends SQLStatementImpl { private Option option; private List items = new ArrayList(); - + private List hints; - public SQLSetStatement(){ + public SQLSetStatement() { } - - public SQLSetStatement(DbType dbType){ - super (dbType); + + public SQLSetStatement(DbType dbType) { + super(dbType); } - - public SQLSetStatement(SQLExpr target, SQLExpr value){ + + public SQLSetStatement(SQLExpr target, SQLExpr value) { this(target, value, null); } - public SQLSetStatement(SQLExpr target, SQLExpr value, DbType dbType){ - super (dbType); + public SQLSetStatement(SQLExpr target, SQLExpr value, DbType dbType) { + super(dbType); SQLAssignItem item = new SQLAssignItem(target, value); item.setParent(this); this.items.add(item); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowACLStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowACLStatement.java index 98e029dfed..3ea1c149b4 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowACLStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowACLStatement.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowACLStatement extends SQLStatementImpl implements SQLShowStatement, SQLReplaceable { - protected SQLExprTableSource table; public SQLExprTableSource getTable() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCatalogsStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCatalogsStatement.java index f9449bb232..c07b20e1df 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCatalogsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCatalogsStatement.java @@ -16,13 +16,11 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowCatalogsStatement extends SQLStatementImpl implements SQLShowStatement, SQLReplaceable { - protected SQLExpr like; public SQLExpr getLike() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowColumnsStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowColumnsStatement.java index 52ef2c7fe7..33ffdd6640 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowColumnsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowColumnsStatement.java @@ -18,14 +18,12 @@ import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class SQLShowColumnsStatement extends SQLStatementImpl implements SQLShowStatement, SQLReplaceable { - private boolean full; private SQLName table; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCreateMaterializedViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCreateMaterializedViewStatement.java index e4b3fa5258..fbbc640c98 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCreateMaterializedViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCreateMaterializedViewStatement.java @@ -25,15 +25,13 @@ import java.util.List; public class SQLShowCreateMaterializedViewStatement extends SQLStatementImpl implements SQLShowStatement { - private SQLExpr name; public SQLShowCreateMaterializedViewStatement() { - } public SQLShowCreateMaterializedViewStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCreateTableStatement.java index 1c33ada058..a840713cba 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCreateTableStatement.java @@ -19,12 +19,9 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.ast.expr.SQLCharExpr; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowCreateTableStatement extends SQLStatementImpl implements SQLShowStatement, SQLReplaceable { - private SQLName name; private boolean all; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCreateViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCreateViewStatement.java index fc4a668ead..1be3a425f2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCreateViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowCreateViewStatement.java @@ -19,13 +19,9 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlStatementImpl; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowCreateViewStatement extends SQLStatementImpl implements SQLShowStatement, SQLReplaceable { - private SQLName name; public void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowDatabasesStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowDatabasesStatement.java index b7b4ecab99..f9d198906d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowDatabasesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowDatabasesStatement.java @@ -19,11 +19,9 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLShowDatabasesStatement extends SQLStatementImpl implements SQLShowStatement,SQLReplaceable { - +public class SQLShowDatabasesStatement extends SQLStatementImpl implements SQLShowStatement, SQLReplaceable { private boolean physical; private boolean full; @@ -34,7 +32,6 @@ public class SQLShowDatabasesStatement extends SQLStatementImpl implements SQLSh private boolean extra; public SQLShowDatabasesStatement() { - } public boolean isPhysical() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowFunctionsStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowFunctionsStatement.java index bb97eec97a..6fe4f02c88 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowFunctionsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowFunctionsStatement.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowFunctionsStatement extends SQLStatementImpl implements SQLShowStatement, SQLReplaceable { - protected SQLExpr like; public SQLExpr getLike() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowHistoryStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowHistoryStatement.java index ed65d7ba14..a64922b27d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowHistoryStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowHistoryStatement.java @@ -18,18 +18,16 @@ import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -import java.util.List; import java.util.ArrayList; +import java.util.List; public class SQLShowHistoryStatement extends SQLStatementImpl implements SQLShowStatement { - protected SQLExprTableSource table; private boolean tables; private List properties = new ArrayList<>(); private List partitions = new ArrayList<>(); public SQLShowHistoryStatement() { - } public SQLExprTableSource getTable() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowIndexesStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowIndexesStatement.java index da5d2c89d8..b8d2878c3c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowIndexesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowIndexesStatement.java @@ -19,16 +19,13 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; -import com.alibaba.druid.sql.ast.statement.SQLShowStatement; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.List; public class SQLShowIndexesStatement extends SQLStatementImpl implements SQLShowStatement { - private SQLExprTableSource table; + private SQLExprTableSource table; private List hints; private SQLExpr where; private String type; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowMaterializedViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowMaterializedViewStatement.java index 00b0b28ba7..0296b68ddb 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowMaterializedViewStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowMaterializedViewStatement.java @@ -26,16 +26,14 @@ import java.util.List; public class SQLShowMaterializedViewStatement extends SQLStatementImpl implements SQLShowStatement { - private SQLExpr name; private SQLCharExpr like; public SQLShowMaterializedViewStatement() { - } public SQLShowMaterializedViewStatement(DbType dbType) { - super (dbType); + super(dbType); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowOutlinesStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowOutlinesStatement.java index 98336bce7a..afc19213cc 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowOutlinesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowOutlinesStatement.java @@ -22,9 +22,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowOutlinesStatement extends SQLStatementImpl implements SQLShowStatement { - private SQLExpr where; + private SQLExpr where; private SQLOrderBy orderBy; - private SQLLimit limit; + private SQLLimit limit; @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowPartitionsStmt.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowPartitionsStmt.java index 705e5ca29a..c27b94fa6f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowPartitionsStmt.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowPartitionsStmt.java @@ -18,23 +18,20 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; -import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class SQLShowPartitionsStmt extends SQLStatementImpl implements SQLShowStatement { - private SQLExprTableSource tableSource; private List partition = new ArrayList(); private SQLExpr where; - + public SQLShowPartitionsStmt() { - super (DbType.odps); + super(DbType.odps); } public SQLExprTableSource getTableSource() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowProcessListStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowProcessListStatement.java index 1963302e4c..c4468c7e5f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowProcessListStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowProcessListStatement.java @@ -15,16 +15,18 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLLimit; +import com.alibaba.druid.sql.ast.SQLOrderBy; +import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowProcessListStatement extends SQLStatementImpl implements SQLShowStatement { - protected boolean mpp; private SQLExpr where; private SQLOrderBy orderBy; private SQLLimit limit; - private boolean full = false; + private boolean full; public boolean isMpp() { return mpp; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowQueryTaskStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowQueryTaskStatement.java index da7e4d0f47..ceddb6b81c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowQueryTaskStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowQueryTaskStatement.java @@ -19,14 +19,13 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowQueryTaskStatement extends SQLStatementImpl implements SQLShowStatement, SQLReplaceable { - private boolean full; - private SQLExpr where; + private boolean full; + private SQLExpr where; private SQLOrderBy orderBy; - private SQLLimit limit; - private SQLExpr user; + private SQLLimit limit; + private SQLExpr user; public SQLShowQueryTaskStatement() { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowRolesStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowRolesStatement.java index 532dc9e5ff..69ef0c7c61 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowRolesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowRolesStatement.java @@ -19,12 +19,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowRolesStatement extends SQLStatementImpl implements SQLShowStatement { - @Override protected void accept0(SQLASTVisitor visitor) { - if (visitor.visit(this)) { - - } + visitor.visit(this); visitor.endVisit(this); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowSessionStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowSessionStatement.java index 671df01f5f..b30a2a1026 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowSessionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowSessionStatement.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowSessionStatement extends SQLStatementImpl implements SQLShowStatement, SQLReplaceable { - protected SQLExpr like; public SQLExpr getLike() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowStatisticListStmt.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowStatisticListStmt.java index 472d31aa29..8b8c32405a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowStatisticListStmt.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowStatisticListStmt.java @@ -24,12 +24,11 @@ import java.util.List; public class SQLShowStatisticListStmt extends SQLStatementImpl implements SQLShowStatement { - private SQLExprTableSource tableSource; - private boolean full; + private boolean full; public SQLShowStatisticListStmt() { - super (DbType.odps); + super(DbType.odps); } public SQLExprTableSource getTableSource() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowStatisticStmt.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowStatisticStmt.java index 7ef7a86693..dd2599f9d7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowStatisticStmt.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowStatisticStmt.java @@ -26,14 +26,13 @@ import java.util.List; public class SQLShowStatisticStmt extends SQLStatementImpl implements SQLShowStatement { - private SQLExprTableSource tableSource; - private boolean full; + private boolean full; private final List partitions = new ArrayList(4); private final List columns = new ArrayList<>(); - + public SQLShowStatisticStmt() { - super (DbType.odps); + super(DbType.odps); } public SQLExprTableSource getTableSource() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowTableGroupsStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowTableGroupsStatement.java index 15fcc9f4f4..fb97b7721b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowTableGroupsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowTableGroupsStatement.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowTableGroupsStatement extends SQLStatementImpl implements SQLShowStatement, SQLReplaceable { - protected SQLName database; public SQLName getDatabase() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowTablesStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowTablesStatement.java index 6945c95193..9e09dacd91 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowTablesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowTablesStatement.java @@ -22,10 +22,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowTablesStatement extends SQLStatementImpl implements SQLShowStatement, SQLReplaceable { - private boolean extended = false; + private boolean extended; protected SQLName database; protected SQLExpr like; - + // for mysql protected boolean full; protected SQLExpr where; @@ -57,7 +57,7 @@ public void setLike(SQLExpr like) { this.like = like; } - + public boolean isFull() { return full; } @@ -73,7 +73,7 @@ public SQLExpr getWhere() { public void setWhere(SQLExpr where) { this.where = where; } - + @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowUsersStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowUsersStatement.java index aec0380aaf..5535565e41 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowUsersStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowUsersStatement.java @@ -19,12 +19,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowUsersStatement extends SQLStatementImpl implements SQLShowStatement { - @Override protected void accept0(SQLASTVisitor visitor) { - if (visitor.visit(this)) { - - } + visitor.visit(this); visitor.endVisit(this); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowVariantsStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowVariantsStatement.java index 4e4c860ca0..0a7df03c85 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowVariantsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowVariantsStatement.java @@ -20,9 +20,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowVariantsStatement extends SQLStatementImpl implements SQLShowStatement { - - private boolean global = false; - private boolean session = false; + private boolean global; + private boolean session; private SQLExpr like; private SQLExpr where; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowViewsStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowViewsStatement.java index a766846f04..85f1b7aea7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowViewsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLShowViewsStatement.java @@ -22,10 +22,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLShowViewsStatement extends SQLStatementImpl implements SQLShowStatement, SQLReplaceable { - protected SQLName database; protected SQLExpr like; - public SQLName getDatabase() { return database; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLStartTransactionStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLStartTransactionStatement.java index e03ddf6310..c495ec7e37 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLStartTransactionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLStartTransactionStatement.java @@ -25,23 +25,19 @@ import java.util.Collections; import java.util.List; -import static java.util.Objects.requireNonNull; - public class SQLStartTransactionStatement extends SQLStatementImpl { + private boolean consistentSnapshot; - private boolean consistentSnapshot = false; - - private boolean begin = false; - private boolean work = false; - private SQLExpr name; + private boolean begin; + private boolean work; + private SQLExpr name; private List hints; - private IsolationLevel IsolationLevel; + private IsolationLevel isolationLevel; private boolean readOnly; public SQLStartTransactionStatement() { - } public SQLStartTransactionStatement(DbType dbType) { @@ -73,11 +69,11 @@ public void setWork(boolean work) { } public SQLStartTransactionStatement.IsolationLevel getIsolationLevel() { - return IsolationLevel; + return isolationLevel; } public void setIsolationLevel(SQLStartTransactionStatement.IsolationLevel isolationLevel) { - IsolationLevel = isolationLevel; + this.isolationLevel = isolationLevel; } public void accept0(SQLASTVisitor visitor) { @@ -121,7 +117,7 @@ public void setReadOnly(boolean readOnly) { this.readOnly = readOnly; } - public static enum IsolationLevel{ + public static enum IsolationLevel { SERIALIZABLE("SERIALIZABLE"), REPEATABLE_READ("REPEATABLE READ"), READ_COMMITTED("READ COMMITTED"), @@ -129,13 +125,11 @@ public static enum IsolationLevel{ private final String text; - IsolationLevel(String text) - { + IsolationLevel(String text) { this.text = text; } - public String getText() - { + public String getText() { return text; } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubmitJobStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubmitJobStatement.java index 2fc78a957d..57a8a625e1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubmitJobStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubmitJobStatement.java @@ -15,16 +15,17 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.SQLObject; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class SQLSubmitJobStatement extends SQLStatementImpl { - - private boolean await; - private SQLStatement statment; + private boolean await; + private SQLStatement statment; public void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { @@ -33,35 +34,35 @@ public void accept0(SQLASTVisitor visitor) { visitor.endVisit(this); } - @Override - public List getChildren() { - ArrayList children = new ArrayList(); - children.add(statment); - return children; - } + @Override + public List getChildren() { + ArrayList children = new ArrayList(); + children.add(statment); + return children; + } - public boolean isAwait() { - return await; - } + public boolean isAwait() { + return await; + } - public void setAwait(boolean await) { - this.await = await; - } + public void setAwait(boolean await) { + this.await = await; + } - public SQLStatement getStatment() { - return statment; - } + public SQLStatement getStatment() { + return statment; + } - public void setStatment(SQLStatement statment) { - this.statment = statment; - } + public void setStatment(SQLStatement statment) { + this.statment = statment; + } - public SQLSubmitJobStatement clone() { - SQLSubmitJobStatement x = new SQLSubmitJobStatement(); + public SQLSubmitJobStatement clone() { + SQLSubmitJobStatement x = new SQLSubmitJobStatement(); - if (statment != null) { - x.setStatment(statment.clone()); - } - return x; - } + if (statment != null) { + x.setStatment(statment.clone()); + } + return x; + } } 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 4e1750bed6..67c19df139 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 @@ -22,32 +22,30 @@ import java.util.List; public class SQLSubqueryTableSource extends SQLTableSourceImpl { - protected SQLSelect select; protected List columns = new ArrayList(); - public SQLSubqueryTableSource(){ - + public SQLSubqueryTableSource() { } - public SQLSubqueryTableSource(String alias){ + public SQLSubqueryTableSource(String alias) { super(alias); } - public SQLSubqueryTableSource(SQLSelect select, String alias){ + public SQLSubqueryTableSource(SQLSelect select, String alias) { super(alias); this.setSelect(select); } - public SQLSubqueryTableSource(SQLSelect select){ + public SQLSubqueryTableSource(SQLSelect select) { this.setSelect(select); } - public SQLSubqueryTableSource(SQLSelectQuery query){ + public SQLSubqueryTableSource(SQLSelectQuery query) { this(new SQLSelect(query)); } - public SQLSubqueryTableSource(SQLSelectQuery query, String alias){ + public SQLSubqueryTableSource(SQLSelectQuery query, String alias) { this(new SQLSelect(query), alias); } @@ -129,8 +127,12 @@ public SQLTableSource findTableSourceWithColumn(long columnNameHash, String colu @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLSubqueryTableSource that = (SQLSubqueryTableSource) o; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableConstraint.java index 05ab91caaa..bba091e4cd 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableConstraint.java @@ -16,5 +16,4 @@ package com.alibaba.druid.sql.ast.statement; public interface SQLTableConstraint extends SQLConstraint, SQLTableElement { - } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableLike.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableLike.java index 497991f79b..489ae5ebc0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableLike.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableLike.java @@ -1,13 +1,12 @@ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLTableLike extends SQLObjectImpl implements SQLTableElement { private SQLExprTableSource table; - private boolean includeProperties = false; - private boolean excludeProperties = false; + private boolean includeProperties; + private boolean excludeProperties; @Override protected void accept0(SQLASTVisitor v) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSource.java index 34be6664c5..b4a74c5aa6 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSource.java @@ -23,33 +23,39 @@ import java.util.List; public interface SQLTableSource extends SQLObject { - String getAlias(); + long aliasHashCode64(); void setAlias(String alias); - + List getHints(); SQLTableSource clone(); String computeAlias(); + boolean containsAlias(String alias); SQLExpr getFlashback(); + void setFlashback(SQLExpr flashback); SQLColumnDefinition findColumn(String columnName); + SQLColumnDefinition findColumn(long columnNameHash); SQLObject resolveColum(long columnNameHash); SQLTableSource findTableSourceWithColumn(String columnName); + SQLTableSource findTableSourceWithColumn(long columnName_hash); + SQLTableSource findTableSourceWithColumn(SQLName columnName); SQLTableSource findTableSourceWithColumn(long columnName_hash, String name, int option); SQLTableSource findTableSource(String alias); + SQLTableSource findTableSource(long alias_hash); } 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 e617ae2d1e..315b79ce96 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 @@ -25,16 +25,15 @@ import java.util.List; public abstract class SQLTableSourceImpl extends SQLObjectImpl implements SQLTableSource { - protected String alias; + protected String alias; protected List hints; - protected SQLExpr flashback; + protected SQLExpr flashback; protected long aliasHashCode64; - public SQLTableSourceImpl(){ - + public SQLTableSourceImpl() { } - public SQLTableSourceImpl(String alias){ + public SQLTableSourceImpl(String alias) { this.alias = alias; } @@ -189,13 +188,21 @@ public SQLTableSource findTableSource(long alias_hash) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLTableSourceImpl that = (SQLTableSourceImpl) o; - if (aliasHashCode64() != that.aliasHashCode64()) return false; - if (hints != null ? !hints.equals(that.hints) : that.hints != null) return false; + if (aliasHashCode64() != that.aliasHashCode64()) { + return false; + } + if (hints != null ? !hints.equals(that.hints) : that.hints != null) { + return false; + } return flashback != null ? flashback.equals(that.flashback) : that.flashback == null; } 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 38363a0164..22a5ffc3e7 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 @@ -25,32 +25,30 @@ import java.util.List; public class SQLTruncateStatement extends SQLStatementImpl { - - protected List tableSources = new ArrayList(2); - private boolean purgeSnapshotLog = false; - private boolean only; - private Boolean restartIdentity; - private Boolean cascade; + protected List tableSources = new ArrayList(2); + private boolean purgeSnapshotLog; + private boolean only; + private Boolean restartIdentity; + private Boolean cascade; // db2 - private boolean dropStorage = false; - private boolean reuseStorage = false; - private boolean immediate = false; - private boolean ignoreDeleteTriggers = false; - private boolean restrictWhenDeleteTriggers = false; - private boolean continueIdentity = false; - protected boolean ifExists = false; - protected List partitions = new ArrayList(); + private boolean dropStorage; + private boolean reuseStorage; + private boolean immediate; + private boolean ignoreDeleteTriggers; + private boolean restrictWhenDeleteTriggers; + private boolean continueIdentity; + protected boolean ifExists; + protected List partitions = new ArrayList(); // adb - protected boolean partitionAll = false; + protected boolean partitionAll; protected List partitionsForADB = new ArrayList(); - public SQLTruncateStatement(){ - + public SQLTruncateStatement() { } - public SQLTruncateStatement(DbType dbType){ + public SQLTruncateStatement(DbType dbType) { super(dbType); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionOperator.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionOperator.java index f6f78d5838..a539b32b10 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionOperator.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionOperator.java @@ -30,11 +30,11 @@ public enum SQLUnionOperator { DISTINCT("UNION DISTINCT"); public final String name; - public final String name_lcase; + public final String nameLCase; - private SQLUnionOperator(String name){ + private SQLUnionOperator(String name) { this.name = name; - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } public String toString() { 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 4f9c7dda3f..1b2de383bb 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLDbTypedObject; import com.alibaba.druid.sql.ast.SQLLimit; -import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -30,10 +29,10 @@ public class SQLUnionQuery extends SQLSelectQueryBase implements SQLDbTypedObject { private List relations = new ArrayList(); private SQLUnionOperator operator = SQLUnionOperator.UNION; - private SQLOrderBy orderBy; + private SQLOrderBy orderBy; - private SQLLimit limit; - private DbType dbType; + private SQLLimit limit; + private DbType dbType; public SQLUnionOperator getOperator() { return operator; @@ -43,21 +42,19 @@ public void setOperator(SQLUnionOperator operator) { this.operator = operator; } - public SQLUnionQuery(){ - + public SQLUnionQuery() { } - public SQLUnionQuery(DbType dbType){ + public SQLUnionQuery(DbType dbType) { this.dbType = dbType; } - public SQLUnionQuery(SQLSelectQuery left, SQLUnionOperator operator, SQLSelectQuery right){ + public SQLUnionQuery(SQLSelectQuery left, SQLUnionOperator operator, SQLSelectQuery right) { this.setLeft(left); this.operator = operator; this.setRight(right); } - public List getRelations() { return relations; } @@ -153,7 +150,6 @@ protected void accept0(SQLASTVisitor visitor) { visitor.endVisit(this); } - public SQLLimit getLimit() { return limit; } @@ -243,7 +239,6 @@ public List getChildren() { && ((SQLUnionQuery) left).getOperator() == operator && !right.isParenthesized() && orderBy == null) { - SQLUnionQuery leftUnion = (SQLUnionQuery) left; ArrayList rights = new ArrayList(); @@ -278,16 +273,30 @@ public List getChildren() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLUnionQuery that = (SQLUnionQuery) o; - if (parenthesized != that.parenthesized) return false; - if (relations != null ? !relations.equals(that.relations) : that.relations != null) return false; - if (operator != that.operator) return false; - if (orderBy != null ? !orderBy.equals(that.orderBy) : that.orderBy != null) return false; - if (limit != null ? !limit.equals(that.limit) : that.limit != null) return false; + if (parenthesized != that.parenthesized) { + return false; + } + if (relations != null ? !relations.equals(that.relations) : that.relations != null) { + return false; + } + if (operator != that.operator) { + return false; + } + if (orderBy != null ? !orderBy.equals(that.orderBy) : that.orderBy != null) { + return false; + } + if (limit != null ? !limit.equals(that.limit) : that.limit != null) { + return false; + } return dbType == that.dbType; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQueryTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQueryTableSource.java index c80e546326..8d0715e135 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQueryTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQueryTableSource.java @@ -25,12 +25,10 @@ import java.util.List; public class SQLUnionQueryTableSource extends SQLTableSourceImpl { - private SQLUnionQuery union; protected List columns = new ArrayList(); public SQLUnionQueryTableSource() { - } public SQLUnionQueryTableSource(String alias) { @@ -79,7 +77,6 @@ public void setUnion(SQLUnionQuery union) { @Override public SQLUnionQueryTableSource clone() { - SQLUnionQueryTableSource x = new SQLUnionQueryTableSource(this.union.clone(), alias); if (this.flashback != null) { @@ -103,13 +100,21 @@ public List getColumns() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } SQLUnionQueryTableSource that = (SQLUnionQueryTableSource) o; - if (union != null ? !union.equals(that.union) : that.union != null) return false; + if (union != null ? !union.equals(that.union) : that.union != null) { + return false; + } return columns != null ? columns.equals(that.columns) : that.columns == null; } 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 409ccd242e..dca3376e05 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 @@ -27,10 +27,9 @@ import java.util.List; public class SQLUnique extends SQLConstraintImpl implements SQLUniqueConstraint, SQLTableElement { - protected final SQLIndexDefinition indexDefinition = new SQLIndexDefinition(); - public SQLUnique(){ + public SQLUnique() { indexDefinition.setParent(this); } @@ -70,7 +69,7 @@ public SQLIndexDefinition getIndexDefinition() { public List getColumns() { return indexDefinition.getColumns(); } - + public void addColumn(SQLExpr column) { if (column == null) { return; @@ -165,8 +164,8 @@ public boolean applyColumnRename(SQLName columnName, SQLColumnDefinition to) { if (to.getDataType().hasKeyLength() && 1 == to.getDataType().getArguments().size() && to.getDataType().getArguments().get(0) instanceof SQLIntegerExpr) { - int newKeyLength = ((SQLIntegerExpr)to.getDataType().getArguments().get(0)).getNumber().intValue(); - int oldKeyLength = ((SQLIntegerExpr)((SQLMethodInvokeExpr) expr).getArguments().get(0)).getNumber().intValue(); + int newKeyLength = ((SQLIntegerExpr) to.getDataType().getArguments().get(0)).getNumber().intValue(); + int oldKeyLength = ((SQLIntegerExpr) ((SQLMethodInvokeExpr) expr).getArguments().get(0)).getNumber().intValue(); if (newKeyLength > oldKeyLength) { // Change name and keep key length. ((SQLMethodInvokeExpr) expr).setMethodName(to.getName().getSimpleName()); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java index d1e5b09857..bd5174d7b7 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java @@ -18,7 +18,6 @@ import java.util.List; public interface SQLUniqueConstraint extends SQLConstraint { - List getColumns(); boolean containsColumn(String column); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnnestTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnnestTableSource.java index a2a1b3cc87..0e353a9c6b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnnestTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnnestTableSource.java @@ -10,10 +10,9 @@ public class SQLUnnestTableSource extends SQLTableSourceImpl { private final List items = new ArrayList(); protected List columns = new ArrayList(); - private boolean ordinality = false; + private boolean ordinality; public SQLUnnestTableSource() { - } @Override 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 cf87585985..18fb269939 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 @@ -27,12 +27,10 @@ import java.io.IOException; public class SQLUpdateSetItem extends SQLObjectImpl implements SQLReplaceable { - private SQLExpr column; private SQLExpr value; - public SQLUpdateSetItem(){ - + public SQLUpdateSetItem() { } public SQLExpr getColumn() { @@ -57,7 +55,6 @@ public SQLUpdateSetItem clone() { return x; } - public void setColumn(SQLExpr x) { if (x != null) { x.setParent(this); @@ -134,12 +131,18 @@ public boolean replace(SQLExpr expr, SQLExpr target) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLUpdateSetItem that = (SQLUpdateSetItem) o; - if (column != null ? !column.equals(that.column) : that.column != null) return false; + if (column != null ? !column.equals(that.column) : that.column != null) { + return false; + } return value != null ? value.equals(that.value) : that.value == null; } 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 d730248315..a510a15f2e 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 @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExprGroup; import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; @@ -31,19 +30,18 @@ public class SQLUpdateStatement extends SQLStatementImpl implements SQLReplaceab protected SQLWithSubqueryClause with; // for pg protected final List items = new ArrayList(); - protected SQLExpr where; - protected SQLTableSource from; + protected SQLExpr where; + protected SQLTableSource from; - protected SQLTableSource tableSource; - protected List returning; + protected SQLTableSource tableSource; + protected List returning; - protected List partitions; + protected List partitions; // for mysql protected SQLOrderBy orderBy; - public SQLUpdateStatement(){ - + public SQLUpdateStatement() { } public void cloneTo(SQLUpdateStatement x) { @@ -89,9 +87,9 @@ public SQLUpdateStatement clone() { cloneTo(x); return x; } - - public SQLUpdateStatement(DbType dbType){ - super (dbType); + + public SQLUpdateStatement(DbType dbType) { + super(dbType); } public SQLTableSource getTableSource() { @@ -145,7 +143,7 @@ public void setWhere(SQLExpr where) { public List getItems() { return items; } - + public void addItem(SQLUpdateSetItem item) { this.items.add(item); item.setParent(this); @@ -178,8 +176,7 @@ protected void accept0(SQLASTVisitor visitor) { visitor.endVisit(this); } - protected void acceptChild(SQLASTVisitor visitor) - { + protected void acceptChild(SQLASTVisitor visitor) { if (with != null) { with.accept(visitor); } @@ -246,7 +243,6 @@ public boolean replace(SQLExpr expr, SQLExpr target) { return false; } - public SQLOrderBy getOrderBy() { return orderBy; } @@ -349,17 +345,33 @@ public boolean removeCondition(SQLExpr condition) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLUpdateStatement that = (SQLUpdateStatement) o; - if (with != null ? !with.equals(that.with) : that.with != null) return false; - if (!items.equals(that.items)) return false; - if (where != null ? !where.equals(that.where) : that.where != null) return false; - if (from != null ? !from.equals(that.from) : that.from != null) return false; - if (tableSource != null ? !tableSource.equals(that.tableSource) : that.tableSource != null) return false; - if (returning != null ? !returning.equals(that.returning) : that.returning != null) return false; + if (with != null ? !with.equals(that.with) : that.with != null) { + return false; + } + if (!items.equals(that.items)) { + return false; + } + if (where != null ? !where.equals(that.where) : that.where != null) { + return false; + } + if (from != null ? !from.equals(that.from) : that.from != null) { + return false; + } + if (tableSource != null ? !tableSource.equals(that.tableSource) : that.tableSource != null) { + return false; + } + if (returning != null ? !returning.equals(that.returning) : that.returning != null) { + return false; + } return orderBy != null ? orderBy.equals(that.orderBy) : that.orderBy == null; } 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 0d21489f85..3ee5f834bc 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 @@ -23,15 +23,13 @@ import java.util.List; public class SQLUseStatement extends SQLStatementImpl implements SQLReplaceable { - private SQLName database; - + public SQLUseStatement() { - } - + public SQLUseStatement(DbType dbType) { - super (dbType); + super(dbType); } public SQLName getDatabase() { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLValuesQuery.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLValuesQuery.java index 8339493214..2ea586f70a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLValuesQuery.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLValuesQuery.java @@ -16,7 +16,6 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.expr.SQLListExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLValuesTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLValuesTableSource.java index f55aa44c7e..313cce966b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLValuesTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLValuesTableSource.java @@ -35,7 +35,6 @@ public class SQLValuesTableSource extends SQLTableSourceImpl implements SQLSelec private List columns = new ArrayList(); public SQLValuesTableSource() { - } public List getValues() { @@ -85,7 +84,6 @@ public void setParenthesized(boolean paren) { @Override public SQLValuesTableSource clone() { - SQLValuesTableSource x = new SQLValuesTableSource(); x.setAlias(this.alias); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWhileStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWhileStatement.java index 7e77368e66..a267bdbf25 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWhileStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWhileStatement.java @@ -22,83 +22,81 @@ import java.util.List; /** - * * @author zz [455910092@qq.com] */ public class SQLWhileStatement extends SQLStatementImpl implements SQLReplaceable { - - //while expr - private SQLExpr condition; - private List statements = new ArrayList(); - //while label name - private String labelName; - - - public String getLabelName() { - return labelName; - } - - public void setLabelName(String labelName) { - this.labelName = labelName; - } + //while expr + private SQLExpr condition; + private List statements = new ArrayList(); + //while label name + private String labelName; + + public String getLabelName() { + return labelName; + } + + public void setLabelName(String labelName) { + this.labelName = labelName; + } public void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { - acceptChild(visitor, condition); + acceptChild(visitor, condition); acceptChild(visitor, statements); } visitor.endVisit(this); } - @Override - public List getChildren() { - List children = new ArrayList(); - children.add(condition); - children.addAll(this.statements); - return children; - } + @Override + public List getChildren() { + List children = new ArrayList(); + children.add(condition); + children.addAll(this.statements); + return children; + } - public List getStatements() { + public List getStatements() { return statements; } public void setStatements(List statements) { this.statements = statements; } + public SQLExpr getCondition() { - return condition; - } - - public void setCondition(SQLExpr x) { - if (x != null) { - x.setParent(this); - } - - this.condition = x; - } - - public SQLWhileStatement clone() { - SQLWhileStatement x = new SQLWhileStatement(); - - if (condition != null) { - x.setCondition(condition.clone()); - } - for (SQLStatement stmt : statements) { - SQLStatement stmt2 = stmt.clone(); - stmt2.setParent(x); - x.statements.add(stmt2); - } - x.labelName = labelName; - return x; - } - - @Override - public boolean replace(SQLExpr expr, SQLExpr target) { - if (condition == expr) { - setCondition(target); - return true; - } - - return false; - } + return condition; + } + + public void setCondition(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + + this.condition = x; + } + + public SQLWhileStatement clone() { + SQLWhileStatement x = new SQLWhileStatement(); + + if (condition != null) { + x.setCondition(condition.clone()); + } + for (SQLStatement stmt : statements) { + SQLStatement stmt2 = stmt.clone(); + stmt2.setParent(x); + x.statements.add(stmt2); + } + x.labelName = labelName; + return x; + } + + @Override + public boolean replace(SQLExpr expr, SQLExpr target) { + if (condition == expr) { + setCondition(target); + return true; + } + + return false; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWhoamiStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWhoamiStatement.java index 098d411b06..c95251fd2a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWhoamiStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWhoamiStatement.java @@ -1,15 +1,12 @@ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLWhoamiStatement extends SQLStatementImpl { @Override protected void accept0(SQLASTVisitor v) { - if (v.visit(this)) { - - } + v.visit(this); v.endVisit(this); } } 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 ca9cc2522c..dcfb9621c6 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 @@ -22,8 +22,7 @@ import java.util.List; public class SQLWithSubqueryClause extends SQLObjectImpl { - - private Boolean recursive; + private Boolean recursive; private final List entries = new ArrayList(); public SQLWithSubqueryClause clone() { @@ -72,14 +71,12 @@ protected void accept0(SQLASTVisitor visitor) { } public static class Entry extends SQLTableSourceImpl implements SQLReplaceable { - protected final List columns = new ArrayList(); - protected SQLSelect subQuery; - protected SQLStatement returningStatement; - protected SQLExpr expr; + protected SQLSelect subQuery; + protected SQLStatement returningStatement; + protected SQLExpr expr; public Entry() { - } public Entry(String alias, SQLSelect select) { @@ -213,14 +210,24 @@ public SQLTableSource findTableSourceWithColumn(long columnNameHash, String colu @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } Entry entry = (Entry) o; - if (!columns.equals(entry.columns)) return false; - if (subQuery != null ? !subQuery.equals(entry.subQuery) : entry.subQuery != null) return false; + if (!columns.equals(entry.columns)) { + return false; + } + if (subQuery != null ? !subQuery.equals(entry.subQuery) : entry.subQuery != null) { + return false; + } return returningStatement != null ? returningStatement.equals(entry.returningStatement) : entry.returningStatement == null; } @@ -250,12 +257,18 @@ public Entry findEntry(long alias_hash) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } SQLWithSubqueryClause that = (SQLWithSubqueryClause) o; - if (recursive != null ? !recursive.equals(that.recursive) : that.recursive != null) return false; + if (recursive != null ? !recursive.equals(that.recursive) : that.recursive != null) { + return false; + } return entries.equals(that.entries); } diff --git a/src/main/java/com/alibaba/druid/sql/builder/SQLBuilder.java b/src/main/java/com/alibaba/druid/sql/builder/SQLBuilder.java index a2ae7016b5..f055991b77 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/SQLBuilder.java +++ b/src/main/java/com/alibaba/druid/sql/builder/SQLBuilder.java @@ -16,7 +16,5 @@ package com.alibaba.druid.sql.builder; - public interface SQLBuilder { - } diff --git a/src/main/java/com/alibaba/druid/sql/builder/SQLBuilderFactory.java b/src/main/java/com/alibaba/druid/sql/builder/SQLBuilderFactory.java index 17f605361c..c596ca3af5 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/SQLBuilderFactory.java +++ b/src/main/java/com/alibaba/druid/sql/builder/SQLBuilderFactory.java @@ -21,11 +21,10 @@ import com.alibaba.druid.sql.builder.impl.SQLUpdateBuilderImpl; public class SQLBuilderFactory { - public static SQLSelectBuilder createSelectSQLBuilder(DbType dbType) { return new SQLSelectBuilderImpl(dbType); } - + public static SQLSelectBuilder createSelectSQLBuilder(String sql, DbType dbType) { return new SQLSelectBuilderImpl(sql, dbType); } @@ -33,7 +32,7 @@ public static SQLSelectBuilder createSelectSQLBuilder(String sql, DbType dbType) public static SQLDeleteBuilder createDeleteBuilder(DbType dbType) { return new SQLDeleteBuilderImpl(dbType); } - + public static SQLDeleteBuilder createDeleteBuilder(String sql, DbType dbType) { return new SQLDeleteBuilderImpl(sql, dbType); } @@ -41,7 +40,7 @@ public static SQLDeleteBuilder createDeleteBuilder(String sql, DbType dbType) { public static SQLUpdateBuilder createUpdateBuilder(DbType dbType) { return new SQLUpdateBuilderImpl(dbType); } - + public static SQLUpdateBuilder createUpdateBuilder(String sql, DbType dbType) { return new SQLUpdateBuilderImpl(sql, dbType); } diff --git a/src/main/java/com/alibaba/druid/sql/builder/SQLDeleteBuilder.java b/src/main/java/com/alibaba/druid/sql/builder/SQLDeleteBuilder.java index 9b4489735c..3387c52c14 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/SQLDeleteBuilder.java +++ b/src/main/java/com/alibaba/druid/sql/builder/SQLDeleteBuilder.java @@ -16,7 +16,6 @@ package com.alibaba.druid.sql.builder; public interface SQLDeleteBuilder { - SQLDeleteBuilder from(String table); SQLDeleteBuilder from(String table, String alias); diff --git a/src/main/java/com/alibaba/druid/sql/builder/SQLSelectBuilder.java b/src/main/java/com/alibaba/druid/sql/builder/SQLSelectBuilder.java index f6aae04528..06ac68b5b5 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/SQLSelectBuilder.java +++ b/src/main/java/com/alibaba/druid/sql/builder/SQLSelectBuilder.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; public interface SQLSelectBuilder { - SQLSelectStatement getSQLSelectStatement(); SQLSelectBuilder select(String... column); diff --git a/src/main/java/com/alibaba/druid/sql/builder/SQLUpdateBuilder.java b/src/main/java/com/alibaba/druid/sql/builder/SQLUpdateBuilder.java index 9746d33f77..5c6a10e9a1 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/SQLUpdateBuilder.java +++ b/src/main/java/com/alibaba/druid/sql/builder/SQLUpdateBuilder.java @@ -16,7 +16,6 @@ package com.alibaba.druid.sql.builder; public interface SQLUpdateBuilder { - SQLUpdateBuilder from(String table); SQLUpdateBuilder from(String table, String alias); diff --git a/src/main/java/com/alibaba/druid/sql/builder/UpdateBuilder.java b/src/main/java/com/alibaba/druid/sql/builder/UpdateBuilder.java index 94d5331e2b..5cd7732771 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/UpdateBuilder.java +++ b/src/main/java/com/alibaba/druid/sql/builder/UpdateBuilder.java @@ -15,12 +15,11 @@ */ package com.alibaba.druid.sql.builder; - public interface UpdateBuilder { UpdateBuilder from(String table); UpdateBuilder from(String table, String alias); - + UpdateBuilder limit(int rowCount); UpdateBuilder limit(int rowCount, int offset); diff --git a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLBuilderImpl.java b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLBuilderImpl.java index d29c120e1f..969c469a36 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLBuilderImpl.java +++ b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLBuilderImpl.java @@ -20,29 +20,28 @@ import com.alibaba.druid.sql.ast.expr.*; import com.alibaba.druid.sql.builder.SQLBuilder; - public class SQLBuilderImpl implements SQLBuilder { public static SQLExpr toSQLExpr(Object obj, DbType dbType) { if (obj == null) { return new SQLNullExpr(); } - + if (obj instanceof Integer) { return new SQLIntegerExpr((Integer) obj); } - + if (obj instanceof Number) { return new SQLNumberExpr((Number) obj); } - + if (obj instanceof String) { return new SQLCharExpr((String) obj); } - + if (obj instanceof Boolean) { return new SQLBooleanExpr((Boolean) obj); } - + throw new IllegalArgumentException("not support : " + obj.getClass().getName()); } } diff --git a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLDeleteBuilderImpl.java b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLDeleteBuilderImpl.java index c9b4cb53a9..9931b7ce35 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLDeleteBuilderImpl.java +++ b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLDeleteBuilderImpl.java @@ -31,15 +31,14 @@ import java.util.List; public class SQLDeleteBuilderImpl implements SQLDeleteBuilder { - private SQLDeleteStatement stmt; - private DbType dbType; + private DbType dbType; - public SQLDeleteBuilderImpl(DbType dbType){ + public SQLDeleteBuilderImpl(DbType dbType) { this.dbType = dbType; } - - public SQLDeleteBuilderImpl(String sql, DbType dbType){ + + public SQLDeleteBuilderImpl(String sql, DbType dbType) { List stmtList = SQLUtils.parseStatements(sql, dbType); if (stmtList.isEmpty()) { @@ -55,7 +54,7 @@ public SQLDeleteBuilderImpl(String sql, DbType dbType){ this.dbType = dbType; } - public SQLDeleteBuilderImpl(SQLDeleteStatement stmt, DbType dbType){ + public SQLDeleteBuilderImpl(SQLDeleteStatement stmt, DbType dbType) { this.stmt = stmt; this.dbType = dbType; } diff --git a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java index fb8f5f25a1..0666b4224b 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java +++ b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java @@ -29,15 +29,14 @@ import java.util.List; public class SQLSelectBuilderImpl implements SQLSelectBuilder { - private SQLSelectStatement stmt; - private DbType dbType; + private DbType dbType; - public SQLSelectBuilderImpl(DbType dbType){ + public SQLSelectBuilderImpl(DbType dbType) { this(new SQLSelectStatement(), dbType); } - - public SQLSelectBuilderImpl(String sql, DbType dbType){ + + public SQLSelectBuilderImpl(String sql, DbType dbType) { List stmtList = SQLUtils.parseStatements(sql, dbType); if (stmtList.isEmpty()) { @@ -53,7 +52,7 @@ public SQLSelectBuilderImpl(String sql, DbType dbType){ this.dbType = dbType; } - public SQLSelectBuilderImpl(SQLSelectStatement stmt, DbType dbType){ + public SQLSelectBuilderImpl(SQLSelectStatement stmt, DbType dbType) { this.stmt = stmt; this.dbType = dbType; } @@ -190,7 +189,7 @@ public SQLSelectBuilderImpl whereOr(String expr) { SQLExpr exprObj = SQLUtils.toSQLExpr(expr, dbType); SQLExpr newCondition = SQLUtils.buildCondition(SQLBinaryOperator.BooleanOr, exprObj, false, - queryBlock.getWhere()); + queryBlock.getWhere()); queryBlock.setWhere(newCondition); return this; diff --git a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLUpdateBuilderImpl.java b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLUpdateBuilderImpl.java index d3a18ae1f2..e0e1553e95 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLUpdateBuilderImpl.java +++ b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLUpdateBuilderImpl.java @@ -34,15 +34,14 @@ import java.util.Map; public class SQLUpdateBuilderImpl extends SQLBuilderImpl implements SQLUpdateBuilder { - private SQLUpdateStatement stmt; - private DbType dbType; + private DbType dbType; - public SQLUpdateBuilderImpl(DbType dbType){ + public SQLUpdateBuilderImpl(DbType dbType) { this.dbType = dbType; } - - public SQLUpdateBuilderImpl(String sql, DbType dbType){ + + public SQLUpdateBuilderImpl(String sql, DbType dbType) { List stmtList = SQLUtils.parseStatements(sql, dbType); if (stmtList.isEmpty()) { @@ -58,7 +57,7 @@ public SQLUpdateBuilderImpl(String sql, DbType dbType){ this.dbType = dbType; } - public SQLUpdateBuilderImpl(SQLUpdateStatement stmt, DbType dbType){ + public SQLUpdateBuilderImpl(SQLUpdateStatement stmt, DbType dbType) { this.stmt = stmt; this.dbType = dbType; } @@ -124,29 +123,29 @@ public SQLUpdateBuilderImpl set(String... items) { SQLUpdateSetItem updateSetItem = SQLUtils.toUpdateSetItem(item, dbType); update.addItem(updateSetItem); } - + return this; } - + public SQLUpdateBuilderImpl setValue(Map values) { for (Map.Entry entry : values.entrySet()) { setValue(entry.getKey(), entry.getValue()); } - + return this; } - + public SQLUpdateBuilderImpl setValue(String column, Object value) { SQLUpdateStatement update = getSQLUpdateStatement(); - + SQLExpr columnExpr = SQLUtils.toSQLExpr(column, dbType); SQLExpr valueExpr = toSQLExpr(value, dbType); - + SQLUpdateSetItem item = new SQLUpdateSetItem(); item.setColumn(columnExpr); item.setValue(valueExpr); update.addItem(item); - + return this; } @@ -173,7 +172,7 @@ public SQLUpdateStatement createSQLUpdateStatement() { return new SQLUpdateStatement(); } } - + public String toString() { return SQLUtils.toSQLString(stmt, dbType); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsCreateTableParser.java index 478d85e534..894f17dd17 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsCreateTableParser.java @@ -1,14 +1,11 @@ package com.alibaba.druid.sql.dialect.ads.parser; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLListExpr; import com.alibaba.druid.sql.ast.statement.*; -import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateTableStatement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleSelectParser; -import com.alibaba.druid.sql.parser.*; +import com.alibaba.druid.sql.parser.ParserException; +import com.alibaba.druid.sql.parser.SQLCreateTableParser; +import com.alibaba.druid.sql.parser.SQLExprParser; +import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.util.FnvHash; public class AdsCreateTableParser extends SQLCreateTableParser { @@ -66,14 +63,14 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { constraint.setParent(stmt); stmt.getTableElementList().add((SQLTableElement) constraint); } else if (token == Token.TABLESPACE) { - throw new ParserException("TODO " + lexer.info()); + throw new ParserException("TODO " + lexer.info()); } else if (lexer.token() == Token.INDEX) { //skip index lexer.nextToken(); accept(Token.IDENTIFIER); accept(Token.IDENTIFIER); accept(Token.LPAREN); accept(Token.IDENTIFIER); - for(;;) { + for (; ; ) { if (lexer.token() == Token.COMMA) { accept(Token.IDENTIFIER); continue; @@ -81,8 +78,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { break; } accept(Token.RPAREN); - } - else { + } else { SQLColumnDefinition column = this.exprParser.parseColumn(); stmt.getTableElementList().add(column); } @@ -103,7 +99,6 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { } - if (lexer.token() == Token.AS) { lexer.nextToken(); @@ -197,7 +192,6 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { accept(Token.LITERAL_CHARS); } - return stmt; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsExprParser.java index 4555b3dcae..86ce2874dd 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsExprParser.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLArrayExpr; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; -import com.alibaba.druid.sql.dialect.h2.parser.H2Lexer; import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.SQLExprParser; import com.alibaba.druid.sql.parser.SQLParserFeature; @@ -28,12 +27,12 @@ import java.util.Arrays; public class AdsExprParser extends SQLExprParser { - private final static String[] AGGREGATE_FUNCTIONS; - private final static long[] AGGREGATE_FUNCTIONS_CODES; + private static final String[] AGGREGATE_FUNCTIONS; + private static final long[] AGGREGATE_FUNCTIONS_CODES; static { - String[] strings = { "AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", - "ROWNUMBER" }; + String[] strings = {"AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", + "ROWNUMBER"}; AGGREGATE_FUNCTIONS_CODES = FnvHash.fnv1a_64_lower(strings, true); AGGREGATE_FUNCTIONS = new String[AGGREGATE_FUNCTIONS_CODES.length]; for (String str : strings) { @@ -43,17 +42,17 @@ public class AdsExprParser extends SQLExprParser { } } - public AdsExprParser(String sql){ + public AdsExprParser(String sql) { this(new AdsLexer(sql)); this.lexer.nextToken(); } - public AdsExprParser(String sql, SQLParserFeature... features){ + public AdsExprParser(String sql, SQLParserFeature... features) { this(new AdsLexer(sql, features)); this.lexer.nextToken(); } - public AdsExprParser(Lexer lexer){ + public AdsExprParser(Lexer lexer) { super(lexer); this.aggregateFunctions = AGGREGATE_FUNCTIONS; this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsLexer.java index 539940b890..30c91692ce 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsLexer.java @@ -10,7 +10,7 @@ import java.util.Map; public class AdsLexer extends Lexer { - public final static Keywords DEFAULT_ADS_KEYWORDS; + public static final Keywords DEFAULT_ADS_KEYWORDS; static { Map map = new HashMap(); @@ -37,7 +37,7 @@ public AdsLexer(String input) { super.keywords = DEFAULT_ADS_KEYWORDS; } - public AdsLexer(String input, SQLParserFeature... features){ + public AdsLexer(String input, SQLParserFeature... features) { super(input); super.keywords = DEFAULT_ADS_KEYWORDS; for (SQLParserFeature feature : features) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsSelectParser.java index 023d7bba68..a9c853eebe 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsSelectParser.java @@ -15,22 +15,20 @@ */ package com.alibaba.druid.sql.dialect.ads.parser; -import com.alibaba.druid.sql.dialect.h2.parser.H2ExprParser; import com.alibaba.druid.sql.parser.SQLExprParser; import com.alibaba.druid.sql.parser.SQLSelectListCache; import com.alibaba.druid.sql.parser.SQLSelectParser; public class AdsSelectParser extends SQLSelectParser { - - public AdsSelectParser(SQLExprParser exprParser){ + public AdsSelectParser(SQLExprParser exprParser) { super(exprParser); } - public AdsSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache){ + public AdsSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache) { super(exprParser, selectListCache); } - public AdsSelectParser(String sql){ + public AdsSelectParser(String sql) { this(new AdsExprParser(sql)); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsStatementParser.java index ef5e97dc89..61977a01ea 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsStatementParser.java @@ -7,14 +7,14 @@ public class AdsStatementParser extends SQLStatementParser { public AdsStatementParser(String sql) { - super (new AdsExprParser(sql)); + super(new AdsExprParser(sql)); } public AdsStatementParser(String sql, SQLParserFeature... features) { - super (new AdsExprParser(sql, features)); + super(new AdsExprParser(sql, features)); } - public AdsStatementParser(Lexer lexer){ + public AdsStatementParser(Lexer lexer) { super(new AdsExprParser(lexer)); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/ads/visitor/AdsOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/ads/visitor/AdsOutputVisitor.java index 6e03e2b698..6ee1df366f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/ads/visitor/AdsOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/ads/visitor/AdsOutputVisitor.java @@ -1,7 +1,6 @@ package com.alibaba.druid.sql.dialect.ads.visitor; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; @@ -58,14 +57,11 @@ public boolean visit(SQLShowColumnsStatement x) { return false; } - @Override public void endVisit(MySqlPrimaryKey x) { - } @Override public void endVisit(MySqlCreateTableStatement x) { - } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/ads/visitor/AdsVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/ads/visitor/AdsVisitor.java index a054c7dbb3..8d1fc28a75 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/ads/visitor/AdsVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/ads/visitor/AdsVisitor.java @@ -6,8 +6,10 @@ public interface AdsVisitor extends SQLASTVisitor { boolean visit(MySqlPrimaryKey x); + void endVisit(MySqlPrimaryKey x); boolean visit(MySqlCreateTableStatement x); + void endVisit(MySqlCreateTableStatement x); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/antspark/ast/AntsparkCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/antspark/ast/AntsparkCreateTableStatement.java index e6e4007696..b32fc26364 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/antspark/ast/AntsparkCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/antspark/ast/AntsparkCreateTableStatement.java @@ -19,16 +19,15 @@ import java.util.Map; /** - * * @author peiheng.qph * @version $Id: AntsparkCreateTableStatement.java, v 0.1 2018年09月14日 15:02 peiheng.qph Exp $ */ public class AntsparkCreateTableStatement extends SQLCreateTableStatement { - protected List mappedBy = new ArrayList(1); - protected List skewedBy = new ArrayList(); - protected List skewedByOn = new ArrayList(); + protected List mappedBy = new ArrayList(1); + protected List skewedBy = new ArrayList(); + protected List skewedByOn = new ArrayList(); protected Map serdeProperties = new LinkedHashMap(); - protected SQLExpr metaLifeCycle; + protected SQLExpr metaLifeCycle; protected SQLExprTableSource datasource; public AntsparkCreateTableStatement() { @@ -92,6 +91,7 @@ protected void accept0(SQLASTVisitor v) { } super.accept0(v); } + protected void accept0(AntsparkVisitor v) { if (v.visit(this)) { acceptChild(v); @@ -110,4 +110,4 @@ protected void acceptChild(SQLASTVisitor v) { } acceptChild(v, metaLifeCycle); } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkCreateTableParser.java index 4cdb796b73..9bca86a978 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkCreateTableParser.java @@ -7,12 +7,7 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.expr.SQLListExpr; -import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; -import com.alibaba.druid.sql.ast.statement.SQLConstraint; -import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelect; -import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; -import com.alibaba.druid.sql.ast.statement.SQLTableElement; +import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.antspark.ast.AntsparkCreateTableStatement; import com.alibaba.druid.sql.dialect.hive.ast.HiveInputOutputFormat; import com.alibaba.druid.sql.parser.ParserException; @@ -22,7 +17,6 @@ import com.alibaba.druid.util.FnvHash; /** - * * @author peiheng.qph * @version $Id: AntsparkCreateTableParser.java, v 0.1 2018年09月14日 15:03 peiheng.qph Exp $ */ @@ -34,6 +28,7 @@ public AntsparkCreateTableParser(String sql) { public AntsparkCreateTableParser(SQLExprParser exprParser) { super(exprParser); } + public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { AntsparkCreateTableStatement stmt = new AntsparkCreateTableStatement(); @@ -85,7 +80,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { constraint.setParent(stmt); stmt.getTableElementList().add((SQLTableElement) constraint); } else if (token == Token.TABLESPACE) { - throw new ParserException("TODO " + lexer.info()); + throw new ParserException("TODO " + lexer.info()); } else { SQLColumnDefinition column = this.exprParser.parseColumn(); stmt.getTableElementList().add(column); @@ -106,9 +101,9 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { accept(Token.RPAREN); } //add using - if(lexer.token()== Token.USING){ + if (lexer.token() == Token.USING) { lexer.nextToken(); - SQLName expr=this.exprParser.name(); + SQLName expr = this.exprParser.name(); stmt.setDatasource(expr); } @@ -129,7 +124,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { accept(Token.BY); accept(Token.LPAREN); - for (;;) { + for (; ; ) { if (lexer.token() != Token.IDENTIFIER) { throw new ParserException("expect identifier. " + lexer.info()); } @@ -178,7 +173,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { accept(Token.RPAREN); accept(Token.ON); accept(Token.LPAREN); - for (;;) { + for (; ; ) { if (lexer.token() == Token.LPAREN) { SQLListExpr list = new SQLListExpr(); lexer.nextToken(); @@ -257,7 +252,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { String name = lexer.stringVal(); lexer.nextToken(); accept(Token.EQ); @@ -308,4 +303,4 @@ private void parseRowFormat(AntsparkCreateTableStatement stmt) { private void parseSortedBy(AntsparkCreateTableStatement stmt) { } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkExprParser.java index 51a74b3947..ed6f315e86 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkExprParser.java @@ -19,17 +19,16 @@ import java.util.Arrays; /** - * * @author peiheng.qph * @version $Id: AntsparkExprParser.java, v 0.1 2018年09月14日 15:04 peiheng.qph Exp $ */ -public class AntsparkExprParser extends SQLExprParser { - private final static String[] AGGREGATE_FUNCTIONS; - private final static long[] AGGREGATE_FUNCTIONS_CODES; +public class AntsparkExprParser extends SQLExprParser { + private static final String[] AGGREGATE_FUNCTIONS; + private static final long[] AGGREGATE_FUNCTIONS_CODES; static { - String[] strings = { "AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", - "ROWNUMBER" }; + String[] strings = {"AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", + "ROWNUMBER"}; AGGREGATE_FUNCTIONS_CODES = FnvHash.fnv1a_64_lower(strings, true); AGGREGATE_FUNCTIONS = new String[AGGREGATE_FUNCTIONS_CODES.length]; @@ -40,12 +39,12 @@ public class AntsparkExprParser extends SQLExprParser { } } - public AntsparkExprParser(String sql){ + public AntsparkExprParser(String sql) { this(new AntsparkLexer(sql)); this.lexer.nextToken(); } - public AntsparkExprParser(Lexer lexer){ + public AntsparkExprParser(Lexer lexer) { super(lexer); this.aggregateFunctions = AGGREGATE_FUNCTIONS; this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; @@ -74,7 +73,7 @@ public SQLExpr primary() { final Token tok = lexer.token(); switch (tok) { case IDENTIFIER: - final long hash_lower = lexer.hash_lower(); + final long hash_lower = lexer.hashLCase(); if (hash_lower == FnvHash.Constants.OUTLINE) { lexer.nextToken(); SQLExpr file = primary(); @@ -180,10 +179,12 @@ protected SQLExpr parseAliasExpr(String alias) { String chars = alias.substring(1, alias.length() - 1); return new SQLCharExpr(chars); } + protected SQLExpr parseDatasource(String alias) { String chars = alias.substring(1, alias.length() - 1); return new SQLCharExpr(chars); } + public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { if (lexer.identifierEquals(FnvHash.Constants.MAPPED)) { lexer.nextToken(); @@ -196,9 +197,6 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { this.parseAssignItem(column.getColProperties(), column); } - return super.parseColumnRest(column); } - - -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkLexer.java index 98014c79be..f8f46ec896 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkLexer.java @@ -13,12 +13,11 @@ import java.util.Map; /** - * * @author peiheng.qph * @version $Id: AntsparkLexer.java, v 0.1 2018年09月14日 15:04 peiheng.qph Exp $ */ public class AntsparkLexer extends Lexer { - public final static Keywords DEFAULT_ANTSPARK_KEYWORDS; + public static final Keywords DEFAULT_ANTSPARK_KEYWORDS; static { Map map = new HashMap(); @@ -46,10 +45,10 @@ public class AntsparkLexer extends Lexer { DEFAULT_ANTSPARK_KEYWORDS = new Keywords(map); } + public AntsparkLexer(String input) { super(input); - dbType= DbType.antspark; + dbType = DbType.antspark; super.keywords = DEFAULT_ANTSPARK_KEYWORDS; } - -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkStatementParser.java index 0ab6b04316..feae37f512 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkStatementParser.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; /** - * * @author peiheng.qph * @version $Id: AntsparkStateMentParser.java, v 0.1 2018年09月14日 15:07 peiheng.qph Exp $ */ @@ -20,5 +19,4 @@ public AntsparkStatementParser(String sql) { public SQLCreateTableParser getSQLCreateTableParser() { return new AntsparkCreateTableParser(this.exprParser); } - -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/antspark/visitor/AntsparkOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/antspark/visitor/AntsparkOutputVisitor.java index 5e0c957cb7..67d29f7850 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/antspark/visitor/AntsparkOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/antspark/visitor/AntsparkOutputVisitor.java @@ -19,12 +19,10 @@ import java.util.Map.Entry; /** - * * @author peiheng.qph * @version $Id: AntsparkOutputVisitor.java, v 0.1 2018年09月17日 10:40 peiheng.qph Exp $ */ public class AntsparkOutputVisitor extends HiveOutputVisitor implements AntsparkVisitor { - public AntsparkOutputVisitor(Appendable appender, DbType dbType) { super(appender, dbType); } @@ -87,9 +85,9 @@ public boolean visit(AntsparkCreateTableStatement x) { println(); print(')'); } - if(x.getDatasource()!=null){ + if (x.getDatasource() != null) { println(); - print0(ucase?"USING ":"using "); + print0(ucase ? "USING " : "using "); print0(x.getDatasource().toString()); } if (x.getComment() != null) { @@ -98,7 +96,6 @@ public boolean visit(AntsparkCreateTableStatement x) { x.getComment().accept(this); } - int partitionSize = x.getPartitionColumns().size(); if (partitionSize > 0) { println(); @@ -169,12 +166,12 @@ public boolean visit(AntsparkCreateTableStatement x) { if (serdeProperties.size() > 0) { println(); print0(ucase ? "TBLPROPERTIES (" : "tblproperties ("); - String seperator=""; - for(Entry entry:serdeProperties.entrySet()){ - print0("'"+entry.getKey()+"'='"); + String seperator = ""; + for (Entry entry : serdeProperties.entrySet()) { + print0("'" + entry.getKey() + "'='"); entry.getValue().accept(this); - print0("'"+seperator); - seperator=","; + print0("'" + seperator); + seperator = ","; } print(')'); } @@ -191,6 +188,5 @@ public boolean visit(AntsparkCreateTableStatement x) { @Override public void endVisit(AntsparkCreateTableStatement x) { - } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/antspark/visitor/AntsparkSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/antspark/visitor/AntsparkSchemaStatVisitor.java index e2ab3da553..a90d10825b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/antspark/visitor/AntsparkSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/antspark/visitor/AntsparkSchemaStatVisitor.java @@ -11,7 +11,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; /** - * * @author peiheng.qph * @version $Id: AntsparkSchemaStatVisitor.java, v 0.1 2018年09月16日 23:09 peiheng.qph Exp $ */ @@ -36,6 +35,5 @@ public boolean visit(AntsparkCreateTableStatement x) { @Override public void endVisit(AntsparkCreateTableStatement x) { super.endVisit((SQLCreateTableStatement) x); - } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/antspark/visitor/AntsparkVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/antspark/visitor/AntsparkVisitor.java index 19ed91043d..e90191ea13 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/antspark/visitor/AntsparkVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/antspark/visitor/AntsparkVisitor.java @@ -8,11 +8,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; /** - * * @author peiheng.qph * @version $Id: AntsparkVisitor.java, v 0.1 2018年09月14日 15:07 peiheng.qph Exp $ */ public interface AntsparkVisitor extends SQLASTVisitor { boolean visit(AntsparkCreateTableStatement x); + void endVisit(AntsparkCreateTableStatement x); -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/blink/ast/BlinkCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/blink/ast/BlinkCreateTableStatement.java index 0a6eb92dcd..4544bfd25b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/blink/ast/BlinkCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/blink/ast/BlinkCreateTableStatement.java @@ -3,8 +3,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; -import com.alibaba.druid.sql.dialect.blink.vsitor.BlinkVisitor; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class BlinkCreateTableStatement extends SQLCreateTableStatement { private SQLExpr periodFor; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkCreateTableParser.java index d6e693f24c..0f119f685b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkCreateTableParser.java @@ -16,8 +16,9 @@ package com.alibaba.druid.sql.dialect.blink.parser; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.statement.*; +import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; +import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; +import com.alibaba.druid.sql.ast.statement.SQLTableConstraint; import com.alibaba.druid.sql.dialect.blink.ast.BlinkCreateTableStatement; import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.sql.parser.SQLCreateTableParser; @@ -26,18 +27,17 @@ import com.alibaba.druid.util.FnvHash; public class BlinkCreateTableParser extends SQLCreateTableParser { - - public BlinkCreateTableParser(String sql){ + public BlinkCreateTableParser(String sql) { super(new BlinkExprParser(sql)); } - public BlinkCreateTableParser(SQLExprParser exprParser){ + public BlinkCreateTableParser(SQLExprParser exprParser) { super(exprParser); } public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { BlinkCreateTableStatement stmt = new BlinkCreateTableStatement(); - + if (acceptCreate) { accept(Token.CREATE); } @@ -46,7 +46,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { lexer.nextToken(); stmt.setExternal(true); } - + accept(Token.TABLE); if (lexer.token() == Token.IF || lexer.identifierEquals("IF")) { @@ -66,7 +66,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { } for_: - for (;;) { + for (; ; ) { SQLColumnDefinition column = null; switch (lexer.token()) { case IDENTIFIER: @@ -98,8 +98,6 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { // stmt.getTableElementList().add(constraint); // } - - if (lexer.isKeepComments() && lexer.hasComment() && column != null) { column.addAfterComment(lexer.readAndResetComments()); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkExprParser.java index f81e9bf7c4..5233cadc74 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkExprParser.java @@ -8,12 +8,12 @@ import java.util.Arrays; public class BlinkExprParser extends SQLExprParser { - private final static String[] AGGREGATE_FUNCTIONS; - private final static long[] AGGREGATE_FUNCTIONS_CODES; + private static final String[] AGGREGATE_FUNCTIONS; + private static final long[] AGGREGATE_FUNCTIONS_CODES; static { - String[] strings = { "AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", - "ROWNUMBER" }; + String[] strings = {"AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", + "ROWNUMBER"}; AGGREGATE_FUNCTIONS_CODES = FnvHash.fnv1a_64_lower(strings, true); AGGREGATE_FUNCTIONS = new String[AGGREGATE_FUNCTIONS_CODES.length]; for (String str : strings) { @@ -23,19 +23,19 @@ public class BlinkExprParser extends SQLExprParser { } } - public BlinkExprParser(String sql){ + public BlinkExprParser(String sql) { this(new BlinkLexer(sql)); this.lexer.nextToken(); } - public BlinkExprParser(String sql, SQLParserFeature... features){ + public BlinkExprParser(String sql, SQLParserFeature... features) { this(new BlinkLexer(sql, features)); this.lexer.nextToken(); } - public BlinkExprParser(Lexer lexer){ + public BlinkExprParser(Lexer lexer) { super(lexer); this.aggregateFunctions = AGGREGATE_FUNCTIONS; this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkLexer.java index 0ccf723c5b..890b9f31aa 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkLexer.java @@ -10,7 +10,7 @@ import java.util.Map; public class BlinkLexer extends Lexer { - public final static Keywords DEFAULT_BLINK_KEYWORDS; + public static final Keywords DEFAULT_BLINK_KEYWORDS; static { Map map = new HashMap(); @@ -31,13 +31,13 @@ public class BlinkLexer extends Lexer { DEFAULT_BLINK_KEYWORDS = new Keywords(map); } - public BlinkLexer(String input){ + public BlinkLexer(String input) { super(input); super.keywords = DEFAULT_BLINK_KEYWORDS; dbType = DbType.blink; } - public BlinkLexer(String input, SQLParserFeature... features){ + public BlinkLexer(String input, SQLParserFeature... features) { super(input); super.keywords = DEFAULT_BLINK_KEYWORDS; dbType = DbType.blink; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkStatementParser.java index 53c2a568a4..a73728b9ae 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkStatementParser.java @@ -15,19 +15,21 @@ */ package com.alibaba.druid.sql.dialect.blink.parser; -import com.alibaba.druid.sql.dialect.odps.parser.OdpsCreateTableParser; -import com.alibaba.druid.sql.parser.*; +import com.alibaba.druid.sql.parser.Lexer; +import com.alibaba.druid.sql.parser.SQLCreateTableParser; +import com.alibaba.druid.sql.parser.SQLParserFeature; +import com.alibaba.druid.sql.parser.SQLStatementParser; public class BlinkStatementParser extends SQLStatementParser { public BlinkStatementParser(String sql) { - super (new BlinkExprParser(sql)); + super(new BlinkExprParser(sql)); } public BlinkStatementParser(String sql, SQLParserFeature... features) { - super (new BlinkExprParser(sql, features)); + super(new BlinkExprParser(sql, features)); } - public BlinkStatementParser(Lexer lexer){ + public BlinkStatementParser(Lexer lexer) { super(new BlinkExprParser(lexer)); } // diff --git a/src/main/java/com/alibaba/druid/sql/dialect/blink/vsitor/BlinkOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/blink/vsitor/BlinkOutputVisitor.java index eec97260c5..ae754f0021 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/blink/vsitor/BlinkOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/blink/vsitor/BlinkOutputVisitor.java @@ -16,14 +16,9 @@ package com.alibaba.druid.sql.dialect.blink.vsitor; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.expr.SQLQueryExpr; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; -import com.alibaba.druid.sql.ast.statement.SQLReplaceStatement; import com.alibaba.druid.sql.ast.statement.SQLTableElement; import com.alibaba.druid.sql.dialect.blink.ast.BlinkCreateTableStatement; -import com.alibaba.druid.sql.dialect.h2.visitor.H2ASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import java.util.List; @@ -89,6 +84,5 @@ protected void printTableElements(List tableElementList) { @Override public void endVisit(BlinkCreateTableStatement x) { - } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/blink/vsitor/BlinkVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/blink/vsitor/BlinkVisitor.java index 1739478cc5..6afa159f5b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/blink/vsitor/BlinkVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/blink/vsitor/BlinkVisitor.java @@ -1,10 +1,10 @@ package com.alibaba.druid.sql.dialect.blink.vsitor; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableUnarchivePartition; import com.alibaba.druid.sql.dialect.blink.ast.BlinkCreateTableStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public interface BlinkVisitor extends SQLASTVisitor { +public interface BlinkVisitor extends SQLASTVisitor { boolean visit(BlinkCreateTableStatement x); + void endVisit(BlinkCreateTableStatement x); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/ast/ClickhouseCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/ast/ClickhouseCreateTableStatement.java index d79b4c4eb0..408bb56f98 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/ast/ClickhouseCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/ast/ClickhouseCreateTableStatement.java @@ -12,7 +12,7 @@ import java.util.List; public class ClickhouseCreateTableStatement extends SQLCreateTableStatement { - protected final List settings = new ArrayList(); + protected final List settings = new ArrayList(); private SQLOrderBy orderBy; private SQLExpr partitionBy; private SQLExpr sampleBy; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseCreateTableParser.java index 5cc452f094..1a942a79c9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseCreateTableParser.java @@ -52,7 +52,7 @@ protected void parseCreateTableRest(SQLCreateTableStatement stmt) { if (lexer.identifierEquals("SETTINGS")) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLAssignItem item = this.exprParser.parseAssignItem(); item.setParent(ckStmt); ckStmt.getSettings().add(item); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseExprParser.java index ea8bea1868..ae359e35e8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseExprParser.java @@ -27,12 +27,12 @@ import java.util.Arrays; public class ClickhouseExprParser extends SQLExprParser { - private final static String[] AGGREGATE_FUNCTIONS; - private final static long[] AGGREGATE_FUNCTIONS_CODES; + private static final String[] AGGREGATE_FUNCTIONS; + private static final long[] AGGREGATE_FUNCTIONS_CODES; static { - String[] strings = { "AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", - "ROWNUMBER" }; + String[] strings = {"AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", + "ROWNUMBER"}; AGGREGATE_FUNCTIONS_CODES = FnvHash.fnv1a_64_lower(strings, true); AGGREGATE_FUNCTIONS = new String[AGGREGATE_FUNCTIONS_CODES.length]; for (String str : strings) { @@ -42,17 +42,17 @@ public class ClickhouseExprParser extends SQLExprParser { } } - public ClickhouseExprParser(String sql){ + public ClickhouseExprParser(String sql) { this(new ClickhouseLexer(sql)); this.lexer.nextToken(); } - public ClickhouseExprParser(String sql, SQLParserFeature... features){ + public ClickhouseExprParser(String sql, SQLParserFeature... features) { this(new ClickhouseLexer(sql, features)); this.lexer.nextToken(); } - public ClickhouseExprParser(Lexer lexer){ + public ClickhouseExprParser(Lexer lexer) { super(lexer); this.aggregateFunctions = AGGREGATE_FUNCTIONS; this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseLexer.java index 1dc3ff367e..882c4a6cd7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseLexer.java @@ -10,7 +10,7 @@ import java.util.Map; public class ClickhouseLexer extends Lexer { - public final static Keywords DEFAULT_KEYWORDS; + public static final Keywords DEFAULT_KEYWORDS; static { Map map = new HashMap(); @@ -39,7 +39,7 @@ public ClickhouseLexer(String input) { super.keywords = DEFAULT_KEYWORDS; } - public ClickhouseLexer(String input, SQLParserFeature... features){ + public ClickhouseLexer(String input, SQLParserFeature... features) { super(input); super.keywords = DEFAULT_KEYWORDS; for (SQLParserFeature feature : features) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseStatementParser.java index 2ac7365579..1677b15e95 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseStatementParser.java @@ -5,18 +5,17 @@ public class ClickhouseStatementParser extends SQLStatementParser { public ClickhouseStatementParser(String sql) { - super (new ClickhouseExprParser(sql)); + super(new ClickhouseExprParser(sql)); } public ClickhouseStatementParser(String sql, SQLParserFeature... features) { - super (new ClickhouseExprParser(sql, features)); + super(new ClickhouseExprParser(sql, features)); } - public ClickhouseStatementParser(Lexer lexer){ + public ClickhouseStatementParser(Lexer lexer) { super(new ClickhouseExprParser(lexer)); } - @Override public SQLWithSubqueryClause parseWithQuery() { SQLWithSubqueryClause withQueryClause = new SQLWithSubqueryClause(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickSchemaStatVisitor.java index 679f942832..738945a7c9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickSchemaStatVisitor.java @@ -5,15 +5,15 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; public class ClickSchemaStatVisitor extends SchemaStatVisitor implements ClickhouseVisitor { - { - dbType = DbType.antspark; - } + { + dbType = DbType.antspark; + } public ClickSchemaStatVisitor() { - super(DbType.antspark); - } + super(DbType.antspark); + } public ClickSchemaStatVisitor(SchemaRepository repository) { - super(repository); - } + super(repository); + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseExportParameterVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseExportParameterVisitor.java index cb80fd95c1..eae53efa72 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseExportParameterVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseExportParameterVisitor.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause; import com.alibaba.druid.sql.ast.statement.SQLSelectItem; -import com.alibaba.druid.sql.dialect.postgresql.visitor.PGOutputVisitor; import com.alibaba.druid.sql.visitor.ExportParameterVisitor; import com.alibaba.druid.sql.visitor.ExportParameterVisitorUtils; @@ -30,13 +29,14 @@ import java.util.List; public class ClickhouseExportParameterVisitor extends ClickhouseOutputVisitor implements ExportParameterVisitor { - /** * true= if require parameterized sql output */ private final boolean requireParameterizedOutput; - public ClickhouseExportParameterVisitor(final List parameters, final Appendable appender, final boolean wantParameterizedOutput){ + public ClickhouseExportParameterVisitor(final List parameters, + final Appendable appender, + final boolean wantParameterizedOutput) { super(appender, true); this.parameters = parameters; this.requireParameterizedOutput = wantParameterizedOutput; @@ -46,21 +46,21 @@ public ClickhouseExportParameterVisitor() { this(new ArrayList()); } - public ClickhouseExportParameterVisitor(final List parameters){ - this(parameters,new StringBuilder(),false); + public ClickhouseExportParameterVisitor(final List parameters) { + this(parameters, new StringBuilder(), false); } public ClickhouseExportParameterVisitor(final Appendable appender) { - this(new ArrayList(),appender,true); + this(new ArrayList(), appender, true); } - + public List getParameters() { return parameters; } @Override public boolean visit(SQLSelectItem x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -68,7 +68,7 @@ public boolean visit(SQLSelectItem x) { @Override public boolean visit(SQLOrderBy x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -76,7 +76,7 @@ public boolean visit(SQLOrderBy x) { @Override public boolean visit(SQLSelectGroupByClause x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -84,7 +84,7 @@ public boolean visit(SQLSelectGroupByClause x) { @Override public boolean visit(SQLMethodInvokeExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getArguments()); @@ -94,7 +94,7 @@ public boolean visit(SQLMethodInvokeExpr x) { @Override public boolean visit(SQLInListExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getTargetList()); @@ -104,7 +104,7 @@ public boolean visit(SQLInListExpr x) { @Override public boolean visit(SQLBetweenExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParameter(this.parameters, x); @@ -112,7 +112,7 @@ public boolean visit(SQLBetweenExpr x) { } public boolean visit(SQLBinaryOpExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParameter(this.parameters, x); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseVisitor.java index 64f13311fe..5f16cdf73a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/visitor/ClickhouseVisitor.java @@ -1,6 +1,5 @@ package com.alibaba.druid.sql.dialect.clickhouse.visitor; -import com.alibaba.druid.sql.ast.statement.SQLNotNullConstraint; import com.alibaba.druid.sql.dialect.clickhouse.ast.ClickhouseCreateTableStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2IntermediateResultTableSource.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2IntermediateResultTableSource.java index c3732a2256..b61a1c41eb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2IntermediateResultTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2IntermediateResultTableSource.java @@ -6,10 +6,9 @@ public class DB2IntermediateResultTableSource extends SQLTableSourceImpl { @Override protected void accept0(SQLASTVisitor v) { - } - public static enum Type { + public static enum Type { OldTable, NewTable, FinalTable diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2Object.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2Object.java index 26ca204341..cf82310b3f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2Object.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2Object.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2ASTVisitor; import com.alibaba.druid.util.FnvHash; - public interface DB2Object extends SQLObject { void accept0(DB2ASTVisitor visitor); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2StatementImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2StatementImpl.java index 0df3ef0198..daf49f03a0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2StatementImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2StatementImpl.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class DB2StatementImpl extends SQLStatementImpl implements DB2Object { - public DB2StatementImpl() { super(DbType.db2); } 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 43a9000d85..0931ada077 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 @@ -27,9 +27,9 @@ public class DB2SelectQueryBlock extends SQLSelectQueryBlock implements DB2Object { private Isolation isolation; - private boolean forReadOnly; + private boolean forReadOnly; - private SQLExpr optimizeFor; + private SQLExpr optimizeFor; @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2ValuesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2ValuesStatement.java index f4c82992a8..40e11685f3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2ValuesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2ValuesStatement.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2ASTVisitor; public class DB2ValuesStatement extends DB2StatementImpl { - private SQLExpr expr; @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2CreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2CreateTableParser.java index b96c3becff..49b6e1f5fc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2CreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2CreateTableParser.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.sql.dialect.db2.parser; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLPartitionByHash; import com.alibaba.druid.sql.ast.statement.*; @@ -87,7 +86,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { constraint.setParent(createTable); createTable.getTableElementList().add((SQLTableElement) constraint); } else if (token == Token.TABLESPACE) { - throw new ParserException("TODO " + lexer.info()); + throw new ParserException("TODO " + lexer.info()); } else { SQLColumnDefinition column = this.exprParser.parseColumn(); createTable.getTableElementList().add(column); @@ -122,7 +121,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { createTable.setSelect(select); } - for (;;) { + for (; ; ) { if (lexer.identifierEquals(FnvHash.Constants.DATA)) { lexer.nextToken(); acceptIdentifier("CAPTURE"); @@ -133,7 +132,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { continue; } - throw new ParserException("TODO " + lexer.info()); + throw new ParserException("TODO " + lexer.info()); } else if (lexer.token() == Token.IN) { lexer.nextToken(); @@ -142,7 +141,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { SQLName database = this.exprParser.name(); createTable.setDatabase(database); } else if (lexer.identifierEquals("tablespace")) { - throw new ParserException("TODO " + lexer.info()); + throw new ParserException("TODO " + lexer.info()); } else { SQLName tablespace = this.exprParser.name(); createTable.setTablespace(tablespace); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java index 58745a6233..dc85475079 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java @@ -26,13 +26,13 @@ import java.util.Arrays; public class DB2ExprParser extends SQLExprParser { - public final static String[] AGGREGATE_FUNCTIONS; + public static final String[] AGGREGATE_FUNCTIONS; - public final static long[] AGGREGATE_FUNCTIONS_CODES; + public static final long[] AGGREGATE_FUNCTIONS_CODES; static { - String[] strings = { "AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", - "ROWNUMBER" }; + String[] strings = {"AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", + "ROWNUMBER"}; AGGREGATE_FUNCTIONS_CODES = FnvHash.fnv1a_64_lower(strings, true); AGGREGATE_FUNCTIONS = new String[AGGREGATE_FUNCTIONS_CODES.length]; for (String str : strings) { @@ -42,18 +42,18 @@ public class DB2ExprParser extends SQLExprParser { } } - public DB2ExprParser(String sql){ + public DB2ExprParser(String sql) { this(new DB2Lexer(sql)); this.lexer.nextToken(); this.dbType = DbType.db2; } - public DB2ExprParser(String sql, SQLParserFeature... features){ + public DB2ExprParser(String sql, SQLParserFeature... features) { this(new DB2Lexer(sql, features)); this.lexer.nextToken(); } - public DB2ExprParser(Lexer lexer){ + public DB2ExprParser(Lexer lexer) { super(lexer); this.aggregateFunctions = AGGREGATE_FUNCTIONS; this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2Lexer.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2Lexer.java index afd8978105..7f92763d30 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2Lexer.java @@ -23,16 +23,14 @@ import java.util.HashMap; import java.util.Map; - public class DB2Lexer extends Lexer { - - public final static Keywords DEFAULT_DB2_KEYWORDS; + public static final Keywords DEFAULT_DB2_KEYWORDS; static { Map map = new HashMap(); map.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords()); - + map.put("FETCH", Token.FETCH); map.put("FIRST", Token.FIRST); map.put("ONLY", Token.ONLY); @@ -44,16 +42,16 @@ public class DB2Lexer extends Lexer { map.put("MERGE", Token.MERGE); map.put("USING", Token.USING); map.put("MATCHED", Token.MATCHED); - + DEFAULT_DB2_KEYWORDS = new Keywords(map); } - public DB2Lexer(String input){ + public DB2Lexer(String input) { super(input); super.keywords = DEFAULT_DB2_KEYWORDS; } - public DB2Lexer(String input, SQLParserFeature... features){ + public DB2Lexer(String input, SQLParserFeature... features) { super(input); super.keywords = DEFAULT_DB2_KEYWORDS; for (SQLParserFeature feature : features) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java index 3b6a97959b..e7957ed6dd 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java @@ -26,18 +26,17 @@ import com.alibaba.druid.sql.parser.*; public class DB2SelectParser extends SQLSelectParser { - - public DB2SelectParser(SQLExprParser exprParser){ + public DB2SelectParser(SQLExprParser exprParser) { super(exprParser); dbType = DbType.db2; } - public DB2SelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache){ + public DB2SelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache) { super(exprParser, selectListCache); dbType = DbType.db2; } - public DB2SelectParser(String sql){ + public DB2SelectParser(String sql) { this(new DB2ExprParser(sql)); } @@ -93,14 +92,13 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { parseHierachical(queryBlock); parseGroupBy(queryBlock); - + if (lexer.token() == Token.ORDER) { SQLOrderBy orderBy = parseOrderBy(); queryBlock.setOrderBy(orderBy); } - - for (;;) { + for (; ; ) { if (lexer.token() == Token.FETCH) { lexer.nextToken(); accept(Token.FIRST); @@ -112,7 +110,7 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { accept(Token.ONLY); continue; } - + if (lexer.token() == Token.WITH) { lexer.nextToken(); if (lexer.identifierEquals("RR")) { @@ -129,10 +127,10 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { lexer.nextToken(); continue; } - + if (lexer.token() == Token.FOR) { lexer.nextToken(); - + if (lexer.token() == Token.UPDATE) { queryBlock.setForUpdate(true); lexer.nextToken(); @@ -142,11 +140,11 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { queryBlock.setForReadOnly(true); } } - + if (lexer.token() == Token.OPTIMIZE) { lexer.nextToken(); accept(Token.FOR); - + queryBlock.setOptimizeFor(this.expr()); if (lexer.identifierEquals("ROW")) { lexer.nextToken(); @@ -154,7 +152,7 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { acceptIdentifier("ROWS"); } } - + break; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java index 4c232ebbfd..4cd9356805 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java @@ -26,24 +26,23 @@ import java.util.List; - public class DB2StatementParser extends SQLStatementParser { public DB2StatementParser(String sql) { - super (new DB2ExprParser(sql)); + super(new DB2ExprParser(sql)); } public DB2StatementParser(String sql, SQLParserFeature... features) { - super (new DB2ExprParser(sql, features)); + super(new DB2ExprParser(sql, features)); } - public DB2StatementParser(Lexer lexer){ + public DB2StatementParser(Lexer lexer) { super(new DB2ExprParser(lexer)); } - + public DB2SelectParser createSQLSelectParser() { return new DB2SelectParser(this.exprParser, selectListCache); } - + public boolean parseStatementListDialect(List statementList) { if (lexer.token() == Token.VALUES) { lexer.nextToken(); @@ -52,7 +51,7 @@ public boolean parseStatementListDialect(List statementList) { statementList.add(stmt); return true; } - + return false; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ASTVisitor.java index faf2e1ca3d..eb81360b49 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ASTVisitor.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public interface DB2ASTVisitor extends SQLASTVisitor { - default boolean visit(DB2SelectQueryBlock x) { return visit((SQLSelectQueryBlock) x); } @@ -31,13 +30,12 @@ default boolean visit(DB2SelectQueryBlock x) { default void endVisit(DB2SelectQueryBlock x) { endVisit((SQLSelectQueryBlock) x); } - + default boolean visit(DB2ValuesStatement x) { return true; } - - default void endVisit(DB2ValuesStatement x) { + default void endVisit(DB2ValuesStatement x) { } default boolean visit(DB2CreateTableStatement x) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ASTVisitorAdapter.java index a3a054dc46..c4e7df930f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ASTVisitorAdapter.java @@ -15,11 +15,7 @@ */ package com.alibaba.druid.sql.dialect.db2.visitor; -import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2CreateTableStatement; -import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock; -import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2ValuesStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; public class DB2ASTVisitorAdapter extends SQLASTVisitorAdapter implements DB2ASTVisitor { - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2EvalVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2EvalVisitor.java index c7fcc98aa8..00f77b54f0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2EvalVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2EvalVisitor.java @@ -26,19 +26,18 @@ import java.util.Map; public class DB2EvalVisitor extends DB2ASTVisitorAdapter implements SQLEvalVisitor { + private Map functions = new HashMap(); + private List parameters = new ArrayList(); - private Map functions = new HashMap(); - private List parameters = new ArrayList(); + private int variantIndex = -1; - private int variantIndex = -1; + private boolean markVariantIndex = true; - private boolean markVariantIndex = true; - - public DB2EvalVisitor(){ + public DB2EvalVisitor() { this(new ArrayList(1)); } - public DB2EvalVisitor(List parameters){ + public DB2EvalVisitor(List parameters) { this.parameters = parameters; } @@ -124,7 +123,7 @@ public Function getFunction(String funcName) { public void registerFunction(String funcName, Function function) { functions.put(funcName, function); } - + @Override public void unregisterFunction(String funcName) { functions.remove(funcName); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ExportParameterVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ExportParameterVisitor.java index d5bb31d192..66df041ed1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ExportParameterVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2ExportParameterVisitor.java @@ -30,14 +30,14 @@ import java.util.List; public class DB2ExportParameterVisitor extends DB2OutputVisitor implements ExportParameterVisitor { - - /** * true= if require parameterized sql output */ private final boolean requireParameterizedOutput; - public DB2ExportParameterVisitor(final List parameters,final Appendable appender,final boolean wantParameterizedOutput){ + public DB2ExportParameterVisitor(final List parameters, + final Appendable appender, + final boolean wantParameterizedOutput) { super(appender, true); this.parameters = parameters; this.requireParameterizedOutput = wantParameterizedOutput; @@ -47,22 +47,21 @@ public DB2ExportParameterVisitor() { this(new ArrayList()); } - public DB2ExportParameterVisitor(final List parameters){ - this(parameters,new StringBuilder(),false); + public DB2ExportParameterVisitor(final List parameters) { + this(parameters, new StringBuilder(), false); } public DB2ExportParameterVisitor(final Appendable appender) { - this(new ArrayList(),appender,true); + this(new ArrayList(), appender, true); } - public List getParameters() { return parameters; } @Override public boolean visit(SQLSelectItem x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -70,7 +69,7 @@ public boolean visit(SQLSelectItem x) { @Override public boolean visit(SQLOrderBy x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -78,7 +77,7 @@ public boolean visit(SQLOrderBy x) { @Override public boolean visit(SQLSelectGroupByClause x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -86,7 +85,7 @@ public boolean visit(SQLSelectGroupByClause x) { @Override public boolean visit(SQLMethodInvokeExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getArguments()); @@ -95,17 +94,17 @@ public boolean visit(SQLMethodInvokeExpr x) { @Override public boolean visit(SQLInListExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } - + ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getTargetList()); return true; } @Override public boolean visit(SQLBetweenExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } @@ -114,7 +113,7 @@ public boolean visit(SQLBetweenExpr x) { } public boolean visit(SQLBinaryOpExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParameter(this.parameters, x); @@ -123,6 +122,5 @@ public boolean visit(SQLBinaryOpExpr x) { @Override public void endVisit(DB2CreateTableStatement x) { - } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java index d95830ab1d..1ab61522cf 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java @@ -31,12 +31,11 @@ import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; public class DB2OutputVisitor extends SQLASTOutputVisitor implements DB2ASTVisitor { - - public DB2OutputVisitor(Appendable appender){ + public DB2OutputVisitor(Appendable appender) { super(appender, DbType.db2); } - public DB2OutputVisitor(Appendable appender, boolean parameterized){ + public DB2OutputVisitor(Appendable appender, boolean parameterized) { super(appender, parameterized); this.dbType = DbType.db2; } @@ -65,10 +64,8 @@ public boolean visit(DB2SelectQueryBlock x) { return false; } - @Override public void endVisit(DB2SelectQueryBlock x) { - } @Override @@ -80,7 +77,6 @@ public boolean visit(DB2ValuesStatement x) { @Override public void endVisit(DB2ValuesStatement x) { - } @Override @@ -145,14 +141,13 @@ public boolean visit(DB2CreateTableStatement x) { @Override public void endVisit(DB2CreateTableStatement x) { - } protected void printOperator(SQLBinaryOperator operator) { if (operator == SQLBinaryOperator.Concat) { print0(ucase ? "CONCAT" : "concat"); } else { - print0(ucase ? operator.name : operator.name_lcase); + print0(ucase ? operator.name : operator.nameLCase); } } @@ -163,7 +158,7 @@ public boolean visit(SQLIntervalExpr x) { SQLIntervalUnit unit = x.getUnit(); if (unit != null) { print(' '); - print0(ucase ? unit.name : unit.name_lcase); + print0(ucase ? unit.name : unit.nameLCase); print(ucase ? 'S' : 's'); } return false; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java index d3aecb0079..21105b4ad5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java @@ -27,11 +27,11 @@ public class DB2SchemaStatVisitor extends SchemaStatVisitor implements DB2ASTVisitor { public DB2SchemaStatVisitor() { - super (DbType.db2); + super(DbType.db2); } public DB2SchemaStatVisitor(SchemaRepository repository) { - super (repository); + super(repository); } @Override @@ -56,12 +56,11 @@ public boolean visit(DB2CreateTableStatement x) { @Override public void endVisit(DB2CreateTableStatement x) { - } protected boolean isPseudoColumn(long hash64) { return hash64 == DB2Object.Constants.CURRENT_DATE - || hash64 == DB2Object.Constants.CURRENT_DATE2 + || hash64 == DB2Object.Constants.CURRENT_DATE2 || hash64 == DB2Object.Constants.CURRENT_TIME || hash64 == DB2Object.Constants.CURRENT_SCHEMA; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2ExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2ExprParser.java index 92d0ef7c79..52bbc58331 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2ExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2ExprParser.java @@ -28,12 +28,12 @@ import java.util.Arrays; public class H2ExprParser extends SQLExprParser { - private final static String[] AGGREGATE_FUNCTIONS; - private final static long[] AGGREGATE_FUNCTIONS_CODES; + private static final String[] AGGREGATE_FUNCTIONS; + private static final long[] AGGREGATE_FUNCTIONS_CODES; static { - String[] strings = { "AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", - "ROWNUMBER" }; + String[] strings = {"AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", + "ROWNUMBER"}; AGGREGATE_FUNCTIONS_CODES = FnvHash.fnv1a_64_lower(strings, true); AGGREGATE_FUNCTIONS = new String[AGGREGATE_FUNCTIONS_CODES.length]; for (String str : strings) { @@ -43,17 +43,17 @@ public class H2ExprParser extends SQLExprParser { } } - public H2ExprParser(String sql){ + public H2ExprParser(String sql) { this(new H2Lexer(sql)); this.lexer.nextToken(); } - public H2ExprParser(String sql, SQLParserFeature... features){ + public H2ExprParser(String sql, SQLParserFeature... features) { this(new H2Lexer(sql, features)); this.lexer.nextToken(); } - public H2ExprParser(Lexer lexer){ + public H2ExprParser(Lexer lexer) { super(lexer); dbType = lexer.getDbType(); this.aggregateFunctions = AGGREGATE_FUNCTIONS; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java index 48af73bce6..206ff97039 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java @@ -25,7 +25,7 @@ import java.util.Map; public class H2Lexer extends Lexer { - public final static Keywords DEFAULT_H2_KEYWORDS; + public static final Keywords DEFAULT_H2_KEYWORDS; static { Map map = new HashMap(); @@ -45,12 +45,12 @@ public class H2Lexer extends Lexer { DEFAULT_H2_KEYWORDS = new Keywords(map); } - public H2Lexer(String input){ + public H2Lexer(String input) { super(input, null, DbType.h2); super.keywords = DEFAULT_H2_KEYWORDS; } - public H2Lexer(String input, SQLParserFeature... features){ + public H2Lexer(String input, SQLParserFeature... features) { super(input, null, DbType.h2); super.keywords = DEFAULT_H2_KEYWORDS; for (SQLParserFeature feature : features) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2SelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2SelectParser.java index 886b58d338..c2b6158b08 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2SelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2SelectParser.java @@ -20,16 +20,15 @@ import com.alibaba.druid.sql.parser.SQLSelectParser; public class H2SelectParser extends SQLSelectParser { - - public H2SelectParser(SQLExprParser exprParser){ + public H2SelectParser(SQLExprParser exprParser) { super(exprParser); } - public H2SelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache){ + public H2SelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache) { super(exprParser, selectListCache); } - public H2SelectParser(String sql){ + public H2SelectParser(String sql) { this(new H2ExprParser(sql)); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2StatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2StatementParser.java index acc60023fb..51c33176a3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2StatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2StatementParser.java @@ -30,14 +30,14 @@ public class H2StatementParser extends SQLStatementParser { public H2StatementParser(String sql) { - super (new H2ExprParser(sql)); + super(new H2ExprParser(sql)); } public H2StatementParser(String sql, SQLParserFeature... features) { - super (new H2ExprParser(sql, features)); + super(new H2ExprParser(sql, features)); } - public H2StatementParser(Lexer lexer){ + public H2StatementParser(Lexer lexer) { super(new H2ExprParser(lexer)); } @@ -65,7 +65,7 @@ public SQLStatement parseMerge() { if (lexer.token() == Token.VALUES || lexer.identifierEquals("VALUE")) { lexer.nextToken(); - parseValueClause(stmt.getValuesList(), null,0, stmt); + parseValueClause(stmt.getValuesList(), null, 0, stmt); } else if (lexer.token() == Token.SELECT) { SQLQueryExpr queryExpr = (SQLQueryExpr) this.exprParser.expr(); stmt.setQuery(queryExpr); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2EvalVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2EvalVisitor.java index 9e25fc1915..c4c4f0efcb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2EvalVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2EvalVisitor.java @@ -26,18 +26,18 @@ import java.util.Map; public class H2EvalVisitor extends H2ASTVisitorAdapter implements SQLEvalVisitor { - private Map functions = new HashMap(); - private List parameters = new ArrayList(); + private Map functions = new HashMap(); + private List parameters = new ArrayList(); - private int variantIndex = -1; + private int variantIndex = -1; - private boolean markVariantIndex = true; + private boolean markVariantIndex = true; - public H2EvalVisitor(){ + public H2EvalVisitor() { this(new ArrayList(1)); } - public H2EvalVisitor(List parameters){ + public H2EvalVisitor(List parameters) { this.parameters = parameters; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitor.java index 9bcb621d40..37989883fb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitor.java @@ -16,15 +16,15 @@ package com.alibaba.druid.sql.dialect.h2.visitor; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.expr.SQLQueryExpr; -import com.alibaba.druid.sql.ast.statement.*; +import com.alibaba.druid.sql.ast.statement.SQLCreateDatabaseStatement; +import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement; +import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; +import com.alibaba.druid.sql.ast.statement.SQLReplaceStatement; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import java.util.List; -import java.util.Map; public class H2OutputVisitor extends SQLASTOutputVisitor implements H2ASTVisitor { public H2OutputVisitor(Appendable appender) { @@ -86,7 +86,6 @@ public boolean visit(SQLReplaceStatement x) { @Override public boolean visit(SQLCreateDatabaseStatement x) { - /* https://h2database.com/html/commands.html#create_schema CREATE SCHEMA [ IF NOT EXISTS ] @@ -106,7 +105,6 @@ public boolean visit(SQLCreateDatabaseStatement x) { @Override public boolean visit(SQLCreateIndexStatement x) { - /* h2 CREATE INDEX BNF: https://h2database.com/html/commands.html#create_index CREATE [ UNIQUE | SPATIAL ] INDEX [ [ IF NOT EXISTS ] [schemaName.]indexName ] @@ -117,7 +115,7 @@ public boolean visit(SQLCreateIndexStatement x) { printUcase("CREATE "); String type = x.getType(); - if ( "UNIQUE".equalsIgnoreCase(type) || "SPATIAL".equalsIgnoreCase(type) ) { + if ("UNIQUE".equalsIgnoreCase(type) || "SPATIAL".equalsIgnoreCase(type)) { printUcase(type + ' '); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2SchemaStatVisitor.java index 4371d45f2a..a4ab64bcd1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2SchemaStatVisitor.java @@ -20,10 +20,9 @@ public class H2SchemaStatVisitor extends SchemaStatVisitor implements H2ASTVisitor { public H2SchemaStatVisitor() { - } public H2SchemaStatVisitor(SchemaRepository repository) { - super (repository); + super(repository); } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/ast/HiveInputOutputFormat.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/ast/HiveInputOutputFormat.java index 6bcf9c2f8d..4f26c3719f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/ast/HiveInputOutputFormat.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/ast/HiveInputOutputFormat.java @@ -2,7 +2,6 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.dialect.hive.visitor.HiveASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class HiveInputOutputFormat extends SQLExprImpl { @@ -11,12 +10,18 @@ public class HiveInputOutputFormat extends SQLExprImpl { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } HiveInputOutputFormat that = (HiveInputOutputFormat) o; - if (input != null ? !input.equals(that.input) : that.input != null) return false; + if (input != null ? !input.equals(that.input) : that.input != null) { + return false; + } return output != null ? output.equals(that.output) : that.output == null; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/ast/HiveInsertStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/ast/HiveInsertStatement.java index 06d40d7a60..8f244129c3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/ast/HiveInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/ast/HiveInsertStatement.java @@ -13,7 +13,7 @@ import java.util.List; public class HiveInsertStatement extends SQLInsertStatement implements SQLStatement { - private boolean ifNotExists = false; + private boolean ifNotExists; public HiveInsertStatement() { dbType = DbType.hive; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/ast/HiveMultiInsertStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/ast/HiveMultiInsertStatement.java index 9d1a587dda..274a97cc36 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/ast/HiveMultiInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/ast/HiveMultiInsertStatement.java @@ -29,10 +29,10 @@ public class HiveMultiInsertStatement extends SQLStatementImpl { protected SQLWithSubqueryClause with; private SQLTableSource from; - private List items = new ArrayList(); - + private List items = new ArrayList(); + public HiveMultiInsertStatement() { - super (DbType.hive); + super(DbType.hive); } public void setFrom(SQLTableSource x) { @@ -50,7 +50,7 @@ public SQLTableSource getFrom() { public List getItems() { return items; } - + public void addItem(HiveInsert item) { if (item != null) { item.setParent(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java index 32176f5697..603c722c9b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveCreateTableParser.java @@ -84,7 +84,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { constraint.setParent(stmt); stmt.getTableElementList().add((SQLTableElement) constraint); } else if (token == Token.TABLESPACE) { - throw new ParserException("TODO " + lexer.info()); + throw new ParserException("TODO " + lexer.info()); } else { SQLColumnDefinition column = this.exprParser.parseColumn(); stmt.getTableElementList().add(column); @@ -151,7 +151,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { accept(Token.BY); accept(Token.LPAREN); - for (;;) { + for (; ; ) { if (lexer.token() != Token.IDENTIFIER) { throw new ParserException("expect identifier. " + lexer.info()); } @@ -200,7 +200,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { accept(Token.RPAREN); accept(Token.ON); accept(Token.LPAREN); - for (;;) { + for (; ; ) { if (lexer.token() == Token.LPAREN) { SQLListExpr list = new SQLListExpr(); lexer.nextToken(); @@ -298,7 +298,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { if (lexer.token() == Token.LIKE) { lexer.nextToken(); Lexer.SavePoint mark = lexer.mark(); - if(lexer.token() == Token.SELECT) { + if (lexer.token() == Token.SELECT) { stmt.setLikeQuery(true); SQLSelect select = this.createSQLSelectParser().select(); stmt.setSelect(select); @@ -341,7 +341,7 @@ private void parseTblProperties(HiveCreateTableStatement stmt) { lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { String name = lexer.stringVal(); lexer.nextToken(); if (lexer.token() == Token.DOT) { @@ -408,7 +408,7 @@ private void parseRowFormat(HiveCreateTableStatement stmt) { accept(Token.LPAREN); - for (;;) { + for (; ; ) { String name = lexer.stringVal(); lexer.nextToken(); accept(Token.EQ); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveExprParser.java index e9fce1c200..486f95d024 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveExprParser.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.*; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; -import com.alibaba.druid.sql.ast.statement.SQLExternalRecordFormat; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlOutFileExpr; import com.alibaba.druid.sql.parser.*; import com.alibaba.druid.util.FnvHash; @@ -28,12 +27,12 @@ import java.util.Arrays; public class HiveExprParser extends SQLExprParser { - private final static String[] AGGREGATE_FUNCTIONS; - private final static long[] AGGREGATE_FUNCTIONS_CODES; + private static final String[] AGGREGATE_FUNCTIONS; + private static final long[] AGGREGATE_FUNCTIONS_CODES; static { - String[] strings = { "AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", - "ROWNUMBER" }; + String[] strings = {"AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", + "ROWNUMBER"}; AGGREGATE_FUNCTIONS_CODES = FnvHash.fnv1a_64_lower(strings, true); AGGREGATE_FUNCTIONS = new String[AGGREGATE_FUNCTIONS_CODES.length]; @@ -44,17 +43,17 @@ public class HiveExprParser extends SQLExprParser { } } - public HiveExprParser(String sql){ + public HiveExprParser(String sql) { this(new HiveLexer(sql)); this.lexer.nextToken(); } - public HiveExprParser(String sql, SQLParserFeature... features){ + public HiveExprParser(String sql, SQLParserFeature... features) { this(new HiveLexer(sql, features)); this.lexer.nextToken(); } - public HiveExprParser(Lexer lexer){ + public HiveExprParser(Lexer lexer) { super(lexer); this.aggregateFunctions = AGGREGATE_FUNCTIONS; this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; @@ -104,7 +103,7 @@ public SQLExpr primary() { final Token tok = lexer.token(); switch (tok) { case IDENTIFIER: - final long hash_lower = lexer.hash_lower(); + final long hash_lower = lexer.hashLCase(); if (hash_lower == FnvHash.Constants.OUTLINE) { lexer.nextToken(); SQLExpr file = primary(); @@ -147,8 +146,6 @@ public SQLExpr primary() { return super.primary(); } - - protected SQLExpr parseAliasExpr(String alias) { String chars = alias.substring(1, alias.length() - 1); @@ -202,7 +199,6 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { this.parseAssignItem(column.getColProperties(), column); } - return super.parseColumnRest(column); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveLexer.java index 7e15ac9209..440d99495b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveLexer.java @@ -16,15 +16,16 @@ package com.alibaba.druid.sql.dialect.hive.parser; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.parser.*; +import com.alibaba.druid.sql.parser.Keywords; +import com.alibaba.druid.sql.parser.Lexer; +import com.alibaba.druid.sql.parser.SQLParserFeature; +import com.alibaba.druid.sql.parser.Token; import java.util.HashMap; import java.util.Map; -import static com.alibaba.druid.sql.parser.LayoutCharacters.EOI; - public class HiveLexer extends Lexer { - public final static Keywords DEFAULT_HIVE_KEYWORDS; + public static final Keywords DEFAULT_HIVE_KEYWORDS; static { Map map = new HashMap(); @@ -54,7 +55,7 @@ public class HiveLexer extends Lexer { DEFAULT_HIVE_KEYWORDS = new Keywords(map); } - public HiveLexer(String input){ + public HiveLexer(String input) { super(input); this.skipComment = true; this.keepComments = true; @@ -63,7 +64,7 @@ public HiveLexer(String input){ super.keywords = DEFAULT_HIVE_KEYWORDS; } - public HiveLexer(String input, SQLParserFeature... features){ + public HiveLexer(String input, SQLParserFeature... features) { super(input); dbType = DbType.hive; this.skipComment = true; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveSelectParser.java index 8a9d209ec1..a316c38dad 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveSelectParser.java @@ -15,26 +15,21 @@ */ package com.alibaba.druid.sql.dialect.hive.parser; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLOrderBy; -import com.alibaba.druid.sql.ast.SQLOrderingSpecification; -import com.alibaba.druid.sql.ast.expr.SQLSizeExpr; -import com.alibaba.druid.sql.ast.statement.*; -import com.alibaba.druid.sql.dialect.odps.ast.OdpsSelectQueryBlock; -import com.alibaba.druid.sql.parser.*; -import com.alibaba.druid.util.FnvHash; +import com.alibaba.druid.sql.ast.statement.SQLTableSource; +import com.alibaba.druid.sql.parser.SQLExprParser; +import com.alibaba.druid.sql.parser.SQLSelectListCache; +import com.alibaba.druid.sql.parser.SQLSelectParser; public class HiveSelectParser extends SQLSelectParser { - - public HiveSelectParser(SQLExprParser exprParser){ + public HiveSelectParser(SQLExprParser exprParser) { super(exprParser); } - public HiveSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache){ + public HiveSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache) { super(exprParser, selectListCache); } - public HiveSelectParser(String sql){ + public HiveSelectParser(String sql) { this(new HiveExprParser(sql)); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveStatementParser.java index f175150da7..b1cbda5253 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveStatementParser.java @@ -31,15 +31,16 @@ public class HiveStatementParser extends SQLStatementParser { { dbType = DbType.hive; } + public HiveStatementParser(String sql) { - super (new HiveExprParser(sql)); + super(new HiveExprParser(sql)); } public HiveStatementParser(String sql, SQLParserFeature... features) { - super (new HiveExprParser(sql, features)); + super(new HiveExprParser(sql, features)); } - public HiveStatementParser(Lexer lexer){ + public HiveStatementParser(Lexer lexer) { super(new HiveExprParser(lexer)); } @@ -94,7 +95,7 @@ public SQLStatement parseInsert() { stmt.setFrom(from); } - for (;;) { + for (; ; ) { HiveInsert insert = parseHiveInsert(); stmt.addItem(insert); @@ -367,7 +368,7 @@ public SQLCreateTableStatement parseCreateTable() { } public SQLCreateFunctionStatement parseCreateFunction() { - return parseHiveCreateFunction(); + return parseHiveCreateFunction(); } public SQLCreateIndexStatement parseCreateIndex(boolean acceptCreate) { @@ -390,7 +391,7 @@ public SQLCreateIndexStatement parseCreateIndex(boolean acceptCreate) { accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLSelectOrderByItem item = this.exprParser.parseSelectOrderByItem(); item.setParent(stmt); stmt.addItem(item); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveCreateFunctionStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveCreateFunctionStatement.java index b1352640d7..60bd945360 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveCreateFunctionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveCreateFunctionStatement.java @@ -7,7 +7,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class HiveCreateFunctionStatement extends SQLCreateFunctionStatement implements SQLCreateStatement { - protected boolean declare = false; + protected boolean declare; protected SQLExpr className; protected SQLExpr location; protected SQLExpr symbol; @@ -15,7 +15,6 @@ public class HiveCreateFunctionStatement extends SQLCreateFunctionStatement impl protected String code; public HiveCreateFunctionStatement() { - } public void accept0(SQLASTVisitor visitor) { @@ -69,13 +68,11 @@ public void setSymbol(SQLExpr x) { this.symbol = x; } - public ResourceType getResourceType() - { + public ResourceType getResourceType() { return resourceType; } - public void setResourceType(ResourceType resourceType) - { + public void setResourceType(ResourceType resourceType) { this.resourceType = resourceType; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveCreateTableStatement.java index bbeb9e5a7f..4b79a2d051 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveCreateTableStatement.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; -import com.alibaba.druid.sql.dialect.hive.visitor.HiveASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; @@ -29,16 +28,16 @@ import java.util.Map; public class HiveCreateTableStatement extends SQLCreateTableStatement { - protected List skewedBy = new ArrayList(); - protected List skewedByOn = new ArrayList(); + protected List skewedBy = new ArrayList(); + protected List skewedByOn = new ArrayList(); protected Map serdeProperties = new LinkedHashMap(); - protected SQLExpr metaLifeCycle; + protected SQLExpr metaLifeCycle; - protected boolean likeQuery = false; // for DLA + protected boolean likeQuery; // for DLA - protected List mappedBy = new ArrayList(1); - protected SQLExpr intoBuckets; - protected SQLExpr using; + protected List mappedBy = new ArrayList(1); + protected SQLExpr intoBuckets; + protected SQLExpr using; public HiveCreateTableStatement() { this.dbType = DbType.hive; @@ -67,7 +66,6 @@ protected void acceptChild(SQLASTVisitor v) { acceptChild(v, intoBuckets); } - public void cloneTo(HiveCreateTableStatement x) { super.cloneTo(x); for (SQLExpr item : skewedBy) { @@ -155,13 +153,11 @@ public List getMappedBy() { return mappedBy; } - public SQLExpr getIntoBuckets() - { + public SQLExpr getIntoBuckets() { return intoBuckets; } - public void setIntoBuckets(SQLExpr intoBuckets) - { + public void setIntoBuckets(SQLExpr intoBuckets) { this.intoBuckets = intoBuckets; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveLoadDataStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveLoadDataStatement.java index ba199f6220..3c275e5df0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveLoadDataStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveLoadDataStatement.java @@ -21,7 +21,7 @@ public class HiveLoadDataStatement extends SQLStatementImpl { private boolean overwrite; private SQLExprTableSource into; - private final List partition = new ArrayList(4); + private final List partition = new ArrayList(4); private SQLExternalRecordFormat format; private SQLExpr storedBy; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveMsckRepairStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveMsckRepairStatement.java index edd6794dd8..e7cb2bacf0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveMsckRepairStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/stmt/HiveMsckRepairStatement.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.ast.statement.SQLAlterStatement; -import com.alibaba.druid.sql.ast.statement.SQLAssignItem; import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.dialect.hive.visitor.HiveASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveASTVisitorAdapter.java index 36b9ac6ca8..619393d6cb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveASTVisitorAdapter.java @@ -15,16 +15,7 @@ */ package com.alibaba.druid.sql.dialect.hive.visitor; -import com.alibaba.druid.sql.dialect.hive.ast.HiveInputOutputFormat; -import com.alibaba.druid.sql.dialect.hive.ast.HiveInsert; -import com.alibaba.druid.sql.dialect.hive.ast.HiveInsertStatement; -import com.alibaba.druid.sql.dialect.hive.ast.HiveMultiInsertStatement; -import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateFunctionStatement; -import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateTableStatement; -import com.alibaba.druid.sql.dialect.hive.stmt.HiveLoadDataStatement; -import com.alibaba.druid.sql.dialect.hive.stmt.HiveMsckRepairStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; public class HiveASTVisitorAdapter extends SQLASTVisitorAdapter implements HiveASTVisitor { - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveOutputVisitor.java index 65e0b387b1..e7812ba4ef 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveOutputVisitor.java @@ -16,7 +16,9 @@ package com.alibaba.druid.sql.dialect.hive.visitor; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.SQLCommentHint; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.ast.statement.*; @@ -102,7 +104,6 @@ public boolean visit(HiveInsert x) { printAndAccept(valuesList, ", "); } - return false; } @@ -209,7 +210,6 @@ public boolean visit(HiveInsertStatement x) { printAndAccept(valuesList, ", "); } - return false; } @@ -217,7 +217,6 @@ public boolean visit(SQLMergeStatement.MergeUpdateClause x) { print0(ucase ? "WHEN MATCHED " : "when matched "); this.indentCount++; - SQLExpr where = x.getWhere(); if (where != null) { this.indentCount++; @@ -326,7 +325,8 @@ public boolean visit(HiveLoadDataStatement x) { return false; } - @Override public boolean visit(HiveMsckRepairStatement x) { + @Override + public boolean visit(HiveMsckRepairStatement x) { final List headHints = x.getHeadHintsDirect(); if (headHints != null) { for (SQLCommentHint hint : headHints) { @@ -391,7 +391,6 @@ public boolean visit(SQLCreateIndexStatement x) { print0(type); } - if (x.isDeferedRebuild()) { print0(ucase ? " WITH DEFERRED REBUILD" : " with deferred rebuild"); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveSchemaStatVisitor.java index db2a931f96..3260df184b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/visitor/HiveSchemaStatVisitor.java @@ -20,15 +20,12 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; -import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.ast.statement.SQLWithSubqueryClause; -import com.alibaba.druid.sql.dialect.hive.ast.HiveInputOutputFormat; import com.alibaba.druid.sql.dialect.hive.ast.HiveInsert; import com.alibaba.druid.sql.dialect.hive.ast.HiveInsertStatement; import com.alibaba.druid.sql.dialect.hive.ast.HiveMultiInsertStatement; import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateFunctionStatement; -import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateTableStatement; import com.alibaba.druid.sql.dialect.hive.stmt.HiveLoadDataStatement; import com.alibaba.druid.sql.dialect.hive.stmt.HiveMsckRepairStatement; import com.alibaba.druid.sql.repository.SchemaRepository; @@ -38,7 +35,6 @@ import java.util.List; public class HiveSchemaStatVisitor extends SchemaStatVisitor implements HiveASTVisitor { - public HiveSchemaStatVisitor() { super(DbType.hive); } @@ -48,7 +44,7 @@ public HiveSchemaStatVisitor(DbType dbType) { } public HiveSchemaStatVisitor(SchemaRepository repository) { - super (repository); + super(repository); } @Override @@ -73,7 +69,6 @@ public boolean visit(HiveInsert x) { return false; } - @Override public boolean visit(HiveMultiInsertStatement x) { if (repository != null @@ -135,7 +130,8 @@ public boolean visit(HiveLoadDataStatement x) { return false; } - @Override public boolean visit(HiveMsckRepairStatement x) { + @Override + public boolean visit(HiveMsckRepairStatement x) { return false; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/AnalyzerIndexType.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/AnalyzerIndexType.java index da0e77c22a..edf928838f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/AnalyzerIndexType.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/AnalyzerIndexType.java @@ -1,5 +1,5 @@ package com.alibaba.druid.sql.dialect.mysql.ast; public enum AnalyzerIndexType { - INDEX, QUERY -} \ No newline at end of file + INDEX, QUERY +} 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 8a1869f2a6..25fde4be55 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,7 +19,6 @@ public class MySqlForceIndexHint extends MySqlIndexHintImpl { public MySqlForceIndexHint() { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlHint.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlHint.java index 376d99adac..afce367c5a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlHint.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlHint.java @@ -17,7 +17,5 @@ import com.alibaba.druid.sql.ast.SQLHint; - public interface MySqlHint extends SQLHint, MySqlObject { - } 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 6e77afbce5..81d4c665be 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlIgnoreIndexHint extends MySqlIndexHintImpl { - @Override public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlIndexHint.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlIndexHint.java index 39a4c25a0d..fe53d91403 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlIndexHint.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlIndexHint.java @@ -19,15 +19,14 @@ public interface MySqlIndexHint extends MySqlHint { public static enum Option { JOIN("JOIN"), ORDER_BY("ORDER BY"), - GROUP_BY("GROUP BY") - ; - + GROUP_BY("GROUP BY"); + public final String name; - public final String name_lcase; - + public final String nameLCase; + Option(String name) { this.name = name; - this.name_lcase = name.toLowerCase(); + this.nameLCase = name.toLowerCase(); } } } 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 1ac3c40961..34d628652a 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 @@ -22,10 +22,9 @@ import java.util.List; public abstract class MySqlIndexHintImpl extends MySqlObjectImpl implements MySqlIndexHint { - private 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 3d10b9c0a9..928cbf151d 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 @@ -16,8 +16,8 @@ package com.alibaba.druid.sql.dialect.mysql.ast; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLIndex; import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLIndex; import com.alibaba.druid.sql.ast.statement.SQLTableConstraint; import com.alibaba.druid.sql.ast.statement.SQLUnique; import com.alibaba.druid.sql.ast.statement.SQLUniqueConstraint; @@ -26,8 +26,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlKey extends SQLUnique implements SQLUniqueConstraint, SQLTableConstraint, SQLIndex { - - public MySqlKey(){ + public MySqlKey() { dbType = DbType.mysql; } @@ -35,7 +34,7 @@ public MySqlKey(){ protected void accept0(SQLASTVisitor visitor) { if (visitor instanceof MySqlASTVisitor) { accept0((MySqlASTVisitor) visitor); - } else if (visitor instanceof AdsVisitor) { + } else if (visitor instanceof AdsVisitor) { accept0((AdsVisitor) visitor); } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlObject.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlObject.java index 527332c979..e9aef4f80c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlObject.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlObject.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; - public interface MySqlObject extends SQLObject { void accept0(MySqlASTVisitor v); } 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 bbbbd815a5..16d0963952 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 @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class MySqlObjectImpl extends SQLObjectImpl implements MySqlObject { - @Override protected void accept0(SQLASTVisitor v) { if (v 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 6df0bb51be..5cb84bc007 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 @@ -20,8 +20,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlPrimaryKey extends MySqlKey implements SQLPrimaryKey { - - public MySqlPrimaryKey(){ + public MySqlPrimaryKey() { dbType = DbType.mysql; } 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 fcb56c3964..257b72181b 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 @@ -16,13 +16,10 @@ package com.alibaba.druid.sql.dialect.mysql.ast; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLPartitionBy; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlUnique extends MySqlKey { - - public MySqlUnique(){ - + public MySqlUnique() { } protected void accept0(MySqlASTVisitor visitor) { 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 f1144ef033..6aa80aac08 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlUseIndexHint extends MySqlIndexHintImpl { - @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 af49978c3a..293c5305c9 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 @@ -25,9 +25,9 @@ * @author kiki */ public class MysqlForeignKey extends SQLForeignKeyImpl { - private SQLName indexName; - private boolean hasConstraint; - private Match referenceMatch; + private SQLName indexName; + private boolean hasConstraint; + private Match referenceMatch; protected Option onUpdate; protected Option onDelete; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/ConditionValue.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/ConditionValue.java index 070295a784..1ec547c64b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/ConditionValue.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/ConditionValue.java @@ -15,36 +15,38 @@ */ package com.alibaba.druid.sql.dialect.mysql.ast.clause; - /** - * * @author zhujun [455910092@qq.com] * 2016-04-16 */ public class ConditionValue { - // type for condition SQLSTATE | SELF | SYSTEM | mysql_error_code - private ConditionType type; - - //value for condition condition_name | sqlstate | SQLWARNING | NOT FOUND | SQLEXCEPTION | mysql_error_code - private String value; - public ConditionType getType() { - return type; - } - public void setType(ConditionType type) { - this.type = type; - } - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - - public enum ConditionType{ - SQLSTATE, - SELF, - SYSTEM, - MYSQL_ERROR_CODE - } - + // type for condition SQLSTATE | SELF | SYSTEM | mysql_error_code + private ConditionType type; + + //value for condition condition_name | sqlstate | SQLWARNING | NOT FOUND | SQLEXCEPTION | mysql_error_code + private String value; + + public ConditionType getType() { + return type; + } + + public void setType(ConditionType type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public enum ConditionType { + SQLSTATE, + SELF, + SYSTEM, + MYSQL_ERROR_CODE + } + } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlCaseStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlCaseStatement.java index 732cf57884..6d835393d6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlCaseStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlCaseStatement.java @@ -27,77 +27,73 @@ import java.util.List; /** - * * @author zz [455910092@qq.com] */ -public class MySqlCaseStatement extends MySqlStatementImpl{ - - //case expr - private SQLExpr condition; - //when statement list - private List whenList = new ArrayList(); - //else statement - private SQLIfStatement.Else elseItem; - - public SQLExpr getCondition() { - return condition; - } - - public void setCondition(SQLExpr condition) { - this.condition = condition; - } - - public List getWhenList() { - return whenList; - } - - public void setWhenList(List whenList) { - this.whenList = whenList; - } - - public void addWhenStatement(MySqlWhenStatement stmt) - { - this.whenList.add(stmt); - } - - public SQLIfStatement.Else getElseItem() { - return elseItem; - } - - public void setElseItem(SQLIfStatement.Else elseItem) { - this.elseItem = elseItem; - } - - @Override - public void accept0(MySqlASTVisitor visitor) { - if (visitor.visit(this)) { +public class MySqlCaseStatement extends MySqlStatementImpl { + //case expr + private SQLExpr condition; + //when statement list + private List whenList = new ArrayList(); + //else statement + private SQLIfStatement.Else elseItem; + + public SQLExpr getCondition() { + return condition; + } + + public void setCondition(SQLExpr condition) { + this.condition = condition; + } + + public List getWhenList() { + return whenList; + } + + public void setWhenList(List whenList) { + this.whenList = whenList; + } + + public void addWhenStatement(MySqlWhenStatement stmt) { + this.whenList.add(stmt); + } + + public SQLIfStatement.Else getElseItem() { + return elseItem; + } + + public void setElseItem(SQLIfStatement.Else elseItem) { + this.elseItem = elseItem; + } + + @Override + public void accept0(MySqlASTVisitor visitor) { + if (visitor.visit(this)) { acceptChild(visitor, condition); acceptChild(visitor, whenList); acceptChild(visitor, elseItem); } visitor.endVisit(this); - } - - @Override - public List getChildren() { - List children = new ArrayList(); - children.addAll(children); - children.addAll(whenList); - children.addAll(whenList); - if (elseItem != null) { - children.add(elseItem); - } - return children; - } - - /** - * case when statement - * @author zz - * - */ - public static class MySqlWhenStatement extends MySqlObjectImpl { - - private SQLExpr condition; + } + + @Override + public List getChildren() { + List children = new ArrayList(); + children.addAll(children); + children.addAll(whenList); + children.addAll(whenList); + if (elseItem != null) { + children.add(elseItem); + } + return children; + } + + /** + * case when statement + * + * @author zz + */ + public static class MySqlWhenStatement extends MySqlObjectImpl { + private SQLExpr condition; private List statements = new ArrayList(); @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlCursorDeclareStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlCursorDeclareStatement.java index d3be1982a2..cd52f493a5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlCursorDeclareStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlCursorDeclareStatement.java @@ -22,49 +22,47 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; /** - * * @author zz [455910092@qq.com] */ -public class MySqlCursorDeclareStatement extends MySqlStatementImpl{ - - //cursor name - private SQLName cursorName; - //select statement - private SQLSelect select; - - public SQLName getCursorName() { - return cursorName; - } - - public void setCursorName(SQLName cursorName) { - if (cursorName != null) { - cursorName.setParent(this); - } - this.cursorName = cursorName; - } +public class MySqlCursorDeclareStatement extends MySqlStatementImpl { + //cursor name + private SQLName cursorName; + //select statement + private SQLSelect select; - public void setCursorName(String cursorName) { - this.setCursorName(new SQLIdentifierExpr(cursorName)); - } + public SQLName getCursorName() { + return cursorName; + } - public SQLSelect getSelect() { - return select; - } + public void setCursorName(SQLName cursorName) { + if (cursorName != null) { + cursorName.setParent(this); + } + this.cursorName = cursorName; + } - public void setSelect(SQLSelect select) { - if (select != null) { - select.setParent(this); - } - this.select = select; - } + public void setCursorName(String cursorName) { + this.setCursorName(new SQLIdentifierExpr(cursorName)); + } - @Override - public void accept0(MySqlASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, select); - } - visitor.endVisit(this); - - } + public SQLSelect getSelect() { + return select; + } + + public void setSelect(SQLSelect select) { + if (select != null) { + select.setParent(this); + } + this.select = select; + } + + @Override + public void accept0(MySqlASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, select); + } + visitor.endVisit(this); + + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlDeclareConditionStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlDeclareConditionStatement.java index 82ee6c6e41..bf9ec92a38 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlDeclareConditionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlDeclareConditionStatement.java @@ -15,52 +15,38 @@ */ package com.alibaba.druid.sql.dialect.mysql.ast.clause; - import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlStatementImpl; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; /** - * * @author zhujun [455910092@qq.com] */ -public class MySqlDeclareConditionStatement extends MySqlStatementImpl{ - - /* - DECLARE condition_name CONDITION FOR condition_value - - condition_value: - SQLSTATE [VALUE] sqlstate_value - | mysql_error_code - */ - - //condition_name - private String conditionName; - //sp statement - private ConditionValue conditionValue; - - public String getConditionName() { - return conditionName; - } - - public void setConditionName(String conditionName) { - this.conditionName = conditionName; - } - - public ConditionValue getConditionValue() { - return conditionValue; - } - - public void setConditionValue(ConditionValue conditionValue) { - this.conditionValue = conditionValue; - } - - @Override - public void accept0(MySqlASTVisitor visitor) { - // TODO Auto-generated method stub - visitor.visit(this); - visitor.endVisit(this); - - } - +public class MySqlDeclareConditionStatement extends MySqlStatementImpl { + private String conditionName; + //sp statement + private ConditionValue conditionValue; + + public String getConditionName() { + return conditionName; + } + + public void setConditionName(String conditionName) { + this.conditionName = conditionName; + } + + public ConditionValue getConditionValue() { + return conditionValue; + } + + public void setConditionValue(ConditionValue conditionValue) { + this.conditionValue = conditionValue; + } + + @Override + public void accept0(MySqlASTVisitor visitor) { + // TODO Auto-generated method stub + visitor.visit(this); + visitor.endVisit(this); + + } } - diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlDeclareHandlerStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlDeclareHandlerStatement.java index 42dd5030c2..bdbb09b609 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlDeclareHandlerStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlDeclareHandlerStatement.java @@ -23,56 +23,52 @@ import java.util.List; /** - * * @author zhujun [455910092@qq.com] */ -public class MySqlDeclareHandlerStatement extends MySqlStatementImpl{ - - //DECLARE handler_type HANDLER FOR condition_value[,...] sp_statement - - //handler type - private MySqlHandlerType handleType; - //sp statement - private SQLStatement spStatement; - - private List conditionValues; - - - public MySqlDeclareHandlerStatement() { - conditionValues = new ArrayList(); - } +public class MySqlDeclareHandlerStatement extends MySqlStatementImpl { + //DECLARE handler_type HANDLER FOR condition_value[,...] sp_statement - public List getConditionValues() { - return conditionValues; - } + //handler type + private MySqlHandlerType handleType; + //sp statement + private SQLStatement spStatement; - public void setConditionValues(List conditionValues) { - this.conditionValues = conditionValues; - } + private List conditionValues; - public MySqlHandlerType getHandleType() { - return handleType; - } + public MySqlDeclareHandlerStatement() { + conditionValues = new ArrayList(); + } - public void setHandleType(MySqlHandlerType handleType) { - this.handleType = handleType; - } + public List getConditionValues() { + return conditionValues; + } - public SQLStatement getSpStatement() { - return spStatement; - } + public void setConditionValues(List conditionValues) { + this.conditionValues = conditionValues; + } - public void setSpStatement(SQLStatement spStatement) { - this.spStatement = spStatement; - } + public MySqlHandlerType getHandleType() { + return handleType; + } - @Override - public void accept0(MySqlASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, spStatement); - } - visitor.endVisit(this); - } + public void setHandleType(MySqlHandlerType handleType) { + this.handleType = handleType; + } -} + public SQLStatement getSpStatement() { + return spStatement; + } + + public void setSpStatement(SQLStatement spStatement) { + this.spStatement = spStatement; + } + @Override + public void accept0(MySqlASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, spStatement); + } + visitor.endVisit(this); + } + +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlDeclareStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlDeclareStatement.java index 99ceb82121..cb30af2bfa 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlDeclareStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlDeclareStatement.java @@ -26,7 +26,6 @@ * @author zz [455910092@qq.com] */ public class MySqlDeclareStatement extends MySqlStatementImpl { - private List varList = new ArrayList(); public List getVarList() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlExplainType.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlExplainType.java index 35355444d2..296d5e7251 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlExplainType.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlExplainType.java @@ -16,8 +16,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.clause; public enum MySqlExplainType { - - EXTENDED, - PARTITIONS, - FORMAT + EXTENDED, + PARTITIONS, + FORMAT } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlFormatName.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlFormatName.java index eb0f3fa3f4..d66f9b81c4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlFormatName.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlFormatName.java @@ -16,7 +16,6 @@ package com.alibaba.druid.sql.dialect.mysql.ast.clause; public enum MySqlFormatName { - - TRADITIONAL, - JSON + TRADITIONAL, + JSON } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlHandlerType.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlHandlerType.java index 2eaa697aa6..d333aab07f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlHandlerType.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlHandlerType.java @@ -16,13 +16,12 @@ package com.alibaba.druid.sql.dialect.mysql.ast.clause; /** - * * @author zhujun [zhujunxxxxx@163.com] */ public enum MySqlHandlerType { - //DECLARE处理程序handler_type + //DECLARE处理程序handler_type - CONTINUE, - EXIT, - UNDO + CONTINUE, + EXIT, + UNDO } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlIterateStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlIterateStatement.java index 168ea82fba..99aa4ce390 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlIterateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlIterateStatement.java @@ -19,25 +19,23 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; /** - * * @author zz [455910092@qq.com] */ public class MySqlIterateStatement extends MySqlStatementImpl { - - private String labelName; - - @Override + private String labelName; + + @Override public void accept0(MySqlASTVisitor visitor) { - visitor.visit(this); + visitor.visit(this); visitor.endVisit(this); } - public String getLabelName() { - return labelName; - } + public String getLabelName() { + return labelName; + } + + public void setLabelName(String labelName) { + this.labelName = labelName; + } - public void setLabelName(String labelName) { - this.labelName = labelName; - } - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlLeaveStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlLeaveStatement.java index 6586504e1c..8322df1e59 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlLeaveStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlLeaveStatement.java @@ -23,38 +23,35 @@ import java.util.List; /** - * * @author zz [455910092@qq.com] */ public class MySqlLeaveStatement extends MySqlStatementImpl { - - private String labelName; + private String labelName; - public MySqlLeaveStatement() { - - } + public MySqlLeaveStatement() { + } - public MySqlLeaveStatement(String labelName) { - this.labelName = labelName; - } + public MySqlLeaveStatement(String labelName) { + this.labelName = labelName; + } - @Override + @Override public void accept0(MySqlASTVisitor visitor) { - visitor.visit(this); + visitor.visit(this); visitor.endVisit(this); } - public String getLabelName() { - return labelName; - } + public String getLabelName() { + return labelName; + } - public void setLabelName(String labelName) { - this.labelName = labelName; - } + public void setLabelName(String labelName) { + this.labelName = labelName; + } + + @Override + public List getChildren() { + return Collections.emptyList(); + } - @Override - public List getChildren() { - return Collections.emptyList(); - } - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlRepeatStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlRepeatStatement.java index 8c255d355f..ab16995ca5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlRepeatStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlRepeatStatement.java @@ -24,18 +24,16 @@ import java.util.List; /** - * * @author zz [455910092@qq.com] */ public class MySqlRepeatStatement extends MySqlStatementImpl { - - private String labelName; + private String labelName; - private List statements = new ArrayList(); - - private SQLExpr condition; - - @Override + private List statements = new ArrayList(); + + private SQLExpr condition; + + @Override public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, statements); @@ -52,19 +50,19 @@ public void setStatements(List statements) { this.statements = statements; } - public String getLabelName() { - return labelName; - } + public String getLabelName() { + return labelName; + } - public void setLabelName(String labelName) { - this.labelName = labelName; - } - - public SQLExpr getCondition() { - return condition; - } + public void setLabelName(String labelName) { + this.labelName = labelName; + } - public void setCondition(SQLExpr condition) { - this.condition = condition; - } + public SQLExpr getCondition() { + return condition; + } + + public void setCondition(SQLExpr condition) { + this.condition = condition; + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlSelectIntoStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlSelectIntoStatement.java index 2bd46b92ed..c475280eee 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlSelectIntoStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlSelectIntoStatement.java @@ -24,41 +24,37 @@ import java.util.List; /** - * * @author zz [455910092@qq.com] */ -public class MySqlSelectIntoStatement extends MySqlStatementImpl{ - - //select statement - private SQLSelect select; - //var list - private List varList=new ArrayList(); - - public SQLSelect getSelect() { - return select; - } - - public void setSelect(SQLSelect select) { - this.select = select; - } - - public List getVarList() { - return varList; - } - - public void setVarList(List varList) { - this.varList = varList; - } - - - - @Override - public void accept0(MySqlASTVisitor visitor) { - if (visitor.visit(this)) { +public class MySqlSelectIntoStatement extends MySqlStatementImpl { + //select statement + private SQLSelect select; + //var list + private List varList = new ArrayList(); + + public SQLSelect getSelect() { + return select; + } + + public void setSelect(SQLSelect select) { + this.select = select; + } + + public List getVarList() { + return varList; + } + + public void setVarList(List varList) { + this.varList = varList; + } + + @Override + public void accept0(MySqlASTVisitor visitor) { + if (visitor.visit(this)) { acceptChild(visitor, select); acceptChild(visitor, varList); } visitor.endVisit(this); - } + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlStatementType.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlStatementType.java index 46e9a84dcc..db3a2c8630 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlStatementType.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/clause/MySqlStatementType.java @@ -22,54 +22,50 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; /** - * * @author zz [455910092@qq.com] */ public enum MySqlStatementType { - //select statement - SELECT(SQLSelectStatement.class.getName()), - //update statement - UPDATE(MySqlUpdateStatement.class.getName()), - //insert statement - INSERT(MySqlInsertStatement.class.getName()), - //delete statement - DELETE(MySqlDeleteStatement.class.getName()), - //while statement - WHILE(SQLWhileStatement.class.getName()), - //begin-end - IF(SQLIfStatement.class.getName()), - //begin-end - LOOP(SQLLoopStatement.class.getName()), - //begin-end - BLOCK(SQLBlockStatement.class.getName()), - //declare statement - DECLARE(MySqlDeclareStatement.class.getName()), - //select into - SELECTINTO(MySqlSelectIntoStatement.class.getName()), - //case - CASE(MySqlCaseStatement.class.getName()), - - UNDEFINED, - ; - - - - public final String name; + //select statement + SELECT(SQLSelectStatement.class.getName()), + //update statement + UPDATE(MySqlUpdateStatement.class.getName()), + //insert statement + INSERT(MySqlInsertStatement.class.getName()), + //delete statement + DELETE(MySqlDeleteStatement.class.getName()), + //while statement + WHILE(SQLWhileStatement.class.getName()), + //begin-end + IF(SQLIfStatement.class.getName()), + //begin-end + LOOP(SQLLoopStatement.class.getName()), + //begin-end + BLOCK(SQLBlockStatement.class.getName()), + //declare statement + DECLARE(MySqlDeclareStatement.class.getName()), + //select into + SELECTINTO(MySqlSelectIntoStatement.class.getName()), + //case + CASE(MySqlCaseStatement.class.getName()), - MySqlStatementType(){ + UNDEFINED; + + public final String name; + + MySqlStatementType() { this(null); } - MySqlStatementType(String name){ + MySqlStatementType(String name) { this.name = name; } - public static MySqlStatementType getType(SQLStatement stmt) - { - for (MySqlStatementType type : MySqlStatementType.values()) { - if (type.name == stmt.getClass().getName()) { - return type; - } - } - return UNDEFINED; - } + + public static MySqlStatementType getType(SQLStatement stmt) { + for (MySqlStatementType type : MySqlStatementType.values()) { + if (type.name == stmt.getClass().getName()) { + return type; + } + } + return UNDEFINED; + } } 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 3328e65060..192b0a40c7 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 @@ -28,20 +28,19 @@ public class MySqlCharExpr extends SQLCharExpr implements MySqlExpr { private String type; - public MySqlCharExpr(){ - + public MySqlCharExpr() { } - public MySqlCharExpr(String text){ + public MySqlCharExpr(String text) { super(text); } - public MySqlCharExpr(String text, String charset){ + public MySqlCharExpr(String text, String charset) { super(text); this.charset = charset; } - public MySqlCharExpr(String text, String charset, String collate){ + public MySqlCharExpr(String text, String charset, String collate) { super(text); this.charset = charset; this.collate = collate; @@ -104,14 +103,13 @@ public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); visitor.endVisit(this); } - + public String toString() { StringBuffer buf = new StringBuffer(); output(buf); return buf.toString(); } - public MySqlCharExpr clone() { MySqlCharExpr x = new MySqlCharExpr(text); x.collate = collate; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlExpr.java index 5b3cfee96d..061f8e807a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlExpr.java @@ -18,5 +18,4 @@ import com.alibaba.druid.sql.ast.SQLExpr; public interface MySqlExpr extends SQLExpr { - } 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 6ccf9e4e45..d8c41a8244 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,7 +20,8 @@ import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl; public abstract class MySqlExprImpl extends MySqlObjectImpl implements SQLExpr { - protected SQLCommentHint hint; + protected SQLCommentHint hint; + public SQLExpr clone() { throw new UnsupportedOperationException(); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlJSONTableExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlJSONTableExpr.java index 29e78f5042..ea9dbee8ca 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlJSONTableExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlJSONTableExpr.java @@ -1,6 +1,9 @@ package com.alibaba.druid.sql.dialect.mysql.ast.expr; -import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.SQLDataType; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlOrderingExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlOrderingExpr.java index 1340047d43..c06a23e64a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlOrderingExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlOrderingExpr.java @@ -26,15 +26,13 @@ import java.util.List; public class MySqlOrderingExpr extends SQLExprImpl implements MySqlExpr, SQLReplaceable { - - protected SQLExpr expr; + protected SQLExpr expr; protected SQLOrderingSpecification type; - + public MySqlOrderingExpr() { - } - - public MySqlOrderingExpr(SQLExpr expr, SQLOrderingSpecification type){ + + public MySqlOrderingExpr(SQLExpr expr, SQLOrderingSpecification type) { super(); setExpr(expr); this.type = type; 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 a22fe0c379..ce372593a1 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 @@ -24,24 +24,23 @@ import java.util.List; public class MySqlOutFileExpr extends MySqlObjectImpl implements SQLExpr { + private SQLExpr file; + private String charset; - private SQLExpr file; - private String charset; - - private SQLExpr columnsTerminatedBy; - private boolean columnsEnclosedOptionally = false; + private SQLExpr columnsTerminatedBy; + private boolean columnsEnclosedOptionally; private SQLLiteralExpr columnsEnclosedBy; private SQLLiteralExpr columnsEscaped; private SQLLiteralExpr linesStartingBy; private SQLLiteralExpr linesTerminatedBy; - private SQLExpr ignoreLinesNumber; + private SQLExpr ignoreLinesNumber; - public MySqlOutFileExpr(){ + public MySqlOutFileExpr() { } - public MySqlOutFileExpr(SQLExpr file){ + public MySqlOutFileExpr(SQLExpr file) { this.file = file; } 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 51ec67860e..bd05da95df 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 @@ -26,13 +26,12 @@ import java.util.List; public class MySqlUserName extends MySqlExprImpl implements SQLName, Cloneable { - private String userName; private String host; private String identifiedBy; - private long userNameHashCod64; - private long hashCode64; + private long userNameHashCod64; + private long hashCode64; public String getUserName() { return userName; @@ -110,10 +109,10 @@ public String toString() { public MySqlUserName clone() { MySqlUserName x = new MySqlUserName(); - x.userName = userName; - x.host = host; + x.userName = userName; + x.host = host; x.identifiedBy = identifiedBy; - x.hashCode64 = hashCode64; + x.hashCode64 = hashCode64; x.userNameHashCod64 = userNameHashCod64; return x; 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 dcfd5f6d7d..e79c5963b2 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class CobarShowStatus extends MySqlStatementImpl { - public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsBaselineStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsBaselineStatement.java index a89c2219c0..63ed6b778a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsBaselineStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsBaselineStatement.java @@ -13,7 +13,6 @@ * Date 2019/9/5 10:48 */ public class DrdsBaselineStatement extends MySqlStatementImpl implements SQLStatement { - private String operation; private List baselineIds = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsCancelDDLJob.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsCancelDDLJob.java index ce7dad5ca5..1eaa5047d4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsCancelDDLJob.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsCancelDDLJob.java @@ -12,7 +12,6 @@ * Date 2019-06-16 21:45 */ public class DrdsCancelDDLJob extends MySqlStatementImpl implements SQLStatement { - private List jobIds = new ArrayList(); public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsChangeDDLJob.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsChangeDDLJob.java index 6878157f56..a2b7ddf712 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsChangeDDLJob.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsChangeDDLJob.java @@ -12,10 +12,9 @@ * Date 2019-07-22 17:01 */ public class DrdsChangeDDLJob extends MySqlStatementImpl implements SQLStatement { - - private long jobId = 0; - private boolean skip = false; - private boolean add = false; + private long jobId; + private boolean skip; + private boolean add; private List groupAndTableNameList = new ArrayList(); public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsClearDDLJobCache.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsClearDDLJobCache.java index ef1baa6d80..6e6a35560c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsClearDDLJobCache.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsClearDDLJobCache.java @@ -12,8 +12,7 @@ * Date 2019-07-22 10:09 */ public class DrdsClearDDLJobCache extends MySqlStatementImpl implements SQLStatement { - - private boolean allJobs = false; + private boolean allJobs; private List jobIds = new ArrayList(); public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsInspectDDLJobCache.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsInspectDDLJobCache.java index b315daaab3..9eca9c21dd 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsInspectDDLJobCache.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsInspectDDLJobCache.java @@ -9,7 +9,6 @@ * Date 2019-07-22 10:06 */ public class DrdsInspectDDLJobCache extends MySqlStatementImpl implements SQLStatement { - 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/DrdsRecoverDDLJob.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsRecoverDDLJob.java index 2fc377194c..cf2134e038 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsRecoverDDLJob.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsRecoverDDLJob.java @@ -12,8 +12,7 @@ * Date 2019-06-16 22:02 */ public class DrdsRecoverDDLJob extends MySqlStatementImpl implements SQLStatement { - - private boolean allJobs = false; + private boolean allJobs; private List jobIds = new ArrayList(); public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsRemoveDDLJob.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsRemoveDDLJob.java index 6f94d92af0..7e3f460431 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsRemoveDDLJob.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsRemoveDDLJob.java @@ -12,9 +12,8 @@ * Date 2019-06-18 23:41 */ public class DrdsRemoveDDLJob extends MySqlStatementImpl implements SQLStatement { - - private boolean allCompleted = false; - private boolean allPending = false; + private boolean allCompleted; + private boolean allPending; private List jobIds = new ArrayList(); public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsRollbackDDLJob.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsRollbackDDLJob.java index 61e44a4bda..c56ba39abf 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsRollbackDDLJob.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsRollbackDDLJob.java @@ -12,7 +12,6 @@ * Date 2019-06-18 23:37 */ public class DrdsRollbackDDLJob extends MySqlStatementImpl implements SQLStatement { - private List jobIds = new ArrayList(); public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsShowDDLJobs.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsShowDDLJobs.java index 2a38d14e63..279db3bc72 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsShowDDLJobs.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsShowDDLJobs.java @@ -12,8 +12,7 @@ * Date 2019-06-16 21:37 */ public class DrdsShowDDLJobs extends MySqlStatementImpl implements SQLShowStatement { - - private boolean full = false; + private boolean full; private List jobIds = new ArrayList(); public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsShowGlobalIndex.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsShowGlobalIndex.java index 8e28025674..a7cdcd9095 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsShowGlobalIndex.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsShowGlobalIndex.java @@ -10,8 +10,7 @@ * Date 2019/10/8 20:06 */ public class DrdsShowGlobalIndex extends MySqlStatementImpl implements SQLShowStatement { - - private SQLName tableName = null; + private SQLName tableName; public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsShowMetadataLock.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsShowMetadataLock.java index 8560d0ea42..eca8cd6655 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsShowMetadataLock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/DrdsShowMetadataLock.java @@ -10,8 +10,7 @@ * Date 2019/10/8 20:08 */ public class DrdsShowMetadataLock extends MySqlStatementImpl implements SQLShowStatement { - - private SQLName schemaName = null; + private SQLName schemaName; public void accept0(MySqlASTVisitor visitor) { visitor.visit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterDatabaseKillJob.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterDatabaseKillJob.java index c938dde16b..b5ed715c5b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterDatabaseKillJob.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterDatabaseKillJob.java @@ -17,12 +17,10 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.statement.SQLAlterDatabaseItem; -import com.alibaba.druid.sql.ast.statement.SQLAssignItem; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlAlterDatabaseKillJob extends MySqlObjectImpl implements SQLAlterDatabaseItem { - private SQLName jobType; private SQLName jobId; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterDatabaseSetOption.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterDatabaseSetOption.java index be44cfad30..4767a5ac13 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterDatabaseSetOption.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterDatabaseSetOption.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.statement.SQLAlterDatabaseItem; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; @@ -28,7 +27,6 @@ import java.util.List; public class MySqlAlterDatabaseSetOption extends MySqlObjectImpl implements SQLAlterDatabaseItem { - private List options = new ArrayList(); private SQLName on; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterEventStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterEventStatement.java index bb23ff3159..ec5d44b7d6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterEventStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterEventStatement.java @@ -23,16 +23,16 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlAlterEventStatement extends MySqlStatementImpl implements SQLAlterStatement { - private SQLName definer; - private SQLName name; + private SQLName definer; + private SQLName name; private MySqlEventSchedule schedule; - private boolean onCompletionPreserve; - private SQLName renameTo; - private Boolean enable; - private boolean disableOnSlave; - private SQLExpr comment; - private SQLStatement eventBody; + private boolean onCompletionPreserve; + private SQLName renameTo; + private Boolean enable; + private boolean disableOnSlave; + private SQLExpr comment; + private SQLStatement eventBody; public MySqlAlterEventStatement() { setDbType(DbType.mysql); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAlterColumn.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAlterColumn.java index 746c1e1fbf..594cd585a8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAlterColumn.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAlterColumn.java @@ -22,10 +22,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlAlterTableAlterColumn extends MySqlObjectImpl implements SQLAlterTableItem { - private SQLName column; - private boolean dropDefault = false; + private boolean dropDefault; private SQLExpr defaultExpr; @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAlterFullTextIndex.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAlterFullTextIndex.java index 4986908d62..e2d657db7c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAlterFullTextIndex.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableAlterFullTextIndex.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.sql.dialect.mysql.ast.statement; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem; import com.alibaba.druid.sql.dialect.mysql.ast.AnalyzerIndexType; @@ -23,12 +22,10 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlAlterTableAlterFullTextIndex extends MySqlObjectImpl implements SQLAlterTableItem { - private SQLName indexName; private AnalyzerIndexType analyzerType; - private SQLName analyzerName; - + private SQLName analyzerName; @Override public void accept0(MySqlASTVisitor visitor) { 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 950182d8c4..c834833c0f 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 @@ -22,15 +22,14 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlAlterTableChangeColumn extends MySqlObjectImpl implements SQLAlterTableItem { - - private SQLName columnName; + private SQLName columnName; private SQLColumnDefinition newColumnDefinition; - private boolean first; + private boolean first; - private SQLName firstColumn; - private SQLName afterColumn; + private SQLName firstColumn; + private SQLName afterColumn; @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 bc92130137..25d356f283 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 @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlAlterTableDiscardTablespace extends MySqlObjectImpl implements SQLAlterTableItem, MySqlObject { - @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 2af34e819e..2cab923232 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 @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlAlterTableImportTablespace extends MySqlObjectImpl implements SQLAlterTableItem, MySqlObject { - @Override protected void accept0(SQLASTVisitor visitor) { if (visitor instanceof MySqlASTVisitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableLock.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableLock.java index 90d74a9e76..b6ade51ca8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableLock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableLock.java @@ -11,7 +11,6 @@ * Date 2019-06-03 15:50 */ public class MySqlAlterTableLock extends MySqlObjectImpl implements SQLAlterTableItem { - private SQLExpr lockType; @Override 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 a93c5df9ff..256bfe1723 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 @@ -22,13 +22,12 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlAlterTableModifyColumn extends MySqlObjectImpl implements SQLAlterTableItem { - private SQLColumnDefinition newColumnDefinition; - private boolean first; + private boolean first; - private SQLName firstColumn; - private SQLName afterColumn; + private SQLName firstColumn; + private SQLName afterColumn; @Override public void accept0(MySqlASTVisitor visitor) { 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 89814db256..5d6fd1392b 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 @@ -22,20 +22,19 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlAlterTableOption extends MySqlObjectImpl implements SQLAlterTableItem { - private String name; private SQLObject value; - public MySqlAlterTableOption(String name, String value){ + public MySqlAlterTableOption(String name, String value) { this(name, new SQLIdentifierExpr(value)); } - public MySqlAlterTableOption(String name, SQLObject value){ + public MySqlAlterTableOption(String name, SQLObject value) { this.name = name; this.setValue(value); } - public MySqlAlterTableOption(){ + public MySqlAlterTableOption() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableOrderBy.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableOrderBy.java index 8a19719e11..353e2716eb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableOrderBy.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableOrderBy.java @@ -14,7 +14,6 @@ * Date 2019-06-03 15:59 */ public class MySqlAlterTableOrderBy extends MySqlObjectImpl implements SQLAlterTableItem { - private List columns = new ArrayList(); @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableValidation.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableValidation.java index 5ec38cbece..70dea5d5ee 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableValidation.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableValidation.java @@ -10,7 +10,6 @@ * Date 2019-06-03 16:22 */ public class MySqlAlterTableValidation extends MySqlObjectImpl implements SQLAlterTableItem { - private boolean withValidation; @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTablespaceStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTablespaceStatement.java index c4c291686c..30118153da 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTablespaceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTablespaceStatement.java @@ -101,4 +101,4 @@ public void setEngine(SQLExpr engine) { } this.engine = engine; } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterUserStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterUserStatement.java index 0cdb57ada7..5b2a04a23c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterUserStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterUserStatement.java @@ -25,8 +25,7 @@ import java.util.List; public class MySqlAlterUserStatement extends MySqlStatementImpl implements SQLAlterStatement { - - private boolean ifExists = false; + private boolean ifExists; private final List alterUsers = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAnalyzeStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAnalyzeStatement.java index 135b1beb29..aeb2223c7a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAnalyzeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAnalyzeStatement.java @@ -24,9 +24,8 @@ import java.util.List; public class MySqlAnalyzeStatement extends SQLAnalyzeTableStatement implements MySqlStatement { - - private boolean noWriteToBinlog = false; - private boolean local = false; + private boolean noWriteToBinlog; + private boolean local; public MySqlAnalyzeStatement() { super.dbType = DbType.mysql; 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 7c6648a9bb..504330c894 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,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlBinlogStatement extends MySqlStatementImpl { - private SQLExpr expr; public SQLExpr getExpr() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCheckTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCheckTableStatement.java index 1ba5c594c8..fac8de7626 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCheckTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCheckTableStatement.java @@ -9,9 +9,7 @@ public class MySqlCheckTableStatement extends MySqlStatementImpl { private final List tables = new ArrayList(); - public MySqlCheckTableStatement() { - } public void addTable(SQLExprTableSource table) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlChecksumTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlChecksumTableStatement.java index 7a2a99b5e8..5b292ed951 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlChecksumTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlChecksumTableStatement.java @@ -13,7 +13,6 @@ public class MySqlChecksumTableStatement extends MySqlStatementImpl { private boolean extended; public MySqlChecksumTableStatement() { - } public void addTable(SQLExprTableSource table) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlClearPlanCacheStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlClearPlanCacheStatement.java index 1d774eed38..c7ad6ea8f5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlClearPlanCacheStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlClearPlanCacheStatement.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlClearPlanCacheStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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/MySqlCreateEventStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateEventStatement.java index bcd7f9e7f9..8518f35a88 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateEventStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateEventStatement.java @@ -23,18 +23,18 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlCreateEventStatement extends MySqlStatementImpl implements SQLAlterStatement { - private SQLName definer; - private SQLName name; + private SQLName definer; + private SQLName name; - private boolean ifNotExists; + private boolean ifNotExists; private MySqlEventSchedule schedule; - private boolean onCompletionPreserve; - private SQLName renameTo; - private Boolean enable; - private boolean disableOnSlave; - private SQLExpr comment; - private SQLStatement eventBody; + private boolean onCompletionPreserve; + private SQLName renameTo; + private Boolean enable; + private boolean disableOnSlave; + private SQLExpr comment; + private SQLStatement eventBody; public MySqlCreateEventStatement() { setDbType(DbType.mysql); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateExternalCatalogStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateExternalCatalogStatement.java index e4c97d9df0..2abba82dd0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateExternalCatalogStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateExternalCatalogStatement.java @@ -16,9 +16,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLAlterStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; @@ -26,12 +24,12 @@ import java.util.Map; public class MySqlCreateExternalCatalogStatement extends MySqlStatementImpl implements SQLAlterStatement { - private SQLName name; + private SQLName name; - private boolean ifNotExists; + private boolean ifNotExists; private Map properties = new HashMap(); - private SQLName comment; + private SQLName comment; public MySqlCreateExternalCatalogStatement() { setDbType(DbType.mysql); 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 8c77d4b007..a01224d287 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 @@ -17,18 +17,17 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.ast.expr.SQLBooleanExpr; -import com.alibaba.druid.sql.ast.expr.SQLCharExpr; +import com.alibaba.druid.sql.ast.SQLCommentHint; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.ads.visitor.AdsOutputVisitor; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey; -import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlExprImpl; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlShowColumnOutpuVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.util.StringUtils; @@ -40,25 +39,34 @@ import java.util.Map; public class MySqlCreateTableStatement extends SQLCreateTableStatement implements MySqlStatement { - private List hints = new ArrayList(); - private List optionHints = new ArrayList(); - private SQLName tableGroup; - protected SQLExpr dbPartitionBy;//for drds - protected SQLExpr dbPartitions;//for drds - protected SQLExpr tablePartitionBy;//for drds - protected SQLExpr tablePartitions;//for drds - protected MySqlExtPartition exPartition; //for drds - protected SQLName storedBy; // for ads - protected SQLName distributeByType; // for ads - protected List distributeBy = new ArrayList(); - protected boolean isBroadCast; - protected Map with = new HashMap(3); // for ads - - protected SQLName archiveBy; // adb + private List hints = new ArrayList(); + private List optionHints = new ArrayList(); + private SQLName tableGroup; + //for drds + protected SQLExpr dbPartitionBy; + //for drds + protected SQLExpr dbPartitions; + //for drds + protected SQLExpr tablePartitionBy; + //for drds + protected SQLExpr tablePartitions; + //for drds + protected MySqlExtPartition exPartition; + // for ads + protected SQLName storedBy; + // for ads + protected SQLName distributeByType; + protected List distributeBy = new ArrayList(); + protected boolean isBroadCast; + // for ads + protected Map with = new HashMap(3); + + // adb + protected SQLName archiveBy; protected Boolean withData; - public MySqlCreateTableStatement(){ - super (DbType.mysql); + public MySqlCreateTableStatement() { + super(DbType.mysql); } public List getHints() { @@ -153,7 +161,6 @@ public void accept0(MySqlASTVisitor visitor) { } public static class TableSpaceOption extends MySqlExprImpl { - private SQLName name; private SQLExpr storage; @@ -217,7 +224,6 @@ public void setOptionHints(List optionHints) { this.optionHints = optionHints; } - public SQLName getTableGroup() { return tableGroup; } @@ -249,7 +255,7 @@ public List getMysqlKeys() { List mySqlKeys = new ArrayList(); for (SQLTableElement element : this.getTableElementList()) { if (element instanceof MySqlKey) { - mySqlKeys.add((MySqlKey)element); + mySqlKeys.add((MySqlKey) element); } } return mySqlKeys; @@ -259,7 +265,7 @@ public List getMysqlIndexes() { List indexList = new ArrayList(); for (SQLTableElement element : this.getTableElementList()) { if (element instanceof MySqlTableIndex) { - indexList.add((MySqlTableIndex)element); + indexList.add((MySqlTableIndex) element); } } return indexList; @@ -412,7 +418,7 @@ public boolean apply(MySqlAlterTableChangeColumn item) { for (int i = 0; i < tableElementList.size(); i++) { SQLTableElement e = tableElementList.get(i); - if(e instanceof MySqlTableIndex) { + if (e instanceof MySqlTableIndex) { ((MySqlTableIndex) e).applyColumnRename(columnName, column); } else if (e instanceof SQLUnique) { SQLUnique unique = (SQLUnique) e; @@ -464,7 +470,7 @@ public boolean apply(MySqlAlterTableModifyColumn item) { // Just old name -> old name. for (int i = 0; i < tableElementList.size(); i++) { SQLTableElement e = tableElementList.get(i); - if(e instanceof MySqlTableIndex) { + if (e instanceof MySqlTableIndex) { ((MySqlTableIndex) e).applyColumnRename(columnName, column); } else if (e instanceof SQLUnique) { SQLUnique unique = (SQLUnique) e; @@ -561,7 +567,6 @@ public void setTablePartitionBy(SQLExpr x) { this.tablePartitionBy = x; } - public SQLName getDistributeByType() { return distributeByType; } 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 8cac5355d6..7e99dfae97 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 @@ -25,10 +25,9 @@ import java.util.List; public class MySqlCreateUserStatement extends MySqlStatementImpl implements SQLCreateStatement { - private List users = new ArrayList(2); - private boolean ifNotExists = false; + private boolean ifNotExists; public List getUsers() { return users; @@ -58,9 +57,8 @@ public void accept0(MySqlASTVisitor visitor) { } public static class UserSpecification extends MySqlObjectImpl { - private SQLExpr user; - private boolean passwordHash = false; + private boolean passwordHash; private SQLExpr password; private SQLExpr authPlugin; private boolean pluginAs; @@ -115,6 +113,5 @@ public void accept0(MySqlASTVisitor visitor) { visitor.endVisit(this); } - } } 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 bbf49c7bc7..7a25a7283b 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 @@ -22,28 +22,26 @@ import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class MySqlDeleteStatement extends SQLDeleteStatement { - - private boolean lowPriority = false; - private boolean quick = false; - private boolean ignore = false; - private SQLOrderBy orderBy; - private SQLLimit limit; + private boolean lowPriority; + private boolean quick; + private boolean ignore; + private SQLOrderBy orderBy; + private SQLLimit limit; // for petadata - private boolean forceAllPartitions = false; - private SQLName forcePartition; + private boolean forceAllPartitions; + private SQLName forcePartition; private List hints; - private boolean fulltextDictionary = false; + private boolean fulltextDictionary; - public MySqlDeleteStatement(){ + public MySqlDeleteStatement() { super(DbType.mysql); } @@ -75,12 +73,12 @@ public List getHints() { } return hints; } - + public int getHintsSize() { if (hints == null) { return 0; } - + return hints.size(); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDisabledPlanCacheStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDisabledPlanCacheStatement.java index d16e716356..4760bc8a77 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDisabledPlanCacheStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDisabledPlanCacheStatement.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlDisabledPlanCacheStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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/MySqlExecuteForAdsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExecuteForAdsStatement.java index f843bb87fc..1f44bdfede 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExecuteForAdsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExecuteForAdsStatement.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.sql.dialect.mysql.ast.statement; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; @@ -25,7 +24,6 @@ import java.util.List; public class MySqlExecuteForAdsStatement extends MySqlStatementImpl { - private SQLName action; private SQLName role; private SQLCharExpr targetId; 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 1b144df924..51e7c23075 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,8 +24,7 @@ import java.util.List; public class MySqlExecuteStatement extends MySqlStatementImpl { - - private SQLName statementName; + private SQLName statementName; private final List parameters = new ArrayList(); public SQLName getStatementName() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExplainPlanCacheStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExplainPlanCacheStatement.java index fd0fa30733..ab0fb53a47 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExplainPlanCacheStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExplainPlanCacheStatement.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlExplainPlanCacheStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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/MySqlExplainStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExplainStatement.java index 82a7cff64b..9861b4085e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExplainStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlExplainStatement.java @@ -17,7 +17,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.statement.SQLExplainStatement; @@ -31,17 +30,16 @@ public class MySqlExplainStatement extends SQLExplainStatement implements MySqlS private SQLExpr wild; private SQLExpr connectionId; - private boolean distributeInfo = false; // for ads + private boolean distributeInfo; // for ads public MySqlExplainStatement() { - super (DbType.mysql); + super(DbType.mysql); } public MySqlExplainStatement(DbType dbType) { - super (dbType); + super(dbType); } - @Override public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlFlashbackStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlFlashbackStatement.java index f05939006c..ee484c47d0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlFlashbackStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlFlashbackStatement.java @@ -16,7 +16,6 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlFlashbackStatement extends MySqlStatementImpl { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlFlushStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlFlushStatement.java index cb69da8492..7c1577862c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlFlushStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlFlushStatement.java @@ -28,12 +28,12 @@ * Created by wenshao on 16/08/2017. */ public class MySqlFlushStatement extends MySqlStatementImpl { - private boolean noWriteToBinlog = false; - private boolean local = false; + private boolean noWriteToBinlog; + private boolean local; private final List tables = new ArrayList(); - private boolean withReadLock = false; + private boolean withReadLock; private boolean forExport; private boolean binaryLogs; @@ -55,7 +55,6 @@ public class MySqlFlushStatement extends MySqlStatementImpl { private boolean tableOption; private SQLIntegerExpr version; // for ads - public boolean isNoWriteToBinlog() { return noWriteToBinlog; } 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 61ffa020b5..ef6b295fd1 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlHelpStatement extends MySqlStatementImpl { - private SQLExpr content; public SQLExpr getContent() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlHintStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlHintStatement.java index 941f03f0bc..602fabea4f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlHintStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlHintStatement.java @@ -19,18 +19,15 @@ import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; -import com.alibaba.druid.util.MySqlUtils; import java.util.List; public class MySqlHintStatement extends MySqlStatementImpl { - private List hints; private List hintStatements; public MySqlHintStatement() { - } public void accept0(MySqlASTVisitor visitor) { @@ -78,7 +75,7 @@ public int getHintVersion() { && c4 >= '0' && c4 <= '9' && c5 >= '0' && c5 <= '9' && c6 == ' ') { - return (c1 - '0') * 10000 + return (c1 - '0') * 10000 + (c2 - '0') * 1000 + (c3 - '0') * 100 + (c4 - '0') * 10 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 a4d5133819..5c29651684 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 @@ -20,23 +20,22 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class MySqlInsertStatement extends SQLInsertStatement { - private boolean lowPriority = false; - private boolean delayed = false; - private boolean highPriority = false; - private boolean ignore = false; - private boolean rollbackOnFail = false; - private boolean fulltextDictionary = false; // for adb - private boolean overwrite = false; // for adb - private boolean ifNotExists = false; //for adb - - protected List hints; + private boolean lowPriority; + private boolean delayed; + private boolean highPriority; + private boolean ignore; + private boolean rollbackOnFail; + private boolean fulltextDictionary; // for adb + private boolean overwrite; // for adb + private boolean ifNotExists; //for adb + + protected List hints; private final List duplicateKeyUpdate = new ArrayList(); 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 6fe2221f03..36f2b4b528 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 @@ -17,9 +17,7 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; @@ -27,12 +25,11 @@ import java.util.List; public class MySqlKillStatement extends SQLStatementImpl { - - private Type type; + private Type type; private List threadIds = new ArrayList(); public static enum Type { - CONNECTION, QUERY + CONNECTION, QUERY } public Type getType() { @@ -54,7 +51,7 @@ public void setThreadId(SQLExpr threadId) { } this.threadIds.set(0, threadId); } - + public List getThreadIds() { return threadIds; } 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 ef2c9cd7f6..4457d55204 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,33 +25,32 @@ import java.util.List; public class MySqlLoadDataInFileStatement extends MySqlStatementImpl { + private boolean lowPriority; + private boolean concurrent; + private boolean local; - private boolean lowPriority = false; - private boolean concurrent = false; - private boolean local = false; + private SQLLiteralExpr fileName; - private SQLLiteralExpr fileName; + private boolean replicate; + private boolean ignore; - private boolean replicate = false; - private boolean ignore = false; + private SQLName tableName; - private SQLName tableName; + private String charset; - private String charset; + private SQLLiteralExpr columnsTerminatedBy; + private boolean columnsEnclosedOptionally; + 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; + private List setList = new ArrayList(); - private List setList = new ArrayList(); - - private List columns = new ArrayList(); + private List columns = new ArrayList(); public boolean isLowPriority() { return lowPriority; @@ -222,17 +221,14 @@ public List getChildren() { return children; } - public List getColumns() { return columns; } - public void setColumns(List columns) { this.columns = columns; } - public void setSetList(List setList) { this.setList = setList; } 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 a11e5c49aa..6ccd8515ff 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,25 +25,24 @@ import java.util.List; public class MySqlLoadXmlStatement extends MySqlStatementImpl { + private boolean lowPriority; + private boolean concurrent; + private boolean local; - private boolean lowPriority = false; - private boolean concurrent = false; - private boolean local = false; + private SQLLiteralExpr fileName; - private SQLLiteralExpr fileName; + private boolean replicate; + private boolean ignore; - private boolean replicate = false; - private boolean ignore = false; + private SQLName tableName; - private SQLName tableName; + private String charset; - private String charset; + private SQLExpr rowsIdentifiedBy; - private SQLExpr rowsIdentifiedBy; + private SQLExpr ignoreLinesNumber; - 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 c756b5b4ca..615be63acd 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 @@ -16,8 +16,6 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.ast.SQLCommentHint; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.ast.statement.SQLLockTableStatement; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl; @@ -27,7 +25,6 @@ import java.util.List; public class MySqlLockTableStatement extends MySqlStatementImpl implements SQLLockTableStatement { - private List items = new ArrayList(); @Override @@ -43,7 +40,7 @@ public static enum LockType { public final String name; - LockType(String name){ + LockType(String name) { this.name = name; } } @@ -57,10 +54,9 @@ public void setItems(List items) { } public static class Item extends MySqlObjectImpl { - private SQLExprTableSource tableSource = new SQLExprTableSource(); - private LockType lockType; + private LockType lockType; private List hints; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlManageInstanceGroupStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlManageInstanceGroupStatement.java index 430dd64267..f574a8ca57 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlManageInstanceGroupStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlManageInstanceGroupStatement.java @@ -17,8 +17,6 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; @@ -26,7 +24,6 @@ import java.util.List; public class MySqlManageInstanceGroupStatement extends MySqlStatementImpl { - private List groupNames = new ArrayList(); private SQLIntegerExpr replication; private SQLName operation; @@ -49,7 +46,6 @@ public List getGroupNamesToString() { return names; } - public List getGroupNames() { return groupNames; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlMigrateStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlMigrateStatement.java index eb4c2533c6..355a44f55d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlMigrateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlMigrateStatement.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlMigrateStatement extends MySqlStatementImpl { - private SQLName schema; private SQLCharExpr shardNames; private SQLIntegerExpr migrateType; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlOptimizeStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlOptimizeStatement.java index 0c2393ebbd..debccead4b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlOptimizeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlOptimizeStatement.java @@ -22,11 +22,10 @@ import java.util.List; public class MySqlOptimizeStatement extends MySqlStatementImpl { + private boolean noWriteToBinlog; + private boolean local; - private boolean noWriteToBinlog = false; - private boolean local = false; - - protected final List tableSources = new ArrayList(); + protected final List tableSources = new ArrayList(); public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { 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 41e588b915..0031012b78 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 @@ -32,7 +32,7 @@ protected void accept0(SQLASTVisitor visitor) { throw new IllegalArgumentException("not support visitor type : " + visitor.getClass().getName()); } } - + @Override public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { 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 48473b38f7..c055779596 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 @@ -24,14 +24,13 @@ import java.util.List; public class MySqlPrepareStatement extends MySqlStatementImpl { - private SQLName name; private SQLExpr from; - public MySqlPrepareStatement(){ + public MySqlPrepareStatement() { } - public MySqlPrepareStatement(SQLName name, SQLExpr from){ + public MySqlPrepareStatement(SQLName name, SQLExpr from) { this.name = name; this.from = from; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRaftLeaderTransferStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRaftLeaderTransferStatement.java index cd6990925c..d1a0e23987 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRaftLeaderTransferStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRaftLeaderTransferStatement.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlRaftLeaderTransferStatement extends MySqlStatementImpl { - private SQLCharExpr shard; private SQLCharExpr from; private SQLCharExpr to; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRaftMemberChangeStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRaftMemberChangeStatement.java index 6bcc15d1ad..0e178b7400 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRaftMemberChangeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRaftMemberChangeStatement.java @@ -15,14 +15,10 @@ */ package com.alibaba.druid.sql.dialect.mysql.ast.statement; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlRaftMemberChangeStatement extends MySqlStatementImpl { - private SQLCharExpr shard; private SQLCharExpr host; private SQLCharExpr status; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRenameSequenceStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRenameSequenceStatement.java index 74621994ae..9e09e0ee53 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRenameSequenceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRenameSequenceStatement.java @@ -17,11 +17,9 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.statement.SQLAlterStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; -public class MySqlRenameSequenceStatement extends MySqlStatementImpl implements SQLAlterStatement { - +public class MySqlRenameSequenceStatement extends MySqlStatementImpl implements SQLAlterStatement { private SQLName name; private SQLName to; 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 113a3da130..d23e3fc140 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 @@ -23,8 +23,7 @@ import java.util.ArrayList; import java.util.List; -public class MySqlRenameTableStatement extends MySqlStatementImpl implements SQLAlterStatement { - +public class MySqlRenameTableStatement extends MySqlStatementImpl implements SQLAlterStatement { private List items = new ArrayList(2); public List getItems() { @@ -46,7 +45,6 @@ public void accept0(MySqlASTVisitor visitor) { } public static class Item extends MySqlObjectImpl { - private SQLName name; private SQLName to; 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 c50a8ce2a6..f4cb8501c6 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,7 +21,6 @@ import java.util.List; public class MySqlResetStatement extends MySqlStatementImpl { - private List options = new ArrayList(); public List getOptions() { 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 4288391fb2..305bc5c1c2 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 @@ -17,7 +17,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLWindow; @@ -32,19 +31,19 @@ import java.util.List; public class MySqlSelectQueryBlock extends SQLSelectQueryBlock implements MySqlObject { - private boolean hignPriority; - private boolean straightJoin; - private boolean smallResult; - private boolean bigResult; - private boolean bufferResult; - private Boolean cache; - private boolean calcFoundRows; - private SQLName procedureName; - private List procedureArgumentList; - private boolean lockInShareMode; - private SQLName forcePartition; // for petadata - - public MySqlSelectQueryBlock(){ + private boolean hignPriority; + private boolean straightJoin; + private boolean smallResult; + private boolean bigResult; + private boolean bufferResult; + private Boolean cache; + private boolean calcFoundRows; + private SQLName procedureName; + private List procedureArgumentList; + private boolean lockInShareMode; + private SQLName forcePartition; // for petadata + + public MySqlSelectQueryBlock() { dbType = DbType.mysql; } @@ -84,7 +83,6 @@ public int getHintsSize() { return hints.size(); } - public boolean isLockInShareMode() { return lockInShareMode; } @@ -164,33 +162,63 @@ public void setCalcFoundRows(boolean calcFoundRows) { this.calcFoundRows = calcFoundRows; } - @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } MySqlSelectQueryBlock that = (MySqlSelectQueryBlock) o; - if (hignPriority != that.hignPriority) return false; - if (straightJoin != that.straightJoin) return false; - if (smallResult != that.smallResult) return false; - if (bigResult != that.bigResult) return false; - if (bufferResult != that.bufferResult) return false; - if (calcFoundRows != that.calcFoundRows) return false; - if (lockInShareMode != that.lockInShareMode) return false; - if (cache != null ? !cache.equals(that.cache) : that.cache != null) return false; - if (procedureName != null ? !procedureName.equals(that.procedureName) : that.procedureName != null) + if (hignPriority != that.hignPriority) { + return false; + } + if (straightJoin != that.straightJoin) { + return false; + } + if (smallResult != that.smallResult) { + return false; + } + if (bigResult != that.bigResult) { + return false; + } + if (bufferResult != that.bufferResult) { return false; + } + if (calcFoundRows != that.calcFoundRows) { + return false; + } + if (lockInShareMode != that.lockInShareMode) { + return false; + } + if (cache != null ? !cache.equals(that.cache) : that.cache != null) { + return false; + } + if (procedureName != null ? !procedureName.equals(that.procedureName) : that.procedureName != null) { + return false; + } if (procedureArgumentList != null ? !procedureArgumentList.equals(that.procedureArgumentList) : - that.procedureArgumentList != null) return false; - if (hints != null ? !hints.equals(that.hints) : that.hints != null) return false; - if (forcePartition != null ? !forcePartition.equals(that.forcePartition) : that.forcePartition != null) + that.procedureArgumentList != null) { + return false; + } + if (hints != null ? !hints.equals(that.hints) : that.hints != null) { return false; + } + if (forcePartition != null ? !forcePartition.equals(that.forcePartition) : that.forcePartition != null) { + return false; + } return true; } - @Override public int hashCode() { + @Override + public int hashCode() { int result = super.hashCode(); result = 31 * result + (hignPriority ? 1 : 0); result = 31 * result + (straightJoin ? 1 : 0); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetTransactionStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetTransactionStatement.java index c676289b99..d37696f38d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetTransactionStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSetTransactionStatement.java @@ -16,18 +16,16 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlSetTransactionStatement extends MySqlStatementImpl { - private Boolean global; private Boolean session; private boolean local; - private String isolationLevel; - private String accessModel; + private String isolationLevel; + private String accessModel; private SQLExpr policy; 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 70d7caf0cc..10c8490441 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowAuthorsStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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 225d214ba0..b065d3bd58 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 @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowBinLogEventsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr in; private SQLExpr from; private SQLLimit limit; 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 45aadde2b8..d661a9e903 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowBinaryLogsStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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/MySqlShowBroadcastsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBroadcastsStatement.java index fafae21eba..72cc35711d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBroadcastsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBroadcastsStatement.java @@ -17,15 +17,13 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLLimit; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowBroadcastsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; + private SQLExpr where; + private SQLLimit limit; public SQLLimit getLimit() { return limit; @@ -51,7 +49,6 @@ public void setWhere(SQLExpr where) { this.where = where; } - public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, where); 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 80f5a27176..cf3384ef36 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 @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowCharacterSetStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr where; private SQLExpr pattern; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowClusterNameStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowClusterNameStatement.java index ab5a17287b..cd5ee9bcbd 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowClusterNameStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowClusterNameStatement.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowClusterNameStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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/MySqlShowCollationStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCollationStatement.java index a824015f84..7789bfe480 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCollationStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr where; private SQLExpr pattern; 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 3eac6f36c9..a5101b2467 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowContributorsStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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 3293ef621a..c0137f9a77 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 @@ -19,10 +19,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCreateDatabaseStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr database; - private boolean ifNotExists = false; + private boolean ifNotExists; 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 4b81530c2a..5dbd5be987 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCreateEventStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr eventName; public void accept0(MySqlASTVisitor visitor) { 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 78c5ba4389..b28d4a7523 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCreateFunctionStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr name; public void accept0(MySqlASTVisitor visitor) { 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 5966a85dd2..15fe094a5f 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCreateProcedureStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr name; public void accept0(MySqlASTVisitor visitor) { 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 fa5755e436..5a2c57e4f6 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowCreateTriggerStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr name; public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatabaseStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatabaseStatusStatement.java index efaa6989ac..ca2bf2aa11 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatabaseStatusStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatabaseStatusStatement.java @@ -22,12 +22,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowDatabaseStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - - private SQLName name; + private SQLName name; private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; - private boolean full; + private SQLExpr where; + private SQLLimit limit; + private boolean full; public SQLLimit getLimit() { return limit; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatasourcesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatasourcesStatement.java index 827942605c..e5668ae2f6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatasourcesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatasourcesStatement.java @@ -21,10 +21,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowDatasourcesStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; + private SQLExpr where; + private SQLLimit limit; public SQLLimit getLimit() { return limit; @@ -50,7 +49,6 @@ public void setWhere(SQLExpr where) { this.where = where; } - public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, where); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDdlStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDdlStatusStatement.java index 3442d56794..d6e1684243 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDdlStatusStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDdlStatusStatement.java @@ -24,10 +24,9 @@ * for ttdl5 */ public class MySqlShowDdlStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; + private SQLExpr where; + private SQLLimit limit; public SQLLimit getLimit() { return limit; @@ -53,7 +52,6 @@ public void setWhere(SQLExpr where) { this.where = where; } - public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, where); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDsStatement.java index f25dcaf186..9fbe4c4823 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDsStatement.java @@ -21,10 +21,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowDsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; + private SQLExpr where; + private SQLLimit limit; public SQLLimit getLimit() { return limit; @@ -50,7 +49,6 @@ public void setWhere(SQLExpr where) { this.where = where; } - public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, where); 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 040b31d13c..1dd67627c1 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 @@ -19,9 +19,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowEngineStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr name; - private Option option; + 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 6f1b320c0a..6ef3d8c29c 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 @@ -18,8 +18,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowEnginesStatement extends MySqlStatementImpl implements MySqlShowStatement { - - private boolean storage = false; + private boolean storage; 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 ee4b1c2307..df4bbb32b1 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 @@ -19,8 +19,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowErrorsStatement extends MySqlStatementImpl implements MySqlShowStatement { - - private boolean count = false; + private boolean count; private SQLLimit limit; public boolean isCount() { 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 5f9bf554b6..6d047bc3d6 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowEventsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr schema; private SQLExpr like; private SQLExpr where; 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 0461a16bb0..2e622c0799 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowFunctionCodeStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr name; public void accept0(MySqlASTVisitor visitor) { 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 cee7bbf82a..815e7d1874 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowFunctionStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr like; private SQLExpr where; 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 7b8781b88c..3cdfdb8c9e 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 @@ -16,7 +16,6 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.statement.SQLShowGrantsStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; @@ -32,5 +31,4 @@ public void accept0(MySqlASTVisitor visitor) { visitor.endVisit(this); } - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowHMSMetaStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowHMSMetaStatement.java index 58556568e8..2d73b3e735 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowHMSMetaStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowHMSMetaStatement.java @@ -15,16 +15,12 @@ */ package com.alibaba.druid.sql.dialect.mysql.ast.statement; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLLimit; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowHMSMetaStatement extends MySqlStatementImpl implements MySqlShowStatement { - - private SQLName name; + private SQLName name; public SQLName getName() { return name; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowHelpStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowHelpStatement.java index c17db74da5..faf9e1c171 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowHelpStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowHelpStatement.java @@ -21,10 +21,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowHelpStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; + private SQLExpr where; + private SQLLimit limit; public SQLLimit getLimit() { return limit; @@ -50,7 +49,6 @@ public void setWhere(SQLExpr where) { this.where = where; } - public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, where); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowJobStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowJobStatusStatement.java index 32544647c5..d7047c51ff 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowJobStatusStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowJobStatusStatement.java @@ -16,12 +16,10 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowJobStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - - private boolean sync = false; + private boolean sync; private SQLExpr where; public MySqlShowJobStatusStatement() { 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 3705473665..97dc2124f0 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowMasterLogsStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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 d858550f2f..fa74939ed4 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowMasterStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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/MySqlShowMigrateTaskStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMigrateTaskStatusStatement.java index 2bd70226f7..14d28d1c6f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMigrateTaskStatusStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMigrateTaskStatusStatement.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowMigrateTaskStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr where; public MySqlShowMigrateTaskStatusStatement() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowNodeStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowNodeStatement.java index f9c4f48792..e44f1aacf5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowNodeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowNodeStatement.java @@ -21,10 +21,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowNodeStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; + private SQLExpr where; + private SQLLimit limit; public SQLLimit getLimit() { return limit; @@ -50,7 +49,6 @@ public void setWhere(SQLExpr where) { this.where = where; } - public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, where); 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 bbe0bae99b..ea20b5f3dc 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowOpenTablesStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr database; private SQLExpr like; private SQLExpr where; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPartitionsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPartitionsStatement.java index 3be071454f..d8281dcf35 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPartitionsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPartitionsStatement.java @@ -15,14 +15,10 @@ */ package com.alibaba.druid.sql.dialect.mysql.ast.statement; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLLimit; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowPartitionsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLName name; public SQLName getName() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPlanCacheStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPlanCacheStatement.java index 9ffbf4ddd8..212a7365f0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPlanCacheStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPlanCacheStatement.java @@ -22,7 +22,6 @@ public class MySqlShowPlanCacheStatement extends MySqlStatementImpl implements M private SQLSelect select; public MySqlShowPlanCacheStatement() { - } public MySqlShowPlanCacheStatement(SQLSelect select) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPlanCacheStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPlanCacheStatusStatement.java index 8ce0ed5d66..d11bba11cf 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPlanCacheStatusStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPlanCacheStatusStatement.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.sql.dialect.mysql.ast.statement; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLLimit; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowPlanCacheStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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/MySqlShowPluginsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPluginsStatement.java index 5663b0d39a..712be3c456 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowPluginsStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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 e091a0743a..a8b970175c 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowPrivilegesStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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 5b80383ab4..af9839dff8 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowProcedureCodeStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr name; public void accept0(MySqlASTVisitor visitor) { 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 216cce40d3..4529699fcc 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowProcedureStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr like; private SQLExpr where; 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 e0211adc3c..f795ed11c1 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 @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class MySqlShowProcessListStatement extends SQLShowProcessListStatement implements MySqlShowStatement { - protected void accept0(SQLASTVisitor visitor) { if (visitor instanceof MySqlASTVisitor) { accept0((MySqlASTVisitor) visitor); 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 d5db81258e..891292ea1b 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 @@ -23,10 +23,9 @@ import java.util.List; public class MySqlShowProfileStatement extends MySqlStatementImpl implements MySqlShowStatement { - private List types = new ArrayList(); - private SQLExpr forQuery; + private SQLExpr forQuery; private SQLLimit limit; @@ -61,7 +60,7 @@ public static enum Type { public final String name; - Type(String name){ + Type(String name) { this.name = name; } } 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 90d20224cf..497380e4af 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowProfilesStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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 7d3147d677..be0476e76d 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 @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowRelayLogEventsStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLExpr logName; private SQLExpr from; private SQLLimit limit; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRuleStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRuleStatement.java index 15f9e96b85..8e07cbface 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRuleStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRuleStatement.java @@ -22,16 +22,14 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowRuleStatement extends MySqlStatementImpl implements MySqlShowStatement { - - private SQLName name; + private SQLName name; private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; - private boolean full = false; - private boolean version = false; + private SQLExpr where; + private SQLLimit limit; + private boolean full; + private boolean version; public MySqlShowRuleStatement() { - } public SQLLimit getLimit() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRuleStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRuleStatusStatement.java index 35ef5c1454..540770937e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRuleStatusStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRuleStatusStatement.java @@ -17,18 +17,16 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLLimit; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowRuleStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - - private boolean lite = true; + private boolean lite = true; private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; - private boolean full = false; - private boolean version = false; + private SQLExpr where; + private SQLLimit limit; + private boolean full; + private boolean version; public SQLLimit getLimit() { return limit; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSequencesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSequencesStatement.java index e466f15858..cb48ab4531 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSequencesStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSequencesStatement.java @@ -21,10 +21,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowSequencesStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; + private SQLExpr where; + private SQLLimit limit; public SQLLimit getLimit() { return limit; @@ -50,7 +49,6 @@ public void setWhere(SQLExpr where) { this.where = where; } - public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, where); 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 d084e0e9c5..20dbbfbd00 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowSlaveHostsStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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 4f717104c9..6748a368e5 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowSlaveStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - 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/MySqlShowSlowStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlowStatement.java index bac04207df..d9420b3b65 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlowStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlowStatement.java @@ -17,17 +17,15 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLLimit; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowSlowStatement extends MySqlStatementImpl implements MySqlShowStatement { - - private boolean physical = false; + private boolean physical; private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; - private boolean full = false; + private SQLExpr where; + private SQLLimit limit; + private boolean full; public SQLLimit getLimit() { return limit; 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 3e8aec0acd..342e6a455d 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 @@ -18,5 +18,4 @@ import com.alibaba.druid.sql.ast.statement.SQLShowStatement; public interface MySqlShowStatement extends MySqlStatement, SQLShowStatement { - } 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 254de6deaa..c10f21d594 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 @@ -19,15 +19,13 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - - private boolean global = false; - private boolean session = false; + private boolean global; + private boolean session; private SQLExpr like; private SQLExpr where; public MySqlShowStatusStatement() { - } public boolean isGlobal() { 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 3837f18af2..0f30e343ec 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,14 +20,12 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowTableStatusStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLName database; private SQLName tableGroup; private SQLExpr like; private SQLExpr where; public MySqlShowTableStatusStatement() { - } public SQLName getDatabase() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTopologyStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTopologyStatement.java index 0e2578fee2..e88024d8ae 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTopologyStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTopologyStatement.java @@ -22,12 +22,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowTopologyStatement extends MySqlStatementImpl implements MySqlShowStatement { - - private boolean full = false; - private SQLName name; + private boolean full; + private SQLName name; private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; + private SQLExpr where; + private SQLLimit limit; public SQLLimit getLimit() { return limit; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTraceStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTraceStatement.java index 4306d31615..a52e8fa037 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTraceStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTraceStatement.java @@ -17,15 +17,13 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLLimit; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowTraceStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLOrderBy orderBy; - private SQLExpr where; - private SQLLimit limit; + private SQLExpr where; + private SQLLimit limit; public SQLLimit getLimit() { return limit; 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 7a8acc59d0..81535e817b 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 @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowTriggersStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLName database; private SQLExpr like; private SQLExpr where; 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 116931fd82..dc3996cbeb 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 @@ -19,8 +19,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowWarningsStatement extends MySqlStatementImpl implements MySqlShowStatement { - - private boolean count = false; + private boolean count; private SQLLimit limit; public boolean isCount() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStatement.java index ae426fa24e..047920f46c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStatement.java @@ -19,5 +19,4 @@ import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObject; public interface MySqlStatement extends SQLStatement, MySqlObject { - } 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 6de46defe9..754dc66879 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 @@ -24,7 +24,6 @@ import java.util.List; public abstract class MySqlStatementImpl extends SQLStatementImpl implements MySqlStatement { - public MySqlStatementImpl() { super(DbType.mysql); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByKey.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByKey.java index 60bd08bc8c..7d89470c13 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByKey.java @@ -36,7 +36,7 @@ protected void accept0(SQLASTVisitor visitor) { throw new IllegalArgumentException("not support visitor type : " + visitor.getClass().getName()); } } - + @Override public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByList.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByList.java index 04b357e70e..c302e2dfd5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByList.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByList.java @@ -26,8 +26,7 @@ import java.util.List; public class MySqlSubPartitionByList extends SQLSubPartitionBy implements MySqlObject { - - private List keys = new ArrayList(); + private List keys = new ArrayList(); private List columns = new ArrayList(); @@ -39,7 +38,7 @@ protected void accept0(SQLASTVisitor visitor) { throw new IllegalArgumentException("not support visitor type : " + visitor.getClass().getName()); } } - + @Override public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByValue.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByValue.java index d4778eb974..0111c359bc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByValue.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSubPartitionByValue.java @@ -37,7 +37,7 @@ protected void accept0(SQLASTVisitor visitor) { throw new IllegalArgumentException("not support visitor type : " + visitor.getClass().getName()); } } - + @Override public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { @@ -77,7 +77,7 @@ public MySqlSubPartitionByValue clone() { public boolean isPartitionByColumn(long columnNameHashCode64) { for (SQLExpr column : columns) { if (column instanceof SQLName) { - if (((SQLName)column).nameHashCode64() == columnNameHashCode64) { + if (((SQLName) column).nameHashCode64() == columnNameHashCode64) { return true; } else if (column instanceof SQLMethodInvokeExpr) { List arguments = ((SQLMethodInvokeExpr) column).getArguments(); 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 0d1c01177b..3519843ee3 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 @@ -30,7 +30,6 @@ import java.util.List; public class MySqlTableIndex extends SQLConstraintImpl implements SQLTableElement, SQLIndex, MySqlObject { - private SQLIndexDefinition indexDefinition = new SQLIndexDefinition(); public MySqlTableIndex() { @@ -118,8 +117,8 @@ public boolean applyColumnRename(SQLName columnName, SQLColumnDefinition to) { if (to.getDataType().hasKeyLength() && 1 == to.getDataType().getArguments().size() && to.getDataType().getArguments().get(0) instanceof SQLIntegerExpr) { - int newKeyLength = ((SQLIntegerExpr)to.getDataType().getArguments().get(0)).getNumber().intValue(); - int oldKeyLength = ((SQLIntegerExpr)((SQLMethodInvokeExpr) expr).getArguments().get(0)).getNumber().intValue(); + int newKeyLength = ((SQLIntegerExpr) to.getDataType().getArguments().get(0)).getNumber().intValue(); + int oldKeyLength = ((SQLIntegerExpr) ((SQLMethodInvokeExpr) expr).getArguments().get(0)).getNumber().intValue(); if (newKeyLength > oldKeyLength) { // Change name and keep key length. ((SQLMethodInvokeExpr) expr).setMethodName(to.getName().getSimpleName()); 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 afab285489..025ad9e899 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 @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlUnlockTablesStatement extends MySqlStatementImpl { - 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/MySqlUpdatePlanCacheStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdatePlanCacheStatement.java index 646cbb2984..49c22b1719 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdatePlanCacheStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdatePlanCacheStatement.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlUpdatePlanCacheStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLSelect formSelect; private SQLSelect toSelect; 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 c0f060d22b..07207be919 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 @@ -29,22 +29,22 @@ import java.util.List; public class MySqlUpdateStatement extends SQLUpdateStatement implements MySqlStatement { - private SQLLimit limit; + private SQLLimit limit; - private boolean lowPriority = false; - private boolean ignore = false; - private boolean commitOnSuccess = false; - private boolean rollBackOnFail = false; - private boolean queryOnPk = false; - private SQLExpr targetAffectRow; + private boolean lowPriority; + private boolean ignore; + private boolean commitOnSuccess; + private boolean rollBackOnFail; + private boolean queryOnPk; + private SQLExpr targetAffectRow; // for petadata - private boolean forceAllPartitions = false; - private SQLName forcePartition; + private boolean forceAllPartitions; + private SQLName forcePartition; - protected List hints; + protected List hints; - public MySqlUpdateStatement(){ + public MySqlUpdateStatement() { super(DbType.mysql); } @@ -99,7 +99,6 @@ public void accept0(MySqlASTVisitor visitor) { limit.accept(visitor); } - if (hints != null) { for (int i = 0; i < hints.size(); i++) { SQLCommentHint hint = hints.get(i); @@ -165,19 +164,39 @@ public void setTargetAffectRow(SQLExpr targetAffectRow) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } MySqlUpdateStatement that = (MySqlUpdateStatement) o; - if (lowPriority != that.lowPriority) return false; - if (ignore != that.ignore) return false; - if (commitOnSuccess != that.commitOnSuccess) return false; - if (rollBackOnFail != that.rollBackOnFail) return false; - if (queryOnPk != that.queryOnPk) return false; - if (this.hints != null ? hints.equals(that.hints) : that.hints != null) return false; - if (limit != null ? !limit.equals(that.limit) : that.limit != null) return false; + if (lowPriority != that.lowPriority) { + return false; + } + if (ignore != that.ignore) { + return false; + } + if (commitOnSuccess != that.commitOnSuccess) { + return false; + } + if (rollBackOnFail != that.rollBackOnFail) { + return false; + } + if (queryOnPk != that.queryOnPk) { + return false; + } + if (this.hints != null ? hints.equals(that.hints) : that.hints != null) { + return false; + } + if (limit != null ? !limit.equals(that.limit) : that.limit != null) { + return false; + } return targetAffectRow != null ? targetAffectRow.equals(that.targetAffectRow) : that.targetAffectRow == null; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdateTableSource.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdateTableSource.java index 1973a05d54..fab3e727c7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdateTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdateTableSource.java @@ -16,18 +16,15 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; import com.alibaba.druid.sql.ast.SQLHint; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.statement.SQLLateralViewTableSource; import com.alibaba.druid.sql.ast.statement.SQLTableSourceImpl; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; // just for alibaba mysql public class MySqlUpdateTableSource extends SQLTableSourceImpl { - private MySqlUpdateStatement update; - public MySqlUpdateTableSource(MySqlUpdateStatement update){ + public MySqlUpdateTableSource(MySqlUpdateStatement update) { this.update = update; } @@ -57,8 +54,6 @@ public void setUpdate(MySqlUpdateStatement update) { @Override public MySqlUpdateTableSource clone() { - - MySqlUpdateTableSource x = new MySqlUpdateTableSource(this.update); x.setAlias(this.alias); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlAlterFullTextStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlAlterFullTextStatement.java index f4005529e9..e49de4c2cc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlAlterFullTextStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlAlterFullTextStatement.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MysqlAlterFullTextStatement extends MySqlStatementImpl implements SQLAlterStatement { - private FullTextType type; private SQLName name; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlAlterTableAlterCheck.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlAlterTableAlterCheck.java index ac5d04a022..d67763daf2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlAlterTableAlterCheck.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlAlterTableAlterCheck.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MysqlAlterTableAlterCheck extends MySqlObjectImpl implements SQLAlterTableItem { - private SQLName name; private Boolean enforced; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextAnalyzerStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextAnalyzerStatement.java index fcf08d4547..e3c919f0ba 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextAnalyzerStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextAnalyzerStatement.java @@ -1,14 +1,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.expr.SQLTextLiteralExpr; -import com.alibaba.druid.sql.ast.expr.SQLValuableExpr; -import com.alibaba.druid.sql.ast.statement.SQLAssignItem; -import com.alibaba.druid.sql.dialect.mysql.ast.FullTextType; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; -import com.alibaba.druid.util.FnvHash; import java.util.ArrayList; import java.util.List; @@ -17,9 +10,7 @@ * @author lijun.cailj 2018/8/13 */ public class MysqlCreateFullTextAnalyzerStatement extends MySqlStatementImpl { - - - private SQLName name; + private SQLName name; private String tokenizer; private List charfilters = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextCharFilterStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextCharFilterStatement.java index a4c01f3e0b..fbab6d6efb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextCharFilterStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextCharFilterStatement.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.ast.expr.SQLTextLiteralExpr; import com.alibaba.druid.sql.ast.expr.SQLValuableExpr; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; -import com.alibaba.druid.sql.dialect.mysql.ast.FullTextType; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.util.FnvHash; @@ -17,9 +16,7 @@ * @author lijun.cailj 2018/8/13 */ public class MysqlCreateFullTextCharFilterStatement extends MySqlStatementImpl { - - - private SQLName name; // for all, not null + private SQLName name; // for all, not null private SQLTextLiteralExpr typeName; // for charfilter/tokenizer/tokenfilter protected final List options = new ArrayList(); // charfilter/tokenizer/tokenfilter diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextDictionaryStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextDictionaryStatement.java index 92cd01dfa7..4138535038 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextDictionaryStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextDictionaryStatement.java @@ -2,11 +2,9 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; -import com.alibaba.druid.sql.dialect.mysql.ast.FullTextType; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MysqlCreateFullTextDictionaryStatement extends MySqlStatementImpl implements MySqlShowStatement { - private SQLName name; private SQLColumnDefinition column; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextTokenFilterStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextTokenFilterStatement.java index a9949ee8c6..e1f9440672 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextTokenFilterStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextTokenFilterStatement.java @@ -16,8 +16,7 @@ * @author lijun.cailj 2018/8/13 */ public class MysqlCreateFullTextTokenFilterStatement extends MySqlStatementImpl { - - private SQLName name; + private SQLName name; private SQLTextLiteralExpr typeName; protected final List options = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextTokenizerStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextTokenizerStatement.java index 9ee207e60a..e2c2715361 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextTokenizerStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlCreateFullTextTokenizerStatement.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.ast.expr.SQLTextLiteralExpr; import com.alibaba.druid.sql.ast.expr.SQLValuableExpr; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; -import com.alibaba.druid.sql.dialect.mysql.ast.FullTextType; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.util.FnvHash; @@ -17,8 +16,7 @@ * @author lijun.cailj 2018/8/13 */ public class MysqlCreateFullTextTokenizerStatement extends MySqlStatementImpl { - - private SQLName name; + private SQLName name; private SQLTextLiteralExpr typeName; private SQLTextLiteralExpr userDefinedDict; protected final List options = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDeallocatePrepareStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDeallocatePrepareStatement.java index 55bfc0d875..7ba3ef55a1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDeallocatePrepareStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDeallocatePrepareStatement.java @@ -23,26 +23,25 @@ import java.util.List; public class MysqlDeallocatePrepareStatement extends MySqlStatementImpl { - - private SQLName statementName; + private SQLName statementName; - public SQLName getStatementName() { - return statementName; - } + public SQLName getStatementName() { + return statementName; + } + + public void setStatementName(SQLName statementName) { + this.statementName = statementName; + } - public void setStatementName(SQLName statementName) { - this.statementName = statementName; - } - - public void accept0(MySqlASTVisitor visitor) { + public void accept0(MySqlASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, statementName); } visitor.endVisit(this); } - @Override - public List getChildren() { - return Collections.singletonList(statementName); - } + @Override + public List getChildren() { + return Collections.singletonList(statementName); + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDropFullTextStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDropFullTextStatement.java index bb960a4206..fd899f2c3f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDropFullTextStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDropFullTextStatement.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MysqlDropFullTextStatement extends MySqlStatementImpl implements SQLDropStatement { - private FullTextType type; private SQLName name; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowCreateFullTextStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowCreateFullTextStatement.java index eb2124f2cc..0bdfe8047e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowCreateFullTextStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowCreateFullTextStatement.java @@ -5,12 +5,10 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MysqlShowCreateFullTextStatement extends MySqlStatementImpl implements MySqlShowStatement { - private FullTextType type; private SQLName name; - public SQLName getName() { return name; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowFullTextStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowFullTextStatement.java index 9de7ff4205..625528b939 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowFullTextStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowFullTextStatement.java @@ -1,11 +1,9 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.dialect.mysql.ast.FullTextType; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MysqlShowFullTextStatement extends MySqlStatementImpl implements MySqlShowStatement { - private FullTextType type; public FullTextType getType() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowHtcStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowHtcStatement.java index 9cae3addc2..d7a7f7d14e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowHtcStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowHtcStatement.java @@ -6,8 +6,8 @@ * @author lijun.cailj 2017/11/16 */ public class MysqlShowHtcStatement extends MySqlStatementImpl implements MySqlShowStatement { - private boolean full = false; - private boolean isHis = false; + private boolean full; + private boolean isHis; @Override public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowStcStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowStcStatement.java index 8b72bd7673..a4931c4185 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowStcStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlShowStcStatement.java @@ -6,8 +6,8 @@ * @author lijun.cailj 2017/11/16 */ public class MysqlShowStcStatement extends MySqlStatementImpl implements MySqlShowStatement { - private boolean full = false; - private boolean isHis = false; + private boolean full; + private boolean isHis; @Override public void accept0(MySqlASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/SQLAlterResourceGroupStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/SQLAlterResourceGroupStatement.java index 215fa353ff..73c836631b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/SQLAlterResourceGroupStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/SQLAlterResourceGroupStatement.java @@ -57,8 +57,7 @@ public void setEnable(Boolean enable) { this.enable = enable; } - public Map getProperties() - { + public Map getProperties() { return properties; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/SQLCreateResourceGroupStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/SQLCreateResourceGroupStatement.java index 65abebf68a..2c4ff14231 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/SQLCreateResourceGroupStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/SQLCreateResourceGroupStatement.java @@ -56,8 +56,7 @@ public void setEnable(Boolean enable) { this.enable = enable; } - public Map getProperties() - { + public Map getProperties() { return properties; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/SQLListResourceGroupStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/SQLListResourceGroupStatement.java index 1d46316b37..c460bf01d1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/SQLListResourceGroupStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/SQLListResourceGroupStatement.java @@ -15,18 +15,14 @@ */ package com.alibaba.druid.sql.dialect.mysql.ast.statement; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.ast.statement.SQLCreateStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLListResourceGroupStatement extends SQLStatementImpl implements SQLCreateStatement { - public void accept0(SQLASTVisitor v) { - if (v.visit(this)) { - } + v.visit(this); v.endVisit(this); } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/executor/MySqlProcedureExecutor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/executor/MySqlProcedureExecutor.java index e5ee97c38a..ad650b7055 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/executor/MySqlProcedureExecutor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/executor/MySqlProcedureExecutor.java @@ -23,7 +23,6 @@ * @author zz [455910092@qq.com] */ public class MySqlProcedureExecutor { - public static int executeStatements(List list) { return 0; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java index c8f8eabbe2..b32b40768b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java @@ -29,12 +29,11 @@ import com.alibaba.druid.util.MySqlUtils; public class MySqlCreateTableParser extends SQLCreateTableParser { - - public MySqlCreateTableParser(String sql){ + public MySqlCreateTableParser(String sql) { super(new MySqlExprParser(sql)); } - public MySqlCreateTableParser(SQLExprParser exprParser){ + public MySqlCreateTableParser(SQLExprParser exprParser) { super(exprParser); } @@ -106,7 +105,7 @@ public MySqlCreateTableStatement parseCreateTable(boolean acceptCreate) { SQLSelect query = new MySqlSelectParser(this.exprParser).select(); stmt.setSelect(query); } else { - for (;;) { + for (; ; ) { SQLColumnDefinition column = null; boolean global = false; @@ -253,7 +252,7 @@ public MySqlCreateTableStatement parseCreateTable(boolean acceptCreate) { lexer.nextToken(); continue; } - } else if(lexer.token() == Token.INDEX) { + } else if (lexer.token() == Token.INDEX) { MySqlTableIndex idx = new MySqlTableIndex(); this.exprParser.parseIndex(idx.getIndexDefinition()); idx.setIndexType("CLUSTERING"); @@ -268,7 +267,7 @@ public MySqlCreateTableStatement parseCreateTable(boolean acceptCreate) { } } } else if (lexer.token() == Token.IDENTIFIER // - || lexer.token() == Token.LITERAL_CHARS) { + || lexer.token() == Token.LITERAL_CHARS) { column = this.exprParser.parseColumn(); column.setParent(stmt); stmt.getTableElementList().add(column); @@ -277,8 +276,8 @@ public MySqlCreateTableStatement parseCreateTable(boolean acceptCreate) { column.addAfterComment(lexer.readAndResetComments()); } } else if (lexer.token() == Token.CONSTRAINT // - || lexer.token() == Token.PRIMARY // - || lexer.token() == Token.UNIQUE) { + || lexer.token() == Token.PRIMARY // + || lexer.token() == Token.UNIQUE) { SQLTableConstraint constraint = this.parseConstraint(); constraint.setParent(stmt); @@ -374,7 +373,7 @@ public MySqlCreateTableStatement parseCreateTable(boolean acceptCreate) { } } - for (;;) { + for (; ; ) { if (lexer.token() == Token.COMMA) { lexer.nextToken(); } @@ -682,7 +681,6 @@ public MySqlCreateTableStatement parseCreateTable(boolean acceptCreate) { lexer.nextToken(); } - accept(Token.LPAREN); SQLListExpr list = new SQLListExpr(); this.exprParser.exprList(list.getItems(), list); @@ -725,7 +723,6 @@ public MySqlCreateTableStatement parseCreateTable(boolean acceptCreate) { continue; } - if (lexer.identifierEquals("INDEX_ALL")) { lexer.nextToken(); accept(Token.EQ); @@ -796,7 +793,7 @@ public MySqlCreateTableStatement parseCreateTable(boolean acceptCreate) { if (lexer.identifierEquals("TABLE_PROPERTIES")) { lexer.nextToken(); accept(Token.EQ); - stmt.addOption("TABLE_PROPERTIES",exprParser.charExpr()); + stmt.addOption("TABLE_PROPERTIES", exprParser.charExpr()); continue; } @@ -912,7 +909,7 @@ public MySqlCreateTableStatement parseCreateTable(boolean acceptCreate) { MySqlExtPartition partitionDef = new MySqlExtPartition(); - for (;;) { + for (; ; ) { MySqlExtPartition.Item item = new MySqlExtPartition.Item(); if (lexer.identifierEquals(FnvHash.Constants.DBPARTITION)) { @@ -953,7 +950,7 @@ public MySqlCreateTableStatement parseCreateTable(boolean acceptCreate) { accept(Token.LPAREN); stmt.putAttribute("ads.options", Boolean.TRUE); - for (;;) { + for (; ; ) { String name = lexer.stringVal(); lexer.nextToken(); accept(Token.EQ); @@ -981,7 +978,7 @@ public MySqlCreateTableStatement parseCreateTable(boolean acceptCreate) { lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { String name = lexer.stringVal(); lexer.nextToken(); accept(Token.EQ); @@ -1092,7 +1089,7 @@ public SQLPartitionBy parsePartitionBy() { accept(Token.LPAREN); if (lexer.token() != Token.RPAREN) { - for (;;) { + for (; ; ) { clause.addColumn(this.exprParser.name()); if (lexer.token() == Token.COMMA) { lexer.nextToken(); @@ -1183,7 +1180,7 @@ public SQLPartitionBy parsePartitionBy() { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLPartition partitionDef = this.getExprParser() .parsePartition(); @@ -1202,7 +1199,6 @@ public SQLPartitionBy parsePartitionBy() { } protected SQLPartitionByRange partitionByRange1() { - acceptIdentifier("RANGE"); SQLPartitionByRange clause = new SQLPartitionByRange(); @@ -1214,7 +1210,7 @@ protected SQLPartitionByRange partitionByRange1() { } else { acceptIdentifier("COLUMNS"); accept(Token.LPAREN); - for (;;) { + for (; ; ) { clause.addColumn(this.exprParser.name()); if (lexer.token() == Token.COMMA) { lexer.nextToken(); @@ -1253,7 +1249,7 @@ protected SQLPartitionByRange partitionByRange() { } else { acceptIdentifier("COLUMNS"); accept(Token.LPAREN); - for (;;) { + for (; ; ) { clause.addColumn(this.exprParser.name()); if (lexer.token() == Token.COMMA) { lexer.nextToken(); @@ -1332,7 +1328,7 @@ protected void partitionClauseRest(SQLPartitionBy clause) { } accept(Token.LPAREN); - for (;;) { + for (; ; ) { subPartitionKey.addColumn(this.exprParser.name()); if (lexer.token() == Token.COMMA) { lexer.nextToken(); @@ -1387,7 +1383,7 @@ protected void partitionClauseRest(SQLPartitionBy clause) { lexer.nextToken(); accept(Token.LPAREN); - for(;;) { + for (; ; ) { SQLExpr expr = this.exprParser.expr(); if (expr instanceof SQLIdentifierExpr @@ -1441,7 +1437,7 @@ protected void partitionClauseRest(SQLPartitionBy clause) { } else { acceptIdentifier("COLUMNS"); accept(Token.LPAREN); - for (;;) { + for (; ; ) { subPartitionList.addColumn(this.exprParser.parseColumn()); if (lexer.token() == Token.COMMA) { lexer.nextToken(); @@ -1476,7 +1472,7 @@ protected void partitionClauseRest(SQLPartitionBy clause) { lexer.nextToken(); } else if (lexer.identifierEquals(FnvHash.Constants.PARTITIONS)) { // ADB lexer.nextToken(); - subPartitionByClause.setSubPartitionsCount((SQLIntegerExpr)exprParser.expr()); + subPartitionByClause.setSubPartitionsCount((SQLIntegerExpr) exprParser.expr()); subPartitionByClause.getAttributes().put("adb.partitons", true); } 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 eb500b6a06..dffaf67473 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 @@ -35,13 +35,13 @@ import java.util.List; public class MySqlExprParser extends SQLExprParser { - public final static String[] AGGREGATE_FUNCTIONS; + public static final String[] AGGREGATE_FUNCTIONS; - public final static long[] AGGREGATE_FUNCTIONS_CODES; + public static final long[] AGGREGATE_FUNCTIONS_CODES; - public final static String[] SINGLE_WORD_TABLE_OPTIONS; + public static final String[] SINGLE_WORD_TABLE_OPTIONS; - public final static long[] SINGLE_WORD_TABLE_OPTIONS_CODES; + public static final long[] SINGLE_WORD_TABLE_OPTIONS_CODES; static { String[] strings = { @@ -89,18 +89,18 @@ public class MySqlExprParser extends SQLExprParser { } } - public MySqlExprParser(Lexer lexer){ + public MySqlExprParser(Lexer lexer) { super(lexer, DbType.mysql); this.aggregateFunctions = AGGREGATE_FUNCTIONS; this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; } - public MySqlExprParser(String sql){ + public MySqlExprParser(String sql) { this(new MySqlLexer(sql)); this.lexer.nextToken(); } - public MySqlExprParser(String sql, SQLParserFeature... features){ + public MySqlExprParser(String sql, SQLParserFeature... features) { super(new MySqlLexer(sql, features), DbType.mysql); this.aggregateFunctions = AGGREGATE_FUNCTIONS; this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; @@ -153,13 +153,12 @@ public MySqlExprParser(String sql, SQLParserFeature... features){ } - public MySqlExprParser(String sql, boolean keepComments){ + public MySqlExprParser(String sql, boolean keepComments) { this(new MySqlLexer(sql, true, keepComments)); this.lexer.nextToken(); } - - public MySqlExprParser(String sql, boolean skipComment,boolean keepComments){ + public MySqlExprParser(String sql, boolean skipComment, boolean keepComments) { this(new MySqlLexer(sql, skipComment, keepComments)); this.lexer.nextToken(); } @@ -168,10 +167,10 @@ public SQLExpr primary() { final Token tok = lexer.token(); switch (tok) { case IDENTIFIER: - final long hash_lower = lexer.hash_lower(); + final long hash_lower = lexer.hashLCase(); Lexer.SavePoint savePoint = lexer.mark(); - if(hash_lower == FnvHash.Constants.OUTLINE) { + if (hash_lower == FnvHash.Constants.OUTLINE) { lexer.nextToken(); try { SQLExpr file = primary(); @@ -193,17 +192,17 @@ public SQLExpr primary() { } SQLCurrentTimeExpr currentTimeExpr = null; - if(hash_lower == FnvHash.Constants.CURRENT_TIME && !quoteStart) { + if (hash_lower == FnvHash.Constants.CURRENT_TIME && !quoteStart) { currentTimeExpr = new SQLCurrentTimeExpr(SQLCurrentTimeExpr.Type.CURRENT_TIME); - } else if(hash_lower == FnvHash.Constants.CURRENT_TIMESTAMP && !quoteStart) { + } else if (hash_lower == FnvHash.Constants.CURRENT_TIMESTAMP && !quoteStart) { currentTimeExpr = new SQLCurrentTimeExpr(SQLCurrentTimeExpr.Type.CURRENT_TIMESTAMP); - } else if(hash_lower == FnvHash.Constants.CURRENT_DATE && !quoteStart) { + } else if (hash_lower == FnvHash.Constants.CURRENT_DATE && !quoteStart) { currentTimeExpr = new SQLCurrentTimeExpr(SQLCurrentTimeExpr.Type.CURRENT_DATE); - } else if(hash_lower == FnvHash.Constants.CURDATE && !quoteStart) { + } else if (hash_lower == FnvHash.Constants.CURDATE && !quoteStart) { currentTimeExpr = new SQLCurrentTimeExpr(SQLCurrentTimeExpr.Type.CURDATE); - } else if(hash_lower == FnvHash.Constants.LOCALTIME && !quoteStart) { + } else if (hash_lower == FnvHash.Constants.LOCALTIME && !quoteStart) { currentTimeExpr = new SQLCurrentTimeExpr(SQLCurrentTimeExpr.Type.LOCALTIME); - } else if(hash_lower == FnvHash.Constants.LOCALTIMESTAMP && !quoteStart) { + } else if (hash_lower == FnvHash.Constants.LOCALTIMESTAMP && !quoteStart) { currentTimeExpr = new SQLCurrentTimeExpr(SQLCurrentTimeExpr.Type.LOCALTIMESTAMP); } else if (hash_lower == FnvHash.Constants.JSON_TABLE) { if (lexer.identifierEquals("JSON_TABLE")) { @@ -218,7 +217,7 @@ public SQLExpr primary() { this.expr()); acceptIdentifier("COLUMNS"); accept(Token.LPAREN); - for (;lexer.token() != Token.RPAREN;) { + for (; lexer.token() != Token.RPAREN; ) { jsonTable.addColumn( parseJsonTableColumn()); @@ -233,7 +232,7 @@ public SQLExpr primary() { accept(Token.RPAREN); return jsonTable; } - } else if((hash_lower == FnvHash.Constants._LATIN1) && !quoteStart) { + } else if ((hash_lower == FnvHash.Constants._LATIN1) && !quoteStart) { lexer.nextToken(); String hexString; @@ -270,7 +269,7 @@ public SQLExpr primary() { } return primaryRest(charExpr); - } else if((hash_lower == FnvHash.Constants._UTF8 || hash_lower == FnvHash.Constants._UTF8MB4) + } else if ((hash_lower == FnvHash.Constants._UTF8 || hash_lower == FnvHash.Constants._UTF8MB4) && !quoteStart) { lexer.nextToken(); @@ -309,7 +308,7 @@ public SQLExpr primary() { } return primaryRest(charExpr); - } else if((hash_lower == FnvHash.Constants._UTF16 || hash_lower == FnvHash.Constants._UCS2) + } else if ((hash_lower == FnvHash.Constants._UTF16 || hash_lower == FnvHash.Constants._UCS2) && !quoteStart) { lexer.nextToken(); @@ -335,7 +334,7 @@ public SQLExpr primary() { } return primaryRest(charExpr); - } else if((hash_lower == FnvHash.Constants._UTF16LE) + } else if ((hash_lower == FnvHash.Constants._UTF16LE) && !quoteStart) { lexer.nextToken(); @@ -361,7 +360,7 @@ public SQLExpr primary() { } return primaryRest(charExpr); - } else if(hash_lower == FnvHash.Constants._UTF32 && !quoteStart) { + } else if (hash_lower == FnvHash.Constants._UTF32 && !quoteStart) { lexer.nextToken(); String hexString; @@ -386,7 +385,7 @@ public SQLExpr primary() { } return primaryRest(charExpr); - } else if(hash_lower == FnvHash.Constants._GBK && !quoteStart) { + } else if (hash_lower == FnvHash.Constants._GBK && !quoteStart) { lexer.nextToken(); String hexString; @@ -411,7 +410,7 @@ public SQLExpr primary() { } return primaryRest(charExpr); - } else if(hash_lower == FnvHash.Constants._UJIS && !quoteStart) { + } else if (hash_lower == FnvHash.Constants._UJIS && !quoteStart) { lexer.nextToken(); String hexString; @@ -436,7 +435,7 @@ public SQLExpr primary() { } return primaryRest(charExpr); - } else if(hash_lower == FnvHash.Constants._BIG5 && !quoteStart) { + } else if (hash_lower == FnvHash.Constants._BIG5 && !quoteStart) { lexer.nextToken(); String hexString; @@ -465,7 +464,7 @@ public SQLExpr primary() { lexer.nextToken(); return primaryRest( new SQLCurrentUserExpr()); - } else if(hash_lower == -5808529385363204345L && lexer.charAt(lexer.pos()) == '\'') { // hex + } else if (hash_lower == -5808529385363204345L && lexer.charAt(lexer.pos()) == '\'') { // hex lexer.nextToken(); SQLHexExpr hex = new SQLHexExpr(lexer.stringVal()); lexer.nextToken(); @@ -564,7 +563,7 @@ protected MySqlJSONTableExpr.Column parseJsonTableColumn() { && name.nameHashCode64() == FnvHash.Constants.NESTED) { acceptIdentifier("COLUMNS"); accept(Token.LPAREN); - for (;lexer.token() != Token.RPAREN;) { + for (; lexer.token() != Token.RPAREN; ) { MySqlJSONTableExpr.Column nestedColumn = parseJsonTableColumn(); column.addNestedColumn(nestedColumn); @@ -774,7 +773,6 @@ private SQLExpr userNameRest(SQLExpr expr) { userName.setUserName(((SQLIdentifierExpr) expr).getName()); } - String strVal = lexer.stringVal(); lexer.nextToken(); @@ -880,15 +878,13 @@ protected SQLExpr parseInterval() { } accept(Token.RPAREN); - - // - - if (methodInvokeExpr.getArguments().size() == 1 // + + if (methodInvokeExpr.getArguments().size() == 1 && lexer.token() == Token.IDENTIFIER) { SQLExpr value = methodInvokeExpr.getArguments().get(0); String unit = lexer.stringVal(); lexer.nextToken(); - + SQLIntervalExpr intervalExpr = new SQLIntervalExpr(); intervalExpr.setValue(value); intervalExpr.setUnit(SQLIntervalUnit.valueOf(unit.toUpperCase())); @@ -906,7 +902,7 @@ protected SQLExpr parseInterval() { SQLIntervalUnit intervalUnit = null; String unit = lexer.stringVal(); - long unitHash = lexer.hash_lower(); + long unitHash = lexer.hashLCase(); lexer.nextToken(); intervalUnit = SQLIntervalUnit.valueOf(unit.toUpperCase()); @@ -1107,7 +1103,7 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { } if (lexer.identifierEquals(FnvHash.Constants.PRECISION) - && column.getDataType().nameHashCode64() ==FnvHash.Constants.DOUBLE) { + && column.getDataType().nameHashCode64() == FnvHash.Constants.DOUBLE) { lexer.nextToken(); } @@ -1128,7 +1124,7 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { SQLExpr expr = expr(); column.setStorage(expr); } - + if (lexer.token() == Token.AS) { lexer.nextToken(); accept(Token.LPAREN); @@ -1141,7 +1137,7 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { lexer.nextToken(); column.setStored(true); } - + if (lexer.identifierEquals(FnvHash.Constants.VIRTUAL)) { lexer.nextToken(); column.setVirtual(true); @@ -1183,7 +1179,7 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { accept(Token.LPAREN); SQLAnnIndex annIndex = new SQLAnnIndex(); - for (;;) { + for (; ; ) { if (lexer.identifierEquals(FnvHash.Constants.TYPE)) { lexer.nextToken(); accept(Token.EQ); @@ -1227,7 +1223,7 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { protected SQLDataType parseDataTypeRest(SQLDataType dataType) { super.parseDataTypeRest(dataType); - for (;;) { + for (; ; ) { if (lexer.identifierEquals(FnvHash.Constants.UNSIGNED)) { lexer.nextToken(); ((SQLDataTypeImpl) dataType).setUnsigned(true); @@ -1553,20 +1549,20 @@ public MysqlForeignKey parseForeignKey() { while (lexer.token() == Token.ON) { lexer.nextToken(); - + if (lexer.token() == Token.DELETE) { lexer.nextToken(); - + Option option = parseReferenceOption(); fk.setOnDelete(option); } else if (lexer.token() == Token.UPDATE) { lexer.nextToken(); - + Option option = parseReferenceOption(); fk.setOnUpdate(option); } else { throw new ParserException("syntax error, expect DELETE or UPDATE, actual " + lexer.token() + " " - + lexer.info()); + + lexer.info()); } } return fk; @@ -1610,7 +1606,7 @@ public SQLSubPartition parseSubPartition() { SQLSubPartition subPartition = new SQLSubPartition(); subPartition.setName(this.name()); - for (;;) { + for (; ; ) { boolean storage = false; if (lexer.identifierEquals(FnvHash.Constants.DATA)) { lexer.nextToken(); @@ -1674,7 +1670,7 @@ public SQLSubPartition parseSubPartition() { return subPartition; } - + public SQLPartition parsePartition() { if (lexer.identifierEquals(FnvHash.Constants.DBPARTITION) || lexer.identifierEquals(FnvHash.Constants.TBPARTITION) @@ -1701,7 +1697,7 @@ public SQLPartition parsePartition() { partitionDef.setValues(values); } - for (;;) { + for (; ; ) { boolean storage = false; if (lexer.identifierEquals(FnvHash.Constants.DATA)) { lexer.nextToken(); @@ -1739,7 +1735,7 @@ public SQLPartition parsePartition() { SQLExpr minRows = this.primary(); partitionDef.setMaxRows(minRows); } else if (lexer.identifierEquals(FnvHash.Constants.ENGINE) || // - (storage = (lexer.token() == Token.STORAGE || lexer.identifierEquals(FnvHash.Constants.STORAGE)))) { + (storage = (lexer.token() == Token.STORAGE || lexer.identifierEquals(FnvHash.Constants.STORAGE)))) { if (storage) { lexer.nextToken(); } @@ -1762,24 +1758,24 @@ public SQLPartition parsePartition() { break; } } - + if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - - for (;;) { + + for (; ; ) { acceptIdentifier("SUBPARTITION"); - + SQLSubPartition subPartition = parseSubPartition(); partitionDef.addSubPartition(subPartition); - + if (lexer.token() == Token.COMMA) { lexer.nextToken(); continue; } break; } - + accept(Token.RPAREN); } @@ -1794,7 +1790,7 @@ public SQLPartition parsePartition() { } protected SQLExpr parseAliasExpr(String alias) { - if(isEnabled(SQLParserFeature.KeepNameQuotes)) { + if (isEnabled(SQLParserFeature.KeepNameQuotes)) { return new SQLIdentifierExpr(alias); } Lexer newLexer = new Lexer(alias); @@ -1807,7 +1803,7 @@ public boolean parseTableOptions(List assignItems, SQLDDLStatemen boolean succeed = false; while (lexer.token() != Token.EOF) { - final long hash = lexer.hash_lower(); + final long hash = lexer.hashLCase(); final int idx = Arrays.binarySearch(SINGLE_WORD_TABLE_OPTIONS_CODES, hash); SQLAssignItem assignItem = null; Lexer.SavePoint mark = null; @@ -1875,8 +1871,9 @@ public boolean parseTableOptions(List assignItems, SQLDDLStatemen // STORAGE_POLICY assignItem = new SQLAssignItem( - new SQLIdentifierExpr(SINGLE_WORD_TABLE_OPTIONS[idx]) - , idx == 9 ? charExpr() : expr()); + new SQLIdentifierExpr(SINGLE_WORD_TABLE_OPTIONS[idx]), + idx == 9 ? charExpr() : expr() + ); } } else { // Following may not table options. Save mark. diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlInsertReader.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlInsertReader.java index 20bf9cc0d8..98a6d5802f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlInsertReader.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlInsertReader.java @@ -1,6 +1,5 @@ package com.alibaba.druid.sql.dialect.mysql.parser; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; 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 e8fae62bd9..2b4b56c96e 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 @@ -22,14 +22,13 @@ import java.util.Map; import static com.alibaba.druid.sql.parser.CharTypes.isFirstIdentifierChar; -import static com.alibaba.druid.sql.parser.CharTypes.isWhitespace; import static com.alibaba.druid.sql.parser.LayoutCharacters.EOI; import static com.alibaba.druid.sql.parser.Token.LITERAL_CHARS; public class MySqlLexer extends Lexer { public static SymbolTable quoteTable = new SymbolTable(8192); - public final static Keywords DEFAULT_MYSQL_KEYWORDS; + public static final Keywords DEFAULT_MYSQL_KEYWORDS; static { Map map = new HashMap(); @@ -53,10 +52,10 @@ public class MySqlLexer extends Lexer { map.put("END", Token.END); map.put("DIV", Token.DIV); map.put("MERGE", Token.MERGE); - + // for oceanbase & mysql 5.7 map.put("PARTITION", Token.PARTITION); - + map.put("CONTINUE", Token.CONTINUE); map.put("UNDO", Token.UNDO); map.put("SQLSTATE", Token.SQLSTATE); @@ -73,16 +72,16 @@ public class MySqlLexer extends Lexer { dbType = DbType.mysql; } - public MySqlLexer(char[] input, int inputLength, boolean skipComment){ + public MySqlLexer(char[] input, int inputLength, boolean skipComment) { super(input, inputLength, skipComment); super.keywords = DEFAULT_MYSQL_KEYWORDS; } - public MySqlLexer(String input){ + public MySqlLexer(String input) { this(input, true, true); } - public MySqlLexer(String input, SQLParserFeature... features){ + public MySqlLexer(String input, SQLParserFeature... features) { super(input, true); this.keepComments = true; super.keywords = DEFAULT_MYSQL_KEYWORDS; @@ -92,7 +91,7 @@ public MySqlLexer(String input, SQLParserFeature... features){ } } - public MySqlLexer(String input, boolean skipComment, boolean keepComments){ + public MySqlLexer(String input, boolean skipComment, boolean keepComments) { super(input, skipComment); this.skipComment = skipComment; this.keepComments = keepComments; @@ -114,7 +113,7 @@ public void scanSharp() { scanChar(); mark = pos; bufPos = 0; - for (;;) { + for (; ; ) { if (ch == '\r') { if (charAt(pos + 1) == '\n') { bufPos += 2; @@ -147,7 +146,7 @@ public void scanSharp() { if (commentHandler != null && commentHandler.handle(lastToken, stringVal)) { return; } - + endOfComment = isEOF(); if (!isAllowComment() && (isEOF() || !isSafeComment(stringVal))) { @@ -167,7 +166,7 @@ public void scanVariable() { ++pos; ++bufPos; char ch; - for (;;) { + for (; ; ) { ch = charAt(++pos); if (ch == '`') { @@ -190,7 +189,7 @@ public void scanVariable() { ++pos; ++bufPos; char ch; - for (;;) { + for (; ; ) { ch = charAt(++pos); if (ch == '}') { @@ -210,7 +209,7 @@ public void scanVariable() { stringVal = subString(mark, bufPos); token = Token.VARIANT; } else { - for (;;) { + for (; ; ) { ch = charAt(++pos); if (!isIdentifierChar(ch)) { @@ -245,7 +244,7 @@ protected void scanVariable_at() { ++pos; ++bufPos; char ch; - for (;;) { + for (; ; ) { ch = charAt(++pos); if (ch == '`') { @@ -284,7 +283,7 @@ protected void scanVariable_at() { } public void scanIdentifier() { - hash_lower = 0; + hashLCase = 0; hash = 0; final char first = ch; @@ -296,7 +295,7 @@ && charAt(pos + 2) == '\'') { initBuff(32); pos += 3; - for (;;pos++) { + for (; ; pos++) { ch = charAt(pos); if (isEOF()) { lexError("unclosed.str.lit"); @@ -337,7 +336,7 @@ && charAt(pos + 2) == '\'') { && charAt(pos + 1) == '\'') { int i = 2; int mark = pos + 2; - for (;;++i) { + for (; ; ++i) { char ch = charAt(pos + i); if (ch == '0' || ch == '1') { continue; @@ -364,10 +363,10 @@ && charAt(pos + 1) == '\'') { int startPos = pos + 1; int quoteIndex; - hash_lower = 0xcbf29ce484222325L; + hashLCase = 0xcbf29ce484222325L; hash = 0xcbf29ce484222325L; - for (int i = startPos;; ++i) { + for (int i = startPos; ; ++i) { if (i >= text.length()) { throw new ParserException("illegal identifier. " + info()); } @@ -384,8 +383,8 @@ && charAt(pos + 1) == '\'') { } } - hash_lower ^= ((ch >= 'A' && ch <= 'Z') ? (ch + 32) : ch); - hash_lower *= 0x100000001b3L; + hashLCase ^= ((ch >= 'A' && ch <= 'Z') ? (ch + 32) : ch); + hashLCase *= 0x100000001b3L; hash ^= ch; hash *= 0x100000001b3L; @@ -402,11 +401,11 @@ && charAt(pos + 1) == '\'') { throw new ParserException("illegal identifier. " + info()); } - hash_lower = 0xcbf29ce484222325L; + hashLCase = 0xcbf29ce484222325L; hash = 0xcbf29ce484222325L; - hash_lower ^= ((ch >= 'A' && ch <= 'Z') ? (ch + 32) : ch); - hash_lower *= 0x100000001b3L; + hashLCase ^= ((ch >= 'A' && ch <= 'Z') ? (ch + 32) : ch); + hashLCase *= 0x100000001b3L; hash ^= ch; hash *= 0x100000001b3L; @@ -414,7 +413,7 @@ && charAt(pos + 1) == '\'') { mark = pos; bufPos = 1; char ch = '\0'; - for (;;) { + for (; ; ) { ch = charAt(++pos); if (!isIdentifierChar(ch)) { @@ -423,8 +422,8 @@ && charAt(pos + 1) == '\'') { bufPos++; - hash_lower ^= ((ch >= 'A' && ch <= 'Z') ? (ch + 32) : ch); - hash_lower *= 0x100000001b3L; + hashLCase ^= ((ch >= 'A' && ch <= 'Z') ? (ch + 32) : ch); + hashLCase *= 0x100000001b3L; hash ^= ch; hash *= 0x100000001b3L; @@ -443,7 +442,7 @@ && charAt(pos + 1) == '\'') { return; } - Token tok = keywords.getKeyword(hash_lower); + Token tok = keywords.getKeyword(hashLCase); if (tok != null) { token = tok; if (token == Token.IDENTIFIER) { @@ -466,7 +465,7 @@ protected final void scanString() { public void skipFirstHintsOrMultiCommentAndNextToken() { int starIndex = pos + 2; - for (;;) { + for (; ; ) { starIndex = text.indexOf('*', starIndex); if (starIndex == -1 || starIndex == text.length() - 1) { this.token = Token.ERROR; @@ -504,7 +503,6 @@ public void skipFirstHintsOrMultiCommentAndNextToken() { return; } - if (c0 == 'd' && c1 == 'e' && c2 == 'l' && c3 == 'e' && c4 == 't' && c5 == 'e' && c6 == ' ') { this.comments = null; reset(pos_6, ' ', Token.DELETE); @@ -549,14 +547,14 @@ public void skipFirstHintsOrMultiCommentAndNextToken() { public void scanComment() { Token lastToken = this.token; - if(ch == '-') { + if (ch == '-') { /* * just for tddl test case; * test case : MySqlSelectTest_plus_sub_comment.java */ char before_1 = pos == 0 ? ' ' : charAt(pos - 1); char next_2 = charAt(pos + 2); - if(isDigit(next_2)) { + if (isDigit(next_2)) { scanChar(); token = Token.SUB; return; @@ -599,11 +597,11 @@ public void scanComment() { || ch == '+' // oceanbase hints || ((ch == 'T' && //TDDL hint - charAt(pos + 1) == 'D' // - && charAt(pos + 2) == 'D' // - && charAt(pos + 3) == 'L') - && isEnabled(SQLParserFeature.TDDLHint)) - ) { + charAt(pos + 1) == 'D' // + && charAt(pos + 2) == 'D' // + && charAt(pos + 3) == 'L') + && isEnabled(SQLParserFeature.TDDLHint)) + ) { isHint = true; scanChar(); bufPos++; @@ -656,7 +654,7 @@ && isEnabled(SQLParserFeature.TDDLHint)) ch = charAt(pos); endOfComment = isEOF(); - + if (commentHandler != null && commentHandler.handle(lastToken, stringVal)) { return; @@ -682,7 +680,7 @@ && isEnabled(SQLParserFeature.TDDLHint)) int starIndex = pos; - for (;;) { + for (; ; ) { starIndex = text.indexOf('*', starIndex); if (starIndex == -1 || starIndex == text.length() - 1) { this.token = Token.ERROR; @@ -701,7 +699,7 @@ && isEnabled(SQLParserFeature.TDDLHint)) endOfComment = isEOF(); if (commentHandler != null - && commentHandler.handle(lastToken, stringVal)) { + && commentHandler.handle(lastToken, stringVal)) { return; } @@ -716,7 +714,7 @@ && isEnabled(SQLParserFeature.TDDLHint)) scanChar(); bufPos++; - for (;;) { + for (; ; ) { if (ch == '\r') { if (charAt(pos + 1) == '\n') { bufPos += 2; @@ -751,7 +749,7 @@ && isEnabled(SQLParserFeature.TDDLHint)) } endOfComment = isEOF(); - + if (!isAllowComment() && (isEOF() || !isSafeComment(stringVal))) { throw new NotAllowCommentException(); } @@ -759,8 +757,9 @@ && isEnabled(SQLParserFeature.TDDLHint)) return; } } - - private final static boolean[] identifierFlags = new boolean[256]; + + private static final boolean[] identifierFlags = new boolean[256]; + static { for (char c = 0; c < identifierFlags.length; ++c) { if (c >= 'A' && c <= 'Z') { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectIntoParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectIntoParser.java index 1e69585ea3..86180b6989 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectIntoParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectIntoParser.java @@ -36,28 +36,26 @@ import java.util.List; /** - * * @author zz [455910092@qq.com] */ public class MySqlSelectIntoParser extends SQLSelectParser { - private List argsList; + private List argsList; - public MySqlSelectIntoParser(SQLExprParser exprParser){ + public MySqlSelectIntoParser(SQLExprParser exprParser) { super(exprParser); } - public MySqlSelectIntoParser(String sql){ + public MySqlSelectIntoParser(String sql) { this(new MySqlExprParser(sql)); } - - public MySqlSelectIntoStatement parseSelectInto() - { - SQLSelect select=select(); - MySqlSelectIntoStatement stmt=new MySqlSelectIntoStatement(); - stmt.setSelect(select); - stmt.setVarList(argsList); - return stmt; - + + public MySqlSelectIntoStatement parseSelectInto() { + SQLSelect select = select(); + MySqlSelectIntoStatement stmt = new MySqlSelectIntoStatement(); + stmt.setSelect(select); + stmt.setVarList(argsList); + return stmt; + } @Override @@ -136,8 +134,8 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { } parseSelectList(queryBlock); - - argsList=parseIntoArgs(); + + argsList = parseIntoArgs(); } parseFrom(queryBlock); @@ -176,37 +174,35 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { return queryRest(queryBlock, acceptUnion); } + /** * parser the select into arguments + * * @return */ - protected List parseIntoArgs() { - - List args=new ArrayList(); - if (lexer.token() == (Token.INTO)) { - accept(Token.INTO); - //lexer.nextToken(); - for (;;) { - SQLExpr var = exprParser.primary(); - if (var instanceof SQLIdentifierExpr) { - var = new SQLVariantRefExpr( - ((SQLIdentifierExpr) var).getName()); - } - args.add(var); - if (lexer.token() == Token.COMMA) { - accept(Token.COMMA); - continue; - } - else - { - break; - } - } - } - return args; - } - - + protected List parseIntoArgs() { + List args = new ArrayList(); + if (lexer.token() == (Token.INTO)) { + accept(Token.INTO); + //lexer.nextToken(); + for (; ; ) { + SQLExpr var = exprParser.primary(); + if (var instanceof SQLIdentifierExpr) { + var = new SQLVariantRefExpr( + ((SQLIdentifierExpr) var).getName()); + } + args.add(var); + if (lexer.token() == Token.COMMA) { + accept(Token.COMMA); + continue; + } else { + break; + } + } + } + return args; + } + protected void parseInto(SQLSelectQueryBlock queryBlock) { if (lexer.token() == (Token.INTO)) { lexer.nextToken(); @@ -342,7 +338,7 @@ public SQLUnionQuery unionRest(SQLUnionQuery union) { } return super.unionRest(union); } - + public MySqlExprParser getExprParser() { return (MySqlExprParser) exprParser; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java index 36f35bc14b..abe7eb5da5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java @@ -32,22 +32,21 @@ import java.util.List; public class MySqlSelectParser extends SQLSelectParser { - - protected boolean returningFlag = false; + protected boolean returningFlag; protected MySqlUpdateStatement updateStmt; - public MySqlSelectParser(SQLExprParser exprParser){ + public MySqlSelectParser(SQLExprParser exprParser) { super(exprParser); } - public MySqlSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache){ + public MySqlSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache) { super(exprParser, selectListCache); } - public MySqlSelectParser(String sql){ + public MySqlSelectParser(String sql) { this(new MySqlExprParser(sql)); } - + public void parseFrom(SQLSelectQueryBlock queryBlock) { if (lexer.token() == Token.EOF || lexer.token() == Token.SEMI @@ -67,7 +66,7 @@ public void parseFrom(SQLSelectQueryBlock queryBlock) { } return; } - + lexer.nextTokenIdent(); while (lexer.token() == Token.HINT) { @@ -101,7 +100,6 @@ public void parseFrom(SQLSelectQueryBlock queryBlock) { queryBlock.setFrom(from); } - @Override public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { List hints = null; @@ -171,7 +169,7 @@ public boolean handle(Token lastToken, String comment) { if (lexer.token() == Token.SELECT) { lexer.nextTokenValue(); - for(;;) { + for (; ; ) { if (lexer.token() == Token.HINT) { this.exprParser.parseHints(queryBlock.getHints()); } else { @@ -179,7 +177,6 @@ public boolean handle(Token lastToken, String comment) { } } - while (true) { Token token = lexer.token(); if (token == (Token.DISTINCT)) { @@ -243,7 +240,7 @@ public boolean handle(Token lastToken, String comment) { SQLName partition = this.exprParser.name(); queryBlock.setForcePartition(partition); } - + parseInto(queryBlock); } @@ -339,7 +336,7 @@ public boolean handle(Token lastToken, String comment) { public SQLTableSource parseTableSource() { return parseTableSource(null); } - + public SQLTableSource parseTableSource(SQLObject parent) { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); @@ -365,7 +362,7 @@ public SQLTableSource parseTableSource(SQLObject parent) { if (lexer.token() == Token.LIMIT) { SQLLimit limit = this.exprParser.parseLimit(); if (parent != null && parent instanceof SQLSelectQueryBlock) { - ((SQLSelectQueryBlock) parent).setLimit(limit); + ((SQLSelectQueryBlock) parent).setLimit(limit); } if (parent == null && noOrderByAndLimit) { innerQuery.setLimit(limit); @@ -391,7 +388,7 @@ public SQLTableSource parseTableSource(SQLObject parent) { if (hints != null) { tableSource.getHints().addAll(hints); } - + } else if (lexer.token() == Token.LPAREN) { tableSource = parseTableSource(); if (lexer.token() != Token.RPAREN && tableSource instanceof SQLSubqueryTableSource) { @@ -463,8 +460,8 @@ public SQLTableSource parseTableSource(SQLObject parent) { if (lexer.token() == Token.VALUES) { return parseValues(); } - - if(lexer.token() == Token.UPDATE) { + + if (lexer.token() == Token.UPDATE) { SQLTableSource tableSource = new MySqlUpdateTableSource(parseUpdateStatment()); return parseTableSourceRest(tableSource); } @@ -477,7 +474,7 @@ public SQLTableSource parseTableSource(SQLObject parent) { Lexer.SavePoint mark = lexer.mark(); lexer.nextToken(); - if (lexer.token() == Token.LPAREN){ + if (lexer.token() == Token.LPAREN) { lexer.nextToken(); SQLUnnestTableSource unnest = new SQLUnnestTableSource(); this.exprParser.exprList(unnest.getItems(), unnest); @@ -510,11 +507,11 @@ public SQLTableSource parseTableSource(SQLObject parent) { parseTableSourceQueryTableExpr(tableReference); SQLTableSource tableSrc = parseTableSourceRest(tableReference); - + if (lexer.hasComment() && lexer.isKeepComments()) { tableSrc.addAfterComment(lexer.readAndResetComments()); } - + return tableSrc; } @@ -532,22 +529,22 @@ protected MySqlUpdateStatement parseUpdateStatment() { lexer.nextToken(); update.setIgnore(true); } - + if (lexer.identifierEquals(FnvHash.Constants.COMMIT_ON_SUCCESS)) { lexer.nextToken(); update.setCommitOnSuccess(true); } - + if (lexer.identifierEquals(FnvHash.Constants.ROLLBACK_ON_FAIL)) { lexer.nextToken(); update.setRollBackOnFail(true); } - + if (lexer.identifierEquals(FnvHash.Constants.QUEUE_ON_PK)) { lexer.nextToken(); update.setQueryOnPk(true); } - + if (lexer.identifierEquals(FnvHash.Constants.TARGET_AFFECT_ROW)) { lexer.nextToken(); SQLExpr targetAffectRow = this.exprParser.expr(); @@ -561,7 +558,7 @@ protected MySqlUpdateStatement parseUpdateStatment() { lexer.nextToken(); acceptIdentifier("PARTITIONS"); update.setForceAllPartitions(true); - } else if (lexer.identifierEquals(FnvHash.Constants.PARTITIONS)){ + } else if (lexer.identifierEquals(FnvHash.Constants.PARTITIONS)) { lexer.nextToken(); update.setForceAllPartitions(true); } else if (lexer.token() == Token.PARTITION) { @@ -583,7 +580,7 @@ protected MySqlUpdateStatement parseUpdateStatment() { accept(Token.SET); - for (;;) { + for (; ; ) { SQLUpdateSetItem item = this.exprParser.parseUpdateSetItem(); update.addItem(item); @@ -601,10 +598,10 @@ protected MySqlUpdateStatement parseUpdateStatment() { update.setOrderBy(this.exprParser.parseOrderBy()); update.setLimit(this.exprParser.parseLimit()); - + return update; } - + protected void parseInto(SQLSelectQueryBlock queryBlock) { if (lexer.token() != Token.INTO) { return; @@ -717,7 +714,6 @@ protected SQLTableSource primaryTableSourceRest(SQLTableSource tableSource) { return tableSource; } - public SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { if (lexer.identifierEquals(FnvHash.Constants.TABLESAMPLE) && tableSource instanceof SQLExprTableSource) { Lexer.SavePoint mark = lexer.mark(); 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 7dd4e81a03..2332d2b6cc 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 @@ -38,20 +38,8 @@ import java.util.List; import static com.alibaba.druid.sql.parser.Token.*; -import static com.alibaba.druid.sql.parser.Token.COLUMN; -import static com.alibaba.druid.sql.parser.Token.COMMA; -import static com.alibaba.druid.sql.parser.Token.DATABASE; -import static com.alibaba.druid.sql.parser.Token.EQ; -import static com.alibaba.druid.sql.parser.Token.GROUP; -import static com.alibaba.druid.sql.parser.Token.LPAREN; -import static com.alibaba.druid.sql.parser.Token.RPAREN; -import static com.alibaba.druid.sql.parser.Token.TABLE; -import static com.alibaba.druid.sql.parser.Token.VIEW; -import static com.alibaba.druid.sql.parser.Token.WHERE; -import static com.alibaba.druid.sql.parser.Token.WITH; public class MySqlStatementParser extends SQLStatementParser { - private static final String AUTO_INCREMENT = "AUTO_INCREMENT"; private static final String AVG_ROW_LENGTH = "AVG_ROW_LENGTH"; private static final String CHECKSUM2 = "CHECKSUM"; @@ -183,7 +171,7 @@ public MySqlDeleteStatement parseDeleteStatement() { lexer.nextToken(); acceptIdentifier("PARTITIONS"); deleteStatement.setForceAllPartitions(true); - } else if (lexer.identifierEquals(FnvHash.Constants.PARTITIONS)){ + } else if (lexer.identifierEquals(FnvHash.Constants.PARTITIONS)) { lexer.nextToken(); deleteStatement.setForceAllPartitions(true); } else if (lexer.token() == Token.PARTITION) { @@ -250,7 +238,6 @@ public MySqlDeleteStatement parseDeleteStatement() { } public SQLStatement parseCreate() { - List comments = null; if (lexer.isKeepComments() && lexer.hasComment()) { comments = lexer.readAndResetComments(); @@ -322,8 +309,8 @@ public SQLStatement parseCreate() { if (replace) { lexer.reset(mark); } - SQLCreateDatabaseStatement stmt = (SQLCreateDatabaseStatement)parseCreateDatabase(); - if(physical) { + SQLCreateDatabaseStatement stmt = (SQLCreateDatabaseStatement) parseCreateDatabase(); + if (physical) { stmt.setPhysical(true); } return stmt; @@ -361,8 +348,7 @@ public SQLStatement parseCreate() { || lexer.identifierEquals(FnvHash.Constants.SPATIAL) || lexer.identifierEquals(FnvHash.Constants.ANN) || lexer.identifierEquals(FnvHash.Constants.GLOBAL) - || lexer.identifierEquals(FnvHash.Constants.LOCAL)) - { + || lexer.identifierEquals(FnvHash.Constants.LOCAL)) { if (replace) { lexer.reset(mark); } @@ -432,32 +418,32 @@ public SQLStatement parseCreate() { return parseCreateTable(); } - if(lexer.identifierEquals(FnvHash.Constants.TABLEGROUP)) { + if (lexer.identifierEquals(FnvHash.Constants.TABLEGROUP)) { lexer.reset(mark); return parseCreateTableGroup(); } - if(lexer.identifierEquals(FnvHash.Constants.OUTLINE)) { + if (lexer.identifierEquals(FnvHash.Constants.OUTLINE)) { lexer.reset(mark); return parseCreateOutline(); } - if(lexer.identifierEquals(FnvHash.Constants.CLUSTERED)) { + if (lexer.identifierEquals(FnvHash.Constants.CLUSTERED)) { lexer.reset(mark); return parseCreateIndex(true); } - if(lexer.identifierEquals(FnvHash.Constants.RESOURCE)) { + if (lexer.identifierEquals(FnvHash.Constants.RESOURCE)) { lexer.reset(mark); return parseCreateResourceGroup(); } - if(lexer.identifierEquals(FnvHash.Constants.MATERIALIZED)) { + if (lexer.identifierEquals(FnvHash.Constants.MATERIALIZED)) { lexer.reset(mark); return parseCreateMaterializedView(); } - if(lexer.identifierEquals(FnvHash.Constants.ROLE)) { + if (lexer.identifierEquals(FnvHash.Constants.ROLE)) { lexer.reset(mark); return parseCreateRole(); } @@ -465,8 +451,6 @@ public SQLStatement parseCreate() { throw new ParserException("TODO " + lexer.info()); } - - public SQLStatement parseCreateFullTextStatement() { Lexer.SavePoint mark = lexer.mark(); @@ -529,18 +513,16 @@ private SQLStatement parseFullTextAnalyzer() { accept(Token.LPAREN); for (; ; ) { - String key = ""; if (lexer.token() == Token.LITERAL_ALIAS || lexer.token() == Token.LITERAL_CHARS) { key = StringUtils.removeNameQuotes(lexer.stringVal()); if (key.equalsIgnoreCase("charfilter")) { - lexer.nextToken(); accept(Token.EQ); accept(Token.LBRACKET); - for(;;) { + for (; ; ) { String c = SQLUtils.normalize(this.exprParser.name().getSimpleName()); stmt.getCharfilters().add(c); if (lexer.token() == Token.COMMA) { @@ -741,7 +723,7 @@ public SQLStatement parseCreateTableSpace() { stmt.setAddDataFile(file); } - for (;;) { + for (; ; ) { if (lexer.identifierEquals(FnvHash.Constants.INITIAL_SIZE)) { lexer.nextToken(); if (lexer.token() == Token.EQ) { @@ -829,7 +811,7 @@ public SQLStatement parseCreateServer() { acceptIdentifier("OPTIONS"); accept(Token.LPAREN); - for (;;) { + for (; ; ) { if (lexer.identifierEquals(FnvHash.Constants.HOST)) { lexer.nextToken(); SQLExpr host = this.exprParser.expr(); @@ -957,7 +939,7 @@ public SQLStatement parseCreateUser() { if (password instanceof SQLIdentifierExpr || password instanceof SQLCharExpr) { userSpec.setPassword(password); } else { - throw new ParserException("syntax error. invalid " + password +" expression."); + throw new ParserException("syntax error. invalid " + password + " expression."); } } else if (lexer.token() == Token.WITH) { @@ -967,7 +949,7 @@ public SQLStatement parseCreateUser() { // IDENTIFIED WITH auth_plugin BY 'auth_string' // IDENTIFIED WITH auth_plugin AS 'auth_string' if (lexer.token() == Token.BY || - lexer.token() == Token.AS) { + lexer.token() == Token.AS) { userSpec.setPluginAs(lexer.token() == Token.AS); lexer.nextToken(); @@ -1288,7 +1270,6 @@ public boolean parseStatementListDialect(List statementList) { return true; } - if (lexer.identifierEquals(BINLOG)) { SQLStatement stmt = parseBinlog(); statementList.add(stmt); @@ -1339,7 +1320,7 @@ public boolean parseStatementListDialect(List statementList) { if (lexer.identifierEquals(FnvHash.Constants.EXPORT)) { lexer.nextToken(); - if(lexer.token() == Token.TABLE) { + if (lexer.token() == Token.TABLE) { SQLStatement stmt = parseExportTable(); statementList.add(stmt); } else if (lexer.token() == Token.DATABASE) { @@ -1588,13 +1569,12 @@ public boolean parseStatementListDialect(List statementList) { MySqlLockTableStatement stmt = new MySqlLockTableStatement(); - for(;;) { + for (; ; ) { MySqlLockTableStatement.Item item = new MySqlLockTableStatement.Item(); SQLExprTableSource tableSource = null; SQLName tableName = this.exprParser.name(); - if (lexer.token() == Token.AS) { lexer.nextToken(); String as = lexer.stringVal(); @@ -1673,7 +1653,6 @@ public boolean parseStatementListDialect(List statementList) { boolean tddlHints = false; boolean accept = false; - boolean acceptHint = false; switch (lexer.token()) { case SELECT: @@ -1698,9 +1677,9 @@ public boolean parseStatementListDialect(List statementList) { acceptHint = true; break; case IDENTIFIER: - acceptHint = lexer.hash_lower() == FnvHash.Constants.DUMP - || lexer.hash_lower() == FnvHash.Constants.RENAME - || lexer.hash_lower() == FnvHash.Constants.DESCRIBE; + acceptHint = lexer.hashLCase() == FnvHash.Constants.DUMP + || lexer.hashLCase() == FnvHash.Constants.RENAME + || lexer.hashLCase() == FnvHash.Constants.DESCRIBE; break; default: break; @@ -1713,16 +1692,15 @@ public boolean parseStatementListDialect(List statementList) { if (hintText.startsWith("+TDDL") || hintText.startsWith("+ TDDL") || hintText.startsWith("TDDL") - || hintText.startsWith("!TDDL")) - { + || hintText.startsWith("!TDDL")) { tddlHints = true; - } else if(hintText.startsWith("+")) { + } else if (hintText.startsWith("+")) { accept = true; } } if (tddlHints) { - SQLStatementImpl stmt = (SQLStatementImpl)this.parseStatement(); + SQLStatementImpl stmt = (SQLStatementImpl) this.parseStatement(); stmt.setHeadHints(hints); statementList.add(stmt); return true; @@ -1785,7 +1763,7 @@ public boolean parseStatementListDialect(List statementList) { lexer.nextToken(); MySqlCheckTableStatement stmt = new MySqlCheckTableStatement(); - for (;;) { + for (; ; ) { SQLName table = this.exprParser.name(); stmt.addTable(new SQLExprTableSource(table)); @@ -1813,7 +1791,7 @@ private SQLStatement parseArchive() { stmt.setTable(tableName); stmt.setType(new SQLIdentifierExpr("UPLOAD")); - if(lexer.token() == Token.LITERAL_INT) { + if (lexer.token() == Token.LITERAL_INT) { for (; ; ) { stmt.getSpIdList().add(this.exprParser.integerExpr()); String pidStr = lexer.stringVal(); @@ -1913,7 +1891,7 @@ private SQLStatement parseRestore() { stmt.setType(new SQLIdentifierExpr(type)); accept(Token.FROM); - for (; ;) { + for (; ; ) { stmt.getProperties().add(new SQLCharExpr(lexer.stringVal())); accept(Token.LITERAL_CHARS); if (lexer.token() == Token.COMMA) { @@ -2003,7 +1981,6 @@ private SQLStatement parseCancelJob() { } - protected SQLStatement parseExportTable() { accept(Token.TABLE); SQLExportTableStatement stmt = new SQLExportTableStatement(); @@ -2013,7 +1990,6 @@ protected SQLStatement parseExportTable() { return stmt; } - protected SQLStatement parseExportDB() { accept(Token.DATABASE); SQLExportDatabaseStatement stmt = new SQLExportDatabaseStatement(); @@ -2064,7 +2040,6 @@ protected SQLStatement parseRaftMemeberChange() { acceptIdentifier("RAFT_MEMBER_CHANGE"); MySqlRaftMemberChangeStatement stmt = new MySqlRaftMemberChangeStatement(); - if (lexer.identifierEquals("NOLEADER")) { lexer.nextToken(); stmt.setNoLeader(true); @@ -2110,7 +2085,6 @@ protected SQLStatement parseMigrate() { stmt.setMigrateType(new SQLIntegerExpr(1)); } - accept(Token.FROM); stmt.setFromInsId(exprParser.charExpr()); @@ -2147,7 +2121,6 @@ protected SQLStatement parseMigrate() { } protected SQLStatement parseImportDB() { - accept(Token.DATABASE); SQLImportDatabaseStatement stmt = new SQLImportDatabaseStatement(); @@ -2192,7 +2165,6 @@ protected SQLStatement parseImportTable() { } } - return stmt; } @@ -2239,7 +2211,6 @@ public SQLStatement parseSync() { } - public SQLStatement parseFlush() { acceptIdentifier("FLUSH"); MySqlFlushStatement stmt = new MySqlFlushStatement(); @@ -2254,7 +2225,7 @@ public SQLStatement parseFlush() { stmt.setLocal(true); } - for (;;) { + for (; ; ) { if (lexer.token() == Token.BINARY || lexer.identifierEquals("BINARY")) { lexer.nextToken(); acceptIdentifier("LOGS"); @@ -2290,7 +2261,7 @@ public SQLStatement parseFlush() { lexer.nextToken(); accept(Token.CACHE); stmt.setQueryCache(true); - } else if (lexer.identifierEquals("RELAY")) { + } else if (lexer.identifierEquals("RELAY")) { lexer.nextToken(); acceptIdentifier("LOGS"); stmt.setRelayLogs(true); @@ -2306,7 +2277,7 @@ public SQLStatement parseFlush() { } else if (lexer.identifierEquals(STATUS)) { lexer.nextToken(); stmt.setStatus(true); - } else if (lexer.identifierEquals("USER_RESOURCES")) { + } else if (lexer.identifierEquals("USER_RESOURCES")) { lexer.nextToken(); stmt.setUserResources(true); } else if (lexer.token() == Token.COMMA) { @@ -2328,7 +2299,7 @@ public SQLStatement parseFlush() { accept(Token.LOCK); stmt.setWithReadLock(true); } - for(;;) { + for (; ; ) { if (lexer.token() == Token.IDENTIFIER) { for (; ; ) { SQLName name = this.exprParser.name(); @@ -2418,9 +2389,7 @@ public MySqlExplainStatement parseExplain() { return parseExplain(explain); } - private MySqlExplainStatement parseExplain(MySqlExplainStatement explain) { - if (lexer.identifierEquals(FnvHash.Constants.PLAN)) { Lexer.SavePoint mark = lexer.mark(); lexer.nextToken(); @@ -2456,7 +2425,7 @@ private MySqlExplainStatement parseExplain(MySqlExplainStatement explain) { break; } - for (;;) { + for (; ; ) { if (lexer.identifierEquals("FORMAT")) { lexer.nextToken(); String format = lexer.stringVal(); @@ -2488,7 +2457,7 @@ private MySqlExplainStatement parseExplain(MySqlExplainStatement explain) { boolean table = false; if (lexer.token() == Token.IDENTIFIER) { - final long hash = lexer.hash_lower(); + final long hash = lexer.hashLCase(); String stringVal = lexer.stringVal(); if (hash == FnvHash.Constants.EXTENDED) { @@ -2579,7 +2548,7 @@ public SQLStatement parseShow() { MySqlShowProcessListStatement stmt = new MySqlShowProcessListStatement(); stmt.setFull(full); - if(!full) { + if (!full) { if (lexer.identifierEquals(FnvHash.Constants.MPP)) { lexer.nextToken(); stmt.setMpp(true); @@ -3037,7 +3006,6 @@ public SQLStatement parseShow() { } if (lexer.identifierEquals("STATUS")) { - lexer.nextToken(); if (lexer.token() == Token.LIKE) { @@ -3171,7 +3139,6 @@ public SQLStatement parseShow() { } if (lexer.token() == Token.INDEX || lexer.identifierEquals("INDEXES") || lexer.identifierEquals("KEYS")) { - SQLShowIndexesStatement stmt = new SQLShowIndexesStatement(); stmt.setType(lexer.stringVal()); @@ -3412,8 +3379,8 @@ public SQLStatement parseShow() { lexer.nextToken(); SQLName name = this.exprParser.name(); - if(name instanceof SQLPropertyExpr) { - stmt.setDatabase((SQLIdentifierExpr)((SQLPropertyExpr) name).getOwner()); + if (name instanceof SQLPropertyExpr) { + stmt.setDatabase((SQLIdentifierExpr) ((SQLPropertyExpr) name).getOwner()); stmt.setTableGroup(new SQLIdentifierExpr(((SQLPropertyExpr) name).getName())); } else { stmt.setDatabase(name); @@ -3651,7 +3618,6 @@ public SQLStatement parseShow() { return stmt; } else { - MySqlShowRuleStatement stmt = new MySqlShowRuleStatement(); if (full) { @@ -4097,8 +4063,6 @@ private MySqlShowWarningsStatement parseShowWarnings() { return stmt; } - - public SQLStartTransactionStatement parseStart() { acceptIdentifier("START"); acceptIdentifier("TRANSACTION"); @@ -4311,7 +4275,7 @@ public SQLReplaceStatement parseReplace() { if (lexer.token() == Token.VALUES || lexer.identifierEquals("VALUE")) { lexer.nextToken(); - parseValueClause(stmt.getValuesList(), null,0, stmt); + parseValueClause(stmt.getValuesList(), null, 0, stmt); } else if (lexer.token() == Token.SELECT) { SQLQueryExpr queryExpr = (SQLQueryExpr) this.exprParser.expr(); stmt.setQuery(queryExpr); @@ -4408,7 +4372,7 @@ protected MySqlLoadXmlStatement parseLoadXml() { accept(Token.SET); if (lexer.token() != Token.LITERAL_CHARS) { - throw new ParserException("syntax error, illegal charset. " + lexer.info()); + throw new ParserException("syntax error, illegal charset. " + lexer.info()); } String charset = lexer.stringVal(); @@ -4436,7 +4400,6 @@ protected MySqlLoadXmlStatement parseLoadXml() { } protected MySqlLoadDataInFileStatement parseLoadDataInFile() { - acceptIdentifier("DATA"); MySqlLoadDataInFileStatement stmt = new MySqlLoadDataInFileStatement(); @@ -4610,6 +4573,7 @@ public MySqlExecuteStatement parseExecute() { } return stmt; } + public MySqlExecuteForAdsStatement parseExecuteForAds() { MySqlExecuteForAdsStatement stmt = new MySqlExecuteForAdsStatement(); stmt.setAction(exprParser.name()); @@ -4643,7 +4607,7 @@ public SQLInsertStatement parseInsert() { for (; ; ) { if (lexer.token() == Token.IDENTIFIER) { - long hash = lexer.hash_lower(); + long hash = lexer.hashLCase(); if (hash == FnvHash.Constants.LOW_PRIORITY) { stmt.setLowPriority(true); @@ -4676,7 +4640,6 @@ public SQLInsertStatement parseInsert() { } } - break; } @@ -4728,14 +4691,14 @@ public SQLInsertStatement parseInsert() { } if (lexer.token() == Token.WITH) { - SQLSelectStatement withStmt = (SQLSelectStatement)parseWith(); + SQLSelectStatement withStmt = (SQLSelectStatement) parseWith(); stmt.setQuery(withStmt.getSelect()); } if (lexer.token() == Token.PARTITION) { lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLAssignItem ptExpr = new SQLAssignItem(); ptExpr.setTarget(this.exprParser.name()); if (lexer.token() == Token.EQ) { @@ -4825,7 +4788,7 @@ public SQLInsertStatement parseInsert() { Token token = lexer.token(); if (token == Token.IDENTIFIER) { identName = lexer.stringVal(); - hash = lexer.hash_lower(); + hash = lexer.hashLCase(); } else if (token == Token.LITERAL_CHARS) { if (lexer.isEnabled(SQLParserFeature.IgnoreNameQuotes)) { identName = lexer.stringVal(); @@ -4938,7 +4901,7 @@ public SQLInsertStatement parseInsert() { } else if (lexer.token() == (Token.SELECT)) { SQLSelect select = this.exprParser.createSelectParser().select(); - if(commentHints != null && !commentHints.isEmpty()) { + if (commentHints != null && !commentHints.isEmpty()) { select.setHeadHint(commentHints.get(0)); } select.setParent(stmt); @@ -4961,7 +4924,7 @@ public SQLInsertStatement parseInsert() { accept(Token.UPDATE); List duplicateKeyUpdate = stmt.getDuplicateKeyUpdate(); - for (;;) { + for (; ; ) { SQLName name = this.exprParser.name(); accept(Token.EQ); SQLExpr value; @@ -5102,7 +5065,7 @@ public SQLStatement parseSet() { varRef.setGlobal(true); } - if(session != null){ + if (session != null) { SQLVariantRefExpr varRef = (SQLVariantRefExpr) stmt.getItems().get(0).getTarget(); varRef.setSession(true); } @@ -5115,8 +5078,6 @@ public SQLStatement parseSet() { } } - - public SQLStatement parseAlter() { List comments = null; if (lexer.isKeepComments() && lexer.hasComment()) { @@ -5245,11 +5206,11 @@ public SQLStatement parseAlter() { return parseAlterSystem(); } - if(lexer.identifierEquals(FnvHash.Constants.RESOURCE)) { + if (lexer.identifierEquals(FnvHash.Constants.RESOURCE)) { lexer.reset(mark); return parseAlterResourceGroup(); } - if(lexer.identifierEquals(FnvHash.Constants.MATERIALIZED)) { + if (lexer.identifierEquals(FnvHash.Constants.MATERIALIZED)) { lexer.reset(mark); return parseAlterMaterialized(); } @@ -5427,8 +5388,7 @@ protected SQLStatement parseAlterView() { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - for (;;) { - + for (; ; ) { if (lexer.token() == Token.CONSTRAINT) { SQLTableConstraint constraint = (SQLTableConstraint) this.exprParser.parseConstaint(); createView.addColumn(constraint); @@ -5488,7 +5448,7 @@ protected SQLStatement parseAlterView() { if (lexer.identifierEquals("CASCADED")) { createView.setWithCascaded(true); lexer.nextToken(); - } else if (lexer.identifierEquals("LOCAL")){ + } else if (lexer.identifierEquals("LOCAL")) { createView.setWithLocal(true); lexer.nextToken(); } else if (lexer.identifierEquals("READ")) { @@ -5681,7 +5641,7 @@ protected SQLStatement parseAlterProcedure() { stmt.setName(name); // for mysql - for (;;) { + for (; ; ) { if (lexer.token() == Token.COMMENT) { lexer.nextToken(); SQLExpr comment = this.exprParser.primary(); @@ -5721,7 +5681,7 @@ protected SQLStatement parseAlterFunction() { stmt.setName(name); // for mysql - for (;;) { + for (; ; ) { if (lexer.token() == Token.COMMENT) { lexer.nextToken(); SQLExpr comment = this.exprParser.primary(); @@ -6094,13 +6054,13 @@ private boolean parseAlterSpecification(SQLAlterTableStatement stmt) { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLPartition partition = this.getExprParser().parsePartition(); item.addPartition(partition); if (lexer.token() == COMMA) { lexer.nextToken(); - if(lexer.token() == PARTITION) { + if (lexer.token() == PARTITION) { continue; } } @@ -6787,7 +6747,7 @@ else if (lexer.identifierEquals(FnvHash.Constants.PARTITIONS)) { case PARTITION: { Lexer.SavePoint mark = lexer.mark(); lexer.nextToken(); - if(lexer.identifierEquals(FnvHash.Constants.LIFECYCLE)) { + if (lexer.identifierEquals(FnvHash.Constants.LIFECYCLE)) { lexer.nextToken(); SQLAlterTablePartitionLifecycle item = new SQLAlterTablePartitionLifecycle(); if (lexer.token() == Token.EQ) { @@ -6814,7 +6774,7 @@ protected SQLStatement parseAlterTable(boolean ignore, boolean online, boolean o stmt.setName(this.exprParser.name()); while (true) { - boolean parsed = ((MySqlExprParser)this.exprParser).parseTableOptions(stmt.getTableOptions(), stmt); + boolean parsed = ((MySqlExprParser) this.exprParser).parseTableOptions(stmt.getTableOptions(), stmt); if (!parsed) { parsed = parseAlterSpecification(stmt); } @@ -6838,7 +6798,7 @@ protected SQLStatement parseAlterTable(boolean ignore, boolean online, boolean o MySqlRenameTableStatement renameStmt = new MySqlRenameTableStatement(); MySqlRenameTableStatement.Item item = new MySqlRenameTableStatement.Item(); item.setName((SQLName) stmt.getTableSource().getExpr()); - item.setTo(((SQLAlterTableRename)stmt.getItems().get(0)).getToName()); + item.setTo(((SQLAlterTableRename) stmt.getItems().get(0)).getToName()); renameStmt.addItem(item); return renameStmt; } @@ -6906,7 +6866,6 @@ protected SQLStatement parseAlterTableOld(boolean ignore) { alterIndex.setAnalyzerName(this.exprParser.name()); stmt.addItem(alterIndex); } else { - if (lexer.token() == Token.COLUMN) { lexer.nextToken(); } @@ -7133,7 +7092,6 @@ protected SQLStatement parseAlterTableOld(boolean ignore) { stmt.addItem(item); } else if (lexer.token() == Token.UNIQUE) { - SQLUnique unique = this.exprParser.parseUnique(); SQLAlterTableAddConstraint item = new SQLAlterTableAddConstraint(unique); stmt.addItem(item); @@ -7354,7 +7312,6 @@ protected SQLStatement parseAlterTableOld(boolean ignore) { stmt.addItem(item); } - } else if (lexer.identifierEquals("IMPORT")) { lexer.nextToken(); @@ -7433,7 +7390,6 @@ protected SQLStatement parseAlterTableOld(boolean ignore) { item.setValidation(false); } - stmt.addItem(item); } else if (lexer.identifierEquals("REBUILD")) { lexer.nextToken(); @@ -7773,7 +7729,7 @@ protected SQLStatement parseAlterTableOld(boolean ignore) { private MySqlExtPartition parseExtPartition() { MySqlExtPartition partitionDef = new MySqlExtPartition(); - for (;;) { + for (; ; ) { MySqlExtPartition.Item item = new MySqlExtPartition.Item(); if (lexer.identifierEquals(FnvHash.Constants.DBPARTITION)) { @@ -7838,7 +7794,6 @@ protected void parseAlterTableAddColumn(SQLAlterTableStatement stmt) { SQLAlterTableAddColumn item = new SQLAlterTableAddColumn(); for (; ; ) { - SQLColumnDefinition columnDef = this.exprParser.parseColumn(); item.addColumn(columnDef); if (lexer.identifierEquals("AFTER")) { @@ -7917,7 +7872,7 @@ public void parseAlterDrop(SQLAlterTableStatement stmt) { name.setParent(item); item.addColumn(name); - if (dbType != DbType.mysql) { + if (dbType != DbType.mysql) { while (lexer.token() == Token.COMMA) { Lexer.SavePoint savePoint = lexer.markOut(); lexer.nextToken(); @@ -7985,8 +7940,6 @@ public void parseAlterDrop(SQLAlterTableStatement stmt) { } public SQLStatement parseRename() { - - acceptIdentifier("RENAME"); if (lexer.token() == Token.SEQUENCE) { @@ -8084,7 +8037,7 @@ public SQLStatement parseCreateDatabase() { lexer.nextToken(); } - for (;;) { + for (; ; ) { if (lexer.identifierEquals(FnvHash.Constants.CHARACTER)) { lexer.nextToken(); accept(Token.SET); @@ -8122,7 +8075,7 @@ public SQLStatement parseCreateDatabase() { } //ads 特殊支持 else if (lexer.identifierEquals("SHARDS") || lexer.identifierEquals("SHARD_ID") - || lexer.identifierEquals("REPLICATION") || lexer.identifierEquals("STORAGE_DEPENDENCY") + || lexer.identifierEquals("REPLICATION") || lexer.identifierEquals("STORAGE_DEPENDENCY") || lexer.identifierEquals("REPLICA_TYPE") || lexer.identifierEquals("DATA_REPLICATION")) { String key = lexer.stringVal(); lexer.nextToken(); @@ -8144,7 +8097,7 @@ else if (lexer.identifierEquals("SHARDS") || lexer.identifierEquals("SHARD_ID") if (lexer.identifierEquals(FnvHash.Constants.OPTIONS)) { lexer.nextToken(); accept(Token.LPAREN); - for(;;) { + for (; ; ) { if (lexer.token() == Token.RPAREN) { accept(Token.RPAREN); break; @@ -8161,7 +8114,7 @@ else if (lexer.identifierEquals("SHARDS") || lexer.identifierEquals("SHARD_ID") lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLAssignItem assignItem = this.exprParser.parseAssignItem(); assignItem.setParent(stmt); stmt.getDbProperties().add(assignItem); @@ -8212,7 +8165,7 @@ else if (lexer.identifierEquals("SHARDS") || lexer.identifierEquals("SHARD_ID") accept(Token.ON); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLAssignItem assignItem = this.exprParser.parseAssignItem(); assignItem.setParent(stmt); stmt.getStoredOn().add(assignItem); @@ -8398,7 +8351,6 @@ public MySqlExprParser getExprParser() { return (MySqlExprParser) exprParser; } - public SQLCreateFunctionStatement parseCreateFunction() { SQLCreateFunctionStatement stmt = new SQLCreateFunctionStatement(); stmt.setDbType(dbType); @@ -8424,17 +8376,17 @@ public SQLCreateFunctionStatement parseCreateFunction() { stmt.setName(this.exprParser.name()); - if (lexer.token() == Token.LPAREN) {// match "(" + if (lexer.token() == Token.LPAREN) { // match "(" lexer.nextToken(); parserParameters(stmt.getParameters(), stmt); - accept(Token.RPAREN);// match ")" + accept(Token.RPAREN); // match ")" } acceptIdentifier("RETURNS"); SQLDataType dataType = this.exprParser.parseDataType(); stmt.setReturnDataType(dataType); - for (;;) { + for (; ; ) { if (lexer.identifierEquals("DETERMINISTIC")) { lexer.nextToken(); stmt.setDeterministic(true); @@ -8475,6 +8427,7 @@ public SQLCreateFunctionStatement parseCreateFunction() { return stmt; } + /** * parse create procedure statement */ @@ -8506,13 +8459,13 @@ public SQLCreateProcedureStatement parseCreateProcedure() { stmt.setName(this.exprParser.name()); - if (lexer.token() == Token.LPAREN) {// match "(" + if (lexer.token() == Token.LPAREN) { lexer.nextToken(); parserParameters(stmt.getParameters(), stmt); - accept(Token.RPAREN);// match ")" + accept(Token.RPAREN); } - for (;;) { + for (; ; ) { if (lexer.token() == Token.COMMENT) { lexer.nextToken(); stmt.setComment(this.exprParser.charExpr()); @@ -8585,7 +8538,6 @@ private void parserParameters(List parameters, SQLObject parent) { parameter.setDefaultValue(new SQLQueryExpr(select)); } else if (lexer.token() == Token.IN || lexer.token() == Token.OUT || lexer.token() == Token.INOUT) { - if (lexer.token() == Token.IN) { parameter.setParamType(ParameterType.IN); } else if (lexer.token() == Token.OUT) { @@ -8599,7 +8551,8 @@ private void parserParameters(List parameters, SQLObject parent) { parameter.setDataType(this.exprParser.parseDataType()); } else { - parameter.setParamType(ParameterType.DEFAULT);// default parameter type is in + // default parameter type is in + parameter.setParamType(ParameterType.DEFAULT); parameter.setName(this.exprParser.name()); parameter.setDataType(this.exprParser.parseDataType()); @@ -8635,7 +8588,6 @@ private void parseProcedureStatementList(List statementList) { * parse procedure statement block */ private void parseProcedureStatementList(List statementList, int max) { - for (; ; ) { if (max != -1) { if (statementList.size() >= max) { @@ -8846,7 +8798,6 @@ private void parseProcedureStatementList(List statementList, int m } - public MySqlChecksumTableStatement parseChecksum() { MySqlChecksumTableStatement stmt = new MySqlChecksumTableStatement(); if (lexer.identifierEquals(FnvHash.Constants.CHECKSUM)) { @@ -8857,7 +8808,7 @@ public MySqlChecksumTableStatement parseChecksum() { accept(Token.TABLE); - for (;;) { + for (; ; ) { SQLName table = this.exprParser.name(); stmt.addTable(new SQLExprTableSource(table)); @@ -8902,7 +8853,6 @@ public SQLIfStatement parseIf() { accept(Token.THEN); this.parseStatementList(elseIf.getStatements(), -1, elseIf); - stmt.getElseIfList().add(elseIf); } else { SQLIfStatement.Else elseItem = new SQLIfStatement.Else(); @@ -8940,9 +8890,9 @@ public SQLWhileStatement parseWhile() { accept(Token.WHILE); accept(Token.SEMI); - + stmt.setAfterSemi(true); - + return stmt; } @@ -8972,9 +8922,9 @@ public SQLWhileStatement parseWhile(String label) { acceptIdentifier(label); accept(Token.SEMI); - + stmt.setAfterSemi(true); - + return stmt; } @@ -8991,7 +8941,6 @@ public MySqlCaseStatement parseCase() { if (lexer.token() == Token.WHEN)// grammar 1 { while (lexer.token() == Token.WHEN) { - MySqlWhenStatement when = new MySqlWhenStatement(); // when expr when.setCondition(exprParser.expr()); @@ -9009,8 +8958,7 @@ public MySqlCaseStatement parseCase() { this.parseStatementList(elseStmt.getStatements(), -1, elseStmt); stmt.setElseItem(elseStmt); } - } else// grammar 2 - { + } else { // case expr stmt.setCondition(exprParser.expr()); @@ -9188,7 +9136,6 @@ public MySqlIterateStatement parseIterate() { /** * parse repeat statement - * */ public MySqlRepeatStatement parseRepeat() { MySqlRepeatStatement stmt = new MySqlRepeatStatement(); @@ -9224,7 +9171,6 @@ public MySqlRepeatStatement parseRepeat(String label) { /** * parse cursor declare statement - * */ public MySqlCursorDeclareStatement parseCursorDeclare() { MySqlCursorDeclareStatement stmt = new MySqlCursorDeclareStatement(); @@ -9248,10 +9194,8 @@ public MySqlCursorDeclareStatement parseCursorDeclare() { /** * zhujun [455910092@qq.com] * parse spstatement - * */ public SQLStatement parseSpStatement() { - // update if (lexer.token() == (Token.UPDATE)) { return parseUpdateStatement(); @@ -9330,23 +9274,27 @@ public MySqlDeclareHandlerStatement parseDeclareHandler() { String tokenName = lexer.stringVal(); ConditionValue condition = new ConditionValue(); - if (tokenName.equalsIgnoreCase("NOT")) {//for 'NOT FOUND' + if (tokenName.equalsIgnoreCase("NOT")) { + //for 'NOT FOUND' lexer.nextToken(); acceptIdentifier("FOUND"); condition.setType(ConditionType.SYSTEM); condition.setValue("NOT FOUND"); - } else if (tokenName.equalsIgnoreCase("SQLSTATE")) { //for SQLSTATE (SQLSTATE '10001') + } else if (tokenName.equalsIgnoreCase("SQLSTATE")) { + //for SQLSTATE (SQLSTATE '10001') condition.setType(ConditionType.SQLSTATE); lexer.nextToken(); //condition.setValue(lexer.stringVal()); //lexer.nextToken(); condition.setValue(exprParser.name().toString()); - } else if (lexer.identifierEquals("SQLEXCEPTION")) { //for SQLEXCEPTION + } else if (lexer.identifierEquals("SQLEXCEPTION")) { + //for SQLEXCEPTION condition.setType(ConditionType.SYSTEM); condition.setValue(lexer.stringVal()); lexer.nextToken(); - } else if (lexer.identifierEquals("SQLWARNING")) { //for SQLWARNING + } else if (lexer.identifierEquals("SQLWARNING")) { + //for SQLWARNING condition.setType(ConditionType.SYSTEM); condition.setValue(lexer.stringVal()); lexer.nextToken(); @@ -9377,7 +9325,6 @@ public MySqlDeclareHandlerStatement parseDeclareHandler() { accept(Token.SEMI); } - return stmt; } @@ -9385,16 +9332,8 @@ public MySqlDeclareHandlerStatement parseDeclareHandler() { * zhujun [455910092@qq.com] * 2016-04-17 * 定义条件 - * */ public MySqlDeclareConditionStatement parseDeclareCondition() { - /* - DECLARE condition_name CONDITION FOR condition_value - - condition_value: - SQLSTATE [VALUE] sqlstate_value - | mysql_error_code - */ MySqlDeclareConditionStatement stmt = new MySqlDeclareConditionStatement(); accept(Token.DECLARE); @@ -9486,7 +9425,7 @@ public SQLStatement parseCopy() { if (lexer.identifierEquals(FnvHash.Constants.CREDENTIALS)) { lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.identifierEquals(FnvHash.Constants.ACCESS_KEY_ID)) { lexer.nextToken(); SQLExpr accessKeyId = this.exprParser.primary(); @@ -9504,7 +9443,7 @@ public SQLStatement parseCopy() { if (lexer.token() == Token.WITH) { lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLName name = this.exprParser.name(); if (lexer.token() == Token.EQ) { lexer.nextToken(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java index a630b5a6ff..2a62533c1a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java @@ -32,7 +32,6 @@ default boolean visit(MySqlTableIndex x) { } default void endVisit(MySqlTableIndex x) { - } default boolean visit(MySqlKey x) { @@ -40,7 +39,6 @@ default boolean visit(MySqlKey x) { } default void endVisit(MySqlKey x) { - } default boolean visit(MySqlPrimaryKey x) { @@ -48,7 +46,6 @@ default boolean visit(MySqlPrimaryKey x) { } default void endVisit(MySqlPrimaryKey x) { - } default boolean visit(MySqlUnique x) { @@ -56,7 +53,6 @@ default boolean visit(MySqlUnique x) { } default void endVisit(MySqlUnique x) { - } default boolean visit(MysqlForeignKey x) { @@ -68,7 +64,6 @@ default void endVisit(MysqlForeignKey x) { } default void endVisit(MySqlPrepareStatement x) { - } default boolean visit(MySqlPrepareStatement x) { @@ -76,7 +71,6 @@ default boolean visit(MySqlPrepareStatement x) { } default void endVisit(MySqlExecuteStatement x) { - } default boolean visit(MysqlDeallocatePrepareStatement x) { @@ -84,7 +78,6 @@ default boolean visit(MysqlDeallocatePrepareStatement x) { } default void endVisit(MysqlDeallocatePrepareStatement x) { - } default boolean visit(MySqlExecuteStatement x) { @@ -92,7 +85,6 @@ default boolean visit(MySqlExecuteStatement x) { } default void endVisit(MySqlDeleteStatement x) { - } default boolean visit(MySqlDeleteStatement x) { @@ -100,7 +92,6 @@ default boolean visit(MySqlDeleteStatement x) { } default void endVisit(MySqlInsertStatement x) { - } default boolean visit(MySqlInsertStatement x) { @@ -108,7 +99,6 @@ default boolean visit(MySqlInsertStatement x) { } default void endVisit(MySqlLoadDataInFileStatement x) { - } default boolean visit(MySqlLoadDataInFileStatement x) { @@ -116,7 +106,6 @@ default boolean visit(MySqlLoadDataInFileStatement x) { } default void endVisit(MySqlLoadXmlStatement x) { - } default boolean visit(MySqlLoadXmlStatement x) { @@ -124,7 +113,6 @@ default boolean visit(MySqlLoadXmlStatement x) { } default void endVisit(MySqlShowWarningsStatement x) { - } default boolean visit(MySqlShowWarningsStatement x) { @@ -132,7 +120,6 @@ default boolean visit(MySqlShowWarningsStatement x) { } default void endVisit(MySqlShowStatusStatement x) { - } default boolean visit(MySqlShowStatusStatement x) { @@ -140,7 +127,6 @@ default boolean visit(MySqlShowStatusStatement x) { } default void endVisit(MySqlShowAuthorsStatement x) { - } default boolean visit(MySqlShowAuthorsStatement x) { @@ -148,7 +134,6 @@ default boolean visit(MySqlShowAuthorsStatement x) { } default void endVisit(MysqlShowHtcStatement x) { - } default boolean visit(MysqlShowHtcStatement x) { @@ -156,7 +141,6 @@ default boolean visit(MysqlShowHtcStatement x) { } default void endVisit(MysqlShowStcStatement x) { - } default boolean visit(MysqlShowStcStatement x) { @@ -164,7 +148,6 @@ default boolean visit(MysqlShowStcStatement x) { } default void endVisit(CobarShowStatus x) { - } default boolean visit(CobarShowStatus x) { @@ -172,7 +155,6 @@ default boolean visit(CobarShowStatus x) { } default void endVisit(DrdsShowDDLJobs x) { - } default boolean visit(DrdsShowDDLJobs x) { @@ -180,7 +162,6 @@ default boolean visit(DrdsShowDDLJobs x) { } default void endVisit(DrdsCancelDDLJob x) { - } default boolean visit(DrdsCancelDDLJob x) { @@ -188,7 +169,6 @@ default boolean visit(DrdsCancelDDLJob x) { } default void endVisit(DrdsRecoverDDLJob x) { - } default boolean visit(DrdsRecoverDDLJob x) { @@ -196,7 +176,6 @@ default boolean visit(DrdsRecoverDDLJob x) { } default void endVisit(DrdsRollbackDDLJob x) { - } default boolean visit(DrdsRollbackDDLJob x) { @@ -204,7 +183,6 @@ default boolean visit(DrdsRollbackDDLJob x) { } default void endVisit(DrdsRemoveDDLJob x) { - } default boolean visit(DrdsRemoveDDLJob x) { @@ -212,7 +190,6 @@ default boolean visit(DrdsRemoveDDLJob x) { } default void endVisit(DrdsInspectDDLJobCache x) { - } default boolean visit(DrdsInspectDDLJobCache x) { @@ -220,7 +197,6 @@ default boolean visit(DrdsInspectDDLJobCache x) { } default void endVisit(DrdsClearDDLJobCache x) { - } default boolean visit(DrdsClearDDLJobCache x) { @@ -228,7 +204,6 @@ default boolean visit(DrdsClearDDLJobCache x) { } default void endVisit(DrdsChangeDDLJob x) { - } default boolean visit(DrdsChangeDDLJob x) { @@ -236,7 +211,6 @@ default boolean visit(DrdsChangeDDLJob x) { } default void endVisit(DrdsBaselineStatement x) { - } default boolean visit(DrdsBaselineStatement x) { @@ -244,7 +218,6 @@ default boolean visit(DrdsBaselineStatement x) { } default void endVisit(DrdsShowGlobalIndex x) { - } default boolean visit(DrdsShowGlobalIndex x) { @@ -252,7 +225,6 @@ default boolean visit(DrdsShowGlobalIndex x) { } default void endVisit(DrdsShowMetadataLock x) { - } default boolean visit(DrdsShowMetadataLock x) { @@ -260,7 +232,6 @@ default boolean visit(DrdsShowMetadataLock x) { } default void endVisit(MySqlBinlogStatement x) { - } default boolean visit(MySqlBinlogStatement x) { @@ -268,7 +239,6 @@ default boolean visit(MySqlBinlogStatement x) { } default void endVisit(MySqlResetStatement x) { - } default boolean visit(MySqlResetStatement x) { @@ -276,7 +246,6 @@ default boolean visit(MySqlResetStatement x) { } default void endVisit(MySqlCreateUserStatement x) { - } default boolean visit(MySqlCreateUserStatement x) { @@ -284,7 +253,6 @@ default boolean visit(MySqlCreateUserStatement x) { } default void endVisit(MySqlCreateUserStatement.UserSpecification x) { - } default boolean visit(MySqlCreateUserStatement.UserSpecification x) { @@ -292,7 +260,6 @@ default boolean visit(MySqlCreateUserStatement.UserSpecification x) { } default void endVisit(MySqlPartitionByKey x) { - } default boolean visit(MySqlPartitionByKey x) { @@ -300,7 +267,6 @@ default boolean visit(MySqlPartitionByKey x) { } default void endVisit(MySqlUpdatePlanCacheStatement x) { - } default boolean visit(MySqlUpdatePlanCacheStatement x) { @@ -308,7 +274,6 @@ default boolean visit(MySqlUpdatePlanCacheStatement x) { } default void endVisit(MySqlShowPlanCacheStatusStatement x) { - } default boolean visit(MySqlShowPlanCacheStatusStatement x) { @@ -316,7 +281,6 @@ default boolean visit(MySqlShowPlanCacheStatusStatement x) { } default void endVisit(MySqlClearPlanCacheStatement x) { - } default boolean visit(MySqlClearPlanCacheStatement x) { @@ -324,7 +288,6 @@ default boolean visit(MySqlClearPlanCacheStatement x) { } default void endVisit(MySqlDisabledPlanCacheStatement x) { - } default boolean visit(MySqlDisabledPlanCacheStatement x) { @@ -332,7 +295,6 @@ default boolean visit(MySqlDisabledPlanCacheStatement x) { } default void endVisit(MySqlExplainPlanCacheStatement x) { - } default boolean visit(MySqlExplainPlanCacheStatement x) { @@ -352,7 +314,6 @@ default boolean visit(MySqlOutFileExpr x) { } default void endVisit(MySqlOutFileExpr x) { - } default boolean visit(MySqlExplainStatement x) { @@ -360,7 +321,6 @@ default boolean visit(MySqlExplainStatement x) { } default void endVisit(MySqlExplainStatement x) { - } default boolean visit(MySqlUpdateStatement x) { @@ -368,7 +328,6 @@ default boolean visit(MySqlUpdateStatement x) { } default void endVisit(MySqlUpdateStatement x) { - } default boolean visit(MySqlSetTransactionStatement x) { @@ -376,7 +335,6 @@ default boolean visit(MySqlSetTransactionStatement x) { } default void endVisit(MySqlSetTransactionStatement x) { - } default boolean visit(MySqlShowHMSMetaStatement x) { @@ -384,7 +342,6 @@ default boolean visit(MySqlShowHMSMetaStatement x) { } default void endVisit(MySqlShowHMSMetaStatement x) { - } default boolean visit(MySqlShowBinaryLogsStatement x) { @@ -392,7 +349,6 @@ default boolean visit(MySqlShowBinaryLogsStatement x) { } default void endVisit(MySqlShowBinaryLogsStatement x) { - } default boolean visit(MySqlShowMasterLogsStatement x) { @@ -400,7 +356,6 @@ default boolean visit(MySqlShowMasterLogsStatement x) { } default void endVisit(MySqlShowMasterLogsStatement x) { - } default boolean visit(MySqlShowCharacterSetStatement x) { @@ -408,7 +363,6 @@ default boolean visit(MySqlShowCharacterSetStatement x) { } default void endVisit(MySqlShowCharacterSetStatement x) { - } default boolean visit(MySqlShowCollationStatement x) { @@ -416,7 +370,6 @@ default boolean visit(MySqlShowCollationStatement x) { } default void endVisit(MySqlShowCollationStatement x) { - } default boolean visit(MySqlShowBinLogEventsStatement x) { @@ -424,7 +377,6 @@ default boolean visit(MySqlShowBinLogEventsStatement x) { } default void endVisit(MySqlShowBinLogEventsStatement x) { - } default boolean visit(MySqlShowContributorsStatement x) { @@ -432,7 +384,6 @@ default boolean visit(MySqlShowContributorsStatement x) { } default void endVisit(MySqlShowContributorsStatement x) { - } default boolean visit(MySqlShowCreateDatabaseStatement x) { @@ -440,7 +391,6 @@ default boolean visit(MySqlShowCreateDatabaseStatement x) { } default void endVisit(MySqlShowCreateDatabaseStatement x) { - } default boolean visit(MySqlShowCreateEventStatement x) { @@ -448,7 +398,6 @@ default boolean visit(MySqlShowCreateEventStatement x) { } default void endVisit(MySqlShowCreateEventStatement x) { - } default boolean visit(MySqlShowCreateFunctionStatement x) { @@ -456,7 +405,6 @@ default boolean visit(MySqlShowCreateFunctionStatement x) { } default void endVisit(MySqlShowCreateFunctionStatement x) { - } default boolean visit(MySqlShowCreateProcedureStatement x) { @@ -464,7 +412,6 @@ default boolean visit(MySqlShowCreateProcedureStatement x) { } default void endVisit(MySqlShowCreateProcedureStatement x) { - } default boolean visit(MySqlShowCreateTriggerStatement x) { @@ -472,7 +419,6 @@ default boolean visit(MySqlShowCreateTriggerStatement x) { } default void endVisit(MySqlShowCreateTriggerStatement x) { - } default boolean visit(MySqlShowEngineStatement x) { @@ -480,7 +426,6 @@ default boolean visit(MySqlShowEngineStatement x) { } default void endVisit(MySqlShowEngineStatement x) { - } default boolean visit(MySqlShowEnginesStatement x) { @@ -488,7 +433,6 @@ default boolean visit(MySqlShowEnginesStatement x) { } default void endVisit(MySqlShowEnginesStatement x) { - } default boolean visit(MySqlShowErrorsStatement x) { @@ -496,7 +440,6 @@ default boolean visit(MySqlShowErrorsStatement x) { } default void endVisit(MySqlShowErrorsStatement x) { - } default boolean visit(MySqlShowEventsStatement x) { @@ -504,7 +447,6 @@ default boolean visit(MySqlShowEventsStatement x) { } default void endVisit(MySqlShowEventsStatement x) { - } default boolean visit(MySqlShowFunctionCodeStatement x) { @@ -512,7 +454,6 @@ default boolean visit(MySqlShowFunctionCodeStatement x) { } default void endVisit(MySqlShowFunctionCodeStatement x) { - } default boolean visit(MySqlShowFunctionStatusStatement x) { @@ -520,7 +461,6 @@ default boolean visit(MySqlShowFunctionStatusStatement x) { } default void endVisit(MySqlShowFunctionStatusStatement x) { - } default boolean visit(MySqlShowGrantsStatement x) { @@ -528,7 +468,6 @@ default boolean visit(MySqlShowGrantsStatement x) { } default void endVisit(MySqlShowGrantsStatement x) { - } default boolean visit(MySqlUserName x) { @@ -536,7 +475,6 @@ default boolean visit(MySqlUserName x) { } default void endVisit(MySqlUserName x) { - } default boolean visit(MySqlAlterDatabaseSetOption x) { @@ -544,7 +482,6 @@ default boolean visit(MySqlAlterDatabaseSetOption x) { } default void endVisit(MySqlAlterDatabaseSetOption x) { - } default boolean visit(MySqlAlterDatabaseKillJob x) { @@ -552,7 +489,6 @@ default boolean visit(MySqlAlterDatabaseKillJob x) { } default void endVisit(MySqlAlterDatabaseKillJob x) { - } default boolean visit(MySqlShowMasterStatusStatement x) { @@ -560,7 +496,6 @@ default boolean visit(MySqlShowMasterStatusStatement x) { } default void endVisit(MySqlShowMasterStatusStatement x) { - } default boolean visit(MySqlShowOpenTablesStatement x) { @@ -568,7 +503,6 @@ default boolean visit(MySqlShowOpenTablesStatement x) { } default void endVisit(MySqlShowOpenTablesStatement x) { - } default boolean visit(MySqlShowPluginsStatement x) { @@ -576,7 +510,6 @@ default boolean visit(MySqlShowPluginsStatement x) { } default void endVisit(MySqlShowPluginsStatement x) { - } default boolean visit(MySqlShowPartitionsStatement x) { @@ -584,7 +517,6 @@ default boolean visit(MySqlShowPartitionsStatement x) { } default void endVisit(MySqlShowPartitionsStatement x) { - } default boolean visit(MySqlShowPrivilegesStatement x) { @@ -592,7 +524,6 @@ default boolean visit(MySqlShowPrivilegesStatement x) { } default void endVisit(MySqlShowPrivilegesStatement x) { - } default boolean visit(MySqlShowProcedureCodeStatement x) { @@ -600,7 +531,6 @@ default boolean visit(MySqlShowProcedureCodeStatement x) { } default void endVisit(MySqlShowProcedureCodeStatement x) { - } default boolean visit(MySqlShowProcedureStatusStatement x) { @@ -608,7 +538,6 @@ default boolean visit(MySqlShowProcedureStatusStatement x) { } default void endVisit(MySqlShowProcedureStatusStatement x) { - } default boolean visit(MySqlShowProcessListStatement x) { @@ -616,7 +545,6 @@ default boolean visit(MySqlShowProcessListStatement x) { } default void endVisit(MySqlShowProcessListStatement x) { - } default boolean visit(MySqlShowProfileStatement x) { @@ -624,7 +552,6 @@ default boolean visit(MySqlShowProfileStatement x) { } default void endVisit(MySqlShowProfileStatement x) { - } default boolean visit(MySqlShowProfilesStatement x) { @@ -632,7 +559,6 @@ default boolean visit(MySqlShowProfilesStatement x) { } default void endVisit(MySqlShowProfilesStatement x) { - } default boolean visit(MySqlShowRelayLogEventsStatement x) { @@ -640,7 +566,6 @@ default boolean visit(MySqlShowRelayLogEventsStatement x) { } default void endVisit(MySqlShowRelayLogEventsStatement x) { - } default boolean visit(MySqlShowSlaveHostsStatement x) { @@ -648,7 +573,6 @@ default boolean visit(MySqlShowSlaveHostsStatement x) { } default void endVisit(MySqlShowSlaveHostsStatement x) { - } default boolean visit(MySqlShowSequencesStatement x) { @@ -656,7 +580,6 @@ default boolean visit(MySqlShowSequencesStatement x) { } default void endVisit(MySqlShowSequencesStatement x) { - } default boolean visit(MySqlShowSlaveStatusStatement x) { @@ -664,7 +587,6 @@ default boolean visit(MySqlShowSlaveStatusStatement x) { } default void endVisit(MySqlShowSlaveStatusStatement x) { - } default boolean visit(MySqlShowSlowStatement x) { @@ -672,7 +594,6 @@ default boolean visit(MySqlShowSlowStatement x) { } default void endVisit(MySqlShowSlowStatement x) { - } default boolean visit(MySqlShowTableStatusStatement x) { @@ -680,7 +601,6 @@ default boolean visit(MySqlShowTableStatusStatement x) { } default void endVisit(MySqlShowTableStatusStatement x) { - } default boolean visit(MySqlShowTriggersStatement x) { @@ -688,7 +608,6 @@ default boolean visit(MySqlShowTriggersStatement x) { } default void endVisit(MySqlShowTriggersStatement x) { - } default boolean visit(MySqlShowTraceStatement x) { @@ -696,7 +615,6 @@ default boolean visit(MySqlShowTraceStatement x) { } default void endVisit(MySqlShowTraceStatement x) { - } default boolean visit(MySqlShowBroadcastsStatement x) { @@ -704,7 +622,6 @@ default boolean visit(MySqlShowBroadcastsStatement x) { } default void endVisit(MySqlShowBroadcastsStatement x) { - } default boolean visit(MySqlShowRuleStatement x) { @@ -712,7 +629,6 @@ default boolean visit(MySqlShowRuleStatement x) { } default void endVisit(MySqlShowRuleStatement x) { - } default boolean visit(MySqlShowRuleStatusStatement x) { @@ -720,7 +636,6 @@ default boolean visit(MySqlShowRuleStatusStatement x) { } default void endVisit(MySqlShowRuleStatusStatement x) { - } default boolean visit(MySqlShowDsStatement x) { @@ -728,7 +643,6 @@ default boolean visit(MySqlShowDsStatement x) { } default void endVisit(MySqlShowDsStatement x) { - } default boolean visit(MySqlShowDdlStatusStatement x) { @@ -736,7 +650,6 @@ default boolean visit(MySqlShowDdlStatusStatement x) { } default void endVisit(MySqlShowDdlStatusStatement x) { - } default boolean visit(MySqlShowTopologyStatement x) { @@ -744,7 +657,6 @@ default boolean visit(MySqlShowTopologyStatement x) { } default void endVisit(MySqlShowTopologyStatement x) { - } default boolean visit(MySqlRenameTableStatement.Item x) { @@ -752,7 +664,6 @@ default boolean visit(MySqlRenameTableStatement.Item x) { } default void endVisit(MySqlRenameTableStatement.Item x) { - } default boolean visit(MySqlRenameTableStatement x) { @@ -760,7 +671,6 @@ default boolean visit(MySqlRenameTableStatement x) { } default void endVisit(MySqlRenameTableStatement x) { - } default boolean visit(MysqlShowDbLockStatement x) { @@ -768,7 +678,6 @@ default boolean visit(MysqlShowDbLockStatement x) { } default void endVisit(MysqlShowDbLockStatement x) { - } default boolean visit(MySqlShowDatabaseStatusStatement x) { @@ -776,7 +685,6 @@ default boolean visit(MySqlShowDatabaseStatusStatement x) { } default void endVisit(MySqlShowDatabaseStatusStatement x) { - } default boolean visit(MySqlUseIndexHint x) { @@ -784,7 +692,6 @@ default boolean visit(MySqlUseIndexHint x) { } default void endVisit(MySqlUseIndexHint x) { - } default boolean visit(MySqlIgnoreIndexHint x) { @@ -792,7 +699,6 @@ default boolean visit(MySqlIgnoreIndexHint x) { } default void endVisit(MySqlIgnoreIndexHint x) { - } default boolean visit(MySqlLockTableStatement x) { @@ -800,7 +706,6 @@ default boolean visit(MySqlLockTableStatement x) { } default void endVisit(MySqlLockTableStatement x) { - } default boolean visit(MySqlLockTableStatement.Item x) { @@ -808,7 +713,6 @@ default boolean visit(MySqlLockTableStatement.Item x) { } default void endVisit(MySqlLockTableStatement.Item x) { - } default boolean visit(MySqlUnlockTablesStatement x) { @@ -816,7 +720,6 @@ default boolean visit(MySqlUnlockTablesStatement x) { } default void endVisit(MySqlUnlockTablesStatement x) { - } default boolean visit(MySqlForceIndexHint x) { @@ -824,7 +727,6 @@ default boolean visit(MySqlForceIndexHint x) { } default void endVisit(MySqlForceIndexHint x) { - } default boolean visit(MySqlAlterTableChangeColumn x) { @@ -832,7 +734,6 @@ default boolean visit(MySqlAlterTableChangeColumn x) { } default void endVisit(MySqlAlterTableChangeColumn x) { - } default boolean visit(MySqlAlterTableOption x) { @@ -840,7 +741,6 @@ default boolean visit(MySqlAlterTableOption x) { } default void endVisit(MySqlAlterTableOption x) { - } default boolean visit(MySqlCreateTableStatement x) { @@ -848,7 +748,6 @@ default boolean visit(MySqlCreateTableStatement x) { } default void endVisit(MySqlCreateTableStatement x) { - } default boolean visit(MySqlHelpStatement x) { @@ -856,7 +755,6 @@ default boolean visit(MySqlHelpStatement x) { } default void endVisit(MySqlHelpStatement x) { - } default boolean visit(MySqlCharExpr x) { @@ -864,7 +762,6 @@ default boolean visit(MySqlCharExpr x) { } default void endVisit(MySqlCharExpr x) { - } default boolean visit(MySqlAlterTableModifyColumn x) { @@ -872,7 +769,6 @@ default boolean visit(MySqlAlterTableModifyColumn x) { } default void endVisit(MySqlAlterTableModifyColumn x) { - } default boolean visit(MySqlAlterTableDiscardTablespace x) { @@ -880,7 +776,6 @@ default boolean visit(MySqlAlterTableDiscardTablespace x) { } default void endVisit(MySqlAlterTableDiscardTablespace x) { - } default boolean visit(MySqlAlterTableImportTablespace x) { @@ -888,7 +783,6 @@ default boolean visit(MySqlAlterTableImportTablespace x) { } default void endVisit(MySqlAlterTableImportTablespace x) { - } default boolean visit(MySqlCreateTableStatement.TableSpaceOption x) { @@ -896,7 +790,6 @@ default boolean visit(MySqlCreateTableStatement.TableSpaceOption x) { } default void endVisit(MySqlCreateTableStatement.TableSpaceOption x) { - } default boolean visit(MySqlAnalyzeStatement x) { @@ -904,7 +797,6 @@ default boolean visit(MySqlAnalyzeStatement x) { } default void endVisit(MySqlAnalyzeStatement x) { - } default boolean visit(MySqlCreateExternalCatalogStatement x) { @@ -912,7 +804,6 @@ default boolean visit(MySqlCreateExternalCatalogStatement x) { } default void endVisit(MySqlCreateExternalCatalogStatement x) { - } default boolean visit(MySqlAlterUserStatement x) { @@ -920,7 +811,6 @@ default boolean visit(MySqlAlterUserStatement x) { } default void endVisit(MySqlAlterUserStatement x) { - } default boolean visit(MySqlOptimizeStatement x) { @@ -928,7 +818,6 @@ default boolean visit(MySqlOptimizeStatement x) { } default void endVisit(MySqlOptimizeStatement x) { - } default boolean visit(MySqlHintStatement x) { @@ -936,7 +825,6 @@ default boolean visit(MySqlHintStatement x) { } default void endVisit(MySqlHintStatement x) { - } default boolean visit(MySqlOrderingExpr x) { @@ -944,7 +832,6 @@ default boolean visit(MySqlOrderingExpr x) { } default void endVisit(MySqlOrderingExpr x) { - } default boolean visit(MySqlCaseStatement x) { @@ -952,7 +839,6 @@ default boolean visit(MySqlCaseStatement x) { } default void endVisit(MySqlCaseStatement x) { - } default boolean visit(MySqlDeclareStatement x) { @@ -960,7 +846,6 @@ default boolean visit(MySqlDeclareStatement x) { } default void endVisit(MySqlDeclareStatement x) { - } default boolean visit(MySqlSelectIntoStatement x) { @@ -968,7 +853,6 @@ default boolean visit(MySqlSelectIntoStatement x) { } default void endVisit(MySqlSelectIntoStatement x) { - } default boolean visit(MySqlWhenStatement x) { @@ -976,7 +860,6 @@ default boolean visit(MySqlWhenStatement x) { } default void endVisit(MySqlWhenStatement x) { - } default boolean visit(MySqlLeaveStatement x) { @@ -984,7 +867,6 @@ default boolean visit(MySqlLeaveStatement x) { } default void endVisit(MySqlLeaveStatement x) { - } default boolean visit(MySqlIterateStatement x) { @@ -992,7 +874,6 @@ default boolean visit(MySqlIterateStatement x) { } default void endVisit(MySqlIterateStatement x) { - } default boolean visit(MySqlRepeatStatement x) { @@ -1000,7 +881,6 @@ default boolean visit(MySqlRepeatStatement x) { } default void endVisit(MySqlRepeatStatement x) { - } default boolean visit(MySqlCursorDeclareStatement x) { @@ -1008,7 +888,6 @@ default boolean visit(MySqlCursorDeclareStatement x) { } default void endVisit(MySqlCursorDeclareStatement x) { - } default boolean visit(MySqlUpdateTableSource x) { @@ -1016,7 +895,6 @@ default boolean visit(MySqlUpdateTableSource x) { } default void endVisit(MySqlUpdateTableSource x) { - } default boolean visit(MySqlAlterTableAlterColumn x) { @@ -1024,7 +902,6 @@ default boolean visit(MySqlAlterTableAlterColumn x) { } default void endVisit(MySqlAlterTableAlterColumn x) { - } default boolean visit(MySqlAlterTableForce x) { @@ -1032,7 +909,6 @@ default boolean visit(MySqlAlterTableForce x) { } default void endVisit(MySqlAlterTableForce x) { - } default boolean visit(MySqlAlterTableLock x) { @@ -1040,7 +916,6 @@ default boolean visit(MySqlAlterTableLock x) { } default void endVisit(MySqlAlterTableLock x) { - } default boolean visit(MySqlAlterTableOrderBy x) { @@ -1048,7 +923,6 @@ default boolean visit(MySqlAlterTableOrderBy x) { } default void endVisit(MySqlAlterTableOrderBy x) { - } default boolean visit(MySqlAlterTableValidation x) { @@ -1056,7 +930,6 @@ default boolean visit(MySqlAlterTableValidation x) { } default void endVisit(MySqlAlterTableValidation x) { - } default boolean visit(MySqlSubPartitionByKey x) { @@ -1064,7 +937,6 @@ default boolean visit(MySqlSubPartitionByKey x) { } default void endVisit(MySqlSubPartitionByKey x) { - } default boolean visit(MySqlSubPartitionByList x) { @@ -1072,7 +944,6 @@ default boolean visit(MySqlSubPartitionByList x) { } default void endVisit(MySqlSubPartitionByList x) { - } default boolean visit(MySqlDeclareHandlerStatement x) { @@ -1080,7 +951,6 @@ default boolean visit(MySqlDeclareHandlerStatement x) { } default void endVisit(MySqlDeclareHandlerStatement x) { - } default boolean visit(MySqlDeclareConditionStatement x) { @@ -1088,7 +958,6 @@ default boolean visit(MySqlDeclareConditionStatement x) { } default void endVisit(MySqlDeclareConditionStatement x) { - } default boolean visit(MySqlFlushStatement x) { @@ -1096,7 +965,6 @@ default boolean visit(MySqlFlushStatement x) { } default void endVisit(MySqlFlushStatement x) { - } default boolean visit(MySqlEventSchedule x) { @@ -1104,7 +972,6 @@ default boolean visit(MySqlEventSchedule x) { } default void endVisit(MySqlEventSchedule x) { - } default boolean visit(MySqlCreateEventStatement x) { @@ -1112,7 +979,6 @@ default boolean visit(MySqlCreateEventStatement x) { } default void endVisit(MySqlCreateEventStatement x) { - } default boolean visit(MySqlCreateAddLogFileGroupStatement x) { @@ -1120,7 +986,6 @@ default boolean visit(MySqlCreateAddLogFileGroupStatement x) { } default void endVisit(MySqlCreateAddLogFileGroupStatement x) { - } default boolean visit(MySqlCreateServerStatement x) { @@ -1128,7 +993,6 @@ default boolean visit(MySqlCreateServerStatement x) { } default void endVisit(MySqlCreateServerStatement x) { - } default boolean visit(MySqlCreateTableSpaceStatement x) { @@ -1136,7 +1000,6 @@ default boolean visit(MySqlCreateTableSpaceStatement x) { } default void endVisit(MySqlCreateTableSpaceStatement x) { - } default boolean visit(MySqlAlterEventStatement x) { @@ -1144,7 +1007,6 @@ default boolean visit(MySqlAlterEventStatement x) { } default void endVisit(MySqlAlterEventStatement x) { - } default boolean visit(MySqlAlterLogFileGroupStatement x) { @@ -1152,7 +1014,6 @@ default boolean visit(MySqlAlterLogFileGroupStatement x) { } default void endVisit(MySqlAlterLogFileGroupStatement x) { - } default boolean visit(MySqlAlterServerStatement x) { @@ -1160,7 +1021,6 @@ default boolean visit(MySqlAlterServerStatement x) { } default void endVisit(MySqlAlterServerStatement x) { - } default boolean visit(MySqlAlterTablespaceStatement x) { @@ -1168,7 +1028,6 @@ default boolean visit(MySqlAlterTablespaceStatement x) { } default void endVisit(MySqlAlterTablespaceStatement x) { - } default boolean visit(MySqlChecksumTableStatement x) { @@ -1176,7 +1035,6 @@ default boolean visit(MySqlChecksumTableStatement x) { } default void endVisit(MySqlChecksumTableStatement x) { - } default boolean visit(MySqlShowDatasourcesStatement x) { @@ -1184,7 +1042,6 @@ default boolean visit(MySqlShowDatasourcesStatement x) { } default void endVisit(MySqlShowDatasourcesStatement x) { - } default boolean visit(MySqlShowNodeStatement x) { @@ -1192,7 +1049,6 @@ default boolean visit(MySqlShowNodeStatement x) { } default void endVisit(MySqlShowNodeStatement x) { - } default boolean visit(MySqlShowHelpStatement x) { @@ -1200,7 +1056,6 @@ default boolean visit(MySqlShowHelpStatement x) { } default void endVisit(MySqlShowHelpStatement x) { - } default boolean visit(MySqlFlashbackStatement x) { @@ -1208,7 +1063,6 @@ default boolean visit(MySqlFlashbackStatement x) { } default void endVisit(MySqlFlashbackStatement x) { - } default boolean visit(MySqlShowConfigStatement x) { @@ -1216,7 +1070,6 @@ default boolean visit(MySqlShowConfigStatement x) { } default void endVisit(MySqlShowConfigStatement x) { - } default boolean visit(MySqlShowPlanCacheStatement x) { @@ -1224,7 +1077,6 @@ default boolean visit(MySqlShowPlanCacheStatement x) { } default void endVisit(MySqlShowPlanCacheStatement x) { - } default boolean visit(MySqlShowPhysicalProcesslistStatement x) { @@ -1232,7 +1084,6 @@ default boolean visit(MySqlShowPhysicalProcesslistStatement x) { } default void endVisit(MySqlShowPhysicalProcesslistStatement x) { - } default boolean visit(MySqlRenameSequenceStatement x) { @@ -1240,7 +1091,6 @@ default boolean visit(MySqlRenameSequenceStatement x) { } default void endVisit(MySqlRenameSequenceStatement x) { - } default boolean visit(MySqlCheckTableStatement x) { @@ -1248,7 +1098,6 @@ default boolean visit(MySqlCheckTableStatement x) { } default void endVisit(MySqlCheckTableStatement x) { - } default boolean visit(MysqlCreateFullTextCharFilterStatement x) { @@ -1256,7 +1105,6 @@ default boolean visit(MysqlCreateFullTextCharFilterStatement x) { } default void endVisit(MysqlCreateFullTextCharFilterStatement x) { - } default boolean visit(MysqlShowFullTextStatement x) { @@ -1264,7 +1112,6 @@ default boolean visit(MysqlShowFullTextStatement x) { } default void endVisit(MysqlShowFullTextStatement x) { - } default boolean visit(MysqlShowCreateFullTextStatement x) { @@ -1272,7 +1119,6 @@ default boolean visit(MysqlShowCreateFullTextStatement x) { } default void endVisit(MysqlShowCreateFullTextStatement x) { - } default boolean visit(MysqlAlterFullTextStatement x) { @@ -1280,7 +1126,6 @@ default boolean visit(MysqlAlterFullTextStatement x) { } default void endVisit(MysqlAlterFullTextStatement x) { - } default boolean visit(MysqlDropFullTextStatement x) { @@ -1288,7 +1133,6 @@ default boolean visit(MysqlDropFullTextStatement x) { } default void endVisit(MysqlDropFullTextStatement x) { - } default boolean visit(MysqlCreateFullTextTokenizerStatement x) { @@ -1296,7 +1140,6 @@ default boolean visit(MysqlCreateFullTextTokenizerStatement x) { } default void endVisit(MysqlCreateFullTextTokenizerStatement x) { - } default boolean visit(MysqlCreateFullTextTokenFilterStatement x) { @@ -1304,7 +1147,6 @@ default boolean visit(MysqlCreateFullTextTokenFilterStatement x) { } default void endVisit(MysqlCreateFullTextTokenFilterStatement x) { - } default boolean visit(MysqlCreateFullTextAnalyzerStatement x) { @@ -1312,7 +1154,6 @@ default boolean visit(MysqlCreateFullTextAnalyzerStatement x) { } default void endVisit(MysqlCreateFullTextAnalyzerStatement x) { - } default boolean visit(MysqlCreateFullTextDictionaryStatement x) { @@ -1320,7 +1161,6 @@ default boolean visit(MysqlCreateFullTextDictionaryStatement x) { } default void endVisit(MysqlCreateFullTextDictionaryStatement x) { - } default boolean visit(MySqlAlterTableAlterFullTextIndex x) { @@ -1328,7 +1168,6 @@ default boolean visit(MySqlAlterTableAlterFullTextIndex x) { } default void endVisit(MySqlAlterTableAlterFullTextIndex x) { - } default boolean visit(MySqlExecuteForAdsStatement x) { @@ -1336,7 +1175,6 @@ default boolean visit(MySqlExecuteForAdsStatement x) { } default void endVisit(MySqlExecuteForAdsStatement x) { - } default boolean visit(MySqlManageInstanceGroupStatement x) { @@ -1344,7 +1182,6 @@ default boolean visit(MySqlManageInstanceGroupStatement x) { } default void endVisit(MySqlManageInstanceGroupStatement x) { - } default boolean visit(MySqlRaftMemberChangeStatement x) { @@ -1352,7 +1189,6 @@ default boolean visit(MySqlRaftMemberChangeStatement x) { } default void endVisit(MySqlRaftMemberChangeStatement x) { - } default boolean visit(MySqlRaftLeaderTransferStatement x) { @@ -1360,7 +1196,6 @@ default boolean visit(MySqlRaftLeaderTransferStatement x) { } default void endVisit(MySqlRaftLeaderTransferStatement x) { - } default boolean visit(MySqlMigrateStatement x) { @@ -1368,7 +1203,6 @@ default boolean visit(MySqlMigrateStatement x) { } default void endVisit(MySqlMigrateStatement x) { - } default boolean visit(MySqlShowClusterNameStatement x) { @@ -1376,7 +1210,6 @@ default boolean visit(MySqlShowClusterNameStatement x) { } default void endVisit(MySqlShowClusterNameStatement x) { - } default boolean visit(MySqlShowJobStatusStatement x) { @@ -1384,7 +1217,6 @@ default boolean visit(MySqlShowJobStatusStatement x) { } default void endVisit(MySqlShowJobStatusStatement x) { - } default boolean visit(MySqlShowMigrateTaskStatusStatement x) { @@ -1392,7 +1224,6 @@ default boolean visit(MySqlShowMigrateTaskStatusStatement x) { } default void endVisit(MySqlShowMigrateTaskStatusStatement x) { - } default boolean visit(MySqlSubPartitionByValue x) { @@ -1400,7 +1231,6 @@ default boolean visit(MySqlSubPartitionByValue x) { } default void endVisit(MySqlSubPartitionByValue x) { - } default boolean visit(MySqlExtPartition x) { @@ -1408,7 +1238,6 @@ default boolean visit(MySqlExtPartition x) { } default void endVisit(MySqlExtPartition x) { - } default boolean visit(MySqlExtPartition.Item x) { @@ -1416,7 +1245,6 @@ default boolean visit(MySqlExtPartition.Item x) { } default void endVisit(MySqlExtPartition.Item x) { - } default boolean visit(MySqlJSONTableExpr x) { @@ -1424,16 +1252,13 @@ default boolean visit(MySqlJSONTableExpr x) { } default void endVisit(MySqlJSONTableExpr x) { - } - default boolean visit(MySqlJSONTableExpr.Column x) { return true; } default void endVisit(MySqlJSONTableExpr.Column x) { - } default boolean visit(MysqlAlterTableAlterCheck x) { @@ -1441,6 +1266,5 @@ default boolean visit(MysqlAlterTableAlterCheck x) { } default void endVisit(MysqlAlterTableAlterCheck x) { - } } // diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java index 7ddeb1b0f7..1d820b8c6b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java @@ -15,19 +15,7 @@ */ package com.alibaba.druid.sql.dialect.mysql.visitor; -import com.alibaba.druid.sql.ast.expr.SQLIntervalExpr; -import com.alibaba.druid.sql.ast.statement.SQLAlterCharacter; -import com.alibaba.druid.sql.ast.statement.SQLShowColumnsStatement; -import com.alibaba.druid.sql.ast.statement.SQLShowCreateTableStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.*; -import com.alibaba.druid.sql.dialect.mysql.ast.clause.*; -import com.alibaba.druid.sql.dialect.mysql.ast.clause.MySqlCaseStatement.MySqlWhenStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.expr.*; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.*; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement.TableSpaceOption; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateUserStatement.UserSpecification; import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; public class MySqlASTVisitorAdapter extends SQLASTVisitorAdapter implements MySqlASTVisitor { - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlEvalVisitorImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlEvalVisitorImpl.java index 21d6f006af..8754a59aba 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlEvalVisitorImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlEvalVisitorImpl.java @@ -26,19 +26,18 @@ import java.util.Map; public class MySqlEvalVisitorImpl extends MySqlASTVisitorAdapter implements SQLEvalVisitor { + private Map functions = new HashMap(); + private List parameters = new ArrayList(); - private Map functions = new HashMap(); - private List parameters = new ArrayList(); + private int variantIndex = -1; - private int variantIndex = -1; + private boolean markVariantIndex = true; - private boolean markVariantIndex = true; - - public MySqlEvalVisitorImpl(){ + public MySqlEvalVisitorImpl() { this(new ArrayList(1)); } - public MySqlEvalVisitorImpl(List parameters){ + public MySqlEvalVisitorImpl(List parameters) { this.parameters = parameters; } @@ -81,11 +80,11 @@ public boolean visit(SQLIntegerExpr x) { public boolean visit(SQLNumberExpr x) { return SQLEvalVisitorUtils.visit(this, x); } - + public boolean visit(SQLHexExpr x) { return SQLEvalVisitorUtils.visit(this, x); } - + @Override public boolean visit(SQLBinaryExpr x) { return SQLEvalVisitorUtils.visit(this, x); @@ -147,7 +146,7 @@ public boolean visit(SQLIdentifierExpr x) { public void unregisterFunction(String funcName) { functions.remove(funcName); } - + @Override public boolean visit(SQLBooleanExpr x) { x.getAttributes().put(EVAL_VALUE, x.getBooleanValue()); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlExportParameterVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlExportParameterVisitor.java index 890648a643..b39276bf9a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlExportParameterVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlExportParameterVisitor.java @@ -31,14 +31,12 @@ import java.util.List; public class MySqlExportParameterVisitor extends MySqlOutputVisitor implements ExportParameterVisitor { - /** * true= if require parameterized sql output */ private boolean requireParameterizedOutput; - - public MySqlExportParameterVisitor(List parameters, Appendable appender, boolean wantParameterizedOutput){ + public MySqlExportParameterVisitor(List parameters, Appendable appender, boolean wantParameterizedOutput) { super(appender, true); this.parameters = parameters; this.requireParameterizedOutput = wantParameterizedOutput; @@ -53,7 +51,7 @@ public MySqlExportParameterVisitor(List parameters) { } public MySqlExportParameterVisitor(final Appendable appender) { - this(new ArrayList(),appender, true); + this(new ArrayList(), appender, true); } public List getParameters() { @@ -62,7 +60,7 @@ public List getParameters() { @Override public boolean visit(final SQLSelectItem x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return true; @@ -70,7 +68,7 @@ public boolean visit(final SQLSelectItem x) { @Override public boolean visit(SQLLimit x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } @@ -79,7 +77,7 @@ public boolean visit(SQLLimit x) { @Override public boolean visit(SQLOrderBy x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -87,7 +85,7 @@ public boolean visit(SQLOrderBy x) { @Override public boolean visit(SQLSelectGroupByClause x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -95,19 +93,19 @@ public boolean visit(SQLSelectGroupByClause x) { @Override public boolean visit(SQLMethodInvokeExpr x) { - if(requireParameterizedOutput){ - return super.visit(x); + if (requireParameterizedOutput) { + return super.visit(x); } - + ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getArguments()); return true; } @Override public boolean visit(SQLInListExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); - } + } ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getTargetList()); return true; @@ -115,17 +113,17 @@ public boolean visit(SQLInListExpr x) { @Override public boolean visit(SQLBetweenExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); - } + } ExportParameterVisitorUtils.exportParameter(this.parameters, x); return true; } public boolean visit(SQLBinaryOpExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); - } + } ExportParameterVisitorUtils.exportParameter(this.parameters, x); return true; } @@ -137,6 +135,5 @@ public boolean visit(MySqlFlushStatement x) { @Override public void endVisit(MySqlFlushStatement x) { - } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java index 055088b87a..54709169a2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java @@ -39,7 +39,6 @@ import java.util.Map; public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTVisitor { - { this.dbType = DbType.mysql; this.shardingSupport = true; @@ -60,7 +59,7 @@ public MySqlOutputVisitor(Appendable appender, boolean parameterized) { } } - private static boolean shardingSupportChecked = false; + private static boolean shardingSupportChecked; public void configFromProperty() { if (this.parameterized && !shardingSupportChecked) { @@ -309,7 +308,7 @@ public boolean visit(SQLColumnDefinition x) { } for (SQLColumnConstraint item : x.getConstraints()) { - if(item instanceof SQLColumnReference) { + if (item instanceof SQLColumnReference) { continue; } print(' '); @@ -364,7 +363,6 @@ public boolean visit(SQLColumnDefinition x) { x.getValueType().accept(this); } - final AutoIncrementType sequenceType = x.getSequenceType(); if (sequenceType != null) { print0(ucase ? " BY " : " by "); @@ -756,13 +754,12 @@ public boolean visit(SQLCharExpr x, boolean parameterized) { long nameHash = regCall.methodNameHashCode64(); regForPresto = (x == regCall.getArguments().get(1)) && (nameHash == FnvHash.Constants.REGEXP_SUBSTR - || nameHash == FnvHash.Constants.REGEXP_COUNT - || nameHash == FnvHash.Constants.REGEXP_EXTRACT - || nameHash == FnvHash.Constants.REGEXP_EXTRACT_ALL - || nameHash == FnvHash.Constants.REGEXP_LIKE - || nameHash == FnvHash.Constants.REGEXP_REPLACE - || nameHash == FnvHash.Constants.REGEXP_SPLIT) - ; + || nameHash == FnvHash.Constants.REGEXP_COUNT + || nameHash == FnvHash.Constants.REGEXP_EXTRACT + || nameHash == FnvHash.Constants.REGEXP_EXTRACT_ALL + || nameHash == FnvHash.Constants.REGEXP_LIKE + || nameHash == FnvHash.Constants.REGEXP_REPLACE + || nameHash == FnvHash.Constants.REGEXP_SPLIT); } for (int i = 0; i < text.length(); ++i) { @@ -791,7 +788,7 @@ public boolean visit(SQLCharExpr x, boolean parameterized) { } appender.append('\''); - return false; + return false; } catch (IOException e) { throw new RuntimeException("println error", e); } @@ -802,14 +799,13 @@ public boolean visit(SQLVariantRefExpr x) { int index = x.getIndex(); if (inputParameters != null && index < inputParameters.size()) { - return super.visit(x); } } if (x.isGlobal()) { print0("@@global."); - }else if(x.isSession()){ + } else if (x.isSession()) { print0("@@session."); } @@ -855,11 +851,11 @@ public boolean visit(MySqlExecuteStatement x) { x.getStatementName().accept(this); if (x.getParameters().size() > 0) { print0(ucase ? " USING " : " using "); - ; printAndAccept(x.getParameters(), ", "); } return false; } + @Override public boolean visit(MySqlExecuteForAdsStatement x) { print0(ucase ? "EXECUTE " : "execute "); @@ -891,7 +887,6 @@ public boolean visit(MySqlManageInstanceGroupStatement x) { @Override public boolean visit(MySqlRaftMemberChangeStatement x) { - print0(ucase ? "SYNC RAFT_MEMBER_CHANGE " : "sync raft_member_change "); if (x.isNoLeader()) { @@ -933,7 +928,6 @@ public boolean visit(MySqlRaftLeaderTransferStatement x) { @Override public boolean visit(MySqlMigrateStatement x) { - return false; } @@ -1064,7 +1058,7 @@ public boolean visit(MySqlDeleteStatement x) { SQLTableSource from = x.getFrom(); if (from == null) { print0(ucase ? "FROM " : "from "); - if(x.isFulltextDictionary()) { + if (x.isFulltextDictionary()) { print0(ucase ? "FULLTEXT DICTIONARY " : "fulltext dictionary "); } x.getTableSource().accept(this); @@ -1091,7 +1085,6 @@ public boolean visit(MySqlDeleteStatement x) { this.indentCount--; } - if (x.getOrderBy() != null) { println(); x.getOrderBy().accept(this); @@ -1201,7 +1194,6 @@ public boolean visit(MySqlInsertStatement x) { } } - String columnsString = x.getColumnsString(); if (columnsString != null) { if (!isEnabled(VisitorFeature.OutputSkipInsertColumnsString)) { @@ -1232,7 +1224,7 @@ public boolean visit(MySqlInsertStatement x) { } } - List valuesList = x.getValuesList(); + List valuesList = x.getValuesList(); if (!valuesList.isEmpty()) { println(); printValuesList(valuesList); @@ -1262,11 +1254,9 @@ public boolean visit(MySqlInsertStatement x) { } protected void printValuesList(List valuesList) { - if (this.parameterized && valuesList.size() > 1 - && !this.parameterizedQuesUnMergeValuesList) - { + && !this.parameterizedQuesUnMergeValuesList) { print0(ucase ? "VALUES " : "values "); this.indentCount++; @@ -1448,7 +1438,6 @@ public boolean visit(MySqlLoadDataInFileStatement x) { } public boolean visit(SQLReplaceStatement x) { - final List headHints = x.getHeadHintsDirect(); if (headHints != null) { for (SQLCommentHint hint : headHints) { @@ -1459,8 +1448,6 @@ public boolean visit(SQLReplaceStatement x) { print0(ucase ? "REPLACE " : "replace "); - - if (x.isLowPriority()) { print0(ucase ? "LOW_PRIORITY " : "low_priority "); } @@ -1478,7 +1465,6 @@ public boolean visit(SQLReplaceStatement x) { printTableSourceExpr(x.getTableName()); - List columns = x.getColumns(); if (columns.size() > 0) { print0(" ("); @@ -1567,7 +1553,7 @@ public boolean visit(SQLStartTransactionStatement x) { } if (x.isReadOnly()) { - print0(ucase ?" READ ONLY" : " read only"); + print0(ucase ? " READ ONLY" : " read only"); } return false; @@ -1655,7 +1641,6 @@ public boolean visit(MySqlShowDatabaseStatusStatement x) { x.getName().accept(this); } - if (x.getWhere() != null) { print0(ucase ? " WHERE " : " where "); x.getWhere().accept(this); @@ -1671,7 +1656,6 @@ public boolean visit(MySqlShowDatabaseStatusStatement x) { x.getLimit().accept(this); } - return false; } @@ -2038,27 +2022,32 @@ public boolean visit(MySqlPartitionByKey x) { return false; } - @Override public boolean visit(MySqlShowPlanCacheStatusStatement x) { + @Override + public boolean visit(MySqlShowPlanCacheStatusStatement x) { print0(ucase ? "SHOW PLANCACHE STATUS" : "show plancache status"); return false; } - @Override public boolean visit(MySqlClearPlanCacheStatement x) { + @Override + public boolean visit(MySqlClearPlanCacheStatement x) { print0(ucase ? "CLEAR PLANCACHE" : "clear plancache"); return false; } - @Override public boolean visit(MySqlDisabledPlanCacheStatement x) { + @Override + public boolean visit(MySqlDisabledPlanCacheStatement x) { print0(ucase ? "DISABLED PLANCACHE" : "disabled plancache"); return false; } - @Override public boolean visit(MySqlExplainPlanCacheStatement x) { + @Override + public boolean visit(MySqlExplainPlanCacheStatement x) { print0(ucase ? "EXPLAIN PLANCACHE" : "explain plancache"); return false; } - @Override public boolean visit(MySqlUpdatePlanCacheStatement x) { + @Override + public boolean visit(MySqlUpdatePlanCacheStatement x) { print0(ucase ? "UPDATE PLANCACHE " : "update plancache "); x.getFormSelect().accept(this); println(); @@ -2335,7 +2324,7 @@ public boolean visit(MySqlSetTransactionStatement x) { print0(ucase ? "SET " : "set "); if (x.getGlobal() != null && x.getGlobal()) { print0(ucase ? "GLOBAL " : "global "); - } else if(x.getSession() != null && x.getSession()) { + } else if (x.getSession() != null && x.getSession()) { print0(ucase ? "SESSION " : "session "); } @@ -2802,13 +2791,11 @@ public boolean visit(MySqlShowSlowStatement x) { public boolean visit(MySqlShowSequencesStatement x) { print0(ucase ? "SHOW SEQUENCES" : "show sequences"); - if (x.getWhere() != null) { print0(ucase ? " WHERE " : " where "); x.getWhere().accept(this); } - if (x.getOrderBy() != null) { print0(" "); x.getOrderBy().accept(this); @@ -2929,7 +2916,6 @@ public boolean visit(MySqlShowRuleStatement x) { x.getWhere().accept(this); } - if (x.getOrderBy() != null) { print0(" "); x.getOrderBy().accept(this); @@ -3002,8 +2988,9 @@ public boolean visit(MySqlCheckTableStatement x) { return false; } - @Override public boolean visit(MysqlCreateFullTextCharFilterStatement x) { - print0(ucase? "CREATE FULLTEXT CHARFILTER " : "create fulltext charfilter "); + @Override + public boolean visit(MysqlCreateFullTextCharFilterStatement x) { + print0(ucase ? "CREATE FULLTEXT CHARFILTER " : "create fulltext charfilter "); x.getName().accept(this); println("("); print0("\"type\" = " + x.getTypeName()); @@ -3016,7 +3003,8 @@ public boolean visit(MySqlCheckTableStatement x) { return false; } - @Override public boolean visit(MysqlShowFullTextStatement x) { + @Override + public boolean visit(MysqlShowFullTextStatement x) { print0(ucase ? "SHOW FULLTEXT " : "show fulltext "); if (x.getType() == FullTextType.DICTIONARY) { print0(ucase ? "DICTIONARIES" : "dictionaries"); @@ -3026,7 +3014,8 @@ public boolean visit(MySqlCheckTableStatement x) { return false; } - @Override public boolean visit(MysqlShowCreateFullTextStatement x) { + @Override + public boolean visit(MysqlShowCreateFullTextStatement x) { print0(ucase ? "SHOW CREATE FULLTEXT " : "show create fulltext "); print0(ucase ? x.getType().toString().toUpperCase() : x.getType().toString().toLowerCase()); print0(" "); @@ -3034,24 +3023,27 @@ public boolean visit(MySqlCheckTableStatement x) { return false; } - @Override public boolean visit(MysqlAlterFullTextStatement x) { + @Override + public boolean visit(MysqlAlterFullTextStatement x) { print0(ucase ? "ALTER FULLTEXT " : "alter fulltext "); print0(ucase ? x.getType().toString().toUpperCase() : x.getType().toString().toLowerCase()); - print0( " "); + print0(" "); x.getName().accept(this); print0(ucase ? " SET " : " set "); x.getItem().accept(this); return false; } - @Override public boolean visit(SQLAlterTableDropClusteringKey x) { + @Override + public boolean visit(SQLAlterTableDropClusteringKey x) { print0(ucase ? "DROP CLUSTERED KEY " : "drop clustered key "); x.getKeyName().accept(this); return false; } - @Override public boolean visit(MysqlDropFullTextStatement x) { + @Override + public boolean visit(MysqlDropFullTextStatement x) { print0(ucase ? "DROP FULLTEXT " : "drop fulltext "); print0(ucase ? x.getType().toString().toUpperCase() : x.getType().toString().toLowerCase()); print0(" "); @@ -3059,8 +3051,8 @@ public boolean visit(MySqlCheckTableStatement x) { return false; } - @Override public boolean visit(MysqlCreateFullTextTokenizerStatement x) { - + @Override + public boolean visit(MysqlCreateFullTextTokenizerStatement x) { print0(ucase ? "CREATE FULLTEXT TOKENIZER " : "create fulltext tokenizer "); x.getName().accept(this); println("("); @@ -3069,7 +3061,7 @@ public boolean visit(MySqlCheckTableStatement x) { println(","); print("\"user_defined_dict\" = " + x.getUserDefinedDict()); } - if(!x.getOptions().isEmpty()) { + if (!x.getOptions().isEmpty()) { println(","); printAndAccept(x.getOptions(), ","); } @@ -3079,7 +3071,8 @@ public boolean visit(MySqlCheckTableStatement x) { return false; } - @Override public boolean visit(MysqlCreateFullTextTokenFilterStatement x) { + @Override + public boolean visit(MysqlCreateFullTextTokenFilterStatement x) { print0(ucase ? "CREATE FULLTEXT TOKENFILTER " : "create fulltext tokenfilter "); x.getName().accept(this); println("("); @@ -3091,11 +3084,12 @@ public boolean visit(MySqlCheckTableStatement x) { return false; } - @Override public boolean visit(MysqlCreateFullTextAnalyzerStatement x) { + @Override + public boolean visit(MysqlCreateFullTextAnalyzerStatement x) { print0(ucase ? "CREATE FULLTEXT ANALYZER " : "create fulltext analyzer "); x.getName().accept(this); println("("); - print0(ucase ? "\"TOKENIZER\" = " : "\"tokenizer\" = " ); + print0(ucase ? "\"TOKENIZER\" = " : "\"tokenizer\" = "); print0(x.getTokenizer()); println(","); @@ -3126,7 +3120,8 @@ public boolean visit(MySqlCheckTableStatement x) { return false; } - @Override public boolean visit(MysqlCreateFullTextDictionaryStatement x) { + @Override + public boolean visit(MysqlCreateFullTextDictionaryStatement x) { print0(ucase ? "CREATE FULLTEXT DICTIONARY " : "create fulltext dictionary "); x.getName().accept(this); println("("); @@ -3141,11 +3136,12 @@ public boolean visit(MySqlCheckTableStatement x) { return false; } - @Override public boolean visit(MySqlAlterTableAlterFullTextIndex x) { + @Override + public boolean visit(MySqlAlterTableAlterFullTextIndex x) { print0(ucase ? " ALTER INDEX " : " alter index "); x.getIndexName().accept(this); print0(ucase ? " FULLTEXT " : " fulltext "); - if(x.getAnalyzerType() != null) { + if (x.getAnalyzerType() != null) { String analyzerType = x.getAnalyzerType().toString(); print0(ucase ? analyzerType.toUpperCase() : analyzerType.toLowerCase()); } @@ -3207,13 +3203,11 @@ public boolean visit(MySqlExtPartition.Item x) { public boolean visit(MySqlShowTraceStatement x) { print0(ucase ? "SHOW TRACE" : "show trace"); - if (x.getWhere() != null) { print0(ucase ? " WHERE " : " where "); x.getWhere().accept(this); } - if (x.getOrderBy() != null) { print0(" "); x.getOrderBy().accept(this); @@ -3236,7 +3230,6 @@ public boolean visit(MySqlShowBroadcastsStatement x) { x.getWhere().accept(this); } - if (x.getOrderBy() != null) { print0(" "); x.getOrderBy().accept(this); @@ -3254,13 +3247,11 @@ public boolean visit(MySqlShowBroadcastsStatement x) { public boolean visit(MySqlShowDatasourcesStatement x) { print0(ucase ? "SHOW DATASOURCES" : "show datasources"); - if (x.getWhere() != null) { print0(ucase ? " WHERE " : " where "); x.getWhere().accept(this); } - if (x.getOrderBy() != null) { print0(" "); x.getOrderBy().accept(this); @@ -3278,13 +3269,11 @@ public boolean visit(MySqlShowDatasourcesStatement x) { public boolean visit(MySqlShowNodeStatement x) { print0(ucase ? "SHOW NODE" : "show node"); - if (x.getWhere() != null) { print0(ucase ? " WHERE " : " where "); x.getWhere().accept(this); } - if (x.getOrderBy() != null) { print0(" "); x.getOrderBy().accept(this); @@ -3302,13 +3291,11 @@ public boolean visit(MySqlShowNodeStatement x) { public boolean visit(MySqlShowHelpStatement x) { print0(ucase ? "SHOW HELP" : "show help"); - if (x.getWhere() != null) { print0(ucase ? " WHERE " : " where "); x.getWhere().accept(this); } - if (x.getOrderBy() != null) { print0(" "); x.getOrderBy().accept(this); @@ -3360,7 +3347,6 @@ public boolean visit(MySqlShowDdlStatusStatement x) { x.getWhere().accept(this); } - if (x.getOrderBy() != null) { print0(" "); x.getOrderBy().accept(this); @@ -3597,7 +3583,7 @@ public boolean visit(MySqlIgnoreIndexHint x) { print0(ucase ? "IGNORE INDEX " : "ignore index "); if (x.getOption() != null) { print0(ucase ? "FOR " : "for "); - print0(ucase ? x.getOption().name : x.getOption().name_lcase); + print0(ucase ? x.getOption().name : x.getOption().nameLCase); print(' '); } print('('); @@ -3649,7 +3635,7 @@ public boolean visit(SQLExprTableSource x) { public boolean visit(MySqlLockTableStatement x) { print0(ucase ? "LOCK TABLES" : "lock tables"); List items = x.getItems(); - if(items.size() > 0) { + if (items.size() > 0) { print(' '); printAndAccept(items, ", "); } @@ -3828,7 +3814,6 @@ public boolean visit(MySqlUnique x) { name.accept(this); } - if (x.getIndexType() != null) { print0(ucase ? " USING " : " using "); print0(x.getIndexType()); @@ -3910,17 +3895,17 @@ public boolean visit(MysqlForeignKey x) { SQLForeignKeyImpl.Match match = x.getReferenceMatch(); if (match != null) { print0(ucase ? " MATCH " : " match "); - print0(ucase ? match.name : match.name_lcase); + print0(ucase ? match.name : match.nameLCase); } if (x.getOnDelete() != null) { print0(ucase ? " ON DELETE " : " on delete "); - print0(ucase ? x.getOnDelete().name : x.getOnDelete().name_lcase); + print0(ucase ? x.getOnDelete().name : x.getOnDelete().nameLCase); } if (x.getOnUpdate() != null) { print0(ucase ? " ON UPDATE " : " on update "); - print0(ucase ? x.getOnUpdate().name : x.getOnUpdate().name_lcase); + print0(ucase ? x.getOnUpdate().name : x.getOnUpdate().nameLCase); } return false; } @@ -3968,8 +3953,6 @@ public boolean visit(MySqlAlterTableImportTablespace x) { @Override public boolean visit(SQLAssignItem x) { - - String tagetString = x.getTarget().toString(); boolean mysqlSpecial = false; @@ -4030,7 +4013,6 @@ public boolean visit(MySqlAnalyzeStatement x) { print0(ucase ? "LOCAL " : "local "); } - if (!x.getAdbColumns().isEmpty()) { print0(ucase ? "COLUMN " : "column "); } else if (!x.getAdbColumnsGroup().isEmpty()) { @@ -4201,7 +4183,7 @@ public boolean visit(MySqlOrderingExpr x) { x.getExpr().accept(this); if (x.getType() != null) { print(' '); - print0(ucase ? x.getType().name : x.getType().name_lcase); + print0(ucase ? x.getType().name : x.getType().nameLCase); } return false; @@ -4343,7 +4325,9 @@ public boolean visit(MySqlCaseStatement x) { for (int i = 0; i < x.getWhenList().size(); i++) { x.getWhenList().get(i).accept(this); } - if (x.getElseItem() != null) x.getElseItem().accept(this); + if (x.getElseItem() != null) { + x.getElseItem().accept(this); + } print0(ucase ? "END CASE" : "end case"); return false; } @@ -4361,7 +4345,9 @@ public boolean visit(MySqlSelectIntoStatement x) { print0(ucase ? " INTO " : " into "); for (int i = 0; i < x.getVarList().size(); i++) { x.getVarList().get(i).accept(this); - if (i != x.getVarList().size() - 1) print0(", "); + if (i != x.getVarList().size() - 1) { + print0(", "); + } } return false; } @@ -4661,7 +4647,6 @@ public boolean visit(MySqlDeclareConditionStatement x) { @Override public boolean visit(SQLAlterTableDropColumnItem x) { - for (int i = 0; i < x.getColumns().size(); ++i) { if (i != 0) { print0(", "); @@ -4845,7 +4830,7 @@ public boolean visit(MySqlFlushStatement x) { print0(ucase ? " LOCAL" : " local"); } - if(x.isBinaryLogs()) { + if (x.isBinaryLogs()) { print0(ucase ? " BINARY LOGS" : " binary logs"); } if (x.isDesKeyFile()) { @@ -4893,7 +4878,7 @@ public boolean visit(MySqlFlushStatement x) { print0(ucase ? " USER_RESOURCES" : " user_resources"); } - if(x.isTableOption()){ + if (x.isTableOption()) { print0(ucase ? " TABLES" : " tables"); List tables = x.getTables(); @@ -5413,7 +5398,7 @@ public boolean visit(SQLValuesTableSource x) { decrementIndent(); println(); print0(")"); - if(x.getAlias() != null) { + if (x.getAlias() != null) { print0(" AS "); print0(x.getAlias()); @@ -5571,6 +5556,5 @@ public boolean visit(MysqlAlterTableAlterCheck x) { } public void endVisit(MysqlAlterTableAlterCheck x) { - } } // diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedVisitor.java index 9829dd87c3..24e83c660a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedVisitor.java @@ -16,22 +16,12 @@ package com.alibaba.druid.sql.dialect.mysql.visitor; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.dialect.mysql.ast.*; -import com.alibaba.druid.sql.dialect.mysql.ast.clause.*; -import com.alibaba.druid.sql.dialect.mysql.ast.clause.MySqlCaseStatement.MySqlWhenStatement; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlCharExpr; -import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlOrderingExpr; -import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlOutFileExpr; -import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlUserName; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.*; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement.TableSpaceOption; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateUserStatement.UserSpecification; import com.alibaba.druid.sql.visitor.SQLASTParameterizedVisitor; import java.util.List; public class MySqlParameterizedVisitor extends SQLASTParameterizedVisitor implements MySqlASTVisitor { - public MySqlParameterizedVisitor() { super(DbType.mysql); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java index 28d8a37e34..11d3c90f72 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java @@ -24,7 +24,9 @@ import com.alibaba.druid.sql.dialect.mysql.ast.*; import com.alibaba.druid.sql.dialect.mysql.ast.clause.*; import com.alibaba.druid.sql.dialect.mysql.ast.clause.MySqlCaseStatement.MySqlWhenStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.expr.*; +import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlCharExpr; +import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlOutFileExpr; +import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlUserName; import com.alibaba.druid.sql.dialect.mysql.ast.statement.*; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement.TableSpaceOption; import com.alibaba.druid.sql.repository.SchemaRepository; @@ -33,13 +35,12 @@ import com.alibaba.druid.stat.TableStat.Mode; public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlASTVisitor { - public MySqlSchemaStatVisitor() { - super (DbType.mysql); + super(DbType.mysql); } public MySqlSchemaStatVisitor(SchemaRepository repository) { - super (repository); + super(repository); } public boolean visit(SQLSelectStatement x) { @@ -165,32 +166,38 @@ public boolean visit(MySqlPartitionByKey x) { return false; } - @Override public boolean visit(MySqlUpdatePlanCacheStatement x) { + @Override + public boolean visit(MySqlUpdatePlanCacheStatement x) { return false; } - @Override public boolean visit(MySqlShowPlanCacheStatusStatement x) { + @Override + public boolean visit(MySqlShowPlanCacheStatusStatement x) { return false; } - @Override public boolean visit(MySqlClearPlanCacheStatement x) { + @Override + public boolean visit(MySqlClearPlanCacheStatement x) { return false; } - @Override public boolean visit(MySqlDisabledPlanCacheStatement x) { + @Override + public boolean visit(MySqlDisabledPlanCacheStatement x) { return false; } - @Override public boolean visit(MySqlAlterDatabaseSetOption x) { + @Override + public boolean visit(MySqlAlterDatabaseSetOption x) { return false; } - @Override public boolean visit(MySqlAlterDatabaseKillJob x) { + @Override + public boolean visit(MySqlAlterDatabaseKillJob x) { return false; } - - @Override public boolean visit(MySqlExplainPlanCacheStatement x) { + @Override + public boolean visit(MySqlExplainPlanCacheStatement x) { return false; } @@ -229,7 +236,7 @@ public boolean visit(MySqlUpdateStatement x) { for (SQLExpr item : x.getReturning()) { item.accept(this); } - + return false; } @@ -238,7 +245,8 @@ public boolean visit(MySqlSetTransactionStatement x) { return false; } - @Override public boolean visit(MySqlShowHMSMetaStatement x) { + @Override + public boolean visit(MySqlShowHMSMetaStatement x) { return false; } @@ -695,15 +703,15 @@ public boolean visit(MySqlSubPartitionByList x) { return false; } - @Override - public boolean visit(MySqlDeclareHandlerStatement x) { - return false; - } + @Override + public boolean visit(MySqlDeclareHandlerStatement x) { + return false; + } - @Override - public boolean visit(MySqlDeclareConditionStatement x) { - return false; - } + @Override + public boolean visit(MySqlDeclareConditionStatement x) { + return false; + } @Override public boolean visit(MySqlFlushStatement x) { @@ -784,6 +792,7 @@ public boolean visit(MySqlFlashbackStatement x) { public boolean visit(MySqlShowConfigStatement x) { return false; } + @Override public boolean visit(MySqlShowPlanCacheStatement x) { return false; @@ -807,43 +816,53 @@ public boolean visit(MySqlCheckTableStatement x) { return false; } - @Override public boolean visit(MysqlCreateFullTextCharFilterStatement x) { + @Override + public boolean visit(MysqlCreateFullTextCharFilterStatement x) { return false; } - @Override public boolean visit(MysqlShowFullTextStatement x) { + @Override + public boolean visit(MysqlShowFullTextStatement x) { return false; } - @Override public boolean visit(MysqlShowCreateFullTextStatement x) { + @Override + public boolean visit(MysqlShowCreateFullTextStatement x) { return false; } - @Override public boolean visit(MysqlAlterFullTextStatement x) { + @Override + public boolean visit(MysqlAlterFullTextStatement x) { return false; } - @Override public boolean visit(MysqlDropFullTextStatement x) { + @Override + public boolean visit(MysqlDropFullTextStatement x) { return false; } - @Override public boolean visit(MysqlCreateFullTextTokenizerStatement x) { + @Override + public boolean visit(MysqlCreateFullTextTokenizerStatement x) { return false; } - @Override public boolean visit(MysqlCreateFullTextTokenFilterStatement x) { + @Override + public boolean visit(MysqlCreateFullTextTokenFilterStatement x) { return false; } - @Override public boolean visit(MysqlCreateFullTextAnalyzerStatement x) { + @Override + public boolean visit(MysqlCreateFullTextAnalyzerStatement x) { return false; } - @Override public boolean visit(MysqlCreateFullTextDictionaryStatement x) { + @Override + public boolean visit(MysqlCreateFullTextDictionaryStatement x) { return false; } - @Override public boolean visit(MySqlAlterTableAlterFullTextIndex x) { + @Override + public boolean visit(MySqlAlterTableAlterFullTextIndex x) { return false; } @@ -892,11 +911,13 @@ public boolean visit(MySqlSubPartitionByValue x) { return false; } - @Override public boolean visit(MySqlExtPartition x) { + @Override + public boolean visit(MySqlExtPartition x) { return true; } - @Override public boolean visit(MySqlExtPartition.Item x) { + @Override + public boolean visit(MySqlExtPartition.Item x) { return false; } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlShowColumnOutpuVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlShowColumnOutpuVisitor.java index 22b08eb138..258e362ec2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlShowColumnOutpuVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlShowColumnOutpuVisitor.java @@ -176,12 +176,12 @@ public boolean visit(MySqlCreateTableStatement x) { print("-+-"); print('-', extra_len); print("-+\n"); - + return false; } void print(char ch, int count) { - for (int i = 0; i < count; ++i) { + for (int i = 0; i < count; ++i) { print(ch); } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/FromSubqueryResolver.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/FromSubqueryResolver.java index 397803c0eb..05bea614f9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/FromSubqueryResolver.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/FromSubqueryResolver.java @@ -54,10 +54,10 @@ public boolean visit(SQLSubqueryTableSource x) { String subViewName = generateSubViewName(); SQLObject parent = x.getParent(); - if(parent instanceof SQLSelectQueryBlock) { + if (parent instanceof SQLSelectQueryBlock) { SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) parent; queryBlock.setFrom(subViewName, x.getAlias()); - } else if(parent instanceof SQLJoinTableSource) { + } else if (parent instanceof SQLJoinTableSource) { SQLJoinTableSource join = (SQLJoinTableSource) parent; if (join.getLeft() == x) { join.setLeft(subViewName, x.getAlias()); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/NameResolveVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/NameResolveVisitor.java index 4a38f00e7e..0702ddc066 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/NameResolveVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/NameResolveVisitor.java @@ -19,17 +19,8 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.ast.expr.SQLExistsExpr; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.expr.SQLInSubQueryExpr; -import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; -import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; -import com.alibaba.druid.sql.ast.statement.SQLSelect; -import com.alibaba.druid.sql.ast.statement.SQLSelectItem; -import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; -import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; -import com.alibaba.druid.sql.ast.statement.SQLTableSource; +import com.alibaba.druid.sql.ast.expr.*; +import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitorAdapter; import com.alibaba.druid.util.FnvHash; @@ -151,11 +142,9 @@ public boolean isRowNumColumn(SQLExpr x, SQLSelectQueryBlock source) { return true; } - SQLSelectQueryBlock queryBlock = source; if (queryBlock.getFrom() instanceof SQLSubqueryTableSource && ((SQLSubqueryTableSource) queryBlock.getFrom()).getSelect().getQuery() instanceof SQLSelectQueryBlock) { - SQLSelectQueryBlock subQueryBlock = ((SQLSubqueryTableSource) queryBlock.getFrom()).getSelect().getQueryBlock(); SQLSelectItem selectItem = subQueryBlock.findSelectItem(nameHashCode64); @@ -165,12 +154,10 @@ public boolean isRowNumColumn(SQLExpr x, SQLSelectQueryBlock source) { } - } return false; } - /** * 是否是 select item 字段的别名 * @@ -191,7 +178,6 @@ public boolean isAliasColumn(SQLExpr x, SQLSelectQueryBlock source) { if (queryBlock.getFrom() instanceof SQLSubqueryTableSource && ((SQLSubqueryTableSource) queryBlock.getFrom()).getSelect().getQuery() instanceof SQLSelectQueryBlock) { - SQLSelectQueryBlock subQueryBlock = ((SQLSubqueryTableSource) queryBlock.getFrom()).getSelect().getQueryBlock(); if (isAliasColumn(x, subQueryBlock)) { @@ -200,10 +186,8 @@ public boolean isAliasColumn(SQLExpr x, SQLSelectQueryBlock source) { } - } return false; } - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/OrderByResolve.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/OrderByResolve.java index b30b451f77..b3e0a12bf4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/OrderByResolve.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/OrderByResolve.java @@ -33,7 +33,7 @@ * Created by wenshao on 27/07/2017. */ public class OrderByResolve extends OracleASTVisitorAdapter { - final static long DBMS_RANDOM_VALUE = FnvHash.hashCode64("DBMS_RANDOM.value"); + static final long DBMS_RANDOM_VALUE = FnvHash.hashCode64("DBMS_RANDOM.value"); public boolean visit(SQLSelect x) { SQLSelectQueryBlock queryBlock = x.getQueryBlock(); @@ -51,7 +51,6 @@ public boolean visit(SQLSelect x) { return super.visit(x); } - if (!queryBlock.selectItemHasAllColumn(false)) { List notContainsOrderBy = new ArrayList(); @@ -82,8 +81,6 @@ public boolean visit(SQLSelect x) { } } - - return super.visit(x); } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddAccountProviderStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddAccountProviderStatement.java index 4dc4dd268e..03f45cfd66 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddAccountProviderStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddAccountProviderStatement.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OdpsAddAccountProviderStatement extends SQLStatementImpl { - private SQLName provider; public OdpsAddAccountProviderStatement() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddFileStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddFileStatement.java index e9dc162c01..ed94f148ed 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddFileStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddFileStatement.java @@ -17,10 +17,7 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.statement.SQLAlterStatement; -import com.alibaba.druid.sql.ast.statement.SQLAssignItem; -import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; public class OdpsAddFileStatement extends OdpsStatementImpl implements SQLAlterStatement { @@ -38,9 +35,7 @@ public OdpsAddFileStatement() { @Override protected void accept0(OdpsASTVisitor visitor) { - if (visitor.visit(this)) { - - } + visitor.visit(this); visitor.endVisit(this); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddStatisticStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddStatisticStatement.java index 24f9a224b9..dc572f6400 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddStatisticStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddStatisticStatement.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; public class OdpsAddStatisticStatement extends OdpsStatementImpl implements SQLAlterStatement { - private SQLExprTableSource table; private OdpsStatisticClause statisticClause; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddTableStatement.java index b3b58a4e78..d4dffeb4d1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddTableStatement.java @@ -28,7 +28,6 @@ import java.util.List; public class OdpsAddTableStatement extends OdpsStatementImpl implements SQLAlterStatement { - private SQLExprTableSource table; private final List partitions = new ArrayList(); protected SQLExpr comment; @@ -41,7 +40,6 @@ public OdpsAddTableStatement() { super.dbType = DbType.odps; } - @Override protected void accept0(OdpsASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddUserStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddUserStatement.java index 194220abcc..bb3ff93cff 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddUserStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsAddUserStatement.java @@ -16,15 +16,12 @@ package com.alibaba.druid.sql.dialect.odps.ast; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OdpsAddUserStatement extends SQLStatementImpl { - private SQLName user; public OdpsAddUserStatement() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsCountStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsCountStatement.java index a16f33907d..e768245ba7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsCountStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsCountStatement.java @@ -27,17 +27,14 @@ public class OdpsCountStatement extends OdpsStatementImpl implements SQLAlterStatement { - private SQLExprTableSource table; private final List partitions = new ArrayList(); - public OdpsCountStatement() { super.dbType = DbType.odps; } - @Override protected void accept0(OdpsASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsCreateTableStatement.java index 43240ce4a2..5990948765 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsCreateTableStatement.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; -import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateTableStatement; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; @@ -33,7 +32,7 @@ public class OdpsCreateTableStatement extends HiveCreateTableStatement { protected SQLExpr lifecycle; protected SQLExpr storedBy; - public OdpsCreateTableStatement(){ + public OdpsCreateTableStatement() { super(DbType.odps); } @@ -52,7 +51,7 @@ public void setLike(SQLExprTableSource like) { public List getPartitionColumns() { return partitionColumns; } - + public void addPartitionColumn(SQLColumnDefinition column) { if (column != null) { column.setParent(this); @@ -108,5 +107,4 @@ public List getWithSerdeproperties() { return withSerdeproperties; } - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsDeclareVariableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsDeclareVariableStatement.java index 54536cf471..5837b182ab 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsDeclareVariableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsDeclareVariableStatement.java @@ -2,7 +2,6 @@ import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; public class OdpsDeclareVariableStatement extends OdpsStatementImpl { @@ -11,7 +10,6 @@ public class OdpsDeclareVariableStatement extends OdpsStatementImpl { private SQLExpr initValue; public OdpsDeclareVariableStatement() { - } public OdpsDeclareVariableStatement(String variant, SQLExpr initValue) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsExstoreStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsExstoreStatement.java index 05b196d6cd..d0ef25c4d9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsExstoreStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsExstoreStatement.java @@ -1,12 +1,11 @@ package com.alibaba.druid.sql.dialect.odps.ast; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; -import java.util.List; import java.util.ArrayList; +import java.util.List; public class OdpsExstoreStatement extends OdpsStatementImpl { private SQLExprTableSource table; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsGrantStmt.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsGrantStmt.java index c3260d9d3b..d299efd77d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsGrantStmt.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsGrantStmt.java @@ -18,10 +18,8 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.statement.SQLGrantStatement; import com.alibaba.druid.sql.ast.statement.SQLObjectType; -import com.alibaba.druid.sql.ast.statement.SQLPrivilegeItem; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -29,17 +27,16 @@ import java.util.List; public class OdpsGrantStmt extends SQLGrantStatement { - private SQLObjectType subjectType; - private boolean isSuper = false; + private boolean isSuper; - private boolean isLabel = false; - private SQLExpr label; - private List columns = new ArrayList(); ; - private SQLExpr expire; + private boolean isLabel; + private SQLExpr label; + private List columns = new ArrayList(); + private SQLExpr expire; - public OdpsGrantStmt(){ + public OdpsGrantStmt() { super(DbType.odps); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsListStmt.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsListStmt.java index 837f594cfd..a2a86d87cf 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsListStmt.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsListStmt.java @@ -22,10 +22,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OdpsListStmt extends SQLStatementImpl { - private SQLExpr object; - public OdpsListStmt(){ + public OdpsListStmt() { super(DbType.odps); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsNewExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsNewExpr.java index 906a543047..860cd387c4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsNewExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsNewExpr.java @@ -1,7 +1,6 @@ package com.alibaba.druid.sql.dialect.odps.ast; import com.alibaba.druid.FastsqlException; -import com.alibaba.druid.sql.ast.SQLArgument; import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; @@ -9,17 +8,16 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.io.IOException; -import java.util.List; import java.util.ArrayList; +import java.util.List; public class OdpsNewExpr extends SQLMethodInvokeExpr implements OdpsObject { - private boolean array = false; + private boolean array; private List initValues = new ArrayList<>(); private List typeParameters = new ArrayList<>(); public OdpsNewExpr() { - } @Override @@ -55,8 +53,8 @@ public void accept0(OdpsASTVisitor visitor) { this.using.accept(visitor); } - if (this._for != null) { - this._for.accept(visitor); + if (this.hasFor != null) { + this.hasFor.accept(visitor); } visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsObjectImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsObjectImpl.java index c25e151b36..d18205c3a3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsObjectImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsObjectImpl.java @@ -25,9 +25,9 @@ public abstract class OdpsObjectImpl extends SQLObjectImpl implements OdpsObject protected void accept0(SQLASTVisitor visitor) { accept0((OdpsASTVisitor) visitor); } - + public abstract void accept0(OdpsASTVisitor visitor); - + public String toString() { return SQLUtils.toOdpsString(this); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsQueryAliasStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsQueryAliasStatement.java index a862aa299c..aefdee853b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsQueryAliasStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsQueryAliasStatement.java @@ -9,7 +9,6 @@ public class OdpsQueryAliasStatement extends OdpsStatementImpl { private SQLSelectStatement statement; public OdpsQueryAliasStatement() { - } public OdpsQueryAliasStatement(String variant, SQLSelectStatement statement) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsReadStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsReadStatement.java index 37b70133a5..fac8efb932 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsReadStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsReadStatement.java @@ -25,11 +25,10 @@ import java.util.List; public class OdpsReadStatement extends OdpsStatementImpl { - - private SQLExprTableSource table; + private SQLExprTableSource table; private List partition = new ArrayList(); - private List columns = new ArrayList(); - private SQLExpr rowCount; + private List columns = new ArrayList(); + private SQLExpr rowCount; @Override protected void accept0(OdpsASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRemoveStatisticStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRemoveStatisticStatement.java index d404f01c0f..190dec2c69 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRemoveStatisticStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRemoveStatisticStatement.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; public class OdpsRemoveStatisticStatement extends OdpsStatementImpl { - private SQLExprTableSource table; private OdpsStatisticClause statisticClause; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRemoveUserStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRemoveUserStatement.java index 24bf2951fb..21bb05e2e2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRemoveUserStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRemoveUserStatement.java @@ -15,15 +15,12 @@ */ package com.alibaba.druid.sql.dialect.odps.ast; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OdpsRemoveUserStatement extends SQLStatementImpl { - private SQLIdentifierExpr user; @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRestoreStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRestoreStatement.java index 08cd133393..632d5a59b7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRestoreStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsRestoreStatement.java @@ -28,7 +28,6 @@ public class OdpsRestoreStatement extends OdpsStatementImpl implements SQLAlterStatement { - private final List properties = new ArrayList(); private final List partitions = new ArrayList(); private SQLExprTableSource table; @@ -40,7 +39,6 @@ public OdpsRestoreStatement() { super.dbType = DbType.odps; } - @Override protected void accept0(OdpsASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java index 3a1bcf5da5..25f4ba10b4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java @@ -17,7 +17,8 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.SQLLimit; +import com.alibaba.druid.sql.ast.SQLZOrderBy; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; @@ -29,7 +30,7 @@ public class OdpsSelectQueryBlock extends SQLSelectQueryBlock { private SQLZOrderBy zOrderBy; - public OdpsSelectQueryBlock(){ + public OdpsSelectQueryBlock() { dbType = DbType.odps; clusterBy = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSetLabelStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSetLabelStatement.java index 1d668181a2..d3007f44ff 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSetLabelStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSetLabelStatement.java @@ -24,15 +24,14 @@ import java.util.List; public class OdpsSetLabelStatement extends OdpsStatementImpl { + private String label; - private String label; - - private SQLExpr project; - private SQLExpr user; + private SQLExpr project; + private SQLExpr user; private SQLTableSource table; - private List columns = new ArrayList(); + private List columns = new ArrayList(); @Override protected void accept0(OdpsASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsShowChangelogsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsShowChangelogsStatement.java index ab94c9c179..ccf3d42c7b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsShowChangelogsStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsShowChangelogsStatement.java @@ -33,7 +33,6 @@ public class OdpsShowChangelogsStatement extends SQLStatementImpl { private SQLExpr id; public OdpsShowChangelogsStatement() { - } public SQLExprTableSource getTable() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsShowGrantsStmt.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsShowGrantsStmt.java index 7d74281dd0..1a60224644 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsShowGrantsStmt.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsShowGrantsStmt.java @@ -26,7 +26,7 @@ public class OdpsShowGrantsStmt extends SQLStatementImpl { private SQLExpr user; private SQLExpr objectType; - + @Override protected void accept0(SQLASTVisitor visitor) { accept0((OdpsASTVisitor) visitor); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsStatementImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsStatementImpl.java index d9de2ca6d6..f364299c7c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsStatementImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsStatementImpl.java @@ -20,15 +20,14 @@ import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; - public abstract class OdpsStatementImpl extends SQLStatementImpl { @Override protected void accept0(SQLASTVisitor visitor) { accept0((OdpsASTVisitor) visitor); } - + protected abstract void accept0(OdpsASTVisitor visitor); - + public String toString() { return SQLUtils.toOdpsString(this); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsStatisticClause.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsStatisticClause.java index 7fc98c3196..57d995e8e2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsStatisticClause.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsStatisticClause.java @@ -20,22 +20,20 @@ import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor; public abstract class OdpsStatisticClause extends OdpsObjectImpl { - - public static abstract class ColumnStatisticClause extends OdpsStatisticClause { - + public abstract static class ColumnStatisticClause extends OdpsStatisticClause { protected SQLName column; - + public SQLName getColumn() { return column; } - + public void setColumn(SQLName column) { if (column != null) { column.setParent(this); } this.column = column; } - + } public static class NullValue extends ColumnStatisticClause { @@ -68,7 +66,6 @@ public void accept0(OdpsASTVisitor visitor) { } } - public static class DistinctValue extends ColumnStatisticClause { @Override public void accept0(OdpsASTVisitor visitor) { @@ -79,7 +76,6 @@ public void accept0(OdpsASTVisitor visitor) { } } - public static class ColumnMax extends ColumnStatisticClause { @Override public void accept0(OdpsASTVisitor visitor) { @@ -91,20 +87,19 @@ public void accept0(OdpsASTVisitor visitor) { } public static class ExpressionCondition extends OdpsStatisticClause { - private SQLExpr expr; - + public SQLExpr getExpr() { return expr; } - + public void setExpr(SQLExpr expr) { if (expr != null) { expr.setParent(this); } this.expr = expr; } - + @Override public void accept0(OdpsASTVisitor visitor) { if (visitor.visit(this)) { @@ -115,15 +110,11 @@ public void accept0(OdpsASTVisitor visitor) { } public static class TableCount extends OdpsStatisticClause { - @Override public void accept0(OdpsASTVisitor visitor) { - if (visitor.visit(this)) { - - } + visitor.visit(this); visitor.endVisit(this); } - - } -} \ No newline at end of file + } +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsUDTFSQLSelectItem.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsUDTFSQLSelectItem.java index 5077844ab7..f7086fbb78 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsUDTFSQLSelectItem.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsUDTFSQLSelectItem.java @@ -33,11 +33,11 @@ public void setAlias(String alias) { protected void accept0(SQLASTVisitor visitor) { if (visitor instanceof OdpsASTVisitor) { accept0((OdpsASTVisitor) visitor); - } else{ + } else { super.accept0(visitor); } } - + public void accept0(OdpsASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, this.expr); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsUndoTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsUndoTableStatement.java index 814efcade8..77ede0fe97 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsUndoTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsUndoTableStatement.java @@ -28,7 +28,6 @@ public class OdpsUndoTableStatement extends OdpsStatementImpl implements SQLAlterStatement { - private SQLExprTableSource table; private List partitions = new ArrayList<>(); private SQLExpr to; @@ -37,7 +36,6 @@ public OdpsUndoTableStatement() { super.dbType = DbType.odps; } - @Override protected void accept0(OdpsASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsUnloadStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsUnloadStatement.java index 16a20dd296..d61d6b47c4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsUnloadStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsUnloadStatement.java @@ -30,16 +30,15 @@ import java.util.List; public class OdpsUnloadStatement extends SQLStatementImpl { - protected final List serdeProperties = new ArrayList(); - protected final List properties = new ArrayList(); + protected final List properties = new ArrayList(); private final List partitions = new ArrayList(); protected SQLExpr location; protected SQLExternalRecordFormat rowFormat; protected SQLExpr storedAs; private SQLTableSource from; - public OdpsUnloadStatement(){ + public OdpsUnloadStatement() { super(DbType.odps); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsCreateTableParser.java index 133e7a2f1d..8de0d99662 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsCreateTableParser.java @@ -29,18 +29,17 @@ import com.alibaba.druid.util.FnvHash; public class OdpsCreateTableParser extends SQLCreateTableParser { - - public OdpsCreateTableParser(String sql){ + public OdpsCreateTableParser(String sql) { super(new OdpsExprParser(sql)); } - public OdpsCreateTableParser(SQLExprParser exprParser){ + public OdpsCreateTableParser(SQLExprParser exprParser) { super(exprParser); } public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { OdpsCreateTableStatement stmt = new OdpsCreateTableStatement(); - + if (acceptCreate) { accept(Token.CREATE); } @@ -49,7 +48,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { lexer.nextToken(); stmt.setExternal(true); } - + accept(Token.TABLE); if (lexer.token() == Token.IF || lexer.identifierEquals("IF")) { @@ -71,7 +70,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { return stmt; } - for (;;) { + for (; ; ) { if (lexer.identifierEquals(FnvHash.Constants.TBLPROPERTIES)) { parseTblProperties(stmt); @@ -125,12 +124,12 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { // skip } else { accept(Token.LPAREN); - + if (lexer.isKeepComments() && lexer.hasComment()) { stmt.addBodyBeforeComment(lexer.readAndResetComments()); } - - for (;;) { + + for (; ; ) { SQLColumnDefinition column; switch (lexer.token()) { case IDENTIFIER: @@ -212,16 +211,16 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { } stmt.getTableElementList().add(column); - + if (lexer.isKeepComments() && lexer.hasComment()) { column.addAfterComment(lexer.readAndResetComments()); } - + if (!(lexer.token() == (Token.COMMA))) { break; } else { lexer.nextToken(); - + if (lexer.isKeepComments() && lexer.hasComment()) { column.addAfterComment(lexer.readAndResetComments()); } @@ -230,8 +229,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { accept(Token.RPAREN); } - - for (;;) { + for (; ; ) { if (lexer.token() == Token.COMMENT) { lexer.nextToken(); stmt.setComment(this.exprParser.primary()); @@ -464,7 +462,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { break; } - + return stmt; } @@ -472,7 +470,7 @@ private void parseTblProperties(OdpsCreateTableStatement stmt) { acceptIdentifier("TBLPROPERTIES"); accept(Token.LPAREN); - for (;;) { + for (; ; ) { String name = lexer.stringVal(); lexer.nextToken(); accept(Token.EQ); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsExprParser.java index f5ab428655..2d4edce266 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsExprParser.java @@ -16,7 +16,9 @@ package com.alibaba.druid.sql.dialect.odps.parser; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.SQLDataType; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.expr.*; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLExternalRecordFormat; @@ -24,27 +26,30 @@ import com.alibaba.druid.sql.dialect.odps.ast.OdpsNewExpr; import com.alibaba.druid.sql.dialect.odps.ast.OdpsTransformExpr; import com.alibaba.druid.sql.dialect.odps.ast.OdpsUDTFSQLSelectItem; -import com.alibaba.druid.sql.parser.*; +import com.alibaba.druid.sql.parser.Lexer; +import com.alibaba.druid.sql.parser.SQLExprParser; +import com.alibaba.druid.sql.parser.SQLParserFeature; +import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.util.FnvHash; import java.util.Arrays; import java.util.List; public class OdpsExprParser extends SQLExprParser { - public final static String[] AGGREGATE_FUNCTIONS; + public static final String[] AGGREGATE_FUNCTIONS; - public final static long[] AGGREGATE_FUNCTIONS_CODES; + public static final long[] AGGREGATE_FUNCTIONS_CODES; static { String[] strings = { - "AVG", // - "COUNT", // + "AVG", + "COUNT", "LAG", "LEAD", - "MAX", // - "MIN", // - "STDDEV", // - "SUM", // + "MAX", + "MIN", + "STDDEV", + "SUM", "ROW_NUMBER", "WM_CONCAT", "STRAGG", @@ -60,44 +65,44 @@ public class OdpsExprParser extends SQLExprParser { } } - public OdpsExprParser(Lexer lexer){ + public OdpsExprParser(Lexer lexer) { super(lexer, DbType.odps); this.aggregateFunctions = AGGREGATE_FUNCTIONS; this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; } - public OdpsExprParser(String sql, SQLParserFeature... features){ + public OdpsExprParser(String sql, SQLParserFeature... features) { this(new OdpsLexer(sql, features)); this.lexer.nextToken(); } - - public OdpsExprParser(String sql, boolean skipComments, boolean keepComments){ + + public OdpsExprParser(String sql, boolean skipComments, boolean keepComments) { this(new OdpsLexer(sql, skipComments, keepComments)); this.lexer.nextToken(); } - + protected SQLExpr parseAliasExpr(String alias) { String chars = alias.substring(1, alias.length() - 1); return new SQLCharExpr(chars); } - - final static long GSONBUILDER = FnvHash.fnv1a_64_lower("GSONBUILDER"); - + + static final long GSONBUILDER = FnvHash.fnv1a_64_lower("GSONBUILDER"); + @Override public SQLSelectItem parseSelectItem() { SQLExpr expr; if (lexer.token() == Token.IDENTIFIER) { String stringVal = lexer.stringVal(); - long hash_lower = lexer.hash_lower(); + long hash_lower = lexer.hashLCase(); lexer.nextTokenComma(); if (FnvHash.Constants.DATETIME == hash_lower && lexer.stringVal().charAt(0) != '`' && (lexer.token() == Token.LITERAL_CHARS - || lexer.token() == Token.LITERAL_ALIAS) - ) { + || lexer.token() == Token.LITERAL_ALIAS) + ) { String literal = lexer.stringVal(); lexer.nextToken(); @@ -145,7 +150,7 @@ public SQLSelectItem parseSelectItem() { selectItem.setExpr(expr); - for (;;) { + for (; ; ) { alias = lexer.stringVal(); lexer.nextToken(); @@ -178,7 +183,7 @@ public SQLSelectItem parseSelectItem() { } public SQLExpr primaryRest(SQLExpr expr) { - if(lexer.token() == Token.COLON) { + if (lexer.token() == Token.COLON) { lexer.nextToken(); if (lexer.token() == Token.LITERAL_INT && expr instanceof SQLPropertyExpr) { SQLPropertyExpr propertyExpr = (SQLPropertyExpr) expr; @@ -306,7 +311,7 @@ public SQLExpr primaryRest(SQLExpr expr) { if (lexer.token() == Token.LT) { lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.token() == Token.GT) { break; } @@ -334,7 +339,7 @@ public SQLExpr primaryRest(SQLExpr expr) { if (lexer.token() == Token.LBRACE) { lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.token() == Token.RPAREN) { break; } @@ -367,7 +372,7 @@ public SQLExpr primaryRest(SQLExpr expr) { String strName = ident.getName() + ' ' + name.toString(); if (lexer.token() == Token.LT) { lexer.nextToken(); - for (int i = 0; lexer.token() != Token.GT;i++) { + for (int i = 0; lexer.token() != Token.GT; i++) { if (i != 0) { strName += ", "; } @@ -386,7 +391,6 @@ public SQLExpr primaryRest(SQLExpr expr) { return super.primaryRest(expr); } - public SQLExpr relationalRest(SQLExpr expr) { if (lexer.identifierEquals("REGEXP")) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsLexer.java index b51eafa5ac..ea984f999d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsLexer.java @@ -25,14 +25,13 @@ import static com.alibaba.druid.sql.parser.LayoutCharacters.EOI; public class OdpsLexer extends Lexer { - - public final static Keywords DEFAULT_ODPS_KEYWORDS; + public static final Keywords DEFAULT_ODPS_KEYWORDS; static { Map map = new HashMap(); map.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords()); - + map.put("SHOW", Token.SHOW); map.put("PARTITION", Token.PARTITION); map.put("PARTITIONED", Token.PARTITIONED); @@ -51,7 +50,7 @@ public class OdpsLexer extends Lexer { DEFAULT_ODPS_KEYWORDS = new Keywords(map); } - public OdpsLexer(String input, SQLParserFeature... features){ + public OdpsLexer(String input, SQLParserFeature... features) { super(input); init(); @@ -65,8 +64,8 @@ public OdpsLexer(String input, SQLParserFeature... features){ config(feature, true); } } - - public OdpsLexer(String input, boolean skipComment, boolean keepComments){ + + public OdpsLexer(String input, boolean skipComment, boolean keepComments) { super(input, skipComment); init(); @@ -77,7 +76,7 @@ public OdpsLexer(String input, boolean skipComment, boolean keepComments){ super.keywords = DEFAULT_ODPS_KEYWORDS; } - public OdpsLexer(String input, CommentHandler commentHandler){ + public OdpsLexer(String input, CommentHandler commentHandler) { super(input, commentHandler); init(); @@ -85,7 +84,7 @@ public OdpsLexer(String input, CommentHandler commentHandler){ dbType = DbType.odps; super.keywords = DEFAULT_ODPS_KEYWORDS; } - + private void init() { if (ch == '】' || ch == ' ' || ch == '，' || ch == '：' || ch == '、' || ch == '\u200C' || ch == '；') { ch = charAt(++pos); @@ -95,28 +94,27 @@ private void init() { pos += 2; ch = charAt(pos); - while(isWhitespace(ch)) { + while (isWhitespace(ch)) { ch = charAt(++pos); } } } - + public void scanComment() { - scanHiveComment(); + scanHiveComment(); } public void scanIdentifier() { - hash_lower = 0; + hashLCase = 0; hash = 0; final char first = ch; - - if (first == '`') { + if (first == '`') { mark = pos; bufPos = 1; char ch; - for (;;) { + for (; ; ) { ch = charAt(++pos); if (ch == '`') { @@ -139,7 +137,7 @@ public void scanIdentifier() { stringVal = subString(mark, bufPos); token = Token.IDENTIFIER; - + return; } @@ -154,7 +152,7 @@ public void scanIdentifier() { mark = pos; bufPos = 1; char ch; - for (;;) { + for (; ; ) { ch = charAt(++pos); if (ch != 'ó' @@ -190,10 +188,10 @@ public void scanIdentifier() { } this.ch = charAt(pos); - + if (ch == '@') { // for user identifier bufPos++; - for (;;) { + for (; ; ) { ch = charAt(++pos); if (ch != '-' && ch != '.' && !isIdentifierChar(ch)) { @@ -242,7 +240,7 @@ public void scanVariable() { int p2 = text.indexOf("#end code", pos + 1); if (p1 == -1) { p1 = p2; - } else if (p1 > p2 && p2 != -1){ + } else if (p1 > p2 && p2 != -1) { p1 = p2; } @@ -255,7 +253,7 @@ public void scanVariable() { return; } } - + super.scanVariable(); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java index 6e792eaecc..78e5923797 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java @@ -15,21 +15,22 @@ */ package com.alibaba.druid.sql.dialect.odps.parser; -import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.SQLLimit; +import com.alibaba.druid.sql.ast.SQLObject; +import com.alibaba.druid.sql.ast.SQLSetQuantifier; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.expr.SQLListExpr; import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.odps.ast.OdpsSelectQueryBlock; import com.alibaba.druid.sql.parser.*; import com.alibaba.druid.util.FnvHash; public class OdpsSelectParser extends SQLSelectParser { - public OdpsSelectParser(SQLExprParser exprParser){ + public OdpsSelectParser(SQLExprParser exprParser) { super(exprParser.getLexer()); this.exprParser = exprParser; } - public OdpsSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache){ + public OdpsSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache) { super(exprParser.getLexer()); this.exprParser = exprParser; this.selectListCache = selectListCache; @@ -47,7 +48,7 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { } OdpsSelectQueryBlock queryBlock = new OdpsSelectQueryBlock(); - + if (lexer.hasComment() && lexer.isKeepComments()) { queryBlock.addBeforeComment(lexer.readAndResetComments()); } @@ -82,9 +83,6 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { } else if (lexer.token() == Token.ALL) { String str = lexer.stringVal(); lexer.nextToken(); - if (lexer.token() == Token.DOT) { - - } queryBlock.setDistionOption(SQLSetQuantifier.ALL); } @@ -176,7 +174,7 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { lexer.nextToken(); accept(Token.BY); - for (;;) { + for (; ; ) { SQLSelectOrderByItem distributeByItem = this.exprParser.parseSelectOrderByItem(); queryBlock.addDistributeBy(distributeByItem); @@ -196,7 +194,7 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { lexer.nextToken(); accept(Token.BY); - for (;;) { + for (; ; ) { SQLSelectOrderByItem sortByItem = this.exprParser.parseSelectOrderByItem(); queryBlock.addSortBy(sortByItem); @@ -212,7 +210,7 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { lexer.nextToken(); accept(Token.BY); - for (;;) { + for (; ; ) { SQLSelectOrderByItem clusterByItem = this.exprParser.parseSelectOrderByItem(); queryBlock.addClusterBy(clusterByItem); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsStatementParser.java index 6f742eda11..1d442af589 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsStatementParser.java @@ -18,7 +18,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr; -import com.alibaba.druid.sql.ast.expr.SQLAnyExpr; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLQueryExpr; import com.alibaba.druid.sql.ast.statement.*; @@ -37,21 +36,20 @@ import static com.alibaba.druid.sql.parser.Token.OVERWRITE; public class OdpsStatementParser extends SQLStatementParser { - - public OdpsStatementParser(String sql){ + public OdpsStatementParser(String sql) { super(new OdpsExprParser(sql)); } - public OdpsStatementParser(String sql, SQLParserFeature ... features){ + public OdpsStatementParser(String sql, SQLParserFeature... features) { super(new OdpsExprParser(sql, features)); } - public OdpsStatementParser(SQLExprParser exprParser){ + public OdpsStatementParser(SQLExprParser exprParser) { super(exprParser); } public SQLSelectStatement parseSelect() { - SQLSelect select = new OdpsSelectParser(this.exprParser) + SQLSelect select = new OdpsSelectParser(this.exprParser) .select(); // if (select.getWithSubQuery() == null && select.getQuery() instanceof SQLSelectQueryBlock) { @@ -164,7 +162,7 @@ public boolean parseStatementListDialect(List statementList) { || lexer.identifierEquals(FnvHash.Constants.ARCHIVE)) { OdpsAddFileStatement stmt = new OdpsAddFileStatement(); - long hash = lexer.hash_lower(); + long hash = lexer.hashLCase(); if (hash == FnvHash.Constants.JAR) { stmt.setType(OdpsAddFileStatement.FileType.JAR); } else if (hash == FnvHash.Constants.PY) { @@ -178,7 +176,6 @@ public boolean parseStatementListDialect(List statementList) { lexer.nextToken(); - stmt.setFile(path); if (lexer.token() == Token.AS) { @@ -219,7 +216,7 @@ public boolean parseStatementListDialect(List statementList) { if (lexer.token() == Token.USER) { lexer.nextToken(); OdpsRemoveUserStatement stmt = new OdpsRemoveUserStatement(); - stmt.setUser((SQLIdentifierExpr)this.exprParser.name()); + stmt.setUser((SQLIdentifierExpr) this.exprParser.name()); statementList.add(stmt); return true; } @@ -421,7 +418,7 @@ public boolean parseStatementListDialect(List statementList) { } accept(Token.TO); stmt.setTo( - this.exprParser.expr() + this.exprParser.expr() ); statementList.add(stmt); return true; @@ -453,7 +450,7 @@ public boolean parseStatementListDialect(List statementList) { if (lexer.token() == Token.LPAREN) { lpMark = lexer.mark(); lexer.nextToken(); - }; + } switch (lexer.token()) { case LITERAL_INT: @@ -469,8 +466,7 @@ public boolean parseStatementListDialect(List statementList) { case NEW: case SUB: case TRUE: - case FALSE: - { + case FALSE: { if (lpMark != null) { lexer.reset(lpMark); } @@ -503,7 +499,7 @@ public boolean parseStatementListDialect(List statementList) { statementList.add(stmt); return true; } - throw error; + throw error; } switch (lexer.token()) { case GT: @@ -512,11 +508,11 @@ public boolean parseStatementListDialect(List statementList) { case LT: case LTEQ: statementList.add( - new SQLExprStatement( - new SQLAssignItem(new SQLIdentifierExpr(variant), - this.exprParser.exprRest(new SQLQueryExpr(select)) - ) - ) + new SQLExprStatement( + new SQLAssignItem(new SQLIdentifierExpr(variant), + this.exprParser.exprRest(new SQLQueryExpr(select)) + ) + ) ); return true; default: @@ -535,7 +531,7 @@ public boolean parseStatementListDialect(List statementList) { if (lexer.token() != Token.EQ && lexer.token() != Token.SEMI && lexer.token() != Token.EOF) { stmt.setDataType( - this.exprParser.parseDataType() + this.exprParser.parseDataType() ); } @@ -575,7 +571,7 @@ public SQLStatement parseIf() { accept(Token.IF); SQLIfStatement ifStmt = new SQLIfStatement(); ifStmt.setCondition( - this.exprParser.expr() + this.exprParser.expr() ); if (lexer.identifierEquals("BEGIN")) { @@ -651,7 +647,7 @@ public SQLStatement parseUnload() { stmt.setRowFormat(format); } - for (;;) { + for (; ; ) { if (lexer.identifierEquals(FnvHash.Constants.STORED)) { lexer.nextToken(); if (lexer.token() == Token.BY) { @@ -871,7 +867,7 @@ public SQLStatement parseInsert() { stmt.setFrom(tableSource); } - if(lexer.token() == Token.SELECT) { + if (lexer.token() == Token.SELECT) { SQLSelectParser selectParser = createSQLSelectParser(); SQLSelect query = selectParser.select(); @@ -881,7 +877,7 @@ public SQLStatement parseInsert() { return stmt; } - for (;;) { + for (; ; ) { HiveInsert insert = parseHiveInsert(); stmt.addItem(insert); @@ -968,7 +964,6 @@ public SQLStatement parseShow() { return stmt; } - if (lexer.identifierEquals(FnvHash.Constants.PACKAGES)) { lexer.nextToken(); @@ -1351,7 +1346,7 @@ public OdpsGrantStmt parseGrant() { } protected void parsePrivileages(List privileges, SQLObject parent) { - for (;;) { + for (; ; ) { String privilege = null; if (lexer.token() == Token.ALL) { lexer.nextToken(); @@ -1462,7 +1457,7 @@ protected HiveLoadDataStatement parseLoad() { if (lexer.token() == OVERWRITE) { stmt.setOverwrite(true); lexer.nextToken(); - } else if (lexer.token() == Token.INTO){ + } else if (lexer.token() == Token.INTO) { lexer.nextToken(); } @@ -1516,7 +1511,7 @@ protected HiveLoadDataStatement parseLoad() { accept(Token.LPAREN); - for (;;) { + for (; ; ) { String name = lexer.stringVal(); lexer.nextToken(); accept(Token.EQ); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsASTVisitor.java index bbefb514d3..8cdbeeaecc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsASTVisitor.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.odps.ast.*; public interface OdpsASTVisitor extends HiveASTVisitor { - default void endVisit(OdpsCreateTableStatement x) { endVisit((SQLCreateTableStatement) x); } @@ -34,7 +33,6 @@ default boolean visit(OdpsCreateTableStatement x) { } default void endVisit(OdpsUDTFSQLSelectItem x) { - } default boolean visit(OdpsUDTFSQLSelectItem x) { @@ -42,7 +40,6 @@ default boolean visit(OdpsUDTFSQLSelectItem x) { } default void endVisit(OdpsSetLabelStatement x) { - } default boolean visit(OdpsSetLabelStatement x) { @@ -58,7 +55,6 @@ default boolean visit(OdpsSelectQueryBlock x) { } default void endVisit(OdpsAddStatisticStatement x) { - } default boolean visit(OdpsAddStatisticStatement x) { @@ -66,7 +62,6 @@ default boolean visit(OdpsAddStatisticStatement x) { } default void endVisit(OdpsRemoveStatisticStatement x) { - } default boolean visit(OdpsRemoveStatisticStatement x) { @@ -74,7 +69,6 @@ default boolean visit(OdpsRemoveStatisticStatement x) { } default void endVisit(OdpsStatisticClause.TableCount x) { - } default boolean visit(OdpsStatisticClause.TableCount x) { @@ -82,7 +76,6 @@ default boolean visit(OdpsStatisticClause.TableCount x) { } default void endVisit(OdpsStatisticClause.ExpressionCondition x) { - } default boolean visit(OdpsStatisticClause.ExpressionCondition x) { @@ -90,7 +83,6 @@ default boolean visit(OdpsStatisticClause.ExpressionCondition x) { } default void endVisit(OdpsStatisticClause.NullValue x) { - } default boolean visit(OdpsStatisticClause.NullValue x) { @@ -98,7 +90,6 @@ default boolean visit(OdpsStatisticClause.NullValue x) { } default void endVisit(OdpsStatisticClause.DistinctValue x) { - } default boolean visit(OdpsStatisticClause.DistinctValue x) { @@ -106,7 +97,6 @@ default boolean visit(OdpsStatisticClause.DistinctValue x) { } default void endVisit(OdpsStatisticClause.ColumnSum x) { - } default boolean visit(OdpsStatisticClause.ColumnSum x) { @@ -114,7 +104,6 @@ default boolean visit(OdpsStatisticClause.ColumnSum x) { } default void endVisit(OdpsStatisticClause.ColumnMax x) { - } default boolean visit(OdpsStatisticClause.ColumnMax x) { @@ -122,7 +111,6 @@ default boolean visit(OdpsStatisticClause.ColumnMax x) { } default void endVisit(OdpsStatisticClause.ColumnMin x) { - } default boolean visit(OdpsStatisticClause.ColumnMin x) { @@ -130,7 +118,6 @@ default boolean visit(OdpsStatisticClause.ColumnMin x) { } default void endVisit(OdpsReadStatement x) { - } default boolean visit(OdpsReadStatement x) { @@ -138,7 +125,6 @@ default boolean visit(OdpsReadStatement x) { } default void endVisit(OdpsShowGrantsStmt x) { - } default boolean visit(OdpsShowGrantsStmt x) { @@ -146,7 +132,6 @@ default boolean visit(OdpsShowGrantsStmt x) { } default void endVisit(OdpsShowChangelogsStatement x) { - } default boolean visit(OdpsShowChangelogsStatement x) { @@ -154,7 +139,6 @@ default boolean visit(OdpsShowChangelogsStatement x) { } default void endVisit(OdpsListStmt x) { - } default boolean visit(OdpsListStmt x) { @@ -181,7 +165,6 @@ default boolean visit(OdpsAddFileStatement x) { } default void endVisit(OdpsAddFileStatement x) { - } default boolean visit(OdpsAddUserStatement x) { @@ -189,7 +172,6 @@ default boolean visit(OdpsAddUserStatement x) { } default void endVisit(OdpsAddUserStatement x) { - } default boolean visit(OdpsRemoveUserStatement x) { @@ -197,7 +179,6 @@ default boolean visit(OdpsRemoveUserStatement x) { } default void endVisit(OdpsRemoveUserStatement x) { - } default boolean visit(OdpsAlterTableSetChangeLogs x) { @@ -205,7 +186,6 @@ default boolean visit(OdpsAlterTableSetChangeLogs x) { } default void endVisit(OdpsAlterTableSetChangeLogs x) { - } default boolean visit(OdpsCountStatement x) { @@ -213,7 +193,6 @@ default boolean visit(OdpsCountStatement x) { } default void endVisit(OdpsCountStatement x) { - } default boolean visit(OdpsQueryAliasStatement x) { @@ -221,7 +200,6 @@ default boolean visit(OdpsQueryAliasStatement x) { } default void endVisit(OdpsQueryAliasStatement x) { - } default boolean visit(OdpsTransformExpr x) { @@ -229,7 +207,6 @@ default boolean visit(OdpsTransformExpr x) { } default void endVisit(OdpsTransformExpr x) { - } default boolean visit(OdpsExstoreStatement x) { @@ -237,7 +214,6 @@ default boolean visit(OdpsExstoreStatement x) { } default void endVisit(OdpsExstoreStatement x) { - } default boolean visit(OdpsNewExpr x) { @@ -245,7 +221,6 @@ default boolean visit(OdpsNewExpr x) { } default void endVisit(OdpsNewExpr x) { - } default boolean visit(OdpsInstallPackageStatement x) { @@ -253,7 +228,6 @@ default boolean visit(OdpsInstallPackageStatement x) { } default void endVisit(OdpsInstallPackageStatement x) { - } default boolean visit(OdpsDeclareVariableStatement x) { @@ -261,7 +235,6 @@ default boolean visit(OdpsDeclareVariableStatement x) { } default void endVisit(OdpsDeclareVariableStatement x) { - } default boolean visit(OdpsAddAccountProviderStatement x) { @@ -269,7 +242,6 @@ default boolean visit(OdpsAddAccountProviderStatement x) { } default void endVisit(OdpsAddAccountProviderStatement x) { - } default boolean visit(OdpsUnloadStatement x) { @@ -277,7 +249,6 @@ default boolean visit(OdpsUnloadStatement x) { } default void endVisit(OdpsUnloadStatement x) { - } default boolean visit(OdpsAlterTableSetFileFormat x) { @@ -285,7 +256,6 @@ default boolean visit(OdpsAlterTableSetFileFormat x) { } default void endVisit(OdpsAlterTableSetFileFormat x) { - } default boolean visit(OdpsRestoreStatement x) { @@ -293,7 +263,6 @@ default boolean visit(OdpsRestoreStatement x) { } default void endVisit(OdpsRestoreStatement x) { - } default boolean visit(OdpsUndoTableStatement x) { @@ -301,7 +270,6 @@ default boolean visit(OdpsUndoTableStatement x) { } default void endVisit(OdpsUndoTableStatement x) { - } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsASTVisitorAdapter.java index ec592f407c..1612772c89 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsASTVisitorAdapter.java @@ -18,6 +18,4 @@ import com.alibaba.druid.sql.dialect.hive.visitor.HiveASTVisitorAdapter; public class OdpsASTVisitorAdapter extends HiveASTVisitorAdapter implements OdpsASTVisitor { - - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java index 4d7ce0e0e4..2d0703e289 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java @@ -47,11 +47,11 @@ public class OdpsOutputVisitor extends HiveOutputVisitor implements OdpsASTVisit builtInFunctions.add("EXPLODE"); builtInFunctions.add("LEAST"); builtInFunctions.add("GREATEST"); - + groupItemSingleLine = true; } - public OdpsOutputVisitor(Appendable appender){ + public OdpsOutputVisitor(Appendable appender) { super(appender, DbType.odps); } @@ -91,12 +91,12 @@ public boolean visit(OdpsCreateTableStatement x) { int size = tableElementList.size(); if (size > 0) { print0(" ("); - + if (this.isPrettyFormat() && x.hasBodyBeforeComment()) { print(' '); printlnComment(x.getBodyBeforeCommentsDirect()); } - + this.indentCount++; println(); for (int i = 0; i < size; ++i) { @@ -669,7 +669,7 @@ protected void printJoinType(JoinType joinType) { } else if (joinType.equals(JoinType.FULL_OUTER_JOIN)) { print0(ucase ? "FULL OUTER JOIN" : "full outer join"); } else { - print0(ucase ? joinType.name : joinType.name_lcase); + print0(ucase ? joinType.name : joinType.nameLCase); } } @@ -763,7 +763,7 @@ public boolean visit(OdpsGrantStmt x) { if (x.isLabel()) { print0(ucase ? "LABEL " : "label "); - x.getLabel().accept(this);; + x.getLabel().accept(this); } else { printAndAccept(x.getPrivileges(), ", "); } @@ -775,7 +775,7 @@ public boolean visit(OdpsGrantStmt x) { print(' '); } x.getResource().accept(this); - + if (x.getColumns().size() > 0) { print('('); printAndAccept(x.getColumns(), ", "); @@ -799,7 +799,7 @@ public boolean visit(OdpsGrantStmt x) { return false; } - + public boolean visit(SQLCharExpr x, boolean parameterized) { String text = x.getText(); if (text == null) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsSchemaStatVisitor.java index a7c5896825..b2a2d7dbc4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsSchemaStatVisitor.java @@ -29,13 +29,12 @@ import java.util.List; public class OdpsSchemaStatVisitor extends HiveSchemaStatVisitor implements OdpsASTVisitor { - public OdpsSchemaStatVisitor() { super(DbType.odps); } public OdpsSchemaStatVisitor(SchemaRepository repository) { - super (repository); + super(repository); } @Override 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 ea4eae8147..325c8c32b0 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 @@ -24,12 +24,11 @@ import java.util.List; public class OracleDataTypeIntervalDay extends SQLDataTypeImpl implements OracleSQLObject { - - private boolean toSecond = false; + private boolean toSecond; protected final List fractionalSeconds = new ArrayList(); - public OracleDataTypeIntervalDay(){ + public OracleDataTypeIntervalDay() { this.setName("INTERVAL DAY"); } 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 b29fce50bb..12284ca890 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 @@ -20,8 +20,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleDataTypeIntervalYear extends SQLDataTypeImpl implements OracleSQLObject { - - public OracleDataTypeIntervalYear(){ + public OracleDataTypeIntervalYear() { this.setName("INTERVAL YEAR"); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObject.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObject.java index bfa5d9c8a3..0cd40d21aa 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObject.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObject.java @@ -19,6 +19,5 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public interface OracleSQLObject extends SQLObject { - void accept0(OracleASTVisitor visitor); } 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 94a035c3fd..e52793413a 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 @@ -23,9 +23,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class OracleSQLObjectImpl extends SQLObjectImpl implements OracleSQLObject { - - public OracleSQLObjectImpl(){ - + public OracleSQLObjectImpl() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSegmentAttributes.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSegmentAttributes.java index 88e0e20dd2..59e4575b04 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSegmentAttributes.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSegmentAttributes.java @@ -22,8 +22,8 @@ * Created by wenshao on 21/05/2017. */ public interface OracleSegmentAttributes extends SQLObject { - SQLName getTablespace(); + void setTablespace(SQLName name); Boolean getCompress(); @@ -35,24 +35,31 @@ public interface OracleSegmentAttributes extends SQLObject { void setCompressLevel(Integer compressLevel); Integer getInitrans(); + void setInitrans(Integer initrans); Integer getMaxtrans(); + void setMaxtrans(Integer maxtrans); Integer getPctincrease(); + void setPctincrease(Integer pctincrease); Integer getPctused(); + void setPctused(Integer pctused); Integer getPctfree(); + void setPctfree(Integer ptcfree); Boolean getLogging(); + void setLogging(Boolean logging); SQLObject getStorage(); + void setStorage(SQLObject storage); boolean isCompressForOltp(); 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 d4fe8d7397..aa23c0719a 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 @@ -23,11 +23,10 @@ import java.util.List; public class CycleClause extends OracleSQLObjectImpl { - private final List aliases = new ArrayList(); - private SQLExpr mark; - private SQLExpr value; - private SQLExpr defaultValue; + private SQLExpr mark; + private SQLExpr value; + private SQLExpr defaultValue; public SQLExpr getMark() { return mark; @@ -95,7 +94,7 @@ public CycleClause clone() { } if (defaultValue != null) { - setDefaultValue(defaultValue.clone()); + setDefaultValue(defaultValue.clone()); } return x; 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 e7d0c1384b..c7f229d073 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,11 +26,10 @@ import java.util.List; public class ModelClause extends OracleSQLObjectImpl { - - private final List cellReferenceOptions = new ArrayList(); - private ReturnRowsClause returnRowsClause; + private final List cellReferenceOptions = new ArrayList(); + private ReturnRowsClause returnRowsClause; private final List referenceModelClauses = new ArrayList(); - private MainModelClause mainModel; + private MainModelClause mainModel; @Override public void accept0(OracleASTVisitor visitor) { @@ -68,17 +67,15 @@ public List getCellReferenceOptions() { public static enum CellReferenceOption { IgnoreNav("IGNORE NAV"), KeepNav("KEEP NAV"), UniqueDimension("UNIQUE DIMENSION"), - UniqueSingleReference("UNIQUE SINGLE REFERENCE") - - ; + UniqueSingleReference("UNIQUE SINGLE REFERENCE"); public final String name; - CellReferenceOption(){ + CellReferenceOption() { this(null); } - CellReferenceOption(String name){ + CellReferenceOption(String name) { this.name = name; } @@ -89,8 +86,7 @@ public String toString() { } public static class ReturnRowsClause extends OracleSQLObjectImpl { - - private boolean all = false; + private boolean all; public boolean isAll() { return all; @@ -108,9 +104,8 @@ public void accept0(OracleASTVisitor visitor) { } public static class ReferenceModelClause extends OracleSQLObjectImpl { - - private SQLExpr name; - private SQLSelect subQuery; + private SQLExpr name; + private SQLSelect subQuery; private final List cellReferenceOptions = new ArrayList(); public List getCellReferenceOptions() { @@ -135,16 +130,14 @@ public void setSubQuery(SQLSelect subQuery) { @Override public void accept0(OracleASTVisitor visitor) { - } } public static class ModelColumnClause extends OracleSQLObjectImpl { - - private QueryPartitionClause queryPartitionClause; - private String alias; + private QueryPartitionClause queryPartitionClause; + private String alias; private final List dimensionByColumns = new ArrayList(); - private final List measuresColumns = new ArrayList(); + private final List measuresColumns = new ArrayList(); public List getDimensionByColumns() { return dimensionByColumns; @@ -183,9 +176,8 @@ public void accept0(OracleASTVisitor visitor) { } public static class ModelColumn extends OracleSQLObjectImpl { - private SQLExpr expr; - private String alias; + private String alias; public SQLExpr getExpr() { return expr; @@ -214,7 +206,6 @@ public void accept0(OracleASTVisitor visitor) { } public static class QueryPartitionClause extends OracleSQLObjectImpl { - private List exprList = new ArrayList(); public List getExprList() { @@ -235,12 +226,11 @@ public void accept0(OracleASTVisitor visitor) { } public static class MainModelClause extends OracleSQLObjectImpl { - - private SQLExpr mainModelName; - private ModelColumnClause modelColumnClause; + private SQLExpr mainModelName; + private ModelColumnClause modelColumnClause; private final List cellReferenceOptions = new ArrayList(); - private ModelRulesClause modelRulesClause; + private ModelRulesClause modelRulesClause; public ModelRulesClause getModelRulesClause() { return modelRulesClause; @@ -283,10 +273,9 @@ public void accept0(OracleASTVisitor visitor) { } public static class ModelRulesClause extends OracleSQLObjectImpl { - - private final List options = new ArrayList(); - private SQLExpr iterate; - private SQLExpr until; + private final List options = new ArrayList(); + private SQLExpr iterate; + private SQLExpr until; private final List cellAssignmentItems = new ArrayList(); public SQLExpr getUntil() { @@ -326,13 +315,11 @@ public void accept0(OracleASTVisitor visitor) { } public static enum ModelRuleOption { - UPSERT("UPSERT"), UPDATE("UPDATE"), AUTOMATIC_ORDER("AUTOMATIC ORDER"), SEQUENTIAL_ORDER("SEQUENTIAL ORDER"), - - ; + UPSERT("UPSERT"), UPDATE("UPDATE"), AUTOMATIC_ORDER("AUTOMATIC ORDER"), SEQUENTIAL_ORDER("SEQUENTIAL ORDER"); public final String name; - ModelRuleOption(String name){ + ModelRuleOption(String name) { this.name = name; } @@ -342,11 +329,10 @@ public String toString() { } public static class CellAssignmentItem extends OracleSQLObjectImpl { - private ModelRuleOption option; - private CellAssignment cellAssignment; - private SQLOrderBy orderBy; - private SQLExpr expr; + private CellAssignment cellAssignment; + private SQLOrderBy orderBy; + private SQLExpr expr; public ModelRuleOption getOption() { return option; @@ -393,8 +379,7 @@ public void accept0(OracleASTVisitor visitor) { } public static class CellAssignment extends SQLExprImpl implements OracleExpr, SQLReplaceable { - - private SQLExpr measureColumn; + private SQLExpr measureColumn; private final List conditions = new ArrayList(); public List getConditions() { @@ -441,13 +426,18 @@ public void accept0(OracleASTVisitor visitor) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } CellAssignment that = (CellAssignment) o; - if (measureColumn != null ? !measureColumn.equals(that.measureColumn) : that.measureColumn != null) + if (measureColumn != null ? !measureColumn.equals(that.measureColumn) : that.measureColumn != null) { return false; + } return conditions.equals(that.conditions); } 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 index 4efbfccfd1..c5c4ebd1ff 100644 --- 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 @@ -26,29 +26,27 @@ import java.util.List; public class OracleLobStorageClause extends OracleSegmentAttributesImpl implements OracleSQLObject { + private SQLName segementName; - private SQLName segementName; + private final List items = new ArrayList(); - private final List items = new ArrayList(); + private boolean secureFile; + private boolean basicFile; - private boolean secureFile = false; - private boolean basicFile = false; + private Boolean enable; + private SQLExpr chunk; - private Boolean enable; + private Boolean cache; + private Boolean logging; - private SQLExpr chunk; - - private Boolean cache; - private Boolean logging; - - private Boolean compress; - private Boolean keepDuplicate; - private boolean retention; + private Boolean compress; + private Boolean keepDuplicate; + private boolean retention; private OracleStorageClause storageClause; - private SQLExpr pctversion; + private SQLExpr pctversion; protected void accept0(SQLASTVisitor visitor) { this.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 500fe10b17..b964a5c79b 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,8 +24,7 @@ import java.util.List; public class OracleReturningClause extends OracleSQLObjectImpl implements SQLReplaceable { - - private List items = new ArrayList(); + private List items = new ArrayList(); private List values = new ArrayList(); public List getItems() { 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 f437f51f27..7ff8bfb19a 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 @@ -20,17 +20,16 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleStorageClause extends OracleSQLObjectImpl { - - private SQLExpr initial; - private SQLExpr next; - private SQLExpr minExtents; - private SQLExpr maxExtents; - private SQLExpr maxSize; - private SQLExpr pctIncrease; - 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 maxSize; + private SQLExpr pctIncrease; + private SQLExpr freeLists; + private SQLExpr freeListGroups; + private SQLExpr bufferPool; + private SQLExpr objno; private FlashCacheType flashCache; private FlashCacheType cellFlashCache; @@ -188,5 +187,4 @@ 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 dc9fba713c..ab47cf28c4 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 @@ -21,9 +21,8 @@ * limitations under the License. */ public class OracleWithSubqueryEntry extends Entry implements OracleSQLObject { - private SearchClause searchClause; - private CycleClause cycleClause; + private CycleClause cycleClause; public CycleClause getCycleClause() { return cycleClause; 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 4fda6b0ff3..c8650a7b43 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 @@ -23,9 +23,8 @@ import java.util.List; public class PartitionExtensionClause extends OracleSQLObjectImpl { - - private boolean subPartition; - private SQLName partition; + private boolean subPartition; + private SQLName partition; private final List target = new ArrayList(); public boolean isSubPartition() { 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 04fc9b7d73..e84d40c266 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,12 +24,11 @@ import java.util.List; public class SampleClause extends OracleSQLObjectImpl implements SQLReplaceable { - - private boolean block = false; + private boolean block; private final List percent = new ArrayList(); - private SQLExpr seedValue; + private SQLExpr seedValue; public boolean isBlock() { return block; @@ -92,7 +91,6 @@ public SampleClause clone() { @Override public boolean replace(SQLExpr expr, SQLExpr target) { - for (int i = percent.size() - 1; i >= 0; i--) { if (percent.get(i) == expr) { percent.set(i, target); 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 92f314d333..6b0375c2aa 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 @@ -24,16 +24,15 @@ import java.util.List; public class SearchClause extends OracleSQLObjectImpl { - public static enum Type { DEPTH, BREADTH } - private Type type; + private Type type; private final List items = new ArrayList(); - private SQLIdentifierExpr orderingColumn; + private SQLIdentifierExpr orderingColumn; public Type getType() { return type; @@ -46,7 +45,7 @@ public void setType(Type type) { public List getItems() { return items; } - + public void addItem(SQLSelectOrderByItem item) { if (item != null) { item.setParent(this); 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 32b9d2623d..b4f9ab4e29 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 @@ -15,11 +15,7 @@ */ package com.alibaba.druid.sql.dialect.oracle.ast.expr; -import com.alibaba.druid.sql.ast.SQLDataType; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.SQLOver; -import com.alibaba.druid.sql.ast.SQLReplaceable; +import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -27,11 +23,9 @@ import java.util.List; public class OracleAnalytic extends SQLOver implements SQLReplaceable, OracleExpr { - private OracleAnalyticWindowing windowing; public OracleAnalytic() { - } @Override @@ -90,7 +84,6 @@ public SQLDataType computeDataType() { @Override public boolean replace(SQLExpr expr, SQLExpr target) { - for (int i = 0; i < partitionBy.size(); i++) { if (partitionBy.get(i) == expr) { partitionBy.set(i, target); 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 33644b4df7..0d3139a09b 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 @@ -25,12 +25,10 @@ import java.util.List; public class OracleAnalyticWindowing extends SQLObjectImpl implements OracleExpr { - - private Type type; + private Type type; private SQLExpr expr; - public OracleAnalyticWindowing(){ - + public OracleAnalyticWindowing() { } @Override 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 2a894fab11..57a22d8b79 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 @@ -15,7 +15,6 @@ */ package com.alibaba.druid.sql.dialect.oracle.ast.expr; -import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLReplaceable; @@ -26,15 +25,13 @@ import java.util.List; public class OracleArgumentExpr extends OracleSQLObjectImpl implements SQLExpr, SQLReplaceable { - - private String argumentName; + private String argumentName; private SQLExpr value; - public OracleArgumentExpr(){ - + public OracleArgumentExpr() { } - public OracleArgumentExpr(String argumentName, SQLExpr value){ + public OracleArgumentExpr(String argumentName, SQLExpr value) { this.argumentName = argumentName; setValue(value); } 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 7b39a7e2cf..d032301b59 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 @@ -20,14 +20,12 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleBinaryDoubleExpr extends SQLNumericLiteralExpr implements OracleExpr { - private Double value; - public OracleBinaryDoubleExpr(){ - + public OracleBinaryDoubleExpr() { } - public OracleBinaryDoubleExpr(Double value){ + public OracleBinaryDoubleExpr(Double value) { super(); this.value = value; } 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 40a1fde7c5..93b04e3dd2 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 @@ -24,14 +24,12 @@ import java.util.List; public class OracleBinaryFloatExpr extends SQLNumericLiteralExpr implements OracleExpr { - private Float value; - public OracleBinaryFloatExpr(){ - + public OracleBinaryFloatExpr() { } - public OracleBinaryFloatExpr(Float value){ + public OracleBinaryFloatExpr(Float value) { super(); this.value = value; } 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 4aeb8b37e7..da8fc6e3f0 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 @@ -25,11 +25,9 @@ import java.util.List; public class OracleCursorExpr extends SQLExprImpl implements OracleExpr { - private SQLSelect query; - public OracleCursorExpr(){ - + public OracleCursorExpr() { } public OracleCursorExpr clone() { @@ -40,7 +38,7 @@ public OracleCursorExpr clone() { return x; } - public OracleCursorExpr(SQLSelect query){ + public OracleCursorExpr(SQLSelect query) { setQuery(query); } 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 f551d1e0b2..d26e9c3068 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 @@ -24,15 +24,13 @@ import java.util.List; public class OracleDatetimeExpr extends OracleSQLObjectImpl implements SQLExpr { - private SQLExpr expr; private SQLExpr timeZone; - public OracleDatetimeExpr(){ - + public OracleDatetimeExpr() { } - public OracleDatetimeExpr(SQLExpr expr, SQLExpr timeZone){ + public OracleDatetimeExpr(SQLExpr expr, SQLExpr timeZone) { this.expr = expr; this.timeZone = timeZone; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExpr.java index b44445d1c5..ac69daa7da 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExpr.java @@ -19,5 +19,4 @@ import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; public interface OracleExpr extends SQLExpr, OracleSQLObject { - } 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 1d02d6258c..c552873df4 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 @@ -28,16 +28,14 @@ import java.util.List; public class OracleIntervalExpr extends SQLExprImpl implements SQLLiteralExpr, OracleExpr, SQLReplaceable { - - private SQLExpr value; + private SQLExpr value; private OracleIntervalType type; - private SQLExpr precision; - private Integer factionalSecondsPrecision; + private SQLExpr precision; + private Integer factionalSecondsPrecision; private OracleIntervalType toType; - private SQLExpr toFactionalSecondsPrecision; - - public OracleIntervalExpr(){ + private SQLExpr toFactionalSecondsPrecision; + public OracleIntervalExpr() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIsOfTypeExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIsOfTypeExpr.java index 015270b05d..06eda576f3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIsOfTypeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIsOfTypeExpr.java @@ -31,12 +31,18 @@ public class OracleIsOfTypeExpr extends SQLExprImpl implements OracleExpr, SQLRe @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } OracleIsOfTypeExpr that = (OracleIsOfTypeExpr) o; - if (expr != null ? !expr.equals(that.expr) : that.expr != null) return false; + if (expr != null ? !expr.equals(that.expr) : that.expr != null) { + return false; + } return types != null ? types.equals(that.types) : that.types == null; } 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 997e607e49..7cbecadafa 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 @@ -26,13 +26,12 @@ import java.util.List; public class OracleIsSetExpr extends SQLExprImpl implements OracleExpr, SQLReplaceable { - private SQLExpr nestedTable; - public OracleIsSetExpr(){ + public OracleIsSetExpr() { } - public OracleIsSetExpr(SQLExpr nestedTable){ + public OracleIsSetExpr(SQLExpr nestedTable) { this.nestedTable = nestedTable; } 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 7bbc659120..7f07839cc9 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 @@ -20,22 +20,18 @@ import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.Collections; import java.util.List; public class OracleOuterExpr extends SQLExprImpl implements OracleExpr, SQLReplaceable { - private SQLExpr expr; - public OracleOuterExpr(){ - + public OracleOuterExpr() { } - public OracleOuterExpr(SQLExpr expr){ - + public OracleOuterExpr(SQLExpr expr) { this.expr = expr; } 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 80def6b8a1..fbafaa1f6b 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 @@ -24,15 +24,13 @@ import java.util.List; public class OracleRangeExpr extends OracleSQLObjectImpl implements SQLExpr { - private SQLExpr lowBound; private SQLExpr upBound; - public OracleRangeExpr(){ - + public OracleRangeExpr() { } - public OracleRangeExpr(SQLExpr lowBound, SQLExpr upBound){ + public OracleRangeExpr(SQLExpr lowBound, SQLExpr upBound) { setLowBound(lowBound); setUpBound(upBound); } @@ -72,7 +70,6 @@ public void setUpBound(SQLExpr upBound) { this.upBound = upBound; } - public OracleRangeExpr clone() { OracleRangeExpr x = new OracleRangeExpr(); 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 af7ae4bec8..2ced4ac272 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 @@ -25,7 +25,6 @@ import java.util.List; public class OracleSysdateExpr extends OracleSQLObjectImpl implements SQLExpr { - private String option; public String getOption() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTreatExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTreatExpr.java index 23fc263de1..e3a5dc7aa3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTreatExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTreatExpr.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleTreatExpr extends OracleSQLObjectImpl implements SQLExpr { - private SQLExpr expr; private SQLExpr type; private boolean ref; 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 705893851f..06953f2e77 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 @@ -22,7 +22,6 @@ import java.util.List; public class OracleAlterSessionStatement extends OracleStatementImpl implements OracleAlterStatement { - private List items = new ArrayList(); @Override 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 210f52ff09..71c9c58fe6 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterSynonymStatement extends OracleStatementImpl implements OracleAlterStatement { - private SQLName name; private Boolean enable; 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 a18810d12d..73fd482f51 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTableDropPartition extends OracleAlterTableItem { - private SQLName name; @Override 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 a45d096539..dffa46df5b 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 @@ -19,5 +19,4 @@ import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl; public abstract class OracleAlterTableItem extends OracleSQLObjectImpl implements SQLAlterTableItem { - } 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 7292d618b3..b8e088c281 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 @@ -22,7 +22,6 @@ import java.util.List; public class OracleAlterTableModify extends OracleAlterTableItem { - private List columns = new ArrayList(); @Override 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 81cb92daf5..b15360931d 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTableMoveTablespace extends OracleAlterTableItem { - private SQLName name; @Override 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 8096170658..50bd4d134e 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 @@ -25,13 +25,12 @@ import java.util.List; public class OracleAlterTableSplitPartition extends OracleAlterTableItem { + private SQLName name; + private List at = new ArrayList(); + private List values = new ArrayList(); + private List into = new ArrayList(); - private SQLName name; - private List at = new ArrayList(); - private List values = new ArrayList(); - private List into = new ArrayList(); - - private UpdateIndexesClause updateIndexes = null; + private UpdateIndexesClause updateIndexes; @Override public void accept0(OracleASTVisitor visitor) { @@ -85,8 +84,7 @@ public void setValues(List values) { } public static class NestedTablePartitionSpec extends OracleSQLObjectImpl { - - private SQLName partition; + private SQLName partition; private List segmentAttributeItems = new ArrayList(); @@ -118,14 +116,12 @@ public void setSegmentAttributeItems(List segmentAttributeItems) { } public static class TableSpaceItem extends OracleSQLObjectImpl { - private SQLName tablespace; - public TableSpaceItem(){ - + public TableSpaceItem() { } - public TableSpaceItem(SQLName tablespace){ + public TableSpaceItem(SQLName tablespace) { this.tablespace = tablespace; } @@ -147,7 +143,6 @@ public void setTablespace(SQLName tablespace) { } public static class UpdateIndexesClause extends OracleSQLObjectImpl { - private List items = new ArrayList(); @Override 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 7cf72b2262..0bdc6bfef8 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTableTruncatePartition extends OracleAlterTableItem { - private SQLName name; @Override 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 b9c6b244b9..9a00e26ffa 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 @@ -22,7 +22,6 @@ import java.util.List; public class OracleAlterTablespaceAddDataFile extends OracleSQLObjectImpl implements OracleAlterTablespaceItem { - private List files = new ArrayList(); @Override 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 517048200f..a8403c1348 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 @@ -18,5 +18,4 @@ 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 577f5d8bf8..5c652cb18f 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 @@ -19,8 +19,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTablespaceStatement extends OracleStatementImpl implements OracleAlterStatement { - - private SQLName name; + private SQLName name; private OracleAlterTablespaceItem item; @Override 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 2545cbf642..0ebdc70ab3 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTriggerStatement extends OracleStatementImpl implements OracleAlterStatement { - private SQLName name; private Boolean enable; 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 65f718bd84..18087ea15f 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterViewStatement extends OracleStatementImpl implements OracleAlterStatement { - private SQLName name; private Boolean enable; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCheck.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCheck.java index a8ff9288a8..071423dcf6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCheck.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCheck.java @@ -22,11 +22,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleCheck extends SQLCheck implements OracleConstraint, OracleSQLObject { - private OracleUsingIndexClause using; - private SQLName exceptionsInto; - private Initially initially; - private Boolean deferrable; + private SQLName exceptionsInto; + private Initially initially; + private Boolean deferrable; @Override protected void accept0(SQLASTVisitor 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 7daa3b2b31..dfb56c72b4 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,7 +21,6 @@ import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; public interface OracleConstraint extends OracleSQLObject, SQLConstraint, SQLTableElement { - SQLName getExceptionsInto(); void setExceptionsInto(SQLName exceptionsInto); @@ -35,6 +34,7 @@ public interface OracleConstraint extends OracleSQLObject, SQLConstraint, SQLTab void setEnable(Boolean enable); Boolean getValidate(); + void setValidate(Boolean validate); Initially getInitially(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleContinueStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleContinueStatement.java index 68cbffb80d..35361caa29 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleContinueStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleContinueStatement.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleContinueStatement extends OracleStatementImpl { - private SQLExpr when; private String label; 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 5a3f7ac109..610ac4e273 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,20 +21,19 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleCreateDatabaseDbLinkStatement extends OracleStatementImpl implements SQLCreateStatement { - private boolean shared; - private boolean _public; + private boolean isPublic; private SQLName name; private SQLName user; - private String password; + private String password; private SQLExpr using; private SQLExpr authenticatedUser; - private String authenticatedPassword; + private String authenticatedPassword; public boolean isShared() { return shared; @@ -45,11 +44,11 @@ public void setShared(boolean shared) { } public boolean isPublic() { - return _public; + return isPublic; } public void setPublic(boolean value) { - this._public = value; + this.isPublic = value; } public SQLName getName() { 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 7b5202161f..b481fa3c69 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 @@ -27,11 +27,10 @@ import java.util.List; public class OracleCreateIndexStatement extends SQLCreateIndexStatement implements OracleDDLStatement, OracleSegmentAttributes, SQLCreateStatement { + private boolean online; - private boolean online = false; - - private boolean indexOnlyTopLevel = false; - private boolean cluster = false; + private boolean indexOnlyTopLevel; + private boolean cluster; private boolean noParallel; @@ -56,12 +55,12 @@ public class OracleCreateIndexStatement extends SQLCreateIndexStatement implemen protected SQLName tablespace; protected SQLObject storage; - private Boolean enable = null; + private Boolean enable; + + private boolean computeStatistics; - private boolean computeStatistics = false; - public OracleCreateIndexStatement() { - super (DbType.oracle); + super(DbType.oracle); } public SQLExpr getParallel() { @@ -127,7 +126,6 @@ public void accept0(OracleASTVisitor visitor) { visitor.endVisit(this); } - public Boolean getEnable() { return enable; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreatePackageStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreatePackageStatement.java index 7a92dc7ae9..34b72210ce 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreatePackageStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreatePackageStatement.java @@ -28,7 +28,7 @@ * Created by wenshao on 23/05/2017. */ public class OracleCreatePackageStatement extends OracleStatementImpl implements SQLCreateStatement { - private boolean orReplace; + private boolean orReplace; private SQLName name; private boolean body; 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 7a176e590d..cb74023fa2 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 @@ -19,8 +19,8 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.statement.SQLExternalRecordFormat; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; +import com.alibaba.druid.sql.ast.statement.SQLExternalRecordFormat; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSegmentAttributes; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSegmentAttributesImpl; @@ -33,43 +33,41 @@ import java.util.List; public class OracleCreateTableStatement extends SQLCreateTableStatement implements OracleDDLStatement, OracleSegmentAttributes { + private boolean inMemoryMetadata; - private boolean inMemoryMetadata; - - private boolean cursorSpecificSegment; + private boolean cursorSpecificSegment; // NOPARALLEL - private Boolean parallel; - private SQLExpr parallelValue; + private Boolean parallel; + private SQLExpr parallelValue; - private OracleStorageClause storage; - private OracleLobStorageClause lobStorage; + private OracleStorageClause storage; + private OracleLobStorageClause lobStorage; - private Integer pctfree; - private Integer pctused; - private Integer initrans; - private Integer maxtrans; - private Integer pctincrease; + private Integer pctfree; + private Integer pctused; + private Integer initrans; + private Integer maxtrans; + private Integer pctincrease; + private Integer compressLevel; + private boolean compressForOltp; - private Integer compressLevel; - private boolean compressForOltp; + private Boolean cache; - private Boolean cache; + private DeferredSegmentCreation deferredSegmentCreation; - private DeferredSegmentCreation deferredSegmentCreation; + private Boolean enableRowMovement; - private Boolean enableRowMovement; + private List clusterColumns = new ArrayList(); + private SQLName cluster; - private List clusterColumns = new ArrayList(); - private SQLName cluster; + private Organization organization; - private Organization organization; - - private SQLName of; - private OIDIndex oidIndex; - private boolean monitoring; - private List including = new ArrayList(); + private SQLName of; + private OIDIndex oidIndex; + private boolean monitoring; + private List including = new ArrayList(); private OracleXmlColumnProperties xmlTypeColumnProperties; public void simplify() { @@ -93,9 +91,9 @@ public void simplify() { super.simplify(); } - + public OracleCreateTableStatement() { - super (DbType.oracle); + super(DbType.oracle); } public OracleLobStorageClause getLobStorage() { @@ -404,7 +402,7 @@ public void setXmlTypeColumnProperties(OracleXmlColumnProperties x) { this.xmlTypeColumnProperties = x; } - public static class OIDIndex extends OracleSegmentAttributesImpl implements OracleSQLObject{ + public static class OIDIndex extends OracleSegmentAttributesImpl implements OracleSQLObject { private SQLName name; @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateTypeStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateTypeStatement.java index 21936a1ad2..3a1e983e07 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateTypeStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateTypeStatement.java @@ -26,27 +26,27 @@ import java.util.List; public class OracleCreateTypeStatement extends OracleStatementImpl implements SQLCreateStatement { - private boolean orReplace; - private SQLName name; - private SQLName authId; - private boolean force; - private SQLName oid; - private boolean body; - private boolean object; - private boolean paren; - private Boolean isFinal; - private Boolean instantiable; - - private SQLName under; + private boolean orReplace; + private SQLName name; + private SQLName authId; + private boolean force; + private SQLName oid; + private boolean body; + private boolean object; + private boolean paren; + private Boolean isFinal; + private Boolean instantiable; + + private SQLName under; private List parameters = new ArrayList(); - private SQLDataType tableOf; + private SQLDataType tableOf; - private SQLExpr varraySizeLimit; - private SQLDataType varrayDataType; + private SQLExpr varraySizeLimit; + private SQLDataType varrayDataType; - private String wrappedSource; + private String wrappedSource; @Override public void accept0(OracleASTVisitor visitor) { 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 cb115c85b9..3aa358b91a 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 @@ -18,5 +18,4 @@ 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 bf5825e882..f0991b19b9 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,11 +26,11 @@ import java.util.List; public class OracleDeleteStatement extends SQLDeleteStatement { - private final List hints = new ArrayList(); - private OracleReturningClause returning = null; + private final List hints = new ArrayList(); + private OracleReturningClause returning; - public OracleDeleteStatement(){ - super (DbType.oracle); + public OracleDeleteStatement() { + super(DbType.oracle); } public OracleReturningClause getReturning() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDropDbLinkStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDropDbLinkStatement.java index 6e70ea030f..e170a1588e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDropDbLinkStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDropDbLinkStatement.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleDropDbLinkStatement extends OracleStatementImpl implements SQLDropStatement { - private boolean isPublic; private SQLName name; 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 1eded2a930..51d814d2c7 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 @@ -24,7 +24,6 @@ import java.util.List; public class OracleExceptionStatement extends OracleStatementImpl implements OracleStatement { - private List items = new ArrayList(); public List getItems() { @@ -35,13 +34,12 @@ public void addItem(Item item) { if (item != null) { item.setParent(this); } - + this.items.add(item); } public static class Item extends OracleSQLObjectImpl { - - private SQLExpr when; + private SQLExpr when; private List statements = new ArrayList(); public SQLExpr getWhen() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExecuteImmediateStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExecuteImmediateStatement.java index dafb4e0459..761e491ba9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExecuteImmediateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExecuteImmediateStatement.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleExecuteImmediateStatement extends OracleStatementImpl { - private SQLExpr dynamicSql; private final List arguments = new ArrayList(); @@ -33,10 +32,10 @@ public class OracleExecuteImmediateStatement extends OracleStatementImpl { private final List returnInto = new ArrayList(); - public OracleExecuteImmediateStatement(){ + public OracleExecuteImmediateStatement() { } - public OracleExecuteImmediateStatement(String dynamicSql){ + public OracleExecuteImmediateStatement(String dynamicSql) { this.setDynamicSql(dynamicSql); } 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 e8fdae100a..93b754ee91 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 @@ -18,18 +18,16 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.ast.statement.SQLExplainStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleExplainStatement extends SQLExplainStatement implements OracleStatement { - private SQLExpr statementId; - private SQLExpr into; - + private SQLExpr into; + public OracleExplainStatement() { - super (DbType.oracle); + super(DbType.oracle); } @Override 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 e3e550f4bb..cfbaa1ef9e 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 @@ -23,14 +23,13 @@ import java.util.List; public class OracleFileSpecification extends OracleSQLObjectImpl { + private List fileNames = new ArrayList(); - private List fileNames = new ArrayList(); + private SQLExpr size; - private SQLExpr size; + private boolean autoExtendOff; - 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 2aec70abe6..5330f549ee 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 @@ -22,11 +22,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleForStatement extends SQLForStatement implements OracleStatement { + private boolean all; - - private boolean all; - - private SQLName endLabel; + private SQLName endLabel; @Override protected void accept0(SQLASTVisitor v) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleForeignKey.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleForeignKey.java index b63bb006dd..3cb2885133 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleForeignKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleForeignKey.java @@ -22,11 +22,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleForeignKey extends SQLForeignKeyImpl implements OracleConstraint, OracleSQLObject { - private OracleUsingIndexClause using; - private SQLName exceptionsInto; - private Initially initially; - private Boolean deferrable; + private SQLName exceptionsInto; + private Initially initially; + private Boolean deferrable; @Override protected void accept0(SQLASTVisitor 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 f382e43f9e..37f78ac44b 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 @@ -19,13 +19,12 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleGotoStatement extends OracleStatementImpl { - private SQLName label; - public OracleGotoStatement(){ + public OracleGotoStatement() { } - public OracleGotoStatement(SQLName label){ + public OracleGotoStatement(SQLName label) { this.label = label; } 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 4fa2a82a82..e78497af7f 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 @@ -22,17 +22,15 @@ import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleReturningClause; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.ArrayList; import java.util.List; public class OracleInsertStatement extends SQLInsertStatement implements OracleStatement { - private OracleReturningClause returning; private SQLErrorLoggingClause errorLogging; - private List hints = new ArrayList(); + private List hints = new ArrayList(); public OracleInsertStatement() { dbType = DbType.oracle; 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 8187aa8844..7748e8f7fb 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 @@ -19,13 +19,12 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleLabelStatement extends OracleStatementImpl { - private SQLName label; - public OracleLabelStatement(){ + public OracleLabelStatement() { } - public OracleLabelStatement(SQLName label){ + public OracleLabelStatement(SQLName label) { this.label = label; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLobParameters.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLobParameters.java index cab7f3f12b..d0c1210e3d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLobParameters.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleLobParameters.java @@ -19,7 +19,6 @@ public class OracleLobParameters extends OracleSQLObjectImpl { @Override public void accept0(OracleASTVisitor visitor) { - } public OracleStorageClause getStorage() { 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 aaffc66fbe..23a2b10f99 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 @@ -26,12 +26,11 @@ import java.util.List; public class OracleLockTableStatement extends OracleStatementImpl implements SQLLockTableStatement { - private SQLExprTableSource table; private LockMode lockMode; - private boolean noWait = false; - private SQLExpr wait; - private SQLExpr partition; + private boolean noWait; + private SQLExpr wait; + private SQLExpr partition; public boolean isNoWait() { return noWait; @@ -111,8 +110,7 @@ public static enum LockMode { SHARE_UPDATE, SHARE, SHARE_ROW_EXCLUSIVE, - EXCLUSIVE, - ; + EXCLUSIVE; public String toString() { switch (this) { 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 1efcbfae32..9c2853092f 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 @@ -30,15 +30,14 @@ import java.util.List; public class OracleMultiInsertStatement extends OracleStatementImpl { - public static enum Option { ALL, FIRST } - 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; @@ -85,13 +84,11 @@ public void accept0(OracleASTVisitor visitor) { } public static interface Entry extends OracleSQLObject { - } public static class ConditionalInsertClause extends OracleSQLObjectImpl implements Entry { - private List items = new ArrayList(); - private InsertIntoClause elseItem; + private InsertIntoClause elseItem; public InsertIntoClause getElseItem() { return elseItem; @@ -124,8 +121,7 @@ public void accept0(OracleASTVisitor visitor) { } public static class ConditionalInsertClauseItem extends OracleSQLObjectImpl { - - private SQLExpr when; + private SQLExpr when; private InsertIntoClause then; public SQLExpr getWhen() { @@ -156,12 +152,10 @@ public void accept0(OracleASTVisitor visitor) { } public static class InsertIntoClause extends SQLInsertInto implements OracleSQLObject, Entry { - - private OracleReturningClause returning; + private OracleReturningClause returning; private SQLErrorLoggingClause errorLogging; - public InsertIntoClause(){ - + public InsertIntoClause() { } public OracleReturningClause getReturning() { 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 84a7079d44..62a7e03f32 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 @@ -24,12 +24,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OraclePrimaryKey extends SQLPrimaryKeyImpl implements OracleConstraint, SQLPrimaryKey, SQLTableElement, SQLTableConstraint { - private OracleUsingIndexClause using; - private SQLName exceptionsInto; - private Boolean enable; - private Initially initially; - private Boolean deferrable; + private SQLName exceptionsInto; + private Boolean enable; + private Initially initially; + private Boolean deferrable; @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleRaiseStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleRaiseStatement.java index 08537cfea5..e88ee8dcc9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleRaiseStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleRaiseStatement.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleRaiseStatement extends OracleStatementImpl { - private SQLExpr exception; public SQLExpr getException() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleRunStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleRunStatement.java index a464ecf9ce..8ff49fd674 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleRunStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleRunStatement.java @@ -23,14 +23,14 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleRunStatement extends SQLStatementImpl implements OracleStatement { - - private SQLExpr expr; + private SQLExpr expr; public OracleRunStatement() { - super (DbType.oracle); + super(DbType.oracle); } + public OracleRunStatement(SQLExpr expr) { - super (DbType.oracle); + super(DbType.oracle); this.setExpr(expr); } 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 8e576e2b73..57bae5d236 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 @@ -22,23 +22,20 @@ import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource; import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelectJoin extends SQLJoinTableSource implements OracleSelectTableSource { - protected OracleSelectPivotBase pivot; - public OracleSelectJoin(String alias){ + public OracleSelectJoin(String alias) { super(alias); } - public OracleSelectJoin(){ - + public OracleSelectJoin() { } - public OracleSelectJoin(SQLTableSource left, JoinType joinType, SQLTableSource right, SQLExpr condition){ - super (left, joinType, right, condition); + public OracleSelectJoin(SQLTableSource left, JoinType joinType, SQLTableSource right, SQLExpr condition) { + super(left, joinType, right, condition); } public OracleSelectPivotBase getPivot() { @@ -72,13 +69,21 @@ protected void accept0(OracleASTVisitor visitor) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } OracleSelectJoin that = (OracleSelectJoin) o; - if (pivot != null ? !pivot.equals(that.pivot) : that.pivot != null) return false; + if (pivot != null ? !pivot.equals(that.pivot) : that.pivot != null) { + return false; + } return flashback != null ? flashback.equals(that.flashback) : that.flashback == null; } @@ -89,7 +94,7 @@ public int hashCode() { return result; } - public String toString () { + public String toString() { return SQLUtils.toOracleString(this); } 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 1d9a0655d5..8292e12ed5 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 @@ -16,7 +16,6 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLHint; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; @@ -24,14 +23,12 @@ import java.util.List; public class OracleSelectPivot extends OracleSelectPivotBase { - private boolean xml; private final List items = new ArrayList(); private final List pivotFor = new ArrayList(); private final List pivotIn = new ArrayList(); public OracleSelectPivot() { - } public void accept0(OracleASTVisitor visitor) { @@ -72,12 +69,10 @@ public void setXml(boolean xml) { } public static class Item extends OracleSQLObjectImpl { - private String alias; private SQLExpr expr; public Item() { - } public String getAlias() { @@ -106,6 +101,7 @@ public void accept0(OracleASTVisitor visitor) { visitor.endVisit(this); } + @Override public Item clone() { Item x = new Item(); @@ -123,7 +119,6 @@ public Item clone() { @Override public OracleSelectPivot clone() { - OracleSelectPivot x = new OracleSelectPivot(); x.setXml(this.xml); 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 d7568f2701..cd82fb9755 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 @@ -22,11 +22,9 @@ import java.util.List; public abstract class OracleSelectPivotBase extends OracleSQLObjectImpl { - protected final List pivotFor = new ArrayList(); - public OracleSelectPivotBase(){ - + public OracleSelectPivotBase() { } public List getPivotFor() { 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 2842540325..cc0bf6c0e4 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 @@ -17,9 +17,7 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLHint; import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; @@ -31,12 +29,9 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelectQueryBlock extends SQLSelectQueryBlock implements OracleSQLObject { + private ModelClause modelClause; - - private ModelClause modelClause; - - - private boolean skipLocked = false; + private boolean skipLocked; public OracleSelectQueryBlock clone() { OracleSelectQueryBlock x = new OracleSelectQueryBlock(); @@ -60,7 +55,7 @@ public OracleSelectQueryBlock clone() { return x; } - public OracleSelectQueryBlock(){ + public OracleSelectQueryBlock() { dbType = DbType.oracle; } @@ -108,7 +103,7 @@ public void accept0(OracleASTVisitor visitor) { } visitor.endVisit(this); } - + public String toString() { return SQLUtils.toOracleString(this); } 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 46d51381ef..f59e4867aa 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,11 +20,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public abstract class OracleSelectRestriction extends OracleSQLObjectImpl { - protected SQLName constraint; - public OracleSelectRestriction(){ - + public OracleSelectRestriction() { } public SQLName getConstraint() { @@ -39,9 +37,7 @@ public void setConstraint(SQLName constraint) { } public static class CheckOption extends OracleSelectRestriction { - - public CheckOption(){ - + public CheckOption() { } @Override @@ -64,9 +60,7 @@ public CheckOption clone() { } public static class ReadOnly extends OracleSelectRestriction { - - public ReadOnly(){ - + public ReadOnly() { } @Override @@ -83,5 +77,4 @@ public ReadOnly clone() { } } - } 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 8439b54b58..a6a0b802f0 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 @@ -22,22 +22,20 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelectSubqueryTableSource extends SQLSubqueryTableSource implements OracleSelectTableSource { - protected OracleSelectPivotBase pivot; - - public OracleSelectSubqueryTableSource(){ + public OracleSelectSubqueryTableSource() { } - public OracleSelectSubqueryTableSource(String alias){ + public OracleSelectSubqueryTableSource(String alias) { super(alias); } - public OracleSelectSubqueryTableSource(SQLSelect select, String alias){ + public OracleSelectSubqueryTableSource(SQLSelect select, String alias) { super(select, alias); } - public OracleSelectSubqueryTableSource(SQLSelect select){ + public OracleSelectSubqueryTableSource(SQLSelect select) { super(select); } @@ -64,7 +62,7 @@ protected void accept0(OracleASTVisitor visitor) { visitor.endVisit(this); } - public String toString () { + public String toString() { return SQLUtils.toOracleString(this); } 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 2a71f4da02..60fbff35da 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 @@ -21,19 +21,16 @@ import com.alibaba.druid.sql.dialect.oracle.ast.clause.PartitionExtensionClause; import com.alibaba.druid.sql.dialect.oracle.ast.clause.SampleClause; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleSelectTableReference extends SQLExprTableSource implements OracleSelectTableSource { - - private boolean only = false; - protected OracleSelectPivotBase pivot; + private boolean only; + protected OracleSelectPivotBase pivot; protected PartitionExtensionClause partition; - protected SampleClause sampleClause; - - public OracleSelectTableReference(){ + protected SampleClause sampleClause; + public OracleSelectTableReference() { } public OracleSelectTableReference(SQLExpr expr) { @@ -102,16 +99,30 @@ protected void accept0(OracleASTVisitor visitor) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + if (!super.equals(o)) { + return false; + } OracleSelectTableReference that = (OracleSelectTableReference) o; - if (only != that.only) return false; - if (pivot != null ? !pivot.equals(that.pivot) : that.pivot != null) return false; - if (partition != null ? !partition.equals(that.partition) : that.partition != null) return false; - if (sampleClause != null ? !sampleClause.equals(that.sampleClause) : that.sampleClause != null) return false; + if (only != that.only) { + return false; + } + if (pivot != null ? !pivot.equals(that.pivot) : that.pivot != null) { + return false; + } + if (partition != null ? !partition.equals(that.partition) : that.partition != null) { + return false; + } + if (sampleClause != null ? !sampleClause.equals(that.sampleClause) : that.sampleClause != null) { + return false; + } return flashback != null ? flashback.equals(that.flashback) : that.flashback == null; } @@ -126,11 +137,10 @@ public int hashCode() { return result; } - public String toString () { + public String toString() { return SQLUtils.toOracleString(this); } - public OracleSelectTableReference clone() { OracleSelectTableReference x = new OracleSelectTableReference(); cloneTo(x); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectTableSource.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectTableSource.java index f5202d711b..096328f77d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelectTableSource.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.ast.statement.SQLTableSource; public interface OracleSelectTableSource extends SQLTableSource { - OracleSelectPivotBase getPivot(); void setPivot(OracleSelectPivotBase pivot); 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 63290d6f3c..5db65bb79c 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 @@ -23,14 +23,12 @@ import java.util.List; public class OracleSelectUnPivot extends OracleSelectPivotBase { - private NullsIncludeType nullsIncludeType; private final List items = new ArrayList(); private final List pivotIn = new ArrayList(); public OracleSelectUnPivot() { - } public void accept0(OracleASTVisitor visitor) { @@ -81,7 +79,6 @@ public static String toString(NullsIncludeType type, boolean ucase) { @Override public OracleSelectUnPivot clone() { - OracleSelectUnPivot x = new OracleSelectUnPivot(); x.setNullsIncludeType(nullsIncludeType); 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 730e735704..6271481c7b 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 @@ -19,9 +19,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleSetTransactionStatement extends OracleStatementImpl implements OracleStatement { - - private boolean readOnly = false; - private boolean write = false; + private boolean readOnly; + private boolean write; private SQLExpr name; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleStatement.java index df78d3cce5..6616fe1c25 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleStatement.java @@ -19,5 +19,4 @@ import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; public interface OracleStatement extends SQLStatement, OracleSQLObject { - } 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 549ddda1f9..c777e97741 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,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class OracleStatementImpl extends SQLStatementImpl implements OracleStatement { - public OracleStatementImpl() { super(DbType.oracle); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSupplementalIdKey.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSupplementalIdKey.java index 108ede3384..a64ffe6029 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSupplementalIdKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSupplementalIdKey.java @@ -23,7 +23,6 @@ * Created by wenshao on 20/05/2017. */ public class OracleSupplementalIdKey extends OracleSQLObjectImpl implements SQLTableElement { - private boolean all; private boolean primaryKey; private boolean unique; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSupplementalLogGrp.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSupplementalLogGrp.java index 311dbed535..3b0bb186da 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSupplementalLogGrp.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSupplementalLogGrp.java @@ -29,7 +29,7 @@ public class OracleSupplementalLogGrp extends OracleSQLObjectImpl implements SQLTableElement { private SQLName group; private List columns = new ArrayList(); - private boolean always = false; + private boolean always; @Override public void accept0(OracleASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUnique.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUnique.java index 02b7c4de80..900260c151 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUnique.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUnique.java @@ -22,11 +22,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class OracleUnique extends SQLUnique implements OracleConstraint, OracleSQLObject { - private OracleUsingIndexClause using; - private SQLName exceptionsInto; - private Initially initially; - private Boolean deferrable; + private SQLName exceptionsInto; + private Initially initially; + private Boolean deferrable; @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 e393741711..ed1b908723 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 @@ -27,12 +27,11 @@ import java.util.List; public class OracleUpdateStatement extends SQLUpdateStatement implements OracleStatement, SQLReplaceable { + private List hints = new ArrayList(1); + private boolean only; + private String alias; - private List hints = new ArrayList(1); - private boolean only = false; - private String alias; - - private final List returningInto = new ArrayList(); + private final List returningInto = new ArrayList(); public OracleUpdateStatement() { super(DbType.oracle); @@ -73,7 +72,6 @@ public void accept0(OracleASTVisitor visitor) { visitor.endVisit(this); } - @Override public boolean replace(SQLExpr expr, SQLExpr target) { boolean replace = super.replace(expr, target); @@ -92,7 +90,6 @@ public boolean replace(SQLExpr expr, SQLExpr target) { return false; } - public String getAlias() { return this.alias; } @@ -130,18 +127,36 @@ public void setHints(List hints) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } OracleUpdateStatement that = (OracleUpdateStatement) o; - if (with != null ? !with.equals(that.getWith()) : that.getWith() != null) return false; - if (!items.equals(that.getItems())) return false; - if (where != null ? !where.equals(that.getWhere()) : that.getWhere() != null) return false; - if (from != null ? !from.equals(that.getFrom()) : that.getFrom() != null) return false; - if (hints != null ? !hints.equals(that.hints) : that.hints != null) return false; - if (tableSource != null ? !tableSource.equals(that.tableSource) : that.tableSource != null) return false; - if (returning != null ? !returning.equals(that.returning) : that.returning != null) return false; + if (with != null ? !with.equals(that.getWith()) : that.getWith() != null) { + return false; + } + if (!items.equals(that.getItems())) { + return false; + } + if (where != null ? !where.equals(that.getWhere()) : that.getWhere() != null) { + return false; + } + if (from != null ? !from.equals(that.getFrom()) : that.getFrom() != null) { + return false; + } + if (hints != null ? !hints.equals(that.hints) : that.hints != null) { + return false; + } + if (tableSource != null ? !tableSource.equals(that.tableSource) : that.tableSource != null) { + return false; + } + if (returning != null ? !returning.equals(that.returning) : that.returning != null) { + return false; + } return orderBy != null ? orderBy.equals(that.orderBy) : that.orderBy == null; } 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 f9969159cb..0a69582497 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 @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLPartition; import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement; -import com.alibaba.druid.sql.ast.statement.SQLCreateStatement; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSegmentAttributesImpl; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; @@ -29,17 +28,15 @@ import java.util.List; public class OracleUsingIndexClause extends OracleSegmentAttributesImpl implements OracleSQLObject { + private SQLObject index; + private Boolean enable; - private SQLObject index; - private Boolean enable = null; - - private boolean computeStatistics = false; - private boolean reverse; + private boolean computeStatistics; + private boolean reverse; private List localPartitionIndex = new ArrayList(); - public OracleUsingIndexClause(){ - + public OracleUsingIndexClause() { } protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleXmlColumnProperties.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleXmlColumnProperties.java index c178dd771f..ab78f8c3b4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleXmlColumnProperties.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleXmlColumnProperties.java @@ -68,7 +68,6 @@ public static class OracleXMLTypeStorage extends OracleSQLObjectImpl { @Override public void accept0(OracleASTVisitor visitor) { - } public boolean isSecureFile() { 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 33da01460b..e9755d3e02 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 @@ -32,12 +32,11 @@ import com.alibaba.druid.util.FnvHash; public class OracleCreateTableParser extends SQLCreateTableParser { - - public OracleCreateTableParser(Lexer lexer){ + public OracleCreateTableParser(Lexer lexer) { super(new OracleExprParser(lexer)); } - public OracleCreateTableParser(String sql){ + public OracleCreateTableParser(String sql) { super(new OracleExprParser(sql)); } @@ -68,7 +67,7 @@ public OracleCreateTableStatement parseCreateTable(boolean acceptCreate) { } } - for (;;) { + for (; ; ) { this.getExprParser().parseSegmentAttributes(stmt); if (lexer.identifierEquals(FnvHash.Constants.IN_MEMORY_METADATA)) { @@ -220,7 +219,7 @@ public OracleCreateTableStatement parseCreateTable(boolean acceptCreate) { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLPartition partition = this.getExprParser().parsePartition(); partitionByHash.addPartition(partition); if (lexer.token() == Token.COMMA) { @@ -280,16 +279,16 @@ public OracleCreateTableStatement parseCreateTable(boolean acceptCreate) { OracleLobParameters lobParameters = new OracleLobParameters(); for_: - for (;;) { + for (; ; ) { switch (lexer.token()) { case TABLESPACE: { lexer.nextToken(); SQLName tableSpace = this.exprParser.name(); lobParameters.setTableSpace(tableSpace); } - continue for_; + continue for_; case ENABLE: - case DISABLE:{ + case DISABLE: { Boolean enable = lexer.token() == Token.ENABLE; lexer.nextToken(); accept(Token.STORAGE); @@ -298,7 +297,7 @@ public OracleCreateTableStatement parseCreateTable(boolean acceptCreate) { lobParameters.setEnableStorageInRow(enable); } - continue for_; + continue for_; case CHUNK: lexer.nextToken(); SQLExpr chunk = this.exprParser.expr(); @@ -325,7 +324,7 @@ public OracleCreateTableStatement parseCreateTable(boolean acceptCreate) { lobParameters.setStorage(storageClause); continue for_; case IDENTIFIER: - long hash = lexer.hash_lower(); + long hash = lexer.hashLCase(); if (hash == FnvHash.Constants.PCTVERSION) { lobParameters.setPctVersion(this.exprParser.primary()); lexer.nextToken(); @@ -343,7 +342,7 @@ public OracleCreateTableStatement parseCreateTable(boolean acceptCreate) { } } - for (;;) { + for (; ; ) { if (lexer.identifierEquals(FnvHash.Constants.ALLOW)) { lexer.nextToken(); if (lexer.identifierEquals("NONSCHEMA")) { @@ -439,7 +438,6 @@ private void parseOrganization(OracleCreateTableStatement stmt) { if (lexer.identifierEquals("RECORDS")) { lexer.nextToken(); - if (lexer.identifierEquals("DELIMITED")) { lexer.nextToken(); accept(Token.BY); @@ -554,7 +552,7 @@ protected SQLTableElement parseCreateTableSupplementalLogingProps() { logGrp.setGroup(this.exprParser.name()); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLName column = this.exprParser.name(); if (lexer.identifierEquals("NO")) { @@ -584,12 +582,12 @@ protected SQLTableElement parseCreateTableSupplementalLogingProps() { } return logGrp; - } else if (lexer.identifierEquals(FnvHash.Constants.DATA)){ + } else if (lexer.identifierEquals(FnvHash.Constants.DATA)) { lexer.nextToken(); OracleSupplementalIdKey idKey = new OracleSupplementalIdKey(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { if (lexer.token() == Token.ALL) { lexer.nextToken(); idKey.setAll(true); 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 3c9ac451d0..bc52673b76 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 @@ -37,59 +37,53 @@ import java.util.List; public class OracleExprParser extends SQLExprParser { + public boolean allowStringAdditive; + public static final String[] AGGREGATE_FUNCTIONS; - - - - - public boolean allowStringAdditive = false; - - public final static String[] AGGREGATE_FUNCTIONS; - - public final static long[] AGGREGATE_FUNCTIONS_CODES; + public static final long[] AGGREGATE_FUNCTIONS_CODES; static { String[] strings = { - "AVG", // - "CORR", // - "COVAR_POP", // - "COVAR_SAMP", // - "COUNT", // - "CUME_DIST", // - "DENSE_RANK", // - "FIRST", // - "FIRST_VALUE", // - "LAG", // - "LAST", // - "LAST_VALUE", // + "AVG", + "CORR", + "COVAR_POP", + "COVAR_SAMP", + "COUNT", + "CUME_DIST", + "DENSE_RANK", + "FIRST", + "FIRST_VALUE", + "LAG", + "LAST", + "LAST_VALUE", "LISTAGG", - "LEAD", // + "LEAD", "MAX", // - "MIN", // - "NTILE", // + "MIN", + "NTILE", "PERCENT_RANK", // "PERCENTILE_CONT", // "PERCENTILE_DISC", // - "RANK", // - "RATIO_TO_REPORT", // - "REGR_SLOPE", // + "RANK", + "RATIO_TO_REPORT", + "REGR_SLOPE", "REGR_INTERCEPT", // "REGR_COUNT", // - "REGR_R2", // + "REGR_R2", "REGR_AVGX", // "REGR_AVGY", // "REGR_SXX", // "REGR_SYY", // - "REGR_SXY", // + "REGR_SXY", "ROW_NUMBER", // "STDDEV", // "STDDEV_POP", // - "STDDEV_SAMP", // - "SUM", // - "VAR_POP", // - "VAR_SAMP", // - "VARIANCE", // + "STDDEV_SAMP", + "SUM", + "VAR_POP", + "VAR_SAMP", + "VARIANCE", "WM_CONCAT" }; AGGREGATE_FUNCTIONS_CODES = FnvHash.fnv1a_64_lower(strings, true); @@ -101,25 +95,25 @@ public class OracleExprParser extends SQLExprParser { } } - public OracleExprParser(Lexer lexer){ + public OracleExprParser(Lexer lexer) { super(lexer); this.aggregateFunctions = AGGREGATE_FUNCTIONS; this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; this.dbType = DbType.oracle; } - public OracleExprParser(String text){ + public OracleExprParser(String text) { this(new OracleLexer(text)); this.lexer.nextToken(); this.dbType = DbType.oracle; } - public OracleExprParser(String text, SQLParserFeature... features){ + public OracleExprParser(String text, SQLParserFeature... features) { this(new OracleLexer(text, features)); this.lexer.nextToken(); this.dbType = DbType.oracle; } - + protected boolean isCharType(long hash) { return hash == FnvHash.Constants.CHAR || hash == FnvHash.Constants.CHARACTER @@ -128,12 +122,10 @@ protected boolean isCharType(long hash) { || hash == FnvHash.Constants.VARCHAR2 || hash == FnvHash.Constants.NVARCHAR || hash == FnvHash.Constants.NVARCHAR2 - || hash == FnvHash.Constants.CHARACTER - ; + || hash == FnvHash.Constants.CHARACTER; } public SQLDataType parseDataType(boolean restrict) { - if (lexer.token() == Token.CONSTRAINT || lexer.token() == Token.COMMA) { return null; } @@ -197,36 +189,36 @@ public SQLDataType parseDataType(boolean restrict) { SQLName typeExpr = name(); typeName = typeExpr.toString(); } - + if ("TIMESTAMP".equalsIgnoreCase(typeName)) { SQLDataTypeImpl timestamp = new SQLDataTypeImpl(typeName); timestamp.setDbType(dbType); - + if (lexer.token() == Token.LPAREN) { lexer.nextToken(); timestamp.addArgument(this.expr()); accept(Token.RPAREN); } - + if (lexer.token() == Token.WITH) { lexer.nextToken(); - + if (lexer.identifierEquals("LOCAL")) { lexer.nextToken(); timestamp.setWithLocalTimeZone(true); } timestamp.setWithTimeZone(true); - + acceptIdentifier("TIME"); acceptIdentifier("ZONE"); } - + return timestamp; } if ("national".equalsIgnoreCase(typeName) - && isCharType(lexer.hash_lower())) { + && isCharType(lexer.hashLCase())) { typeName += ' ' + lexer.stringVal(); lexer.nextToken(); @@ -254,7 +246,7 @@ && isCharType(lexer.hash_lower())) { return charType; } - + if (isCharType(typeName)) { if (lexer.identifierEquals("VARYING")) { typeName += ' ' + lexer.stringVal(); @@ -282,10 +274,10 @@ && isCharType(lexer.hash_lower())) { } else if (restrict) { accept(Token.LPAREN); } - + return parseCharTypeRest(charType); } - + if (lexer.token() == Token.PERCENT) { lexer.nextToken(); if (lexer.identifierEquals("TYPE")) { @@ -446,8 +438,8 @@ public SQLExpr primary() { throw new ParserException("TODO " + lexer.info()); } return primaryRest(sqlExpr); - - case CURSOR: + + case CURSOR: lexer.nextToken(); accept(Token.LPAREN); @@ -457,44 +449,44 @@ public SQLExpr primary() { accept(Token.RPAREN); sqlExpr = cursorExpr; - return primaryRest(sqlExpr); + return primaryRest(sqlExpr); // 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 MAXSIZE: - case PCTINCREASE: - case FLASH_CACHE: - case CELL_FLASH_CACHE: - case NONE: - case LOB: - case STORE: - case ROW: - case CHUNK: - case CACHE: - case NOCACHE: - case LOGGING: - case NOCOMPRESS: - case KEEP_DUPLICATES: - case EXCEPTIONS: - case PURGE: - case OUTER: - sqlExpr = new SQLIdentifierExpr(lexer.stringVal()); - lexer.nextToken(); - return primaryRest(sqlExpr); + case PCTFREE: + case INITRANS: + case MAXTRANS: + case SEGMENT: + case CREATION: + case IMMEDIATE: + case DEFERRED: + case STORAGE: + case NEXT: + case MINEXTENTS: + case MAXEXTENTS: + case MAXSIZE: + case PCTINCREASE: + case FLASH_CACHE: + case CELL_FLASH_CACHE: + case NONE: + case LOB: + case STORE: + case ROW: + case CHUNK: + case CACHE: + case NOCACHE: + case LOGGING: + case NOCOMPRESS: + case KEEP_DUPLICATES: + case EXCEPTIONS: + case PURGE: + case OUTER: + sqlExpr = new SQLIdentifierExpr(lexer.stringVal()); + lexer.nextToken(); + return primaryRest(sqlExpr); default: return super.primary(); } } - + @Override protected SQLExpr methodRest(SQLExpr expr, boolean acceptLPAREN) { if (acceptLPAREN) { @@ -506,7 +498,7 @@ protected SQLExpr methodRest(SQLExpr expr, boolean acceptLPAREN) { accept(Token.RPAREN); return new OracleOuterExpr(expr); } - + if (expr instanceof SQLIdentifierExpr) { String methodName = ((SQLIdentifierExpr) expr).getName(); SQLMethodInvokeExpr methodExpr = new SQLMethodInvokeExpr(methodName); @@ -535,7 +527,7 @@ protected SQLExpr methodRest(SQLExpr expr, boolean acceptLPAREN) { public SQLExpr primaryRest(SQLExpr expr) { if (expr instanceof SQLIdentifierExpr) { SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr; - String ident = ((SQLIdentifierExpr)expr).getName(); + String ident = ((SQLIdentifierExpr) expr).getName(); final long hashCode64 = identExpr.hashCode64(); if (hashCode64 == FnvHash.Constants.TIMESTAMP) { @@ -559,13 +551,12 @@ public SQLExpr primaryRest(SQLExpr expr) { accept(Token.LITERAL_CHARS); } - - return primaryRest(timestamp); + return primaryRest(timestamp); } } if (lexer.token() == Token.IDENTIFIER && expr instanceof SQLNumericLiteralExpr) { String ident = lexer.stringVal(); - + if (ident.length() == 1) { char unit = ident.charAt(0); switch (unit) { @@ -585,18 +576,18 @@ public SQLExpr primaryRest(SQLExpr expr) { lexer.nextToken(); break; default: - break; + break; } } } - + if (lexer.token() == Token.DOTDOT) { lexer.nextToken(); SQLExpr upBound = expr(); - + return new OracleRangeExpr(expr, upBound); } - + if (lexer.token() == Token.MONKEYS_AT) { lexer.nextToken(); @@ -608,7 +599,7 @@ public SQLExpr primaryRest(SQLExpr expr) { lexer.nextToken(); } else { String link = lexer.stringVal(); - if(lexer.token() == Token.LITERAL_ALIAS) { + if (lexer.token() == Token.LITERAL_ALIAS) { accept(Token.LITERAL_ALIAS); } else { accept(Token.IDENTIFIER); @@ -616,9 +607,9 @@ public SQLExpr primaryRest(SQLExpr expr) { dblink.setDbLink(link); if (lexer.token() == Token.LPAREN) { SQLExpr dblinkExpr = dblink.getExpr(); - if(dblinkExpr.getClass() == SQLPropertyExpr.class) { + if (dblinkExpr.getClass() == SQLPropertyExpr.class) { SQLExpr methodInvokeExpr = new SQLMethodInvokeExpr(); - SQLMethodInvokeExpr expr2 = (SQLMethodInvokeExpr)methodRest(methodInvokeExpr, true); + SQLMethodInvokeExpr expr2 = (SQLMethodInvokeExpr) methodRest(methodInvokeExpr, true); expr2.setOwner(((SQLPropertyExpr) expr).getOwner()); expr2.setMethodName(((SQLPropertyExpr) expr).getName()); @@ -641,23 +632,23 @@ public SQLExpr primaryRest(SQLExpr expr) { expr = primaryRest(expr); } - + if (lexer.identifierEquals("DAY") || lexer.identifierEquals("YEAR")) { Lexer.SavePoint savePoint = lexer.mark(); - + String name = lexer.stringVal(); lexer.nextToken(); - + if (lexer.token() == Token.COMMA) { lexer.reset(savePoint); return expr; } - + OracleIntervalExpr interval = new OracleIntervalExpr(); interval.setValue(expr); OracleIntervalType type = OracleIntervalType.valueOf(name.toUpperCase()); interval.setType(type); - + if (lexer.token() == Token.LPAREN) { lexer.nextToken(); if (lexer.token() != Token.LITERAL_INT) { @@ -691,10 +682,10 @@ public SQLExpr primaryRest(SQLExpr expr) { interval.setToType(OracleIntervalType.MONTH); lexer.nextToken(); } - + expr = interval; } - + if (lexer.identifierEquals("AT")) { Lexer.SavePoint mark = lexer.mark(); lexer.nextToken(); @@ -709,14 +700,14 @@ public SQLExpr primaryRest(SQLExpr expr) { return expr; } acceptIdentifier("ZONE"); - + SQLExpr timeZone = primary(); expr = new OracleDatetimeExpr(expr, timeZone); } } - + SQLExpr restExpr = super.primaryRest(expr); - + if (restExpr != expr && restExpr instanceof SQLMethodInvokeExpr) { SQLMethodInvokeExpr methodInvoke = (SQLMethodInvokeExpr) restExpr; if (methodInvoke.getArguments().size() == 1) { @@ -732,7 +723,7 @@ public SQLExpr primaryRest(SQLExpr expr) { } } } - + return restExpr; } @@ -741,7 +732,7 @@ protected SQLExpr dotRest(SQLExpr expr) { String name = lexer.stringVal(); lexer.nextToken(); expr = new SQLPropertyExpr(expr, name); - + if (lexer.token() == Token.DOT) { lexer.nextToken(); expr = dotRest(expr); @@ -749,7 +740,7 @@ protected SQLExpr dotRest(SQLExpr expr) { return expr; } - + if (lexer.identifierEquals(FnvHash.Constants.NEXTVAL)) { if (expr instanceof SQLIdentifierExpr) { SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr; @@ -771,7 +762,7 @@ protected SQLExpr dotRest(SQLExpr expr) { protected SQLAggregateExpr parseAggregateExpr(String methodName) { // methodName = methodName.toUpperCase(); - + SQLAggregateExpr aggregateExpr; if (lexer.token() == Token.UNIQUE) { aggregateExpr = new SQLAggregateExpr(methodName, SQLAggregateOption.UNIQUE); @@ -808,7 +799,7 @@ protected SQLAggregateExpr parseAggregateExpr(String methodName) { acceptIdentifier("NULLS"); aggregateExpr.setIgnoreNulls(false); } - + if (lexer.identifierEquals(FnvHash.Constants.WITHIN)) { lexer.nextToken(); accept(Token.GROUP); @@ -818,10 +809,10 @@ protected SQLAggregateExpr parseAggregateExpr(String methodName) { aggregateExpr.setOrderBy(orderBy); accept(Token.RPAREN); } - + if (lexer.identifierEquals("KEEP")) { lexer.nextToken(); - + SQLKeep keep = new SQLKeep(); accept(Token.LPAREN); acceptIdentifier("DENSE_RANK"); @@ -832,12 +823,12 @@ protected SQLAggregateExpr parseAggregateExpr(String methodName) { acceptIdentifier("LAST"); keep.setDenseRank(DenseRank.LAST); } - + SQLOrderBy orderBy = this.parseOrderBy(); keep.setOrderBy(orderBy); - + aggregateExpr.setKeep(keep); - + accept(Token.RPAREN); } @@ -984,7 +975,7 @@ public OracleSelectParser createSelectParser() { protected SQLExpr parseInterval() { accept(Token.INTERVAL); - + OracleIntervalExpr interval = new OracleIntervalExpr(); if (lexer.token() == Token.LITERAL_CHARS) { @@ -1041,7 +1032,7 @@ protected SQLExpr parseInterval() { } accept(Token.RPAREN); } - + if (lexer.token() == Token.TO) { lexer.nextToken(); if (lexer.identifierEquals("SECOND")) { @@ -1060,14 +1051,14 @@ protected SQLExpr parseInterval() { lexer.nextToken(); } } - - return interval; + + return interval; } - + public SQLExpr relationalRest(SQLExpr expr) { if (lexer.token() == Token.IS) { lexer.nextToken(); - + if (lexer.token() == Token.NOT) { lexer.nextToken(); SQLExpr rightExpr = primary(); @@ -1087,7 +1078,7 @@ public SQLExpr relationalRest(SQLExpr expr) { isOf.setExpr(expr); accept(Token.LPAREN); - for (;;) { + for (; ; ) { boolean only = lexer.identifierEquals(FnvHash.Constants.ONLY); if (only) { lexer.nextToken(); @@ -1115,16 +1106,15 @@ public SQLExpr relationalRest(SQLExpr expr) { SQLExpr rightExpr = primary(); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Is, rightExpr, getDbType()); } - + return expr; } return super.relationalRest(expr); } - - + public SQLName name() { SQLName name = super.name(); - + if (lexer.token() == Token.MONKEYS_AT) { lexer.nextToken(); if (lexer.token() != Token.IDENTIFIER) { @@ -1133,7 +1123,6 @@ public SQLName name() { SQLDbLinkExpr dbLink = new SQLDbLinkExpr(); dbLink.setExpr(name); - String link = lexer.stringVal(); lexer.nextToken(); while (lexer.token() == Token.DOT) { @@ -1153,10 +1142,10 @@ public SQLName name() { // name = new SQLIdentifierExpr(name.getSimpleName() + " " + lexer.stringVal()); // lexer.nextToken(); // } - + return name; } - + public OraclePrimaryKey parsePrimaryKey() { lexer.nextToken(); accept(Token.KEY); @@ -1165,13 +1154,13 @@ public OraclePrimaryKey parsePrimaryKey() { accept(Token.LPAREN); orderBy(primaryKey.getColumns(), primaryKey); accept(Token.RPAREN); - + if (lexer.token() == Token.USING) { OracleUsingIndexClause using = parseUsingIndex(); primaryKey.setUsing(using); } - for (;;) { + for (; ; ) { if (lexer.token() == Token.ENABLE) { lexer.nextToken(); primaryKey.setEnable(Boolean.TRUE); @@ -1194,7 +1183,7 @@ public OraclePrimaryKey parsePrimaryKey() { break; } } - + return primaryKey; } @@ -1210,15 +1199,15 @@ private OracleUsingIndexClause parseUsingIndex() { using.setIndex(createIndex); accept(Token.RPAREN); } - - for (;;) { + + for (; ; ) { this.parseSegmentAttributes(using); if (lexer.token() == Token.COMPUTE) { lexer.nextToken(); acceptIdentifier("STATISTICS"); using.setComputeStatistics(true); - continue; + continue; } else if (lexer.token() == Token.ENABLE) { lexer.nextToken(); using.setEnable(true); @@ -1236,7 +1225,7 @@ private OracleUsingIndexClause parseUsingIndex() { accept(Token.LPAREN); // http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_5010.htm#i2125897 - for (;;) { + for (; ; ) { SQLPartition partition = this.parsePartition(); partition.setParent(using); using.getLocalPartitionIndex().add(partition); @@ -1262,7 +1251,7 @@ private OracleUsingIndexClause parseUsingIndex() { return using; } - + public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { column = super.parseColumnRest(column); @@ -1280,7 +1269,7 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { column.setGeneratedAlawsAs(expr); } - for (;;) { + for (; ; ) { if (lexer.token() == Token.ENABLE) { lexer.nextToken(); column.setEnable(Boolean.TRUE); @@ -1309,19 +1298,19 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { break; } } - + return column; } - + public SQLExpr exprRest(SQLExpr expr) { expr = super.exprRest(expr); - + if (lexer.token() == Token.COLONEQ) { lexer.nextToken(); SQLExpr right = expr(); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Assignment, right, getDbType()); } - + return expr; } @@ -1336,7 +1325,6 @@ public SQLObject parseOpaque() { accept(Token.STORE); accept(Token.AS); - if (lexer.identifierEquals("SECUREFILE")) { lexer.nextToken(); clause.setSecureFile(true); @@ -1352,7 +1340,7 @@ public SQLObject parseOpaque() { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { this.parseSegmentAttributes(clause); if (lexer.token() == Token.ENABLE) { @@ -1425,19 +1413,18 @@ public SQLObject parseOpaque() { return clause; } - + 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); - if (lexer.identifierEquals("SECUREFILE")) { lexer.nextToken(); @@ -1457,7 +1444,7 @@ public OracleLobStorageClause parseLobStorage() { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { this.parseSegmentAttributes(clause); if (lexer.token() == Token.ENABLE) { @@ -1530,13 +1517,13 @@ public OracleLobStorageClause parseLobStorage() { return clause; } - + public OracleStorageClause parseStorage() { lexer.nextToken(); accept(Token.LPAREN); OracleStorageClause storage = new OracleStorageClause(); - for (;;) { + for (; ; ) { if (lexer.identifierEquals("INITIAL")) { lexer.nextToken(); storage.setInitial(this.expr()); @@ -1615,7 +1602,7 @@ public OracleStorageClause parseStorage() { accept(Token.RPAREN); return storage; } - + public SQLUnique parseUnique() { accept(Token.UNIQUE); @@ -1623,7 +1610,7 @@ public SQLUnique parseUnique() { accept(Token.LPAREN); orderBy(unique.getColumns(), unique); accept(Token.RPAREN); - + if (lexer.token() == Token.USING) { OracleUsingIndexClause using = parseUsingIndex(); unique.setUsing(using); @@ -1631,11 +1618,11 @@ public SQLUnique parseUnique() { return unique; } - + public OracleConstraint parseConstaint() { OracleConstraint constraint = (OracleConstraint) super.parseConstaint(); - - for (;;) { + + for (; ; ) { if (lexer.token() == Token.EXCEPTIONS) { lexer.nextToken(); accept(Token.INTO); @@ -1643,13 +1630,13 @@ public OracleConstraint parseConstaint() { constraint.setExceptionsInto(exceptionsInto); continue; } - + if (lexer.token() == Token.DISABLE) { lexer.nextToken(); constraint.setEnable(false); continue; } - + if (lexer.token() == Token.ENABLE) { lexer.nextToken(); constraint.setEnable(true); @@ -1669,7 +1656,7 @@ public OracleConstraint parseConstaint() { if (lexer.token() == Token.INITIALLY) { lexer.nextToken(); - + if (lexer.token() == Token.IMMEDIATE) { lexer.nextToken(); constraint.setInitially(Initially.IMMEDIATE); @@ -1677,10 +1664,10 @@ public OracleConstraint parseConstaint() { accept(Token.DEFERRED); constraint.setInitially(Initially.DEFERRED); } - + continue; } - + if (lexer.token() == Token.NOT) { lexer.nextToken(); if (lexer.identifierEquals(FnvHash.Constants.DEFERRABLE)) { @@ -1690,7 +1677,7 @@ public OracleConstraint parseConstaint() { } throw new ParserException("TODO " + lexer.info()); } - + if (lexer.identifierEquals(FnvHash.Constants.DEFERRABLE)) { lexer.nextToken(); constraint.setDeferrable(true); @@ -1701,17 +1688,17 @@ public OracleConstraint parseConstaint() { OracleUsingIndexClause using = parseUsingIndex(); constraint.setUsing(using); } - + break; } return constraint; } - + protected OracleForeignKey createForeignKey() { return new OracleForeignKey(); } - + protected SQLCheck createCheck() { return new OracleCheck(); } @@ -1733,7 +1720,7 @@ protected SQLPartition parsePartition() { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLSubPartition subPartition = parseSubPartition(); this.parseSegmentAttributes(subPartition); @@ -1754,7 +1741,7 @@ protected SQLPartition parsePartition() { partition.setSubPartitionsCount(subPartitionsCount); } - for (;;) { + for (; ; ) { parseSegmentAttributes(partition); if (lexer.token() == Token.LOB) { @@ -1781,7 +1768,7 @@ protected SQLPartition parsePartition() { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLSubPartition subPartition = parseSubPartition(); this.parseSegmentAttributes(subPartition); @@ -1816,7 +1803,7 @@ protected SQLPartitionBy parsePartitionBy() { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLPartition partition = this.parsePartition(); partitionByHash.addPartition(partition); if (lexer.token() == Token.COMMA) { @@ -1873,7 +1860,7 @@ protected SQLSubPartition parseSubPartition() { } public void parseSegmentAttributes(OracleSegmentAttributes attributes) { - for (;;) { + for (; ; ) { if (lexer.token() == Token.TABLESPACE) { lexer.nextToken(); attributes.setTablespace(this.name()); @@ -1956,7 +1943,7 @@ protected SQLPartitionByRange partitionByRange() { acceptIdentifier("RANGE"); accept(Token.LPAREN); SQLPartitionByRange clause = new SQLPartitionByRange(); - for (;;) { + for (; ; ) { SQLName column = this.name(); clause.addColumn(column); @@ -1986,7 +1973,7 @@ protected void parsePartitionByRest(SQLPartitionBy clause) { lexer.nextToken(); accept(Token.IN); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLName tablespace = this.name(); clause.getStoreIn().add(tablespace); @@ -2015,7 +2002,7 @@ protected void parsePartitionByRest(SQLPartitionBy clause) { accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLPartition partition = this.parsePartition(); clause.addPartition(partition); @@ -2059,7 +2046,7 @@ protected SQLSubPartitionBy subPartitionBy() { acceptIdentifier("TEMPLATE"); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLSubPartition subPartition = this.parseSubPartition(); subPartition.setParent(byList); byList.getSubPartitionTemplate().add(subPartition); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleFunctionDataType.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleFunctionDataType.java index 445a1a51b9..ffd0ba64e3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleFunctionDataType.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleFunctionDataType.java @@ -24,7 +24,7 @@ import java.util.List; public class OracleFunctionDataType extends SQLDataTypeImpl { - private boolean isStatic = false; + private boolean isStatic; private final List parameters = new ArrayList(); private SQLDataType returnDataType; 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 67c7eb3d06..07619a47ad 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 @@ -24,8 +24,7 @@ import static com.alibaba.druid.sql.parser.LayoutCharacters.EOI; public class OracleLexer extends Lexer { - - public final static Keywords DEFAULT_ORACLE_KEYWORDS; + public static final Keywords DEFAULT_ORACLE_KEYWORDS; static { Map map = new HashMap(); @@ -118,19 +117,19 @@ public class OracleLexer extends Lexer { DEFAULT_ORACLE_KEYWORDS = new Keywords(map); } - public OracleLexer(char[] input, int inputLength, boolean skipComment){ + public OracleLexer(char[] input, int inputLength, boolean skipComment) { super(input, inputLength, skipComment); super.keywords = DEFAULT_ORACLE_KEYWORDS; } - public OracleLexer(String input){ + public OracleLexer(String input) { super(input); this.skipComment = true; this.keepComments = true; super.keywords = DEFAULT_ORACLE_KEYWORDS; } - public OracleLexer(String input, SQLParserFeature... features){ + public OracleLexer(String input, SQLParserFeature... features) { super(input); this.skipComment = true; this.keepComments = true; @@ -259,7 +258,7 @@ public void scanComment() { bufPos++; } - for (;!isEOF();) { + for (; !isEOF(); ) { if (ch == '*' && charAt(pos + 1) == '/') { bufPos += 2; scanChar(); @@ -298,7 +297,7 @@ public void scanComment() { scanChar(); bufPos++; - for (;;) { + for (; ; ) { if (ch == '\r') { if (charAt(pos + 1) == '\n') { bufPos += 2; @@ -332,8 +331,6 @@ public void scanComment() { } } - - public void scanNumber() { mark = pos; @@ -342,7 +339,7 @@ public void scanNumber() { ch = charAt(++pos); } - for (;;) { + for (; ; ) { if (ch >= '0' && ch <= '9') { bufPos++; } else { @@ -362,7 +359,7 @@ public void scanNumber() { ch = charAt(++pos); isDouble = true; - for (;;) { + for (; ; ) { if (ch >= '0' && ch <= '9') { bufPos++; } else { @@ -381,7 +378,7 @@ public void scanNumber() { ch = charAt(++pos); } - for (;;) { + for (; ; ) { if (ch >= '0' && ch <= '9') { bufPos++; } else { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleProcedureDataType.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleProcedureDataType.java index db72129b72..80df5d7554 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleProcedureDataType.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleProcedureDataType.java @@ -23,7 +23,7 @@ import java.util.List; public class OracleProcedureDataType extends SQLDataTypeImpl { - private boolean isStatic = false; + private boolean isStatic; private final List parameters = new ArrayList(); private SQLStatement block; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java index 3e14c570e5..cd5164ef7b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java @@ -27,16 +27,15 @@ import java.util.List; public class OracleSelectParser extends SQLSelectParser { - - public OracleSelectParser(String sql){ + public OracleSelectParser(String sql) { super(new OracleExprParser(sql)); } - public OracleSelectParser(SQLExprParser exprParser){ + public OracleSelectParser(SQLExprParser exprParser) { super(exprParser); } - public OracleSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache){ + public OracleSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache) { super(exprParser, selectListCache); } @@ -110,7 +109,7 @@ public SQLSelect select() { orderBy = this.exprParser.parseOrderBy(); if (queryBlock != null && queryBlock.getOrderBy() == null) { queryBlock.setOrderBy(orderBy); - } else if (select.getOrderBy() == null){ + } else if (select.getOrderBy() == null) { select.setOrderBy(orderBy); } else { throw new ParserException("illegal state."); @@ -164,7 +163,7 @@ public SQLSelect select() { public SQLWithSubqueryClause parseWith() { accept(Token.WITH); SQLWithSubqueryClause subqueryFactoringClause = new SQLWithSubqueryClause(); - for (;;) { + for (; ; ) { OracleWithSubqueryEntry entry = new OracleWithSubqueryEntry(); String alias = lexer.stringVal(); @@ -431,7 +430,7 @@ private void parseMainModelClause(ModelClause modelClause) { acceptIdentifier("DIMENSION"); accept(Token.BY); accept(Token.LPAREN); - for (;;) { + for (; ; ) { if (lexer.token() == Token.RPAREN) { lexer.nextToken(); break; @@ -450,7 +449,7 @@ private void parseMainModelClause(ModelClause modelClause) { acceptIdentifier("MEASURES"); accept(Token.LPAREN); - for (;;) { + for (; ; ) { if (lexer.token() == Token.RPAREN) { lexer.nextToken(); break; @@ -513,7 +512,7 @@ private void parseModelRulesClause(MainModelClause mainModel) { } accept(Token.LPAREN); - for (;;) { + for (; ; ) { if (lexer.token() == Token.RPAREN) { lexer.nextToken(); break; @@ -746,7 +745,6 @@ private void parseTableSourceQueryTableExpr(OracleSelectTableReference tableRefe accept(Token.BETWEEN); - SQLFlashbackExpr start = new SQLFlashbackExpr(); if (lexer.identifierEquals("SCN")) { lexer.nextToken(); @@ -790,7 +788,7 @@ protected SQLTableSource primaryTableSourceRest(SQLTableSource tableSource) { lexer.nextToken(); if (lexer.token() == Token.OF) { - ((OracleSelectTableSource)tableSource).setFlashback(flashback()); + ((OracleSelectTableSource) tableSource).setFlashback(flashback()); } tableSource.setAlias(tableAlias()); @@ -1055,7 +1053,7 @@ private void parsePivot(OracleSelectTableSource tableSource) { throw new ParserException("TODO. " + lexer.info()); } - for (;;) { + for (; ; ) { item = new OracleSelectPivot.Item(); item.setExpr(this.exprParser.expr()); item.setAlias(as()); 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 57d436f395..0b703e5f54 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 @@ -32,16 +32,15 @@ import java.util.List; public class OracleStatementParser extends SQLStatementParser { - - public OracleStatementParser(String sql){ + public OracleStatementParser(String sql) { super(new OracleExprParser(sql)); } - public OracleStatementParser(String sql, SQLParserFeature... features){ + public OracleStatementParser(String sql, SQLParserFeature... features) { super(new OracleExprParser(sql, features)); } - public OracleStatementParser(Lexer lexer){ + public OracleStatementParser(Lexer lexer) { super(new OracleExprParser(lexer)); } @@ -65,7 +64,7 @@ protected void parseInsert0_hinits(SQLInsertInto insertStatement) { } public void parseStatementList(List statementList, int max, SQLObject parent) { - for (;;) { + for (; ; ) { if (max != -1) { if (statementList.size() >= max) { return; @@ -84,7 +83,7 @@ public void parseStatementList(List statementList, int max, SQLObj if (lexer.token() == (Token.SEMI)) { lexer.nextToken(); - if(statementList.size() > 0) { + if (statementList.size() > 0) { SQLStatement lastStmt = statementList.get(statementList.size() - 1); lastStmt.setAfterSemi(true); } @@ -389,12 +388,12 @@ public void parseStatementList(List statementList, int max, SQLObj statementList.add(this.parseGrant()); continue; } - + if (lexer.token() == Token.REVOKE) { statementList.add(this.parseRevoke()); continue; } - + if (lexer.token() == Token.COMMENT) { statementList.add(this.parseComment()); continue; @@ -453,7 +452,7 @@ public void parseStatementList(List statementList, int max, SQLObj stmt.setWrite(true); lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.token() == Token.WAIT) { lexer.nextToken(); stmt.setWait(Boolean.TRUE); @@ -579,7 +578,7 @@ public void parseStatementList(List statementList, int max, SQLObj statementList.add(stmt); continue; } - + if (lexer.token() == Token.PROCEDURE) { SQLDropProcedureStatement stmt = parseDropProcedure(false); stmt.setParent(parent); @@ -624,7 +623,7 @@ public void parseStatementList(List statementList, int max, SQLObj statementList.add(stmt); continue; } - + if (lexer.token() == Token.OPEN) { SQLStatement stmt = this.parseOpen(); stmt.setParent(parent); @@ -743,7 +742,6 @@ public SQLStatement parseDropMaterializedView() { return stmt; } - public SQLStatement parseDropSynonym() { if (lexer.token() == Token.DROP) { lexer.nextToken(); @@ -798,7 +796,7 @@ public SQLStatement parseExecute() { if (lexer.token() == Token.USING) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLArgument arg = new SQLArgument(); if (lexer.token() == Token.IN) { @@ -949,7 +947,7 @@ public SQLStatement parseFunction() { } else { String wrappedString = lexer.text.substring(lexer.pos()); stmt.setWrappedSource(wrappedString); - lexer.reset(lexer.text.length(),(char) LayoutCharacters.EOI, Token.EOF); + lexer.reset(lexer.text.length(), (char) LayoutCharacters.EOI, Token.EOF); return stmt; } @@ -1282,7 +1280,7 @@ public SQLStatement parserAlter() { OracleAlterTriggerStatement stmt = new OracleAlterTriggerStatement(); stmt.setName(this.exprParser.name()); - for (;;) { + for (; ; ) { if (lexer.token() == Token.ENABLE) { lexer.nextToken(); stmt.setEnable(Boolean.TRUE); @@ -1305,7 +1303,7 @@ public SQLStatement parserAlter() { OracleAlterSynonymStatement stmt = new OracleAlterSynonymStatement(); stmt.setName(this.exprParser.name()); - for (;;) { + for (; ; ) { if (lexer.token() == Token.ENABLE) { lexer.nextToken(); stmt.setEnable(Boolean.TRUE); @@ -1328,7 +1326,7 @@ public SQLStatement parserAlter() { OracleAlterViewStatement stmt = new OracleAlterViewStatement(); stmt.setName(this.exprParser.name()); - for (;;) { + for (; ; ) { if (lexer.token() == Token.ENABLE) { lexer.nextToken(); stmt.setEnable(Boolean.TRUE); @@ -1360,10 +1358,10 @@ public SQLStatement parserAlter() { OracleAlterTablespaceAddDataFile item = new OracleAlterTablespaceAddDataFile(); - for (;;) { + for (; ; ) { OracleFileSpecification file = new OracleFileSpecification(); - for (;;) { + for (; ; ) { SQLExpr fileName = this.exprParser.expr(); file.getFileNames().add(fileName); @@ -1490,7 +1488,7 @@ private SQLStatement parseAlterTable() { SQLAlterTableStatement stmt = new SQLAlterTableStatement(getDbType()); stmt.setName(this.exprParser.name()); - for (;;) { + for (; ; ) { if (lexer.identifierEquals(FnvHash.Constants.ADD)) { lexer.nextToken(); @@ -1553,7 +1551,7 @@ private SQLStatement parseAlterTable() { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLColumnDefinition columnDef = this.exprParser.parseColumn(); item.addColumn(columnDef); if (lexer.token() == Token.COMMA) { @@ -1687,12 +1685,12 @@ private void parseAlterTableSplit(SQLAlterTableStatement stmt) { lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { NestedTablePartitionSpec spec = new NestedTablePartitionSpec(); accept(Token.PARTITION); spec.setPartition(this.exprParser.name()); - for (;;) { + for (; ; ) { if (lexer.token() == Token.TABLESPACE) { lexer.nextToken(); SQLName tablespace = this.exprParser.name(); @@ -1776,7 +1774,7 @@ public OracleLockTableStatement parseLock() { } else if (token == Token.EXCLUSIVE) { stmt.setLockMode(LockMode.EXCLUSIVE); lexer.nextToken(); - } else if(token == Token.ROW) { + } else if (token == Token.ROW) { lexer.nextToken(); token = lexer.token(); if (token == Token.SHARE) { @@ -1859,7 +1857,7 @@ public SQLStatement parseBlock() { } private void parserParameters(List parameters, SQLObject parent) { - for (;;) { + for (; ; ) { SQLParameter parameter = new SQLParameter(); parameter.setParent(parent); @@ -1929,11 +1927,11 @@ private void parserParameters(List parameters, SQLObject parent) { } dataType = new SQLDataTypeImpl(typeName); - } else if(lexer.token() == Token.LPAREN) { + } else if (lexer.token() == Token.LPAREN) { lexer.nextToken(); String typeName = name.toString(); - SQLIntegerExpr lenExpr = (SQLIntegerExpr)this.exprParser.expr(); + SQLIntegerExpr lenExpr = (SQLIntegerExpr) this.exprParser.expr(); int len = lenExpr.getNumber().intValue(); dataType = new SQLDataTypeImpl(typeName, len); accept(Token.RPAREN); @@ -1957,11 +1955,11 @@ private void parserParameters(List parameters, SQLObject parent) { lexer.nextToken(); String typeName = "VARRAY(" + len + ") OF NUMBER"; - if(lexer.token() == Token.LPAREN) { + if (lexer.token() == Token.LPAREN) { accept(Token.LPAREN); int numLen = this.exprParser.acceptInteger(); accept(Token.RPAREN); - typeName += "(" +numLen + ")"; + typeName += "(" + numLen + ")"; } dataType = new SQLDataTypeImpl(typeName); dataType.setDbType(dbType); @@ -2203,7 +2201,7 @@ private OracleExceptionStatement parseException() { accept(Token.EXCEPTION); OracleExceptionStatement stmt = new OracleExceptionStatement(); - for (;;) { + for (; ; ) { accept(Token.WHEN); OracleExceptionStatement.Item item = new OracleExceptionStatement.Item(); item.setWhen(this.exprParser.expr()); @@ -2231,7 +2229,7 @@ public OracleReturningClause parseReturningClause() { lexer.nextToken(); clause = new OracleReturningClause(); - for (;;) { + for (; ; ) { SQLExpr item = exprParser.expr(); clause.addItem(item); if (lexer.token() == Token.COMMA) { @@ -2241,7 +2239,7 @@ public OracleReturningClause parseReturningClause() { break; } accept(Token.INTO); - for (;;) { + for (; ; ) { SQLExpr item = exprParser.expr(); clause.addValue(item); if (lexer.token() == Token.COMMA) { @@ -2362,7 +2360,7 @@ public SQLStatement parseCreateDbLink() { lexer.nextToken(); accept(Token.BY); dbLink.setPassword(lexer.stringVal()); - + if (lexer.token() == Token.IDENTIFIER) { lexer.nextToken(); } else { @@ -2438,7 +2436,7 @@ public OracleCreateIndexStatement parseCreateIndex(boolean acceptCreate) { accept(Token.RPAREN); } - for (;;) { + for (; ; ) { this.getExprParser().parseSegmentAttributes(stmt); if (lexer.token() == Token.COMPUTE) { @@ -2488,7 +2486,7 @@ public OracleCreateIndexStatement parseCreateIndex(boolean acceptCreate) { lexer.nextToken(); stmt.setLocal(true); - for (;;) { + for (; ; ) { if (lexer.token() == Token.STORE) { lexer.nextToken(); accept(Token.IN); @@ -2573,7 +2571,7 @@ public SQLCreateSequenceStatement parseCreateSequence(boolean acceptCreate) { stmt.setDbType(DbType.oracle); stmt.setName(this.exprParser.name()); - for (;;) { + for (; ; ) { if (lexer.token() == Token.START) { lexer.nextToken(); accept(Token.WITH); @@ -2686,7 +2684,7 @@ public SQLCreateProcedureStatement parseCreateProcedure() { } else { String wrappedString = lexer.text.substring(lexer.pos()); stmt.setWrappedSource(wrappedString); - lexer.reset(lexer.text.length(),(char) LayoutCharacters.EOI, Token.EOF); + lexer.reset(lexer.text.length(), (char) LayoutCharacters.EOI, Token.EOF); } return stmt; } @@ -2761,9 +2759,8 @@ public SQLStatement parseCreatePackage() { } // this.parseStatementList(stmt.getStatements(), -1, stmt); - for (;;) { + for (; ; ) { if (lexer.token() == Token.IDENTIFIER) { - SQLDeclareStatement varDecl = new SQLDeclareStatement(); varDecl.setDbType(dbType); varDecl.setParent(stmt); @@ -2787,7 +2784,7 @@ public SQLStatement parseCreatePackage() { SQLRecordDataType recordDataType = new SQLRecordDataType(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLColumnDefinition column = this.exprParser.parseColumn(); recordDataType.addColumn(column); if (lexer.token() == Token.COMMA) { @@ -2966,7 +2963,7 @@ public SQLStatement parseCreateType() { } } - for (;;) { + for (; ; ) { if (lexer.token() == Token.NOT) { lexer.nextToken(); if (lexer.identifierEquals(FnvHash.Constants.FINAL)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleUpdateParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleUpdateParser.java index ea9e4257a1..750f48f938 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleUpdateParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleUpdateParser.java @@ -24,18 +24,17 @@ import com.alibaba.druid.sql.parser.Token; public class OracleUpdateParser extends SQLStatementParser { - public OracleUpdateParser(String sql) { super(new OracleExprParser(sql)); } - public OracleUpdateParser(Lexer lexer){ + public OracleUpdateParser(Lexer lexer) { super(new OracleExprParser(lexer)); } public OracleUpdateStatement parseUpdateStatement() { OracleUpdateStatement update = new OracleUpdateStatement(); - + if (lexer.token() == Token.UPDATE) { lexer.nextToken(); @@ -74,7 +73,7 @@ private void parseReturn(OracleUpdateStatement update) { if (lexer.token() == Token.RETURN || lexer.token() == Token.RETURNING) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLExpr item = this.exprParser.expr(); update.getReturning().add(item); @@ -88,7 +87,7 @@ private void parseReturn(OracleUpdateStatement update) { accept(Token.INTO); - for (;;) { + for (; ; ) { SQLExpr item = this.exprParser.expr(); update.addReturningInto(item); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTParameterizedVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTParameterizedVisitor.java index 4f3e7b1d90..c6f3553a84 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTParameterizedVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTParameterizedVisitor.java @@ -5,7 +5,7 @@ import java.util.List; -public class OracleASTParameterizedVisitor extends SQLASTParameterizedVisitor implements OracleASTVisitor { +public class OracleASTParameterizedVisitor extends SQLASTParameterizedVisitor implements OracleASTVisitor { public OracleASTParameterizedVisitor() { super(DbType.oracle); } 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 066700d5b6..9a1d3f6045 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 @@ -29,14 +29,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public interface OracleASTVisitor extends SQLASTVisitor { - - default void endVisit(OracleAnalytic x) { - } default void endVisit(OracleAnalyticWindowing x) { - } default void endVisit(OracleDeleteStatement x) { @@ -44,43 +40,33 @@ default void endVisit(OracleDeleteStatement x) { } default void endVisit(OracleIntervalExpr x) { - } default void endVisit(OracleOuterExpr x) { - } default void endVisit(OracleSelectJoin x) { - } default void endVisit(OracleSelectPivot x) { - } default void endVisit(OracleSelectPivot.Item x) { - } default void endVisit(OracleSelectRestriction.CheckOption x) { - } default void endVisit(OracleSelectRestriction.ReadOnly x) { - } default void endVisit(OracleSelectSubqueryTableSource x) { - } default void endVisit(OracleSelectUnPivot x) { - } default void endVisit(OracleUpdateStatement x) { - } default boolean visit(OracleAnalytic x) { @@ -140,7 +126,6 @@ default boolean visit(SampleClause x) { } default void endVisit(SampleClause x) { - } default boolean visit(OracleSelectTableReference x) { @@ -148,7 +133,6 @@ default boolean visit(OracleSelectTableReference x) { } default void endVisit(OracleSelectTableReference x) { - } default boolean visit(PartitionExtensionClause x) { @@ -156,7 +140,6 @@ default boolean visit(PartitionExtensionClause x) { } default void endVisit(PartitionExtensionClause x) { - } default boolean visit(OracleWithSubqueryEntry x) { @@ -164,7 +147,6 @@ default boolean visit(OracleWithSubqueryEntry x) { } default void endVisit(OracleWithSubqueryEntry x) { - } default boolean visit(SearchClause x) { @@ -172,7 +154,6 @@ default boolean visit(SearchClause x) { } default void endVisit(SearchClause x) { - } default boolean visit(CycleClause x) { @@ -180,7 +161,6 @@ default boolean visit(CycleClause x) { } default void endVisit(CycleClause x) { - } default boolean visit(OracleBinaryFloatExpr x) { @@ -188,7 +168,6 @@ default boolean visit(OracleBinaryFloatExpr x) { } default void endVisit(OracleBinaryFloatExpr x) { - } default boolean visit(OracleBinaryDoubleExpr x) { @@ -196,7 +175,6 @@ default boolean visit(OracleBinaryDoubleExpr x) { } default void endVisit(OracleBinaryDoubleExpr x) { - } default boolean visit(OracleCursorExpr x) { @@ -204,7 +182,6 @@ default boolean visit(OracleCursorExpr x) { } default void endVisit(OracleCursorExpr x) { - } default boolean visit(OracleIsSetExpr x) { @@ -212,7 +189,6 @@ default boolean visit(OracleIsSetExpr x) { } default void endVisit(OracleIsSetExpr x) { - } default boolean visit(ModelClause.ReturnRowsClause x) { @@ -220,7 +196,6 @@ default boolean visit(ModelClause.ReturnRowsClause x) { } default void endVisit(ModelClause.ReturnRowsClause x) { - } default boolean visit(ModelClause.MainModelClause x) { @@ -228,7 +203,6 @@ default boolean visit(ModelClause.MainModelClause x) { } default void endVisit(ModelClause.MainModelClause x) { - } default boolean visit(ModelClause.ModelColumnClause x) { @@ -236,7 +210,6 @@ default boolean visit(ModelClause.ModelColumnClause x) { } default void endVisit(ModelClause.ModelColumnClause x) { - } default boolean visit(ModelClause.QueryPartitionClause x) { @@ -244,7 +217,6 @@ default boolean visit(ModelClause.QueryPartitionClause x) { } default void endVisit(ModelClause.QueryPartitionClause x) { - } default boolean visit(ModelClause.ModelColumn x) { @@ -252,7 +224,6 @@ default boolean visit(ModelClause.ModelColumn x) { } default void endVisit(ModelClause.ModelColumn x) { - } default boolean visit(ModelClause.ModelRulesClause x) { @@ -260,7 +231,6 @@ default boolean visit(ModelClause.ModelRulesClause x) { } default void endVisit(ModelClause.ModelRulesClause x) { - } default boolean visit(ModelClause.CellAssignmentItem x) { @@ -268,7 +238,6 @@ default boolean visit(ModelClause.CellAssignmentItem x) { } default void endVisit(ModelClause.CellAssignmentItem x) { - } default boolean visit(ModelClause.CellAssignment x) { @@ -276,7 +245,6 @@ default boolean visit(ModelClause.CellAssignment x) { } default void endVisit(ModelClause.CellAssignment x) { - } default boolean visit(ModelClause x) { @@ -284,7 +252,6 @@ default boolean visit(ModelClause x) { } default void endVisit(ModelClause x) { - } default boolean visit(OracleReturningClause x) { @@ -292,7 +259,6 @@ default boolean visit(OracleReturningClause x) { } default void endVisit(OracleReturningClause x) { - } default boolean visit(OracleInsertStatement x) { @@ -308,7 +274,6 @@ default boolean visit(InsertIntoClause x) { } default void endVisit(InsertIntoClause x) { - } default boolean visit(OracleMultiInsertStatement x) { @@ -316,7 +281,6 @@ default boolean visit(OracleMultiInsertStatement x) { } default void endVisit(OracleMultiInsertStatement x) { - } default boolean visit(ConditionalInsertClause x) { @@ -324,7 +288,6 @@ default boolean visit(ConditionalInsertClause x) { } default void endVisit(ConditionalInsertClause x) { - } default boolean visit(ConditionalInsertClauseItem x) { @@ -332,7 +295,6 @@ default boolean visit(ConditionalInsertClauseItem x) { } default void endVisit(ConditionalInsertClauseItem x) { - } default boolean visit(OracleSelectQueryBlock x) { @@ -348,7 +310,6 @@ default boolean visit(OracleLockTableStatement x) { } default void endVisit(OracleLockTableStatement x) { - } default boolean visit(OracleAlterSessionStatement x) { @@ -356,7 +317,6 @@ default boolean visit(OracleAlterSessionStatement x) { } default void endVisit(OracleAlterSessionStatement x) { - } default boolean visit(OracleDatetimeExpr x) { @@ -364,7 +324,6 @@ default boolean visit(OracleDatetimeExpr x) { } default void endVisit(OracleDatetimeExpr x) { - } default boolean visit(OracleSysdateExpr x) { @@ -372,7 +331,6 @@ default boolean visit(OracleSysdateExpr x) { } default void endVisit(OracleSysdateExpr x) { - } default boolean visit(OracleExceptionStatement x) { @@ -380,7 +338,6 @@ default boolean visit(OracleExceptionStatement x) { } default void endVisit(OracleExceptionStatement x) { - } default boolean visit(OracleExceptionStatement.Item x) { @@ -388,7 +345,6 @@ default boolean visit(OracleExceptionStatement.Item x) { } default void endVisit(OracleExceptionStatement.Item x) { - } default boolean visit(OracleArgumentExpr x) { @@ -396,7 +352,6 @@ default boolean visit(OracleArgumentExpr x) { } default void endVisit(OracleArgumentExpr x) { - } default boolean visit(OracleSetTransactionStatement x) { @@ -404,7 +359,6 @@ default boolean visit(OracleSetTransactionStatement x) { } default void endVisit(OracleSetTransactionStatement x) { - } default boolean visit(OracleExplainStatement x) { @@ -412,7 +366,6 @@ default boolean visit(OracleExplainStatement x) { } default void endVisit(OracleExplainStatement x) { - } default boolean visit(OracleAlterTableDropPartition x) { @@ -420,7 +373,6 @@ default boolean visit(OracleAlterTableDropPartition x) { } default void endVisit(OracleAlterTableDropPartition x) { - } default boolean visit(OracleAlterTableTruncatePartition x) { @@ -428,7 +380,6 @@ default boolean visit(OracleAlterTableTruncatePartition x) { } default void endVisit(OracleAlterTableTruncatePartition x) { - } default boolean visit(OracleAlterTableSplitPartition.TableSpaceItem x) { @@ -436,7 +387,6 @@ default boolean visit(OracleAlterTableSplitPartition.TableSpaceItem x) { } default void endVisit(OracleAlterTableSplitPartition.TableSpaceItem x) { - } default boolean visit(OracleAlterTableSplitPartition.UpdateIndexesClause x) { @@ -444,7 +394,6 @@ default boolean visit(OracleAlterTableSplitPartition.UpdateIndexesClause x) { } default void endVisit(OracleAlterTableSplitPartition.UpdateIndexesClause x) { - } default boolean visit(OracleAlterTableSplitPartition.NestedTablePartitionSpec x) { @@ -452,7 +401,6 @@ default boolean visit(OracleAlterTableSplitPartition.NestedTablePartitionSpec x) } default void endVisit(OracleAlterTableSplitPartition.NestedTablePartitionSpec x) { - } default boolean visit(OracleAlterTableSplitPartition x) { @@ -460,7 +408,6 @@ default boolean visit(OracleAlterTableSplitPartition x) { } default void endVisit(OracleAlterTableSplitPartition x) { - } default boolean visit(OracleAlterTableModify x) { @@ -468,7 +415,6 @@ default boolean visit(OracleAlterTableModify x) { } default void endVisit(OracleAlterTableModify x) { - } default boolean visit(OracleCreateIndexStatement x) { @@ -484,7 +430,6 @@ default boolean visit(OracleForStatement x) { } default void endVisit(OracleForStatement x) { - } default boolean visit(OracleRangeExpr x) { @@ -492,7 +437,6 @@ default boolean visit(OracleRangeExpr x) { } default void endVisit(OracleRangeExpr x) { - } default boolean visit(OraclePrimaryKey x) { @@ -500,7 +444,6 @@ default boolean visit(OraclePrimaryKey x) { } default void endVisit(OraclePrimaryKey x) { - } default boolean visit(OracleCreateTableStatement x) { @@ -516,7 +459,6 @@ default boolean visit(OracleStorageClause x) { } default void endVisit(OracleStorageClause x) { - } default boolean visit(OracleGotoStatement x) { @@ -524,7 +466,6 @@ default boolean visit(OracleGotoStatement x) { } default void endVisit(OracleGotoStatement x) { - } default boolean visit(OracleLabelStatement x) { @@ -532,7 +473,6 @@ default boolean visit(OracleLabelStatement x) { } default void endVisit(OracleLabelStatement x) { - } default boolean visit(OracleAlterTriggerStatement x) { @@ -540,7 +480,6 @@ default boolean visit(OracleAlterTriggerStatement x) { } default void endVisit(OracleAlterTriggerStatement x) { - } default boolean visit(OracleAlterSynonymStatement x) { @@ -548,7 +487,6 @@ default boolean visit(OracleAlterSynonymStatement x) { } default void endVisit(OracleAlterSynonymStatement x) { - } default boolean visit(OracleAlterViewStatement x) { @@ -556,7 +494,6 @@ default boolean visit(OracleAlterViewStatement x) { } default void endVisit(OracleAlterViewStatement x) { - } default boolean visit(OracleAlterTableMoveTablespace x) { @@ -564,7 +501,6 @@ default boolean visit(OracleAlterTableMoveTablespace x) { } default void endVisit(OracleAlterTableMoveTablespace x) { - } default boolean visit(OracleFileSpecification x) { @@ -572,7 +508,6 @@ default boolean visit(OracleFileSpecification x) { } default void endVisit(OracleFileSpecification x) { - } default boolean visit(OracleAlterTablespaceAddDataFile x) { @@ -580,7 +515,6 @@ default boolean visit(OracleAlterTablespaceAddDataFile x) { } default void endVisit(OracleAlterTablespaceAddDataFile x) { - } default boolean visit(OracleAlterTablespaceStatement x) { @@ -588,7 +522,6 @@ default boolean visit(OracleAlterTablespaceStatement x) { } default void endVisit(OracleAlterTablespaceStatement x) { - } default boolean visit(OracleExitStatement x) { @@ -596,7 +529,6 @@ default boolean visit(OracleExitStatement x) { } default void endVisit(OracleExitStatement x) { - } default boolean visit(OracleContinueStatement x) { @@ -604,7 +536,6 @@ default boolean visit(OracleContinueStatement x) { } default void endVisit(OracleContinueStatement x) { - } default boolean visit(OracleRaiseStatement x) { @@ -612,7 +543,6 @@ default boolean visit(OracleRaiseStatement x) { } default void endVisit(OracleRaiseStatement x) { - } default boolean visit(OracleCreateDatabaseDbLinkStatement x) { @@ -620,7 +550,6 @@ default boolean visit(OracleCreateDatabaseDbLinkStatement x) { } default void endVisit(OracleCreateDatabaseDbLinkStatement x) { - } default boolean visit(OracleDropDbLinkStatement x) { @@ -628,7 +557,6 @@ default boolean visit(OracleDropDbLinkStatement x) { } default void endVisit(OracleDropDbLinkStatement x) { - } default boolean visit(OracleDataTypeIntervalYear x) { @@ -636,7 +564,6 @@ default boolean visit(OracleDataTypeIntervalYear x) { } default void endVisit(OracleDataTypeIntervalYear x) { - } default boolean visit(OracleDataTypeIntervalDay x) { @@ -644,7 +571,6 @@ default boolean visit(OracleDataTypeIntervalDay x) { } default void endVisit(OracleDataTypeIntervalDay x) { - } default boolean visit(OracleUsingIndexClause x) { @@ -652,7 +578,6 @@ default boolean visit(OracleUsingIndexClause x) { } default void endVisit(OracleUsingIndexClause x) { - } default boolean visit(OracleLobStorageClause x) { @@ -660,7 +585,6 @@ default boolean visit(OracleLobStorageClause x) { } default void endVisit(OracleLobStorageClause x) { - } default boolean visit(OracleUnique x) { @@ -692,7 +616,6 @@ default boolean visit(OracleSupplementalIdKey x) { } default void endVisit(OracleSupplementalIdKey x) { - } default boolean visit(OracleSupplementalLogGrp x) { @@ -700,7 +623,6 @@ default boolean visit(OracleSupplementalLogGrp x) { } default void endVisit(OracleSupplementalLogGrp x) { - } default boolean visit(OracleCreateTableStatement.Organization x) { @@ -708,7 +630,6 @@ default boolean visit(OracleCreateTableStatement.Organization x) { } default void endVisit(OracleCreateTableStatement.Organization x) { - } default boolean visit(OracleCreateTableStatement.OIDIndex x) { @@ -716,7 +637,6 @@ default boolean visit(OracleCreateTableStatement.OIDIndex x) { } default void endVisit(OracleCreateTableStatement.OIDIndex x) { - } default boolean visit(OracleCreatePackageStatement x) { @@ -724,7 +644,6 @@ default boolean visit(OracleCreatePackageStatement x) { } default void endVisit(OracleCreatePackageStatement x) { - } default boolean visit(OracleExecuteImmediateStatement x) { @@ -732,7 +651,6 @@ default boolean visit(OracleExecuteImmediateStatement x) { } default void endVisit(OracleExecuteImmediateStatement x) { - } default boolean visit(OracleTreatExpr x) { @@ -740,7 +658,6 @@ default boolean visit(OracleTreatExpr x) { } default void endVisit(OracleTreatExpr x) { - } default boolean visit(OracleCreateSynonymStatement x) { @@ -748,7 +665,6 @@ default boolean visit(OracleCreateSynonymStatement x) { } default void endVisit(OracleCreateSynonymStatement x) { - } default boolean visit(OracleCreateTypeStatement x) { @@ -756,7 +672,6 @@ default boolean visit(OracleCreateTypeStatement x) { } default void endVisit(OracleCreateTypeStatement x) { - } default boolean visit(OraclePipeRowStatement x) { @@ -764,7 +679,6 @@ default boolean visit(OraclePipeRowStatement x) { } default void endVisit(OraclePipeRowStatement x) { - } default boolean visit(OracleIsOfTypeExpr x) { @@ -772,7 +686,6 @@ default boolean visit(OracleIsOfTypeExpr x) { } default void endVisit(OracleIsOfTypeExpr x) { - } default boolean visit(OracleRunStatement x) { @@ -780,7 +693,6 @@ default boolean visit(OracleRunStatement x) { } default void endVisit(OracleRunStatement x) { - } default boolean visit(OracleXmlColumnProperties x) { @@ -788,7 +700,6 @@ default boolean visit(OracleXmlColumnProperties x) { } default void endVisit(OracleXmlColumnProperties x) { - } default boolean visit(OracleXmlColumnProperties.OracleXMLTypeStorage x) { @@ -796,6 +707,5 @@ default boolean visit(OracleXmlColumnProperties.OracleXMLTypeStorage x) { } default void endVisit(OracleXmlColumnProperties.OracleXMLTypeStorage 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 47a8060e48..fb6ebf639d 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 @@ -18,5 +18,4 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; public class OracleASTVisitorAdapter extends SQLASTVisitorAdapter implements OracleASTVisitor { - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleEvalVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleEvalVisitor.java index f72234a882..18792f9390 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleEvalVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleEvalVisitor.java @@ -26,19 +26,18 @@ import java.util.Map; public class OracleEvalVisitor extends OracleASTVisitorAdapter implements SQLEvalVisitor { + private Map functions = new HashMap(); + private List parameters = new ArrayList(); - private Map functions = new HashMap(); - private List parameters = new ArrayList(); + private int variantIndex = -1; - private int variantIndex = -1; + private boolean markVariantIndex = true; - private boolean markVariantIndex = true; - - public OracleEvalVisitor(){ + public OracleEvalVisitor() { this(new ArrayList(1)); } - public OracleEvalVisitor(List parameters){ + public OracleEvalVisitor(List parameters) { this.parameters = parameters; } @@ -124,7 +123,7 @@ public Function getFunction(String funcName) { public void registerFunction(String funcName, Function function) { functions.put(funcName, function); } - + @Override public void unregisterFunction(String funcName) { functions.remove(funcName); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleExportParameterVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleExportParameterVisitor.java index bc2c585434..76060be7b9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleExportParameterVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleExportParameterVisitor.java @@ -29,14 +29,15 @@ import java.util.List; public class OracleExportParameterVisitor extends OracleParameterizedOutputVisitor implements ExportParameterVisitor { - /** * true= if require parameterized sql output */ private final boolean requireParameterizedOutput; - public OracleExportParameterVisitor(List parameters,Appendable appender,final boolean wantParameterizedOutput){ - super(appender,false); + public OracleExportParameterVisitor(List parameters, + Appendable appender, + final boolean wantParameterizedOutput) { + super(appender, false); this.parameters = parameters; this.requireParameterizedOutput = wantParameterizedOutput; } @@ -45,12 +46,12 @@ public OracleExportParameterVisitor() { this(new ArrayList()); } - public OracleExportParameterVisitor(List parameters){ - this(parameters,new StringBuilder(),false); + public OracleExportParameterVisitor(List parameters) { + this(parameters, new StringBuilder(), false); } public OracleExportParameterVisitor(final Appendable appender) { - this(new ArrayList(),appender,true); + this(new ArrayList(), appender, true); } public List getParameters() { @@ -59,7 +60,7 @@ public List getParameters() { @Override public boolean visit(SQLSelectItem x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -67,7 +68,7 @@ public boolean visit(SQLSelectItem x) { @Override public boolean visit(SQLOrderBy x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -75,7 +76,7 @@ public boolean visit(SQLOrderBy x) { @Override public boolean visit(SQLSelectGroupByClause x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -83,17 +84,17 @@ public boolean visit(SQLSelectGroupByClause x) { @Override public boolean visit(SQLMethodInvokeExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } - + ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getArguments()); return true; } @Override public boolean visit(SQLInListExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getTargetList()); @@ -102,7 +103,7 @@ public boolean visit(SQLInListExpr x) { @Override public boolean visit(SQLBetweenExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParameter(this.parameters, x); @@ -110,7 +111,7 @@ public boolean visit(SQLBetweenExpr x) { } public boolean visit(SQLBinaryOpExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParameter(this.parameters, 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 16ebda9391..b236b54985 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 @@ -42,17 +42,17 @@ import java.util.List; public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleASTVisitor { - private final boolean printPostSemi; + { this.dbType = DbType.oracle; } - public OracleOutputVisitor(Appendable appender){ + public OracleOutputVisitor(Appendable appender) { this(appender, true); } - public OracleOutputVisitor(Appendable appender, boolean printPostSemi){ + public OracleOutputVisitor(Appendable appender, boolean printPostSemi) { super(appender); this.printPostSemi = printPostSemi; } @@ -71,7 +71,7 @@ private void printHints(List hints) { public boolean visit(OracleAnalytic x) { print0(ucase ? "(" : "("); - + boolean space = false; if (x.getPartitionBy().size() > 0) { print0(ucase ? "PARTITION BY " : "partition by "); @@ -102,7 +102,7 @@ public boolean visit(OracleAnalytic x) { } print(')'); - + return false; } @@ -120,7 +120,7 @@ public boolean visit(OracleAnalyticWindowing x) { print0(ucase ? " BETWEEN " : " between "); betweenExpr.getBeginExpr().accept(this); print(' '); - print0(ucase ? beginBound.name : beginBound.name_lower); + print0(ucase ? beginBound.name : beginBound.nameLCase); print0(ucase ? " AND " : " and "); betweenExpr.getEndExpr().accept(this); return false; @@ -132,8 +132,6 @@ public boolean visit(OracleAnalyticWindowing x) { return false; } - - public boolean visit(OracleDeleteStatement x) { print0(ucase ? "DELETE " : "delete "); @@ -266,7 +264,7 @@ public boolean visit(OracleSelectJoin x) { } println(); - print0(ucase ? x.getJoinType().name : x.getJoinType().name_lcase); + print0(ucase ? x.getJoinType().name : x.getJoinType().nameLCase); print(' '); if (right instanceof SQLJoinTableSource) { @@ -599,7 +597,7 @@ public boolean visit(OracleSelectUnPivot x) { public boolean visit(OracleUpdateStatement x) { print0(ucase ? "UPDATE " : "update "); - + if (x.getHints().size() > 0) { printAndAccept(x.getHints(), ", "); print(' '); @@ -962,16 +960,16 @@ public boolean visit(OracleReturningClause x) { @Override public boolean visit(OracleInsertStatement x) { //visit((SQLInsertStatement) x); - + print0(ucase ? "INSERT " : "insert "); - + if (x.getHints().size() > 0) { printAndAccept(x.getHints(), ", "); print(' '); } print0(ucase ? "INTO " : "into "); - + x.getTableSource().accept(this); printInsertColumns(x.getColumns()); @@ -2338,7 +2336,6 @@ public boolean visit(OracleUsingIndexClause x) { print0(ucase ? "REVERSE" : "reverse"); } - return false; } @@ -2348,7 +2345,6 @@ public boolean visit(OracleLobStorageClause x) { printAndAccept(x.getItems(), ","); print0(ucase ? ") STORE AS" : ") store as"); - if (x.isSecureFile()) { print0(ucase ? " SECUREFILE" : " securefile"); } @@ -2510,7 +2506,6 @@ public boolean visit(OracleSupplementalLogGrp x) { } public boolean visit(OracleCreateTableStatement.Organization x) { - String type = x.getType(); print0(ucase ? "ORGANIZATION " : "organization "); @@ -2752,7 +2747,7 @@ public boolean visit(OracleCreateTypeStatement x) { && ((OracleFunctionDataType) dataType).getBlock() != null) { // skip println(); - } else if (dataType instanceof OracleProcedureDataType + } else if (dataType instanceof OracleProcedureDataType && ((OracleProcedureDataType) dataType).getBlock() != null) { // skip println(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java index 46064f1282..c8b80aac33 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java @@ -20,18 +20,17 @@ import com.alibaba.druid.sql.visitor.VisitorFeature; public class OracleParameterizedOutputVisitor extends OracleOutputVisitor implements ParameterizedVisitor { - - public OracleParameterizedOutputVisitor(){ + public OracleParameterizedOutputVisitor() { this(new StringBuilder()); this.config(VisitorFeature.OutputParameterized, true); } - public OracleParameterizedOutputVisitor(Appendable appender){ + public OracleParameterizedOutputVisitor(Appendable appender) { super(appender); this.config(VisitorFeature.OutputParameterized, true); } - public OracleParameterizedOutputVisitor(Appendable appender, boolean printPostSemi){ + public OracleParameterizedOutputVisitor(Appendable appender, boolean printPostSemi) { super(appender, printPostSemi); this.config(VisitorFeature.OutputParameterized, true); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleRowNumToLimit.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleRowNumToLimit.java index 3983fc4670..ae3275359b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleRowNumToLimit.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleRowNumToLimit.java @@ -4,13 +4,7 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLLimit; import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr; -import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; -import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; +import com.alibaba.druid.sql.ast.expr.*; import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectQueryBlock; import com.alibaba.druid.util.FnvHash; @@ -155,7 +149,6 @@ public boolean visit(SQLUnionQuery x) { x.getRight().accept(this); } - if (x.getLeft() instanceof SQLSelectQueryBlock && x.getRight() instanceof SQLSelectQueryBlock) { if (x.getOperator() == SQLUnionOperator.MINUS) { boolean eqNonLimit; @@ -229,7 +222,7 @@ public boolean visit(SQLUnionQuery x) { } } } - } else if (x.getOperator() == SQLUnionOperator.INTERSECT) { + } else if (x.getOperator() == SQLUnionOperator.INTERSECT) { boolean eqNonLimit; { SQLSelectQueryBlock left = (SQLSelectQueryBlock) x.getLeft().clone(); @@ -273,7 +266,6 @@ public boolean visit(SQLUnionQuery x) { limit.setOffset(SQLIntegerExpr.greatst((SQLIntegerExpr) leftOffset, (SQLIntegerExpr) rightOffset)); } - SQLExpr rightRowCount = rightLimit.getRowCount(); SQLExpr leftRowCount = leftLimit.getRowCount(); @@ -372,7 +364,6 @@ public boolean visit(SQLBinaryOpExpr x) { } return false; } else if (op == SQLBinaryOperator.GreaterThanOrEqual) { - if (SQLUtils.replaceInParent(x, null)) { context.setOffset(decrement(right)); // 如果存在 offset, 重新计算 rowCount @@ -552,5 +543,4 @@ public static SQLExpr increment(SQLExpr x) { return new SQLBinaryOpExpr(x.clone(), SQLBinaryOperator.Add, new SQLIntegerExpr(1)); } - } 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 f7ff6397ce..1433b5f386 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 @@ -23,20 +23,18 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.*; import com.alibaba.druid.sql.ast.statement.*; -import com.alibaba.druid.sql.ast.statement.SQLMergeStatement.MergeInsertClause; -import com.alibaba.druid.sql.ast.statement.SQLMergeStatement.MergeUpdateClause; 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.clause.*; -import com.alibaba.druid.sql.dialect.oracle.ast.clause.ModelClause.*; -import com.alibaba.druid.sql.dialect.oracle.ast.expr.*; +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.OracleWithSubqueryEntry; +import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIsOfTypeExpr; +import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleOuterExpr; +import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleSysdateExpr; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.*; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleMultiInsertStatement.ConditionalInsertClause; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleMultiInsertStatement.ConditionalInsertClauseItem; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleMultiInsertStatement.InsertIntoClause; -import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectPivot.Item; -import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectRestriction.CheckOption; -import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectRestriction.ReadOnly; import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; @@ -48,16 +46,15 @@ import java.util.List; public class OracleSchemaStatVisitor extends SchemaStatVisitor implements OracleASTVisitor { - - public OracleSchemaStatVisitor(){ + public OracleSchemaStatVisitor() { this(new ArrayList()); } public OracleSchemaStatVisitor(SchemaRepository repository) { - super (repository); + super(repository); } - public OracleSchemaStatVisitor(List parameters){ + public OracleSchemaStatVisitor(List parameters) { super(DbType.oracle, parameters); } @@ -242,7 +239,6 @@ public boolean visit(OracleWithSubqueryEntry x) { @Override public boolean visit(InsertIntoClause x) { - if (x.getTableName() instanceof SQLName) { TableStat stat = getTableStat(x.getTableName()); stat.incrementInsertCount(); @@ -466,6 +462,7 @@ public boolean visit(OracleContinueStatement x) { public boolean visit(OracleRaiseStatement x) { return false; } + @Override public boolean visit(OracleCreateDatabaseDbLinkStatement x) { return false; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleToMySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleToMySqlOutputVisitor.java index 8c26ae250f..a11e16eb0b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleToMySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleToMySqlOutputVisitor.java @@ -25,12 +25,11 @@ import com.alibaba.druid.util.FnvHash; public class OracleToMySqlOutputVisitor extends OracleOutputVisitor { - - public OracleToMySqlOutputVisitor(Appendable appender, boolean printPostSemi){ + public OracleToMySqlOutputVisitor(Appendable appender, boolean printPostSemi) { super(appender, printPostSemi); } - public OracleToMySqlOutputVisitor(Appendable appender){ + public OracleToMySqlOutputVisitor(Appendable appender) { super(appender); } @@ -39,7 +38,7 @@ public boolean visit(OracleSelectQueryBlock x) { { if (x.getParent() instanceof SQLSelect) { SQLSelect select = (SQLSelect) x.getParent(); - if (select.getParent() instanceof SQLSelectStatement || select.getParent() instanceof SQLSubqueryTableSource) { + if (select.getParent() instanceof SQLSelectStatement || select.getParent() instanceof SQLSubqueryTableSource) { parentIsSelectStatment = true; } } @@ -50,7 +49,7 @@ public boolean visit(OracleSelectQueryBlock x) { } if (x.getWhere() instanceof SQLBinaryOpExpr // - && x.getFrom() instanceof SQLSubqueryTableSource // + && x.getFrom() instanceof SQLSubqueryTableSource // ) { int rownum; String ident; @@ -77,7 +76,7 @@ public boolean visit(OracleSelectQueryBlock x) { for (SQLSelectItem selectItem : queryBlock.getSelectList()) { if (isRowNumber(selectItem.getExpr())) { if (where.getLeft() instanceof SQLIdentifierExpr - && ((SQLIdentifierExpr) where.getLeft()).getName().equals(selectItem.getAlias())) { + && ((SQLIdentifierExpr) where.getLeft()).getName().equals(selectItem.getAlias())) { isSubQueryRowNumMapping = true; } } @@ -110,8 +109,7 @@ public boolean visit(OracleSelectQueryBlock x) { SQLBinaryOperator subOp = subWhere.getOperator(); if (isRowNumber(subWhere.getLeft()) // - && subWhere.getRight() instanceof SQLIntegerExpr) { - + && subWhere.getRight() instanceof SQLIntegerExpr) { int subRownum = ((SQLIntegerExpr) subWhere.getRight()).getNumber().intValue(); Integer offset = null; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/ast/PhoenixStatementImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/ast/PhoenixStatementImpl.java index 93022ec63b..64efd07de1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/ast/PhoenixStatementImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/ast/PhoenixStatementImpl.java @@ -24,7 +24,6 @@ * Created by wenshao on 16/9/14. */ public abstract class PhoenixStatementImpl extends SQLStatementImpl implements PhoenixObject { - public PhoenixStatementImpl() { super(DbType.phoenix); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/ast/PhoenixUpsertStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/ast/PhoenixUpsertStatement.java index ccca0f1b93..f8020b03f9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/ast/PhoenixUpsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/ast/PhoenixUpsertStatement.java @@ -21,9 +21,7 @@ * Created by wenshao on 16/9/14. */ public class PhoenixUpsertStatement extends PhoenixStatementImpl { - @Override public void accept0(PhoenixASTVisitor visitor) { - } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixExprParser.java index b5eaf421a7..30d60257c1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixExprParser.java @@ -23,13 +23,12 @@ * Created by wenshao on 16/9/13. */ public class PhoenixExprParser extends SQLExprParser { - public PhoenixExprParser(String sql, SQLParserFeature... features){ + public PhoenixExprParser(String sql, SQLParserFeature... features) { this(new PhoenixLexer(sql, features)); this.lexer.nextToken(); } - public PhoenixExprParser(Lexer lexer){ + public PhoenixExprParser(Lexer lexer) { super(lexer); } } - diff --git a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixLexer.java index fed8596b89..6a4dcdde93 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixLexer.java @@ -27,7 +27,7 @@ * Created by wenshao on 16/9/13. */ public class PhoenixLexer extends Lexer { - public final static Keywords DEFAULT_PHOENIX_KEYWORDS; + public static final Keywords DEFAULT_PHOENIX_KEYWORDS; static { Map map = new HashMap(); @@ -50,7 +50,7 @@ public class PhoenixLexer extends Lexer { DEFAULT_PHOENIX_KEYWORDS = new Keywords(map); } - public PhoenixLexer(String input, SQLParserFeature... features){ + public PhoenixLexer(String input, SQLParserFeature... features) { super(input); super.keywords = DEFAULT_PHOENIX_KEYWORDS; for (SQLParserFeature feature : features) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixStatementParser.java index fda1493903..36e52dec7f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixStatementParser.java @@ -27,20 +27,20 @@ */ public class PhoenixStatementParser extends SQLStatementParser { public PhoenixStatementParser(String sql) { - super (new PhoenixExprParser(sql)); + super(new PhoenixExprParser(sql)); } - public PhoenixStatementParser(Lexer lexer){ + public PhoenixStatementParser(Lexer lexer) { super(new PhoenixExprParser(lexer)); } @Override protected void parseInsertColumns(SQLInsertInto insert) { - if (lexer.token() == Token.RPAREN ) { + if (lexer.token() == Token.RPAREN) { return; } - for (;;) { + for (; ; ) { SQLName expr = this.exprParser.name(); expr.setParent(insert); insert.getColumns().add(expr); @@ -48,11 +48,11 @@ protected void parseInsertColumns(SQLInsertInto insert) { if (lexer.token() == Token.IDENTIFIER) { String text = lexer.stringVal(); if (text.equalsIgnoreCase("TINYINT") - || text.equalsIgnoreCase("BIGINT") - || text.equalsIgnoreCase("INTEGER") - || text.equalsIgnoreCase("DOUBLE") - || text.equalsIgnoreCase("DATE") - || text.equalsIgnoreCase("VARCHAR")) { + || text.equalsIgnoreCase("BIGINT") + || text.equalsIgnoreCase("INTEGER") + || text.equalsIgnoreCase("DOUBLE") + || text.equalsIgnoreCase("DATE") + || text.equalsIgnoreCase("VARCHAR")) { expr.getAttributes().put("dataType", text); lexer.nextToken(); } else if (text.equalsIgnoreCase("CHAR")) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/visitor/PhoenixOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/visitor/PhoenixOutputVisitor.java index af9d2fc037..597d367204 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/visitor/PhoenixOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/visitor/PhoenixOutputVisitor.java @@ -21,11 +21,11 @@ * Created by wenshao on 16/9/13. */ public class PhoenixOutputVisitor extends SQLASTOutputVisitor implements PhoenixASTVisitor { - public PhoenixOutputVisitor(Appendable appender){ + public PhoenixOutputVisitor(Appendable appender) { super(appender); } - public PhoenixOutputVisitor(Appendable appender, boolean parameterized){ + public PhoenixOutputVisitor(Appendable appender, boolean parameterized) { super(appender, parameterized); } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGSQLObject.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGSQLObject.java index 4994320788..0d3de67ac2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGSQLObject.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGSQLObject.java @@ -19,6 +19,5 @@ import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; public interface PGSQLObject extends SQLObject { - void accept0(PGASTVisitor visitor); } 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 8a520e410f..9caa3196dc 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 @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class PGSQLObjectImpl extends SQLObjectImpl implements PGSQLObject { - - public PGSQLObjectImpl(){ - + public PGSQLObjectImpl() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGBoxExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGBoxExpr.java index 9ac2aeb474..06dcef3de7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGBoxExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGBoxExpr.java @@ -24,7 +24,6 @@ import java.util.List; public class PGBoxExpr extends PGExprImpl implements SQLReplaceable { - private SQLExpr value; public PGBoxExpr clone() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGCidrExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGCidrExpr.java index e15af7522b..e44bed0888 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGCidrExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGCidrExpr.java @@ -24,7 +24,6 @@ import java.util.List; public class PGCidrExpr extends PGExprImpl implements SQLReplaceable { - private SQLExpr value; public PGCidrExpr clone() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGCircleExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGCircleExpr.java index 4d96793c01..c41eef0675 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGCircleExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGCircleExpr.java @@ -24,7 +24,6 @@ import java.util.List; public class PGCircleExpr extends PGExprImpl implements SQLReplaceable { - private SQLExpr value; public PGCircleExpr clone() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGDateField.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGDateField.java index 56070e3f08..aee36abe82 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGDateField.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGDateField.java @@ -37,4 +37,4 @@ public enum PGDateField { TIMEZONE_MINUTE, WEEK, YEAR -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExpr.java index f188e071d7..293d5b88fe 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExpr.java @@ -18,6 +18,5 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.dialect.postgresql.ast.PGSQLObject; -public interface PGExpr extends SQLExpr, PGSQLObject{ - +public interface PGExpr extends SQLExpr, PGSQLObject { } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExprImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExprImpl.java index 5e0bed49df..3fdbc45f36 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExprImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExprImpl.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; - public abstract class PGExprImpl extends SQLExprImpl implements PGExpr { - @Override public abstract void accept0(PGASTVisitor visitor); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExtractExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExtractExpr.java index f4adedbb48..bd35c24184 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExtractExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExtractExpr.java @@ -24,9 +24,8 @@ import java.util.List; public class PGExtractExpr extends PGExprImpl implements SQLReplaceable { - private PGDateField field; - private SQLExpr source; + private SQLExpr source; public PGExtractExpr clone() { PGExtractExpr x = new PGExtractExpr(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGInetExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGInetExpr.java index 390db38f5d..0c2e9016a7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGInetExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGInetExpr.java @@ -24,7 +24,6 @@ import java.util.List; public class PGInetExpr extends PGExprImpl implements SQLReplaceable { - private SQLExpr value; public PGInetExpr clone() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGLineSegmentsExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGLineSegmentsExpr.java index 561f0653b0..87d6f5ada2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGLineSegmentsExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGLineSegmentsExpr.java @@ -24,7 +24,6 @@ import java.util.List; public class PGLineSegmentsExpr extends PGExprImpl implements SQLReplaceable { - private SQLExpr value; public PGLineSegmentsExpr clone() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGMacAddrExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGMacAddrExpr.java index 45d6a57367..9dba2c60e5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGMacAddrExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGMacAddrExpr.java @@ -23,9 +23,7 @@ import java.util.Collections; import java.util.List; - public class PGMacAddrExpr extends PGExprImpl implements SQLReplaceable { - private SQLExpr value; public PGMacAddrExpr clone() { @@ -95,6 +93,4 @@ public boolean equals(Object obj) { } return true; } - } - diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGPointExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGPointExpr.java index c9fc9cdf1b..8135893c40 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGPointExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGPointExpr.java @@ -24,7 +24,6 @@ import java.util.List; public class PGPointExpr extends PGExprImpl implements SQLReplaceable { - private SQLExpr value; public PGPointExpr clone() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGPolygonExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGPolygonExpr.java index 0b2c698bd0..9c844640a1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGPolygonExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGPolygonExpr.java @@ -23,9 +23,7 @@ import java.util.Collections; import java.util.List; - public class PGPolygonExpr extends PGExprImpl implements SQLReplaceable { - private SQLExpr value; public PGPolygonExpr clone() { @@ -95,6 +93,4 @@ public boolean equals(Object obj) { } return true; } - } - diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGTypeCastExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGTypeCastExpr.java index 720c5fb5b1..23aa5f7f82 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGTypeCastExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGTypeCastExpr.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGTypeCastExpr extends SQLCastExpr implements PGExpr { - @Override public void accept0(PGASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGAlterSchemaStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGAlterSchemaStatement.java index 260169a019..5cfdafaa3c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGAlterSchemaStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGAlterSchemaStatement.java @@ -18,12 +18,10 @@ import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.statement.SQLAlterStatement; -import com.alibaba.druid.sql.ast.statement.SQLCreateStatement; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGAlterSchemaStatement extends SQLStatementImpl implements PGSQLStatement, SQLAlterStatement { - private SQLIdentifierExpr schemaName; private SQLIdentifierExpr newName; private SQLIdentifierExpr newOwner; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGAlterTableAlterColumnSetNotNull.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGAlterTableAlterColumnSetNotNull.java index 3ac9a9e514..f7a8e2caa6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGAlterTableAlterColumnSetNotNull.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGAlterTableAlterColumnSetNotNull.java @@ -15,7 +15,5 @@ */ package com.alibaba.druid.sql.dialect.postgresql.ast.stmt; - public class PGAlterTableAlterColumnSetNotNull { - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGConnectToStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGConnectToStatement.java index 8fe582bb17..7e89ffa792 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGConnectToStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGConnectToStatement.java @@ -1,15 +1,10 @@ package com.alibaba.druid.sql.dialect.postgresql.ast.stmt; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatementImpl; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; -import com.alibaba.druid.sql.dialect.postgresql.visitor.PGOutputVisitor; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -import com.alibaba.druid.util.JdbcConstants; public class PGConnectToStatement extends SQLStatementImpl implements PGSQLStatement { private SQLName target; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGCreateSchemaStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGCreateSchemaStatement.java index bbda90ebd5..9b3edc5ad1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGCreateSchemaStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGCreateSchemaStatement.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGCreateSchemaStatement extends SQLStatementImpl implements PGSQLStatement, SQLCreateStatement { - private SQLIdentifierExpr schemaName; private SQLIdentifierExpr userName; private boolean ifNotExists; 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 da62309652..46e59707be 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 @@ -21,11 +21,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGDeleteStatement extends SQLDeleteStatement implements PGSQLStatement { - - private boolean returning; + private boolean returning; public PGDeleteStatement() { - super (DbType.postgresql); + super(DbType.postgresql); } public boolean isReturning() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGDropSchemaStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGDropSchemaStatement.java index ea5003e9e2..a533f9f5d4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGDropSchemaStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGDropSchemaStatement.java @@ -17,13 +17,11 @@ import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.statement.SQLCreateStatement; import com.alibaba.druid.sql.ast.statement.SQLDropStatement; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGDropSchemaStatement extends SQLStatementImpl implements PGSQLStatement, SQLDropStatement { - private SQLIdentifierExpr schemaName; private boolean ifExists; private boolean cascade; 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 9d772326e3..309f601ef6 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,14 +27,12 @@ import java.util.List; public class PGFunctionTableSource extends SQLExprTableSource implements PGSQLObject { - private final List parameters = new ArrayList(); - public PGFunctionTableSource(){ - + public PGFunctionTableSource() { } - public PGFunctionTableSource(SQLExpr expr){ + public PGFunctionTableSource(SQLExpr expr) { this.expr = expr; } @@ -57,7 +55,6 @@ public void accept0(PGASTVisitor visitor) { @Override public PGFunctionTableSource clone() { - PGFunctionTableSource x = new PGFunctionTableSource(); x.setAlias(this.alias); 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 81d5928844..32457d1e79 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 @@ -28,17 +28,15 @@ import java.util.List; public class PGInsertStatement extends SQLInsertStatement implements PGSQLStatement { - - - private List valuesList = new ArrayList(); - private SQLExpr returning; - private boolean defaultValues = false; - - private List onConflictTarget; - private SQLName onConflictConstraint; - private SQLExpr onConflictWhere; - private SQLExpr onConflictUpdateWhere; - private boolean onConflictDoNothing; + private List valuesList = new ArrayList(); + private SQLExpr returning; + private boolean defaultValues; + + private List onConflictTarget; + private SQLName onConflictConstraint; + private SQLExpr onConflictWhere; + private SQLExpr onConflictUpdateWhere; + private boolean onConflictDoNothing; private List onConflictUpdateSetItems; public PGInsertStatement() { @@ -66,7 +64,6 @@ public void setReturning(SQLExpr returning) { this.returning = returning; } - public ValuesClause getValues() { if (valuesList.isEmpty()) { return null; @@ -92,15 +89,15 @@ public void addValueCause(ValuesClause valueClause) { } public boolean isDefaultValues() { - return defaultValues; - } + return defaultValues; + } - public void setDefaultValues(boolean defaultValues) { - this.defaultValues = defaultValues; - } + public void setDefaultValues(boolean defaultValues) { + this.defaultValues = defaultValues; + } - protected void accept0(SQLASTVisitor visitor) { - if(visitor instanceof PGASTVisitor) { + protected void accept0(SQLASTVisitor visitor) { + if (visitor instanceof PGASTVisitor) { accept0((PGASTVisitor) visitor); } else { super.accept0(visitor); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSQLStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSQLStatement.java index 86065670c9..c87c7ae8f8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSQLStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSQLStatement.java @@ -19,5 +19,4 @@ import com.alibaba.druid.sql.dialect.postgresql.ast.PGSQLObject; public interface PGSQLStatement extends SQLStatement, PGSQLObject { - } 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 94461ce8b7..688abc8015 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 @@ -17,7 +17,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.dialect.postgresql.ast.PGSQLObject; import com.alibaba.druid.sql.dialect.postgresql.ast.PGSQLObjectImpl; @@ -27,13 +26,12 @@ import java.util.ArrayList; import java.util.List; -public class PGSelectQueryBlock extends SQLSelectQueryBlock implements PGSQLObject{ - +public class PGSelectQueryBlock extends SQLSelectQueryBlock implements PGSQLObject { private List distinctOn = new ArrayList(2); - private FetchClause fetch; - private ForClause forClause; - private IntoOption intoOption; + private FetchClause fetch; + private ForClause forClause; + private IntoOption intoOption; public static enum IntoOption { TEMPORARY, TEMP, UNLOGGED @@ -103,12 +101,11 @@ public void setDistinctOn(List distinctOn) { } public static class FetchClause extends PGSQLObjectImpl { - public static enum Option { FIRST, NEXT } - private Option option; + private Option option; private SQLExpr count; public Option getOption() { @@ -138,15 +135,14 @@ public void accept0(PGASTVisitor visitor) { } public static class ForClause extends PGSQLObjectImpl { - public static enum Option { UPDATE, SHARE } private List of = new ArrayList(2); - private boolean noWait; - private boolean skipLocked; - private Option option; + private boolean noWait; + private boolean skipLocked; + private Option option; public Option getOption() { return option; @@ -189,6 +185,4 @@ public void accept0(PGASTVisitor visitor) { } } - - } 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 d1a97ac239..5272393cef 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 @@ -22,12 +22,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGSelectStatement extends SQLSelectStatement implements PGSQLStatement { - - public PGSelectStatement(){ + public PGSelectStatement() { super(DbType.postgresql); } - public PGSelectStatement(SQLSelect select){ + public PGSelectStatement(SQLSelect select) { super(select, DbType.postgresql); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGShowStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGShowStatement.java index 83f4cfe955..df0487ac69 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGShowStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGShowStatement.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGShowStatement extends SQLStatementImpl implements PGSQLStatement, SQLShowStatement { - private SQLExpr expr; public SQLExpr getExpr() { 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 d00506e11f..8f71e9cf54 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 @@ -21,11 +21,10 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class PGUpdateStatement extends SQLUpdateStatement implements PGSQLStatement { + private boolean only; - private boolean only = false; - - public PGUpdateStatement(){ - super (DbType.postgresql); + public PGUpdateStatement() { + super(DbType.postgresql); } public boolean isOnly() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGCreateTableParser.java index 6f60e7daba..80ce0f5580 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGCreateTableParser.java @@ -6,12 +6,11 @@ import com.alibaba.druid.sql.parser.*; public class PGCreateTableParser extends SQLCreateTableParser { - - public PGCreateTableParser(Lexer lexer){ + public PGCreateTableParser(Lexer lexer) { super(new PGExprParser(lexer)); } - public PGCreateTableParser(String sql){ + public PGCreateTableParser(String sql) { super(new PGExprParser(sql)); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java index 423c07c181..cfdd3dc16f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.*; -import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.*; import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.SQLExprParser; @@ -31,13 +30,12 @@ import java.util.Arrays; public class PGExprParser extends SQLExprParser { + public static final String[] AGGREGATE_FUNCTIONS; - public final static String[] AGGREGATE_FUNCTIONS; - - public final static long[] AGGREGATE_FUNCTIONS_CODES; + public static final long[] AGGREGATE_FUNCTIONS_CODES; static { - String[] strings = { "AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER","PERCENTILE_CONT", "PERCENTILE_DISC", "RANK", "DENSE_RANK","PERCENT_RANK","CUME_DIST" }; + String[] strings = {"AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM", "ROW_NUMBER", "PERCENTILE_CONT", "PERCENTILE_DISC", "RANK", "DENSE_RANK", "PERCENT_RANK", "CUME_DIST"}; AGGREGATE_FUNCTIONS_CODES = FnvHash.fnv1a_64_lower(strings, true); AGGREGATE_FUNCTIONS = new String[AGGREGATE_FUNCTIONS_CODES.length]; @@ -48,25 +46,25 @@ public class PGExprParser extends SQLExprParser { } } - public PGExprParser(String sql){ + public PGExprParser(String sql) { this(new PGLexer(sql)); this.lexer.nextToken(); this.dbType = DbType.postgresql; } - public PGExprParser(String sql, SQLParserFeature... features){ + public PGExprParser(String sql, SQLParserFeature... features) { this(new PGLexer(sql)); this.lexer.nextToken(); this.dbType = DbType.postgresql; } - public PGExprParser(Lexer lexer){ + public PGExprParser(Lexer lexer) { super(lexer); this.aggregateFunctions = AGGREGATE_FUNCTIONS; this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; this.dbType = DbType.postgresql; } - + @Override public SQLDataType parseDataType() { if (lexer.token() == Token.TYPE) { @@ -86,7 +84,7 @@ protected SQLDataType parseDataTypeRest(SQLDataType dataType) { return dataType; } - + public PGSelectParser createSelectParser() { return new PGSelectParser(this); } @@ -125,7 +123,7 @@ public SQLExpr primary() { lexer.nextToken(); SQLValuesExpr values = new SQLValuesExpr(); - for (;;) { + for (; ; ) { accept(Token.LPAREN); SQLListExpr listExpr = new SQLListExpr(); exprList(listExpr.getItems(), listExpr); @@ -148,7 +146,7 @@ public SQLExpr primary() { .select()); return queryExpr; } - + return super.primary(); } @@ -189,15 +187,15 @@ public SQLExpr primaryRest(SQLExpr expr) { if (lexer.token() == Token.COLONCOLON) { lexer.nextToken(); SQLDataType dataType = this.parseDataType(); - + PGTypeCastExpr castExpr = new PGTypeCastExpr(); - + castExpr.setExpr(expr); castExpr.setDataType(dataType); return primaryRest(castExpr); } - + if (lexer.token() == Token.LBRACKET) { SQLArrayExpr array = new SQLArrayExpr(); array.setExpr(expr); @@ -206,7 +204,7 @@ public SQLExpr primaryRest(SQLExpr expr) { accept(Token.RBRACKET); return primaryRest(array); } - + if (expr.getClass() == SQLIdentifierExpr.class) { SQLIdentifierExpr identifierExpr = (SQLIdentifierExpr) expr; String ident = identifierExpr.getName(); @@ -247,7 +245,6 @@ public SQLExpr primaryRest(SQLExpr expr) { accept(Token.LITERAL_CHARS); } - return primaryRest(timestamp); } else if (FnvHash.Constants.TIMESTAMPTZ == hash) { if (lexer.token() != Token.LITERAL_ALIAS // @@ -274,26 +271,25 @@ public SQLExpr primaryRest(SQLExpr expr) { accept(Token.LITERAL_CHARS); } - return primaryRest(timestamp); } else if (FnvHash.Constants.EXTRACT == hash) { accept(Token.LPAREN); - + PGExtractExpr extract = new PGExtractExpr(); - + String fieldName = lexer.stringVal(); PGDateField field = PGDateField.valueOf(fieldName.toUpperCase()); lexer.nextToken(); - + extract.setField(field); - + accept(Token.FROM); SQLExpr source = this.expr(); - + extract.setSource(source); - + accept(Token.RPAREN); - + return primaryRest(extract); } else if (FnvHash.Constants.POINT == hash) { switch (lexer.token()) { @@ -325,10 +321,10 @@ public SQLExpr primaryRest(SQLExpr expr) { macaddr.setValue(value); return primaryRest(macaddr); } else if (FnvHash.Constants.INET == hash) { - SQLExpr value = this.primary(); - PGInetExpr inet = new PGInetExpr(); - inet.setValue(value); - return primaryRest(inet); + SQLExpr value = this.primary(); + PGInetExpr inet = new PGInetExpr(); + inet.setValue(value); + return primaryRest(inet); } else if (FnvHash.Constants.CIDR == hash) { SQLExpr value = this.primary(); PGCidrExpr cidr = new PGCidrExpr(); @@ -369,14 +365,14 @@ protected String alias() { } // 某些关键字在alias时,不作为关键字,仍然是作用为别名 switch (lexer.token()) { - case INTERSECT: - // 具体可以参考SQLParser::alias()的方法实现 - alias = lexer.stringVal(); - lexer.nextToken(); - return alias; - // TODO other cases - default: - break; + case INTERSECT: + // 具体可以参考SQLParser::alias()的方法实现 + alias = lexer.stringVal(); + lexer.nextToken(); + return alias; + // TODO other cases + default: + break; } return alias; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java index 31d66d7cd7..b0bbd7d6fa 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java @@ -25,8 +25,7 @@ import static com.alibaba.druid.sql.parser.Token.LITERAL_CHARS; public class PGLexer extends Lexer { - - public final static Keywords DEFAULT_PG_KEYWORDS; + public static final Keywords DEFAULT_PG_KEYWORDS; static { Map map = new HashMap(); @@ -58,10 +57,10 @@ public class PGLexer extends Lexer { map.put("SHARE", Token.SHARE); map.put("SHOW", Token.SHOW); map.put("START", Token.START); - + map.put("USING", Token.USING); map.put("WINDOW", Token.WINDOW); - + map.put("TRUE", Token.TRUE); map.put("FALSE", Token.FALSE); map.put("ARRAY", Token.ARRAY); @@ -76,7 +75,7 @@ public class PGLexer extends Lexer { DEFAULT_PG_KEYWORDS = new Keywords(map); } - public PGLexer(String input, SQLParserFeature... features){ + public PGLexer(String input, SQLParserFeature... features) { super(input, true); this.keepComments = true; super.keywords = DEFAULT_PG_KEYWORDS; @@ -85,12 +84,12 @@ public PGLexer(String input, SQLParserFeature... features){ config(feature, true); } } - + protected void scanString() { mark = pos; boolean hasSpecial = false; - for (;;) { + for (; ; ) { if (isEOF()) { lexError("unclosed.str.lit"); return; @@ -176,7 +175,7 @@ protected void scanString() { stringVal = new String(buf, 0, bufPos); } } - + public void scanSharp() { scanChar(); if (ch == '>') { @@ -214,7 +213,7 @@ protected void scanVariable_at() { return; } - for (;;) { + for (; ; ) { ch = charAt(++pos); if (!isIdentifierChar(ch)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java index e882861a66..de4da43ee3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java @@ -35,16 +35,16 @@ public class PGSQLStatementParser extends SQLStatementParser { public PGSQLStatementParser(PGExprParser parser) { super(parser); } - - public PGSQLStatementParser(String sql){ + + public PGSQLStatementParser(String sql) { super(new PGExprParser(sql)); } - public PGSQLStatementParser(String sql, SQLParserFeature... features){ + public PGSQLStatementParser(String sql, SQLParserFeature... features) { super(new PGExprParser(sql, features)); } - public PGSQLStatementParser(Lexer lexer){ + public PGSQLStatementParser(Lexer lexer) { super(new PGExprParser(lexer)); } @@ -77,7 +77,7 @@ public SQLUpdateStatement parseUpdateStatement() { if (lexer.token() == Token.RETURNING) { lexer.nextToken(); - for (;;) { + for (; ; ) { udpateStatement.getReturning().add(this.exprParser.expr()); if (lexer.token() == Token.COMMA) { lexer.nextToken(); @@ -110,11 +110,11 @@ public PGInsertStatement parseInsert() { } } - + if (lexer.token() == Token.DEFAULT) { - lexer.nextToken(); - accept(Token.VALUES); - stmt.setDefaultValues(true); + lexer.nextToken(); + accept(Token.VALUES); + stmt.setDefaultValues(true); } if (lexer.token() == (Token.LPAREN)) { @@ -126,7 +126,7 @@ public PGInsertStatement parseInsert() { if (lexer.token() == (Token.VALUES)) { lexer.nextToken(); - for (;;) { + for (; ; ) { accept(Token.LPAREN); SQLInsertStatement.ValuesClause valuesCaluse = new SQLInsertStatement.ValuesClause(); this.exprParser.exprList(valuesCaluse.getValues(), valuesCaluse); @@ -180,7 +180,7 @@ public PGInsertStatement parseInsert() { accept(Token.UPDATE); accept(Token.SET); - for (;;) { + for (; ; ) { SQLUpdateSetItem item = this.exprParser.parseUpdateSetItem(); stmt.addConflicUpdateItem(item); @@ -324,14 +324,14 @@ public PGDeleteStatement parseDeleteStatement() { SQLName tableName = exprParser.name(); deleteStatement.setTableName(tableName); - + if (lexer.token() == Token.AS) { - accept(Token.AS); - } - if (lexer.token() == Token.IDENTIFIER) { - deleteStatement.setAlias(lexer.stringVal()); - lexer.nextToken(); - } + accept(Token.AS); + } + if (lexer.token() == Token.IDENTIFIER) { + deleteStatement.setAlias(lexer.stringVal()); + lexer.nextToken(); + } if (lexer.token() == Token.USING) { lexer.nextToken(); @@ -385,8 +385,6 @@ public boolean parseStatementListDialect(List statementList) { break; } - - return false; } @@ -485,22 +483,22 @@ protected SQLAlterTableAlterColumn parseAlterColumn() { } return alterColumn; } - + public SQLStatement parseShow() { accept(Token.SHOW); PGShowStatement stmt = new PGShowStatement(); switch (lexer.token()) { - case ALL: - stmt.setExpr(new SQLIdentifierExpr(Token.ALL.name())); - lexer.nextToken(); - break; - default: - stmt.setExpr(this.exprParser.expr()); - break; + case ALL: + stmt.setExpr(new SQLIdentifierExpr(Token.ALL.name())); + lexer.nextToken(); + break; + default: + stmt.setExpr(this.exprParser.expr()); + break; } return stmt; } - + @Override public SQLStatement parseCommit() { SQLCommitStatement stmt = new SQLCommitStatement(); @@ -526,7 +524,7 @@ public SQLStatement parseSet() { lexer.nextToken(); } - long hash = lexer.hash_lower(); + long hash = lexer.hashLCase(); String parameter = lexer.stringVal(); SQLExpr paramExpr; List values = new ArrayList(); @@ -571,8 +569,6 @@ public SQLStatement parseSet() { // value | 'value' | DEFAULT - - SQLExpr valueExpr; if (values.size() == 1) { valueExpr = values.get(0); @@ -641,7 +637,7 @@ public SQLCreateIndexStatement parseCreateIndex(boolean acceptCreate) { accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLSelectOrderByItem item = this.exprParser.parseSelectOrderByItem(); item.setParent(stmt); stmt.addItem(item); @@ -657,7 +653,7 @@ public SQLCreateIndexStatement parseCreateIndex(boolean acceptCreate) { lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { String optionName = lexer.stringVal(); accept(Token.IDENTIFIER); accept(Token.EQ); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSelectParser.java index 2899c712c4..f82519c67e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSelectParser.java @@ -24,23 +24,21 @@ import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGFunctionTableSource; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.IntoOption; -import com.alibaba.druid.sql.ast.statement.SQLValuesQuery; import com.alibaba.druid.sql.parser.*; import com.alibaba.druid.util.FnvHash; import java.util.List; public class PGSelectParser extends SQLSelectParser { - - public PGSelectParser(SQLExprParser exprParser){ + public PGSelectParser(SQLExprParser exprParser) { super(exprParser); } - public PGSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache){ + public PGSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache) { super(exprParser, selectListCache); } - public PGSelectParser(String sql){ + public PGSelectParser(String sql) { this(new PGExprParser(sql)); } @@ -86,7 +84,7 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { if (lexer.token() == Token.ON) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLExpr expr = this.createExprParser().expr(); queryBlock.getDistinctOn().add(expr); if (lexer.token() == Token.COMMA) { @@ -140,7 +138,7 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { queryBlock.setOrderBy(this.createExprParser().parseOrderBy()); - for (;;) { + for (; ; ) { if (lexer.token() == Token.LIMIT) { SQLLimit limit = new SQLLimit(); @@ -217,7 +215,7 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { } if (lexer.token() == Token.OF) { - for (;;) { + for (; ; ) { SQLExpr expr = this.createExprParser().expr(); forClause.getOf().add(expr); if (lexer.token() == Token.COMMA) { @@ -232,7 +230,7 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { if (lexer.token() == Token.NOWAIT) { lexer.nextToken(); forClause.setNoWait(true); - } else if (lexer.identifierEquals(FnvHash.Constants.SKIP)) { + } else if (lexer.identifierEquals(FnvHash.Constants.SKIP)) { lexer.nextToken(); acceptIdentifier("LOCKED"); forClause.setSkipLocked(true); @@ -261,7 +259,7 @@ public SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { if (alias != null) { functionTableSource.setAlias(alias); } - + lexer.nextToken(); parserParameters(functionTableSource.getParameters()); accept(Token.RPAREN); @@ -278,7 +276,7 @@ public SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { } private void parserParameters(List parameters) { - for (;;) { + for (; ; ) { SQLParameter parameter = new SQLParameter(); parameter.setName(this.exprParser.name()); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitor.java index 78fb10ded2..6481c34c3a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitor.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public interface PGASTVisitor extends SQLASTVisitor { - default void endVisit(PGSelectQueryBlock x) { endVisit((SQLSelectQueryBlock) x); } @@ -52,7 +51,8 @@ default boolean visit(PGDeleteStatement x) { return true; } - default void endVisit(PGInsertStatement x) {} + default void endVisit(PGInsertStatement x) { + } default boolean visit(PGInsertStatement x) { return true; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitorAdapter.java index 7aaf25c4df..a39fbaccb3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitorAdapter.java @@ -22,43 +22,35 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; public class PGASTVisitorAdapter extends SQLASTVisitorAdapter implements PGASTVisitor { - @Override public void endVisit(FetchClause x) { - } @Override public boolean visit(FetchClause x) { - return true; } @Override public void endVisit(ForClause x) { - } @Override public boolean visit(ForClause x) { - return true; } @Override public void endVisit(PGDeleteStatement x) { - } @Override public boolean visit(PGDeleteStatement x) { - return true; } @Override public void endVisit(PGInsertStatement x) { - } @Override @@ -68,7 +60,6 @@ public boolean visit(PGInsertStatement x) { @Override public void endVisit(PGUpdateStatement x) { - } @Override @@ -78,109 +69,98 @@ public boolean visit(PGUpdateStatement x) { @Override public void endVisit(PGFunctionTableSource x) { - } @Override public boolean visit(PGFunctionTableSource x) { return true; } - - @Override - public boolean visit(PGTypeCastExpr x) { - return true; - } - - @Override - public void endVisit(PGTypeCastExpr x) { - - } + + @Override + public boolean visit(PGTypeCastExpr x) { + return true; + } + + @Override + public void endVisit(PGTypeCastExpr x) { + } @Override public void endVisit(PGExtractExpr x) { - } - + @Override public boolean visit(PGExtractExpr x) { return true; } - + @Override public void endVisit(PGBoxExpr x) { - } - + @Override public boolean visit(PGBoxExpr x) { return true; } - + @Override public void endVisit(PGPointExpr x) { - } - + @Override public boolean visit(PGPointExpr x) { return true; } - + @Override public void endVisit(PGMacAddrExpr x) { - } - + @Override public boolean visit(PGMacAddrExpr x) { return true; } - + @Override public void endVisit(PGInetExpr x) { - } - + @Override public boolean visit(PGInetExpr x) { return true; } - + @Override public void endVisit(PGCidrExpr x) { - } - + @Override public boolean visit(PGCidrExpr x) { return true; } - + @Override public void endVisit(PGPolygonExpr x) { - } - + @Override public boolean visit(PGPolygonExpr x) { return true; } - + @Override public void endVisit(PGCircleExpr x) { - } - + @Override public boolean visit(PGCircleExpr x) { return true; } - + @Override public void endVisit(PGLineSegmentsExpr x) { - } - + @Override public boolean visit(PGLineSegmentsExpr x) { return true; @@ -188,9 +168,8 @@ public boolean visit(PGLineSegmentsExpr x) { @Override public void endVisit(PGShowStatement x) { - } - + @Override public boolean visit(PGShowStatement x) { return true; @@ -198,7 +177,6 @@ public boolean visit(PGShowStatement x) { @Override public void endVisit(PGStartTransactionStatement x) { - } @Override @@ -208,7 +186,6 @@ public boolean visit(PGStartTransactionStatement x) { @Override public void endVisit(PGConnectToStatement x) { - } @Override @@ -218,7 +195,6 @@ public boolean visit(PGConnectToStatement x) { @Override public void endVisit(PGCreateSchemaStatement x) { - } @Override @@ -228,7 +204,6 @@ public boolean visit(PGCreateSchemaStatement x) { @Override public void endVisit(PGDropSchemaStatement x) { - } @Override @@ -238,7 +213,6 @@ public boolean visit(PGDropSchemaStatement x) { @Override public void endVisit(PGAlterSchemaStatement x) { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGEvalVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGEvalVisitor.java index 62cafc6d2e..e452da35e0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGEvalVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGEvalVisitor.java @@ -26,19 +26,18 @@ import java.util.Map; public class PGEvalVisitor extends PGASTVisitorAdapter implements SQLEvalVisitor { + private Map functions = new HashMap(); + private List parameters = new ArrayList(); - private Map functions = new HashMap(); - private List parameters = new ArrayList(); + private int variantIndex = -1; - private int variantIndex = -1; + private boolean markVariantIndex = true; - private boolean markVariantIndex = true; - - public PGEvalVisitor(){ + public PGEvalVisitor() { this(new ArrayList(1)); } - public PGEvalVisitor(List parameters){ + public PGEvalVisitor(List parameters) { this.parameters = parameters; } @@ -124,7 +123,7 @@ public Function getFunction(String funcName) { public void registerFunction(String funcName, Function function) { functions.put(funcName, function); } - + @Override public void unregisterFunction(String funcName) { functions.remove(funcName); @@ -133,7 +132,7 @@ public void unregisterFunction(String funcName) { public boolean visit(SQLIdentifierExpr x) { return SQLEvalVisitorUtils.visit(this, x); } - + @Override public boolean visit(SQLBinaryExpr x) { return SQLEvalVisitorUtils.visit(this, x); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGExportParameterVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGExportParameterVisitor.java index bb2437d3c0..65ab5674d7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGExportParameterVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGExportParameterVisitor.java @@ -29,13 +29,14 @@ import java.util.List; public class PGExportParameterVisitor extends PGOutputVisitor implements ExportParameterVisitor { - /** * true= if require parameterized sql output */ private final boolean requireParameterizedOutput; - public PGExportParameterVisitor(final List parameters,final Appendable appender,final boolean wantParameterizedOutput){ + public PGExportParameterVisitor(final List parameters, + final Appendable appender, + final boolean wantParameterizedOutput) { super(appender, true); this.parameters = parameters; this.requireParameterizedOutput = wantParameterizedOutput; @@ -45,21 +46,21 @@ public PGExportParameterVisitor() { this(new ArrayList()); } - public PGExportParameterVisitor(final List parameters){ - this(parameters,new StringBuilder(),false); + public PGExportParameterVisitor(final List parameters) { + this(parameters, new StringBuilder(), false); } public PGExportParameterVisitor(final Appendable appender) { - this(new ArrayList(),appender,true); + this(new ArrayList(), appender, true); } - + public List getParameters() { return parameters; } @Override public boolean visit(SQLSelectItem x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -67,7 +68,7 @@ public boolean visit(SQLSelectItem x) { @Override public boolean visit(SQLOrderBy x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -75,7 +76,7 @@ public boolean visit(SQLOrderBy x) { @Override public boolean visit(SQLSelectGroupByClause x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -83,7 +84,7 @@ public boolean visit(SQLSelectGroupByClause x) { @Override public boolean visit(SQLMethodInvokeExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getArguments()); @@ -93,7 +94,7 @@ public boolean visit(SQLMethodInvokeExpr x) { @Override public boolean visit(SQLInListExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getTargetList()); @@ -103,7 +104,7 @@ public boolean visit(SQLInListExpr x) { @Override public boolean visit(SQLBetweenExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParameter(this.parameters, x); @@ -111,7 +112,7 @@ public boolean visit(SQLBetweenExpr x) { } public boolean visit(SQLBinaryOpExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParameter(this.parameters, x); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java index 55af4e95f5..0146d99773 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java @@ -39,13 +39,12 @@ import java.util.Set; public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor, OracleASTVisitor { - - public PGOutputVisitor(Appendable appender){ + public PGOutputVisitor(Appendable appender) { super(appender); this.dbType = DbType.postgresql; } - public PGOutputVisitor(Appendable appender, boolean parameterized){ + public PGOutputVisitor(Appendable appender, boolean parameterized) { super(appender, parameterized); this.dbType = DbType.postgresql; } @@ -91,7 +90,6 @@ public boolean visit(ForClause x) { return false; } - public boolean visit(PGSelectQueryBlock x) { if ((!isParameterized()) && isPrettyFormat() && x.hasBeforeComment()) { printlnComments(x.getBeforeCommentsDirect()); @@ -220,7 +218,7 @@ public boolean visit(SQLTruncateStatement x) { if (x.getCascade().booleanValue()) { print0(ucase ? " CASCADE" : " cascade"); } else { - print0(ucase ? " RESTRICT" : " restrict"); + print0(ucase ? " RESTRICT" : " restrict"); } } return false; @@ -459,14 +457,14 @@ public boolean visit(PGExtractExpr x) { print(')'); return false; } - + @Override public boolean visit(PGBoxExpr x) { print0(ucase ? "BOX " : "box "); x.getValue().accept(this); return false; } - + @Override public boolean visit(PGPointExpr x) { print0(ucase ? "POINT " : "point "); @@ -487,7 +485,7 @@ public boolean visit(PGInetExpr x) { x.getValue().accept(this); return false; } - + @Override public boolean visit(PGCidrExpr x) { print0("cidr "); @@ -724,7 +722,10 @@ public boolean visit(SQLGrantStatement x) { } /** **************************************************************************/ // for oracle to postsql - /** **************************************************************************/ + + /** + * + **************************************************************************/ public boolean visit(OracleSysdateExpr x) { print0(ucase ? "CURRENT_TIMESTAMP" : "CURRENT_TIMESTAMP"); @@ -1696,7 +1697,7 @@ public boolean visit(OracleCreateTypeStatement x) { && ((OracleFunctionDataType) dataType).getBlock() != null) { // skip println(); - } else if (dataType instanceof OracleProcedureDataType + } else if (dataType instanceof OracleProcedureDataType && ((OracleProcedureDataType) dataType).getBlock() != null) { // skip println(); @@ -2089,7 +2090,7 @@ public boolean visit(OracleSelectJoin x) { } println(); - print0(ucase ? x.getJoinType().name : x.getJoinType().name_lcase); + print0(ucase ? x.getJoinType().name : x.getJoinType().nameLCase); print(' '); if (right instanceof SQLJoinTableSource) { @@ -2434,7 +2435,6 @@ public boolean visit(SQLCreateIndexStatement x) { if (x.getUsing() != null) { print0(ucase ? " USING " : " using "); - ; print0(x.getUsing()); } print0(" ("); @@ -2452,10 +2452,10 @@ public boolean visit(SQLCreateIndexStatement x) { if (x.getIndexDefinition().hasOptions()) { SQLIndexOptions indexOptions = x.getIndexDefinition().getOptions(); if (indexOptions.getKeyBlockSize() != null || - indexOptions.getParserName() != null || - indexOptions.getAlgorithm() != null || - indexOptions.getLock() != null || - indexOptions.getOtherOptions().size() > 0) { + indexOptions.getParserName() != null || + indexOptions.getAlgorithm() != null || + indexOptions.getLock() != null || + indexOptions.getOtherOptions().size() > 0) { hasOptions = true; } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java index 140310fbe5..2dce1b67a8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java @@ -17,13 +17,10 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.ast.statement.SQLTableSource; -import com.alibaba.druid.sql.dialect.postgresql.ast.expr.*; +import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGTypeCastExpr; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.*; -import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.FetchClause; -import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.ForClause; import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; @@ -36,7 +33,7 @@ public PGSchemaStatVisitor() { } public PGSchemaStatVisitor(SchemaRepository repository) { - super (repository); + super(repository); } @Override @@ -85,7 +82,6 @@ public boolean visit(PGInsertStatement x) { x.putAttribute("_original_use_mode", getMode()); setMode(x, Mode.Insert); - SQLName tableName = x.getTableName(); { TableStat stat = getTableStat(tableName); @@ -100,7 +96,6 @@ public boolean visit(PGInsertStatement x) { @Override public void endVisit(PGSelectStatement x) { - } @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/presto/ast/stmt/PrestoSelectStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/presto/ast/stmt/PrestoSelectStatement.java index e26f9ab37f..45c3e9ccb7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/presto/ast/stmt/PrestoSelectStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/presto/ast/stmt/PrestoSelectStatement.java @@ -24,12 +24,11 @@ /** * presto 的 select语句 - * + *

* author zhangcanlong * date 2022/01/11 */ public class PrestoSelectStatement extends SQLSelectStatement implements SQLStatement { - public PrestoSelectStatement() { super(DbType.postgresql); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoExprParser.java index 47a6e0d688..8f8bacb11b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoExprParser.java @@ -24,19 +24,17 @@ * Created by wenshao on 16/9/13. */ public class PrestoExprParser extends SQLExprParser { - { dbType = DbType.presto; } - public PrestoExprParser(String sql, SQLParserFeature... features){ + public PrestoExprParser(String sql, SQLParserFeature... features) { this(new PrestoLexer(sql, features)); this.lexer.nextToken(); } - public PrestoExprParser(Lexer lexer){ + public PrestoExprParser(Lexer lexer) { super(lexer); } } - diff --git a/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoLexer.java index bdadd47718..ac247c003b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoLexer.java @@ -10,7 +10,7 @@ import java.util.Map; public class PrestoLexer extends Lexer { - public final static Keywords DEFAULT_PHOENIX_KEYWORDS; + public static final Keywords DEFAULT_PHOENIX_KEYWORDS; static { Map map = new HashMap(); @@ -38,7 +38,7 @@ public class PrestoLexer extends Lexer { dbType = DbType.presto; } - public PrestoLexer(String input, SQLParserFeature... features){ + public PrestoLexer(String input, SQLParserFeature... features) { super(input); super.keywords = DEFAULT_PHOENIX_KEYWORDS; for (SQLParserFeature feature : features) { @@ -46,4 +46,3 @@ public PrestoLexer(String input, SQLParserFeature... features){ } } } - diff --git a/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoSelectParser.java index dbdcbc529c..daf695e338 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoSelectParser.java @@ -30,12 +30,11 @@ /** * presto的 选择解析器 - * + *

* author zhangcanlong * date 2022/01/11 */ public class PrestoSelectParser extends SQLSelectParser { - public PrestoSelectParser(SQLExprParser exprParser) { super(exprParser); } @@ -152,10 +151,8 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { return this.queryRest(queryBlock, acceptUnion); } - @Override public void parseFetchClause(SQLSelectQueryBlock queryBlock) { - // 如果是presto，则先解析 offset 再解析limit if (this.lexer.identifierEquals(FnvHash.Constants.OFFSET) || this.lexer.token() == Token.OFFSET) { this.lexer.nextToken(); @@ -178,7 +175,6 @@ public void parseFetchClause(SQLSelectQueryBlock queryBlock) { return; } - if (this.lexer.token() == Token.FETCH) { this.lexer.nextToken(); if (this.lexer.token() == Token.FIRST || this.lexer.token() == Token.NEXT || this.lexer.identifierEquals(FnvHash.Constants.NEXT)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoStatementParser.java index 3bebcd9802..e8a27a6c8f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoStatementParser.java @@ -29,10 +29,10 @@ */ public class PrestoStatementParser extends SQLStatementParser { public PrestoStatementParser(String sql) { - super (new PrestoExprParser(sql)); + super(new PrestoExprParser(sql)); } - public PrestoStatementParser(Lexer lexer){ + public PrestoStatementParser(Lexer lexer) { super(new PrestoExprParser(lexer)); } @@ -50,11 +50,11 @@ public PGSelectStatement parseSelect() { @Override protected void parseInsertColumns(SQLInsertInto insert) { - if (lexer.token() == Token.RPAREN ) { + if (lexer.token() == Token.RPAREN) { return; } - for (;;) { + for (; ; ) { SQLName expr = this.exprParser.name(); expr.setParent(insert); insert.getColumns().add(expr); @@ -62,11 +62,11 @@ protected void parseInsertColumns(SQLInsertInto insert) { if (lexer.token() == Token.IDENTIFIER) { String text = lexer.stringVal(); if (text.equalsIgnoreCase("TINYINT") - || text.equalsIgnoreCase("BIGINT") - || text.equalsIgnoreCase("INTEGER") - || text.equalsIgnoreCase("DOUBLE") - || text.equalsIgnoreCase("DATE") - || text.equalsIgnoreCase("VARCHAR")) { + || text.equalsIgnoreCase("BIGINT") + || text.equalsIgnoreCase("INTEGER") + || text.equalsIgnoreCase("DOUBLE") + || text.equalsIgnoreCase("DATE") + || text.equalsIgnoreCase("VARCHAR")) { expr.getAttributes().put("dataType", text); lexer.nextToken(); } else if (text.equalsIgnoreCase("CHAR")) { 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 2003c721d5..399b1e3ab8 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 @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class SQLServerObjectImpl extends SQLObjectImpl implements SQLServerObject { - - public SQLServerObjectImpl(){ - + public SQLServerObjectImpl() { } @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerOutput.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerOutput.java index 3332fc8825..29cf728441 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerOutput.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerOutput.java @@ -24,10 +24,9 @@ import java.util.List; public class SQLServerOutput extends SQLServerObjectImpl { + protected SQLExprTableSource into; - protected SQLExprTableSource into; - - protected final List columns = new ArrayList(); + protected final List columns = new ArrayList(); protected final List selectList = new ArrayList(); 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 b702eaf496..8b5c2ef261 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 @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLServerSelectQueryBlock extends SQLSelectQueryBlock { - private SQLServerTop top; public SQLServerSelectQueryBlock() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerStatement.java index b86cd3d959..0a51948bfe 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerStatement.java @@ -18,5 +18,4 @@ import com.alibaba.druid.sql.ast.SQLStatement; public interface SQLServerStatement extends SQLStatement, SQLServerObject { - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerStatementImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerStatementImpl.java index 6ed0858776..74108bb3be 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerStatementImpl.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerStatementImpl.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public abstract class SQLServerStatementImpl extends SQLStatementImpl implements SQLServerStatement { - - public SQLServerStatementImpl(){ - + public SQLServerStatementImpl() { } @Override 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 31789e5886..0233a5b442 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,16 +20,14 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor; public class SQLServerTop extends SQLServerObjectImpl { - private SQLExpr expr; private boolean percent; private boolean withTies; - public SQLServerTop(){ - + 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/SQLServerExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/expr/SQLServerExpr.java index 8b64baadb4..a1564f1175 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/expr/SQLServerExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/expr/SQLServerExpr.java @@ -17,7 +17,5 @@ import com.alibaba.druid.sql.ast.SQLExpr; - public interface SQLServerExpr extends SQLExpr { - } 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 a991ef3638..b2a92233d3 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 @@ -31,7 +31,6 @@ import java.util.List; public class SQLServerObjectReferenceExpr extends SQLServerObjectImpl implements SQLServerExpr, SQLName { - private String server; private String database; private String schema; @@ -39,11 +38,10 @@ public class SQLServerObjectReferenceExpr extends SQLServerObjectImpl implements protected long schemaHashCode64; protected long hashCode64; - public SQLServerObjectReferenceExpr(){ - + public SQLServerObjectReferenceExpr() { } - public SQLServerObjectReferenceExpr(SQLExpr owner){ + public SQLServerObjectReferenceExpr(SQLExpr owner) { if (owner instanceof SQLIdentifierExpr) { this.database = ((SQLIdentifierExpr) owner).getName(); } else if (owner instanceof SQLPropertyExpr) { @@ -129,12 +127,12 @@ public void setSchema(String schema) { public SQLServerObjectReferenceExpr clone() { SQLServerObjectReferenceExpr x = new SQLServerObjectReferenceExpr(); - x.server = server; - x.database = database; - x.schema = schema; + x.server = server; + x.database = database; + x.schema = schema; x.schemaHashCode64 = schemaHashCode64; - x.hashCode64 = hashCode64; + x.hashCode64 = hashCode64; return x; } @@ -152,9 +150,9 @@ public long hashCode64() { if (hashCode64 == 0) { if (server == null) { hashCode64 = new SQLPropertyExpr( - new SQLPropertyExpr(server, database) - , schema) - .hashCode64(); + new SQLPropertyExpr(server, database), + schema + ).hashCode64(); } else { hashCode64 = new SQLPropertyExpr(database, schema) .hashCode64(); 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 48f1e29988..e51da0a18a 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 @@ -26,9 +26,8 @@ import java.util.List; public class SQLServerExecStatement extends SQLServerStatementImpl implements SQLServerStatement { - - private SQLName returnStatus; - private SQLName moduleName; + private SQLName returnStatus; + private SQLName moduleName; private List parameters = new ArrayList(); public SQLName getModuleName() { @@ -61,32 +60,36 @@ public void setReturnStatus(SQLName returnStatus) { } /** - * * @author zz [455910092@qq.com] */ - public static class SQLServerParameter extends SQLServerObjectImpl - { - private SQLExpr expr; - private boolean type;//sql server 支持参数只有input 和 output 两种 - public SQLExpr getExpr() { - return expr; - } - public void setExpr(SQLExpr expr) { - this.expr = expr; - } - public boolean getType() { - return type; - } - public void setType(boolean type) { - this.type = type; - } - @Override - public void accept0(SQLServerASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, expr); - } - visitor.endVisit(this); - - } + public static class SQLServerParameter extends SQLServerObjectImpl { + private SQLExpr expr; + //sql server 支持参数只有input 和 output 两种 + private boolean type; + + public SQLExpr getExpr() { + return expr; + } + + public void setExpr(SQLExpr expr) { + this.expr = expr; + } + + public boolean getType() { + return type; + } + + public void setType(boolean type) { + this.type = type; + } + + @Override + public void accept0(SQLServerASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, expr); + } + visitor.endVisit(this); + + } } } 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 cf030a10c3..4beb068a75 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 @@ -24,12 +24,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLServerInsertStatement extends SQLInsertStatement implements SQLServerObject { + private boolean defaultValues; - private boolean defaultValues; + private SQLServerTop top; - private SQLServerTop top; - - private SQLServerOutput output; + private SQLServerOutput output; public SQLServerInsertStatement() { dbType = DbType.sqlserver; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerRollbackStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerRollbackStatement.java index 7d4e9830cc..a9740b3995 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerRollbackStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerRollbackStatement.java @@ -22,8 +22,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLServerRollbackStatement extends SQLRollbackStatement implements SQLServerStatement { - - private boolean work = false; + private boolean work; private SQLExpr name; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerSetTransactionIsolationLevelStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerSetTransactionIsolationLevelStatement.java index 5fc893cfaa..736d52efb4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerSetTransactionIsolationLevelStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerSetTransactionIsolationLevelStatement.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor; public class SQLServerSetTransactionIsolationLevelStatement extends SQLServerStatementImpl implements SQLServerStatement { - private String level; @Override 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 d655da0605..47889aba0d 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,12 +24,11 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLServerUpdateStatement extends SQLUpdateStatement implements SQLServerStatement { - - private SQLServerTop top; + private SQLServerTop top; private SQLServerOutput output; - - public SQLServerUpdateStatement(){ - super (DbType.sqlserver); + + public SQLServerUpdateStatement() { + super(DbType.sqlserver); } public SQLServerTop getTop() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerWaitForStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerWaitForStatement.java index 26bead8adb..73f3548120 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerWaitForStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerWaitForStatement.java @@ -22,15 +22,14 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor; public class SQLServerWaitForStatement extends SQLServerStatementImpl implements SQLServerStatement { + private SQLExpr delay; - private SQLExpr delay; - - private SQLExpr time; + private SQLExpr time; private SQLStatement statement; - private SQLExpr timeout; - + private SQLExpr timeout; + @Override public void accept0(SQLServerASTVisitor visitor) { if (visitor.visit(this)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerExprParser.java index 0e63ca13da..ded6c46057 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerExprParser.java @@ -35,9 +35,9 @@ import java.util.List; public class SQLServerExprParser extends SQLExprParser { - public final static String[] AGGREGATE_FUNCTIONS; + public static final String[] AGGREGATE_FUNCTIONS; - public final static long[] AGGREGATE_FUNCTIONS_CODES; + public static final long[] AGGREGATE_FUNCTIONS_CODES; static { String[] strings = { @@ -59,27 +59,26 @@ public class SQLServerExprParser extends SQLExprParser { } } - public SQLServerExprParser(Lexer lexer){ + public SQLServerExprParser(Lexer lexer) { super(lexer); this.dbType = DbType.sqlserver; this.aggregateFunctions = AGGREGATE_FUNCTIONS; this.aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; } - public SQLServerExprParser(String sql){ + public SQLServerExprParser(String sql) { this(new SQLServerLexer(sql)); this.lexer.nextToken(); this.dbType = DbType.sqlserver; } - public SQLServerExprParser(String sql, SQLParserFeature... features){ + public SQLServerExprParser(String sql, SQLParserFeature... features) { this(new SQLServerLexer(sql, features)); this.lexer.nextToken(); this.dbType = DbType.sqlserver; } public SQLExpr primary() { - if (lexer.token() == Token.LBRACKET) { lexer.nextToken(); SQLExpr name = this.name(); @@ -188,14 +187,14 @@ public SQLServerTop parseTop() { return null; } - + protected SQLServerOutput parserOutput() { if (lexer.identifierEquals("OUTPUT")) { lexer.nextToken(); SQLServerOutput output = new SQLServerOutput(); final List selectList = output.getSelectList(); - for (;;) { + for (; ; ) { final SQLSelectItem selectItem = parseSelectItem(); selectList.add(selectItem); @@ -250,12 +249,12 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { SQLColumnDefinition.Identity identity = new SQLColumnDefinition.Identity(); if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - + SQLIntegerExpr seed = (SQLIntegerExpr) this.primary(); accept(Token.COMMA); SQLIntegerExpr increment = (SQLIntegerExpr) this.primary(); accept(Token.RPAREN); - + identity.setSeed((Integer) seed.getNumber()); identity.setIncrement((Integer) increment.getNumber()); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java index 08c418b4a8..3c6ca1593d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java @@ -24,14 +24,13 @@ import static com.alibaba.druid.sql.parser.Token.IDENTIFIER; public class SQLServerLexer extends Lexer { - - public final static Keywords DEFAULT_SQL_SERVER_KEYWORDS; + public static final Keywords DEFAULT_SQL_SERVER_KEYWORDS; static { Map map = new HashMap(); - + map.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords()); - + map.put("CURSOR", Token.CURSOR); map.put("TOP", Token.TOP); map.put("USE", Token.USE); @@ -51,24 +50,24 @@ public class SQLServerLexer extends Lexer { DEFAULT_SQL_SERVER_KEYWORDS = new Keywords(map); } - public SQLServerLexer(char[] input, int inputLength, boolean skipComment){ + public SQLServerLexer(char[] input, int inputLength, boolean skipComment) { super(input, inputLength, skipComment); super.keywords = DEFAULT_SQL_SERVER_KEYWORDS; } - public SQLServerLexer(String input){ + public SQLServerLexer(String input) { super(input); super.keywords = DEFAULT_SQL_SERVER_KEYWORDS; } - public SQLServerLexer(String input, SQLParserFeature... features){ + public SQLServerLexer(String input, SQLParserFeature... features) { super(input); super.keywords = DEFAULT_SQL_SERVER_KEYWORDS; for (SQLParserFeature feature : features) { config(feature, true); } } - + public void scanComment() { if (ch != '/' && ch != '-') { throw new IllegalStateException(); @@ -96,7 +95,7 @@ public void scanComment() { bufPos++; } - for (;;) { + for (; ; ) { if (ch == '*' && charAt(pos + 1) == '/') { bufPos += 2; scanChar(); @@ -131,7 +130,7 @@ public void scanComment() { scanChar(); bufPos++; - for (;;) { + for (; ; ) { if (ch == '\r') { if (charAt(pos + 1) == '\n') { bufPos += 2; @@ -161,14 +160,14 @@ public void scanComment() { addComment(stringVal); } endOfComment = isEOF(); - + if (!isAllowComment() && (isEOF() || !isSafeComment(stringVal))) { throw new NotAllowCommentException(); } return; } } - + protected void scanLBracket() { mark = pos; @@ -176,7 +175,7 @@ protected void scanLBracket() { buf = new char[32]; } - for (;;) { + for (; ; ) { if (isEOF()) { lexError("unclosed.str.lit"); return; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerSelectParser.java index 68db68a48c..10705b880b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerSelectParser.java @@ -24,16 +24,15 @@ import com.alibaba.druid.sql.parser.*; public class SQLServerSelectParser extends SQLSelectParser { - - public SQLServerSelectParser(String sql){ + public SQLServerSelectParser(String sql) { super(new SQLServerExprParser(sql)); } - public SQLServerSelectParser(SQLExprParser exprParser){ + public SQLServerSelectParser(SQLExprParser exprParser) { super(exprParser); } - public SQLServerSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache){ + public SQLServerSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache) { super(exprParser, selectListCache); } @@ -61,10 +60,10 @@ public SQLSelect select() { } else if (lexer.identifierEquals("XML")) { lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.identifierEquals("AUTO") // - || lexer.identifierEquals("TYPE") // - || lexer.identifierEquals("XMLSCHEMA") // + || lexer.identifierEquals("TYPE") // + || lexer.identifierEquals("XMLSCHEMA") // ) { select.getForXmlOptions().add(lexer.stringVal()); lexer.nextToken(); @@ -82,7 +81,7 @@ public SQLSelect select() { } else { break; } - + if (lexer.token() == Token.COMMA) { lexer.nextToken(); continue; @@ -94,18 +93,18 @@ public SQLSelect select() { throw new ParserException("syntax error, not support option : " + lexer.token() + ", " + lexer.info()); } } - + if (lexer.identifierEquals("OFFSET")) { lexer.nextToken(); SQLExpr offset = this.expr(); - + acceptIdentifier("ROWS"); select.setOffset(offset); - + if (lexer.token() == Token.FETCH) { lexer.nextToken(); acceptIdentifier("NEXT"); - + SQLExpr rowCount = expr(); acceptIdentifier("ROWS"); acceptIdentifier("ONLY"); @@ -180,7 +179,7 @@ public SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLExpr expr = this.expr(); SQLExprHint hint = new SQLExprHint(expr); hint.setParent(tableSource); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerStatementParser.java index f80be0d38a..fb07a3fb5f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerStatementParser.java @@ -30,12 +30,11 @@ import java.util.List; public class SQLServerStatementParser extends SQLStatementParser { - - public SQLServerStatementParser(String sql){ + public SQLServerStatementParser(String sql) { super(new SQLServerExprParser(sql)); } - public SQLServerStatementParser(String sql, SQLParserFeature... features){ + public SQLServerStatementParser(String sql, SQLParserFeature... features) { super(new SQLServerExprParser(sql, features)); } @@ -43,7 +42,7 @@ public SQLSelectParser createSQLSelectParser() { return new SQLServerSelectParser(this.exprParser, selectListCache); } - public SQLServerStatementParser(Lexer lexer){ + public SQLServerStatementParser(Lexer lexer) { super(new SQLServerExprParser(lexer)); } @@ -80,12 +79,12 @@ public boolean parseStatementListDialect(List statementList) { statementList.add(execStmt); return true; } - + if (lexer.token() == Token.DECLARE) { statementList.add(this.parseDeclare()); return true; } - + if (lexer.token() == Token.IF) { statementList.add(this.parseIf()); return true; @@ -95,7 +94,7 @@ public boolean parseStatementListDialect(List statementList) { statementList.add(this.parseBlock()); return true; } - + if (lexer.token() == Token.COMMIT) { statementList.add(this.parseCommit()); return true; @@ -113,11 +112,13 @@ public boolean parseStatementListDialect(List statementList) { statementList.add(stmt); return true; } - + return false; } + /** * SQLServer parse Parameter statement support out type + * * @author zz [455910092@qq.com] */ public void parseExecParameter(Collection exprCol, SQLObject parent) { @@ -150,16 +151,16 @@ public void parseExecParameter(Collection exprCol, SQLObject exprCol.add(param); } } - + public SQLStatement parseDeclare() { this.accept(Token.DECLARE); SQLDeclareStatement declareStatement = new SQLDeclareStatement(); - - for (;;) { - SQLDeclareItem item = new SQLDeclareItem(); + + for (; ; ) { + SQLDeclareItem item = new SQLDeclareItem(); declareStatement.addItem(item); - + item.setName(this.exprParser.name()); if (lexer.token() == Token.AS) { @@ -169,19 +170,19 @@ public SQLStatement parseDeclare() { if (lexer.token() == Token.TABLE) { lexer.nextToken(); item.setType(SQLDeclareItem.Type.TABLE); - + if (lexer.token() == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.token() == Token.IDENTIFIER // - || lexer.token() == Token.LITERAL_ALIAS) { + || lexer.token() == Token.LITERAL_ALIAS) { SQLColumnDefinition column = this.exprParser.parseColumn(); item.getTableElementList().add(column); } else if (lexer.token() == Token.PRIMARY // - || lexer.token() == Token.UNIQUE // - || lexer.token() == Token.CHECK // - || lexer.token() == Token.CONSTRAINT) { + || lexer.token() == Token.UNIQUE // + || lexer.token() == Token.CHECK // + || lexer.token() == Token.CONSTRAINT) { SQLConstraint constraint = this.exprParser.parseConstaint(); constraint.setParent(item); item.getTableElementList().add((SQLTableElement) constraint); @@ -241,7 +242,7 @@ public SQLStatement parseInsert() { protected void parseInsert0(SQLInsertInto insert, boolean acceptSubQuery) { SQLServerInsertStatement insertStatement = (SQLServerInsertStatement) insert; - + SQLServerTop top = this.getExprParser().parseTop(); if (top != null) { insertStatement.setTop(top); @@ -250,7 +251,7 @@ protected void parseInsert0(SQLInsertInto insert, boolean acceptSubQuery) { if (lexer.token() == Token.INTO) { lexer.nextToken(); } - + SQLName tableName = this.exprParser.name(); insertStatement.setTableName(tableName); @@ -270,7 +271,7 @@ protected void parseInsert0(SQLInsertInto insert, boolean acceptSubQuery) { this.exprParser.exprList(insertStatement.getColumns(), insertStatement); accept(Token.RPAREN); } - + SQLServerOutput output = this.getExprParser().parserOutput(); if (output != null) { insertStatement.setOutput(output); @@ -279,7 +280,7 @@ protected void parseInsert0(SQLInsertInto insert, boolean acceptSubQuery) { if (lexer.token() == Token.VALUES) { lexer.nextToken(); - for (;;) { + for (; ; ) { accept(Token.LPAREN); SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause(); this.exprParser.exprList(values.getValues(), values); @@ -290,7 +291,7 @@ protected void parseInsert0(SQLInsertInto insert, boolean acceptSubQuery) { lexer.skipToEOF(); break; } - + if (lexer.token() == Token.COMMA) { lexer.nextToken(); continue; @@ -326,7 +327,7 @@ public SQLUpdateStatement parseUpdateStatement() { udpateStatement.setTableSource(tableSource); parseUpdateSet(udpateStatement); - + SQLServerOutput output = this.getExprParser().parserOutput(); if (output != null) { udpateStatement.setOutput(output); @@ -345,12 +346,12 @@ public SQLUpdateStatement parseUpdateStatement() { return udpateStatement; } - + @Override public SQLServerExprParser getExprParser() { return (SQLServerExprParser) exprParser; } - + public SQLStatement parseSet() { accept(Token.SET); @@ -400,8 +401,7 @@ public SQLStatement parseSet() { SQLSetStatement stmt = new SQLSetStatement(); if (lexer.identifierEquals("IO") || lexer.identifierEquals("XML") || lexer.identifierEquals("PROFILE") - || lexer.identifierEquals("TIME")) { - + || lexer.identifierEquals("TIME")) { SQLExpr target = new SQLIdentifierExpr("STATISTICS " + lexer.stringVal().toUpperCase()); lexer.nextToken(); @@ -455,7 +455,7 @@ public SQLStatement parseSet() { return stmt; } } - + public SQLIfStatement parseIf() { accept(Token.IF); @@ -464,8 +464,8 @@ public SQLIfStatement parseIf() { stmt.setCondition(this.exprParser.expr()); this.parseStatementList(stmt.getStatements(), 1, stmt); - - if(lexer.token() == Token.SEMI) { + + if (lexer.token() == Token.SEMI) { lexer.nextToken(); } @@ -502,7 +502,7 @@ public SQLStatement parseBlock() { return block; } - + public SQLStatement parseCommit() { acceptIdentifier("COMMIT"); @@ -532,7 +532,7 @@ public SQLStatement parseCommit() { return stmt; } - + public SQLServerRollbackStatement parseRollback() { acceptIdentifier("ROLLBACK"); @@ -549,12 +549,11 @@ public SQLServerRollbackStatement parseRollback() { stmt.setName(this.exprParser.expr()); } - } return stmt; } - + public SQLServerWaitForStatement parseWaitFor() { acceptIdentifier("WAITFOR"); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/MSSQLServerExportParameterVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/MSSQLServerExportParameterVisitor.java index 26c82a902b..242024ad36 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/MSSQLServerExportParameterVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/MSSQLServerExportParameterVisitor.java @@ -28,13 +28,14 @@ import java.util.List; public class MSSQLServerExportParameterVisitor extends SQLServerOutputVisitor implements ExportParameterVisitor { - /** * true= if require parameterized sql output */ private final boolean requireParameterizedOutput; - public MSSQLServerExportParameterVisitor(final List parameters,final Appendable appender,final boolean wantParameterizedOutput){ + public MSSQLServerExportParameterVisitor(final List parameters, + final Appendable appender, + final boolean wantParameterizedOutput) { super(appender, true); this.parameters = parameters; this.requireParameterizedOutput = wantParameterizedOutput; @@ -44,21 +45,21 @@ public MSSQLServerExportParameterVisitor() { this(new ArrayList()); } - public MSSQLServerExportParameterVisitor(final List parameters){ - this(parameters,new StringBuilder(),false); + public MSSQLServerExportParameterVisitor(final List parameters) { + this(parameters, new StringBuilder(), false); } public MSSQLServerExportParameterVisitor(final Appendable appender) { - this(new ArrayList(),appender,true); + this(new ArrayList(), appender, true); } - + public List getParameters() { return parameters; } @Override public boolean visit(SQLSelectItem x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -66,7 +67,7 @@ public boolean visit(SQLSelectItem x) { @Override public boolean visit(SQLOrderBy x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -74,7 +75,7 @@ public boolean visit(SQLOrderBy x) { @Override public boolean visit(SQLSelectGroupByClause x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } return false; @@ -82,10 +83,10 @@ public boolean visit(SQLSelectGroupByClause x) { @Override public boolean visit(SQLMethodInvokeExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } - + ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getArguments()); return true; @@ -93,7 +94,7 @@ public boolean visit(SQLMethodInvokeExpr x) { @Override public boolean visit(SQLInListExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParamterAndAccept(this.parameters, x.getTargetList()); @@ -103,7 +104,7 @@ public boolean visit(SQLInListExpr x) { @Override public boolean visit(SQLBetweenExpr x) { - if(requireParameterizedOutput){ + if (requireParameterizedOutput) { return super.visit(x); } ExportParameterVisitorUtils.exportParameter(this.parameters, x); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerASTVisitor.java index 5a436bdfa6..64e064797e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerASTVisitor.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public interface SQLServerASTVisitor extends SQLASTVisitor { - default boolean visit(SQLServerSelectQueryBlock x) { return visit((SQLSelectQueryBlock) x); } @@ -39,18 +38,20 @@ default boolean visit(SQLServerTop x) { return true; } - default void endVisit(SQLServerTop x) {} - + default void endVisit(SQLServerTop x) { + } + default boolean visit(SQLServerObjectReferenceExpr x) { return true; } - - default void endVisit(SQLServerObjectReferenceExpr x) {} - + + default void endVisit(SQLServerObjectReferenceExpr x) { + } + default boolean visit(SQLServerInsertStatement x) { return visit((SQLInsertStatement) x); } - + default void endVisit(SQLServerInsertStatement x) { endVisit((SQLInsertStatement) x); } @@ -58,43 +59,50 @@ default void endVisit(SQLServerInsertStatement x) { default boolean visit(SQLServerUpdateStatement x) { return true; } - - default void endVisit(SQLServerUpdateStatement x) {} - + + default void endVisit(SQLServerUpdateStatement x) { + } + default boolean visit(SQLServerExecStatement x) { return true; } - - default void endVisit(SQLServerExecStatement x) {} - + + default void endVisit(SQLServerExecStatement x) { + } + default boolean visit(SQLServerSetTransactionIsolationLevelStatement x) { return true; } - default void endVisit(SQLServerSetTransactionIsolationLevelStatement x) {} + default void endVisit(SQLServerSetTransactionIsolationLevelStatement x) { + } default boolean visit(SQLServerOutput x) { return true; } - default void endVisit(SQLServerOutput x) {} + default void endVisit(SQLServerOutput x) { + } default boolean visit(SQLServerRollbackStatement x) { return true; } - default void endVisit(SQLServerRollbackStatement x) {} - + default void endVisit(SQLServerRollbackStatement x) { + } + default boolean visit(SQLServerWaitForStatement x) { return true; } - default void endVisit(SQLServerWaitForStatement x) {} - + default void endVisit(SQLServerWaitForStatement x) { + } + default boolean visit(SQLServerParameter x) { return true; } - default void endVisit(SQLServerParameter x) {} + default void endVisit(SQLServerParameter x) { + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerEvalVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerEvalVisitor.java index efd704b082..bc0a665d16 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerEvalVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerEvalVisitor.java @@ -26,19 +26,18 @@ import java.util.Map; public class SQLServerEvalVisitor extends SQLServerASTVisitorAdapter implements SQLEvalVisitor { + private Map functions = new HashMap(); + private List parameters = new ArrayList(); - private Map functions = new HashMap(); - private List parameters = new ArrayList(); + private int variantIndex = -1; - private int variantIndex = -1; + private boolean markVariantIndex = true; - private boolean markVariantIndex = true; - - public SQLServerEvalVisitor(){ + public SQLServerEvalVisitor() { this(new ArrayList(1)); } - public SQLServerEvalVisitor(List parameters){ + public SQLServerEvalVisitor(List parameters) { this.parameters = parameters; } @@ -81,7 +80,7 @@ public boolean visit(SQLIntegerExpr x) { public boolean visit(SQLNumberExpr x) { return SQLEvalVisitorUtils.visit(this, x); } - + @Override public boolean visit(SQLCaseExpr x) { return SQLEvalVisitorUtils.visit(this, x); @@ -124,12 +123,12 @@ public Function getFunction(String funcName) { public void registerFunction(String funcName, Function function) { functions.put(funcName, function); } - + @Override public void unregisterFunction(String funcName) { functions.remove(funcName); } - + public boolean visit(SQLIdentifierExpr x) { return SQLEvalVisitorUtils.visit(this, x); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java index aaa2f1f2fe..11c6c81db8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java @@ -33,12 +33,11 @@ import java.util.List; public class SQLServerOutputVisitor extends SQLASTOutputVisitor implements SQLServerASTVisitor { - - public SQLServerOutputVisitor(Appendable appender){ + public SQLServerOutputVisitor(Appendable appender) { super(appender, DbType.sqlserver); } - public SQLServerOutputVisitor(Appendable appender, boolean parameterized){ + public SQLServerOutputVisitor(Appendable appender, boolean parameterized) { super(appender, parameterized); this.dbType = DbType.sqlserver; } @@ -143,13 +142,13 @@ public boolean visit(SQLServerInsertStatement x) { x.getTop().accept(this); print(' '); } - + print0(ucase ? "INTO " : "into "); - + x.getTableSource().accept(this); printInsertColumns(x.getColumns()); - + if (x.getOutput() != null) { println(); x.getOutput().setParent(x); @@ -284,13 +283,13 @@ public boolean visit(SQLColumnDefinition x) { @Override public boolean visit(SQLServerExecStatement x) { print0(ucase ? "EXEC " : "exec "); - + SQLName returnStatus = x.getReturnStatus(); if (returnStatus != null) { returnStatus.accept(this); print0(" = "); } - + SQLName moduleName = x.getModuleName(); if (moduleName != null) { moduleName.accept(this); @@ -335,7 +334,7 @@ public boolean visit(SQLSetStatement x) { SQLExpr value = item.getValue(); if (value instanceof SQLIdentifierExpr && (((SQLIdentifierExpr) value).nameHashCode64() == FnvHash.Constants.ON - || ((SQLIdentifierExpr) value).nameHashCode64() == FnvHash.Constants.OFF)) { + || ((SQLIdentifierExpr) value).nameHashCode64() == FnvHash.Constants.OFF)) { print(' '); } else { print0(" = "); @@ -412,14 +411,14 @@ protected void printGrantOn(SQLGrantStatement x) { x.getResource().accept(this); } } - + public boolean visit(SQLSelect x) { super.visit(x); if (x.isForBrowse()) { println(); print0(ucase ? "FOR BROWSE" : "for browse"); } - + if (x.getForXmlOptionsSize() > 0) { println(); print0(ucase ? "FOR XML " : "for xml "); @@ -430,19 +429,19 @@ public boolean visit(SQLSelect x) { } } } - + if (x.getXmlPath() != null) { println(); print0(ucase ? "FOR XML " : "for xml "); x.getXmlPath().accept(this); } - + if (x.getOffset() != null) { println(); print0(ucase ? "OFFSET " : "offset "); x.getOffset().accept(this); print0(ucase ? " ROWS" : " rows"); - + if (x.getRowCount() != null) { print0(ucase ? " FETCH NEXT " : " fetch next "); x.getRowCount().accept(this); @@ -487,7 +486,7 @@ public boolean visit(SQLServerRollbackStatement x) { x.getName().accept(this); } } - + return false; } @@ -501,29 +500,29 @@ public boolean visit(SQLServerWaitForStatement x) { } else if (x.getTime() != null) { print0(ucase ? " TIME " : " time "); x.getTime().accept(this); - } if (x.getStatement() != null) { + } + if (x.getStatement() != null) { print0(ucase ? " DELAY " : " delay "); x.getStatement().accept(this); } - - if(x.getTimeout() != null) { + + if (x.getTimeout() != null) { print0(ucase ? " ,TIMEOUT " : " ,timeout "); x.getTimeout().accept(this); } - + return false; } - @Override - public boolean visit(SQLServerParameter x) { - // TODO Auto-generated method stub - x.getExpr().accept(this); - if(x.getType()) - { - print0(ucase ? " OUT" : " out"); - } - return false; - } + @Override + public boolean visit(SQLServerParameter x) { + // TODO Auto-generated method stub + x.getExpr().accept(this); + if (x.getType()) { + print0(ucase ? " OUT" : " out"); + } + return false; + } @Override public boolean visit(SQLStartTransactionStatement x) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerSchemaStatVisitor.java index b32d990e68..1472f21853 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerSchemaStatVisitor.java @@ -16,11 +16,7 @@ package com.alibaba.druid.sql.dialect.sqlserver.visitor; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; -import com.alibaba.druid.sql.ast.statement.SQLShowViewsStatement; import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerOutput; -import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock; import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop; import com.alibaba.druid.sql.dialect.sqlserver.ast.expr.SQLServerObjectReferenceExpr; import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.*; @@ -35,7 +31,7 @@ public SQLServerSchemaStatVisitor() { } public SQLServerSchemaStatVisitor(SchemaRepository repository) { - super (repository); + super(repository); } @Override @@ -85,8 +81,8 @@ public boolean visit(SQLServerWaitForStatement x) { return true; } - @Override - public boolean visit(SQLServerParameter x) { - return false; - } + @Override + public boolean visit(SQLServerParameter x) { + return false; + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLObject.java b/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLObject.java index 8ad15bd5ec..a9400928e4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLObject.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLObject.java @@ -18,5 +18,4 @@ import com.alibaba.druid.sql.ast.SQLObject; public interface TransactSQLObject extends SQLObject { - } diff --git a/src/main/java/com/alibaba/druid/sql/parser/CharTypes.java b/src/main/java/com/alibaba/druid/sql/parser/CharTypes.java index feab70d6ef..1f5591dc46 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/CharTypes.java +++ b/src/main/java/com/alibaba/druid/sql/parser/CharTypes.java @@ -18,8 +18,8 @@ import static com.alibaba.druid.sql.parser.LayoutCharacters.EOI; public class CharTypes { + private static final boolean[] hexFlags = new boolean[256]; - private final static boolean[] hexFlags = new boolean[256]; static { for (char c = 0; c < hexFlags.length; ++c) { if (c >= 'A' && c <= 'F') { @@ -40,7 +40,8 @@ public static boolean isDigit(char c) { return c >= '0' && c <= '9'; } - private final static boolean[] firstIdentifierFlags = new boolean[256]; + private static final boolean[] firstIdentifierFlags = new boolean[256]; + static { for (char c = 0; c < firstIdentifierFlags.length; ++c) { if (c >= 'A' && c <= 'Z') { @@ -61,8 +62,9 @@ public static boolean isFirstIdentifierChar(char c) { return c != '　' && c != '，'; } - private final static String[] stringCache = new String[256]; - private final static boolean[] identifierFlags = new boolean[256]; + private static final String[] stringCache = new String[256]; + private static final boolean[] identifierFlags = new boolean[256]; + static { for (char c = 0; c < identifierFlags.length; ++c) { if (c >= 'A' && c <= 'Z') { @@ -100,17 +102,18 @@ public static String valueOf(char ch) { return null; } - private final static boolean[] whitespaceFlags = new boolean[256]; + private static final boolean[] whitespaceFlags = new boolean[256]; + static { for (int i = 0; i <= 32; ++i) { whitespaceFlags[i] = true; } - + whitespaceFlags[EOI] = false; for (int i = 0x7F; i <= 0xA0; ++i) { whitespaceFlags[i] = true; } - + whitespaceFlags[160] = true; // 特别处理 // whitespaceFlags[223] = true; // 特别处理, odps // whitespaceFlags[229] = true; // 特别处理, odps @@ -122,7 +125,7 @@ public static String valueOf(char ch) { */ public static boolean isWhitespace(char c) { return (c <= whitespaceFlags.length && whitespaceFlags[c]) // - || c == '　'; // Chinese space + || c == '　'; // Chinese space } public static String trim(String value) { diff --git a/src/main/java/com/alibaba/druid/sql/parser/EOFParserException.java b/src/main/java/com/alibaba/druid/sql/parser/EOFParserException.java index 53de57818e..59e1e061b6 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/EOFParserException.java +++ b/src/main/java/com/alibaba/druid/sql/parser/EOFParserException.java @@ -17,8 +17,7 @@ @SuppressWarnings("serial") public class EOFParserException extends ParserException { - - public EOFParserException(){ + public EOFParserException() { super("EOF"); } } diff --git a/src/main/java/com/alibaba/druid/sql/parser/InsertColumnsCache.java b/src/main/java/com/alibaba/druid/sql/parser/InsertColumnsCache.java index dcda5d6f6e..f3d354fd95 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/InsertColumnsCache.java +++ b/src/main/java/com/alibaba/druid/sql/parser/InsertColumnsCache.java @@ -31,10 +31,10 @@ public class InsertColumnsCache { public ConcurrentMap cache = new ConcurrentHashMap(); - private final Entry[] buckets; - private final int indexMask; + private final Entry[] buckets; + private final int indexMask; - public InsertColumnsCache(int tableSize){ + public InsertColumnsCache(int tableSize) { this.indexMask = tableSize - 1; this.buckets = new Entry[tableSize]; } @@ -65,7 +65,7 @@ public boolean put(long hashCode64, String columnsString, String columnsFormatte return false; } - public final static class Entry { + public static final class Entry { public final long hashCode64; public final String columnsString; public final String columnsFormattedString; @@ -73,7 +73,11 @@ public final static class Entry { public final List columns; public final Entry next; - public Entry(long hashCode64, String columnsString, String columnsFormattedString, List columns, Entry next) { + public Entry(long hashCode64, + String columnsString, + String columnsFormattedString, + List columns, + Entry next) { this.hashCode64 = hashCode64; this.columnsString = columnsString; this.columnsFormattedString = columnsFormattedString; diff --git a/src/main/java/com/alibaba/druid/sql/parser/Keywords.java b/src/main/java/com/alibaba/druid/sql/parser/Keywords.java index 163b2e9af3..7a68455816 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Keywords.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Keywords.java @@ -25,16 +25,15 @@ * @author wenshao [szujobs@hotmail.com] */ public class Keywords { - private final Map keywords; private long[] hashArray; private Token[] tokens; - public final static Keywords DEFAULT_KEYWORDS; + public static final Keywords DEFAULT_KEYWORDS; - public final static Keywords SQLITE_KEYWORDS; - public final static Keywords DM_KEYWORDS; + public static final Keywords SQLITE_KEYWORDS; + public static final Keywords DM_KEYWORDS; static { Map map = new HashMap(); @@ -143,7 +142,7 @@ public class Keywords { map.put("WITH", Token.WITH); map.put("GRANT", Token.GRANT); map.put("REVOKE", Token.REVOKE); - + // MySql procedure: add by zz map.put("WHILE", Token.WHILE); map.put("DO", Token.DO); @@ -189,7 +188,7 @@ public boolean containsValue(Token token) { return this.keywords.containsValue(token); } - public Keywords(Map keywords){ + public Keywords(Map keywords) { this.keywords = keywords; this.hashArray = new long[keywords.size()]; @@ -207,13 +206,13 @@ public Keywords(Map keywords){ } } -public Token getKeyword(long hash) { - int index = Arrays.binarySearch(hashArray, hash); - if (index < 0) { - return null; + public Token getKeyword(long hash) { + int index = Arrays.binarySearch(hashArray, hash); + if (index < 0) { + return null; + } + return tokens[index]; } - return tokens[index]; -} public Token getKeyword(String key) { long k = FnvHash.fnv1a_64_lower(key); diff --git a/src/main/java/com/alibaba/druid/sql/parser/LayoutCharacters.java b/src/main/java/com/alibaba/druid/sql/parser/LayoutCharacters.java index d0ab2741b5..24f5eebbc4 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/LayoutCharacters.java +++ b/src/main/java/com/alibaba/druid/sql/parser/LayoutCharacters.java @@ -19,35 +19,34 @@ * @author wenshao [szujobs@hotmail.com] */ public interface LayoutCharacters { - /** * Tabulator column increment. */ - final static int TabInc = 8; + static final int TabInc = 8; /** * Tabulator character. */ - final static byte TAB = 0x8; + static final byte TAB = 0x8; /** * Line feed character. */ - final static byte LF = 0xA; + static final byte LF = 0xA; /** * Form feed character. */ - final static byte FF = 0xC; + static final byte FF = 0xC; /** * Carriage return character. */ - final static byte CR = 0xD; + static final byte CR = 0xD; /** * End of input character. Used as a sentinel to denote the character one beyond the last defined character in a * source file. */ - final static byte EOI = 0x1A; + static final byte EOI = 0x1A; } diff --git a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java index ff6e016d39..8505a8b395 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java @@ -40,52 +40,52 @@ public class Lexer { protected static SymbolTable symbols_l2 = new SymbolTable(512); - protected int features = 0; //SQLParserFeature.of(SQLParserFeature.EnableSQLBinaryOpExprGroup); - protected TimeZone timeZone; - public final String text; - protected int pos; - protected int mark; - protected int numberSale; - protected boolean numberExp; + protected int features; //SQLParserFeature.of(SQLParserFeature.EnableSQLBinaryOpExprGroup); + protected TimeZone timeZone; + public final String text; + protected int pos; + protected int mark; + protected int numberSale; + protected boolean numberExp; - protected char ch; + protected char ch; - protected char[] buf; - protected int bufPos; + protected char[] buf; + protected int bufPos; - protected Token token; + protected Token token; protected Keywords keywords = Keywords.DEFAULT_KEYWORDS; - protected String stringVal; - protected long hash_lower; // fnv1a_64 - protected long hash; + protected String stringVal; + protected long hashLCase; // fnv1a_64 + protected long hash; - protected int commentCount = 0; - protected List comments = null; - protected boolean skipComment = true; - private SavePoint savePoint = null; + protected int commentCount; + protected List comments; + protected boolean skipComment = true; + private SavePoint savePoint; /* * anti sql injection */ - private boolean allowComment = true; - private int varIndex = -1; + private boolean allowComment = true; + private int varIndex = -1; protected CommentHandler commentHandler; - protected boolean endOfComment = false; - protected boolean keepComments = false; - protected int line = 0; - protected int lines = 0; - protected DbType dbType; + protected boolean endOfComment; + protected boolean keepComments; + protected int line; + protected int lines; + protected DbType dbType; - protected boolean optimizedForParameterized = false; - protected boolean keepSourceLocation = false; + protected boolean optimizedForParameterized; + protected boolean keepSourceLocation; - protected int startPos; - protected int posLine; - protected int posColumn; + protected int startPos; + protected int posLine; + protected int posColumn; - public Lexer(String input){ + public Lexer(String input) { this(input, (CommentHandler) null); } @@ -93,12 +93,12 @@ public Lexer(String input){ // this(input, (CommentHandler) null, dbType); // } - public Lexer(String input, CommentHandler commentHandler){ + public Lexer(String input, CommentHandler commentHandler) { this(input, true); this.commentHandler = commentHandler; } - public Lexer(String input, CommentHandler commentHandler, DbType dbType){ + public Lexer(String input, CommentHandler commentHandler, DbType dbType) { this(input, true); this.commentHandler = commentHandler; this.dbType = dbType; @@ -177,13 +177,13 @@ public int nextVarIndex() { } public static class SavePoint { - int bp; + int bp; int startPos; - int sp; - int np; - char ch; + int sp; + int np; + char ch; long hash; - long hash_lower; + long hashLCase; public Token token; String stringVal; } @@ -207,12 +207,11 @@ public SavePoint markOut() { savePoint.token = token; savePoint.stringVal = stringVal; savePoint.hash = hash; - savePoint.hash_lower = hash_lower; + savePoint.hashLCase = hashLCase; savePoint.startPos = startPos; return savePoint; } - public void reset(SavePoint savePoint) { this.pos = savePoint.bp; this.bufPos = savePoint.sp; @@ -221,9 +220,10 @@ public void reset(SavePoint savePoint) { this.token = savePoint.token; this.stringVal = savePoint.stringVal; this.hash = savePoint.hash; - this.hash_lower = savePoint.hash_lower; + this.hashLCase = savePoint.hashLCase; this.startPos = savePoint.startPos; } + //出现多次调用mark()后调用reset()会有问题 @Deprecated public void reset() { @@ -235,7 +235,7 @@ public void reset(int pos) { this.ch = charAt(pos); } - public Lexer(String input, boolean skipComment){ + public Lexer(String input, boolean skipComment) { this.skipComment = skipComment; this.text = input; @@ -249,7 +249,7 @@ public Lexer(String input, boolean skipComment){ } } - public Lexer(char[] input, int inputLength, boolean skipComment){ + public Lexer(char[] input, int inputLength, boolean skipComment) { this(new String(input, 0, inputLength), skipComment); } @@ -507,7 +507,7 @@ public final void nextTokenValue() { return; } - if (ch == '-') { + if (ch == '-') { char next = charAt(pos + 1); if (next >= '0' && next <= '9') { bufPos = 0; @@ -602,7 +602,6 @@ public final void nextTokenNotOrNull() { scanChar(); } - if ((ch == 'n' || ch == 'N') && pos + 3 < text.length()) { char c1 = text.charAt(pos + 1); char c2 = text.charAt(pos + 2); @@ -661,7 +660,7 @@ public final void nextTokenIdent() { public final SQLType scanSQLType() { _loop: - for (;;) { + for (; ; ) { while (isWhitespace(ch)) { ch = charAt(++pos); } @@ -737,7 +736,7 @@ public final SQLType scanSQLType() { } long hashCode = FnvHash.BASIC; - for (;;) { + for (; ; ) { char c; if (ch >= 'a' && ch <= 'z') { c = ch; @@ -991,7 +990,6 @@ public final SQLType scanSQLType() { } public final SQLType scanSQLTypeV2() { - SQLType sqlType = scanSQLType(); if (sqlType == SQLType.CREATE) { nextToken(); @@ -1000,7 +998,7 @@ public final SQLType scanSQLTypeV2() { } _for: - for (int i = 0; i < 1000;++i) { + for (int i = 0; i < 1000; ++i) { switch (token) { case EOF: case ERROR: @@ -1072,7 +1070,7 @@ public final SQLType scanSQLTypeV2() { } else if (sqlType == SQLType.INSERT) { nextToken(); boolean overwrite = token == OVERWRITE; - for (int i = 0; i < 1000;++i) { + for (int i = 0; i < 1000; ++i) { nextToken(); if (token == SELECT) { @@ -1219,7 +1217,7 @@ public final void nextToken() { this.lines = 0; int startLine = line; - for (;;) { + for (; ; ) { if (isWhitespace(ch)) { if (ch == '\n') { line++; @@ -1408,7 +1406,7 @@ public final void nextToken() { scanVariable_at(); return; case '-': - char next = charAt(pos +1); + char next = charAt(pos + 1); if (next == '-') { scanComment(); if ((token == Token.LINE_COMMENT || token == Token.MULTI_LINE_COMMENT) && skipComment) { @@ -1710,7 +1708,7 @@ protected void scanString() { boolean hasSpecial = false; Token preToken = this.token; - for (;;) { + for (; ; ) { if (isEOF()) { lexError("unclosed.str.lit"); return; @@ -1805,7 +1803,7 @@ protected final void scanString2() { mark = pos; boolean hasSpecial = false; - for (;;) { + for (; ; ) { if (isEOF()) { lexError("unclosed.str.lit"); return; @@ -1821,7 +1819,6 @@ protected final void scanString2() { hasSpecial = true; } - switch (ch) { case '0': putChar('\0'); @@ -1851,13 +1848,13 @@ protected final void scanString2() { putChar((char) 0x1A); // ctrl + Z break; case '%': - if(dbType == DbType.mysql) { + if (dbType == DbType.mysql) { putChar('\\'); } putChar('%'); break; case '_': - if(dbType == DbType.mysql) { + if (dbType == DbType.mysql) { putChar('\\'); } putChar('_'); @@ -1984,7 +1981,7 @@ protected final void scanString2_d() { mark = pos; boolean hasSpecial = false; - for (;;) { + for (; ; ) { if (isEOF()) { lexError("unclosed.str.lit"); return; @@ -2000,7 +1997,6 @@ protected final void scanString2_d() { hasSpecial = true; } - switch (ch) { case '0': putChar('\0'); @@ -2030,13 +2026,13 @@ protected final void scanString2_d() { putChar((char) 0x1A); // ctrl + Z break; case '%': - if(dbType == DbType.mysql) { + if (dbType == DbType.mysql) { putChar('\\'); } putChar('%'); break; case '_': - if(dbType == DbType.mysql) { + if (dbType == DbType.mysql) { putChar('\\'); } putChar('_'); @@ -2139,7 +2135,7 @@ protected final void scanAlias() { //putChar(ch); putChar(ch); - for (;;) { + for (; ; ) { if (isEOF()) { lexError("unclosed.str.lit"); return; @@ -2257,7 +2253,7 @@ public void scanVariable() { bufPos++; boolean ident = false; - for (;;) { + for (; ; ) { ch = charAt(++pos); if (isEOF()) { pos--; @@ -2305,7 +2301,7 @@ public void scanVariable() { pos += 2; bufPos += 2; - for (;;) { + for (; ; ) { ch = charAt(++pos); if (ch == '}') { @@ -2337,7 +2333,7 @@ public void scanVariable() { return; } - for (;;) { + for (; ; ) { ch = charAt(++pos); if (!isIdentifierChar(ch)) { @@ -2369,7 +2365,7 @@ protected void scanVariable_at() { bufPos++; } - for (;;) { + for (; ; ) { ch = charAt(++pos); if (!isIdentifierChar(ch)) { @@ -2442,17 +2438,16 @@ protected final void scanHiveComment() { bufPos++; } - for (;;) { + for (; ; ) { if (ch == '*') { if (charAt(pos + 1) == '/') { - bufPos += 2; scanChar(); scanChar(); break; } else if (isWhitespace(charAt(pos + 1))) { int i = 2; - for (;i < 1024 * 1024;++i) { + for (; i < 1024 * 1024; ++i) { if (!isWhitespace(charAt(pos + i))) { break; } @@ -2466,7 +2461,6 @@ protected final void scanHiveComment() { } } - scanChar(); if (ch == EOI) { break; @@ -2505,7 +2499,7 @@ protected final void scanHiveComment() { scanChar(); bufPos++; - for (;;) { + for (; ; ) { if (ch == '\r') { if (charAt(pos + 1) == '\n') { line++; @@ -2555,7 +2549,7 @@ private void scanMultiLineComment() { mark = pos; bufPos = 0; - for (;;) { + for (; ; ) { if (ch == '/' && charAt(pos + 1) == '*') { scanChar(); scanChar(); @@ -2606,7 +2600,7 @@ private void scanSingleLineComment() { scanChar(); scanChar(); - for (;;) { + for (; ; ) { if (ch == '\r') { if (charAt(pos + 1) == '\n') { line++; @@ -2648,7 +2642,7 @@ private void scanSingleLineComment() { } public void scanIdentifier() { - this.hash_lower = 0; + this.hashLCase = 0; this.hash = 0; final char first = ch; @@ -2664,14 +2658,14 @@ public void scanIdentifier() { throw new ParserException("illegal identifier. " + info()); } - hash_lower = 0xcbf29ce484222325L; + hashLCase = 0xcbf29ce484222325L; hash = 0xcbf29ce484222325L; for (int i = startPos; i < quoteIndex; ++i) { ch = text.charAt(i); - hash_lower ^= ((ch >= 'A' && ch <= 'Z') ? (ch + 32) : ch); - hash_lower *= 0x100000001b3L; + hashLCase ^= ((ch >= 'A' && ch <= 'Z') ? (ch + 32) : ch); + hashLCase *= 0x100000001b3L; hash ^= ch; hash *= 0x100000001b3L; @@ -2690,11 +2684,11 @@ public void scanIdentifier() { throw new ParserException("illegal identifier. " + info()); } - hash_lower = 0xcbf29ce484222325L; + hashLCase = 0xcbf29ce484222325L; hash = 0xcbf29ce484222325L; - hash_lower ^= ((ch >= 'A' && ch <= 'Z') ? (ch + 32) : ch); - hash_lower *= 0x100000001b3L; + hashLCase ^= ((ch >= 'A' && ch <= 'Z') ? (ch + 32) : ch); + hashLCase *= 0x100000001b3L; hash ^= ch; hash *= 0x100000001b3L; @@ -2702,20 +2696,20 @@ public void scanIdentifier() { mark = pos; bufPos = 1; char ch = 0; - for (;;) { + for (; ; ) { char c0 = ch; ch = charAt(++pos); if (!isIdentifierChar(ch)) { - if ((ch == '（' || ch == '）') && c0 > 256) { + if ((ch == '（' || ch == '）') && c0 > 256) { bufPos++; continue; } break; } - hash_lower ^= ((ch >= 'A' && ch <= 'Z') ? (ch + 32) : ch); - hash_lower *= 0x100000001b3L; + hashLCase ^= ((ch >= 'A' && ch <= 'Z') ? (ch + 32) : ch); + hashLCase *= 0x100000001b3L; hash ^= ch; hash *= 0x100000001b3L; @@ -2745,7 +2739,7 @@ public void scanIdentifier() { return; } - Token tok = keywords.getKeyword(hash_lower); + Token tok = keywords.getKeyword(hashLCase); if (tok != null) { token = tok; if (token == Token.IDENTIFIER) { @@ -2768,7 +2762,7 @@ public void scanNumber() { if (ch == '0' && charAt(pos + 1) == 'b' && dbType != DbType.odps) { int i = 2; int mark = pos + 2; - for (;;++i) { + for (; ; ++i) { char ch = charAt(pos + i); if (ch == '0' || ch == '1') { continue; @@ -2790,7 +2784,7 @@ public void scanNumber() { ch = charAt(++pos); } - for (;;) { + for (; ; ) { if (ch >= '0' && ch <= '9') { bufPos++; } else { @@ -2807,7 +2801,7 @@ public void scanNumber() { bufPos++; ch = charAt(++pos); - for (numberSale = 0;;numberSale++) { + for (numberSale = 0; ; numberSale++) { if (ch >= '0' && ch <= '9') { bufPos++; } else { @@ -2831,7 +2825,7 @@ public void scanNumber() { ch = charAt(++pos); } - for (;;) { + for (; ; ) { if (ch >= '0' && ch <= '9') { bufPos++; } else { @@ -2863,7 +2857,7 @@ public void scanNumber() { ) { bufPos++; boolean brace = false; - for (;;) { + for (; ; ) { char c0 = ch; ch = charAt(++pos); @@ -2884,7 +2878,7 @@ public void scanNumber() { continue; } - if ((ch == '（' || ch == '）') + if ((ch == '（' || ch == '）') && c0 > 256) { bufPos++; continue; @@ -2897,7 +2891,7 @@ public void scanNumber() { } stringVal = addSymbol(); - hash_lower = FnvHash.hashCode64(stringVal); + hashLCase = FnvHash.hashCode64(stringVal); token = Token.IDENTIFIER; return; } @@ -2915,7 +2909,7 @@ public void scanHexaDecimal() { ch = charAt(++pos); } - for (;;) { + for (; ; ) { if (CharTypes.isHex(ch)) { bufPos++; } else { @@ -2925,7 +2919,7 @@ public void scanHexaDecimal() { } if (isIdentifierChar(ch)) { - for (;;) { + for (; ; ) { bufPos++; ch = charAt(++pos); if (!isIdentifierChar(ch)) { @@ -2935,7 +2929,7 @@ public void scanHexaDecimal() { mark -= 2; bufPos += 2; stringVal = addSymbol(); - hash_lower = FnvHash.hashCode64(stringVal); + hashLCase = FnvHash.hashCode64(stringVal); token = Token.IDENTIFIER; return; } @@ -3010,23 +3004,23 @@ public final boolean identifierEquals(long hash_lower) { return false; } - if (this.hash_lower == 0) { + if (this.hashLCase == 0) { if (stringVal == null) { stringVal = subString(mark, bufPos); } - this.hash_lower = FnvHash.fnv1a_64_lower(stringVal); + this.hashLCase = FnvHash.fnv1a_64_lower(stringVal); } - return this.hash_lower == hash_lower; + return this.hashLCase == hash_lower; } - public final long hash_lower() { - if (this.hash_lower == 0) { + public final long hashLCase() { + if (this.hashLCase == 0) { if (stringVal == null) { stringVal = subString(mark, bufPos); } - this.hash_lower = FnvHash.fnv1a_64_lower(stringVal); + this.hashLCase = FnvHash.fnv1a_64_lower(stringVal); } - return hash_lower; + return hashLCase; } public final List readAndResetComments() { @@ -3058,10 +3052,10 @@ private boolean isOperator(char ch) { } } - private static final long MULTMIN_RADIX_TEN = Long.MIN_VALUE / 10; - private static final long N_MULTMAX_RADIX_TEN = -Long.MAX_VALUE / 10; + private static final long MULTMIN_RADIX_TEN = Long.MIN_VALUE / 10; + private static final long N_MULTMAX_RADIX_TEN = -Long.MAX_VALUE / 10; - private final static int[] digits = new int[(int) '9' + 1]; + private static final int[] digits = new int[(int) '9' + 1]; static { for (int i = '0'; i <= '9'; ++i) { @@ -3176,26 +3170,25 @@ public BigDecimal decimalValue() { } char[] value = sub_chars(mark, bufPos); - if (!StringUtils.isNumber(value)){ - throw new ParserException(value+" is not a number! " + info()); + if (!StringUtils.isNumber(value)) { + throw new ParserException(value + " is not a number! " + info()); } return new BigDecimal(value); } public SQLNumberExpr numberExpr() { char[] value = sub_chars(mark, bufPos); - if (!StringUtils.isNumber(value)){ - throw new ParserException(value+" is not a number! " + info()); + if (!StringUtils.isNumber(value)) { + throw new ParserException(value + " is not a number! " + info()); } return new SQLNumberExpr(value); } - public SQLNumberExpr numberExpr(SQLObject parent) { char[] value = sub_chars(mark, bufPos); - if (!StringUtils.isNumber(value)){ - throw new ParserException(value+" is not a number! " + info()); + if (!StringUtils.isNumber(value)) { + throw new ParserException(value + " is not a number! " + info()); } return new SQLNumberExpr(value, parent); @@ -3203,8 +3196,8 @@ public SQLNumberExpr numberExpr(SQLObject parent) { public SQLNumberExpr numberExpr(boolean negate) { char[] value = sub_chars(mark, bufPos); - if (!StringUtils.isNumber(value)){ - throw new ParserException(value+" is not a number! " + info()); + if (!StringUtils.isNumber(value)) { + throw new ParserException(value + " is not a number! " + info()); } if (negate) { @@ -3340,7 +3333,7 @@ public static String parameterize(String sql, DbType dbType) { StringBuffer buf = new StringBuffer(); for_: - for (;;) { + for (; ; ) { Token token = lexer.token; switch (token) { case LITERAL_ALIAS: diff --git a/src/main/java/com/alibaba/druid/sql/parser/NotAllowCommentException.java b/src/main/java/com/alibaba/druid/sql/parser/NotAllowCommentException.java index e43effe1d0..a314fe6d26 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/NotAllowCommentException.java +++ b/src/main/java/com/alibaba/druid/sql/parser/NotAllowCommentException.java @@ -16,18 +16,17 @@ package com.alibaba.druid.sql.parser; public class NotAllowCommentException extends ParserException { - private static final long serialVersionUID = 1L; - public NotAllowCommentException(){ + public NotAllowCommentException() { this("comment not allow"); } - public NotAllowCommentException(String message, Throwable e){ + public NotAllowCommentException(String message, Throwable e) { super(message, e); } - public NotAllowCommentException(String message){ + public NotAllowCommentException(String message) { super(message); } diff --git a/src/main/java/com/alibaba/druid/sql/parser/ParserException.java b/src/main/java/com/alibaba/druid/sql/parser/ParserException.java index 930ac370d8..6cae8105bd 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/ParserException.java +++ b/src/main/java/com/alibaba/druid/sql/parser/ParserException.java @@ -20,32 +20,37 @@ import java.io.Serializable; public class ParserException extends FastsqlException implements Serializable { - private static final long serialVersionUID = 1L; - private int line; - private int column; + private final int line; + private final int column; - public ParserException(){ + public ParserException() { + this.line = 0; + this.column = 0; } - public ParserException(String message){ + public ParserException(String message) { super(message); + this.line = 0; + this.column = 0; } - - - public ParserException(String message, Throwable e){ + public ParserException(String message, Throwable e) { super(message, e); + this.line = 0; + this.column = 0; } - public ParserException(String message, int line, int column){ + public ParserException(String message, int line, int column) { super(message); this.line = line; this.column = column; } - public ParserException(Throwable ex, String ksql){ - super("parse error. detail message is :\n" + ex.getMessage() + "\nsource sql is : \n" + ksql, ex); + public ParserException(Throwable ex, String sql) { + super("parse error. detail message is :\n" + ex.getMessage() + "\nsource sql is : \n" + sql, ex); + this.line = 0; + this.column = 0; } } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java index a5bbbcf793..858399e168 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java @@ -16,7 +16,6 @@ package com.alibaba.druid.sql.parser; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLPartitionBy; import com.alibaba.druid.sql.ast.statement.*; @@ -26,7 +25,6 @@ import java.util.List; public class SQLCreateTableParser extends SQLDDLParser { - public SQLCreateTableParser(String sql) { super(sql); } @@ -104,12 +102,12 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { for (; ; ) { Token token = lexer.token; if (lexer.identifierEquals(FnvHash.Constants.SUPPLEMENTAL) - && DbType.oracle == dbType) { + && DbType.oracle == dbType) { SQLTableElement element = this.parseCreateTableSupplementalLogingProps(); element.setParent(createTable); createTable.getTableElementList().add(element); } else if (token == Token.IDENTIFIER // - || token == Token.LITERAL_ALIAS) { + || token == Token.LITERAL_ALIAS) { SQLColumnDefinition column = this.exprParser.parseColumn(createTable); column.setParent(createTable); createTable.getTableElementList().add(column); @@ -122,7 +120,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { constraint.setParent(createTable); createTable.getTableElementList().add((SQLTableElement) constraint); } else if (token == Token.TABLESPACE) { - throw new ParserException("TODO " + lexer.info()); + throw new ParserException("TODO " + lexer.info()); } else { SQLColumnDefinition column = this.exprParser.parseColumn(); createTable.getTableElementList().add(column); @@ -155,7 +153,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { lexer.nextToken(); SQLSelect select = null; - if(DbType.oracle == dbType) { + if (DbType.oracle == dbType) { select = new OracleSelectParser(this.exprParser).select(); } else { select = this.createSQLSelectParser().select(); @@ -173,7 +171,7 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { if (lexer.token == Token.TABLESPACE) { lexer.nextToken(); createTable.setTablespace( - this.exprParser.name() + this.exprParser.name() ); } @@ -188,7 +186,6 @@ public SQLCreateTableStatement parseCreateTable(boolean acceptCreate) { } protected void parseCreateTableRest(SQLCreateTableStatement stmt) { - } public SQLPartitionBy parsePartitionBy() { @@ -202,4 +199,4 @@ protected SQLTableElement parseCreateTableSupplementalLogingProps() { protected SQLCreateTableStatement newCreateStatement() { return new SQLCreateTableStatement(getDbType()); } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLDDLParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLDDLParser.java index e22b8c4543..5b09e85cfc 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLDDLParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLDDLParser.java @@ -19,12 +19,11 @@ import com.alibaba.druid.sql.ast.statement.SQLTableConstraint; public class SQLDDLParser extends SQLStatementParser { - - public SQLDDLParser(String sql){ + public SQLDDLParser(String sql) { super(sql); } - public SQLDDLParser(SQLExprParser exprParser){ + public SQLDDLParser(SQLExprParser exprParser) { super(exprParser); } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index 3c8f3a08b4..ddbb5224ce 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -36,13 +36,12 @@ import java.util.List; public class SQLExprParser extends SQLParser { + public static final String[] AGGREGATE_FUNCTIONS; - public final static String[] AGGREGATE_FUNCTIONS; - - public final static long[] AGGREGATE_FUNCTIONS_CODES; + public static final long[] AGGREGATE_FUNCTIONS_CODES; static { - String[] strings = { "AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM" }; + String[] strings = {"AVG", "COUNT", "MAX", "MIN", "STDDEV", "SUM"}; AGGREGATE_FUNCTIONS_CODES = FnvHash.fnv1a_64_lower(strings, true); AGGREGATE_FUNCTIONS = new String[AGGREGATE_FUNCTIONS_CODES.length]; for (String str : strings) { @@ -52,25 +51,25 @@ public class SQLExprParser extends SQLParser { } } - protected String[] aggregateFunctions = AGGREGATE_FUNCTIONS; + protected String[] aggregateFunctions = AGGREGATE_FUNCTIONS; - protected long[] aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; + protected long[] aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; protected boolean allowIdentifierMethod = true; - public SQLExprParser(String sql){ + public SQLExprParser(String sql) { super(sql); } - public SQLExprParser(String sql, DbType dbType, SQLParserFeature... features){ + public SQLExprParser(String sql, DbType dbType, SQLParserFeature... features) { super(sql, dbType, features); } - public SQLExprParser(Lexer lexer){ + public SQLExprParser(Lexer lexer) { super(lexer); } - public SQLExprParser(Lexer lexer, DbType dbType){ + public SQLExprParser(Lexer lexer, DbType dbType) { super(lexer, dbType); } @@ -148,7 +147,7 @@ public SQLExpr bitXorRest(SQLExpr expr) { expr = bitXorRest(expr); break; } - case SUBGT:{ + case SUBGT: { lexer.nextToken(); SQLExpr rightExp; if (dbType == DbType.mysql) { @@ -171,7 +170,7 @@ public SQLExpr bitXorRest(SQLExpr expr) { expr = bitXorRest(expr); break; } - case SUBGTGT:{ + case SUBGTGT: { lexer.nextToken(); SQLExpr rightExp = primary(); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.SubGtGt, rightExp, dbType); @@ -218,7 +217,6 @@ public SQLExpr bitXorRest(SQLExpr expr) { break; } - return expr; } @@ -272,7 +270,7 @@ public SQLExpr multiplicativeRest(SQLExpr expr) { if (number instanceof Integer) { number = -number.intValue(); } else if (number instanceof Long) { - number = - number.longValue(); + number = -number.longValue(); } else if (number instanceof BigInteger) { number = ((BigInteger) number).abs(); } else { @@ -299,6 +297,7 @@ public SQLIntegerExpr integerExpr() { accept(Token.LITERAL_INT); return intExpr; } + public SQLCharExpr charExpr() { SQLCharExpr charExpr = new SQLCharExpr(lexer.stringVal()); accept(Token.LITERAL_CHARS); @@ -373,7 +372,7 @@ public SQLExpr primary() { break; case IDENTIFIER: String ident = lexer.stringVal(); - long hash_lower = lexer.hash_lower(); + long hash_lower = lexer.hashLCase(); int sourceLine = -1, sourceColumn = -1; if (lexer.keepSourceLocation) { @@ -572,7 +571,8 @@ public SQLExpr primary() { lexer.nextToken(); } break; - } case LITERAL_NCHARS: + } + case LITERAL_NCHARS: sqlExpr = new SQLNCharExpr(lexer.stringVal()); lexer.nextToken(); @@ -1029,16 +1029,20 @@ public SQLExpr primary() { break; case BANG: lexer.nextToken(); - sqlExpr = new SQLUnaryExpr(SQLUnaryOperator.Not - , primary()); + sqlExpr = new SQLUnaryExpr( + SQLUnaryOperator.Not, + primary() + ); break; case BANGBANG: { if (dbType == DbType.hive) { throw new ParserException(lexer.info()); } lexer.nextToken(); - sqlExpr = new SQLUnaryExpr(SQLUnaryOperator.Not - , primary()); + sqlExpr = new SQLUnaryExpr( + SQLUnaryOperator.Not, + primary() + ); break; } case BANG_TILDE: { @@ -1245,7 +1249,7 @@ public SQLExpr primary() { break; } if (sqlExpr != null) { - break; + break; } accept(Token.LPAREN); @@ -1621,7 +1625,6 @@ protected SQLExpr parsePosition() { } protected SQLExpr parseMatch() { - SQLMatchAgainstExpr matchAgainstExpr = new SQLMatchAgainstExpr(); if (lexer.token() == Token.RPAREN) { @@ -1720,7 +1723,7 @@ protected SQLExpr methodRest(SQLExpr expr, boolean acceptLPAREN) { } else if (hash_lower == FnvHash.Constants.POSITION && DbType.mysql == dbType) { return parsePosition(); - }else if (hash_lower == FnvHash.Constants.TRY_CAST) { + } else if (hash_lower == FnvHash.Constants.TRY_CAST) { SQLCastExpr cast = new SQLCastExpr(); cast.setTry(true); cast.setExpr(expr()); @@ -1728,7 +1731,7 @@ protected SQLExpr methodRest(SQLExpr expr, boolean acceptLPAREN) { cast.setDataType(parseDataType(false)); accept(Token.RPAREN); return cast; - }else if (hash_lower == FnvHash.Constants.INT4 && DbType.postgresql == dbType) { + } else if (hash_lower == FnvHash.Constants.INT4 && DbType.postgresql == dbType) { PGTypeCastExpr castExpr = new PGTypeCastExpr(); castExpr.setExpr(this.expr()); castExpr.setDataType(new SQLDataTypeImpl(methodName)); @@ -1875,7 +1878,7 @@ protected SQLExpr methodRest(SQLExpr expr, boolean acceptLPAREN) { if (lexer.identifierEquals(FnvHash.Constants.LEVEL)) { lexer.nextToken(); List levels = new ArrayList(); - for (;;) { + for (; ; ) { SQLSelectOrderByItem level = this.parseSelectOrderByItem(); levels.add(level); if (lexer.token == Token.COMMA) { @@ -1962,7 +1965,7 @@ protected SQLExpr dotRest(SQLExpr expr) { if (lexer.token == Token.IDENTIFIER) { name = lexer.stringVal(); - hash_lower = lexer.hash_lower; + hash_lower = lexer.hashLCase; lexer.nextToken(); if (hash_lower == FnvHash.Constants.NEXTVAL) { @@ -2120,7 +2123,6 @@ public final void names(Collection exprCol, SQLObject parent) { name = name(); } - name.setParent(parent); exprCol.add(name); } @@ -2142,13 +2144,13 @@ public final void exprList(Collection exprCol, SQLObject parent) { return; } - for (;;) { + for (; ; ) { SQLExpr expr; if (lexer.token == Token.ROW && parent instanceof SQLDataType) { SQLDataType dataType = this.parseDataType(); expr = new SQLDataTypeRefExpr(dataType); } else { - expr = expr(); + expr = expr(); } if (expr != null) { @@ -2171,7 +2173,7 @@ public final void exprList(Collection exprCol, SQLObject parent) { public SQLIdentifierExpr identifier() { SQLName name = name(); if (name instanceof SQLIdentifierExpr) { - return (SQLIdentifierExpr)name; + return (SQLIdentifierExpr) name; } throw new ParserException("identifier excepted, " + lexer.info()); } @@ -2187,7 +2189,7 @@ public SQLName name() { char c0 = identName.charAt(0); if (c0 != '[') { - hash = lexer.hash_lower(); + hash = lexer.hashLCase(); } lexer.nextToken(); } else if (lexer.token == Token.LITERAL_CHARS) { @@ -2571,7 +2573,7 @@ protected void over(SQLOver over) { SQLExpr betweenBegin = this.additive(); over.setWindowingBetweenBegin(betweenBegin); } else if (lexer.token == Token.IDENTIFIER) { - long hash = lexer.hash_lower(); + long hash = lexer.hashLCase(); if (hash != FnvHash.Constants.PRECEDING && hash != FnvHash.Constants.FOLLOWING @@ -2602,7 +2604,7 @@ protected void over(SQLOver over) { SQLExpr betweenBegin = this.additive(); over.setWindowingBetweenEnd(betweenBegin); } else if (lexer.token == Token.IDENTIFIER) { - long hash = lexer.hash_lower(); + long hash = lexer.hashLCase(); if (hash != FnvHash.Constants.PRECEDING && hash != FnvHash.Constants.FOLLOWING @@ -2626,7 +2628,7 @@ protected void over(SQLOver over) { SQLExpr betweenBegin = this.additive(); over.setWindowingBetweenBegin(betweenBegin); } else if (lexer.token == Token.IDENTIFIER) { - long hash = lexer.hash_lower(); + long hash = lexer.hashLCase(); if (hash != FnvHash.Constants.PRECEDING && hash != FnvHash.Constants.FOLLOWING @@ -2838,7 +2840,7 @@ public SQLSelectOrderByItem parseSelectOrderByItem() { } else if (lexer.token == Token.LPAREN) { Lexer.SavePoint mark = lexer.mark(); lexer.nextToken(); - for (int i = 0;;++i) { + for (int i = 0; ; ++i) { expr = this.expr(); if (lexer.token == Token.ASC) { lexer.nextToken(); @@ -2869,7 +2871,7 @@ public SQLSelectOrderByItem parseSelectOrderByItem() { } else { expr = expr(); } - if(isEnabled(SQLParserFeature.IgnoreNameQuotes)) { + if (isEnabled(SQLParserFeature.IgnoreNameQuotes)) { if (expr instanceof SQLPropertyExpr) { SQLPropertyExpr propertyExpr = (SQLPropertyExpr) expr; SQLExpr owner = propertyExpr.getOwner(); @@ -2944,7 +2946,7 @@ public SQLUpdateSetItem parseUpdateSetItem() { Token token = lexer.token(); if (token == Token.IDENTIFIER) { identName = lexer.stringVal(); - hash = lexer.hash_lower(); + hash = lexer.hashLCase(); } else if (token == Token.LITERAL_CHARS) { identName = '\'' + lexer.stringVal() + '\''; hash = 0; @@ -3139,7 +3141,6 @@ public final SQLExpr inRest(SQLExpr expr) { parseQueryPlanHint(inListExpr); expr = inListExpr; - if (targetList.size() == 1) { SQLExpr targetExpr = targetList.get(0); if (targetExpr instanceof SQLQueryExpr) { @@ -3172,7 +3173,7 @@ public final SQLExpr inRest(SQLExpr expr) { return queryExpr; } - for (;;) { + for (; ; ) { SQLExpr item; if (lexer.token == Token.LITERAL_INT) { item = new SQLIntegerExpr(lexer.integerValue()); @@ -3290,12 +3291,11 @@ public SQLExpr and() { //for ads public void parseQueryPlanHint(SQLExpr expr) { if (lexer.token == Token.HINT && (expr instanceof SQLInListExpr - || expr instanceof SQLBinaryOpExpr - || expr instanceof SQLInSubQueryExpr - || expr instanceof SQLExistsExpr - || expr instanceof SQLNotExpr - || expr instanceof SQLBetweenExpr)) { - + || expr instanceof SQLBinaryOpExpr + || expr instanceof SQLInSubQueryExpr + || expr instanceof SQLExistsExpr + || expr instanceof SQLNotExpr + || expr instanceof SQLBetweenExpr)) { String text = lexer.stringVal().trim(); Lexer hintLex = SQLParserUtils.createLexer(text, dbType); @@ -3333,9 +3333,8 @@ public void parseQueryPlanHint(SQLExpr expr) { } public SQLExpr andRest(SQLExpr expr) { - for (;;) { - - if(expr instanceof SQLBinaryOpExpr) { + for (; ; ) { + if (expr instanceof SQLBinaryOpExpr) { parseQueryPlanHint(expr); } @@ -3356,7 +3355,6 @@ public SQLExpr andRest(SQLExpr expr) { if (lexer.token == Token.AND && lexer.isEnabled(SQLParserFeature.EnableSQLBinaryOpExprGroup)) { - SQLBinaryOpExprGroup group = new SQLBinaryOpExprGroup(SQLBinaryOperator.BooleanAnd, dbType); group.add(expr); group.add(rightExp); @@ -3365,7 +3363,7 @@ public SQLExpr andRest(SQLExpr expr) { rightExp.addAfterComment(lexer.readAndResetComments()); } - for (;;) { + for (; ; ) { lexer.nextToken(); SQLExpr more = relational(); @@ -3420,7 +3418,7 @@ public SQLExpr xor() { } public SQLExpr xorRest(SQLExpr expr) { - for (;;) { + for (; ; ) { if (lexer.token == Token.XOR) { lexer.nextToken(); SQLExpr rightExp = and(); @@ -3443,7 +3441,7 @@ public SQLExpr or() { } public SQLExpr orRest(SQLExpr expr) { - for (;;) { + for (; ; ) { if (lexer.token == Token.OR) { if (lexer.isKeepComments() && lexer.hasComment()) { expr.addAfterComment(lexer.readAndResetComments()); @@ -3454,7 +3452,6 @@ public SQLExpr orRest(SQLExpr expr) { if (lexer.token == Token.OR && lexer.isEnabled(SQLParserFeature.EnableSQLBinaryOpExprGroup)) { - SQLBinaryOpExprGroup group = new SQLBinaryOpExprGroup(SQLBinaryOperator.BooleanOr, dbType); group.add(expr); group.add(rightExp); @@ -3463,7 +3460,7 @@ public SQLExpr orRest(SQLExpr expr) { rightExp.addAfterComment(lexer.readAndResetComments()); } - for (;;) { + for (; ; ) { lexer.nextToken(); SQLExpr more = xor(); group.add(more); @@ -3481,7 +3478,7 @@ public SQLExpr orRest(SQLExpr expr) { } else { expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanOr, rightExp, dbType); } - } else if (lexer.token == Token.BARBAR) { + } else if (lexer.token == Token.BARBAR) { lexer.nextToken(); SQLExpr rightExp = xor(); @@ -3511,7 +3508,7 @@ public SQLExpr relationalRest(SQLExpr expr) { Token token = lexer.token; switch (token) { - case EQ:{ + case EQ: { lexer.nextToken(); try { rightExp = bitOr(); @@ -3588,13 +3585,13 @@ public SQLExpr relationalRest(SQLExpr expr) { expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.NotEqual, rightExp, dbType); } break; - case COLONEQ:{ + case COLONEQ: { lexer.nextToken(); rightExp = expr(); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Assignment, rightExp, dbType); } break; - case LT:{ + case LT: { SQLBinaryOperator op = SQLBinaryOperator.LessThan; lexer.nextToken(); @@ -3638,14 +3635,14 @@ public SQLExpr relationalRest(SQLExpr expr) { expr = new SQLBinaryOpExpr(expr, op, rightExp, getDbType()); } break; - case GTEQ:{ + case GTEQ: { lexer.nextToken(); rightExp = bitOr(); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.GreaterThanOrEqual, rightExp, getDbType()); } break; - case BANGLT:{ + case BANGLT: { lexer.nextToken(); rightExp = bitOr(); @@ -3838,7 +3835,7 @@ public SQLExpr relationalRest(SQLExpr expr) { break; } case IDENTIFIER: - long hash = lexer.hash_lower; + long hash = lexer.hashLCase; if (hash == FnvHash.Constants.SOUNDS) { lexer.nextToken(); accept(Token.LIKE); @@ -4032,7 +4029,7 @@ public SQLExpr notRationalRest(SQLExpr expr) { expr = relationalRest(expr); break; case IDENTIFIER: - long hash = lexer.hash_lower(); + long hash = lexer.hashLCase(); if (hash == FnvHash.Constants.REGEXP) { lexer.nextToken(); rightExp = bitOr(); @@ -4079,7 +4076,7 @@ public SQLDataType parseDataType(boolean restrict) { SQLArrayDataType array = new SQLArrayDataType(itemType, dbType); - if(lexer.token == Token.LPAREN) { + if (lexer.token == Token.LPAREN) { lexer.nextToken(); this.exprList(array.getArguments(), array); accept(Token.RPAREN); @@ -4160,7 +4157,7 @@ public SQLDataType parseDataType(boolean restrict) { lexer.nextToken(); SQLTableDataType table = new SQLTableDataType(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLColumnDefinition column; if (lexer.token == Token.STAR) { lexer.nextToken(); @@ -4189,7 +4186,7 @@ public SQLDataType parseDataType(boolean restrict) { SQLStructDataType struct = new SQLStructDataType(dbType); - for (;;) { + for (; ; ) { SQLName name; switch (lexer.token) { case GROUP: @@ -4230,7 +4227,7 @@ public SQLDataType parseDataType(boolean restrict) { accept(Token.LT); SQLUnionDataType unionType = new SQLUnionDataType(); - for (;;) { + for (; ; ) { SQLDataType item = this.parseDataType(); unionType.add(item); if (lexer.token == Token.COMMA) { @@ -4356,7 +4353,7 @@ public SQLDataType parseDataType(boolean restrict) { if (lexer.token == Token.LT && dbType == DbType.odps) { lexer.nextToken(); typeName += '<'; - for (;;) { + for (; ; ) { SQLDataType itemType = this.parseDataType(); typeName += itemType.toString(); if (lexer.token == Token.COMMA) { @@ -4384,7 +4381,7 @@ public SQLDataType parseDataType(boolean restrict) { dataType.getArguments().add(arg); } accept(Token.RBRACKET); - dataType.putAttribute("ads.arrayDataType",Boolean.TRUE); + dataType.putAttribute("ads.arrayDataType", Boolean.TRUE); } return parseDataTypeRest(dataType); @@ -4394,7 +4391,7 @@ private SQLRowDataType parseSqlRowDataType() { SQLRowDataType struct = new SQLRowDataType(dbType); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLDataType dataType = null; Lexer.SavePoint mark = lexer.mark(); SQLName name; @@ -4486,7 +4483,6 @@ protected boolean isCharType(String dataTypeName) { return isCharType(hash); } - protected boolean isCharType(long hash) { return hash == FnvHash.Constants.CHAR || hash == FnvHash.Constants.VARCHAR @@ -4496,8 +4492,7 @@ protected boolean isCharType(long hash) { || hash == FnvHash.Constants.TEXT || hash == FnvHash.Constants.MEDIUMTEXT || hash == FnvHash.Constants.LONGTEXT - || hash == FnvHash.Constants.ENUM - ; + || hash == FnvHash.Constants.ENUM; } protected SQLDataType parseCharTypeRest(SQLCharacterDataType charType) { @@ -4518,7 +4513,7 @@ protected SQLDataType parseCharTypeRest(SQLCharacterDataType charType) { } charType.setCharSetName(lexer.stringVal()); lexer.nextToken(); - } else if (lexer.identifierEquals(FnvHash.Constants.CHARSET)) { + } else if (lexer.identifierEquals(FnvHash.Constants.CHARSET)) { lexer.nextToken(); if (lexer.token != Token.IDENTIFIER @@ -4705,14 +4700,14 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { column.addConstraint(check); return parseColumnRest(column); case IDENTIFIER: - long hash = lexer.hash_lower(); + long hash = lexer.hashLCase(); if (hash == FnvHash.Constants.AUTO_INCREMENT) { lexer.nextToken(); column.setAutoIncrement(true); //sequence parser if (lexer.token == Token.BY) { lexer.nextToken(); - if (lexer.hash_lower() == FnvHash.Constants.GROUP) { + if (lexer.hashLCase() == FnvHash.Constants.GROUP) { lexer.nextToken(); column.setSequenceType(AutoIncrementType.GROUP); if (lexer.identifierEquals(FnvHash.Constants.UNIT)) { @@ -4730,7 +4725,7 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { column.setUnitIndex(unitIndex); } - if (lexer.hash_lower() == FnvHash.Constants.STEP) { + if (lexer.hashLCase() == FnvHash.Constants.STEP) { lexer.nextToken(); SQLExpr step = primary(); column.setStep(step); @@ -4738,15 +4733,15 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { } else { return parseColumnRest(column); } - } else if (lexer.hash_lower() == FnvHash.Constants.TIME) { + } else if (lexer.hashLCase() == FnvHash.Constants.TIME) { lexer.nextToken(); column.setSequenceType(AutoIncrementType.TIME); return parseColumnRest(column); - } else if (lexer.hash_lower() == FnvHash.Constants.SIMPLE) { + } else if (lexer.hashLCase() == FnvHash.Constants.SIMPLE) { lexer.nextToken(); - if (lexer.hash_lower() == FnvHash.Constants.WITH) { + if (lexer.hashLCase() == FnvHash.Constants.WITH) { lexer.nextToken(); - if (lexer.hash_lower() == FnvHash.Constants.CACHE) { + if (lexer.hashLCase() == FnvHash.Constants.CACHE) { column.setSequenceType(AutoIncrementType.SIMPLE_CACHE); } else { throw new ParserException("TODO : " + lexer.info()); @@ -4774,7 +4769,7 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { column.setUnitIndex(unitIndex); } - if (lexer.hash_lower() == FnvHash.Constants.STEP) { + if (lexer.hashLCase() == FnvHash.Constants.STEP) { lexer.nextToken(); SQLExpr unitIndex = primary(); column.setStep(unitIndex); @@ -4821,7 +4816,7 @@ public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { lexer.nextToken(); if (dbType == DbType.odps) { - for (;;) { + for (; ; ) { if (lexer.token == Token.LITERAL_ALIAS) { String tmp = lexer.stringVal(); if (tmp.length() > 2 && tmp.charAt(0) == '"' && tmp.charAt(tmp.length() - 1) == '"') { @@ -5031,7 +5026,7 @@ public SQLUnique parseUnique() { public void parseAssignItem(List outList, SQLObject parent) { accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLAssignItem item = this.parseAssignItem(true, parent); item.setParent(parent); outList.add(item); @@ -5098,7 +5093,7 @@ public SQLAssignItem parseAssignItem(boolean variant, SQLObject parent) { SQLIdentifierExpr identExpr = (SQLIdentifierExpr) var; if ((identExpr.getName().equalsIgnoreCase("et") || identExpr.getName().equalsIgnoreCase("odps") - ) + ) && lexer.token == Token.IDENTIFIER) { SQLExpr expr = this.primary(); identExpr.setName( @@ -5122,15 +5117,15 @@ public SQLAssignItem parseAssignItem(boolean variant, SQLObject parent) { String name = propertyExpr.getName() + func; propertyExpr.setName(name); } else if (propertyExpr.getName().equalsIgnoreCase("enab") && identifierEquals("le")) { - String name = propertyExpr.getName() +lexer.stringVal(); + String name = propertyExpr.getName() + lexer.stringVal(); lexer.nextToken(); propertyExpr.setName(name); } else if (propertyExpr.getName().equalsIgnoreCase("sq") && identifierEquals("l")) { - String name = propertyExpr.getName() +lexer.stringVal(); + String name = propertyExpr.getName() + lexer.stringVal(); lexer.nextToken(); propertyExpr.setName(name); } else if (propertyExpr.getName().equalsIgnoreCase("s") && identifierEquals("ql")) { - String name = propertyExpr.getName() +lexer.stringVal(); + String name = propertyExpr.getName() + lexer.stringVal(); lexer.nextToken(); propertyExpr.setName(name); var = this.primaryRest(propertyExpr); @@ -5215,6 +5210,7 @@ public SQLAssignItem parseAssignItem(boolean variant, SQLObject parent) { return item; } } else if (dbType == DbType.db2) { + // skip } else if (lexer.token == Token.QUES || lexer.token == Token.LITERAL_CHARS || lexer.token == Token.LITERAL_ALIAS @@ -5245,7 +5241,7 @@ public SQLAssignItem parseAssignItem(boolean variant, SQLObject parent) { numStr += lexer.numberString(); expr = new SQLIdentifierExpr(numStr); lexer.nextToken(); - } else if (expr instanceof SQLIdentifierExpr) { + } else if (expr instanceof SQLIdentifierExpr) { String ident = ((SQLIdentifierExpr) expr).getName(); ident += lexer.numberString(); expr = new SQLIdentifierExpr(ident); @@ -5269,7 +5265,7 @@ public SQLAssignItem parseAssignItem(boolean variant, SQLObject parent) { if (lexer.token == Token.COMMA && (DbType.postgresql == dbType - || (DbType.odps == dbType && parent instanceof SQLSetStatement))) { + || (DbType.odps == dbType && parent instanceof SQLSetStatement))) { SQLListExpr listExpr = new SQLListExpr(); listExpr.addItem(expr); expr.setParent(listExpr); @@ -5298,7 +5294,7 @@ public List parseHints() { return hints; } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public void parseHints(List hints) { while (lexer.token == Token.HINT) { String text = lexer.stringVal(); @@ -5308,8 +5304,7 @@ public void parseHints(List hints) { && (text.startsWith("+ TDDL") || text.startsWith("+TDDL") || text.startsWith("!TDDL") - || text.startsWith("TDDL"))) - { + || text.startsWith("TDDL"))) { hint = new TDDLHint(text); } else { hint = new SQLCommentHint(text); @@ -5332,8 +5327,7 @@ public SQLCommentHint parseHint() { && (text.startsWith("+ TDDL") || text.startsWith("+TDDL") || text.startsWith("!TDDL") - || text.startsWith("TDDL"))) - { + || text.startsWith("TDDL"))) { hint = new TDDLHint(text); } else { hint = new SQLCommentHint(text); @@ -5344,7 +5338,7 @@ public SQLCommentHint parseHint() { } lexer.nextToken(); - return hint; + return hint; } public void parseIndex(SQLIndexDefinition indexDefinition) { @@ -5448,7 +5442,7 @@ public void parseIndex(SQLIndexDefinition indexDefinition) { lexer.nextToken(); indexDefinition.getOptions().setParserName(lexer.stringVal()); lexer.nextToken(); - break ; + break; } lexer.reset(mark); for (; ; ) { @@ -5469,14 +5463,14 @@ public void parseIndex(SQLIndexDefinition indexDefinition) { lexer.nextToken(); SQLName name = name(); indexDefinition.setAnalyzerName(name); - break ; + break; } else if (lexer.identifierEquals("DICT")) { lexer.nextToken(); indexDefinition.setWithDicName(name()); continue; } } - break ; + break; } break; case LOCK: @@ -5694,10 +5688,10 @@ public SQLSelectItem parseSelectItem() { int startPos = lexer.startPos; if (token == Token.IDENTIFIER - && !(lexer.hash_lower() == -5808529385363204345L && lexer.charAt(lexer.pos) == '\'' && dbType == DbType.mysql) // x'123' X'123' + && !(lexer.hashLCase() == -5808529385363204345L && lexer.charAt(lexer.pos) == '\'' && dbType == DbType.mysql) // x'123' X'123' ) { String ident = lexer.stringVal(); - long hash_lower = lexer.hash_lower(); + long hash_lower = lexer.hashLCase(); lexer.nextTokenComma(); if (hash_lower == FnvHash.Constants.CONNECT_BY_ROOT) { @@ -5717,9 +5711,10 @@ public SQLSelectItem parseSelectItem() { lexer.nextToken(); SQLBinaryOpExpr binaryExpr = new SQLBinaryOpExpr( - new SQLIdentifierExpr(ident) - , SQLBinaryOperator.COLLATE - , new SQLIdentifierExpr(collate), DbType.mysql); + new SQLIdentifierExpr(ident), + SQLBinaryOperator.COLLATE, + new SQLIdentifierExpr(collate), DbType.mysql + ); expr = binaryExpr; } else if (lexer.identifierEquals(FnvHash.Constants.REGEXP) @@ -5729,9 +5724,10 @@ public SQLSelectItem parseSelectItem() { SQLExpr rightExp = bitOr(); SQLBinaryOpExpr binaryExpr = new SQLBinaryOpExpr( - new SQLIdentifierExpr(ident) - , SQLBinaryOperator.RegExp - , rightExp, DbType.mysql); + new SQLIdentifierExpr(ident), + SQLBinaryOperator.RegExp, + rightExp, DbType.mysql + ); expr = binaryExpr; expr = relationalRest(expr); @@ -5739,7 +5735,7 @@ public SQLSelectItem parseSelectItem() { && lexer.stringVal().charAt(0) != '`' && lexer.token == Token.LITERAL_CHARS && (SQLDateExpr.isSupport(dbType)) - ) { + ) { String literal = lexer.stringVal(); lexer.nextToken(); @@ -6107,7 +6103,7 @@ public SQLSelectItem parseSelectItem() { name_hash_lower = FnvHash.Constants.STAR; } else { name = lexer.stringVal(); - name_hash_lower = lexer.hash_lower(); + name_hash_lower = lexer.hashLCase(); } lexer.nextTokenComma(); @@ -6173,7 +6169,7 @@ public SQLSelectItem parseSelectItem() { if (token == Token.IDENTIFIER && hash_lower != FnvHash.Constants.CURRENT) { String as; - if (lexer.hash_lower == FnvHash.Constants.FORCE && DbType.mysql == dbType) { + if (lexer.hashLCase == FnvHash.Constants.FORCE && DbType.mysql == dbType) { String force = lexer.stringVal(); Lexer.SavePoint savePoint = lexer.mark(); @@ -6189,7 +6185,7 @@ public SQLSelectItem parseSelectItem() { } lexer.nextTokenComma(); } - } else if (lexer.hash_lower == FnvHash.Constants.SOUNDS && DbType.mysql == dbType) { + } else if (lexer.hashLCase == FnvHash.Constants.SOUNDS && DbType.mysql == dbType) { String sounds = lexer.stringVal(); Lexer.SavePoint savePoint = lexer.mark(); @@ -6206,12 +6202,12 @@ public SQLSelectItem parseSelectItem() { } lexer.nextTokenComma(); } - } else if (lexer.hash_lower == FnvHash.Constants.COLLATE + } else if (lexer.hashLCase == FnvHash.Constants.COLLATE && lexer.stringVal().charAt(0) != '`' && DbType.mysql == dbType) { expr = primaryRest(expr); as = as(); - } else if (lexer.hash_lower == FnvHash.Constants.REGEXP + } else if (lexer.hashLCase == FnvHash.Constants.REGEXP && lexer.stringVal().charAt(0) != '`' && DbType.mysql == dbType) { expr = exprRest(expr); @@ -6273,7 +6269,7 @@ public SQLSelectItem parseSelectItem() { lexer.nextToken(); aliasList = new ArrayList(); - for (;;) { + for (; ; ) { String stringVal = lexer.stringVal(); lexer.nextToken(); @@ -6370,7 +6366,7 @@ public SQLPartitionSpec parsePartitionSpec() { accept(Token.PARTITION); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLPartitionSpec.Item item = new SQLPartitionSpec.Item(); item.setColumn( this.name()); @@ -6413,7 +6409,7 @@ protected SQLPartitionBy parsePartitionBy() { if (lexer.identifierEquals(FnvHash.Constants.LIFECYCLE)) { lexer.nextToken(); - partitionClause.setLifecycle((SQLIntegerExpr)expr()); + partitionClause.setLifecycle((SQLIntegerExpr) expr()); } } return partitionClause; @@ -6537,7 +6533,7 @@ public SQLLimit parseLimit() { if (lexer.token == Token.BY && dbType == DbType.clickhouse) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLExpr item = this.expr(); limit.addBy(item); if (lexer.token == Token.COMMA) { @@ -6581,7 +6577,7 @@ public void parseIndexRest(SQLIndex idx, SQLObject parent) { return; } - for (;;) { + for (; ; ) { SQLName name = this.name(); name.setParent(parent); idx.getCovering().add(name); diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLInsertValueHandler.java b/src/main/java/com/alibaba/druid/sql/parser/SQLInsertValueHandler.java index e36032aaca..3fbf46c868 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLInsertValueHandler.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLInsertValueHandler.java @@ -11,9 +11,11 @@ public interface SQLInsertValueHandler { void processString(Object row, int index, String value) throws SQLException; void processDate(Object row, int index, String value) throws SQLException; + void processDate(Object row, int index, java.util.Date value) throws SQLException; void processTimestamp(Object row, int index, String value) throws SQLException; + void processTimestamp(Object row, int index, java.util.Date value) throws SQLException; void processTime(Object row, int index, String value) throws SQLException; @@ -24,7 +26,11 @@ public interface SQLInsertValueHandler { void processNull(Object row, int index) throws SQLException; - void processFunction(Object row, int index, String funcName, long funcNameHashCode64, Object... values) throws SQLException; + void processFunction(Object row, + int index, + String funcName, + long funcNameHashCode64, + Object... values) throws SQLException; void processRow(Object row) throws SQLException; 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 240116fdab..57f45d139e 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java @@ -24,9 +24,9 @@ public class SQLParser { protected final Lexer lexer; - protected DbType dbType; + protected DbType dbType; - public SQLParser(String sql, DbType dbType, SQLParserFeature... features){ + public SQLParser(String sql, DbType dbType, SQLParserFeature... features) { this(new Lexer(sql, null, dbType), dbType); for (SQLParserFeature feature : features) { config(feature, true); @@ -35,18 +35,18 @@ public SQLParser(String sql, DbType dbType, SQLParserFeature... features){ this.lexer.nextToken(); } - public SQLParser(String sql){ + public SQLParser(String sql) { this(sql, null); } - public SQLParser(Lexer lexer){ + public SQLParser(Lexer lexer) { this(lexer, null); if (dbType == null) { dbType = lexer.dbType; } } - public SQLParser(Lexer lexer, DbType dbType){ + public SQLParser(Lexer lexer, DbType dbType) { this.lexer = lexer; this.dbType = dbType; } @@ -95,7 +95,7 @@ protected String tableAlias(boolean must) { if (token == Token.IDENTIFIER) { String ident = lexer.stringVal; - long hash = lexer.hash_lower; + long hash = lexer.hashLCase; if (isEnabled(SQLParserFeature.IgnoreNameQuotes) && ident.length() > 1) { ident = StringUtils.removeNameQuotes(ident); } @@ -205,8 +205,7 @@ protected String tableAlias(boolean must) { case OUTER: case IN: case SET: - case BY: - { + case BY: { Lexer.SavePoint mark = lexer.mark(); String strVal = lexer.stringVal(); lexer.nextToken(); @@ -220,8 +219,7 @@ protected String tableAlias(boolean must) { case RPAREN: case ON: case JOIN: - case SEMI: - { + case SEMI: { return strVal; } default: @@ -264,7 +262,7 @@ protected String tableAlias(boolean must) { } break; case TABLE: - if (dbType == DbType.odps){ + if (dbType == DbType.odps) { Lexer.SavePoint mark = lexer.mark(); String strVal = lexer.stringVal(); lexer.nextToken(); @@ -305,7 +303,7 @@ protected String tableAlias(boolean must) { case EXCEPT: case LIMIT: case BETWEEN: - if (dbType == DbType.odps){ + if (dbType == DbType.odps) { Lexer.SavePoint mark = lexer.mark(); String strVal = lexer.stringVal(); lexer.nextToken(); @@ -522,8 +520,7 @@ protected String as() { case ALTER: case IN: case INTO: - case ASC: - { + case ASC: { alias = lexer.stringVal(); Lexer.SavePoint mark = lexer.mark(); @@ -864,7 +861,7 @@ public int acceptInteger() { public void match(Token token) { if (lexer.token != token) { throw new ParserException("syntax error, expect " + token + ", actual " + lexer.token + " " - + lexer.info()); + + lexer.info()); } } @@ -880,7 +877,6 @@ public void config(SQLParserFeature feature, boolean state) { this.lexer.config(feature, state); } - public TimeZone getTimeZone() { return lexer.getTimeZone(); } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java index 4179fb45cb..620efef08e 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java @@ -31,7 +31,7 @@ public enum SQLParserFeature { DRDSBaseline, InsertReader, IgnoreNameQuotes, - KeepNameQuotes,//for ads, presto + KeepNameQuotes, //for ads, presto SelectItemGenerateAlias, @@ -51,16 +51,14 @@ public enum SQLParserFeature { EnableMultiUnion, Spark, - Presto, - ; + Presto; - private SQLParserFeature(){ + private SQLParserFeature() { mask = (1 << ordinal()); } public final int mask; - public static boolean isEnabled(int features, SQLParserFeature feature) { return (features & feature.mask) != 0; } @@ -82,7 +80,7 @@ public static int of(SQLParserFeature... features) { int value = 0; - for (SQLParserFeature feature: features) { + for (SQLParserFeature feature : features) { value |= feature.mask; } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java index 6cb84f4709..4aa671aa98 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java @@ -68,13 +68,12 @@ import java.util.*; public class SQLParserUtils { - public static SQLStatementParser createSQLStatementParser(String sql, DbType dbType) { SQLParserFeature[] features; if (DbType.odps == dbType || DbType.mysql == dbType) { - features = new SQLParserFeature[] {SQLParserFeature.KeepComments}; + features = new SQLParserFeature[]{SQLParserFeature.KeepComments}; } else { - features = new SQLParserFeature[] {}; + features = new SQLParserFeature[]{}; } return createSQLStatementParser(sql, dbType, features); } @@ -82,9 +81,9 @@ public static SQLStatementParser createSQLStatementParser(String sql, DbType dbT public static SQLStatementParser createSQLStatementParser(String sql, DbType dbType, boolean keepComments) { SQLParserFeature[] features; if (keepComments) { - features = new SQLParserFeature[] {SQLParserFeature.KeepComments}; + features = new SQLParserFeature[]{SQLParserFeature.KeepComments}; } else { - features = new SQLParserFeature[] {}; + features = new SQLParserFeature[]{}; } return createSQLStatementParser(sql, dbType, features); @@ -248,45 +247,45 @@ public static SQLSelectQueryBlock createSelectQueryBlock(DbType dbType) { default: return new SQLSelectQueryBlock(dbType); } - } + } - public static SQLType getSQLType(String sql, DbType dbType) { + public static SQLType getSQLType(String sql, DbType dbType) { Lexer lexer = createLexer(sql, dbType); return lexer.scanSQLType(); - } + } - public static SQLType getSQLTypeV2(String sql, DbType dbType) { + public static SQLType getSQLTypeV2(String sql, DbType dbType) { Lexer lexer = createLexer(sql, dbType); return lexer.scanSQLTypeV2(); - } + } - public static boolean startsWithHint(String sql, DbType dbType) { + public static boolean startsWithHint(String sql, DbType dbType) { Lexer lexer = createLexer(sql, dbType); lexer.nextToken(); return lexer.token() == Token.HINT; - } - - public static boolean containsAny(String sql, DbType dbType, Token token) { - Lexer lexer = createLexer(sql, dbType); - for (;;) { - lexer.nextToken(); - final Token tok = lexer.token; - switch (tok) { - case EOF: - case ERROR: - return false; - default: - if (tok == token) { - return true; - } - break; - } - } - } + } + + public static boolean containsAny(String sql, DbType dbType, Token token) { + Lexer lexer = createLexer(sql, dbType); + for (; ; ) { + lexer.nextToken(); + final Token tok = lexer.token; + switch (tok) { + case EOF: + case ERROR: + return false; + default: + if (tok == token) { + return true; + } + break; + } + } + } public static boolean containsAny(String sql, DbType dbType, Token token1, Token token2) { Lexer lexer = createLexer(sql, dbType); - for (;;) { + for (; ; ) { lexer.nextToken(); final Token tok = lexer.token; switch (tok) { @@ -304,7 +303,7 @@ public static boolean containsAny(String sql, DbType dbType, Token token1, Token public static boolean containsAny(String sql, DbType dbType, Token token1, Token token2, Token token3) { Lexer lexer = createLexer(sql, dbType); - for (;;) { + for (; ; ) { lexer.nextToken(); final Token tok = lexer.token; switch (tok) { @@ -326,7 +325,7 @@ public static boolean containsAny(String sql, DbType dbType, Token... tokens) { } Lexer lexer = createLexer(sql, dbType); - for (;;) { + for (; ; ) { lexer.nextToken(); final Token tok = lexer.token; switch (tok) { @@ -348,64 +347,64 @@ public static Object getSimpleSelectValue(String sql, DbType dbType) { return getSimpleSelectValue(sql, dbType, null); } - public static Object getSimpleSelectValue(String sql, DbType dbType, SimpleValueEvalHandler handler) { - Lexer lexer = createLexer(sql, dbType); - lexer.nextToken(); - - if (lexer.token != Token.SELECT && lexer.token != Token.VALUES) { - return null; - } - - lexer.nextTokenValue(); - - SQLExpr expr = null; - Object value; - switch (lexer.token) { - case LITERAL_INT: - value = lexer.integerValue(); - break; - case LITERAL_CHARS: - case LITERAL_NCHARS: - value = lexer.stringVal(); - break; - case LITERAL_FLOAT: - value = lexer.decimalValue(); - break; - default: - if (handler == null) { - return null; - } - - expr = new SQLExprParser(lexer).expr(); - try { - value = handler.eval(expr); - } catch (Exception error) { - // skip - value = null; - } - break; - } - - lexer.nextToken(); - - if (lexer.token == Token.FROM) { - lexer.nextToken(); - if (lexer.token == Token.DUAL) { - lexer.nextToken(); - } else { - return null; - } - } - if (lexer.token != Token.EOF) { - return null; - } - - return value; - } - - public static interface SimpleValueEvalHandler { + public static Object getSimpleSelectValue(String sql, DbType dbType, SimpleValueEvalHandler handler) { + Lexer lexer = createLexer(sql, dbType); + lexer.nextToken(); + + if (lexer.token != Token.SELECT && lexer.token != Token.VALUES) { + return null; + } + + lexer.nextTokenValue(); + + SQLExpr expr = null; + Object value; + switch (lexer.token) { + case LITERAL_INT: + value = lexer.integerValue(); + break; + case LITERAL_CHARS: + case LITERAL_NCHARS: + value = lexer.stringVal(); + break; + case LITERAL_FLOAT: + value = lexer.decimalValue(); + break; + default: + if (handler == null) { + return null; + } + + expr = new SQLExprParser(lexer).expr(); + try { + value = handler.eval(expr); + } catch (Exception error) { + // skip + value = null; + } + break; + } + + lexer.nextToken(); + + if (lexer.token == Token.FROM) { + lexer.nextToken(); + if (lexer.token == Token.DUAL) { + lexer.nextToken(); + } else { + return null; + } + } + if (lexer.token != Token.EOF) { + return null; + } + + return value; + } + + public static interface SimpleValueEvalHandler { Object eval(SQLExpr expr); - } + } public static String replaceBackQuote(String sql, DbType dbType) { int i = sql.indexOf('`'); @@ -421,7 +420,7 @@ public static String replaceBackQuote(String sql, DbType dbType) { int off = 0; for_: - for (;;) { + for (; ; ) { lexer.nextToken(); int p0, p1; @@ -467,7 +466,6 @@ public static String addBackQuote(String sql, DbType dbType) { SQLType sqlType = getSQLType(sql, dbType); if (sqlType == SQLType.INSERT) { - parser.config(SQLParserFeature.InsertReader, true); SQLInsertStatement stmt = (SQLInsertStatement) parser.parseStatement(); @@ -530,7 +528,7 @@ public static List splitAndRemoveComment(String sql, DbType dbType) { boolean set = false, paiOrJar = false; int start = 0; Token token = lexer.token; - for (;lexer.token != Token.EOF;) { + for (; lexer.token != Token.EOF; ) { if (token == Token.SEMI) { int len = lexer.startPos - start; if (len > 0) { @@ -549,8 +547,8 @@ public static List splitAndRemoveComment(String sql, DbType dbType) { int len = lexer.startPos - start; if (len > 0) { String splitSql = removeComment( - sql.substring(start, lexer.startPos) - , dbType + sql.substring(start, lexer.startPos), + dbType ).trim(); if (!splitSql.isEmpty()) { list.add(splitSql); @@ -696,7 +694,7 @@ public static String removeComment(String sql, DbType dbType) { int start = 0; Token token = lexer.token; - for (;lexer.token != Token.EOF;) { + for (; lexer.token != Token.EOF; ) { if (token == Token.LINE_COMMENT) { int len = lexer.startPos - start; if (len > 0) { @@ -723,7 +721,6 @@ public static String removeComment(String sql, DbType dbType) { } public static List getTables(String sql, DbType dbType) { - Set tables = new LinkedHashSet<>(); boolean set = false; @@ -743,9 +740,8 @@ public static List getTables(String sql, DbType dbType) { break; } - for_: - for (;lexer.token != Token.EOF;) { + for (; lexer.token != Token.EOF; ) { switch (lexer.token) { case CREATE: case DROP: diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectListCache.java b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectListCache.java index 1ccbc03f88..3ae7740a68 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectListCache.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectListCache.java @@ -25,9 +25,9 @@ import java.util.concurrent.CopyOnWriteArrayList; public class SQLSelectListCache { - private final static Log LOG = LogFactory.getLog(SQLSelectListCache.class); - private final DbType dbType; - private final List entries = new CopyOnWriteArrayList(); + private static final Log LOG = LogFactory.getLog(SQLSelectListCache.class); + private final DbType dbType; + private final List entries = new CopyOnWriteArrayList(); public SQLSelectListCache(DbType dbType) { this.dbType = dbType; @@ -39,7 +39,7 @@ public void add(String select) { } SQLSelectParser selectParser = SQLParserUtils.createSQLStatementParser(select, dbType) - .createSQLSelectParser(); + .createSQLSelectParser(); SQLSelectQueryBlock queryBlock = SQLParserUtils.createSelectQueryBlock(dbType); selectParser.accept(Token.SELECT); @@ -51,10 +51,12 @@ public void add(String select) { String printSql = queryBlock.toString(); long printSqlHash = FnvHash.fnv1a_64_lower(printSql); entries.add( - new Entry(select.substring(6) - , queryBlock - , printSql - , printSqlHash) + new Entry( + select.substring(6), + queryBlock, + printSql, + printSqlHash + ) ); if (entries.size() > 5) { @@ -96,10 +98,10 @@ public boolean match(Lexer lexer, SQLSelectQueryBlock queryBlock) { } private static class Entry { - public final String sql; + public final String sql; public final SQLSelectQueryBlock queryBlock; - public final String printSql; - public final long printSqlHash; + public final String printSql; + public final long printSqlHash; public Entry(String sql, SQLSelectQueryBlock queryBlock, String printSql, long printSqlHash) { this.sql = sql; diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java index 48ec6cf2ce..889f3c2c92 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java @@ -29,22 +29,22 @@ import java.util.List; public class SQLSelectParser extends SQLParser { - protected SQLExprParser exprParser; + protected SQLExprParser exprParser; protected SQLSelectListCache selectListCache; - public SQLSelectParser(String sql){ + public SQLSelectParser(String sql) { super(sql); } - public SQLSelectParser(Lexer lexer){ + public SQLSelectParser(Lexer lexer) { super(lexer); } - public SQLSelectParser(SQLExprParser exprParser){ + public SQLSelectParser(SQLExprParser exprParser) { this(exprParser, null); } - public SQLSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache){ + public SQLSelectParser(SQLExprParser exprParser, SQLSelectListCache selectListCache) { super(exprParser.getLexer(), exprParser.getDbType()); this.exprParser = exprParser; this.selectListCache = selectListCache; @@ -369,7 +369,10 @@ public SQLSelectQuery queryRest(SQLSelectQuery selectQuery, boolean acceptUnion) return selectQuery; } - private void setToLeft(SQLSelectQuery selectQuery, SQLUnionQuery parentUnion, SQLUnionQuery union, SQLSelectQuery right) { + private void setToLeft(SQLSelectQuery selectQuery, + SQLUnionQuery parentUnion, + SQLUnionQuery union, + SQLSelectQuery right) { SQLUnionOperator operator = union.getOperator(); if (union.getLeft() instanceof SQLUnionQuery) { @@ -414,9 +417,9 @@ public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { if (lexer.token() == Token.VALUES) { return valuesQuery(acceptUnion); } - + SQLSelectQueryBlock queryBlock = new SQLSelectQueryBlock(dbType); - + if (lexer.hasComment() && lexer.isKeepComments()) { queryBlock.addBeforeComment(lexer.readAndResetComments()); } @@ -504,7 +507,7 @@ protected SQLSelectQuery valuesQuery(boolean acceptUnion) { lexer.nextToken(); SQLValuesQuery valuesQuery = new SQLValuesQuery(); - for (;;) { + for (; ; ) { if (lexer.token == Token.LPAREN) { lexer.nextToken(); SQLListExpr listExpr = new SQLListExpr(); @@ -537,7 +540,7 @@ protected void withSubquery(SQLSelect select) { withQueryClause.setRecursive(true); } - for (;;) { + for (; ; ) { SQLWithSubqueryClause.Entry entry = new SQLWithSubqueryClause.Entry(); entry.setParent(withQueryClause); @@ -583,7 +586,7 @@ public SQLWithSubqueryClause parseWith() { withQueryClause.setRecursive(true); } - for (;;) { + for (; ; ) { SQLWithSubqueryClause.Entry entry = new SQLWithSubqueryClause.Entry(); entry.setParent(withQueryClause); @@ -642,7 +645,7 @@ public void parseWhere(SQLSelectQueryBlock queryBlock) { if (lexer.token == Token.IDENTIFIER) { String ident = lexer.stringVal(); - long hash_lower = lexer.hash_lower(); + long hash_lower = lexer.hashLCase(); lexer.nextTokenEq(); SQLExpr identExpr; @@ -729,7 +732,7 @@ public void parseWhere(SQLSelectQueryBlock queryBlock) { if (lexer.hasComment() && lexer.isKeepComments() // && lexer.token != Token.INSERT // odps multi-insert - ) { + ) { where.addAfterComment(lexer.readAndResetComments()); } @@ -747,7 +750,7 @@ protected void parseSortBy(SQLSelectQueryBlock queryBlock) { lexer.nextToken(); accept(Token.BY); - for (;;) { + for (; ; ) { SQLSelectOrderByItem distributeByItem = this.exprParser.parseSelectOrderByItem(); queryBlock.addDistributeBy(distributeByItem); @@ -763,7 +766,7 @@ protected void parseSortBy(SQLSelectQueryBlock queryBlock) { lexer.nextToken(); accept(Token.BY); - for (;;) { + for (; ; ) { SQLSelectOrderByItem sortByItem = this.exprParser.parseSelectOrderByItem(); queryBlock.addSortBy(sortByItem); @@ -779,7 +782,7 @@ protected void parseSortBy(SQLSelectQueryBlock queryBlock) { lexer.nextToken(); accept(Token.BY); - for (;;) { + for (; ; ) { SQLSelectOrderByItem clusterByItem = this.exprParser.parseSelectOrderByItem(); queryBlock.addClusterBy(clusterByItem); @@ -799,7 +802,7 @@ protected void parseWindow(SQLSelectQueryBlock queryBlock) { lexer.nextToken(); - for (;;) { + for (; ; ) { SQLName name = this.exprParser.name(); accept(Token.AS); SQLOver over = new SQLOver(); @@ -814,7 +817,7 @@ protected void parseWindow(SQLSelectQueryBlock queryBlock) { break; } } - + public void parseGroupBy(SQLSelectQueryBlock queryBlock) { if (lexer.token == Token.GROUP) { lexer.nextTokenBy(); @@ -852,16 +855,16 @@ public void parseGroupBy(SQLSelectQueryBlock queryBlock) { groupBy.setWithCube(true); } - for (;;) { + for (; ; ) { SQLExpr item = parseGroupByItem(); - + item.setParent(groupBy); groupBy.addItem(item); if (lexer.token == Token.COMMA) { lexer.nextToken(); continue; - } else if(lexer.identifierEquals(FnvHash.Constants.GROUPING)) { + } else if (lexer.identifierEquals(FnvHash.Constants.GROUPING)) { continue; } else { break; @@ -892,15 +895,15 @@ public void parseGroupBy(SQLSelectQueryBlock queryBlock) { SQLExpr having = this.exprParser.expr(); groupBy.setHaving(having); } - + if (lexer.token == Token.WITH) { Lexer.SavePoint mark = lexer.mark(); lexer.nextToken(); - + if (lexer.identifierEquals(FnvHash.Constants.CUBE)) { lexer.nextToken(); groupBy.setWithCube(true); - } else if(lexer.identifierEquals(FnvHash.Constants.ROLLUP)) { + } else if (lexer.identifierEquals(FnvHash.Constants.ROLLUP)) { lexer.nextToken(); groupBy.setWithRollUp(true); } else if (lexer.identifierEquals(FnvHash.Constants.RS) @@ -942,9 +945,9 @@ public void parseGroupBy(SQLSelectQueryBlock queryBlock) { lexer.nextToken(); accept(Token.BY); - for (;;) { + for (; ; ) { SQLExpr item = parseGroupByItem(); - + item.setParent(groupBy); groupBy.addItem(item); @@ -955,15 +958,15 @@ public void parseGroupBy(SQLSelectQueryBlock queryBlock) { lexer.nextToken(); } } - + if (lexer.token == Token.WITH) { lexer.nextToken(); acceptIdentifier("ROLLUP"); groupBy.setWithRollUp(true); } - - if(DbType.mysql == dbType + + if (DbType.mysql == dbType && lexer.token == Token.DESC) { lexer.nextToken(); // skip } @@ -990,7 +993,7 @@ protected SQLExpr parseGroupByItem() { lexer.nextToken(); if (lexer.token == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.token == Token.RPAREN) { break; } @@ -1022,19 +1025,19 @@ protected SQLExpr parseGroupByItem() { } else { item = this.exprParser.expr(); } - - if(DbType.mysql == dbType) { + + if (DbType.mysql == dbType) { if (lexer.token == Token.DESC) { lexer.nextToken(); // skip - item =new MySqlOrderingExpr(item, SQLOrderingSpecification.DESC); + item = new MySqlOrderingExpr(item, SQLOrderingSpecification.DESC); } else if (lexer.token == Token.ASC) { lexer.nextToken(); // skip - item =new MySqlOrderingExpr(item, SQLOrderingSpecification.ASC); + item = new MySqlOrderingExpr(item, SQLOrderingSpecification.ASC); } } if (lexer.token == Token.HINT) { - SQLCommentHint hint = this.exprParser.parseHint();// skip + SQLCommentHint hint = this.exprParser.parseHint(); // skip if (item instanceof SQLObjectImpl) { ((SQLExprImpl) item).setHint(hint); } @@ -1045,7 +1048,7 @@ protected SQLExpr parseGroupByItem() { protected void parseSelectList(SQLSelectQueryBlock queryBlock) { final List selectList = queryBlock.getSelectList(); - for (;;) { + for (; ; ) { final SQLSelectItem selectItem = this.exprParser.parseSelectItem(); selectList.add(selectItem); selectItem.setParent(queryBlock); @@ -1070,9 +1073,9 @@ public void parseFrom(SQLSelectQueryBlock queryBlock) { if (lexer.token != Token.FROM) { return; } - + lexer.nextToken(); - + queryBlock.setFrom( parseTableSource()); } @@ -1082,7 +1085,7 @@ public SQLTableSource parseTableSource() { lexer.nextToken(); SQLTableSource tableSource; if (lexer.token == Token.SELECT || lexer.token == Token.WITH - || lexer.token == Token.SEL) { + || lexer.token == Token.SEL) { SQLSelect select = select(); accept(Token.RPAREN); SQLSelectQuery selectQuery = select.getQuery(); @@ -1136,7 +1139,7 @@ public SQLTableSource parseTableSource() { accept(Token.LPAREN); this.exprParser.names(values.getColumns(), values); accept(Token.RPAREN); - } else if (tableSource instanceof SQLSubqueryTableSource) { + } else if (tableSource instanceof SQLSubqueryTableSource) { SQLSubqueryTableSource values = (SQLSubqueryTableSource) tableSource; if (lexer.token == Token.LPAREN) { lexer.nextToken(); @@ -1153,7 +1156,7 @@ public SQLTableSource parseTableSource() { lexer.nextToken(); SQLValuesTableSource tableSource = new SQLValuesTableSource(); - for (;;) { + for (; ; ) { accept(Token.LPAREN); SQLListExpr listExpr = new SQLListExpr(); this.exprParser.exprList(listExpr.getItems(), listExpr); @@ -1195,17 +1198,17 @@ public SQLTableSource parseTableSource() { parseTableSourceQueryTableExpr(tableReference); SQLTableSource tableSrc = parseTableSourceRest(tableReference); - + if (lexer.hasComment() && lexer.isKeepComments()) { tableSrc.addAfterComment(lexer.readAndResetComments()); } - + return tableSrc; } protected void parseTableSourceQueryTableExpr(SQLExprTableSource tableReference) { if (lexer.token == Token.LITERAL_ALIAS || lexer.identifierEquals(FnvHash.Constants.IDENTIFIED) - || lexer.token == Token.LITERAL_CHARS) { + || lexer.token == Token.LITERAL_CHARS) { tableReference.setExpr(this.exprParser.name()); return; } @@ -1238,7 +1241,6 @@ protected SQLTableSource primaryTableSourceRest(SQLTableSource tableSource) { } public void parseTableSourceSample(SQLTableSource tableSource) { - } public void parseTableSourceSampleHive(SQLTableSource tableSource) { @@ -1348,14 +1350,13 @@ public SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { tableSource.setAlias(strVal); } } - break; + break; case OUTER: break; default: if (!(token == Token.IDENTIFIER - && ((hash = lexer.hash_lower()) == FnvHash.Constants.STRAIGHT_JOIN - || hash == FnvHash.Constants.CROSS))) - { + && ((hash = lexer.hashLCase()) == FnvHash.Constants.STRAIGHT_JOIN + || hash == FnvHash.Constants.CROSS))) { boolean must = false; if (lexer.token == Token.AS) { lexer.nextToken(); @@ -1391,8 +1392,8 @@ public SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { } else if (lexer.token == Token.LPAREN && tableSource instanceof SQLExprTableSource && (((SQLExprTableSource) tableSource).getExpr() instanceof SQLVariantRefExpr - || ((SQLExprTableSource) tableSource).getExpr() instanceof SQLIdentifierExpr - ) + || ((SQLExprTableSource) tableSource).getExpr() instanceof SQLIdentifierExpr + ) ) { lexer.nextToken(); SQLExprTableSource exprTableSource = (SQLExprTableSource) tableSource; @@ -1507,7 +1508,7 @@ public SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { break; case STRAIGHT_JOIN: case IDENTIFIER: - final long hash = lexer.hash_lower; + final long hash = lexer.hashLCase; if (hash == FnvHash.Constants.STRAIGHT_JOIN) { lexer.nextToken(); joinType = SQLJoinTableSource.JoinType.STRAIGHT_JOIN; @@ -1573,8 +1574,7 @@ public SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { queryRest( unionTableSrc.getUnion() ) - ) - ; + ); } } @@ -1607,7 +1607,7 @@ public SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { Lexer.SavePoint mark = lexer.mark(); lexer.nextToken(); - if (lexer.token() == Token.LPAREN){ + if (lexer.token() == Token.LPAREN) { lexer.nextToken(); SQLUnnestTableSource unnest = new SQLUnnestTableSource(); this.exprParser.exprList(unnest.getItems(), unnest); @@ -1673,8 +1673,7 @@ public SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { } if (lexer.token == Token.USING - ||lexer.identifierEquals(FnvHash.Constants.USING)) - { + || lexer.identifierEquals(FnvHash.Constants.USING)) { Lexer.SavePoint savePoint = lexer.mark(); lexer.nextToken(); @@ -1742,7 +1741,7 @@ public SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLExpr hintExpr = this.expr(); SQLExprHint hint = new SQLExprHint(hintExpr); hint.setParent(tableSource); @@ -2003,7 +2002,7 @@ public void parseLateralViewAs(SQLLateralViewTableSource lateralViewTabSrc) { accept(Token.AS); Lexer.SavePoint mark = null; - for (;;) { + for (; ; ) { SQLName name; if (lexer.token == Token.NULL) { name = new SQLIdentifierExpr(lexer.stringVal()); @@ -2030,14 +2029,13 @@ public SQLValuesTableSource parseValues() { accept(Token.VALUES); SQLValuesTableSource tableSource = new SQLValuesTableSource(); - for (;;) { - + for (; ; ) { // compatible (VALUES 1,2,3) and (VALUES (1), (2), (3)) for ads boolean isSingleValue = true; if (lexer.token == Token.ROW) { lexer.nextToken(); } - if(lexer.token() == Token.LPAREN) { + if (lexer.token() == Token.LPAREN) { accept(Token.LPAREN); isSingleValue = false; } @@ -2075,7 +2073,6 @@ public SQLValuesTableSource parseValues() { accept(Token.RPAREN); } - return tableSource; } } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java index bb2af8c18a..0ce7044778 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -46,46 +46,33 @@ import java.util.UUID; import static com.alibaba.druid.sql.parser.Token.*; -import static com.alibaba.druid.sql.parser.Token.ALL; -import static com.alibaba.druid.sql.parser.Token.ALTER; -import static com.alibaba.druid.sql.parser.Token.CASCADE; -import static com.alibaba.druid.sql.parser.Token.COMMA; -import static com.alibaba.druid.sql.parser.Token.GROUP; -import static com.alibaba.druid.sql.parser.Token.LINE_COMMENT; -import static com.alibaba.druid.sql.parser.Token.LITERAL_CHARS; -import static com.alibaba.druid.sql.parser.Token.LPAREN; -import static com.alibaba.druid.sql.parser.Token.MULTI_LINE_COMMENT; -import static com.alibaba.druid.sql.parser.Token.RESTRICT; -import static com.alibaba.druid.sql.parser.Token.RPAREN; -import static com.alibaba.druid.sql.parser.Token.SELECT; -import static com.alibaba.druid.sql.parser.Token.TABLE; public class SQLStatementParser extends SQLParser { - protected SchemaRepository repository; - protected SQLExprParser exprParser; - protected boolean parseCompleteValues = true; - protected int parseValuesSize = 3; - protected SQLSelectListCache selectListCache = null; - protected InsertColumnsCache insertColumnsCache = null; + protected SchemaRepository repository; + protected SQLExprParser exprParser; + protected boolean parseCompleteValues = true; + protected int parseValuesSize = 3; + protected SQLSelectListCache selectListCache; + protected InsertColumnsCache insertColumnsCache; protected java.sql.Timestamp now; - protected java.sql.Date currentDate; + protected java.sql.Date currentDate; - public SQLStatementParser(String sql){ + public SQLStatementParser(String sql) { this(sql, null); } - public SQLStatementParser(String sql, DbType dbType){ + public SQLStatementParser(String sql, DbType dbType) { this(new SQLExprParser(sql, dbType)); } - public SQLStatementParser(SQLExprParser exprParser){ + public SQLStatementParser(SQLExprParser exprParser) { super(exprParser.getLexer(), exprParser.getDbType()); this.exprParser = exprParser; this.dbType = exprParser.dbType; } - protected SQLStatementParser(Lexer lexer, DbType dbType){ + protected SQLStatementParser(Lexer lexer, DbType dbType) { super(lexer, dbType); } @@ -145,7 +132,7 @@ public void parseStatementList(List statementList, int max, SQLObj } boolean semi = false; - for (int i = 0;;i++) { + for (int i = 0; ; i++) { if (max != -1) { if (statementList.size() >= max) { return; @@ -172,7 +159,7 @@ public void parseStatementList(List statementList, int max, SQLObj lexer.nextToken(); int line1 = lexer.getLine(); - if(statementList.size() > 0) { + if (statementList.size() > 0) { SQLStatement lastStmt = statementList.get(statementList.size() - 1); lastStmt.setAfterSemi(true); @@ -231,7 +218,7 @@ public void parseStatementList(List statementList, int max, SQLObj //FOR ADS Lexer.SavePoint savePoint = lexer.mark(); lexer.nextToken(); - if(dbType == DbType.mysql && lexer.identifierEquals("PLANCACHE")) { + if (dbType == DbType.mysql && lexer.identifierEquals("PLANCACHE")) { lexer.nextToken(); if (lexer.token == Token.SELECT) { MySqlUpdatePlanCacheStatement stmt = new MySqlUpdatePlanCacheStatement(); @@ -445,7 +432,6 @@ public void parseStatementList(List statementList, int max, SQLObj continue; } - if (lexer.identifierEquals("UPSERT")) { SQLStatement stmt = parseUpsert(); statementList.add(stmt); @@ -597,7 +583,7 @@ public void parseStatementList(List statementList, int max, SQLObj SQLValuesTableSource values = this.createSQLSelectParser().parseValues(); SQLSelectStatement stmt = new SQLSelectStatement(); stmt.setSelect( - new SQLSelect(values) + new SQLSelect(values) ); statementList.add(stmt); stmt.setParent(parent); @@ -629,7 +615,6 @@ public void parseStatementList(List statementList, int max, SQLObj throw new ParserException("not supported." + lexer.info()); } - } public SQLStatement parseOptimize() { @@ -811,7 +796,7 @@ public SQLStatement parseDrop() { break; } default: - if (lexer.token == Token.TABLE || lexer.identifierEquals("TEMPORARY") || lexer.identifierEquals(FnvHash.Constants.PARTITIONED)) { + if (lexer.token == Token.TABLE || lexer.identifierEquals("TEMPORARY") || lexer.identifierEquals(FnvHash.Constants.PARTITIONED)) { SQLDropTableStatement dropTable = parseDropTable(false); if (hints != null) { dropTable.setHints(hints); @@ -887,7 +872,6 @@ public SQLStatement parseDrop() { stmt.addBeforeComment(beforeComments); } - return stmt; } @@ -1367,7 +1351,6 @@ public SQLGrantStatement parseGrant() { break; } - if (stmt.getResourceType() != null && lexer.token == Token.COLONCOLON) { lexer.nextToken(); // sql server } @@ -1389,7 +1372,7 @@ public SQLGrantStatement parseGrant() { if (lexer.token == Token.TO) { lexer.nextToken(); - for(;;) { + for (; ; ) { SQLExpr user = parseUser(); stmt.getUsers().add(user); if (lexer.token() == Token.COMMA) { @@ -1410,7 +1393,7 @@ public SQLGrantStatement parseGrant() { stmt.setWithGrantOption(true); } - for (;;) { + for (; ; ) { if (lexer.identifierEquals("MAX_QUERIES_PER_HOUR")) { lexer.nextToken(); stmt.setMaxQueriesPerHour(this.exprParser.primary()); @@ -1472,7 +1455,7 @@ public SQLGrantStatement parseGrant() { } protected void parsePrivileages(List privileges, SQLObject parent) { - for (;;) { + for (; ; ) { String privilege = null; if (lexer.token == Token.ALL) { lexer.nextToken(); @@ -1729,7 +1712,7 @@ protected void parsePrivileages(List privileges, SQLObject par if (lexer.token == Token.LPAREN) { lexer.nextToken(); - for(;;) { + for (; ; ) { privilegeItem.getColumns().add(this.exprParser.name()); if (lexer.token() == Token.COMMA) { @@ -1741,7 +1724,6 @@ protected void parsePrivileages(List privileges, SQLObject par accept(Token.RPAREN); } - expr.setParent(parent); privileges.add(privilegeItem); } @@ -1806,7 +1788,6 @@ public SQLRevokeStatement parseRevoke() { break; } - SQLExpr expr = this.exprParser.expr(); if (stmt.getResourceType() == SQLObjectType.TABLE || stmt.getResourceType() == null) { stmt.setResource(new SQLExprTableSource(expr)); @@ -1817,7 +1798,7 @@ public SQLRevokeStatement parseRevoke() { if (lexer.token == Token.FROM) { lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.token() == Token.USER && this.dbType == DbType.odps) { lexer.nextToken(); } @@ -1866,7 +1847,7 @@ public SQLStatement parseAlter() { stmt.setName(this.exprParser.name()); - for (;;) { + for (; ; ) { if (lexer.token == Token.DROP) { parseAlterDrop(stmt); } else if (lexer.identifierEquals(FnvHash.Constants.ADD)) { @@ -2008,7 +1989,7 @@ public SQLStatement parseAlter() { SQLAlterTableExchangePartition item = new SQLAlterTableExchangePartition(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLExpr partition = this.exprParser.name(); if (lexer.token == Token.EQ) { lexer.nextToken(); @@ -2042,7 +2023,6 @@ public SQLStatement parseAlter() { item.setValidation(false); } - stmt.addItem(item); } else if (lexer.token == Token.WITH) { lexer.nextToken(); @@ -2078,7 +2058,7 @@ public SQLStatement parseAlter() { lexer.nextToken(); SQLAlterTableSetOption setOption = new SQLAlterTableSetOption(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLAssignItem item = this.exprParser.parseAssignItem(); setOption.addOption(item); if (lexer.token == Token.COMMA) { @@ -2145,7 +2125,7 @@ public SQLStatement parseAlter() { continue; } - if (DbType.odps == dbType) { + if (DbType.odps == dbType) { if (lexer.identifierEquals("MERGE")) { SQLAlterTablePartition alterTablePartition = new SQLAlterTablePartition(); for (SQLAssignItem condition : renamePartition.getPartition()) { @@ -2247,7 +2227,7 @@ public SQLStatement parseAlter() { if (lexer.token == PARTITION) { SQLAlterTableMergePartition item = new SQLAlterTableMergePartition(); - for (;;) { + for (; ; ) { item.addPartition( this.getExprParser().parsePartitionSpec() ); @@ -2279,8 +2259,7 @@ public SQLStatement parseAlter() { } } else if (DbType.odps == dbType && (lexer.identifierEquals(Constants.RANGE) - || lexer.identifierEquals(Constants.CLUSTERED))) - { + || lexer.identifierEquals(Constants.CLUSTERED))) { if (lexer.identifierEquals(Constants.RANGE)) { lexer.nextToken(); acceptIdentifier("CLUSTERED"); @@ -2442,7 +2421,7 @@ private void alterTableAdd(SQLAlterTableStatement stmt) { SQLAlterTableAddConstraint item = new SQLAlterTableAddConstraint(constraint); stmt.addItem(item); } else if (lexer.token == Token.PARTITION) { - for (;;) { + for (; ; ) { lexer.nextToken(); SQLAlterTableAddPartition addPartition = new SQLAlterTableAddPartition(); @@ -2468,12 +2447,11 @@ private void alterTableAdd(SQLAlterTableStatement stmt) { if (lexer.token == Token.COMMA) { lexer.nextToken(); - if(lexer.identifierEquals("ADD") || lexer.token == Token.PARTITION) { + if (lexer.identifierEquals("ADD") || lexer.token == Token.PARTITION) { continue; } } - break; } } else if (lexer.token == DEFAULT) { @@ -2638,7 +2616,7 @@ protected SQLAlterTableDropPartition parseAlterTableDropPartition(boolean ifExis dropPartition.setPurge(true); } } else { - for (;;) { + for (; ; ) { SQLExpr partition = this.exprParser.expr(); dropPartition.addPartition(partition); if (lexer.token == COMMA) { @@ -2647,10 +2625,9 @@ protected SQLAlterTableDropPartition parseAlterTableDropPartition(boolean ifExis } break; } - dropPartition.getAttributes().put("SIMPLE",true); + dropPartition.getAttributes().put("SIMPLE", true); } - return dropPartition; } @@ -2731,14 +2708,13 @@ protected SQLDropTableStatement parseDropTable(boolean acceptDrop) { throw new ParserException("expected token: TABLE."); } - if (lexer.token == Token.IF) { lexer.nextToken(); accept(Token.EXISTS); stmt.setIfExists(true); } - for (;;) { + for (; ; ) { SQLName name = this.exprParser.name(); stmt.addPartition(new SQLExprTableSource(name)); if (lexer.token == Token.COMMA) { @@ -2748,7 +2724,7 @@ protected SQLDropTableStatement parseDropTable(boolean acceptDrop) { break; } - for (;;) { + for (; ; ) { if (lexer.identifierEquals("RESTRICT")) { lexer.nextToken(); stmt.setRestrict(true); @@ -2784,8 +2760,6 @@ protected SQLDropTableStatement parseDropTable(boolean acceptDrop) { } - - return stmt; } @@ -2819,7 +2793,6 @@ protected SQLDropTriggerStatement parseDropTrigger(boolean acceptDrop) { SQLName name = this.exprParser.name(); - stmt.setName(name); return stmt; } @@ -2839,7 +2812,7 @@ protected SQLDropViewStatement parseDropView(boolean acceptDrop) { stmt.setIfExists(true); } - for (;;) { + for (; ; ) { SQLName name = this.exprParser.name(); stmt.addPartition(new SQLExprTableSource(name)); if (lexer.token == Token.COMMA) { @@ -2998,7 +2971,7 @@ public SQLStatement parseTruncate() { stmt.setIfExists(true); } - for (;;) { + for (; ; ) { SQLName name = this.exprParser.name(); stmt.addTableSource(name); @@ -3043,7 +3016,7 @@ public SQLStatement parseTruncate() { } } - for (;;) { + for (; ; ) { if (lexer.token == Token.PURGE) { lexer.nextToken(); @@ -3144,7 +3117,6 @@ protected void parseInsert0(SQLInsertInto insertStatement) { } protected void parseInsert0_hinits(SQLInsertInto insertStatement) { - } protected void parseInsert0(SQLInsertInto insertStatement, boolean acceptSubQuery) { @@ -3174,7 +3146,7 @@ protected void parseInsert0(SQLInsertInto insertStatement, boolean acceptSubQuer if (lexer.token == Token.VALUES) { lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.token == Token.LPAREN) { lexer.nextToken(); @@ -3221,7 +3193,7 @@ public SQLDropUserStatement parseDropUser() { accept(Token.EXISTS); stmt.setIfExists(true); } - for (;;) { + for (; ; ) { if (lexer.token == Token.IF) { // skip for adb lexer.nextToken(); accept(Token.EXISTS); @@ -3277,7 +3249,6 @@ public SQLStatement parseDropIndex() { } public SQLCallStatement parseCall() { - boolean brace = false; if (lexer.token == Token.LBRACE) { lexer.nextToken(); @@ -3324,7 +3295,7 @@ public void parseAssignItems(List items, SQLObject parent } public void parseAssignItems(List items, SQLObject parent, boolean variant) { - for (;;) { + for (; ; ) { SQLAssignItem item = exprParser.parseAssignItem(variant, parent); item.setParent(parent); items.add(item); @@ -3345,7 +3316,7 @@ public SQLPartitionRef parsePartitionRef() { accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLIdentifierExpr name = (SQLIdentifierExpr) this.exprParser.name(); if (lexer.token == Token.EQ) { lexer.nextToken(); @@ -3365,7 +3336,6 @@ public SQLPartitionRef parsePartitionRef() { accept(Token.RPAREN); - return partitionRef; } @@ -3383,8 +3353,6 @@ public SQLStatement parseCreate() { accept(Token.CREATE); - - boolean global = false; if (lexer.identifierEquals(FnvHash.Constants.GLOBAL)) { lexer.nextToken(); @@ -3403,7 +3371,6 @@ public SQLStatement parseCreate() { nonclustered = true; } - Token token = lexer.token; switch (lexer.token) { case TABLE: { @@ -3613,7 +3580,6 @@ public SQLStatement parseCreateTableGroup() { accept(Token.CREATE); acceptIdentifier("TABLEGROUP"); - SQLCreateTableGroupStatement stmt = new SQLCreateTableGroupStatement(); if (lexer.identifierEquals(FnvHash.Constants.IF)) { @@ -3708,7 +3674,6 @@ public SQLStatement parseCreateMaterializedView() { } if (token == Token.IDENTIFIER) { - SQLColumnDefinition column = this.exprParser.parseColumn(stmt); stmt.getTableElementList().add((SQLTableElement) column); } else if (token == Token.PRIMARY // @@ -3845,7 +3810,7 @@ public SQLStatement parseCreateMaterializedView() { } } - for (;;) { + for (; ; ) { if (exprParser instanceof OracleExprParser) { ((OracleExprParser) exprParser).parseSegmentAttributes(stmt); } @@ -3997,7 +3962,7 @@ public SQLStatement parseCreateExternalCatalog() { acceptIdentifier("PROPERTIES"); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLName key = this.exprParser.name(); accept(Token.EQ); SQLName value = this.exprParser.name(); @@ -4047,7 +4012,6 @@ public SQLStatement parseCreateTrigger() { accept(Token.TRIGGER); - stmt.setName(this.exprParser.name()); if (lexer.identifierEquals(FnvHash.Constants.BEFORE)) { @@ -4062,7 +4026,7 @@ public SQLStatement parseCreateTrigger() { stmt.setTriggerType(TriggerType.INSTEAD_OF); } - for (;;) { + for (; ; ) { if (lexer.token == Token.INSERT) { lexer.nextToken(); stmt.setInsert(true); @@ -4167,7 +4131,7 @@ public SQLStatement parseCreateDatabase() { if (lexer.identifierEquals(FnvHash.Constants.DBPROPERTIES)) { lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLAssignItem assignItem = this.exprParser.parseAssignItem(); assignItem.setParent(stmt); stmt.getDbProperties().add(assignItem); @@ -4207,7 +4171,7 @@ public SQLStatement parseCreateSequence(boolean acceptCreate) { SQLCreateSequenceStatement stmt = new SQLCreateSequenceStatement(); - if(lexer.token == Token.GROUP) { + if (lexer.token == Token.GROUP) { lexer.nextToken(); stmt.setGroup(true); } else if (lexer.identifierEquals(FnvHash.Constants.SIMPLE)) { @@ -4225,11 +4189,10 @@ public SQLStatement parseCreateSequence(boolean acceptCreate) { accept(Token.SEQUENCE); - stmt.setDbType(dbType); stmt.setName(this.exprParser.name()); - for (;;) { + for (; ; ) { if (lexer.token() == Token.START || lexer.identifierEquals(FnvHash.Constants.START)) { lexer.nextToken(); accept(Token.WITH); @@ -4308,7 +4271,7 @@ public SQLStatement parseCreateSequence(boolean acceptCreate) { stmt.setUnitIndex(unitIndex); } - if (lexer.hash_lower() == FnvHash.Constants.STEP) { + if (lexer.hashLCase() == FnvHash.Constants.STEP) { lexer.nextToken(); SQLExpr step = this.exprParser.primary(); stmt.setStep(step); @@ -4354,7 +4317,7 @@ public SQLCreateIndexStatement parseCreateIndex(boolean acceptCreate) { accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLSelectOrderByItem item = this.exprParser.parseSelectOrderByItem(); item.setParent(stmt); stmt.addItem(item); @@ -4376,7 +4339,7 @@ public SQLCreateTableParser getSQLCreateTableParser() { public SQLStatement parseSelect() { SQLSelectParser selectParser = createSQLSelectParser(); SQLSelect select = selectParser.select(); - return new SQLSelectStatement(select,getDbType()); + return new SQLSelectStatement(select, getDbType()); } public SQLSelectParser createSQLSelectParser() { @@ -4420,7 +4383,7 @@ protected void parseUpdateSet(SQLUpdateStatement update) { lexer.nextToken(); } - for (;;) { + for (; ; ) { SQLUpdateSetItem item = this.exprParser.parseUpdateSetItem(); update.addItem(item); @@ -4546,7 +4509,7 @@ public SQLCreateViewStatement parseCreateView() { if (lexer.token == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.token == Token.CONSTRAINT) { SQLTableConstraint constraint = (SQLTableConstraint) this.exprParser.parseConstaint(); createView.addColumn(constraint); @@ -4627,7 +4590,7 @@ public SQLCreateViewStatement parseCreateView() { if (lexer.identifierEquals("CASCADED")) { createView.setWithCascaded(true); lexer.nextToken(); - } else if (lexer.identifierEquals("LOCAL")){ + } else if (lexer.identifierEquals("LOCAL")) { createView.setWithLocal(true); lexer.nextToken(); } else if (lexer.identifierEquals("READ")) { @@ -4687,7 +4650,7 @@ protected SQLAlterTableAddColumn parseAlterTableAddColumn() { SQLAlterTableAddColumn item = new SQLAlterTableAddColumn(); - for (;;) { + for (; ; ) { SQLColumnDefinition columnDef = this.exprParser.parseColumn(); item.addColumn(columnDef); @@ -4737,7 +4700,7 @@ protected SQLAlterTableReplaceColumn parseAlterTableReplaceColumn() { SQLAlterTableReplaceColumn item = new SQLAlterTableReplaceColumn(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLColumnDefinition columnDef = this.exprParser.parseColumn(); item.addColumn(columnDef); if (lexer.token == Token.COMMA) { @@ -4763,7 +4726,6 @@ public SQLStatement parseStatement() { return this.parseInsert(); } - if (lexer.token == Token.UPDATE) { return this.parseUpdateStatement(); } @@ -4778,11 +4740,11 @@ public SQLStatement parseStatement() { } /** - * @param tryBest - 为true去解析并忽略之后的错误 - * 强制建议除非明确知道可以忽略才传tryBest=true, - * 不然会忽略语法错误，且截断sql,导致update和delete无where条件下执行！！！ + * @param tryBest - 为true去解析并忽略之后的错误 + * 强制建议除非明确知道可以忽略才传tryBest=true, + * 不然会忽略语法错误，且截断sql,导致update和delete无where条件下执行！！！ */ - public SQLStatement parseStatement( final boolean tryBest) { + public SQLStatement parseStatement(final boolean tryBest) { List list = new ArrayList(); this.parseStatementList(list, 1, null); if (tryBest) { @@ -4862,7 +4824,7 @@ public SQLExplainStatement parseExplain() { protected SQLAlterTableAddClusteringKey parseAlterTableAddClusteringKey() { lexer.nextToken(); - SQLAlterTableAddClusteringKey item = new SQLAlterTableAddClusteringKey(); + SQLAlterTableAddClusteringKey item = new SQLAlterTableAddClusteringKey(); accept(Token.KEY); item.setName(exprParser.name()); accept(LPAREN); @@ -4935,7 +4897,6 @@ else if (lexer.identifierEquals(FnvHash.Constants.USING)) { } } - } this.exprParser.parseIndexRest(item); @@ -5098,7 +5059,7 @@ public SQLFetchStatement parseFetch() { } accept(Token.INTO); - for (;;) { + for (; ; ) { stmt.getInto().add(this.exprParser.name()); if (lexer.token == Token.COMMA) { lexer.nextToken(); @@ -5179,7 +5140,7 @@ public SQLStatement parseMerge() { accept(Token.ON); stmt.setOn(exprParser.expr()); - for (;;) { + for (; ; ) { boolean insertFlag = false; if (lexer.token == Token.WHEN) { lexer.nextToken(); @@ -5409,7 +5370,7 @@ public SQLStatement parseDescribe() { if (lexer.token == Token.PARTITION) { lexer.nextToken(); this.accept(Token.LPAREN); - for (;;) { + for (; ; ) { stmt.getPartition().add(this.exprParser.expr()); if (lexer.token == Token.COMMA) { lexer.nextToken(); @@ -5443,7 +5404,7 @@ public SQLWithSubqueryClause parseWithQuery() { withQueryClause.setRecursive(true); } - for (;;) { + for (; ; ) { SQLWithSubqueryClause.Entry entry = new SQLWithSubqueryClause.Entry(); entry.setParent(withQueryClause); @@ -5458,7 +5419,7 @@ public SQLWithSubqueryClause parseWithQuery() { if (lexer.token == Token.LPAREN) { lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.token == RPAREN) { break; } @@ -5555,19 +5516,19 @@ public SQLStatement parseWith() { throw new ParserException("TODO. " + lexer.info()); } - protected void parseValueClause(List valueClauseList - , int columnSize - , SQLObject parent) - { + protected void parseValueClause( + List valueClauseList, + int columnSize, + SQLObject parent) { parseValueClause(valueClauseList, null, 0, parent); } - - protected void parseValueClauseNative(List valueClauseList - , List columnDefinitionList - , int columnSize - , SQLObject parent) - { + protected void parseValueClauseNative( + List valueClauseList, + List columnDefinitionList, + int columnSize, + SQLObject parent + ) { final TimeZone timeZone = lexer.getTimeZone(); SQLInsertStatement.ValuesClause values; for (int i = 0; ; ++i) { @@ -5689,9 +5650,7 @@ protected void parseValueClauseNative(List valu BigDecimal number = lexer.decimalValue(); if (dataType != null - && dataType.nameHashCode64() == FnvHash.Constants.DECIMAL) - { - + && dataType.nameHashCode64() == FnvHash.Constants.DECIMAL) { int precision = 0, scale = 0; List arguments = dataType.getArguments(); if (arguments.size() > 0) { @@ -5740,7 +5699,7 @@ protected void parseValueClauseNative(List valu break; } case IDENTIFIER: { - long hash = lexer.hash_lower(); + long hash = lexer.hashLCase(); if (hash == FnvHash.Constants.DATE) { lexer.nextTokenValue(); String strVal = lexer.stringVal(); @@ -5890,7 +5849,7 @@ protected void parseValueClauseNative(List valu lexer.nextTokenComma(); if (lexer.token == Token.COMMA) { lexer.nextTokenLParen(); - if(values != null) { + if (values != null) { columnSize = values.getValues().size(); } continue; @@ -5900,8 +5859,8 @@ protected void parseValueClauseNative(List valu } } - public void parseValueClause(SQLInsertValueHandler valueHandler) throws SQLException { - for (;;) { + public void parseValueClause(SQLInsertValueHandler valueHandler) throws SQLException { + for (; ; ) { if (lexer.token != Token.LPAREN) { throw new ParserException("syntax error, expect ')', " + lexer.info()); } @@ -6006,7 +5965,7 @@ public void parseValueClause(SQLInsertValueHandler valueHandler) throws SQLExce lexer.nextTokenComma(); break; case IDENTIFIER: { - long hash = lexer.hash_lower(); + long hash = lexer.hashLCase(); if (hash == FnvHash.Constants.DATE) { lexer.nextTokenValue(); String strVal = lexer.stringVal(); @@ -6031,8 +5990,7 @@ public void parseValueClause(SQLInsertValueHandler valueHandler) throws SQLExce } else if (hash == FnvHash.Constants.CURDATE || hash == FnvHash.Constants.CUR_DATE || hash == FnvHash.Constants.CURRENT_DATE - || hash == FnvHash.Constants.SYSDATE) - { + || hash == FnvHash.Constants.SYSDATE) { lexer.nextTokenLParen(); if (lexer.token == Token.LPAREN) { @@ -6046,8 +6004,7 @@ public void parseValueClause(SQLInsertValueHandler valueHandler) throws SQLExce valueHandler.processDate(row, j, currentDate); } else if (hash == FnvHash.Constants.NOW - || hash == FnvHash.Constants.CURRENT_TIMESTAMP) - { + || hash == FnvHash.Constants.CURRENT_TIMESTAMP) { lexer.nextTokenLParen(); if (lexer.token == Token.LPAREN) { @@ -6179,14 +6136,14 @@ public void parseValueClause(SQLInsertValueHandler valueHandler) throws SQLExce break; } } - } - protected void parseValueClause(List valueClauseList - , List columnDefinitionList - , int columnSize - , SQLObject parent) - { + protected void parseValueClause( + List valueClauseList, + List columnDefinitionList, + int columnSize, + SQLObject parent + ) { final boolean optimizedForParameterized = lexer.isEnabled(SQLParserFeature.OptimizedForForParameterizedSkipValue); SQLInsertStatement.ValuesClause values; @@ -6313,8 +6270,7 @@ protected void parseValueClause(List valueClaus SQLNumberExpr numberExpr = lexer.numberExpr(parent); if (dataType != null - && dataType.nameHashCode64() == FnvHash.Constants.DECIMAL) - { + && dataType.nameHashCode64() == FnvHash.Constants.DECIMAL) { Number number = numberExpr.getNumber(); int precision = 0, scale = 0; @@ -6441,7 +6397,7 @@ protected void parseValueClause(List valueClaus lexer.nextTokenComma(); if (lexer.token == Token.COMMA) { lexer.nextTokenLParen(); - if(values != null) { + if (values != null) { columnSize = values.getValues().size(); } continue; @@ -6500,10 +6456,10 @@ protected HiveInsertStatement parseHiveInsertStmt() { if (lexer.token == Token.PARTITION) { lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLAssignItem ptExpr = new SQLAssignItem(); ptExpr.setTarget(this.exprParser.name()); - if (lexer.token == Token.EQ ||lexer.token == Token.EQEQ) { + if (lexer.token == Token.EQ || lexer.token == Token.EQEQ) { lexer.nextTokenValue(); SQLExpr ptValue = this.exprParser.expr(); ptExpr.setValue(ptValue); @@ -6549,7 +6505,7 @@ protected HiveInsertStatement parseHiveInsertStmt() { if (lexer.token == Token.VALUES) { lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.token == Token.LPAREN) { lexer.nextToken(); @@ -6600,7 +6556,7 @@ protected HiveInsert parseHiveInsert() { if (lexer.token == Token.PARTITION) { lexer.nextToken(); accept(Token.LPAREN); - for (;;) { + for (; ; ) { SQLAssignItem ptExpr = new SQLAssignItem(); ptExpr.setTarget(this.exprParser.name()); if (lexer.token == Token.EQ) { @@ -6627,7 +6583,7 @@ protected HiveInsert parseHiveInsert() { if (lexer.token == Token.VALUES) { lexer.nextToken(); - for (;;) { + for (; ; ) { if (lexer.token == Token.LPAREN) { lexer.nextToken(); @@ -6811,12 +6767,12 @@ protected SQLStatement parseAlterIndex() { lexer.nextToken(); stmt.setEnable(false); } - if (lexer.hash_lower == FnvHash.Constants.UNUSABLE) { + if (lexer.hashLCase == FnvHash.Constants.UNUSABLE) { lexer.nextToken(); stmt.setUnusable(true); } - for (;;) { + for (; ; ) { if (lexer.identifierEquals("rebuild")) { lexer.nextToken(); @@ -6897,7 +6853,7 @@ public SQLAlterSequenceStatement parseAlterSequence() { if (lexer.identifierEquals(FnvHash.Constants.SIMPLE)) { stmt.setChangeToSimple(true); lexer.nextToken(); - if (lexer.hash_lower() ==FnvHash.Constants.WITH) { + if (lexer.hashLCase() == FnvHash.Constants.WITH) { lexer.nextToken(); accept(Token.CACHE); stmt.setWithCache(true); @@ -6913,7 +6869,7 @@ public SQLAlterSequenceStatement parseAlterSequence() { } } - for (;;) { + for (; ; ) { if (lexer.token() == Token.START || lexer.identifierEquals(FnvHash.Constants.START)) { lexer.nextToken(); accept(Token.WITH); @@ -6948,7 +6904,7 @@ public SQLAlterSequenceStatement parseAlterSequence() { if (lexer.token == Token.WITH || lexer.token == Token.EQ) { lexer.nextToken(); stmt.setRestartWith(this.exprParser.primary()); - } else if(lexer.token == LITERAL_INT) { + } else if (lexer.token == LITERAL_INT) { stmt.setRestartWith(this.exprParser.primary()); } @@ -7018,8 +6974,7 @@ protected SQLStatement parseMsck() { return stmt; } - protected SQLStatement parseCreateResourceGroup() - { + protected SQLStatement parseCreateResourceGroup() { accept(Token.CREATE); acceptIdentifier("RESOURCE"); accept(Token.GROUP); @@ -7027,7 +6982,7 @@ protected SQLStatement parseCreateResourceGroup() SQLCreateResourceGroupStatement stmt = new SQLCreateResourceGroupStatement(); stmt.setName(this.exprParser.name()); - for (;;) { + for (; ; ) { if (lexer.token() == Token.SEMI || lexer.token() == Token.EOF) { break; } @@ -7073,7 +7028,7 @@ protected SQLStatement parseAlterResourceGroup() { SQLAlterResourceGroupStatement stmt = new SQLAlterResourceGroupStatement(); stmt.setName(this.exprParser.name()); - for (;;) { + for (; ; ) { if (lexer.token() == Token.SEMI || lexer.token() == Token.EOF) { break; } @@ -7316,7 +7271,7 @@ public SQLCreateFunctionStatement parseHiveCreateFunction() { stmt.setSymbol(symbol); } - if (lexer.token() == Token.USING || lexer.hash_lower() == Constants.USING) { + if (lexer.token() == Token.USING || lexer.hashLCase() == Constants.USING) { lexer.nextToken(); if (lexer.identifierEquals(FnvHash.Constants.JAR)) { @@ -7342,7 +7297,6 @@ public SQLCreateFunctionStatement parseHiveCreateFunction() { return stmt; } - protected SQLShowCreateTableStatement parseShowCreateTable() { lexer.nextToken(); accept(Token.TABLE); @@ -7364,7 +7318,6 @@ protected SQLShowCreateTableStatement parseShowCreateTable() { return stmt; } - public SQLShowVariantsStatement parseShowVariants() { SQLShowVariantsStatement stmt = new SQLShowVariantsStatement(); diff --git a/src/main/java/com/alibaba/druid/sql/parser/SymbolTable.java b/src/main/java/com/alibaba/druid/sql/parser/SymbolTable.java index 917469ebf5..1bdb5dfd47 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SymbolTable.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SymbolTable.java @@ -39,9 +39,9 @@ public class SymbolTable { public static SymbolTable global = new SymbolTable(32768); private final Entry[] entries; - private final int indexMask; + private final int indexMask; - public SymbolTable(int tableSize){ + public SymbolTable(int tableSize) { this.indexMask = tableSize - 1; this.entries = new Entry[tableSize]; } @@ -139,4 +139,4 @@ public Entry(long hash, int len, String value) { this.value = value; } } -} \ No newline at end of file +} 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 cf0cc48ceb..e249a5de4a 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Token.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Token.java @@ -16,110 +16,110 @@ package com.alibaba.druid.sql.parser; /** - * - * SQL Token + * SQL Token + * * @author wenshao [szujobs@hotmail.com] */ public enum Token { - SELECT("SELECT"), - DELETE("DELETE"), - INSERT("INSERT"), - UPDATE("UPDATE"), - - FROM("FROM"), - HAVING("HAVING"), - WHERE("WHERE"), - ORDER("ORDER"), + SELECT("SELECT"), + DELETE("DELETE"), + INSERT("INSERT"), + UPDATE("UPDATE"), + + FROM("FROM"), + HAVING("HAVING"), + WHERE("WHERE"), + ORDER("ORDER"), BY("BY"), - GROUP("GROUP"), - INTO("INTO"), - AS("AS"), - + GROUP("GROUP"), + INTO("INTO"), + AS("AS"), + CREATE("CREATE"), - ALTER("ALTER"), - DROP("DROP"), - SET("SET"), - - NULL("NULL"), - NOT("NOT"), + ALTER("ALTER"), + DROP("DROP"), + SET("SET"), + + NULL("NULL"), + NOT("NOT"), DISTINCT("DISTINCT"), - TABLE("TABLE"), - TABLESPACE("TABLESPACE"), - VIEW("VIEW"), - SEQUENCE("SEQUENCE"), - TRIGGER("TRIGGER"), - USER("USER"), - INDEX("INDEX"), + TABLE("TABLE"), + TABLESPACE("TABLESPACE"), + VIEW("VIEW"), + SEQUENCE("SEQUENCE"), + TRIGGER("TRIGGER"), + USER("USER"), + INDEX("INDEX"), SESSION("SESSION"), PROCEDURE("PROCEDURE"), FUNCTION("FUNCTION"), - - PRIMARY("PRIMARY"), - KEY("KEY"), - DEFAULT("DEFAULT"), - CONSTRAINT("CONSTRAINT"), - CHECK("CHECK"), - UNIQUE("UNIQUE"), - FOREIGN("FOREIGN"), - REFERENCES("REFERENCES"), - - EXPLAIN("EXPLAIN"), - FOR("FOR"), + + PRIMARY("PRIMARY"), + KEY("KEY"), + DEFAULT("DEFAULT"), + CONSTRAINT("CONSTRAINT"), + CHECK("CHECK"), + UNIQUE("UNIQUE"), + FOREIGN("FOREIGN"), + REFERENCES("REFERENCES"), + + EXPLAIN("EXPLAIN"), + FOR("FOR"), IF("IF"), GLOBAL("GLOBAL"), ALL("ALL"), UNION("UNION"), - EXCEPT("EXCEPT"), - INTERSECT("INTERSECT"), + EXCEPT("EXCEPT"), + INTERSECT("INTERSECT"), MINUS("MINUS"), - INNER("INNER"), - LEFT("LEFT"), - RIGHT("RIGHT"), - FULL("FULL"), - OUTER("OUTER"), + INNER("INNER"), + LEFT("LEFT"), + RIGHT("RIGHT"), + FULL("FULL"), + OUTER("OUTER"), JOIN("JOIN"), STRAIGHT_JOIN("STRAIGHT_JOIN"), ON("ON"), - SCHEMA("SCHEMA"), + SCHEMA("SCHEMA"), CAST("CAST"), COLUMN("COLUMN"), USE("USE"), DATABASE("DATABASE"), TO("TO"), - AND("AND"), - OR("OR"), - XOR("XOR"), - CASE("CASE"), - WHEN("WHEN"), - THEN("THEN"), + AND("AND"), + OR("OR"), + XOR("XOR"), + CASE("CASE"), + WHEN("WHEN"), + THEN("THEN"), ELSE("ELSE"), ELSIF("ELSIF"), - END("END"), - EXISTS("EXISTS"), + END("END"), + EXISTS("EXISTS"), IN("IN"), - NEW("NEW"), - ASC("ASC"), - DESC("DESC"), - IS("IS"), - LIKE("LIKE"), - ESCAPE("ESCAPE"), - BETWEEN("BETWEEN"), - VALUES("VALUES"), + NEW("NEW"), + ASC("ASC"), + DESC("DESC"), + IS("IS"), + LIKE("LIKE"), + ESCAPE("ESCAPE"), + BETWEEN("BETWEEN"), + VALUES("VALUES"), INTERVAL("INTERVAL"), - LOCK("LOCK"), - SOME("SOME"), + LOCK("LOCK"), + SOME("SOME"), ANY("ANY"), TRUNCATE("TRUNCATE"), RETURN("RETURN"), // mysql - TRUE("TRUE"), + TRUE("TRUE"), FALSE("FALSE"), LIMIT("LIMIT"), KILL("KILL"), @@ -149,7 +149,7 @@ public enum Token { SQLSTATE("SQLSTATE"), CONDITION("CONDITION"), DIV("DIV"), - + //postgresql WINDOW("WINDOW"), OFFSET("OFFSET"), @@ -188,7 +188,7 @@ public enum Token { WITH("WITH"), EXTRACT("EXTRACT"), CURSOR("CURSOR"), -// MODEL("MODEL"), + // MODEL("MODEL"), MERGE("MERGE"), MATCHED("MATCHED"), ERRORS("ERRORS"), @@ -209,7 +209,7 @@ public enum Token { COMMIT("COMMIT"), SAVEPOINT("SAVEPOINT"), CROSS("CROSS"), - + PCTFREE("PCTFREE"), INITRANS("INITRANS"), MAXTRANS("MAXTRANS"), @@ -242,16 +242,16 @@ public enum Token { COMPUTE("COMPUTE"), ANALYZE("ANALYZE"), OPTIMIZE("OPTIMIZE"), - + // transact-sql TOP("TOP"), - + ARRAY("ARRAY"), DISTRIBUTE("DISTRIBUTE"), - + // hive - EOF, + EOF, ERROR, IDENTIFIER, HINT, @@ -269,11 +269,11 @@ public enum Token { LITERAL_ALIAS, LINE_COMMENT, MULTI_LINE_COMMENT, - + // Oracle BINARY_FLOAT, BINARY_DOUBLE, - + // odps,hive PARTITION, PARTITIONED, @@ -298,19 +298,19 @@ public enum Token { UPSERT("UPSERT"), // Phoenix - LPAREN("("), - RPAREN(")"), - LBRACE("{"), - RBRACE("}"), - LBRACKET("["), - RBRACKET("]"), - SEMI(";"), - COMMA(","), - DOT("."), - DOTDOT(".."), - DOTDOTDOT("..,"), - EQ("="), - GT(">"), + LPAREN("("), + RPAREN(")"), + LBRACE("{"), + RBRACE("}"), + LBRACKET("["), + RBRACKET("]"), + SEMI(";"), + COMMA(","), + DOT("."), + DOTDOT(".."), + DOTDOTDOT("..,"), + EQ("="), + GT(">"), LT("<"), LT_SUB_GT("<->"), BANG("!"), @@ -324,34 +324,34 @@ public enum Token { QUESQUES("??"), QUESBAR("?|"), QUESAMP("?&"), - COLON(":"), - COLONCOLON("::"), - COLONEQ(":="), + COLON(":"), + COLONCOLON("::"), + COLONEQ(":="), EQEQ("=="), EQGT("=>"), - LTEQ("<="), - LTEQGT("<=>"), - LTGT("<>"), - GTEQ(">="), - BANGEQ("!="), - BANGGT("!>"), + LTEQ("<="), + LTEQGT("<=>"), + LTGT("<>"), + GTEQ(">="), + BANGEQ("!="), + BANGGT("!>"), BANGLT("!<"), - AMPAMP("&&"), - BARBAR("||"), - BARBARSLASH("||/"), - BARSLASH("|/"), - PLUS("+"), - SUB("-"), - SUBGT("->"), - SUBGTGT("->>"), - STAR("*"), - SLASH("/"), - AMP("&"), - BAR("|"), + AMPAMP("&&"), + BARBAR("||"), + BARBARSLASH("||/"), + BARSLASH("|/"), + PLUS("+"), + SUB("-"), + SUBGT("->"), + SUBGTGT("->>"), + STAR("*"), + SLASH("/"), + AMP("&"), + BAR("|"), CARET("^"), CARETEQ("^="), - PERCENT("%"), - LTLT("<<"), + PERCENT("%"), + LTLT("<<"), GTGT(">>"), MONKEYS_AT("@"), MONKEYS_AT_AT("@@"), @@ -359,16 +359,15 @@ public enum Token { POUNDGT("#>"), POUNDGTGT("#>>"), MONKEYS_AT_GT("@>"), - LT_MONKEYS_AT("<@"), - ; + LT_MONKEYS_AT("<@"); public final String name; - Token(){ + Token() { this(null); } - Token(String name){ + Token(String name) { this.name = name; } } diff --git a/src/main/java/com/alibaba/druid/sql/repository/Schema.java b/src/main/java/com/alibaba/druid/sql/repository/Schema.java index d8a8413324..f8eab4ba7a 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/Schema.java +++ b/src/main/java/com/alibaba/druid/sql/repository/Schema.java @@ -33,11 +33,11 @@ * Created by wenshao on 21/07/2017. */ public class Schema { - private String catalog; - private String name; - protected final Map objects = new ConcurrentHashMap(16, 0.75f, 1); - protected final Map functions = new ConcurrentHashMap(16, 0.75f, 1); - private SchemaRepository repository; + private String catalog; + private String name; + protected final Map objects = new ConcurrentHashMap(16, 0.75f, 1); + protected final Map functions = new ConcurrentHashMap(16, 0.75f, 1); + private SchemaRepository repository; protected Schema(SchemaRepository repository) { this(repository, null); @@ -153,14 +153,13 @@ public boolean isSequence(String name) { && object.getType() == SchemaObjectType.Sequence; } - public SchemaObject findTable(SQLTableSource tableSource, String alias) { if (tableSource instanceof SQLExprTableSource) { if (StringUtils.equalsIgnoreCase(alias, tableSource.computeAlias())) { SQLExprTableSource exprTableSource = (SQLExprTableSource) tableSource; SchemaObject tableObject = exprTableSource.getSchemaObject(); - if (tableObject != null) { + if (tableObject != null) { return tableObject; } diff --git a/src/main/java/com/alibaba/druid/sql/repository/SchemaObject.java b/src/main/java/com/alibaba/druid/sql/repository/SchemaObject.java index cd4755fc81..bf1136ac78 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/SchemaObject.java +++ b/src/main/java/com/alibaba/druid/sql/repository/SchemaObject.java @@ -28,7 +28,7 @@ public class SchemaObject { private final Schema schema; private final String name; - private final long hashCode64; + private final long hashCode64; private final SchemaObjectType type; private SQLStatement statement; diff --git a/src/main/java/com/alibaba/druid/sql/repository/SchemaRepository.java b/src/main/java/com/alibaba/druid/sql/repository/SchemaRepository.java index 47b40fb3df..af03ed671d 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/SchemaRepository.java +++ b/src/main/java/com/alibaba/druid/sql/repository/SchemaRepository.java @@ -30,8 +30,6 @@ import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlRenameTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLShowColumnsStatement; -import com.alibaba.druid.sql.ast.statement.SQLShowCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleCreateTableStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitorAdapter; @@ -55,20 +53,19 @@ public class SchemaRepository { private static Log LOG = LogFactory.getLog(SchemaRepository.class); - private Schema defaultSchema; - protected DbType dbType; - protected DbType schemaDbType; - protected SQLASTVisitor consoleVisitor; - protected Map schemas = new LinkedHashMap(); + private Schema defaultSchema; + protected DbType dbType; + protected DbType schemaDbType; + protected SQLASTVisitor consoleVisitor; + protected Map schemas = new LinkedHashMap(); protected final Map internalFunctions = new ConcurrentHashMap(16, 0.75f, 1); - protected SchemaLoader schemaLoader; + protected SchemaLoader schemaLoader; public SchemaRepository() { - } public SchemaRepository(DbType dbType) { - this (dbType, dbType); + this(dbType, dbType); } public SchemaRepository(DbType dbType, DbType schemaDbType) { @@ -447,8 +444,8 @@ private SchemaResolveVisitor createResolveVisitor(SchemaResolveVisitor.Option... public String resolve(String input) { SchemaResolveVisitor visitor = createResolveVisitor( - SchemaResolveVisitor.Option.ResolveAllColumn, - SchemaResolveVisitor.Option.ResolveIdentifierAlias); + SchemaResolveVisitor.Option.ResolveAllColumn, + SchemaResolveVisitor.Option.ResolveIdentifierAlias); List stmtList = SQLUtils.parseStatements(input, dbType); @@ -548,7 +545,7 @@ public SchemaObject findTable(SQLName name) { String catalog = null; if (owner instanceof SQLIdentifierExpr) { schema = ((SQLIdentifierExpr) owner).getName(); - } else if (owner instanceof SQLPropertyExpr){ + } else if (owner instanceof SQLPropertyExpr) { schema = ((SQLPropertyExpr) owner).getName(); catalog = ((SQLPropertyExpr) owner).getOwnernName(); } else { @@ -608,7 +605,7 @@ public SchemaObject findView(SQLName name) { String catalog = null; if (owner instanceof SQLIdentifierExpr) { schema = ((SQLIdentifierExpr) owner).getName(); - } else if (owner instanceof SQLPropertyExpr){ + } else if (owner instanceof SQLPropertyExpr) { schema = ((SQLPropertyExpr) owner).getName(); catalog = ((SQLPropertyExpr) owner).getOwnernName(); } else { @@ -682,7 +679,6 @@ private boolean renameTable(SQLName name, SQLName to) { return true; } - public SchemaObject findTable(SQLExprTableSource x) { if (x == null) { return null; diff --git a/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitor.java b/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitor.java index a373b7da49..7b37c8f9b7 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitor.java @@ -23,26 +23,24 @@ import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -import static com.alibaba.druid.sql.repository.SchemaResolveVisitorFactory.resolve; -import static com.alibaba.druid.sql.repository.SchemaResolveVisitorFactory.resolveIdent; -import static com.alibaba.druid.sql.repository.SchemaResolveVisitorFactory.resolveUnion; - import java.util.HashMap; import java.util.Map; +import static com.alibaba.druid.sql.repository.SchemaResolveVisitorFactory.*; + /** * Created by wenshao on 03/08/2017. */ public interface SchemaResolveVisitor extends SQLASTVisitor { - boolean isEnabled(Option option); + int getOptions(); public static enum Option { ResolveAllColumn, ResolveIdentifierAlias, - CheckColumnAmbiguous - ; + CheckColumnAmbiguous; + private Option() { mask = (1 << ordinal()); } @@ -67,7 +65,9 @@ public static int of(Option... options) { SchemaRepository getRepository(); Context getContext(); + Context createContext(SQLObject object); + void popContext(); static class Context { @@ -192,7 +192,6 @@ default boolean visit(SQLForeignKeyImpl x) { return false; } - default boolean visit(SQLIdentifierExpr x) { resolveIdent(this, x); return true; diff --git a/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java b/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java index 7392a250f0..284d0faa13 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java +++ b/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java @@ -22,6 +22,8 @@ import com.alibaba.druid.sql.dialect.db2.ast.DB2Object; import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock; import com.alibaba.druid.sql.dialect.db2.visitor.DB2ASTVisitorAdapter; +import com.alibaba.druid.sql.dialect.hive.ast.HiveInsert; +import com.alibaba.druid.sql.dialect.hive.ast.HiveInsertStatement; import com.alibaba.druid.sql.dialect.hive.ast.HiveMultiInsertStatement; import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateTableStatement; import com.alibaba.druid.sql.dialect.hive.visitor.HiveASTVisitorAdapter; @@ -32,8 +34,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.*; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; import com.alibaba.druid.sql.dialect.odps.ast.OdpsCreateTableStatement; -import com.alibaba.druid.sql.dialect.hive.ast.HiveInsert; -import com.alibaba.druid.sql.dialect.hive.ast.HiveInsertStatement; import com.alibaba.druid.sql.dialect.odps.ast.OdpsSelectQueryBlock; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitorAdapter; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.*; @@ -272,7 +272,6 @@ public boolean visit(OracleForStatement x) { index.accept(this); } - if (range != null) { range.accept(this); } @@ -1091,8 +1090,7 @@ static void resolveIdent(SchemaResolveVisitor visitor, SQLIdentifierExpr x) { } else { for (SchemaResolveVisitor.Context parentCtx = ctx; parentCtx != null; - parentCtx = parentCtx.parent) - { + parentCtx = parentCtx.parent) { SQLDeclareItem declareItem = parentCtx.findDeclare(hash); if (declareItem != null) { x.setResolvedDeclareItem(declareItem); @@ -1163,7 +1161,7 @@ static void resolveIdent(SchemaResolveVisitor visitor, SQLIdentifierExpr x) { x.setResolvedColumn(column); } - if (ctxTable instanceof SQLJoinTableSource ) { + if (ctxTable instanceof SQLJoinTableSource) { String alias = tableSource.computeAlias(); if (alias == null || tableSource instanceof SQLWithSubqueryClause.Entry) { return; @@ -1182,8 +1180,7 @@ static void resolveIdent(SchemaResolveVisitor visitor, SQLIdentifierExpr x) { && x.getResolvedTableSource() == null) { for (SchemaResolveVisitor.Context parentCtx = ctx; parentCtx != null; - parentCtx = parentCtx.parent) - { + parentCtx = parentCtx.parent) { SQLDeclareItem declareItem = parentCtx.findDeclare(hash); if (declareItem != null) { x.setResolvedDeclareItem(declareItem); @@ -1211,7 +1208,7 @@ static void resolveIdent(SchemaResolveVisitor visitor, SQLIdentifierExpr x) { if (x.getResolvedColumnObject() == null && ctx.object instanceof SQLSelectQueryBlock) { SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) ctx.object; boolean having = false; - for (SQLObject current = x, parent = x.getParent(); parent != null;current = parent, parent = parent.getParent()) { + for (SQLObject current = x, parent = x.getParent(); parent != null; current = parent, parent = parent.getParent()) { if (parent instanceof SQLSelectGroupByClause && parent.getParent() == queryBlock) { SQLSelectGroupByClause groupBy = (SQLSelectGroupByClause) parent; if (current == groupBy.getHaving()) { @@ -1264,7 +1261,6 @@ static void resolve(SchemaResolveVisitor visitor, SQLPropertyExpr x) { for (SchemaResolveVisitor.Context parentCtx = ctx; parentCtx != null; parentCtx = parentCtx.parent) { - SQLTableSource parentCtxTable = parentCtx.getTableSource(); if (parentCtxTable != null) { @@ -1368,7 +1364,6 @@ static SQLTableSource unwrapAlias(SchemaResolveVisitor.Context ctx, SQLTableSour for (SchemaResolveVisitor.Context parentCtx = ctx; parentCtx != null; parentCtx = parentCtx.parent) { - SQLWithSubqueryClause with = null; if (parentCtx.object instanceof SQLSelect) { SQLSelect select = (SQLSelect) parentCtx.object; @@ -1412,7 +1407,7 @@ static void resolve(SchemaResolveVisitor visitor, SQLSelectQueryBlock x) { from.accept(visitor); } } else if (x.getParent() != null && x.getParent().getParent() instanceof HiveInsert - && x.getParent().getParent().getParent() instanceof HiveMultiInsertStatement){ + && x.getParent().getParent().getParent() instanceof HiveMultiInsertStatement) { HiveMultiInsertStatement insert = (HiveMultiInsertStatement) x.getParent().getParent().getParent(); if (insert.getFrom() instanceof SQLExprTableSource) { from = insert.getFrom(); @@ -1593,7 +1588,10 @@ static void resolve(SchemaResolveVisitor visitor, SQLSelectQueryBlock x) { visitor.popContext(); } - static void extractColumns(SchemaResolveVisitor visitor, SQLTableSource from, String ownerName, List columns) { + static void extractColumns(SchemaResolveVisitor visitor, + SQLTableSource from, + String ownerName, + List columns) { if (from instanceof SQLExprTableSource) { SQLExpr expr = ((SQLExprTableSource) from).getExpr(); @@ -1863,7 +1861,7 @@ static void resolve(SchemaResolveVisitor visitor, SQLExprTableSource x) { annFeature = func.getArguments().get(1); if (annFeature instanceof SQLIdentifierExpr) { ((SQLIdentifierExpr) annFeature).setResolvedTableSource(x); - } else if (annFeature instanceof SQLPropertyExpr) { + } else if (annFeature instanceof SQLPropertyExpr) { ((SQLPropertyExpr) annFeature).setResolvedTableSource(x); } } @@ -1937,8 +1935,8 @@ static void resolve(SchemaResolveVisitor visitor, SQLExprTableSource x) { if (expr instanceof SQLQueryExpr) { SQLSelect select = - ((SQLQueryExpr) expr) - .getSubQuery(); + ((SQLQueryExpr) expr) + .getSubQuery(); visitor.visit(select); @@ -1993,7 +1991,7 @@ static void resolve(SchemaResolveVisitor visitor, SQLMergeStatement x) { on.accept(visitor); } - SQLMergeStatement.MergeUpdateClause updateClause = x.getUpdateClause(); + SQLMergeStatement.MergeUpdateClause updateClause = x.getUpdateClause(); if (updateClause != null) { for (SQLUpdateSetItem item : updateClause.getItems()) { SQLExpr column = item.getColumn(); @@ -2079,7 +2077,6 @@ static void resolve(SchemaResolveVisitor visitor, SQLCreateProcedureStatement x) SQLDeclareItem declareItem = new SQLDeclareItem(x.getName().clone(), null); declareItem.setResolvedObject(x); - SchemaResolveVisitor.Context parentCtx = visitor.getContext(); if (parentCtx != null) { parentCtx.declare(declareItem); @@ -2189,7 +2186,6 @@ static void resolve(SchemaResolveVisitor visitor, SQLOver x) { SQLOrderBy orderBy = x.getOrderBy(); List partitionBy = x.getPartitionBy(); - if (of == null // skip if of is not null && orderBy != null) { orderBy.accept(visitor); @@ -2216,7 +2212,6 @@ private static boolean checkParameter(SchemaResolveVisitor visitor, SQLIdentifie for (SchemaResolveVisitor.Context parentCtx = ctx; parentCtx != null; parentCtx = parentCtx.parent) { - if (parentCtx.object instanceof SQLBlockStatement) { SQLBlockStatement block = (SQLBlockStatement) parentCtx.object; SQLParameter parameter = block.findParameter(hash); @@ -2315,7 +2310,6 @@ static void resolve(SchemaResolveVisitor visitor, SQLForeignKeyConstraint x) { } } - if (repository == null) { return; } @@ -2388,7 +2382,6 @@ static void resolveUnion(SchemaResolveVisitor visitor, SQLUnionQuery x) { && ((SQLUnionQuery) left).getOperator() == operator && !right.isParenthesized() && x.getOrderBy() == null) { - SQLUnionQuery leftUnion = (SQLUnionQuery) left; List rights = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/repository/function/Function.java b/src/main/java/com/alibaba/druid/sql/repository/function/Function.java index 332b3556a3..3586479ec4 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/function/Function.java +++ b/src/main/java/com/alibaba/druid/sql/repository/function/Function.java @@ -4,5 +4,6 @@ public interface Function { FunctionType getType(); FunctionHandler findHandler(); + FunctionHandler findHandler(String signature); } diff --git a/src/main/java/com/alibaba/druid/sql/repository/function/SignatureUtils.java b/src/main/java/com/alibaba/druid/sql/repository/function/SignatureUtils.java index 7e1f0a0d14..f7cc524a4b 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/function/SignatureUtils.java +++ b/src/main/java/com/alibaba/druid/sql/repository/function/SignatureUtils.java @@ -60,9 +60,8 @@ public static Type getJavaType(String signature) { case 'P': return java.sql.Timestamp.class; - default: - break; + break; } } diff --git a/src/main/java/com/alibaba/druid/sql/repository/function/Signatures.java b/src/main/java/com/alibaba/druid/sql/repository/function/Signatures.java index 821faaed73..80839bbb45 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/function/Signatures.java +++ b/src/main/java/com/alibaba/druid/sql/repository/function/Signatures.java @@ -1,5 +1,4 @@ package com.alibaba.druid.sql.repository.function; public class Signatures { - } diff --git a/src/main/java/com/alibaba/druid/sql/semantic/SemanticCheck.java b/src/main/java/com/alibaba/druid/sql/semantic/SemanticCheck.java index 422e13c5a3..67a3c95f99 100644 --- a/src/main/java/com/alibaba/druid/sql/semantic/SemanticCheck.java +++ b/src/main/java/com/alibaba/druid/sql/semantic/SemanticCheck.java @@ -3,14 +3,12 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; import java.util.List; public class SemanticCheck extends SQLASTVisitorAdapter { - public boolean visit(SQLCreateTableStatement stmt) { stmt.containsDuplicateColumnNames(true); return true; diff --git a/src/main/java/com/alibaba/druid/sql/semantic/SemanticException.java b/src/main/java/com/alibaba/druid/sql/semantic/SemanticException.java index fc05990cad..164325524e 100644 --- a/src/main/java/com/alibaba/druid/sql/semantic/SemanticException.java +++ b/src/main/java/com/alibaba/druid/sql/semantic/SemanticException.java @@ -2,7 +2,7 @@ import com.alibaba.druid.FastsqlException; -public class SemanticException extends FastsqlException { +public class SemanticException extends FastsqlException { public SemanticException(String message) { super(message); } diff --git a/src/main/java/com/alibaba/druid/sql/transform/SQLDataTypeTransform.java b/src/main/java/com/alibaba/druid/sql/transform/SQLDataTypeTransform.java index 6f86a1c4e0..722378bed4 100644 --- a/src/main/java/com/alibaba/druid/sql/transform/SQLDataTypeTransform.java +++ b/src/main/java/com/alibaba/druid/sql/transform/SQLDataTypeTransform.java @@ -16,5 +16,4 @@ package com.alibaba.druid.sql.transform; public class SQLDataTypeTransform extends SQLTranformImpl { - } diff --git a/src/main/java/com/alibaba/druid/sql/transform/SQLRefactorVisitor.java b/src/main/java/com/alibaba/druid/sql/transform/SQLRefactorVisitor.java index bc1c2b0fab..ec2cded83e 100644 --- a/src/main/java/com/alibaba/druid/sql/transform/SQLRefactorVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/transform/SQLRefactorVisitor.java @@ -19,10 +19,11 @@ import java.util.Map; public class SQLRefactorVisitor extends SQLASTVisitorAdapter { - private int havingLevel = 0; - private int groupByLevel = 0; + private int havingLevel; + private int groupByLevel; private char quote = '"'; + public SQLRefactorVisitor(DbType dbType) { this.dbType = dbType; @@ -45,7 +46,7 @@ public void addMapping(TableMapping mapping) { } public boolean visit(SQLExprTableSource x) { - TableMapping mapping =findMapping(x); + TableMapping mapping = findMapping(x); if (mapping == null) { return true; } @@ -204,7 +205,6 @@ public boolean visit(SQLPropertyExpr x) { return false; } - private String quote(String name) { char[] chars = new char[name.length() + 2]; name.getChars(0, name.length(), chars, 1); diff --git a/src/main/java/com/alibaba/druid/sql/transform/SQLTranform.java b/src/main/java/com/alibaba/druid/sql/transform/SQLTranform.java index c8991e5c0b..44cdae7dd2 100644 --- a/src/main/java/com/alibaba/druid/sql/transform/SQLTranform.java +++ b/src/main/java/com/alibaba/druid/sql/transform/SQLTranform.java @@ -19,5 +19,6 @@ public interface SQLTranform { DbType getSourceDbType(); + DbType getTargetDbType(); } diff --git a/src/main/java/com/alibaba/druid/sql/transform/SQLUnifiedUtils.java b/src/main/java/com/alibaba/druid/sql/transform/SQLUnifiedUtils.java index 0a5c28b028..48e4ac7d8b 100644 --- a/src/main/java/com/alibaba/druid/sql/transform/SQLUnifiedUtils.java +++ b/src/main/java/com/alibaba/druid/sql/transform/SQLUnifiedUtils.java @@ -15,7 +15,6 @@ * @author lijun.cailj 2020/5/8 */ public class SQLUnifiedUtils { - public static long unifyHash(String sql, DbType type) { String unifySQL = unifySQL(sql, DbType.mysql); return FnvHash.fnv1a_64_lower(unifySQL); diff --git a/src/main/java/com/alibaba/druid/sql/transform/SQLUnifiedVisitor.java b/src/main/java/com/alibaba/druid/sql/transform/SQLUnifiedVisitor.java index 35ac5736f2..3c5b95a331 100644 --- a/src/main/java/com/alibaba/druid/sql/transform/SQLUnifiedVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/transform/SQLUnifiedVisitor.java @@ -17,7 +17,6 @@ import java.util.List; public class SQLUnifiedVisitor extends MySqlASTVisitorAdapter { - @Override public boolean visit(MySqlSelectQueryBlock x) { SchemaRepository repository = new SchemaRepository(DbType.mysql); @@ -57,7 +56,7 @@ public int compare(SQLSelectItem o1, SQLSelectItem o2) { x.getWhere().accept(this); } - if(x.getGroupBy() != null) { + if (x.getGroupBy() != null) { x.getGroupBy().accept(this); } return false; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitor.java index 8f1363b6c6..1b9fd65be7 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitor.java @@ -17,9 +17,9 @@ import java.util.List; - public interface ExportParameterVisitor extends SQLASTVisitor { boolean isParameterizedMergeInList(); + void setParameterizedMergeInList(boolean flag); List getParameters(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java index c48f668c82..56951df545 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java @@ -29,7 +29,6 @@ import java.util.List; public final class ExportParameterVisitorUtils { - //private for util class not need new instance private ExportParameterVisitorUtils() { super(); @@ -62,8 +61,6 @@ public static ExportParameterVisitor createExportParameterVisitor(Appendable out } } - - public static boolean exportParamterAndAccept(final List parameters, List list) { for (int i = 0, size = list.size(); i < size; ++i) { SQLExpr param = list.get(i); @@ -88,7 +85,7 @@ public static SQLExpr exportParameter(final List parameters, final SQLEx // value = StringUtils.removeNameQuotes(vStr); // } replace = true; - } else if ( param instanceof SQLNCharExpr) { + } else if (param instanceof SQLNCharExpr) { value = ((SQLNCharExpr) param).getText(); replace = true; } else if (param instanceof SQLBooleanExpr) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterizedOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterizedOutputVisitor.java index 5eebf275c0..c1d897064f 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterizedOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterizedOutputVisitor.java @@ -19,13 +19,14 @@ import java.util.List; public class ExportParameterizedOutputVisitor extends SQLASTOutputVisitor implements ExportParameterVisitor { - /** * true= if require parameterized sql output */ private final boolean requireParameterizedOutput; - public ExportParameterizedOutputVisitor(final List parameters,final Appendable appender,final boolean wantParameterizedOutput){ + public ExportParameterizedOutputVisitor(final List parameters, + final Appendable appender, + final boolean wantParameterizedOutput) { super(appender, true); this.parameters = parameters; this.requireParameterizedOutput = wantParameterizedOutput; @@ -35,15 +36,14 @@ public ExportParameterizedOutputVisitor() { this(new ArrayList()); } - public ExportParameterizedOutputVisitor(final List parameters){ - this(parameters,new StringBuilder(),false); + public ExportParameterizedOutputVisitor(final List parameters) { + this(parameters, new StringBuilder(), false); } public ExportParameterizedOutputVisitor(final Appendable appender) { this(new ArrayList(), appender, true); } - public List getParameters() { return parameters; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java index db45ddc5e1..76d27838c9 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java @@ -47,27 +47,27 @@ import java.util.TimeZone; public class ParameterizedOutputVisitorUtils { - private final static SQLParserFeature[] defaultFeatures = { + private static final SQLParserFeature[] defaultFeatures = { SQLParserFeature.EnableSQLBinaryOpExprGroup, SQLParserFeature.UseInsertColumnsCache, SQLParserFeature.OptimizedForParameterized, }; - private final static SQLParserFeature[] defaultFeatures2 = { + private static final SQLParserFeature[] defaultFeatures2 = { SQLParserFeature.EnableSQLBinaryOpExprGroup, SQLParserFeature.UseInsertColumnsCache, SQLParserFeature.OptimizedForParameterized, SQLParserFeature.OptimizedForForParameterizedSkipValue, }; - private final static SQLParserFeature[] defaultFeatures_tddl = { + private static final SQLParserFeature[] defaultFeatures_tddl = { SQLParserFeature.EnableSQLBinaryOpExprGroup, SQLParserFeature.UseInsertColumnsCache, SQLParserFeature.OptimizedForParameterized, SQLParserFeature.TDDLHint, }; - private final static SQLParserFeature[] defaultFeatures2_tddl = { + private static final SQLParserFeature[] defaultFeatures2_tddl = { SQLParserFeature.EnableSQLBinaryOpExprGroup, SQLParserFeature.UseInsertColumnsCache, SQLParserFeature.OptimizedForParameterized, @@ -79,47 +79,54 @@ public static String parameterize(String sql, DbType dbType) { return parameterize(sql, dbType, null, null); } - public static String parameterize(String sql, DbType dbType, VisitorFeature...features) { + public static String parameterize(String sql, DbType dbType, VisitorFeature... features) { return parameterize(sql, dbType, null, features); } - public static String parameterize(String sql - , DbType dbType - , SQLSelectListCache selectListCache) { + public static String parameterize( + String sql, + DbType dbType, + SQLSelectListCache selectListCache) { return parameterize(sql, dbType, selectListCache, null); } - public static String parameterize(String sql - , DbType dbType - , List outParameters) { + public static String parameterize( + String sql, + DbType dbType, + List outParameters) { return parameterize(sql, dbType, null, outParameters); } - public static String parameterize(String sql - , DbType dbType - , List outParameters, VisitorFeature ...features) { + public static String parameterize( + String sql, + DbType dbType, + List outParameters, + VisitorFeature... features) { return parameterize(sql, dbType, null, outParameters, features); } - public static String parameterizeForTDDL(String sql - , DbType dbType - , List outParameters, VisitorFeature ...features) { + public static String parameterizeForTDDL( + String sql, + DbType dbType, + List outParameters, + VisitorFeature... features) { return parameterizeForTDDL(sql, dbType, null, outParameters, features); } - private static void configVisitorFeatures(ParameterizedVisitor visitor, VisitorFeature ...features) { - if(features != null) { + private static void configVisitorFeatures(ParameterizedVisitor visitor, VisitorFeature... features) { + if (features != null) { for (int i = 0; i < features.length; i++) { visitor.config(features[i], true); } } } - public static String parameterize(String sql - , DbType dbType - , SQLSelectListCache selectListCache - , List outParameters - , VisitorFeature ...visitorFeatures) { + public static String parameterize( + String sql, + DbType dbType, + SQLSelectListCache selectListCache, + List outParameters, + VisitorFeature... visitorFeatures) { final SQLParserFeature[] features = outParameters == null ? defaultFeatures2 : defaultFeatures; @@ -127,11 +134,12 @@ public static String parameterize(String sql return parameterize(sql, dbType, selectListCache, outParameters, features, visitorFeatures); } - public static String parameterizeForTDDL(String sql - , DbType dbType - , SQLSelectListCache selectListCache - , List outParameters - , VisitorFeature ...visitorFeatures) { + public static String parameterizeForTDDL( + String sql, + DbType dbType, + SQLSelectListCache selectListCache, + List outParameters, + VisitorFeature... visitorFeatures) { final SQLParserFeature[] features = outParameters == null ? defaultFeatures2_tddl : defaultFeatures_tddl; @@ -139,12 +147,13 @@ public static String parameterizeForTDDL(String sql return parameterize(sql, dbType, selectListCache, outParameters, features, visitorFeatures); } - public static String parameterize(String sql - , DbType dbType - , SQLSelectListCache selectListCache - , List outParameters - , SQLParserFeature[] features - , VisitorFeature ...visitorFeatures) { + public static String parameterize( + String sql, + DbType dbType, + SQLSelectListCache selectListCache, + List outParameters, + SQLParserFeature[] features, + VisitorFeature... visitorFeatures) { SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType, features); if (selectListCache != null) { @@ -203,7 +212,6 @@ public static String parameterize(String sql if (visitor.getReplaceCount() == 0 && parser.getLexer().getCommentCount() == 0 && sql.charAt(0) != '/') { - boolean notUseOriginalSql = false; if (visitorFeatures != null) { for (VisitorFeature visitorFeature : visitorFeatures) { @@ -232,24 +240,27 @@ public static String parameterize(String sql return out.toString(); } - public static long parameterizeHash(String sql - , DbType dbType - , List outParameters) { + public static long parameterizeHash( + String sql, + DbType dbType, + List outParameters) { return parameterizeHash(sql, dbType, null, outParameters, null); } - public static long parameterizeHash(String sql - , DbType dbType - , SQLSelectListCache selectListCache - , List outParameters) { + public static long parameterizeHash( + String sql, + DbType dbType, + SQLSelectListCache selectListCache, + List outParameters) { return parameterizeHash(sql, dbType, selectListCache, outParameters, null); } - public static long parameterizeHash(String sql - , DbType dbType - , SQLSelectListCache selectListCache - , List outParameters, VisitorFeature ...visitorFeatures) { - + public static long parameterizeHash( + String sql, + DbType dbType, + SQLSelectListCache selectListCache, + List outParameters, + VisitorFeature... visitorFeatures) { final SQLParserFeature[] features = outParameters == null ? defaultFeatures2 : defaultFeatures; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedVisitor.java index 87f06bdbd4..f55a176a42 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedVisitor.java @@ -20,7 +20,6 @@ import java.util.List; public interface ParameterizedVisitor extends PrintableVisitor { - int getReplaceCount(); void incrementReplaceCunt(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index 4a095f7d39..663adb37fe 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -67,18 +67,18 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet } protected final Appendable appender; - protected int indentCount = 0; + protected int indentCount; protected boolean ucase = true; protected int selectListNumberOfLine = 5; - protected boolean groupItemSingleLine = false; + protected boolean groupItemSingleLine; protected List parameters; protected List inputParameters; - protected Set tables; - protected String table; // for improved + protected Set tables; + protected String table; // for improved - protected boolean exportTables = false; + protected boolean exportTables; protected DbType dbType; @@ -86,35 +86,34 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet protected int replaceCount; - protected boolean parameterizedMergeInList = false; - protected boolean parameterizedQuesUnMergeInList = false; - protected boolean parameterizedQuesUnMergeValuesList = false; - protected boolean printNameQuote = false; - protected char quote = '"'; + protected boolean parameterizedMergeInList; + protected boolean parameterizedQuesUnMergeInList; + protected boolean parameterizedQuesUnMergeValuesList; + protected boolean printNameQuote; + protected char quote = '"'; - protected boolean parameterized = false; - protected boolean shardingSupport = false; + protected boolean parameterized; + protected boolean shardingSupport; - protected transient int lines = 0; + protected transient int lines; private TimeZone timeZone; - protected Boolean printStatementAfterSemi = defaultPrintStatementAfterSemi; { features |= VisitorFeature.OutputPrettyFormat.mask; } - public SQLASTOutputVisitor(Appendable appender){ + public SQLASTOutputVisitor(Appendable appender) { this.appender = appender; } - public SQLASTOutputVisitor(Appendable appender, DbType dbType){ + public SQLASTOutputVisitor(Appendable appender, DbType dbType) { this.appender = appender; this.dbType = dbType; } - public SQLASTOutputVisitor(Appendable appender, boolean parameterized){ + public SQLASTOutputVisitor(Appendable appender, boolean parameterized) { this.appender = appender; this.config(VisitorFeature.OutputParameterized, parameterized); } @@ -192,7 +191,6 @@ public void setInputParameters(List parameters) { } /** - * * @since 1.1.5 */ public void setOutputParameters(List parameters) { @@ -471,10 +469,7 @@ private static int paramCount(SQLExpr x) { protected void printSelectList(List selectList) { this.indentCount++; - for (int i = 0, lineItemCount = 0, size = selectList.size() - ; i < size - ; ++i, ++lineItemCount) - { + for (int i = 0, lineItemCount = 0, size = selectList.size(); i < size; ++i, ++lineItemCount) { SQLSelectItem selectItem = selectList.get(i); SQLExpr selectItemExpr = selectItem.getExpr(); @@ -728,7 +723,6 @@ public boolean visit(SQLBinaryOpExprGroup x) { break; } - if (firstLeft == null) { firstLeft = binaryItem.getLeft(); firstOp = binaryItem.getOperator(); @@ -847,7 +841,7 @@ public boolean visit(SQLBinaryOpExpr x) { && inputParameters.size() > 0 && operator == SQLBinaryOperator.Equality && x.getRight() instanceof SQLVariantRefExpr - ) { + ) { SQLVariantRefExpr right = (SQLVariantRefExpr) x.getRight(); int index = right.getIndex(); if (index >= 0 && index < inputParameters.size()) { @@ -865,7 +859,7 @@ public boolean visit(SQLBinaryOpExpr x) { SQLObject parent = x.getParent(); boolean isRoot = parent instanceof SQLSelectQueryBlock; boolean relational = operator == SQLBinaryOperator.BooleanAnd - || operator == SQLBinaryOperator.BooleanOr; + || operator == SQLBinaryOperator.BooleanOr; if (isRoot && relational) { this.indentCount++; @@ -888,7 +882,7 @@ public boolean visit(SQLBinaryOpExpr x) { } if (param instanceof Collection) { - Collection values = (Collection) param; + Collection values = (Collection) param; if (values.size() > 0) { print('('); @@ -929,10 +923,9 @@ public boolean visit(SQLBinaryOpExpr x) { return false; } - for (;;) { + for (; ; ) { if (left instanceof SQLBinaryOpExpr && ((SQLBinaryOpExpr) left).getOperator() == operator - && operator != SQLBinaryOperator.IsNot && operator != SQLBinaryOperator.Is) - { + && operator != SQLBinaryOperator.IsNot && operator != SQLBinaryOperator.Is) { SQLBinaryOpExpr binaryLeft = (SQLBinaryOpExpr) left; groupList.add(binaryLeft.getRight()); left = binaryLeft.getLeft(); @@ -1002,7 +995,7 @@ && isPrettyFormat() } protected void printOperator(SQLBinaryOperator operator) { - print0(ucase ? operator.name : operator.name_lcase); + print0(ucase ? operator.name : operator.nameLCase); } private void visitorBinaryRight(SQLBinaryOpExpr x) { @@ -1191,9 +1184,9 @@ protected void printTableSource(SQLTableSource x) { Class clazz = x.getClass(); if (clazz == SQLJoinTableSource.class) { visit((SQLJoinTableSource) x); - } else if (clazz == SQLExprTableSource.class) { + } else if (clazz == SQLExprTableSource.class) { visit((SQLExprTableSource) x); - } else if (clazz == SQLSubqueryTableSource.class) { + } else if (clazz == SQLSubqueryTableSource.class) { visit((SQLSubqueryTableSource) x); } else { x.accept(this); @@ -1533,7 +1526,6 @@ public String unwrapShardingTable(String name) { } private boolean printName(SQLName x, String name, boolean shardingSupport) { - if (shardingSupport) { SQLObject parent = x.getParent(); shardingSupport = parent instanceof SQLExprTableSource || parent instanceof SQLPropertyExpr; @@ -1602,7 +1594,7 @@ public boolean visit(SQLInListExpr x) { || expr instanceof SQLBetweenExpr || expr instanceof SQLInListExpr || expr instanceof SQLUnaryExpr - || expr instanceof SQLBinaryOpExprGroup){ + || expr instanceof SQLBinaryOpExprGroup) { quote = true; } @@ -1651,7 +1643,7 @@ public boolean visit(SQLInListExpr x) { print(ucase ? " IN" : " in"); } - if((!parameterizedQuesUnMergeInList) || (targetList.size() == 1 && !(targetList.get(0) instanceof SQLListExpr))) { + if ((!parameterizedQuesUnMergeInList) || (targetList.size() == 1 && !(targetList.get(0) instanceof SQLListExpr))) { // if (parameters != null) { // print(" ("); // for (int i = 0; i < targetList.size(); i++) { @@ -1670,7 +1662,7 @@ public boolean visit(SQLInListExpr x) { } else { print(" ("); for (int i = 0; i < targetList.size(); i++) { - if(i != 0) { + if (i != 0) { print(", "); } SQLExpr item = targetList.get(i); @@ -1862,7 +1854,7 @@ protected void printInteger(SQLIntegerExpr x, boolean parameterized) { print('?'); incrementReplaceCunt(); - if(this.parameters != null){ + if (this.parameters != null) { ExportParameterVisitorUtils.exportParameter(this.parameters, x); } return; @@ -1883,9 +1875,9 @@ public boolean visit(SQLMethodInvokeExpr x) { if (parameterized) { List arguments = x.getArguments(); - if(x.methodNameHashCode64() == FnvHash.Constants.TRIM + if (x.methodNameHashCode64() == FnvHash.Constants.TRIM && arguments.size() == 1 - && arguments.get(0) instanceof SQLCharExpr && x.getTrimOption() == null && x.getFrom() == null){ + && arguments.get(0) instanceof SQLCharExpr && x.getTrimOption() == null && x.getFrom() == null) { print('?'); if (parameters != null) { @@ -2001,7 +1993,6 @@ protected void printMethodParameters(SQLMethodInvokeExpr x) { } } - print(')'); if (odpsTransformUsing) { @@ -2020,7 +2011,6 @@ protected void printFunctionName(String name) { } public boolean visit(SQLAggregateExpr x) { - boolean parameterized = this.parameterized; if (x.methodNameHashCode64() == FnvHash.Constants.GROUP_CONCAT) { this.parameterized = false; @@ -2120,7 +2110,7 @@ public boolean visit(SQLNCharExpr x) { print('?'); incrementReplaceCunt(); - if(this.parameters != null){ + if (this.parameters != null) { ExportParameterVisitorUtils.exportParameter(this.parameters, x); } return false; @@ -2146,7 +2136,7 @@ public boolean visit(SQLNotExpr x) { SQLBinaryOpExpr binaryOpExpr = (SQLBinaryOpExpr) expr; needQuote = binaryOpExpr.getOperator().isLogical(); } else if (expr instanceof SQLInListExpr || expr instanceof SQLNotExpr - || expr instanceof SQLBinaryOpExprGroup) { + || expr instanceof SQLBinaryOpExprGroup) { needQuote = true; } @@ -2171,11 +2161,11 @@ public boolean visit(SQLNullExpr x) { SQLObject parent = x.getParent(); if (this.parameterized && (parent instanceof ValuesClause || parent instanceof SQLInListExpr || - (parent instanceof SQLBinaryOpExpr && ((SQLBinaryOpExpr)parent).getOperator() == SQLBinaryOperator.Equality))) { + (parent instanceof SQLBinaryOpExpr && ((SQLBinaryOpExpr) parent).getOperator() == SQLBinaryOperator.Equality))) { print('?'); incrementReplaceCunt(); - if(this.parameters != null){ + if (this.parameters != null) { if (parent instanceof SQLBinaryOpExpr) { ExportParameterVisitorUtils.exportParameter((this).getParameters(), x); } else { @@ -2194,7 +2184,7 @@ public boolean visit(SQLNumberExpr x) { print('?'); incrementReplaceCunt(); - if(this.parameters != null){ + if (this.parameters != null) { ExportParameterVisitorUtils.exportParameter((this).getParameters(), x); } return false; @@ -2230,7 +2220,7 @@ public boolean visit(SQLPropertyExpr x) { } if (mapTableName != null) { - for (SQLObject parent = x.getParent();parent != null; parent = parent.getParent()) { + for (SQLObject parent = x.getParent(); parent != null; parent = parent.getParent()) { if (parent instanceof SQLSelectQueryBlock) { SQLTableSource from = ((SQLSelectQueryBlock) parent).getFrom(); if (isTableSourceAlias(from, mapTableName, ownerName)) { @@ -2246,9 +2236,11 @@ public boolean visit(SQLPropertyExpr x) { } else { if (owner instanceof SQLIdentifierExpr) { SQLIdentifierExpr ownerIdent = (SQLIdentifierExpr) owner; - printName(ownerIdent - , ownerIdent.getName() - , this.shardingSupport && this.parameterized); + printName( + ownerIdent, + ownerIdent.getName(), + this.shardingSupport && this.parameterized + ); } else { printExpr(owner, parameterized); } @@ -2273,8 +2265,8 @@ protected boolean isTableSourceAlias(SQLTableSource from, String... tableNames) } } - if (alias.length() > 2 && alias.charAt(0) == '`' && alias.charAt(alias.length() -1) == '`') { - alias = alias.substring(1, alias.length() -1); + if (alias.length() > 2 && alias.charAt(0) == '`' && alias.charAt(alias.length() - 1) == '`') { + alias = alias.substring(1, alias.length() - 1); for (String tableName : tableNames) { if (alias.equalsIgnoreCase(tableName)) { return true; @@ -2317,7 +2309,7 @@ public boolean visit(SQLQueryExpr x) { } else if (parent instanceof SQLMethodInvokeExpr && ((SQLMethodInvokeExpr) parent).getArguments().size() == 1 && (((SQLMethodInvokeExpr) parent).methodNameHashCode64() == FnvHash.Constants.LATERAL - || ((SQLMethodInvokeExpr) parent).methodNameHashCode64() == FnvHash.Constants.ARRAY) + || ((SQLMethodInvokeExpr) parent).methodNameHashCode64() == FnvHash.Constants.ARRAY) ) { this.indentCount++; println(); @@ -2337,7 +2329,6 @@ public boolean visit(SQLQueryExpr x) { } public boolean visit(SQLSelectGroupByClause x) { - boolean paren = DbType.oracle == dbType || x.isParen(); boolean rollup = x.isWithRollUp(); boolean cube = x.isWithCube(); @@ -2457,7 +2448,7 @@ public boolean visit(SQLSelectQueryBlock x) { print(' '); } - final boolean informix =DbType.informix == dbType; + final boolean informix = DbType.informix == dbType; if (informix) { printFetchFirst(x); } @@ -2644,10 +2635,13 @@ public boolean visit(SQLSelectItem x) { char ch = alias.charAt(i); if (ch < 256) { if (ch >= '0' && ch <= '9') { + // skip } else if (ch >= 'a' && ch <= 'z') { + // skip } else if (ch >= 'A' && ch <= 'Z') { + // skip } else if (ch == '_' || ch == '$') { - + // skip } else { special = true; } @@ -2747,7 +2741,7 @@ public boolean visit(SQLSelectOrderByItem x) { SQLOrderingSpecification type = x.getType(); if (type != null) { print(' '); - print0(ucase ? type.name : type.name_lcase); + print0(ucase ? type.name : type.nameLCase); } String collate = x.getCollate(); @@ -3017,7 +3011,7 @@ public void printParameter(Object param) { } if (param instanceof Number // - || param instanceof Boolean || param instanceof java.time.temporal.Temporal ) { + || param instanceof Boolean || param instanceof java.time.temporal.Temporal) { print0(param.toString()); return; } @@ -3105,7 +3099,7 @@ public boolean visit(SQLDropTableStatement x) { if (hints != null) { printAndAccept(hints, " "); print(' '); - }; + } if (x.isExternal()) { print0(ucase ? "EXTERNAL " : "external "); @@ -3245,10 +3239,10 @@ public boolean visit(SQLColumnDefinition x) { for (SQLColumnConstraint item : x.getConstraints()) { boolean newLine = item instanceof SQLForeignKeyConstraint // - || item instanceof SQLPrimaryKey // - || item instanceof SQLColumnCheck // - || item instanceof SQLColumnCheck // - || item.getName() != null; + || item instanceof SQLPrimaryKey // + || item instanceof SQLColumnCheck // + || item instanceof SQLColumnCheck // + || item.getName() != null; if (newLine) { this.indentCount++; println(); @@ -3505,7 +3499,7 @@ public boolean visit(SQLUpdateStatement x) { if (i != 0) { print0(", "); } - SQLUpdateSetItem item = (SQLUpdateSetItem)x.getItems().get(i); + SQLUpdateSetItem item = (SQLUpdateSetItem) x.getItems().get(i); visit(item); } @@ -3680,13 +3674,13 @@ public boolean visit(SQLNotNullConstraint x) { public boolean visit(SQLNullConstraint x) { SQLName name = x.getName(); - if (name != null) { - print0(ucase ? "CONSTRAINT " : "constraint "); + if (name != null) { + print0(ucase ? "CONSTRAINT " : "constraint "); name.accept(this); - print(' '); - } - print0(ucase ? "NULL" : "null"); - return false; + print(' '); + } + print0(ucase ? "NULL" : "null"); + return false; } @Override @@ -3698,7 +3692,7 @@ public boolean visit(SQLUnionQuery x) { for (int i = 0; i < relations.size(); i++) { if (i != 0) { println(); - print0(ucase ? operator.name : operator.name_lcase); + print0(ucase ? operator.name : operator.nameLCase); println(); } @@ -3732,7 +3726,6 @@ public boolean visit(SQLUnionQuery x) { && !right.isParenthesized() && x.getLimit() == null && orderBy == null) { - SQLUnionQuery leftUnion = (SQLUnionQuery) left; if (right instanceof SQLSelectQueryBlock) { @@ -3782,7 +3775,7 @@ public boolean visit(SQLUnionQuery x) { if (i > 0) { println(); - print0(ucase ? operator.name : operator.name_lcase); + print0(ucase ? operator.name : operator.nameLCase); println(); } } @@ -3794,7 +3787,7 @@ public boolean visit(SQLUnionQuery x) { } if (left != null) { - for (;;) { + for (; ; ) { if (left.getClass() == SQLUnionQuery.class) { SQLUnionQuery leftUnion = (SQLUnionQuery) left; if (leftUnion.getRelations().size() > 2) { @@ -3809,16 +3802,14 @@ public boolean visit(SQLUnionQuery x) { && leftUnion.getOrderBy() == null) { if (leftLeft.getClass() == SQLUnionQuery.class) { visit((SQLUnionQuery) leftLeft); - } - else { + } else { printQuery(leftLeft); } println(); - print0(ucase ? leftUnion.getOperator().name : leftUnion.getOperator().name_lcase); + print0(ucase ? leftUnion.getOperator().name : leftUnion.getOperator().nameLCase); println(); leftRigt.accept(this); - } - else { + } else { visit(leftUnion); } } @@ -3834,7 +3825,7 @@ public boolean visit(SQLUnionQuery x) { } println(); - print0(ucase ? operator.name : operator.name_lcase); + print0(ucase ? operator.name : operator.nameLCase); println(); boolean needParen = false; @@ -3913,7 +3904,7 @@ public boolean visit(SQLHexExpr x) { print('?'); incrementReplaceCunt(); - if(this.parameters != null){ + if (this.parameters != null) { ExportParameterVisitorUtils.exportParameter(this.parameters, x); } return false; @@ -3933,7 +3924,7 @@ public boolean visit(SQLHexExpr x) { @Override public boolean visit(SQLSetStatement x) { - if(x.getHeadHintsDirect() != null) { + if (x.getHeadHintsDirect() != null) { for (SQLCommentHint hint : x.getHeadHintsDirect()) { hint.accept(this); } @@ -4037,7 +4028,7 @@ public boolean visit(SQLJoinTableSource x) { boolean asof = x.isAsof(); if (asof) { - print0(ucase ? " ASOF ": " asof"); + print0(ucase ? " ASOF " : " asof"); } if (x.isNatural()) { @@ -4065,7 +4056,7 @@ public boolean visit(SQLJoinTableSource x) { if (condition != null) { boolean newLine = false; - if(right instanceof SQLSubqueryTableSource) { + if (right instanceof SQLSubqueryTableSource) { newLine = true; } else if (condition instanceof SQLBinaryOpExpr) { SQLBinaryOperator op = ((SQLBinaryOpExpr) condition).getOperator(); @@ -4129,11 +4120,12 @@ public boolean visit(SQLJoinTableSource.UDJ x) { } protected void printJoinType(JoinType joinType) { - print0(ucase ? joinType.name : joinType.name_lcase); + print0(ucase ? joinType.name : joinType.nameLCase); } static String[] variantValuesCache_1 = new String[64]; static String[] variantValuesCache = new String[64]; + static { for (int len = 0; len < variantValuesCache_1.length; ++len) { StringBuffer buf = new StringBuffer(); @@ -4230,7 +4222,6 @@ && isEnabled(VisitorFeature.OutputUseInsertValueClauseOriginalString) print('('); this.indentCount++; - for (int i = 0, size = values.size(); i < size; ++i) { if (i != 0) { if (i % 5 == 0) { @@ -4270,11 +4261,11 @@ && isEnabled(VisitorFeature.OutputUseInsertValueClauseOriginalString) } else { expr.accept(this); } - } else if (value instanceof Integer){ + } else if (value instanceof Integer) { print(((Integer) value).intValue()); - } else if (value instanceof Long){ + } else if (value instanceof Long) { print(((Long) value).longValue()); - } else if (value instanceof String){ + } else if (value instanceof String) { printChars((String) value); } else if (value instanceof Float) { print(((Float) value).floatValue()); @@ -4416,7 +4407,6 @@ public boolean visit(SQLUnnestTableSource x) { printAndAccept(items, ", "); print(')'); - if (x.isOrdinality()) { print0(ucase ? " WITH ORDINALITY" : " with ordinality"); } @@ -4425,7 +4415,7 @@ public boolean visit(SQLUnnestTableSource x) { final String alias = x.getAlias(); if (alias != null) { if (columns.size() > 0) { - print0(ucase ?" AS " : " as "); + print0(ucase ? " AS " : " as "); } else { print(' '); } @@ -4443,7 +4433,6 @@ public boolean visit(SQLUnnestTableSource x) { print(')'); } - return false; } @@ -4479,27 +4468,27 @@ public boolean visit(SQLTruncateStatement x) { } if (x.isDropStorage()) { - print0(ucase ? " DROP STORAGE" : " drop storage"); + print0(ucase ? " DROP STORAGE" : " drop storage"); } - + if (x.isReuseStorage()) { - print0(ucase ? " REUSE STORAGE" : " reuse storage"); + print0(ucase ? " REUSE STORAGE" : " reuse storage"); } - + if (x.isIgnoreDeleteTriggers()) { - print0(ucase ? " IGNORE DELETE TRIGGERS" : " ignore delete triggers"); + print0(ucase ? " IGNORE DELETE TRIGGERS" : " ignore delete triggers"); } - + if (x.isRestrictWhenDeleteTriggers()) { - print0(ucase ? " RESTRICT WHEN DELETE TRIGGERS" : " restrict when delete triggers"); + print0(ucase ? " RESTRICT WHEN DELETE TRIGGERS" : " restrict when delete triggers"); } - + if (x.isContinueIdentity()) { print0(ucase ? " CONTINUE IDENTITY" : " continue identity"); } - + if (x.isImmediate()) { - print0(ucase ? " IMMEDIATE" : " immediate"); + print0(ucase ? " IMMEDIATE" : " immediate"); } return false; @@ -4513,7 +4502,6 @@ public boolean visit(SQLDefaultExpr x) { @Override public void endVisit(SQLCommentStatement x) { - } @Override @@ -4593,7 +4581,6 @@ public boolean visit(SQLAlterTableDeleteByCondition x) { @Override public void endVisit(SQLAlterTableAddColumn x) { - } @Override @@ -4714,7 +4701,7 @@ public boolean visit(SQLCommentHint x) { @Override public boolean visit(SQLCreateDatabaseStatement x) { - if(x.getHeadHintsDirect() != null) { + if (x.getHeadHintsDirect() != null) { for (SQLCommentHint hint : x.getHeadHintsDirect()) { hint.accept(this); } @@ -4748,7 +4735,6 @@ public boolean visit(SQLCreateDatabaseStatement x) { print0(collate); } - final SQLExpr comment = x.getComment(); if (comment != null) { print0(ucase ? " COMMENT " : " comment "); @@ -5161,7 +5147,7 @@ public boolean visit(SQLOver x) { if (windowingBetweenEnd != null || endBound != null) { if (windowingType != null) { print(' '); - print0(ucase ? windowingType.name : windowingType.name_lower); + print0(ucase ? windowingType.name : windowingType.nameLCase); } print0(ucase ? " BETWEEN" : " between"); @@ -5169,7 +5155,7 @@ public boolean visit(SQLOver x) { if (beginBound != null) { print(' '); - print0(ucase ? beginBound.name : beginBound.name_lower); + print0(ucase ? beginBound.name : beginBound.nameLCase); } print0(ucase ? " AND" : " and"); @@ -5178,26 +5164,26 @@ public boolean visit(SQLOver x) { if (endBound != null) { print(' '); - print0(ucase ? endBound.name : endBound.name_lower); + print0(ucase ? endBound.name : endBound.nameLCase); } } else { if (windowingType != null) { print(' '); - print0(ucase ? windowingType.name : windowingType.name_lower); + print0(ucase ? windowingType.name : windowingType.nameLCase); } printWindowingExpr(windowingBetweenBegin); if (beginBound != null) { print(' '); - print0(ucase ? beginBound.name : beginBound.name_lower); + print0(ucase ? beginBound.name : beginBound.nameLCase); } } if (x.isExcludeCurrentRow()) { print0(ucase ? " EXCLUDE CURRENT ROW" : " exclude current row"); } - + print(')'); return false; } @@ -5214,18 +5200,18 @@ void printWindowingExpr(SQLExpr expr) { expr.accept(this); } } - + @Override public boolean visit(SQLKeep x) { if (x.getDenseRank() == SQLKeep.DenseRank.FIRST) { - print0(ucase ? "KEEP (DENSE_RANK FIRST " : "keep (dense_rank first "); + print0(ucase ? "KEEP (DENSE_RANK FIRST " : "keep (dense_rank first "); } else { print0(ucase ? "KEEP (DENSE_RANK LAST " : "keep (dense_rank last "); } - + x.getOrderBy().accept(this); print(')'); - + return false; } @@ -5335,7 +5321,7 @@ public boolean visit(SQLWithSubqueryClause.Entry x) { @Override public boolean visit(SQLAlterTableModifyClusteredBy x) { print0(ucase ? "CLUSTERED BY " : "clustered by "); - if(!x.getClusterColumns().isEmpty()) { + if (!x.getClusterColumns().isEmpty()) { printAndAccept(x.getClusterColumns(), ", "); } else { print0("()"); @@ -5347,7 +5333,7 @@ public boolean visit(SQLAlterTableModifyClusteredBy x) { public boolean visit(SQLAlterTableAlterColumn x) { if (DbType.odps == dbType) { print0(ucase ? "CHANGE COLUMN " : "change column "); - } else if (DbType.hive == dbType) { + } else if (DbType.hive == dbType) { print0(ucase ? "CHANGE " : "change "); } else { print0(ucase ? "ALTER COLUMN " : "alter column "); @@ -5656,7 +5642,7 @@ public boolean visit(SQLCreateIndexStatement x) { } if (x.getIndexDefinition().hasOptions()) { - String using = x.getIndexDefinition().getOptions().getIndexType(); + String using = x.getIndexDefinition().getOptions().getIndexType(); if (using != null) { print0(ucase ? " USING " : " using "); print0(ucase ? using.toUpperCase() : using.toLowerCase()); @@ -5735,17 +5721,17 @@ public boolean visit(SQLColumnReference x) { SQLForeignKeyImpl.Match match = x.getReferenceMatch(); if (match != null) { print0(ucase ? " MATCH " : " match "); - print0(ucase ? match.name : match.name_lcase); + print0(ucase ? match.name : match.nameLCase); } if (x.getOnDelete() != null) { print0(ucase ? " ON DELETE " : " on delete "); - print0(ucase ? x.getOnDelete().name : x.getOnDelete().name_lcase); + print0(ucase ? x.getOnDelete().name : x.getOnDelete().nameLCase); } if (x.getOnUpdate() != null) { print0(ucase ? " ON UPDATE " : " on update "); - print0(ucase ? x.getOnUpdate().name : x.getOnUpdate().name_lcase); + print0(ucase ? x.getOnUpdate().name : x.getOnUpdate().nameLCase); } return false; @@ -5802,7 +5788,6 @@ public boolean visit(SQLDropSequenceStatement x) { @Override public void endVisit(SQLDropSequenceStatement x) { - } @Override @@ -5818,7 +5803,6 @@ public boolean visit(SQLDropTriggerStatement x) { @Override public void endVisit(SQLDropUserStatement x) { - } @Override @@ -5883,7 +5867,6 @@ public boolean visit(SQLExplainStatement x) { } protected void printGrantPrivileges(SQLGrantStatement x) { - } @Override @@ -5965,7 +5948,7 @@ protected void printGrantOn(SQLGrantStatement x) { SQLObjectType resourceType = x.getResourceType(); if (resourceType != null) { - print0(ucase ? resourceType.name : resourceType.name_lcase); + print0(ucase ? resourceType.name : resourceType.nameLCase); print(' '); } @@ -6411,7 +6394,6 @@ public boolean visit(SQLUnionQueryTableSource x) { @Override public boolean visit(SQLTimestampExpr x) { - if (this.parameterized) { print('?'); incrementReplaceCunt(); @@ -6592,7 +6574,7 @@ public boolean visit(SQLAlterTableAddPartition x) { if (!printAdd) { indentCount--; } - + return false; } @@ -6658,7 +6640,7 @@ public boolean visit(SQLAlterTableDropPartition x) { if (x.getAttribute("SIMPLE") != null) { print0(ucase ? "PARTITION " : "partition "); - printAndAccept(x.getPartitions(),","); + printAndAccept(x.getPartitions(), ","); } else { print0(ucase ? "PARTITION (" : "partition ("); printAndAccept(x.getPartitions(), ", "); @@ -6688,10 +6670,11 @@ public boolean visit(SQLAlterTableSetComment x) { return false; } - @Override public boolean visit(SQLPrivilegeItem x) { + @Override + public boolean visit(SQLPrivilegeItem x) { printExpr(x.getAction()); - if(!x.getColumns().isEmpty()) { + if (!x.getColumns().isEmpty()) { print0("("); printAndAccept(x.getColumns(), ", "); print0(")"); @@ -6699,8 +6682,8 @@ public boolean visit(SQLAlterTableSetComment x) { return false; } - @Override public void endVisit(SQLPrivilegeItem x) { - + @Override + public void endVisit(SQLPrivilegeItem x) { } @Override @@ -6930,7 +6913,6 @@ public boolean visit(SQLLoopStatement x) { this.indentCount++; println(); - for (int i = 0, size = x.getStatements().size(); i < size; ++i) { SQLStatement item = x.getStatements().get(i); item.accept(this); @@ -7112,7 +7094,6 @@ public boolean visit(SQLDeclareItem x) { x.getName().accept(this); - if (x.getType() == SQLDeclareItem.Type.TABLE) { print0(ucase ? " TABLE" : " table"); int size = x.getTableElementList().size(); @@ -7135,7 +7116,6 @@ public boolean visit(SQLDeclareItem x) { } else if (x.getType() == SQLDeclareItem.Type.CURSOR) { print0(ucase ? " CURSOR" : " cursor"); } else { - if (dataType != null) { if (dataType instanceof SQLRecordDataType) { print0(ucase ? " IS " : " is "); @@ -7160,8 +7140,8 @@ public boolean visit(SQLDeclareItem x) { @Override public boolean visit(SQLPartitionValue x) { if (x.getOperator() == SQLPartitionValue.Operator.LessThan // - && DbType.oracle != getDbType() && x.getItems().size() == 1 // - && x.getItems().get(0) instanceof SQLIdentifierExpr) { + && DbType.oracle != getDbType() && x.getItems().size() == 1 // + && x.getItems().get(0) instanceof SQLIdentifierExpr) { SQLIdentifierExpr ident = (SQLIdentifierExpr) x.getItems().get(0); if ("MAXVALUE".equalsIgnoreCase(ident.getName())) { print0(ucase ? "VALUES LESS THAN MAXVALUE" : "values less than maxvalue"); @@ -7238,7 +7218,6 @@ public boolean visit(SQLPartition x) { this.indentCount++; printOracleSegmentAttributes(x); - if (x.getEngine() != null) { println(); print0(ucase ? "STORAGE ENGINE " : "storage engine "); @@ -7297,8 +7276,7 @@ public boolean visit(SQLPartition x) { public boolean visit(SQLPartitionByRange x) { SQLExpr interval = x.getInterval(); if (x.getColumns().isEmpty() - && (interval instanceof SQLBetweenExpr || interval instanceof SQLMethodInvokeExpr)) - { + && (interval instanceof SQLBetweenExpr || interval instanceof SQLMethodInvokeExpr)) { interval.accept(this); } else { print0(ucase ? "RANGE" : "range"); @@ -7401,6 +7379,7 @@ public boolean visit(SQLPartitionByHash x) { return false; } + @Override public boolean visit(SQLPartitionByValue x) { print0(ucase ? "VALUE " : "value "); @@ -7437,7 +7416,6 @@ private void printSQLPartitions(List partitions) { protected void printPartitionsCountAndSubPartitions(SQLPartitionBy x) { final SQLExpr partitionsCount = x.getPartitionsCount(); if (partitionsCount != null) { - boolean isDbPartiton = false, isTbPartition = false; if (x.getParent() instanceof MySqlCreateTableStatement) { MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) x.getParent(); @@ -7633,14 +7611,14 @@ public boolean visit(SQLAlterTableCoalescePartition x) { x.getCount().accept(this); return false; } - + @Override public boolean visit(SQLAlterTableTruncatePartition x) { print0(ucase ? "TRUNCATE PARTITION " : "truncate partition "); printPartitions(x.getPartitions()); return false; } - + @Override public boolean visit(SQLAlterTableDiscardPartition x) { print0(ucase ? "DISCARD PARTITION " : "discard partition "); @@ -7671,7 +7649,7 @@ public boolean visit(SQLAlterTableExchangePartition x) { return false; } - + @Override public boolean visit(SQLAlterTableImportPartition x) { print0(ucase ? "IMPORT PARTITION " : "import partition "); @@ -7683,59 +7661,59 @@ public boolean visit(SQLAlterTableImportPartition x) { return false; } - + @Override public boolean visit(SQLAlterTableAnalyzePartition x) { print0(ucase ? "ANALYZE PARTITION " : "analyze partition "); - + printPartitions(x.getPartitions()); return false; } - + protected void printPartitions(List partitions) { if (partitions.size() == 1 && "ALL".equalsIgnoreCase(partitions.get(0).getSimpleName())) { - print0(ucase ? "ALL" : "all"); + print0(ucase ? "ALL" : "all"); } else { printAndAccept(partitions, ", "); } } - + @Override public boolean visit(SQLAlterTableCheckPartition x) { print0(ucase ? "CHECK PARTITION " : "check partition "); printPartitions(x.getPartitions()); return false; } - + @Override public boolean visit(SQLAlterTableOptimizePartition x) { print0(ucase ? "OPTIMIZE PARTITION " : "optimize partition "); printPartitions(x.getPartitions()); return false; } - + @Override public boolean visit(SQLAlterTableRebuildPartition x) { print0(ucase ? "REBUILD PARTITION " : "rebuild partition "); printPartitions(x.getPartitions()); return false; } - + @Override public boolean visit(SQLAlterTableRepairPartition x) { print0(ucase ? "REPAIR PARTITION " : "repair partition "); printPartitions(x.getPartitions()); return false; } - + @Override public boolean visit(SQLSequenceExpr x) { x.getSequence().accept(this); print('.'); - print0(ucase ? x.getFunction().name : x.getFunction().name_lcase); + print0(ucase ? x.getFunction().name : x.getFunction().nameLCase); return false; } - + @Override public boolean visit(SQLMergeStatement x) { print0(ucase ? "MERGE " : "merge "); @@ -7907,7 +7885,7 @@ public boolean visit(SQLCreateSequenceStatement x) { if (x.getCycle().booleanValue()) { print0(ucase ? " CYCLE" : " cycle"); } else { - if (DbType.postgresql == dbType) { + if (DbType.postgresql == dbType) { print0(ucase ? " NO CYCLE" : " no cycle"); } else { print0(ucase ? " NOCYCLE" : " nocycle"); @@ -8016,7 +7994,7 @@ public boolean visit(SQLAlterSequenceStatement x) { if (x.getCycle().booleanValue()) { print0(ucase ? " CYCLE" : " cycle"); } else { - if (DbType.postgresql == dbType) { + if (DbType.postgresql == dbType) { print0(ucase ? " NO CYCLE" : " no cycle"); } else { print0(ucase ? " NOCYCLE" : " nocycle"); @@ -8191,7 +8169,7 @@ public boolean visit(SQLDescribeStatement x) { print0(ucase ? "FORMATTED " : "formatted "); } - if(x.getObject() != null) { + if (x.getObject() != null) { x.getObject().accept(this); } @@ -8211,7 +8189,7 @@ public boolean visit(SQLDescribeStatement x) { protected void printHierarchical(SQLSelectQueryBlock x) { SQLExpr startWith = x.getStartWith(), connectBy = x.getConnectBy(); - if (startWith != null || connectBy != null){ + if (startWith != null || connectBy != null) { println(); if (x.getStartWith() != null) { print0(ucase ? "START WITH " : "start with "); @@ -8234,7 +8212,6 @@ protected void printHierarchical(SQLSelectQueryBlock x) { } public void printOracleSegmentAttributes(OracleSegmentAttributes x) { - if (x.getPctfree() != null) { println(); print0(ucase ? "PCTFREE " : "pctfree "); @@ -8526,7 +8503,6 @@ public boolean visit(SQLAlterMaterializedViewStatement x) { @Override public void endVisit(SQLAlterMaterializedViewStatement x) { - } public boolean visit(SQLCreateMaterializedViewStatement x) { @@ -8718,7 +8694,7 @@ public boolean visit(SQLIntervalExpr x) { SQLIntervalUnit unit = x.getUnit(); if (unit != null) { print(' '); - print0(ucase ? unit.name : unit.name_lcase); + print0(ucase ? unit.name : unit.nameLCase); } return false; } @@ -8929,7 +8905,7 @@ public boolean visit(SQLBlockStatement x) { || x.getParent() instanceof SQLCreateFunctionStatement || x.getParent() instanceof OracleFunctionDataType || x.getParent() instanceof OracleProcedureDataType) - ) { + ) { print0(ucase ? "DECLARE" : "declare"); println(); } @@ -9165,7 +9141,6 @@ public boolean visit(SQLExternalRecordFormat x) { @Override public boolean visit(SQLArrayDataType x) { - final List arguments = x.getArguments(); if (Boolean.TRUE.equals(x.getAttribute("ads.arrayDataType"))) { x.getComponentType().accept(this); @@ -9365,7 +9340,6 @@ public boolean visit(SQLShowColumnsStatement x) { return false; } - @Override public boolean visit(SQLShowCreateTableStatement x) { final List headHints = x.getHeadHintsDirect(); @@ -9401,7 +9375,7 @@ public boolean visit(SQLShowProcessListStatement x) { print0(ucase ? "PROCESSLIST" : "processlist"); - if (x.isMpp()){ + if (x.isMpp()) { print0(ucase ? " MPP" : " mpp"); } @@ -9485,7 +9459,6 @@ public boolean visit(SQLDropRoleStatement x) { @Override public void endVisit(SQLMatchAgainstExpr x) { - } @Override @@ -9498,7 +9471,7 @@ public boolean visit(SQLMatchAgainstExpr x) { x.getAgainst().accept(this); if (x.getSearchModifier() != null) { print(' '); - print0(ucase ? x.getSearchModifier().name : x.getSearchModifier().name_lcase); + print0(ucase ? x.getSearchModifier().name : x.getSearchModifier().nameLCase); } print(')'); @@ -9555,7 +9528,7 @@ public boolean visit(MySqlCreateTableStatement x) { println(); } } - + if (isPrettyFormat() && x.hasBeforeComment()) { printlnComments(x.getBeforeCommentsDirect()); } @@ -9566,7 +9539,7 @@ public boolean visit(MySqlCreateTableStatement x) { hint.accept(this); print(' '); } - + if (x.isDimension()) { print0(ucase ? "DIMENSION " : "dimension "); } @@ -9575,7 +9548,7 @@ public boolean visit(MySqlCreateTableStatement x) { print0(ucase ? "TEMPORARY TABLE " : "temporary table "); } else if (SQLCreateTableStatement.Type.SHADOW.equals(x.getType())) { print0(ucase ? "SHADOW TABLE " : "shadow table "); - } else if(x.isExternal()) { + } else if (x.isExternal()) { print0(ucase ? "EXTERNAL TABLE " : "external table "); } else { print0(ucase ? "TABLE " : "table "); @@ -9595,7 +9568,7 @@ public boolean visit(MySqlCreateTableStatement x) { printTableElements(x.getTableElementList()); if (x.isBroadCast()) { - print0(ucase ? " BROADCAST":" broadcast"); + print0(ucase ? " BROADCAST" : " broadcast"); } List tableOptions = x.getTableOptions(); @@ -9802,7 +9775,6 @@ public boolean visit(SQLDumpStatement x) { print0(ucase ? "DUMP DATA " : "dump data "); - if (x.isOverwrite()) { print0(ucase ? "OVERWRITE " : "overwrite "); } @@ -9914,7 +9886,6 @@ public boolean visit(SQLAnnIndex x) { print('\''); } - print(')'); return false; @@ -10001,7 +9972,7 @@ public boolean visit(SQLShowIndexesStatement x) { } print0(ucase ? "SHOW " : "show "); - print0(ucase ? x.getType().toUpperCase() :x.getType().toLowerCase()); + print0(ucase ? x.getType().toUpperCase() : x.getType().toLowerCase()); final SQLExprTableSource table = x.getTable(); if (table != null) { @@ -10022,7 +9993,6 @@ public boolean visit(SQLShowIndexesStatement x) { return false; } - @Override public boolean visit(SQLAnalyzeTableStatement x) { print0(ucase ? "ANALYZE TABLE " : "analyze table "); @@ -10136,7 +10106,7 @@ public boolean visit(SQLImportTableStatement x) { location.accept(this); } - if(x.getVersion() != null) { + if (x.getVersion() != null) { print0(ucase ? " VERSIOIN = " : " version = "); x.getVersion().accept(this); } @@ -10242,7 +10212,8 @@ public boolean visit(SQLDropOutlineStatement x) { return false; } - @Override public boolean visit(SQLShowQueryTaskStatement x) { + @Override + public boolean visit(SQLShowQueryTaskStatement x) { if (x.isFull()) { print0(ucase ? "SHOW FULL QUERY_TASK" : "show full query_task"); } else { @@ -10377,8 +10348,8 @@ public boolean visit(SQLAlterTableAddSupplemental x) { public boolean visit(SQLDbLinkExpr x) { SQLExpr expr = x.getExpr(); - if(expr instanceof SQLMethodInvokeExpr) { - SQLMethodInvokeExpr methodInvokeExpr = (SQLMethodInvokeExpr)x.getExpr(); + if (expr instanceof SQLMethodInvokeExpr) { + SQLMethodInvokeExpr methodInvokeExpr = (SQLMethodInvokeExpr) x.getExpr(); SQLExpr owner = methodInvokeExpr.getOwner(); if (owner != null) { printMethodOwner(owner); @@ -10456,7 +10427,7 @@ public boolean visit(SQLShowGrantsStatement x) { @Override public boolean visit(SQLCurrentTimeExpr x) { final SQLCurrentTimeExpr.Type type = x.getType(); - print(ucase ? type.name : type.name_lower); + print(ucase ? type.name : type.nameLCase); return false; } @@ -10473,7 +10444,6 @@ public boolean visit(SQLAdhocTableSource x) { return false; } - @Override public boolean visit(HiveCreateTableStatement x) { printCreateTable(x, true); @@ -10489,7 +10459,7 @@ protected void printCreateTable(HiveCreateTableStatement x, boolean printSelect) } if (parent instanceof SQLAdhocTableSource) { - + // skip } else { print0(ucase ? "CREATE " : "create "); } @@ -10788,7 +10758,6 @@ protected void printTblProperties(HiveCreateTableStatement x) { } } - @Override public boolean visit(HiveInputOutputFormat x) { print0(ucase ? "INPUTFORMAT " : "inputformat "); @@ -10929,7 +10898,6 @@ public boolean visit(SQLTableLike x) { return false; } - @Override public boolean visit(SQLValuesQuery x) { print0(ucase ? "VALUES " : "values "); @@ -10960,6 +10928,7 @@ public boolean visit(SQLBuildTableStatement x) { return false; } + @Override public boolean visit(SQLExportDatabaseStatement x) { print0(ucase ? "EXPORT DATABASE " : "export database "); @@ -10975,6 +10944,7 @@ public boolean visit(SQLExportDatabaseStatement x) { return false; } + @Override public boolean visit(SQLImportDatabaseStatement x) { print0(ucase ? "IMPORT DATABASE " : "import database "); @@ -10988,6 +10958,7 @@ public boolean visit(SQLImportDatabaseStatement x) { return false; } + @Override public boolean visit(SQLRenameUserStatement x) { print0(ucase ? "RENAME USER " : "rename user "); @@ -11069,7 +11040,6 @@ public boolean visit(SQLBackupStatement x) { } public void visitStatementList(List statementList) { - boolean printStmtSeperator; if (DbType.sqlserver == dbType) { printStmtSeperator = false; @@ -11087,7 +11057,7 @@ public void visitStatementList(List statementList) { } List comments = preStmt.getAfterCommentsDirect(); - if (comments != null){ + if (comments != null) { for (int j = 0; j < comments.size(); ++j) { String comment = comments.get(j); if (j != 0) { @@ -11107,8 +11077,8 @@ public void visitStatementList(List statementList) { } { List comments = stmt.getBeforeCommentsDirect(); - if (comments != null){ - for(String comment : comments) { + if (comments != null) { + for (String comment : comments) { printComment(comment); println(); } @@ -11118,7 +11088,7 @@ public void visitStatementList(List statementList) { if (i == size - 1) { List comments = stmt.getAfterCommentsDirect(); - if (comments != null){ + if (comments != null) { for (int j = 0; j < comments.size(); ++j) { String comment = comments.get(j); if (j != 0) { @@ -11131,7 +11101,6 @@ public void visitStatementList(List statementList) { } } - @Override public boolean visit(SQLCreateResourceGroupStatement x) { print0(ucase ? "CREATE RESOURCE GROUP " : "create resource group "); @@ -11178,7 +11147,7 @@ public boolean visit(SQLAlterResourceGroupStatement x) { } } - if(x.getEnable() != null) { + if (x.getEnable() != null) { if (x.getEnable()) { print0(ucase ? " ENABLE" : " enable"); } else { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTParameterizedVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTParameterizedVisitor.java index 05d7ae0e4e..9893e7d95e 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTParameterizedVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTParameterizedVisitor.java @@ -29,13 +29,12 @@ import java.util.List; public class SQLASTParameterizedVisitor extends SQLASTVisitorAdapter { - protected DbType dbType; protected List parameters; - private int replaceCount = 0; + private int replaceCount; - public SQLASTParameterizedVisitor(DbType dbType){ + public SQLASTParameterizedVisitor(DbType dbType) { this.dbType = dbType; } @@ -103,7 +102,6 @@ public boolean visit(SQLIntegerExpr x) { return false; } - @Override public boolean visit(SQLMethodInvokeExpr x) { List arguments = x.getArguments(); @@ -155,7 +153,6 @@ public boolean visit(SQLNumberExpr x) { return false; } - @Override public boolean visit(SQLHexExpr x) { parameterizeAndExportPara(x); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java index 23e6f90a5a..1befc1fab4 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java @@ -22,10 +22,12 @@ import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.hive.ast.HiveInputOutputFormat; import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateTableStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.*; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlKillStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.SQLAlterResourceGroupStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.SQLCreateResourceGroupStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.SQLListResourceGroupStatement; public interface SQLASTVisitor { - default void endVisit(SQLAllColumnExpr x) { } @@ -219,7 +221,6 @@ default boolean visit(SQLVariantRefExpr x) { } default void endVisit(SQLVariantRefExpr x) { - } default boolean visit(SQLQueryExpr x) { @@ -227,7 +228,6 @@ default boolean visit(SQLQueryExpr x) { } default void endVisit(SQLQueryExpr x) { - } default boolean visit(SQLUnaryExpr x) { @@ -235,7 +235,6 @@ default boolean visit(SQLUnaryExpr x) { } default void endVisit(SQLUnaryExpr x) { - } default boolean visit(SQLHexExpr x) { @@ -243,7 +242,6 @@ default boolean visit(SQLHexExpr x) { } default void endVisit(SQLHexExpr x) { - } default boolean visit(SQLSelect x) { @@ -272,7 +270,6 @@ default boolean visit(SQLOrderBy x) { } default void endVisit(SQLOrderBy x) { - } default boolean visit(SQLZOrderBy x) { @@ -280,7 +277,6 @@ default boolean visit(SQLZOrderBy x) { } default void endVisit(SQLZOrderBy x) { - } default boolean visit(SQLSelectOrderByItem x) { @@ -351,7 +347,6 @@ default boolean visit(SQLInsertStatement x) { } default void endVisit(SQLInsertStatement x) { - } default boolean visit(SQLInsertStatement.ValuesClause x) { @@ -397,7 +392,6 @@ default void endVisit(SQLNotNullConstraint x) { } default void endVisit(SQLMethodInvokeExpr x) { - } default boolean visit(SQLMethodInvokeExpr x) { @@ -405,7 +399,6 @@ default boolean visit(SQLMethodInvokeExpr x) { } default void endVisit(SQLUnionQuery x) { - } default boolean visit(SQLUnionQuery x) { @@ -427,7 +420,6 @@ default boolean visit(SQLAssignItem x) { } default void endVisit(SQLCallStatement x) { - } default boolean visit(SQLCallStatement x) { @@ -530,7 +522,6 @@ default boolean visit(SQLAlterTableDeleteByCondition x) { } default void endVisit(SQLAlterTableDeleteByCondition x) { - } default boolean visit(SQLAlterTableModifyClusteredBy x) { @@ -653,7 +644,6 @@ default void endVisit(SQLColumnUniqueKey x) { } default void endVisit(SQLWithSubqueryClause x) { - } default boolean visit(SQLWithSubqueryClause x) { @@ -700,7 +690,6 @@ default boolean visit(SQLAlterTableDropPrimaryKey x) { } default void endVisit(SQLAlterTableDropPrimaryKey x) { - } default boolean visit(SQLAlterTableDisableKeys x) { @@ -708,7 +697,6 @@ default boolean visit(SQLAlterTableDisableKeys x) { } default void endVisit(SQLAlterTableDisableKeys x) { - } default boolean visit(SQLAlterTableEnableKeys x) { @@ -716,7 +704,6 @@ default boolean visit(SQLAlterTableEnableKeys x) { } default void endVisit(SQLAlterTableEnableKeys x) { - } default boolean visit(SQLAlterTableStatement x) { @@ -731,7 +718,6 @@ default boolean visit(SQLAlterTableDisableConstraint x) { } default void endVisit(SQLAlterTableDisableConstraint x) { - } default boolean visit(SQLAlterTableEnableConstraint x) { @@ -739,7 +725,6 @@ default boolean visit(SQLAlterTableEnableConstraint x) { } default void endVisit(SQLAlterTableEnableConstraint x) { - } default boolean visit(SQLColumnCheck x) { @@ -747,7 +732,6 @@ default boolean visit(SQLColumnCheck x) { } default void endVisit(SQLColumnCheck x) { - } default boolean visit(SQLExprHint x) { @@ -755,7 +739,6 @@ default boolean visit(SQLExprHint x) { } default void endVisit(SQLExprHint x) { - } default boolean visit(SQLAlterTableDropConstraint x) { @@ -763,7 +746,6 @@ default boolean visit(SQLAlterTableDropConstraint x) { } default void endVisit(SQLAlterTableDropConstraint x) { - } default boolean visit(SQLUnique x) { @@ -771,7 +753,6 @@ default boolean visit(SQLUnique x) { } default void endVisit(SQLUnique x) { - } default boolean visit(SQLPrimaryKeyImpl x) { @@ -779,7 +760,6 @@ default boolean visit(SQLPrimaryKeyImpl x) { } default void endVisit(SQLPrimaryKeyImpl x) { - } default boolean visit(SQLCreateIndexStatement x) { @@ -787,7 +767,6 @@ default boolean visit(SQLCreateIndexStatement x) { } default void endVisit(SQLCreateIndexStatement x) { - } default boolean visit(SQLAlterTableRenameColumn x) { @@ -795,7 +774,6 @@ default boolean visit(SQLAlterTableRenameColumn x) { } default void endVisit(SQLAlterTableRenameColumn x) { - } default boolean visit(SQLColumnReference x) { @@ -803,7 +781,6 @@ default boolean visit(SQLColumnReference x) { } default void endVisit(SQLColumnReference x) { - } default boolean visit(SQLForeignKeyImpl x) { @@ -811,7 +788,6 @@ default boolean visit(SQLForeignKeyImpl x) { } default void endVisit(SQLForeignKeyImpl x) { - } default boolean visit(SQLDropSequenceStatement x) { @@ -819,7 +795,6 @@ default boolean visit(SQLDropSequenceStatement x) { } default void endVisit(SQLDropSequenceStatement x) { - } default boolean visit(SQLDropTriggerStatement x) { @@ -827,11 +802,9 @@ default boolean visit(SQLDropTriggerStatement x) { } default void endVisit(SQLDropTriggerStatement x) { - } default void endVisit(SQLDropUserStatement x) { - } default boolean visit(SQLDropUserStatement x) { @@ -839,7 +812,6 @@ default boolean visit(SQLDropUserStatement x) { } default void endVisit(SQLExplainStatement x) { - } default boolean visit(SQLExplainStatement x) { @@ -847,7 +819,6 @@ default boolean visit(SQLExplainStatement x) { } default void endVisit(SQLGrantStatement x) { - } default boolean visit(SQLGrantStatement x) { @@ -855,7 +826,6 @@ default boolean visit(SQLGrantStatement x) { } default void endVisit(SQLDropDatabaseStatement x) { - } default boolean visit(SQLDropDatabaseStatement x) { @@ -863,7 +833,6 @@ default boolean visit(SQLDropDatabaseStatement x) { } default void endVisit(SQLIndexOptions x) { - } default boolean visit(SQLIndexOptions x) { @@ -871,7 +840,6 @@ default boolean visit(SQLIndexOptions x) { } default void endVisit(SQLIndexDefinition x) { - } default boolean visit(SQLIndexDefinition x) { @@ -879,7 +847,6 @@ default boolean visit(SQLIndexDefinition x) { } default void endVisit(SQLAlterTableAddIndex x) { - } default boolean visit(SQLAlterTableAddIndex x) { @@ -887,7 +854,6 @@ default boolean visit(SQLAlterTableAddIndex x) { } default void endVisit(SQLAlterTableAlterIndex x) { - } default boolean visit(SQLAlterTableAlterIndex x) { @@ -895,7 +861,6 @@ default boolean visit(SQLAlterTableAlterIndex x) { } default void endVisit(SQLAlterTableAddConstraint x) { - } default boolean visit(SQLAlterTableAddConstraint x) { @@ -903,7 +868,6 @@ default boolean visit(SQLAlterTableAddConstraint x) { } default void endVisit(SQLCreateTriggerStatement x) { - } default boolean visit(SQLCreateTriggerStatement x) { @@ -911,7 +875,6 @@ default boolean visit(SQLCreateTriggerStatement x) { } default void endVisit(SQLDropFunctionStatement x) { - } default boolean visit(SQLDropFunctionStatement x) { @@ -919,7 +882,6 @@ default boolean visit(SQLDropFunctionStatement x) { } default void endVisit(SQLDropTableSpaceStatement x) { - } default boolean visit(SQLDropTableSpaceStatement x) { @@ -927,7 +889,6 @@ default boolean visit(SQLDropTableSpaceStatement x) { } default void endVisit(SQLDropProcedureStatement x) { - } default boolean visit(SQLDropProcedureStatement x) { @@ -935,7 +896,6 @@ default boolean visit(SQLDropProcedureStatement x) { } default void endVisit(SQLBooleanExpr x) { - } default boolean visit(SQLBooleanExpr x) { @@ -943,7 +903,6 @@ default boolean visit(SQLBooleanExpr x) { } default void endVisit(SQLUnionQueryTableSource x) { - } default boolean visit(SQLUnionQueryTableSource x) { @@ -951,7 +910,6 @@ default boolean visit(SQLUnionQueryTableSource x) { } default void endVisit(SQLTimestampExpr x) { - } default boolean visit(SQLTimestampExpr x) { @@ -959,7 +917,6 @@ default boolean visit(SQLTimestampExpr x) { } default void endVisit(SQLDateTimeExpr x) { - } default boolean visit(SQLDateTimeExpr x) { @@ -967,7 +924,6 @@ default boolean visit(SQLDateTimeExpr x) { } default void endVisit(SQLDoubleExpr x) { - } default boolean visit(SQLDoubleExpr x) { @@ -975,7 +931,6 @@ default boolean visit(SQLDoubleExpr x) { } default void endVisit(SQLFloatExpr x) { - } default boolean visit(SQLFloatExpr x) { @@ -983,7 +938,6 @@ default boolean visit(SQLFloatExpr x) { } default void endVisit(SQLRevokeStatement x) { - } default boolean visit(SQLRevokeStatement x) { @@ -991,7 +945,6 @@ default boolean visit(SQLRevokeStatement x) { } default void endVisit(SQLBinaryExpr x) { - } default boolean visit(SQLBinaryExpr x) { @@ -999,7 +952,6 @@ default boolean visit(SQLBinaryExpr x) { } default void endVisit(SQLAlterTableRename x) { - } default boolean visit(SQLAlterTableRename x) { @@ -1007,7 +959,6 @@ default boolean visit(SQLAlterTableRename x) { } default void endVisit(SQLAlterViewRenameStatement x) { - } default boolean visit(SQLAlterViewRenameStatement x) { @@ -1015,7 +966,6 @@ default boolean visit(SQLAlterViewRenameStatement x) { } default void endVisit(SQLShowTablesStatement x) { - } default boolean visit(SQLShowTablesStatement x) { @@ -1023,7 +973,6 @@ default boolean visit(SQLShowTablesStatement x) { } default void endVisit(SQLAlterTableAddPartition x) { - } default boolean visit(SQLAlterTableAddPartition x) { @@ -1031,7 +980,6 @@ default boolean visit(SQLAlterTableAddPartition x) { } default void endVisit(SQLAlterTableAddExtPartition x) { - } default boolean visit(SQLAlterTableAddExtPartition x) { @@ -1039,7 +987,6 @@ default boolean visit(SQLAlterTableAddExtPartition x) { } default void endVisit(SQLAlterTableDropExtPartition x) { - } default boolean visit(SQLAlterTableDropExtPartition x) { @@ -1047,7 +994,6 @@ default boolean visit(SQLAlterTableDropExtPartition x) { } default void endVisit(SQLAlterTableDropPartition x) { - } default boolean visit(SQLAlterTableDropPartition x) { @@ -1055,7 +1001,6 @@ default boolean visit(SQLAlterTableDropPartition x) { } default void endVisit(SQLAlterTableRenamePartition x) { - } default boolean visit(SQLAlterTableRenamePartition x) { @@ -1063,7 +1008,6 @@ default boolean visit(SQLAlterTableRenamePartition x) { } default void endVisit(SQLAlterTableSetComment x) { - } default boolean visit(SQLAlterTableSetComment x) { @@ -1071,7 +1015,6 @@ default boolean visit(SQLAlterTableSetComment x) { } default void endVisit(SQLAlterTableSetLifecycle x) { - } default boolean visit(SQLPrivilegeItem x) { @@ -1079,7 +1022,6 @@ default boolean visit(SQLPrivilegeItem x) { } default void endVisit(SQLPrivilegeItem x) { - } default boolean visit(SQLAlterTableSetLifecycle x) { @@ -1087,7 +1029,6 @@ default boolean visit(SQLAlterTableSetLifecycle x) { } default void endVisit(SQLAlterTableEnableLifecycle x) { - } default boolean visit(SQLAlterTableSetLocation x) { @@ -1095,7 +1036,6 @@ default boolean visit(SQLAlterTableSetLocation x) { } default void endVisit(SQLAlterTableSetLocation x) { - } default boolean visit(SQLAlterTableEnableLifecycle x) { @@ -1103,7 +1043,6 @@ default boolean visit(SQLAlterTableEnableLifecycle x) { } default void endVisit(SQLAlterTablePartition x) { - } default boolean visit(SQLAlterTablePartition x) { @@ -1111,7 +1050,6 @@ default boolean visit(SQLAlterTablePartition x) { } default void endVisit(SQLAlterTablePartitionSetProperties x) { - } default boolean visit(SQLAlterTablePartitionSetProperties x) { @@ -1119,7 +1057,6 @@ default boolean visit(SQLAlterTablePartitionSetProperties x) { } default void endVisit(SQLAlterTableDisableLifecycle x) { - } default boolean visit(SQLAlterTableDisableLifecycle x) { @@ -1127,7 +1064,6 @@ default boolean visit(SQLAlterTableDisableLifecycle x) { } default void endVisit(SQLAlterTableTouch x) { - } default boolean visit(SQLAlterTableTouch x) { @@ -1135,7 +1071,6 @@ default boolean visit(SQLAlterTableTouch x) { } default void endVisit(SQLArrayExpr x) { - } default boolean visit(SQLArrayExpr x) { @@ -1143,7 +1078,6 @@ default boolean visit(SQLArrayExpr x) { } default void endVisit(SQLOpenStatement x) { - } default boolean visit(SQLOpenStatement x) { @@ -1151,7 +1085,6 @@ default boolean visit(SQLOpenStatement x) { } default void endVisit(SQLFetchStatement x) { - } default boolean visit(SQLFetchStatement x) { @@ -1159,7 +1092,6 @@ default boolean visit(SQLFetchStatement x) { } default void endVisit(SQLCloseStatement x) { - } default boolean visit(SQLCloseStatement x) { @@ -1171,7 +1103,6 @@ default boolean visit(SQLGroupingSetExpr x) { } default void endVisit(SQLGroupingSetExpr x) { - } default boolean visit(SQLIfStatement x) { @@ -1179,7 +1110,6 @@ default boolean visit(SQLIfStatement x) { } default void endVisit(SQLIfStatement x) { - } default boolean visit(SQLIfStatement.ElseIf x) { @@ -1187,7 +1117,6 @@ default boolean visit(SQLIfStatement.ElseIf x) { } default void endVisit(SQLIfStatement.ElseIf x) { - } default boolean visit(SQLIfStatement.Else x) { @@ -1195,7 +1124,6 @@ default boolean visit(SQLIfStatement.Else x) { } default void endVisit(SQLIfStatement.Else x) { - } default boolean visit(SQLLoopStatement x) { @@ -1203,7 +1131,6 @@ default boolean visit(SQLLoopStatement x) { } default void endVisit(SQLLoopStatement x) { - } default boolean visit(SQLParameter x) { @@ -1211,7 +1138,6 @@ default boolean visit(SQLParameter x) { } default void endVisit(SQLParameter x) { - } default boolean visit(SQLCreateProcedureStatement x) { @@ -1219,7 +1145,6 @@ default boolean visit(SQLCreateProcedureStatement x) { } default void endVisit(SQLCreateProcedureStatement x) { - } default boolean visit(SQLCreateFunctionStatement x) { @@ -1227,7 +1152,6 @@ default boolean visit(SQLCreateFunctionStatement x) { } default void endVisit(SQLCreateFunctionStatement x) { - } default boolean visit(SQLBlockStatement x) { @@ -1235,7 +1159,6 @@ default boolean visit(SQLBlockStatement x) { } default void endVisit(SQLBlockStatement x) { - } default boolean visit(SQLAlterTableDropKey x) { @@ -1243,7 +1166,6 @@ default boolean visit(SQLAlterTableDropKey x) { } default void endVisit(SQLAlterTableDropKey x) { - } default boolean visit(SQLDeclareItem x) { @@ -1251,7 +1173,6 @@ default boolean visit(SQLDeclareItem x) { } default void endVisit(SQLDeclareItem x) { - } default boolean visit(SQLPartitionValue x) { @@ -1259,7 +1180,6 @@ default boolean visit(SQLPartitionValue x) { } default void endVisit(SQLPartitionValue x) { - } default boolean visit(SQLPartition x) { @@ -1267,7 +1187,6 @@ default boolean visit(SQLPartition x) { } default void endVisit(SQLPartition x) { - } default boolean visit(SQLPartitionByRange x) { @@ -1275,7 +1194,6 @@ default boolean visit(SQLPartitionByRange x) { } default void endVisit(SQLPartitionByRange x) { - } default boolean visit(SQLPartitionByHash x) { @@ -1283,7 +1201,6 @@ default boolean visit(SQLPartitionByHash x) { } default void endVisit(SQLPartitionByHash x) { - } default boolean visit(SQLPartitionByList x) { @@ -1291,7 +1208,6 @@ default boolean visit(SQLPartitionByList x) { } default void endVisit(SQLPartitionByList x) { - } default boolean visit(SQLSubPartition x) { @@ -1299,7 +1215,6 @@ default boolean visit(SQLSubPartition x) { } default void endVisit(SQLSubPartition x) { - } default boolean visit(SQLSubPartitionByHash x) { @@ -1307,7 +1222,6 @@ default boolean visit(SQLSubPartitionByHash x) { } default void endVisit(SQLSubPartitionByHash x) { - } default boolean visit(SQLSubPartitionByRange x) { @@ -1315,7 +1229,6 @@ default boolean visit(SQLSubPartitionByRange x) { } default void endVisit(SQLSubPartitionByRange x) { - } default boolean visit(SQLSubPartitionByList x) { @@ -1323,7 +1236,6 @@ default boolean visit(SQLSubPartitionByList x) { } default void endVisit(SQLSubPartitionByList x) { - } default boolean visit(SQLAlterDatabaseStatement x) { @@ -1331,7 +1243,6 @@ default boolean visit(SQLAlterDatabaseStatement x) { } default void endVisit(SQLAlterDatabaseStatement x) { - } default boolean visit(SQLAlterTableConvertCharSet x) { @@ -1339,7 +1250,6 @@ default boolean visit(SQLAlterTableConvertCharSet x) { } default void endVisit(SQLAlterTableConvertCharSet x) { - } default boolean visit(SQLAlterTableReOrganizePartition x) { @@ -1347,7 +1257,6 @@ default boolean visit(SQLAlterTableReOrganizePartition x) { } default void endVisit(SQLAlterTableReOrganizePartition x) { - } default boolean visit(SQLAlterTableCoalescePartition x) { @@ -1355,7 +1264,6 @@ default boolean visit(SQLAlterTableCoalescePartition x) { } default void endVisit(SQLAlterTableCoalescePartition x) { - } default boolean visit(SQLAlterTableTruncatePartition x) { @@ -1363,7 +1271,6 @@ default boolean visit(SQLAlterTableTruncatePartition x) { } default void endVisit(SQLAlterTableTruncatePartition x) { - } default boolean visit(SQLAlterTableDiscardPartition x) { @@ -1371,7 +1278,6 @@ default boolean visit(SQLAlterTableDiscardPartition x) { } default void endVisit(SQLAlterTableDiscardPartition x) { - } default boolean visit(SQLAlterTableImportPartition x) { @@ -1379,7 +1285,6 @@ default boolean visit(SQLAlterTableImportPartition x) { } default void endVisit(SQLAlterTableImportPartition x) { - } default boolean visit(SQLAlterTableAnalyzePartition x) { @@ -1387,7 +1292,6 @@ default boolean visit(SQLAlterTableAnalyzePartition x) { } default void endVisit(SQLAlterTableAnalyzePartition x) { - } default boolean visit(SQLAlterTableCheckPartition x) { @@ -1395,7 +1299,6 @@ default boolean visit(SQLAlterTableCheckPartition x) { } default void endVisit(SQLAlterTableCheckPartition x) { - } default boolean visit(SQLAlterTableOptimizePartition x) { @@ -1403,7 +1306,6 @@ default boolean visit(SQLAlterTableOptimizePartition x) { } default void endVisit(SQLAlterTableOptimizePartition x) { - } default boolean visit(SQLAlterTableRebuildPartition x) { @@ -1411,7 +1313,6 @@ default boolean visit(SQLAlterTableRebuildPartition x) { } default void endVisit(SQLAlterTableRebuildPartition x) { - } default boolean visit(SQLAlterTableRepairPartition x) { @@ -1419,7 +1320,6 @@ default boolean visit(SQLAlterTableRepairPartition x) { } default void endVisit(SQLAlterTableRepairPartition x) { - } default boolean visit(SQLSequenceExpr x) { @@ -1427,7 +1327,6 @@ default boolean visit(SQLSequenceExpr x) { } default void endVisit(SQLSequenceExpr x) { - } default boolean visit(SQLMergeStatement x) { @@ -1435,7 +1334,6 @@ default boolean visit(SQLMergeStatement x) { } default void endVisit(SQLMergeStatement x) { - } default boolean visit(SQLMergeStatement.MergeUpdateClause x) { @@ -1443,7 +1341,6 @@ default boolean visit(SQLMergeStatement.MergeUpdateClause x) { } default void endVisit(SQLMergeStatement.MergeUpdateClause x) { - } default boolean visit(SQLMergeStatement.MergeInsertClause x) { @@ -1451,7 +1348,6 @@ default boolean visit(SQLMergeStatement.MergeInsertClause x) { } default void endVisit(SQLMergeStatement.MergeInsertClause x) { - } default boolean visit(SQLErrorLoggingClause x) { @@ -1459,7 +1355,6 @@ default boolean visit(SQLErrorLoggingClause x) { } default void endVisit(SQLErrorLoggingClause x) { - } default boolean visit(SQLNullConstraint x) { @@ -1467,7 +1362,6 @@ default boolean visit(SQLNullConstraint x) { } default void endVisit(SQLNullConstraint x) { - } default boolean visit(SQLCreateSequenceStatement x) { @@ -1475,7 +1369,6 @@ default boolean visit(SQLCreateSequenceStatement x) { } default void endVisit(SQLCreateSequenceStatement x) { - } default boolean visit(SQLDateExpr x) { @@ -1483,7 +1376,6 @@ default boolean visit(SQLDateExpr x) { } default void endVisit(SQLDateExpr x) { - } default boolean visit(SQLLimit x) { @@ -1494,7 +1386,6 @@ default void endVisit(SQLLimit x) { } default void endVisit(SQLStartTransactionStatement x) { - } default boolean visit(SQLStartTransactionStatement x) { @@ -1502,7 +1393,6 @@ default boolean visit(SQLStartTransactionStatement x) { } default void endVisit(SQLDescribeStatement x) { - } default boolean visit(SQLDescribeStatement x) { @@ -1517,7 +1407,6 @@ default boolean visit(SQLWhileStatement x) { } default void endVisit(SQLWhileStatement x) { - } default boolean visit(SQLDeclareStatement x) { @@ -1525,7 +1414,6 @@ default boolean visit(SQLDeclareStatement x) { } default void endVisit(SQLDeclareStatement x) { - } default boolean visit(SQLReturnStatement x) { @@ -1533,7 +1421,6 @@ default boolean visit(SQLReturnStatement x) { } default void endVisit(SQLReturnStatement x) { - } default boolean visit(SQLArgument x) { @@ -1541,7 +1428,6 @@ default boolean visit(SQLArgument x) { } default void endVisit(SQLArgument x) { - } default boolean visit(SQLCommitStatement x) { @@ -1549,7 +1435,6 @@ default boolean visit(SQLCommitStatement x) { } default void endVisit(SQLCommitStatement x) { - } default boolean visit(SQLFlashbackExpr x) { @@ -1557,7 +1442,6 @@ default boolean visit(SQLFlashbackExpr x) { } default void endVisit(SQLFlashbackExpr x) { - } default boolean visit(SQLCreateMaterializedViewStatement x) { @@ -1565,7 +1449,6 @@ default boolean visit(SQLCreateMaterializedViewStatement x) { } default void endVisit(SQLCreateMaterializedViewStatement x) { - } default boolean visit(SQLShowCreateMaterializedViewStatement x) { @@ -1573,7 +1456,6 @@ default boolean visit(SQLShowCreateMaterializedViewStatement x) { } default void endVisit(SQLShowCreateMaterializedViewStatement x) { - } default boolean visit(SQLBinaryOpExprGroup x) { @@ -1581,7 +1463,6 @@ default boolean visit(SQLBinaryOpExprGroup x) { } default void endVisit(SQLBinaryOpExprGroup x) { - } default boolean visit(SQLScriptCommitStatement x) { @@ -1589,7 +1470,6 @@ default boolean visit(SQLScriptCommitStatement x) { } default void endVisit(SQLScriptCommitStatement x) { - } default boolean visit(SQLReplaceStatement x) { @@ -1597,7 +1477,6 @@ default boolean visit(SQLReplaceStatement x) { } default void endVisit(SQLReplaceStatement x) { - } default boolean visit(SQLCreateUserStatement x) { @@ -1605,7 +1484,6 @@ default boolean visit(SQLCreateUserStatement x) { } default void endVisit(SQLCreateUserStatement x) { - } default boolean visit(SQLAlterFunctionStatement x) { @@ -1613,7 +1491,6 @@ default boolean visit(SQLAlterFunctionStatement x) { } default void endVisit(SQLAlterFunctionStatement x) { - } default boolean visit(SQLAlterTypeStatement x) { @@ -1621,7 +1498,6 @@ default boolean visit(SQLAlterTypeStatement x) { } default void endVisit(SQLAlterTypeStatement x) { - } default boolean visit(SQLIntervalExpr x) { @@ -1629,7 +1505,6 @@ default boolean visit(SQLIntervalExpr x) { } default void endVisit(SQLIntervalExpr x) { - } default boolean visit(SQLLateralViewTableSource x) { @@ -1637,7 +1512,6 @@ default boolean visit(SQLLateralViewTableSource x) { } default void endVisit(SQLLateralViewTableSource x) { - } default boolean visit(SQLShowErrorsStatement x) { @@ -1645,7 +1519,6 @@ default boolean visit(SQLShowErrorsStatement x) { } default void endVisit(SQLShowErrorsStatement x) { - } default boolean visit(SQLShowGrantsStatement x) { @@ -1653,7 +1526,6 @@ default boolean visit(SQLShowGrantsStatement x) { } default void endVisit(SQLShowGrantsStatement x) { - } default boolean visit(SQLShowPackagesStatement x) { @@ -1661,7 +1533,6 @@ default boolean visit(SQLShowPackagesStatement x) { } default void endVisit(SQLShowPackagesStatement x) { - } default boolean visit(SQLShowRecylebinStatement x) { @@ -1669,7 +1540,6 @@ default boolean visit(SQLShowRecylebinStatement x) { } default void endVisit(SQLShowRecylebinStatement x) { - } default boolean visit(SQLAlterCharacter x) { @@ -1677,7 +1547,6 @@ default boolean visit(SQLAlterCharacter x) { } default void endVisit(SQLAlterCharacter x) { - } default boolean visit(SQLExprStatement x) { @@ -1685,7 +1554,6 @@ default boolean visit(SQLExprStatement x) { } default void endVisit(SQLExprStatement x) { - } default boolean visit(SQLAlterProcedureStatement x) { @@ -1693,7 +1561,6 @@ default boolean visit(SQLAlterProcedureStatement x) { } default void endVisit(SQLAlterProcedureStatement x) { - } default boolean visit(SQLAlterViewStatement x) { @@ -1701,7 +1568,6 @@ default boolean visit(SQLAlterViewStatement x) { } default void endVisit(SQLAlterViewStatement x) { - } default boolean visit(SQLDropEventStatement x) { @@ -1709,7 +1575,6 @@ default boolean visit(SQLDropEventStatement x) { } default void endVisit(SQLDropEventStatement x) { - } default boolean visit(SQLDropLogFileGroupStatement x) { @@ -1717,7 +1582,6 @@ default boolean visit(SQLDropLogFileGroupStatement x) { } default void endVisit(SQLDropLogFileGroupStatement x) { - } default boolean visit(SQLDropServerStatement x) { @@ -1725,7 +1589,6 @@ default boolean visit(SQLDropServerStatement x) { } default void endVisit(SQLDropServerStatement x) { - } default boolean visit(SQLDropSynonymStatement x) { @@ -1733,7 +1596,6 @@ default boolean visit(SQLDropSynonymStatement x) { } default void endVisit(SQLDropSynonymStatement x) { - } default boolean visit(SQLRecordDataType x) { @@ -1741,7 +1603,6 @@ default boolean visit(SQLRecordDataType x) { } default void endVisit(SQLRecordDataType x) { - } default boolean visit(SQLDropTypeStatement x) { @@ -1749,7 +1610,6 @@ default boolean visit(SQLDropTypeStatement x) { } default void endVisit(SQLDropTypeStatement x) { - } default boolean visit(SQLExternalRecordFormat x) { @@ -1757,7 +1617,6 @@ default boolean visit(SQLExternalRecordFormat x) { } default void endVisit(SQLExternalRecordFormat x) { - } default boolean visit(SQLArrayDataType x) { @@ -1765,7 +1624,6 @@ default boolean visit(SQLArrayDataType x) { } default void endVisit(SQLArrayDataType x) { - } default boolean visit(SQLMapDataType x) { @@ -1773,7 +1631,6 @@ default boolean visit(SQLMapDataType x) { } default void endVisit(SQLMapDataType x) { - } default boolean visit(SQLStructDataType x) { @@ -1781,7 +1638,6 @@ default boolean visit(SQLStructDataType x) { } default void endVisit(SQLStructDataType x) { - } default boolean visit(SQLRowDataType x) { @@ -1789,7 +1645,6 @@ default boolean visit(SQLRowDataType x) { } default void endVisit(SQLRowDataType x) { - } default boolean visit(SQLStructDataType.Field x) { @@ -1797,7 +1652,6 @@ default boolean visit(SQLStructDataType.Field x) { } default void endVisit(SQLStructDataType.Field x) { - } default boolean visit(SQLDropMaterializedViewStatement x) { @@ -1805,7 +1659,6 @@ default boolean visit(SQLDropMaterializedViewStatement x) { } default void endVisit(SQLDropMaterializedViewStatement x) { - } default boolean visit(SQLShowMaterializedViewStatement x) { @@ -1813,7 +1666,6 @@ default boolean visit(SQLShowMaterializedViewStatement x) { } default void endVisit(SQLShowMaterializedViewStatement x) { - } default boolean visit(SQLRefreshMaterializedViewStatement x) { @@ -1821,7 +1673,6 @@ default boolean visit(SQLRefreshMaterializedViewStatement x) { } default void endVisit(SQLRefreshMaterializedViewStatement x) { - } default boolean visit(SQLAlterMaterializedViewStatement x) { @@ -1829,7 +1680,6 @@ default boolean visit(SQLAlterMaterializedViewStatement x) { } default void endVisit(SQLAlterMaterializedViewStatement x) { - } default boolean visit(SQLCreateTableGroupStatement x) { @@ -1837,7 +1687,6 @@ default boolean visit(SQLCreateTableGroupStatement x) { } default void endVisit(SQLCreateTableGroupStatement x) { - } default boolean visit(SQLDropTableGroupStatement x) { @@ -1845,7 +1694,6 @@ default boolean visit(SQLDropTableGroupStatement x) { } default void endVisit(SQLDropTableGroupStatement x) { - } default boolean visit(SQLAlterTableSubpartitionAvailablePartitionNum x) { @@ -1853,11 +1701,9 @@ default boolean visit(SQLAlterTableSubpartitionAvailablePartitionNum x) { } default void endVisit(SQLAlterTableSubpartitionAvailablePartitionNum x) { - } default void endVisit(SQLShowDatabasesStatement x) { - } default boolean visit(SQLShowDatabasesStatement x) { @@ -1865,7 +1711,6 @@ default boolean visit(SQLShowDatabasesStatement x) { } default void endVisit(SQLShowTableGroupsStatement x) { - } default boolean visit(SQLShowTableGroupsStatement x) { @@ -1873,7 +1718,6 @@ default boolean visit(SQLShowTableGroupsStatement x) { } default void endVisit(SQLShowColumnsStatement x) { - } default boolean visit(SQLShowColumnsStatement x) { @@ -1881,7 +1725,6 @@ default boolean visit(SQLShowColumnsStatement x) { } default void endVisit(SQLShowCreateTableStatement x) { - } default boolean visit(SQLShowCreateTableStatement x) { @@ -1889,7 +1732,6 @@ default boolean visit(SQLShowCreateTableStatement x) { } default void endVisit(SQLShowProcessListStatement x) { - } default boolean visit(SQLShowProcessListStatement x) { @@ -1897,7 +1739,6 @@ default boolean visit(SQLShowProcessListStatement x) { } default void endVisit(SQLAlterTableSetOption x) { - } default boolean visit(SQLAlterTableSetOption x) { @@ -1909,7 +1750,6 @@ default boolean visit(SQLShowCreateViewStatement x) { } default void endVisit(SQLShowCreateViewStatement x) { - } default boolean visit(SQLShowViewsStatement x) { @@ -1917,7 +1757,6 @@ default boolean visit(SQLShowViewsStatement x) { } default void endVisit(SQLShowViewsStatement x) { - } default boolean visit(SQLAlterTableRenameIndex x) { @@ -1925,7 +1764,6 @@ default boolean visit(SQLAlterTableRenameIndex x) { } default void endVisit(SQLAlterTableRenameIndex x) { - } default boolean visit(SQLAlterSequenceStatement x) { @@ -1933,7 +1771,6 @@ default boolean visit(SQLAlterSequenceStatement x) { } default void endVisit(SQLAlterSequenceStatement x) { - } default boolean visit(SQLAlterTableExchangePartition x) { @@ -1941,7 +1778,6 @@ default boolean visit(SQLAlterTableExchangePartition x) { } default void endVisit(SQLAlterTableExchangePartition x) { - } default boolean visit(SQLCreateRoleStatement x) { @@ -1949,7 +1785,6 @@ default boolean visit(SQLCreateRoleStatement x) { } default void endVisit(SQLCreateRoleStatement x) { - } default boolean visit(SQLDropRoleStatement x) { @@ -1957,7 +1792,6 @@ default boolean visit(SQLDropRoleStatement x) { } default void endVisit(SQLDropRoleStatement x) { - } default boolean visit(SQLAlterTableReplaceColumn x) { @@ -1965,7 +1799,6 @@ default boolean visit(SQLAlterTableReplaceColumn x) { } default void endVisit(SQLAlterTableReplaceColumn x) { - } default boolean visit(SQLMatchAgainstExpr x) { @@ -1973,7 +1806,6 @@ default boolean visit(SQLMatchAgainstExpr x) { } default void endVisit(SQLMatchAgainstExpr x) { - } default boolean visit(SQLTimeExpr x) { @@ -1981,7 +1813,6 @@ default boolean visit(SQLTimeExpr x) { } default void endVisit(SQLTimeExpr x) { - } default boolean visit(SQLDropCatalogStatement x) { @@ -1989,11 +1820,9 @@ default boolean visit(SQLDropCatalogStatement x) { } default void endVisit(SQLDropCatalogStatement x) { - } default void endVisit(SQLShowPartitionsStmt x) { - } default boolean visit(SQLShowPartitionsStmt x) { @@ -2001,7 +1830,6 @@ default boolean visit(SQLShowPartitionsStmt x) { } default void endVisit(SQLValuesExpr x) { - } default boolean visit(SQLValuesExpr x) { @@ -2009,7 +1837,6 @@ default boolean visit(SQLValuesExpr x) { } default void endVisit(SQLContainsExpr x) { - } default boolean visit(SQLContainsExpr x) { @@ -2017,7 +1844,6 @@ default boolean visit(SQLContainsExpr x) { } default void endVisit(SQLDumpStatement x) { - } default boolean visit(SQLDumpStatement x) { @@ -2025,7 +1851,6 @@ default boolean visit(SQLDumpStatement x) { } default void endVisit(SQLValuesTableSource x) { - } default boolean visit(SQLValuesTableSource x) { @@ -2033,7 +1858,6 @@ default boolean visit(SQLValuesTableSource x) { } default void endVisit(SQLExtractExpr x) { - } default boolean visit(SQLExtractExpr x) { @@ -2041,7 +1865,6 @@ default boolean visit(SQLExtractExpr x) { } default void endVisit(SQLWindow x) { - } default boolean visit(SQLWindow x) { @@ -2049,7 +1872,6 @@ default boolean visit(SQLWindow x) { } default void endVisit(SQLJSONExpr x) { - } default boolean visit(SQLJSONExpr x) { @@ -2057,7 +1879,6 @@ default boolean visit(SQLJSONExpr x) { } default void endVisit(SQLDecimalExpr x) { - } default boolean visit(SQLDecimalExpr x) { @@ -2065,7 +1886,6 @@ default boolean visit(SQLDecimalExpr x) { } default void endVisit(SQLAnnIndex x) { - } default boolean visit(SQLAnnIndex x) { @@ -2073,7 +1893,6 @@ default boolean visit(SQLAnnIndex x) { } default void endVisit(SQLUnionDataType x) { - } default boolean visit(SQLUnionDataType x) { @@ -2081,7 +1900,6 @@ default boolean visit(SQLUnionDataType x) { } default void endVisit(SQLAlterTableRecoverPartitions x) { - } default boolean visit(SQLAlterTableRecoverPartitions x) { @@ -2089,20 +1907,17 @@ default boolean visit(SQLAlterTableRecoverPartitions x) { } default void endVisit(SQLAlterIndexStatement x) { - } default boolean visit(SQLAlterIndexStatement x) { return true; } - default boolean visit(SQLAlterIndexStatement.Rebuild x) { return true; } default void endVisit(SQLAlterIndexStatement.Rebuild x) { - } default boolean visit(SQLShowIndexesStatement x) { @@ -2110,7 +1925,6 @@ default boolean visit(SQLShowIndexesStatement x) { } default void endVisit(SQLShowIndexesStatement x) { - } default boolean visit(SQLAnalyzeTableStatement x) { @@ -2118,7 +1932,6 @@ default boolean visit(SQLAnalyzeTableStatement x) { } default void endVisit(SQLAnalyzeTableStatement x) { - } default boolean visit(SQLExportTableStatement x) { @@ -2126,7 +1939,6 @@ default boolean visit(SQLExportTableStatement x) { } default void endVisit(SQLExportTableStatement x) { - } default boolean visit(SQLImportTableStatement x) { @@ -2134,7 +1946,6 @@ default boolean visit(SQLImportTableStatement x) { } default void endVisit(SQLImportTableStatement x) { - } default boolean visit(SQLTableSampling x) { @@ -2142,7 +1953,6 @@ default boolean visit(SQLTableSampling x) { } default void endVisit(SQLTableSampling x) { - } default boolean visit(SQLSizeExpr x) { @@ -2150,7 +1960,6 @@ default boolean visit(SQLSizeExpr x) { } default void endVisit(SQLSizeExpr x) { - } default boolean visit(SQLAlterTableArchivePartition x) { @@ -2158,7 +1967,6 @@ default boolean visit(SQLAlterTableArchivePartition x) { } default void endVisit(SQLAlterTableArchivePartition x) { - } default boolean visit(SQLAlterTableUnarchivePartition x) { @@ -2166,7 +1974,6 @@ default boolean visit(SQLAlterTableUnarchivePartition x) { } default void endVisit(SQLAlterTableUnarchivePartition x) { - } default boolean visit(SQLCreateOutlineStatement x) { @@ -2174,7 +1981,6 @@ default boolean visit(SQLCreateOutlineStatement x) { } default void endVisit(SQLCreateOutlineStatement x) { - } default boolean visit(SQLDropOutlineStatement x) { @@ -2182,7 +1988,6 @@ default boolean visit(SQLDropOutlineStatement x) { } default void endVisit(SQLDropOutlineStatement x) { - } default boolean visit(SQLAlterOutlineStatement x) { @@ -2190,7 +1995,6 @@ default boolean visit(SQLAlterOutlineStatement x) { } default void endVisit(SQLAlterOutlineStatement x) { - } default boolean visit(SQLShowOutlinesStatement x) { @@ -2198,7 +2002,6 @@ default boolean visit(SQLShowOutlinesStatement x) { } default void endVisit(SQLShowOutlinesStatement x) { - } default boolean visit(SQLPurgeTableStatement x) { @@ -2206,7 +2009,6 @@ default boolean visit(SQLPurgeTableStatement x) { } default void endVisit(SQLPurgeTableStatement x) { - } default boolean visit(SQLPurgeTemporaryOutputStatement x) { @@ -2214,7 +2016,6 @@ default boolean visit(SQLPurgeTemporaryOutputStatement x) { } default void endVisit(SQLPurgeTemporaryOutputStatement x) { - } default boolean visit(SQLPurgeLogsStatement x) { @@ -2222,7 +2023,6 @@ default boolean visit(SQLPurgeLogsStatement x) { } default void endVisit(SQLPurgeLogsStatement x) { - } default boolean visit(SQLPurgeRecyclebinStatement x) { @@ -2230,7 +2030,6 @@ default boolean visit(SQLPurgeRecyclebinStatement x) { } default void endVisit(SQLPurgeRecyclebinStatement x) { - } default boolean visit(SQLShowStatisticStmt x) { @@ -2238,7 +2037,6 @@ default boolean visit(SQLShowStatisticStmt x) { } default void endVisit(SQLShowStatisticStmt x) { - } default boolean visit(SQLShowStatisticListStmt x) { @@ -2246,7 +2044,6 @@ default boolean visit(SQLShowStatisticListStmt x) { } default void endVisit(SQLShowStatisticListStmt x) { - } default boolean visit(SQLAlterTableAddSupplemental x) { @@ -2254,7 +2051,6 @@ default boolean visit(SQLAlterTableAddSupplemental x) { } default void endVisit(SQLAlterTableAddSupplemental x) { - } default boolean visit(SQLShowCatalogsStatement x) { @@ -2262,7 +2058,6 @@ default boolean visit(SQLShowCatalogsStatement x) { } default void endVisit(SQLShowCatalogsStatement x) { - } default boolean visit(SQLShowFunctionsStatement x) { @@ -2270,7 +2065,6 @@ default boolean visit(SQLShowFunctionsStatement x) { } default void endVisit(SQLShowFunctionsStatement x) { - } default boolean visit(SQLShowSessionStatement x) { @@ -2278,7 +2072,6 @@ default boolean visit(SQLShowSessionStatement x) { } default void endVisit(SQLShowSessionStatement x) { - } default boolean visit(SQLDbLinkExpr x) { @@ -2286,7 +2079,6 @@ default boolean visit(SQLDbLinkExpr x) { } default void endVisit(SQLDbLinkExpr x) { - } default boolean visit(SQLCurrentTimeExpr x) { @@ -2294,7 +2086,6 @@ default boolean visit(SQLCurrentTimeExpr x) { } default void endVisit(SQLCurrentTimeExpr x) { - } default boolean visit(SQLCurrentUserExpr x) { @@ -2302,7 +2093,6 @@ default boolean visit(SQLCurrentUserExpr x) { } default void endVisit(SQLCurrentUserExpr x) { - } default boolean visit(SQLShowQueryTaskStatement x) { @@ -2310,7 +2100,6 @@ default boolean visit(SQLShowQueryTaskStatement x) { } default void endVisit(SQLShowQueryTaskStatement x) { - } default boolean visit(SQLAdhocTableSource x) { @@ -2318,7 +2107,6 @@ default boolean visit(SQLAdhocTableSource x) { } default void endVisit(SQLAdhocTableSource x) { - } default boolean visit(HiveCreateTableStatement x) { @@ -2326,7 +2114,6 @@ default boolean visit(HiveCreateTableStatement x) { } default void endVisit(HiveCreateTableStatement x) { - } default boolean visit(HiveInputOutputFormat x) { @@ -2334,7 +2121,6 @@ default boolean visit(HiveInputOutputFormat x) { } default void endVisit(HiveInputOutputFormat x) { - } default boolean visit(SQLExplainAnalyzeStatement x) { @@ -2342,7 +2128,6 @@ default boolean visit(SQLExplainAnalyzeStatement x) { } default void endVisit(SQLExplainAnalyzeStatement x) { - } default boolean visit(SQLPartitionRef x) { @@ -2350,7 +2135,6 @@ default boolean visit(SQLPartitionRef x) { } default void endVisit(SQLPartitionRef x) { - } default boolean visit(SQLPartitionRef.Item x) { @@ -2358,7 +2142,6 @@ default boolean visit(SQLPartitionRef.Item x) { } default void endVisit(SQLPartitionRef.Item x) { - } default boolean visit(SQLWhoamiStatement x) { @@ -2366,7 +2149,6 @@ default boolean visit(SQLWhoamiStatement x) { } default void endVisit(SQLWhoamiStatement x) { - } default boolean visit(SQLDropResourceStatement x) { @@ -2374,7 +2156,6 @@ default boolean visit(SQLDropResourceStatement x) { } default void endVisit(SQLDropResourceStatement x) { - } default boolean visit(SQLForStatement x) { @@ -2382,7 +2163,6 @@ default boolean visit(SQLForStatement x) { } default void endVisit(SQLForStatement x) { - } default boolean visit(SQLUnnestTableSource x) { @@ -2390,7 +2170,6 @@ default boolean visit(SQLUnnestTableSource x) { } default void endVisit(SQLUnnestTableSource x) { - } default boolean visit(SQLCopyFromStatement x) { @@ -2398,7 +2177,6 @@ default boolean visit(SQLCopyFromStatement x) { } default void endVisit(SQLCopyFromStatement x) { - } default boolean visit(SQLShowUsersStatement x) { @@ -2406,7 +2184,6 @@ default boolean visit(SQLShowUsersStatement x) { } default void endVisit(SQLShowUsersStatement x) { - } default boolean visit(SQLSubmitJobStatement x) { @@ -2414,7 +2191,6 @@ default boolean visit(SQLSubmitJobStatement x) { } default void endVisit(SQLSubmitJobStatement x) { - } default boolean visit(SQLTableLike x) { @@ -2422,7 +2198,6 @@ default boolean visit(SQLTableLike x) { } default void endVisit(SQLTableLike x) { - } default boolean visit(SQLSyncMetaStatement x) { @@ -2430,7 +2205,6 @@ default boolean visit(SQLSyncMetaStatement x) { } default void endVisit(SQLSyncMetaStatement x) { - } default void endVisit(SQLValuesQuery x) { @@ -2441,7 +2215,6 @@ default boolean visit(SQLValuesQuery x) { } default void endVisit(SQLDataTypeRefExpr x) { - } default boolean visit(SQLDataTypeRefExpr x) { @@ -2449,7 +2222,6 @@ default boolean visit(SQLDataTypeRefExpr x) { } default void endVisit(SQLArchiveTableStatement x) { - } default boolean visit(SQLArchiveTableStatement x) { @@ -2457,7 +2229,6 @@ default boolean visit(SQLArchiveTableStatement x) { } default void endVisit(SQLBackupStatement x) { - } default boolean visit(SQLBackupStatement x) { @@ -2465,7 +2236,6 @@ default boolean visit(SQLBackupStatement x) { } default void endVisit(SQLRestoreStatement x) { - } default boolean visit(SQLRestoreStatement x) { @@ -2473,7 +2243,6 @@ default boolean visit(SQLRestoreStatement x) { } default void endVisit(SQLBuildTableStatement x) { - } default boolean visit(SQLBuildTableStatement x) { @@ -2481,7 +2250,6 @@ default boolean visit(SQLBuildTableStatement x) { } default void endVisit(SQLCancelJobStatement x) { - } default boolean visit(SQLCancelJobStatement x) { @@ -2489,7 +2257,6 @@ default boolean visit(SQLCancelJobStatement x) { } default void endVisit(SQLExportDatabaseStatement x) { - } default boolean visit(SQLExportDatabaseStatement x) { @@ -2497,7 +2264,6 @@ default boolean visit(SQLExportDatabaseStatement x) { } default void endVisit(SQLImportDatabaseStatement x) { - } default boolean visit(SQLImportDatabaseStatement x) { @@ -2505,7 +2271,6 @@ default boolean visit(SQLImportDatabaseStatement x) { } default void endVisit(SQLRenameUserStatement x) { - } default boolean visit(SQLRenameUserStatement x) { @@ -2513,7 +2278,6 @@ default boolean visit(SQLRenameUserStatement x) { } default void endVisit(SQLPartitionByValue x) { - } default boolean visit(SQLPartitionByValue x) { @@ -2521,7 +2285,6 @@ default boolean visit(SQLPartitionByValue x) { } default void endVisit(SQLAlterTablePartitionCount x) { - } default boolean visit(SQLAlterTablePartitionCount x) { @@ -2529,7 +2292,6 @@ default boolean visit(SQLAlterTablePartitionCount x) { } default void endVisit(SQLAlterTableBlockSize x) { - } default boolean visit(SQLAlterTableBlockSize x) { @@ -2537,7 +2299,6 @@ default boolean visit(SQLAlterTableBlockSize x) { } default void endVisit(SQLAlterTableCompression x) { - } default boolean visit(SQLAlterTableCompression x) { @@ -2545,7 +2306,6 @@ default boolean visit(SQLAlterTableCompression x) { } default void endVisit(SQLAlterTablePartitionLifecycle x) { - } default boolean visit(SQLAlterTablePartitionLifecycle x) { @@ -2553,7 +2313,6 @@ default boolean visit(SQLAlterTablePartitionLifecycle x) { } default void endVisit(SQLAlterTableSubpartitionLifecycle x) { - } default boolean visit(SQLAlterTableSubpartitionLifecycle x) { @@ -2561,7 +2320,6 @@ default boolean visit(SQLAlterTableSubpartitionLifecycle x) { } default void endVisit(SQLAlterTableDropSubpartition x) { - } default boolean visit(SQLAlterTableDropSubpartition x) { @@ -2569,7 +2327,6 @@ default boolean visit(SQLAlterTableDropSubpartition x) { } default void endVisit(SQLAlterTableDropClusteringKey x) { - } default boolean visit(SQLAlterTableDropClusteringKey x) { @@ -2577,7 +2334,6 @@ default boolean visit(SQLAlterTableDropClusteringKey x) { } default void endVisit(SQLAlterTableAddClusteringKey x) { - } default boolean visit(SQLAlterTableAddClusteringKey x) { @@ -2585,20 +2341,17 @@ default boolean visit(SQLAlterTableAddClusteringKey x) { } default void endVisit(MySqlKillStatement x) { - } default boolean visit(MySqlKillStatement x) { return true; } - default boolean visit(SQLCreateResourceGroupStatement x) { return true; } default void endVisit(SQLCreateResourceGroupStatement x) { - } default boolean visit(SQLAlterResourceGroupStatement x) { @@ -2606,11 +2359,9 @@ default boolean visit(SQLAlterResourceGroupStatement x) { } default void endVisit(SQLAlterResourceGroupStatement x) { - } default void endVisit(SQLDropResourceGroupStatement x) { - } default boolean visit(SQLDropResourceGroupStatement x) { @@ -2618,7 +2369,6 @@ default boolean visit(SQLDropResourceGroupStatement x) { } default void endVisit(SQLListResourceGroupStatement x) { - } default boolean visit(SQLListResourceGroupStatement x) { @@ -2626,7 +2376,6 @@ default boolean visit(SQLListResourceGroupStatement x) { } default void endVisit(SQLAlterTableMergePartition x) { - } default boolean visit(SQLAlterTableMergePartition x) { @@ -2634,7 +2383,6 @@ default boolean visit(SQLAlterTableMergePartition x) { } default void endVisit(SQLPartitionSpec x) { - } default boolean visit(SQLPartitionSpec x) { @@ -2642,7 +2390,6 @@ default boolean visit(SQLPartitionSpec x) { } default void endVisit(SQLPartitionSpec.Item x) { - } default boolean visit(SQLPartitionSpec.Item x) { @@ -2650,7 +2397,6 @@ default boolean visit(SQLPartitionSpec.Item x) { } default void endVisit(SQLAlterTableChangeOwner x) { - } default boolean visit(SQLAlterTableChangeOwner x) { @@ -2658,7 +2404,6 @@ default boolean visit(SQLAlterTableChangeOwner x) { } default void endVisit(SQLTableDataType x) { - } default boolean visit(SQLTableDataType x) { @@ -2666,7 +2411,6 @@ default boolean visit(SQLTableDataType x) { } default void endVisit(SQLCloneTableStatement x) { - } default boolean visit(SQLCloneTableStatement x) { @@ -2674,7 +2418,6 @@ default boolean visit(SQLCloneTableStatement x) { } default void endVisit(SQLShowHistoryStatement x) { - } default boolean visit(SQLShowHistoryStatement x) { @@ -2682,7 +2425,6 @@ default boolean visit(SQLShowHistoryStatement x) { } default void endVisit(SQLShowRoleStatement x) { - } default boolean visit(SQLShowRoleStatement x) { @@ -2690,7 +2432,6 @@ default boolean visit(SQLShowRoleStatement x) { } default void endVisit(SQLShowRolesStatement x) { - } default boolean visit(SQLShowRolesStatement x) { @@ -2702,7 +2443,6 @@ default boolean visit(SQLShowVariantsStatement x) { } default void endVisit(SQLShowVariantsStatement x) { - } default boolean visit(SQLShowACLStatement x) { @@ -2710,7 +2450,6 @@ default boolean visit(SQLShowACLStatement x) { } default void endVisit(SQLShowACLStatement x) { - } default boolean visit(SQLOptimizeStatement x) { @@ -2718,7 +2457,6 @@ default boolean visit(SQLOptimizeStatement x) { } default void endVisit(SQLOptimizeStatement x) { - } } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java index 9c7f392724..80503ee758 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java @@ -16,18 +16,6 @@ package com.alibaba.druid.sql.visitor; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.ast.expr.*; -import com.alibaba.druid.sql.ast.statement.*; -import com.alibaba.druid.sql.ast.statement.SQLInsertStatement.ValuesClause; -import com.alibaba.druid.sql.ast.statement.SQLMergeStatement.MergeInsertClause; -import com.alibaba.druid.sql.ast.statement.SQLMergeStatement.MergeUpdateClause; -import com.alibaba.druid.sql.dialect.hive.ast.HiveInputOutputFormat; -import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateTableStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlKillStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.SQLAlterResourceGroupStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.SQLCreateResourceGroupStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.SQLListResourceGroupStatement; public class SQLASTVisitorAdapter implements SQLASTVisitor { protected DbType dbType; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLDataTypeValidator.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLDataTypeValidator.java index 5e2feefdae..4e9b2c0ec2 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLDataTypeValidator.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLDataTypeValidator.java @@ -3,7 +3,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.FastsqlException; import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.ast.expr.SQLCaseExpr; import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.util.FnvHash; @@ -74,9 +73,9 @@ public void validate(SQLDataType x) { } } - private static String[] odpsTypes = null; - private static String[] hiveTypes = null; - private static String[] mysqlTypes = null; + private static String[] odpsTypes; + private static String[] hiveTypes; + private static String[] mysqlTypes; public static SQLDataTypeValidator of(DbType dbType) { Set typeSet = null; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitor.java index b73a16281c..f4b484f41d 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitor.java @@ -20,12 +20,11 @@ import java.util.List; public interface SQLEvalVisitor extends SQLASTVisitor { - - public static final String EVAL_VALUE = "eval.value"; - public static final String EVAL_EXPR = "eval.expr"; - public static final Object EVAL_ERROR = new Object(); + public static final String EVAL_VALUE = "eval.value"; + public static final String EVAL_EXPR = "eval.expr"; + public static final Object EVAL_ERROR = new Object(); public static final Object EVAL_VALUE_COUNT = new Object(); - public static final Object EVAL_VALUE_NULL = new Object(); + public static final Object EVAL_VALUE_NULL = new Object(); Function getFunction(String funcName); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorImpl.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorImpl.java index 015a6018e6..ee43c9bc39 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorImpl.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorImpl.java @@ -24,20 +24,19 @@ import java.util.Map; public class SQLEvalVisitorImpl extends SQLASTVisitorAdapter implements SQLEvalVisitor { + private List parameters = new ArrayList(); - private List parameters = new ArrayList(); + private Map functions = new HashMap(); - private Map functions = new HashMap(); + private int variantIndex = -1; - private int variantIndex = -1; + private boolean markVariantIndex = true; - private boolean markVariantIndex = true; - - public SQLEvalVisitorImpl(){ + public SQLEvalVisitorImpl() { this(new ArrayList(1)); } - public SQLEvalVisitorImpl(List parameters){ + public SQLEvalVisitorImpl(List parameters) { this.parameters = parameters; } @@ -76,7 +75,7 @@ public boolean visit(SQLIntegerExpr x) { public boolean visit(SQLNumberExpr x) { return SQLEvalVisitorUtils.visit(this, x); } - + public boolean visit(SQLHexExpr x) { return SQLEvalVisitorUtils.visit(this, x); } @@ -123,7 +122,7 @@ public Function getFunction(String funcName) { public void registerFunction(String funcName, Function function) { functions.put(funcName, function); } - + public boolean visit(SQLIdentifierExpr x) { return SQLEvalVisitorUtils.visit(this, x); } @@ -132,7 +131,7 @@ public boolean visit(SQLIdentifierExpr x) { public void unregisterFunction(String funcName) { functions.remove(funcName); } - + @Override public boolean visit(SQLBooleanExpr x) { x.getAttributes().put(EVAL_VALUE, x.getBooleanValue()); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java index 16e20f2458..188ee8d7f7 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java @@ -43,13 +43,8 @@ import java.util.regex.Pattern; import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.*; -import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_ERROR; -import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_EXPR; -import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; -import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE_NULL; public class SQLEvalVisitorUtils { - private static Map functions = new HashMap(); static { @@ -546,7 +541,7 @@ public static boolean visit(SQLEvalVisitor visitor, SQLBinaryExpr x) { String text = x.getText(); long[] words = new long[text.length() / 64 + 1]; - for (int i = text.length()-1; i >= 0 ; --i) { + for (int i = text.length() - 1; i >= 0; --i) { char ch = text.charAt(i); if (ch == '1') { int wordIndex = i >> 6; @@ -562,7 +557,7 @@ public static boolean visit(SQLEvalVisitor visitor, SQLBinaryExpr x) { byte[] bytes = new byte[words.length * 8]; for (int i = 0; i < words.length; ++i) { - Utils.putLong(bytes, (words.length-1-i) * 8, words[i]); + Utils.putLong(bytes, (words.length - 1 - i) * 8, words[i]); } val = new BigInteger(bytes); @@ -665,7 +660,7 @@ public static boolean visit(SQLEvalVisitor visitor, SQLCaseExpr x) { Object conditionValue = item.getConditionExpr().getAttribute(EVAL_VALUE); if ((x.getValueExpr() != null && eq(value, conditionValue)) - || (x.getValueExpr() == null && conditionValue instanceof Boolean && (Boolean) conditionValue == Boolean.TRUE)) { + || (x.getValueExpr() == null && conditionValue instanceof Boolean && (Boolean) conditionValue == Boolean.TRUE)) { item.getValueExpr().accept(visitor); if (item.getValueExpr().getAttributes().containsKey(EVAL_VALUE)) { @@ -768,7 +763,7 @@ public static boolean visit(SQLEvalVisitor visitor, SQLUnaryExpr x) { x.putAttribute(EVAL_VALUE, EVAL_ERROR); return false; } - + if (val == null) { x.putAttribute(EVAL_VALUE, EVAL_VALUE_NULL); return false; @@ -830,9 +825,9 @@ public static boolean visit(SQLEvalVisitor visitor, SQLBinaryOpExpr x) { wallConditionContext.setXor(true); } } else if (x.getOperator() == SQLBinaryOperator.BitwiseAnd // - || x.getOperator() == SQLBinaryOperator.BitwiseNot // - || x.getOperator() == SQLBinaryOperator.BitwiseOr // - || x.getOperator() == SQLBinaryOperator.BitwiseXor) { + || x.getOperator() == SQLBinaryOperator.BitwiseNot // + || x.getOperator() == SQLBinaryOperator.BitwiseOr // + || x.getOperator() == SQLBinaryOperator.BitwiseXor) { if (wallConditionContext != null) { wallConditionContext.setBitwise(true); } @@ -1012,19 +1007,17 @@ public static boolean visit(SQLEvalVisitor visitor, SQLBinaryOpExpr x) { x.putAttribute(EVAL_VALUE, result); break; } - case BooleanAnd: - { - boolean first = eq(leftValue, true); - boolean second = eq(rightValue, true); - x.putAttribute(EVAL_VALUE, first&&second); - break; + case BooleanAnd: { + boolean first = eq(leftValue, true); + boolean second = eq(rightValue, true); + x.putAttribute(EVAL_VALUE, first && second); + break; } - case BooleanOr: - { - boolean first = eq(leftValue, true); - boolean second = eq(rightValue, true); - x.putAttribute(EVAL_VALUE, first||second); - break; + case BooleanOr: { + boolean first = eq(leftValue, true); + boolean second = eq(rightValue, true); + x.putAttribute(EVAL_VALUE, first || second); + break; } default: break; @@ -1079,8 +1072,7 @@ public static boolean visit(SQLEvalVisitor visitor, SQLVariantRefExpr x) { List parameters = visitor.getParameters(); if (varIndex != -1 && parameters != null - && parameters.size() > varIndex) - { + && parameters.size() > varIndex) { boolean containsValue = attributes.containsKey(EVAL_VALUE); if (!containsValue) { Object value = parameters.get(varIndex); @@ -1098,7 +1090,7 @@ public static Boolean castToBoolean(Object val) { if (val == null) { return null; } - + if (val == EVAL_VALUE_NULL) { return null; } @@ -1106,7 +1098,7 @@ public static Boolean castToBoolean(Object val) { if (val instanceof Boolean) { return (Boolean) val; } - + if (val instanceof Number) { return ((Number) val).intValue() > 0; } @@ -1220,12 +1212,12 @@ public static Long castToLong(Object val) { return castToLong(list.get(0)); } } - + if (val instanceof Boolean) { if (((Boolean) val).booleanValue()) { - return 1l; + return 1L; } else { - return 0l; + return 0L; } } @@ -1271,7 +1263,7 @@ public static BigInteger castToBigInteger(Object val) { return BigInteger.valueOf(((Number) val).longValue()); } - + public static Number castToNumber(String val) { if (val == null) { return null; @@ -1296,22 +1288,22 @@ public static Number castToNumber(String val) { return Long.parseLong(val); } catch (NumberFormatException e) { } - + try { return Float.parseFloat(val); } catch (NumberFormatException e) { } - + try { return Double.parseDouble(val); } catch (NumberFormatException e) { } - + try { return new BigInteger(val); } catch (NumberFormatException e) { } - + try { return new BigDecimal(val); } catch (NumberFormatException e) { @@ -1399,11 +1391,11 @@ public static Object bitAnd(Object a, Object b) { if (a == null || b == null) { return null; } - - if(a == EVAL_VALUE_NULL || b == EVAL_VALUE_NULL) { + + if (a == EVAL_VALUE_NULL || b == EVAL_VALUE_NULL) { return null; } - + if (a instanceof String) { a = castToNumber((String) a); } @@ -1423,11 +1415,11 @@ public static Object bitOr(Object a, Object b) { if (a == null || b == null) { return null; } - - if(a == EVAL_VALUE_NULL || b == EVAL_VALUE_NULL) { + + if (a == EVAL_VALUE_NULL || b == EVAL_VALUE_NULL) { return null; } - + if (a instanceof String) { a = castToNumber((String) a); } @@ -1447,11 +1439,11 @@ public static Object div(Object a, Object b) { if (a == null || b == null) { return null; } - - if(a == EVAL_VALUE_NULL || b == EVAL_VALUE_NULL) { + + if (a == EVAL_VALUE_NULL || b == EVAL_VALUE_NULL) { return null; } - + if (a instanceof String) { a = castToNumber((String) a); } @@ -1680,7 +1672,7 @@ public static boolean eq(Object a, Object b) { if (a == null || b == null) { return false; } - + if (a == EVAL_VALUE_NULL || b == EVAL_VALUE_NULL) { return false; } @@ -1756,7 +1748,7 @@ public static Object add(Object a, Object b) { if (a == EVAL_VALUE_NULL || b == EVAL_VALUE_NULL) { return EVAL_VALUE_NULL; } - + if (a instanceof String && !(b instanceof String)) { a = castToNumber((String) a); } @@ -1795,8 +1787,12 @@ public static Object add(Object a, Object b) { if (a instanceof Boolean || b instanceof Boolean) { int aI = 0, bI = 0; - if (castToBoolean(a)) aI = 1; - if (castToBoolean(b)) bI = 1; + if (castToBoolean(a)) { + aI = 1; + } + if (castToBoolean(b)) { + bI = 1; + } return aI + bI; } @@ -1827,7 +1823,7 @@ public static Object sub(Object a, Object b) { if (a instanceof Date || b instanceof Date) { return SQLEvalVisitor.EVAL_ERROR; } - + if (a instanceof String) { a = castToNumber((String) a); } @@ -1866,8 +1862,12 @@ public static Object sub(Object a, Object b) { if (a instanceof Boolean || b instanceof Boolean) { int aI = 0, bI = 0; - if (castToBoolean(a)) aI = 1; - if (castToBoolean(b)) bI = 1; + if (castToBoolean(a)) { + aI = 1; + } + if (castToBoolean(b)) { + bI = 1; + } return aI - bI; } @@ -1899,11 +1899,11 @@ public static Object multi(Object a, Object b) { if (a instanceof BigInteger || b instanceof BigInteger) { return castToBigInteger(a).multiply(castToBigInteger(b)); } - + if (a instanceof Double || b instanceof Double) { return castToDouble(a) * castToDouble(b); } - + if (a instanceof Float || b instanceof Float) { return castToFloat(a) * castToFloat(b); } @@ -1952,7 +1952,7 @@ public static boolean like(String input, String pattern) { char ch = pattern.charAt(i); if (stat == STAT_LITERAL // - && (ch == '%' || ch == '_' || ch == '[')) { + && (ch == '%' || ch == '_' || ch == '[')) { String block = pattern.substring(blockStart, i); regexprBuilder.append("\\Q"); regexprBuilder.append(block); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLSubQueryGroupVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLSubQueryGroupVisitor.java index c7580679fd..d41c8cd421 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLSubQueryGroupVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLSubQueryGroupVisitor.java @@ -2,10 +2,7 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.statement.*; +import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; import com.alibaba.druid.util.FnvHash; import java.util.*; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLTableAliasCollectVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLTableAliasCollectVisitor.java index 6783e580be..8d7ccd4d2c 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLTableAliasCollectVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLTableAliasCollectVisitor.java @@ -2,7 +2,6 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.util.FnvHash; @@ -15,7 +14,7 @@ public class SQLTableAliasCollectVisitor extends SQLASTVisitorAdapter { protected volatile int seed; public boolean visit(SQLLateralViewTableSource x) { - String alias =x.getAlias(); + String alias = x.getAlias(); if (alias == null) { return false; } @@ -26,7 +25,7 @@ public boolean visit(SQLLateralViewTableSource x) { } public boolean visit(SQLValuesTableSource x) { - String alias =x.getAlias(); + String alias = x.getAlias(); if (alias == null) { return false; } @@ -37,7 +36,7 @@ public boolean visit(SQLValuesTableSource x) { } public boolean visit(SQLUnionQueryTableSource x) { - String alias =x.getAlias(); + String alias = x.getAlias(); if (alias == null) { x.getUnion().accept(this); return false; @@ -49,7 +48,7 @@ public boolean visit(SQLUnionQueryTableSource x) { } public boolean visit(SQLSubqueryTableSource x) { - String alias =x.getAlias(); + String alias = x.getAlias(); if (alias == null) { x.getSelect().accept(this); return false; @@ -114,7 +113,7 @@ public boolean containsTableSource(String alias) { public String genAlias(int seed) { String alias = null; - for (; seed < 100;) { + for (; seed < 100; ) { String str = "G" + (seed++); if (!containsTableSource(str)) { alias = str; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java index f24fdde2dd..9524b59624 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -40,19 +40,18 @@ import java.util.*; public class SchemaStatVisitor extends SQLASTVisitorAdapter { - protected SchemaRepository repository; protected final List originalTables = new ArrayList(); - protected final HashMap tableStats = new LinkedHashMap(); - protected final Map columns = new LinkedHashMap(); - protected final List conditions = new ArrayList(); - protected final Set relationships = new LinkedHashSet(); - protected final List orderByColumns = new ArrayList(); - protected final Set groupByColumns = new LinkedHashSet(); - protected final List aggregateFunctions = new ArrayList(); - protected final List functions = new ArrayList(2); + protected final HashMap tableStats = new LinkedHashMap(); + protected final Map columns = new LinkedHashMap(); + protected final List conditions = new ArrayList(); + protected final Set relationships = new LinkedHashSet(); + protected final List orderByColumns = new ArrayList(); + protected final Set groupByColumns = new LinkedHashSet(); + protected final List aggregateFunctions = new ArrayList(); + protected final List functions = new ArrayList(2); private List parameters; @@ -60,7 +59,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { protected DbType dbType; - public SchemaStatVisitor(){ + public SchemaStatVisitor() { this((DbType) null); } @@ -71,21 +70,21 @@ public SchemaStatVisitor(SchemaRepository repository) { this.repository = repository; } - public SchemaStatVisitor(DbType dbType){ + public SchemaStatVisitor(DbType dbType) { this(new SchemaRepository(dbType), new ArrayList()); this.dbType = dbType; } - public SchemaStatVisitor(List parameters){ + public SchemaStatVisitor(List parameters) { this((DbType) null, parameters); } - public SchemaStatVisitor(DbType dbType, List parameters){ + public SchemaStatVisitor(DbType dbType, List parameters) { this(new SchemaRepository(dbType), parameters); this.parameters = parameters; } - public SchemaStatVisitor(SchemaRepository repository, List parameters){ + public SchemaStatVisitor(SchemaRepository repository, List parameters) { this.repository = repository; this.parameters = parameters; if (repository != null) { @@ -128,7 +127,7 @@ public TableStat getTableStat(SQLName tableName) { String strName; if (tableName instanceof SQLIdentifierExpr) { strName = ((SQLIdentifierExpr) tableName).normalizedName(); - } else if (tableName instanceof SQLPropertyExpr) { + } else if (tableName instanceof SQLPropertyExpr) { strName = ((SQLPropertyExpr) tableName).normalizedName(); } else { strName = tableName.toString(); @@ -256,7 +255,7 @@ private boolean visitOrderBy(SQLIdentifierExpr x) { SQLExpr selectItemExpr = selectItem.getExpr(); if (selectItemExpr instanceof SQLIdentifierExpr) { x = (SQLIdentifierExpr) selectItemExpr; - } else if (selectItemExpr instanceof SQLPropertyExpr) { + } else if (selectItemExpr instanceof SQLPropertyExpr) { return visitOrderBy((SQLPropertyExpr) selectItemExpr); } else { return false; @@ -328,7 +327,7 @@ private boolean visitOrderBy(SQLIdentifierExpr x) { } } else { boolean skip = false; - for (SQLObject parent = x.getParent();parent != null;parent = parent.getParent()) { + for (SQLObject parent = x.getParent(); parent != null; parent = parent.getParent()) { if (parent instanceof SQLSelectQueryBlock) { SQLTableSource from = ((SQLSelectQueryBlock) parent).getFrom(); @@ -418,10 +417,9 @@ private void orderByAddColumn(String table, String columnName, SQLObject expr) { } protected class OrderByStatVisitor extends SQLASTVisitorAdapter { - private final SQLOrderBy orderBy; - public OrderByStatVisitor(SQLOrderBy orderBy){ + public OrderByStatVisitor(SQLOrderBy orderBy) { this.orderBy = orderBy; for (SQLSelectOrderByItem item : orderBy.getItems()) { item.getExpr().setParent(item); @@ -446,10 +444,9 @@ public boolean visit(SQLIntegerExpr x) { } protected class MySqlOrderByStatVisitor extends MySqlASTVisitorAdapter { - private final SQLOrderBy orderBy; - public MySqlOrderByStatVisitor(SQLOrderBy orderBy){ + public MySqlOrderByStatVisitor(SQLOrderBy orderBy) { this.orderBy = orderBy; for (SQLSelectOrderByItem item : orderBy.getItems()) { item.getExpr().setParent(item); @@ -474,10 +471,9 @@ public boolean visit(SQLIntegerExpr x) { } protected class PGOrderByStatVisitor extends PGASTVisitorAdapter { - private final SQLOrderBy orderBy; - public PGOrderByStatVisitor(SQLOrderBy orderBy){ + public PGOrderByStatVisitor(SQLOrderBy orderBy) { this.orderBy = orderBy; for (SQLSelectOrderByItem item : orderBy.getItems()) { item.getExpr().setParent(item); @@ -502,10 +498,9 @@ public boolean visit(SQLIntegerExpr x) { } protected class OracleOrderByStatVisitor extends OracleASTVisitorAdapter { - private final SQLOrderBy orderBy; - public OracleOrderByStatVisitor(SQLOrderBy orderBy){ + public OracleOrderByStatVisitor(SQLOrderBy orderBy) { this.orderBy = orderBy; for (SQLSelectOrderByItem item : orderBy.getItems()) { item.getExpr().setParent(item); @@ -571,7 +566,6 @@ public boolean visit(SQLOver x) { SQLOrderBy orderBy = x.getOrderBy(); List partitionBy = x.getPartitionBy(); - if (of == null // skip if of is not null && orderBy != null) { orderBy.accept(this); @@ -629,7 +623,7 @@ public Set getGroupByColumns() { public List getConditions() { return conditions; } - + public List getAggregateFunctions() { return aggregateFunctions; } @@ -707,7 +701,6 @@ public boolean visit(SQLBinaryOpExpr x) { } handleCondition(right, reverseOp, left); - handleRelationship(left, op.name, right); break; case BooleanOr: { @@ -785,7 +778,7 @@ protected void handleCondition(SQLExpr expr, String operator, SQLExpr... valueEx } } } - + Column column = getColumn(expr); if (column == null @@ -821,7 +814,7 @@ protected void handleCondition(SQLExpr expr, String operator, SQLExpr... valueEx if (column == null) { return; } - + Condition condition = null; for (Condition item : this.getConditions()) { if (item.getColumn().equals(column) && item.getOperator().equals(operator)) { @@ -928,7 +921,7 @@ protected Column getColumn(SQLExpr expr) { if (columnObj == null) { columnObj = new Column(tableName, column, columnHashCode64); if (!(resolvedOwnerObject instanceof SQLSubqueryTableSource - || resolvedOwnerObject instanceof SQLWithSubqueryClause.Entry )) { + || resolvedOwnerObject instanceof SQLWithSubqueryClause.Entry)) { this.columns.put(columnHashCode64, columnObj); } } @@ -1007,7 +1000,7 @@ protected Column getColumn(SQLExpr expr) { private SQLExpr unwrapExpr(SQLExpr expr) { SQLExpr original = expr; - for (int i = 0;;i++) { + for (int i = 0; ; i++) { if (i > 1000) { return null; } @@ -1179,7 +1172,7 @@ public boolean visit(SQLInsertStatement x) { return false; } - + protected static void putAliasMap(Map aliasMap, String name, String value) { if (aliasMap == null || name == null) { return; @@ -1290,7 +1283,7 @@ public boolean visit(SQLSelectQueryBlock x) { } SQLExpr first = x.getFirst(); - if(first != null) { + if (first != null) { statExpr(first); } @@ -1471,7 +1464,7 @@ public boolean visit(SQLPropertyExpr x) { } boolean skip = false; - for (SQLObject parent = x.getParent();parent != null;parent = parent.getParent()) { + for (SQLObject parent = x.getParent(); parent != null; parent = parent.getParent()) { if (parent instanceof SQLSelectQueryBlock) { SQLTableSource from = ((SQLSelectQueryBlock) parent).getFrom(); @@ -1527,8 +1520,7 @@ public boolean visit(SQLIdentifierExpr x) { if (tableSource == null && (x.getResolvedParameter() != null - || x.getResolvedDeclareItem() != null)) - { + || x.getResolvedDeclareItem() != null)) { return false; } @@ -1611,7 +1603,7 @@ public boolean visit(SQLIdentifierExpr x) { return false; } else { boolean skip = false; - for (SQLObject parent = x.getParent();parent != null;parent = parent.getParent()) { + for (SQLObject parent = x.getParent(); parent != null; parent = parent.getParent()) { if (parent instanceof SQLSelectQueryBlock) { SQLTableSource from = ((SQLSelectQueryBlock) parent).getFrom(); @@ -1654,7 +1646,7 @@ public boolean visit(SQLIdentifierExpr x) { } private boolean isParentSelectItem(SQLObject parent) { - for (int i = 0; parent != null; parent = parent.getParent(),++i) { + for (int i = 0; parent != null; parent = parent.getParent(), ++i) { if (i > 100) { break; } @@ -1669,7 +1661,7 @@ private boolean isParentSelectItem(SQLObject parent) { } return false; } - + private boolean isParentGroupBy(SQLObject parent) { for (; parent != null; parent = parent.getParent()) { if (parent instanceof SQLSelectItem) { @@ -1685,7 +1677,7 @@ private boolean isParentGroupBy(SQLObject parent) { private void setColumn(SQLExpr x, Column column) { SQLObject current = x; - for (int i = 0;i < 100;++i) { + for (int i = 0; i < 100; ++i) { SQLObject parent = current.getParent(); if (parent == null) { @@ -1817,7 +1809,7 @@ public Collection getColumns() { public Column getColumn(String tableName, String columnName) { Column column = new Column(tableName, columnName); - + return this.columns.get(column.hashCode64()); } @@ -2036,13 +2028,12 @@ public boolean visit(SQLSelect x) { accept(x.getOrderBy()); } - return false; } public boolean visit(SQLAggregateExpr x) { this.aggregateFunctions.add(x); - + accept(x.getArguments()); accept(x.getOrderBy()); accept(x.getOver()); @@ -2159,7 +2150,6 @@ public boolean visit(SQLInSubQueryExpr x) { } public void endVisit(SQLDeleteStatement x) { - } public void endVisit(SQLUpdateStatement x) { @@ -2234,7 +2224,6 @@ public boolean visit(SQLCallStatement x) { @Override public void endVisit(SQLCommentStatement x) { - } @Override @@ -2260,7 +2249,6 @@ public boolean visit(SQLAlterTableAddColumn x) { @Override public void endVisit(SQLAlterTableAddColumn x) { - } @Override @@ -2326,7 +2314,6 @@ public boolean visit(SQLAlterTableStatement x) { TableStat stat = getTableStat(x.getName()); stat.incrementAlterCount(); - for (SQLAlterTableItem item : x.getItems()) { item.setParent(x); if (item instanceof SQLAlterTableAddPartition @@ -2391,7 +2378,6 @@ public boolean visit(SQLCreateIndexStatement x) { @Override public boolean visit(SQLForeignKeyImpl x) { - for (SQLName column : x.getReferencingColumns()) { column.accept(this); } @@ -2505,12 +2491,12 @@ public boolean visit(SQLArrayExpr x) { } return false; } - + @Override public boolean visit(SQLOpenStatement x) { return false; } - + @Override public boolean visit(SQLFetchStatement x) { return false; @@ -2557,7 +2543,7 @@ public boolean visit(SQLCreateFunctionStatement x) { accept(x.getBlock()); return false; } - + @Override public boolean visit(SQLBlockStatement x) { if (repository != null @@ -2581,121 +2567,121 @@ public boolean visit(SQLBlockStatement x) { return false; } - + @Override public boolean visit(SQLShowTablesStatement x) { return false; } - + @Override public boolean visit(SQLDeclareItem x) { return false; } - + @Override public boolean visit(SQLPartitionByHash x) { return false; } - + @Override public boolean visit(SQLPartitionByRange x) { return false; } - + @Override public boolean visit(SQLPartitionByList x) { return false; } - + @Override public boolean visit(SQLPartition x) { return false; } - + @Override public boolean visit(SQLSubPartition x) { return false; } - + @Override public boolean visit(SQLSubPartitionByHash x) { return false; } - + @Override public boolean visit(SQLPartitionValue x) { return false; } - + @Override public boolean visit(SQLAlterDatabaseStatement x) { return false; } - + @Override public boolean visit(SQLAlterTableConvertCharSet x) { return false; } - + @Override public boolean visit(SQLAlterTableDropPartition x) { return false; } - + @Override public boolean visit(SQLAlterTableReOrganizePartition x) { return false; } - + @Override public boolean visit(SQLAlterTableCoalescePartition x) { return false; } - + @Override public boolean visit(SQLAlterTableTruncatePartition x) { return false; } - + @Override public boolean visit(SQLAlterTableDiscardPartition x) { return false; } - + @Override public boolean visit(SQLAlterTableImportPartition x) { return false; } - + @Override public boolean visit(SQLAlterTableAnalyzePartition x) { return false; } - + @Override public boolean visit(SQLAlterTableCheckPartition x) { return false; } - + @Override public boolean visit(SQLAlterTableOptimizePartition x) { return false; } - + @Override public boolean visit(SQLAlterTableRebuildPartition x) { return false; } - + @Override public boolean visit(SQLAlterTableRepairPartition x) { return false; } - + public boolean visit(SQLSequenceExpr x) { return false; } - + @Override public boolean visit(SQLMergeStatement x) { if (repository != null @@ -2729,7 +2715,7 @@ public boolean visit(SQLMergeStatement x) { return false; } - + @Override public boolean visit(SQLSetStatement x) { return false; @@ -2880,6 +2866,7 @@ protected final void statExpr(SQLExpr x) { public boolean visit(SQLAlterFunctionStatement x) { return false; } + public boolean visit(SQLDropSynonymStatement x) { return false; } @@ -2887,6 +2874,7 @@ public boolean visit(SQLDropSynonymStatement x) { public boolean visit(SQLAlterTypeStatement x) { return false; } + public boolean visit(SQLAlterProcedureStatement x) { return false; } @@ -2980,6 +2968,7 @@ public boolean visit(SQLDropRoleStatement x) { public boolean visit(SQLShowViewsStatement x) { return false; } + @Override public boolean visit(SQLAlterTableExchangePartition x) { SQLExprTableSource table = x.getTable(); @@ -3013,7 +3002,6 @@ public boolean visit(SQLUnionQuery x) { && ((SQLUnionQuery) left).getOperator() == operator && !right.isParenthesized() && x.getOrderBy() == null) { - SQLUnionQuery leftUnion = (SQLUnionQuery) left; List rights = new ArrayList(); @@ -3223,7 +3211,6 @@ public boolean visit(SQLSyncMetaStatement x) { return false; } - public List getOriginalTables() { return originalTables; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/VisitorFeature.java b/src/main/java/com/alibaba/druid/sql/visitor/VisitorFeature.java index 248f1dd727..05587c88d6 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/VisitorFeature.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/VisitorFeature.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.sql.visitor; -public enum VisitorFeature { +public enum VisitorFeature { OutputUCase, OutputPrettyFormat, OutputParameterized, @@ -36,16 +36,14 @@ public enum VisitorFeature { OutputKeepParenthesisWhenNotExpr, OutputNameQuote, - OutputDistributedLiteralInCreateTableStmt - ; + OutputDistributedLiteralInCreateTableStmt; - private VisitorFeature(){ + private VisitorFeature() { mask = (1 << ordinal()); } public final int mask; - public static boolean isEnabled(int features, VisitorFeature feature) { return (features & feature.mask) != 0; } @@ -67,7 +65,7 @@ public static int of(VisitorFeature... features) { int value = 0; - for (VisitorFeature feature: features) { + for (VisitorFeature feature : features) { value |= feature.mask; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Ascii.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Ascii.java index 240101d844..c401f0646e 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Ascii.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Ascii.java @@ -23,8 +23,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE_NULL; public class Ascii implements Function { - - public final static Ascii instance = new Ascii(); + public static final Ascii instance = new Ascii(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().isEmpty()) { @@ -32,12 +31,12 @@ public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { } SQLExpr param = x.getArguments().get(0); param.accept(visitor); - + Object paramValue = param.getAttributes().get(EVAL_VALUE); if (paramValue == null) { return SQLEvalVisitor.EVAL_ERROR; } - + if (paramValue == EVAL_VALUE_NULL) { return EVAL_VALUE_NULL; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Bin.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Bin.java index 8dbf95050b..a015b3146a 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Bin.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Bin.java @@ -22,8 +22,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Bin implements Function { - - public final static Bin instance = new Bin(); + public static final Bin instance = new Bin(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 1) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/BitLength.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/BitLength.java index 125141a007..f7f45d5a78 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/BitLength.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/BitLength.java @@ -22,8 +22,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class BitLength implements Function { - - public final static BitLength instance = new BitLength(); + public static final BitLength instance = new BitLength(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 1) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Char.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Char.java index d2737116f0..95446720b9 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Char.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Char.java @@ -24,8 +24,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Char implements Function { - - public final static Char instance = new Char(); + public static final Char instance = new Char(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().isEmpty()) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Concat.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Concat.java index 3cf1911721..64aa65fc81 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Concat.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Concat.java @@ -23,8 +23,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Concat implements Function { - - public final static Concat instance = new Concat(); + public static final Concat instance = new Concat(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { StringBuilder buf = new StringBuilder(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/DateAdd.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/DateAdd.java index 8ba553a1f3..7461ffb90c 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/DateAdd.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/DateAdd.java @@ -15,11 +15,7 @@ */ package com.alibaba.druid.sql.visitor.functions; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.expr.SQLCharExpr; -import com.alibaba.druid.sql.ast.expr.SQLDateExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.visitor.SQLEvalVisitor; @@ -31,8 +27,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class DateAdd implements Function { - - public final static DateAdd instance = new DateAdd(); + public static final DateAdd instance = new DateAdd(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { final List arguments = x.getArguments(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Elt.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Elt.java index deeba79549..916767bd76 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Elt.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Elt.java @@ -22,8 +22,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Elt implements Function { - - public final static Elt instance = new Elt(); + public static final Elt instance = new Elt(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() <= 1) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Function.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Function.java index 36f3474eb6..6c750d2fda 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Function.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Function.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.visitor.SQLEvalVisitor; - public interface Function { Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Greatest.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Greatest.java index db921f990c..758ff730cf 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Greatest.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Greatest.java @@ -18,7 +18,6 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; -import com.alibaba.druid.sql.ast.expr.SQLValuableExpr; import com.alibaba.druid.sql.visitor.SQLEvalVisitor; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; @@ -27,8 +26,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Greatest implements Function { - - public final static Greatest instance = new Greatest(); + public static final Greatest instance = new Greatest(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { Object result = null; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Hex.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Hex.java index 3406f65ca4..ea563d99e6 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Hex.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Hex.java @@ -24,8 +24,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Hex implements Function { - - public final static Hex instance = new Hex(); + public static final Hex instance = new Hex(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 1) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/If.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/If.java index 905204aa0b..fc85ee058e 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/If.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/If.java @@ -17,7 +17,6 @@ import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; -import com.alibaba.druid.sql.ast.expr.SQLValuableExpr; import com.alibaba.druid.sql.visitor.SQLEvalVisitor; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; @@ -27,8 +26,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class If implements Function { - - public final static If instance = new If(); + public static final If instance = new If(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { final List arguments = x.getArguments(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/IfNull.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/IfNull.java index 5eecb9340d..dcea4a5ee6 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/IfNull.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/IfNull.java @@ -16,11 +16,9 @@ package com.alibaba.druid.sql.visitor.functions; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.ast.expr.SQLValuableExpr; import com.alibaba.druid.sql.visitor.SQLEvalVisitor; -import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import java.util.List; @@ -28,8 +26,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class IfNull implements Function { - - public final static IfNull instance = new IfNull(); + public static final IfNull instance = new IfNull(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { final List arguments = x.getArguments(); @@ -45,7 +42,7 @@ public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { SQLExpr valueExpr = arguments.get(1); valueExpr.accept(visitor); return valueExpr.getAttributes().get(EVAL_VALUE); - } else { + } else { return itemValue; } } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Insert.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Insert.java index d21245f117..9f6e7bab7e 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Insert.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Insert.java @@ -22,8 +22,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Insert implements Function { - - public final static Insert instance = new Insert(); + public static final Insert instance = new Insert(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 4) { @@ -61,23 +60,23 @@ public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { int pos = ((Number) param1Value).intValue(); int len = ((Number) param2Value).intValue(); String newstr = (String) param3Value; - + if (pos <= 0) { return str; } - + if (pos == 1) { if (len > str.length()) { return newstr; } return newstr + str.substring(len); } - + String first = str.substring(0, pos - 1); if (pos + len - 1 > str.length()) { return first + newstr; } - + return first + newstr + str.substring(pos + len - 1); } } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Instr.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Instr.java index bef0564660..ad01ba3ffa 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Instr.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Instr.java @@ -21,10 +21,9 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; - public class Instr implements Function { - public final static Instr instance = new Instr(); - + public static final Instr instance = new Instr(); + public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 2) { return SQLEvalVisitor.EVAL_ERROR; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Isnull.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Isnull.java index 45847d91e3..c719ed65ec 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Isnull.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Isnull.java @@ -22,13 +22,9 @@ import java.util.List; import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.*; -import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_ERROR; -import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; -import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE_NULL; public class Isnull implements Function { - - public final static Isnull instance = new Isnull(); + public static final Isnull instance = new Isnull(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { final List arguments = x.getArguments(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Lcase.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Lcase.java index 2419910c6b..261598cb06 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Lcase.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Lcase.java @@ -24,10 +24,9 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; - public class Lcase implements Function { - public final static Lcase instance = new Lcase(); - + public static final Lcase instance = new Lcase(); + public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 1) { return SQLEvalVisitor.EVAL_ERROR; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Least.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Least.java index c474216f67..89047b2d8a 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Least.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Least.java @@ -26,8 +26,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Least implements Function { - - public final static Least instance = new Least(); + public static final Least instance = new Least(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { Object result = null; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Left.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Left.java index 44823e6c80..bb38371e8b 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Left.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Left.java @@ -23,8 +23,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Left implements Function { - - public final static Left instance = new Left(); + public static final Left instance = new Left(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 2) { @@ -44,7 +43,7 @@ public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { String strValue = param0Value.toString(); int intValue = SQLEvalVisitorUtils.castToInteger(param1Value); - + if (intValue > strValue.length()) { return SQLEvalVisitor.EVAL_ERROR; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Length.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Length.java index 1319a69315..506662c01e 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Length.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Length.java @@ -24,10 +24,9 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; - public class Length implements Function { - public final static Length instance = new Length(); - + public static final Length instance = new Length(); + public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 1) { return SQLEvalVisitor.EVAL_ERROR; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Locate.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Locate.java index ea0003e3b4..0d590fd2a0 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Locate.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Locate.java @@ -24,8 +24,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Locate implements Function { - - public final static Locate instance = new Locate(); + public static final Locate instance = new Locate(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { List params = x.getArguments(); @@ -58,10 +57,10 @@ public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { int result = strValue1.indexOf(strValue0) + 1; return result; } - + Object param2Value = param2.getAttributes().get(EVAL_VALUE); int start = ((Number) param2Value).intValue(); - + int result = strValue1.indexOf(strValue0, start + 1) + 1; return result; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Lpad.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Lpad.java index f4fe167cfd..0124a5d0af 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Lpad.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Lpad.java @@ -24,8 +24,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Lpad implements Function { - - public final static Lpad instance = new Lpad(); + public static final Lpad instance = new Lpad(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { List params = x.getArguments(); @@ -52,12 +51,12 @@ public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { String strValue0 = param0Value.toString(); int len = ((Number) param1Value).intValue(); String strValue1 = param2Value.toString(); - + String result = strValue0; if (result.length() > len) { return result.substring(0, len); } - + while (result.length() < len) { result = strValue1 + result; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Ltrim.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Ltrim.java index f89f61ffc5..7832cb636b 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Ltrim.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Ltrim.java @@ -22,8 +22,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Ltrim implements Function { - - public final static Ltrim instance = new Ltrim(); + public static final Ltrim instance = new Ltrim(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 1) { @@ -39,7 +38,7 @@ public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { } String strValue = param0Value.toString(); - + int index = -1; for (int i = 0; i < strValue.length(); ++i) { if (!Character.isWhitespace(strValue.charAt(i))) { @@ -47,7 +46,7 @@ public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { break; } } - + if (index <= 0) { return strValue; } else { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Nil.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Nil.java index e26e6706a2..82f309dc4f 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Nil.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Nil.java @@ -19,8 +19,7 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitor; public class Nil implements Function { - - public final static Nil instance = new Nil(); + public static final Nil instance = new Nil(); @Override public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Now.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Now.java index 2d47652e75..49fb35f73e 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Now.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Now.java @@ -20,10 +20,9 @@ import java.util.Date; - public class Now implements Function { - public final static Now instance = new Now(); - + public static final Now instance = new Now(); + public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { return new Date(); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/OneParamFunctions.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/OneParamFunctions.java index 756e98103f..4561530eec 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/OneParamFunctions.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/OneParamFunctions.java @@ -28,8 +28,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE_NULL; public class OneParamFunctions implements Function { - - public final static OneParamFunctions instance = new OneParamFunctions(); + public static final OneParamFunctions instance = new OneParamFunctions(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().isEmpty()) { @@ -61,18 +60,18 @@ public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (paramValue instanceof BigDecimal) { BigDecimal decimal = (BigDecimal) paramValue; - BigInteger bigInt = decimal.setScale(0, BigDecimal.ROUND_HALF_UP).toBigInteger(); + BigInteger bigInt = decimal.setScale(0, BigDecimal.ROUND_HALF_UP).toBigInteger(); return bigInt.bitCount(); } Long val = SQLEvalVisitorUtils.castToLong(paramValue); return Long.bitCount(val); } - + if ("soundex".equalsIgnoreCase(method)) { String text = paramValue.toString(); return soundex(text); } - + if ("space".equalsIgnoreCase(method)) { int intVal = SQLEvalVisitorUtils.castToInteger(paramValue); char[] chars = new char[intVal]; @@ -93,7 +92,7 @@ public static String soundex(String str) { if (str.length() == 0) { return str; } - char out[] = {'0', '0', '0', '0'}; + char[] out = {'0', '0', '0', '0'}; char last, mapped; int incount = 1, count = 1; out[0] = str.charAt(0); @@ -110,7 +109,7 @@ public static String soundex(String str) { } return new String(out); } - + static String clean(String str) { if (str == null || str.length() == 0) { return str; @@ -128,7 +127,7 @@ static String clean(String str) { } return new String(chars, 0, count).toUpperCase(java.util.Locale.ENGLISH); } - + private static char getMappingCode(String str, int index) { // map() throws IllegalArgumentException char mappedChar = map(str.charAt(index)); @@ -145,7 +144,7 @@ private static char getMappingCode(String str, int index) { } return mappedChar; } - + private static char map(char ch) { String soundexMapping = "01230120022455012623010202"; int index = ch - 'A'; @@ -154,6 +153,5 @@ private static char map(char ch) { } return soundexMapping.charAt(index); } - - + } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Reverse.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Reverse.java index 1959b21e6b..11578d99ed 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Reverse.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Reverse.java @@ -21,10 +21,9 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; - public class Reverse implements Function { - public final static Reverse instance = new Reverse(); - + public static final Reverse instance = new Reverse(); + public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 1) { return SQLEvalVisitor.EVAL_ERROR; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Right.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Right.java index e86d213f46..aff82d5af9 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Right.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Right.java @@ -23,8 +23,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Right implements Function { - - public final static Right instance = new Right(); + public static final Right instance = new Right(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 2) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Substring.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Substring.java index 49143765a3..5c91a6ff88 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Substring.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Substring.java @@ -25,8 +25,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Substring implements Function { - - public final static Substring instance = new Substring(); + public static final Substring instance = new Substring(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { List params = x.getArguments(); @@ -94,7 +93,7 @@ public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { public Object eval(SQLMethodInvokeExpr x) { List parameters = x.getArguments(); for (SQLExpr parameter : parameters) { - if (!(parameter instanceof SQLValuableExpr)){ + if (!(parameter instanceof SQLValuableExpr)) { return null; } } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/ToChar.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/ToChar.java index 14c9d8c269..fa5d55598f 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/ToChar.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/ToChar.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.sql.visitor.functions; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.visitor.SQLEvalVisitor; -import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import java.text.SimpleDateFormat; import java.util.Date; @@ -30,8 +28,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class ToChar implements Function { - - public final static ToChar instance = new ToChar(); + public static final ToChar instance = new ToChar(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { final List arguments = x.getArguments(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/ToDate.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/ToDate.java index 398eaf9304..1d4471825a 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/ToDate.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/ToDate.java @@ -15,24 +15,19 @@ */ package com.alibaba.druid.sql.visitor.functions; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; -import com.alibaba.druid.sql.ast.expr.SQLDateExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.visitor.SQLEvalVisitor; -import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.List; import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_ERROR; -import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class ToDate implements Function { - - public final static ToDate instance = new ToDate(); + public static final ToDate instance = new ToDate(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { final List arguments = x.getArguments(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Trim.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Trim.java index 4a5c5b80a0..447c9964e2 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Trim.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Trim.java @@ -22,8 +22,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Trim implements Function { - - public final static Trim instance = new Trim(); + public static final Trim instance = new Trim(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 1) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Ucase.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Ucase.java index 9cc65d96cb..d5557857d9 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Ucase.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Ucase.java @@ -24,10 +24,9 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; - public class Ucase implements Function { - public final static Ucase instance = new Ucase(); - + public static final Ucase instance = new Ucase(); + public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 1) { return SQLEvalVisitor.EVAL_ERROR; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Unhex.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Unhex.java index c078f48adc..62bf519756 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Unhex.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Unhex.java @@ -26,8 +26,7 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class Unhex implements Function { - - public final static Unhex instance = new Unhex(); + public static final Unhex instance = new Unhex(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (x.getArguments().size() != 1) { @@ -64,7 +63,7 @@ public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { if (bytes == null) { return SQLEvalVisitor.EVAL_VALUE_NULL; } - + String result; try { result = new String(bytes, "UTF-8"); diff --git a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java index 3a8b7d6585..536556dc70 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java +++ b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java @@ -15,52 +15,41 @@ */ package com.alibaba.druid.stat; -import java.lang.management.ManagementFactory; -import java.lang.reflect.Method; -import java.util.Collections; -import java.util.IdentityHashMap; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import javax.management.JMException; -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.management.openmbean.CompositeDataSupport; -import javax.management.openmbean.CompositeType; -import javax.management.openmbean.OpenType; -import javax.management.openmbean.SimpleType; -import javax.management.openmbean.TabularData; -import javax.management.openmbean.TabularDataSupport; -import javax.management.openmbean.TabularType; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.DruidDataSourceUtils; import com.alibaba.druid.util.JMXUtils; +import javax.management.JMException; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.management.openmbean.*; + +import java.lang.management.ManagementFactory; +import java.lang.reflect.Method; +import java.util.*; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + @SuppressWarnings("rawtypes") public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBean { + private static final Lock staticLock = new ReentrantLock(); - private final static Lock staticLock = new ReentrantLock(); - - public final static String SYS_PROP_INSTANCES = "druid.dataSources"; - public final static String SYS_PROP_REGISTER_SYS_PROPERTY = "druid.registerToSysProperty"; + public static final String SYS_PROP_INSTANCES = "druid.dataSources"; + public static final String SYS_PROP_REGISTER_SYS_PROPERTY = "druid.registerToSysProperty"; - private final static Log LOG = LogFactory.getLog(DruidDataSourceStatManager.class); + private static final Log LOG = LogFactory.getLog(DruidDataSourceStatManager.class); - private final static DruidDataSourceStatManager instance = new DruidDataSourceStatManager(); + private static final DruidDataSourceStatManager instance = new DruidDataSourceStatManager(); - private final AtomicLong resetCount = new AtomicLong(); + private final AtomicLong resetCount = new AtomicLong(); // global instances - private static volatile Map dataSources; + private static volatile Map dataSources; - private final static String MBEAN_NAME = "com.alibaba.druid:type=DruidDataSourceStat"; + private static final String MBEAN_NAME = "com.alibaba.druid:type=DruidDataSourceStat"; public static DruidDataSourceStatManager getInstance() { return instance; @@ -137,7 +126,7 @@ static Map getInstances0() { return instances; } - public synchronized static ObjectName addDataSource(Object dataSource, String name) { + public static synchronized ObjectName addDataSource(Object dataSource, String name) { final Map instances = getInstances(); MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); @@ -182,7 +171,7 @@ public synchronized static ObjectName addDataSource(Object dataSource, String na return objectName; } - public synchronized static void removeDataSource(Object dataSource) { + public static synchronized void removeDataSource(Object dataSource) { Map instances = getInstances(); ObjectName objectName = (ObjectName) instances.remove(dataSource); @@ -278,15 +267,14 @@ public CompositeDataSupport getCompositeData(Object dataSource) throws JMExcepti return new CompositeDataSupport(rowType, map); } - private static CompositeType COMPOSITE_TYPE = null; + private static CompositeType COMPOSITE_TYPE; public static CompositeType getDruidDataSourceCompositeType() throws JMException { - if (COMPOSITE_TYPE != null) { return COMPOSITE_TYPE; } - OpenType[] indexTypes = new OpenType[] { + OpenType[] indexTypes = new OpenType[]{ // 0 - 4 SimpleType.STRING, // SimpleType.STRING, // @@ -352,7 +340,7 @@ public static CompositeType getDruidDataSourceCompositeType() throws JMException // 45 SimpleType.LONG, // - // + // }; String[] indexNames = { @@ -410,25 +398,25 @@ public static CompositeType getDruidDataSourceCompositeType() throws JMException "PreparedStatementCacheMissCount", // "PreparedStatementCacheHitCount", // "PreparedStatementCacheCurrentCount", // - "Version" // - - // 40 - - , "LastErrorTime", // - "LastCreateErrorTime", // - "CreateErrorCount", // - "DiscardCount", // - "ExecuteQueryCount", // + "Version", - "ExecuteUpdateCount", // - // + // 40 - 44 + "LastErrorTime", + "LastCreateErrorTime", + "CreateErrorCount", + "DiscardCount", + "ExecuteQueryCount", + + // 45 - + "ExecuteUpdateCount", }; String[] indexDescriptions = indexNames; COMPOSITE_TYPE = new CompositeType("DataSourceStatistic", - "DataSource Statistic", - indexNames, - indexDescriptions, - indexTypes); + "DataSource Statistic", + indexNames, + indexDescriptions, + indexTypes); return COMPOSITE_TYPE; } diff --git a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManagerMBean.java b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManagerMBean.java index bc8c016216..8181d1398f 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManagerMBean.java +++ b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManagerMBean.java @@ -19,7 +19,6 @@ import javax.management.openmbean.TabularData; public interface DruidDataSourceStatManagerMBean { - void reset(); TabularData getDataSourceList() throws JMException; diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java b/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java index 651b096125..7a011e29b3 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java @@ -15,19 +15,6 @@ */ package com.alibaba.druid.stat; -import java.sql.Driver; -import java.sql.DriverManager; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicLong; - import com.alibaba.druid.VERSION; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; @@ -38,21 +25,25 @@ import com.alibaba.druid.util.StringUtils; import com.alibaba.druid.util.Utils; +import java.sql.Driver; +import java.sql.DriverManager; +import java.util.*; +import java.util.concurrent.atomic.AtomicLong; + /** * 监控相关的对外数据暴露 - * + *

* 1. 为了支持jndi数据源本类内部调用druid相关对象均需要反射调用,返回值也应该是Object,List<Object>,Map<String,Object>等无关于druid的类型 * 2. 对外暴露的public方法都应该先调用init()，应该有更好的方式，暂时没想到 - * + * * @author sandzhang[sandzhangtoo@gmail.com] */ public final class DruidStatManagerFacade { + private static final DruidStatManagerFacade instance = new DruidStatManagerFacade(); + private boolean resetEnable = true; + private final AtomicLong resetCount = new AtomicLong(); - private final static DruidStatManagerFacade instance = new DruidStatManagerFacade(); - private boolean resetEnable = true; - private final AtomicLong resetCount = new AtomicLong(); - - private DruidStatManagerFacade(){ + private DruidStatManagerFacade() { } public static DruidStatManagerFacade getInstance() { @@ -205,14 +196,14 @@ public Map getWallStatMap(Integer dataSourceId) { } /** - * @deprecated * @return + * @deprecated */ public static Map mergWallStat(Map mapA, Map mapB) { return mergeWallStat(mapA, mapB); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) public static Map mergeWallStat(Map mapA, Map mapB) { if (mapA == null || mapA.size() == 0) { return mapB; @@ -298,7 +289,7 @@ public static Map mergeWallStat(Map mapA, Map mapB) { return newMap; } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) private static List> mergeNamedList(List listA, List listB) { Map> mapped = new HashMap>(); for (Object item : (List) listA) { @@ -395,7 +386,7 @@ public long getResetCount() { private List getDriversData() { List drivers = new ArrayList(); - for (Enumeration e = DriverManager.getDrivers(); e.hasMoreElements();) { + for (Enumeration e = DriverManager.getDrivers(); e.hasMoreElements(); ) { Driver driver = e.nextElement(); drivers.add(driver.getClass().getName()); } diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatService.java b/src/main/java/com/alibaba/druid/stat/DruidStatService.java index b8a89f401e..6e2f20d45c 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatService.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatService.java @@ -15,19 +15,6 @@ */ package com.alibaba.druid.stat; -import java.lang.management.ManagementFactory; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Collections; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import javax.management.JMException; -import javax.management.MBeanServer; -import javax.management.ObjectName; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -40,32 +27,40 @@ import com.alibaba.druid.util.MapComparator; import com.alibaba.druid.util.StringUtils; +import javax.management.JMException; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import java.lang.management.ManagementFactory; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; + /** * 注意：避免直接调用Druid相关对象例如DruidDataSource等，相关调用要到DruidStatManagerFacade里用反射实现 - * + * * @author sandzhang[sandzhangtoo@gmail.com] */ public final class DruidStatService implements DruidStatServiceMBean { + private static final Log LOG = LogFactory.getLog(DruidStatService.class); - private final static Log LOG = LogFactory.getLog(DruidStatService.class); - - public final static String MBEAN_NAME = "com.alibaba.druid:type=DruidStatService"; + public static final String MBEAN_NAME = "com.alibaba.druid:type=DruidStatService"; - private final static DruidStatService instance = new DruidStatService(); + private static final DruidStatService instance = new DruidStatService(); - private static DruidStatManagerFacade statManagerFacade = DruidStatManagerFacade.getInstance(); + private static DruidStatManagerFacade statManagerFacade = DruidStatManagerFacade.getInstance(); - public final static int RESULT_CODE_SUCCESS = 1; - public final static int RESULT_CODE_ERROR = -1; + public static final int RESULT_CODE_SUCCESS = 1; + public static final int RESULT_CODE_ERROR = -1; - private final static int DEFAULT_PAGE = 1; - private final static int DEFAULT_PER_PAGE_COUNT = Integer.MAX_VALUE; - private static final String ORDER_TYPE_DESC = "desc"; - private static final String ORDER_TYPE_ASC = "asc"; - private static final String DEFAULT_ORDER_TYPE = ORDER_TYPE_ASC; - private static final String DEFAULT_ORDERBY = "SQL"; + private static final int DEFAULT_PAGE = 1; + private static final int DEFAULT_PER_PAGE_COUNT = Integer.MAX_VALUE; + private static final String ORDER_TYPE_DESC = "desc"; + private static final String ORDER_TYPE_ASC = "asc"; + private static final String DEFAULT_ORDER_TYPE = ORDER_TYPE_ASC; + private static final String DEFAULT_ORDERBY = "SQL"; - private DruidStatService(){ + private DruidStatService() { } public static DruidStatService getInstance() { @@ -81,7 +76,6 @@ public void setResetEnable(boolean value) { } public String service(String url) { - Map parameters = getParameters(url); if (url.equals("/basic.json")) { @@ -118,7 +112,7 @@ public String service(String url) { Integer id = StringUtils.subStringToInteger(url, "connectionInfo-", "."); List connectionInfoList = statManagerFacade.getPoolingConnectionInfoByDataSourceId(id); return returnJSONResult(connectionInfoList == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, - connectionInfoList); + connectionInfoList); } if (url.startsWith("/activeConnectionStackTrace-") && url.endsWith(".json")) { @@ -212,7 +206,8 @@ private List> getWebAppStatDataList(Map para return comparatorOrderBy(array, parameters); } - private List> comparatorOrderBy(List> array, Map parameters) { + private List> comparatorOrderBy(List> array, + Map parameters) { // when open the stat page before executing some sql if (array == null || array.isEmpty()) { return null; @@ -293,7 +288,7 @@ public Map getWallStatMap(Map parameters) { List> sortedArray = comparatorOrderBy(tables, parameters); result.put("tables", sortedArray); } - + List> functions = (List>) result.get("functions"); if (functions != null) { List> sortedArray = comparatorOrderBy(functions, parameters); @@ -358,7 +353,6 @@ public static String returnJSONResult(int resultCode, Object content) { public static void registerMBean() { MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); try { - ObjectName objectName = new ObjectName(MBEAN_NAME); if (!mbeanServer.isRegistered(objectName)) { mbeanServer.registerMBean(instance, objectName); @@ -380,12 +374,12 @@ public static void unregisterMBean() { public static Map getParameters(String url) { if (url == null || (url = url.trim()).length() == 0) { - return Collections. emptyMap(); + return Collections.emptyMap(); } String parametersStr = StringUtils.subString(url, "?", null); if (parametersStr == null || parametersStr.length() == 0) { - return Collections. emptyMap(); + return Collections.emptyMap(); } String[] parametersArray = parametersStr.split("&"); diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatServiceMBean.java b/src/main/java/com/alibaba/druid/stat/DruidStatServiceMBean.java index 4e6c2bba96..5bf33c78a1 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatServiceMBean.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatServiceMBean.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.stat; - public interface DruidStatServiceMBean { String service(String url); } diff --git a/src/main/java/com/alibaba/druid/stat/JdbcConnectionStat.java b/src/main/java/com/alibaba/druid/stat/JdbcConnectionStat.java index 1b949756d7..14d5606434 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcConnectionStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcConnectionStat.java @@ -15,6 +15,15 @@ */ package com.alibaba.druid.stat; +import com.alibaba.druid.util.Histogram; +import com.alibaba.druid.util.JMXUtils; + +import javax.management.JMException; +import javax.management.openmbean.CompositeDataSupport; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.OpenType; +import javax.management.openmbean.SimpleType; + import java.io.PrintWriter; import java.io.StringWriter; import java.util.Date; @@ -24,53 +33,42 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import javax.management.JMException; -import javax.management.openmbean.CompositeDataSupport; -import javax.management.openmbean.CompositeType; -import javax.management.openmbean.OpenType; -import javax.management.openmbean.SimpleType; - -import com.alibaba.druid.util.Histogram; -import com.alibaba.druid.util.JMXUtils; - /** * @author wenshao [szujobs@hotmail.com] */ public class JdbcConnectionStat implements JdbcConnectionStatMBean { + private final AtomicInteger activeCount = new AtomicInteger(); + private final AtomicInteger activeCountMax = new AtomicInteger(); - private final AtomicInteger activeCount = new AtomicInteger(); - private final AtomicInteger activeCountMax = new AtomicInteger(); - - private final AtomicInteger connectingCount = new AtomicInteger(); - private final AtomicInteger connectingMax = new AtomicInteger(); - - private final AtomicLong connectCount = new AtomicLong(); - private final AtomicLong connectErrorCount = new AtomicLong(); - private Throwable connectErrorLast; - private final AtomicLong connectNanoTotal = new AtomicLong(0); // 连接建立消耗时间总和（纳秒） - private final AtomicLong connectNanoMax = new AtomicLong(0); // 连接建立消耗最大时间（纳秒） + private final AtomicInteger connectingCount = new AtomicInteger(); + private final AtomicInteger connectingMax = new AtomicInteger(); - private final AtomicLong errorCount = new AtomicLong(); + private final AtomicLong connectCount = new AtomicLong(); + private final AtomicLong connectErrorCount = new AtomicLong(); + private Throwable connectErrorLast; + private final AtomicLong connectNanoTotal = new AtomicLong(0); // 连接建立消耗时间总和（纳秒） + private final AtomicLong connectNanoMax = new AtomicLong(0); // 连接建立消耗最大时间（纳秒） - private final AtomicLong aliveNanoTotal = new AtomicLong(); - private Throwable lastError; - private long lastErrorTime; + private final AtomicLong errorCount = new AtomicLong(); - private long connectLastTime = 0; + private final AtomicLong aliveNanoTotal = new AtomicLong(); + private Throwable lastError; + private long lastErrorTime; - private final AtomicLong closeCount = new AtomicLong(0); // 执行Connection.close的计数 - private final AtomicLong transactionStartCount = new AtomicLong(0); - private final AtomicLong commitCount = new AtomicLong(0); // 执行commit的计数 - private final AtomicLong rollbackCount = new AtomicLong(0); // 执行rollback的计数 + private long connectLastTime; - private final AtomicLong aliveNanoMin = new AtomicLong(); - private final AtomicLong aliveNanoMax = new AtomicLong(); + private final AtomicLong closeCount = new AtomicLong(0); // 执行Connection.close的计数 + private final AtomicLong transactionStartCount = new AtomicLong(0); + private final AtomicLong commitCount = new AtomicLong(0); // 执行commit的计数 + private final AtomicLong rollbackCount = new AtomicLong(0); // 执行rollback的计数 - private final Histogram histogram = new Histogram(TimeUnit.SECONDS, new long[] { // - 1, 5, 15, 60, 300, 1800 }); + private final AtomicLong aliveNanoMin = new AtomicLong(); + private final AtomicLong aliveNanoMax = new AtomicLong(); - public JdbcConnectionStat(){ + private final Histogram histogram = new Histogram(TimeUnit.SECONDS, new long[]{ // + 1, 5, 15, 60, 300, 1800}); + public JdbcConnectionStat() { } public void reset() { @@ -98,7 +96,7 @@ public void reset() { public void beforeConnect() { int invoking = connectingCount.incrementAndGet(); - for (;;) { + for (; ; ) { int max = connectingMax.get(); if (invoking > max) { if (connectingMax.compareAndSet(max, invoking)) { @@ -118,7 +116,7 @@ public void beforeConnect() { public void afterConnected(long delta) { connectingCount.decrementAndGet(); connectNanoTotal.addAndGet(delta); - for (;;) { + for (; ; ) { // connectNanoMax long max = connectNanoMax.get(); if (delta > max) { @@ -146,7 +144,7 @@ public long getConnectMillisMax() { public void setActiveCount(int activeCount) { this.activeCount.set(activeCount); - for (;;) { + for (; ; ) { int max = activeCountMax.get(); if (activeCount > max) { if (activeCountMax.compareAndSet(max, activeCount)) { @@ -204,7 +202,7 @@ public void afterClose(long aliveNano) { activeCount.decrementAndGet(); aliveNanoTotal.addAndGet(aliveNano); - for (;;) { + for (; ; ) { long max = aliveNanoMax.get(); if (aliveNano > max) { if (aliveNanoMax.compareAndSet(max, aliveNano)) { @@ -217,7 +215,7 @@ public void afterClose(long aliveNano) { } } - for (;;) { + for (; ; ) { long min = aliveNanoMin.get(); if (min == 0 || aliveNano < min) { if (aliveNanoMin.compareAndSet(min, aliveNano)) { @@ -330,21 +328,20 @@ public long getTransactionStartCount() { } public static class Entry implements EntryMBean { - - private long id; - private long establishTime; - private long establishNano; - private Date connectTime; - private long connectTimespanNano; - private Exception connectStackTraceException; - - private String lastSql; - private Exception lastStatementStatckTraceException; - protected Throwable lastError; - protected long lastErrorTime; + private long id; + private long establishTime; + private long establishNano; + private Date connectTime; + private long connectTimespanNano; + private Exception connectStackTraceException; + + private String lastSql; + private Exception lastStatementStatckTraceException; + protected Throwable lastError; + protected long lastErrorTime; private final String dataSource; - public Entry(String dataSource, long connectionId){ + public Entry(String dataSource, long connectionId) { this.id = connectionId; this.dataSource = dataSource; } @@ -439,22 +436,22 @@ public Date getLastErrorTime() { return new Date(lastErrorTime); } - private static String[] indexNames = { "ID", "ConnectTime", "ConnectTimespan", "EstablishTime", - "AliveTimespan", "LastSql", "LastError", "LastErrorTime", - "ConnectStatckTrace", "LastStatementStackTrace", "DataSource" }; + private static String[] indexNames = {"ID", "ConnectTime", "ConnectTimespan", "EstablishTime", + "AliveTimespan", "LastSql", "LastError", "LastErrorTime", + "ConnectStatckTrace", "LastStatementStackTrace", "DataSource"}; private static String[] indexDescriptions = indexNames; public static CompositeType getCompositeType() throws JMException { - OpenType[] indexTypes = new OpenType[] { SimpleType.LONG, SimpleType.DATE, SimpleType.LONG, + OpenType[] indexTypes = new OpenType[]{SimpleType.LONG, SimpleType.DATE, SimpleType.LONG, SimpleType.DATE, SimpleType.LONG, SimpleType.STRING, JMXUtils.getThrowableCompositeType(), SimpleType.DATE, SimpleType.STRING, SimpleType.STRING, - SimpleType.STRING }; + SimpleType.STRING}; return new CompositeType("ConnectionStatistic", "Connection Statistic", indexNames, indexDescriptions, - indexTypes); + indexTypes); } public String getDataSource() { @@ -483,7 +480,6 @@ public CompositeDataSupport getCompositeData() throws JMException { } public interface EntryMBean { - Date getEstablishTime(); long getEstablishNano(); diff --git a/src/main/java/com/alibaba/druid/stat/JdbcConnectionStatMBean.java b/src/main/java/com/alibaba/druid/stat/JdbcConnectionStatMBean.java index 5c57c6b5af..f6a380b57f 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcConnectionStatMBean.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcConnectionStatMBean.java @@ -18,7 +18,6 @@ import java.util.Date; public interface JdbcConnectionStatMBean { - long getConnectCount(); long getCloseCount(); diff --git a/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java b/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java index 0d15adc028..d770869149 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java @@ -15,23 +15,6 @@ */ package com.alibaba.druid.stat; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -import javax.management.JMException; -import javax.management.openmbean.CompositeType; -import javax.management.openmbean.TabularData; -import javax.management.openmbean.TabularDataSupport; -import javax.management.openmbean.TabularType; - import com.alibaba.druid.Constants; import com.alibaba.druid.filter.Filter; import com.alibaba.druid.filter.stat.StatFilter; @@ -40,44 +23,55 @@ import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.Histogram; -public class JdbcDataSourceStat implements JdbcDataSourceStatMBean { +import javax.management.JMException; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.TabularData; +import javax.management.openmbean.TabularDataSupport; +import javax.management.openmbean.TabularType; + +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.ReentrantReadWriteLock; - private final static Log LOG = LogFactory.getLog(JdbcDataSourceStat.class); +public class JdbcDataSourceStat implements JdbcDataSourceStatMBean { + private static final Log LOG = LogFactory.getLog(JdbcDataSourceStat.class); - private final String name; - private final String url; - private String dbType; + private final String name; + private final String url; + private String dbType; - private final JdbcConnectionStat connectionStat = new JdbcConnectionStat(); - private final JdbcResultSetStat resultSetStat = new JdbcResultSetStat(); - private final JdbcStatementStat statementStat = new JdbcStatementStat(); + private final JdbcConnectionStat connectionStat = new JdbcConnectionStat(); + private final JdbcResultSetStat resultSetStat = new JdbcResultSetStat(); + private final JdbcStatementStat statementStat = new JdbcStatementStat(); - private int maxSqlSize = 1000; + private int maxSqlSize = 1000; - private ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); - private final LinkedHashMap sqlStatMap; + private ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + private final LinkedHashMap sqlStatMap; - private final AtomicLong skipSqlCount = new AtomicLong(); + private final AtomicLong skipSqlCount = new AtomicLong(); - private final Histogram connectionHoldHistogram = new Histogram(new long[] { // - // + private final Histogram connectionHoldHistogram = new Histogram(new long[]{ // + // 1, 10, 100, 1000, 10 * 1000, // 100 * 1000, 1000 * 1000 - // - }); + // + }); - private final ConcurrentMap connections = new ConcurrentHashMap( - 16, - 0.75f, - 1); + private final ConcurrentMap connections = new ConcurrentHashMap( + 16, + 0.75f, + 1); - private final AtomicLong clobOpenCount = new AtomicLong(); - private final AtomicLong blobOpenCount = new AtomicLong(); - private final AtomicLong keepAliveCheckCount = new AtomicLong(); + private final AtomicLong clobOpenCount = new AtomicLong(); + private final AtomicLong blobOpenCount = new AtomicLong(); + private final AtomicLong keepAliveCheckCount = new AtomicLong(); - private boolean resetStatEnable = true; + private boolean resetStatEnable = true; - private static JdbcDataSourceStat global; + private static JdbcDataSourceStat global; static { String dbType = null; @@ -99,7 +93,6 @@ public static void setGlobal(JdbcDataSourceStat value) { } public void configFromProperties(Properties properties) { - } public boolean isResetStatEnable() { @@ -110,16 +103,16 @@ public void setResetStatEnable(boolean resetStatEnable) { this.resetStatEnable = resetStatEnable; } - public JdbcDataSourceStat(String name, String url){ + public JdbcDataSourceStat(String name, String url) { this(name, url, null); } - public JdbcDataSourceStat(String name, String url, String dbType){ + public JdbcDataSourceStat(String name, String url, String dbType) { this(name, url, dbType, null); } @SuppressWarnings("serial") - public JdbcDataSourceStat(String name, String url, String dbType, Properties connectProperties){ + public JdbcDataSourceStat(String name, String url, String dbType, Properties connectProperties) { this.name = name; this.url = url; this.dbType = dbType; @@ -141,7 +134,6 @@ public JdbcDataSourceStat(String name, String url, String dbType, Properties con } sqlStatMap = new LinkedHashMap(16, 0.75f, false) { - protected boolean removeEldestEntry(Map.Entry eldest) { boolean remove = (size() > maxSqlSize); @@ -315,7 +307,7 @@ public TabularData getConnectionList() throws JMException { String[] indexNames = rowType.keySet().toArray(new String[rowType.keySet().size()]); TabularType tabularType = new TabularType("ConnectionListStatistic", "ConnectionListStatistic", rowType, - indexNames); + indexNames); TabularData data = new TabularDataSupport(tabularType); for (Map.Entry entry : getConnections().entrySet()) { diff --git a/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStatMBean.java b/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStatMBean.java index 9e19dc58a0..58d3166414 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStatMBean.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStatMBean.java @@ -19,7 +19,6 @@ import javax.management.openmbean.TabularData; public interface JdbcDataSourceStatMBean { - void reset(); TabularData getSqlList() throws JMException; diff --git a/src/main/java/com/alibaba/druid/stat/JdbcResultSetStat.java b/src/main/java/com/alibaba/druid/stat/JdbcResultSetStat.java index 62b8e7f370..6906a8a64d 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcResultSetStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcResultSetStat.java @@ -20,23 +20,22 @@ import java.util.concurrent.atomic.AtomicLong; public class JdbcResultSetStat implements JdbcResultSetStatMBean { + private final AtomicInteger openingCount = new AtomicInteger(); + private final AtomicInteger openingMax = new AtomicInteger(); - private final AtomicInteger openingCount = new AtomicInteger(); - private final AtomicInteger openingMax = new AtomicInteger(); + private final AtomicLong openCount = new AtomicLong(); + private final AtomicLong errorCount = new AtomicLong(); - private final AtomicLong openCount = new AtomicLong(); - private final AtomicLong errorCount = new AtomicLong(); + private final AtomicLong aliveNanoTotal = new AtomicLong(); + private final AtomicLong aliveNanoMax = new AtomicLong(); + private final AtomicLong aliveNanoMin = new AtomicLong(); + private Throwable lastError; + private long lastErrorTime; - private final AtomicLong aliveNanoTotal = new AtomicLong(); - private final AtomicLong aliveNanoMax = new AtomicLong(); - private final AtomicLong aliveNanoMin = new AtomicLong(); - private Throwable lastError; - private long lastErrorTime; + private long lastOpenTime; - private long lastOpenTime = 0; - - private final AtomicLong fetchRowCount = new AtomicLong(0); // 总共读取的行数 - private final AtomicLong closeCount = new AtomicLong(0); // ResultSet打开的计数 + private final AtomicLong fetchRowCount = new AtomicLong(0); // 总共读取的行数 + private final AtomicLong closeCount = new AtomicLong(0); // ResultSet打开的计数 public void reset() { openingMax.set(0); @@ -55,7 +54,7 @@ public void reset() { public void beforeOpen() { int invoking = openingCount.incrementAndGet(); - for (;;) { + for (; ; ) { int max = openingMax.get(); if (invoking > max) { if (openingMax.compareAndSet(max, invoking)) { @@ -115,7 +114,7 @@ public void afterClose(long aliveNano) { aliveNanoTotal.addAndGet(aliveNano); - for (;;) { + for (; ; ) { long max = aliveNanoMax.get(); if (aliveNano > max) { if (aliveNanoMax.compareAndSet(max, aliveNano)) { @@ -126,7 +125,7 @@ public void afterClose(long aliveNano) { } } - for (;;) { + for (; ; ) { long min = aliveNanoMin.get(); if (aliveNano < min) { if (aliveNanoMin.compareAndSet(min, aliveNano)) { diff --git a/src/main/java/com/alibaba/druid/stat/JdbcResultSetStatMBean.java b/src/main/java/com/alibaba/druid/stat/JdbcResultSetStatMBean.java index e3dbfdb89f..7c29a56b7c 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcResultSetStatMBean.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcResultSetStatMBean.java @@ -19,7 +19,6 @@ * @author wenshao [szujobs@hotmail.com] */ public interface JdbcResultSetStatMBean { - long getHoldMillisTotal(); long getFetchRowCount(); diff --git a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java index 35c8d24917..5cce6af233 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java @@ -15,213 +15,208 @@ */ package com.alibaba.druid.stat; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; +import com.alibaba.druid.proxy.DruidDriver; +import com.alibaba.druid.proxy.jdbc.StatementExecuteType; +import com.alibaba.druid.util.JMXUtils; +import com.alibaba.druid.util.Utils; + +import javax.management.JMException; +import javax.management.openmbean.*; import java.util.Date; import java.util.Map; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import javax.management.JMException; -import javax.management.openmbean.ArrayType; -import javax.management.openmbean.CompositeDataSupport; -import javax.management.openmbean.CompositeType; -import javax.management.openmbean.OpenType; -import javax.management.openmbean.SimpleType; - -import com.alibaba.druid.proxy.DruidDriver; -import com.alibaba.druid.proxy.jdbc.StatementExecuteType; -import com.alibaba.druid.util.JMXUtils; -import com.alibaba.druid.util.Utils; +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; public final class JdbcSqlStat implements JdbcSqlStatMBean, Comparable { - - private final String sql; - private long sqlHash; - private long id; - private String dataSource; - private long executeLastStartTime; - - private volatile long executeBatchSizeTotal; - private volatile int executeBatchSizeMax; - - private volatile long executeSuccessCount; - private volatile long executeSpanNanoTotal; - private volatile long executeSpanNanoMax; - private volatile int runningCount; - private volatile int concurrentMax; - private volatile long resultSetHoldTimeNano; - private volatile long executeAndResultSetHoldTime; - - final static AtomicLongFieldUpdater executeBatchSizeTotalUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeBatchSizeTotal"); - final static AtomicIntegerFieldUpdater executeBatchSizeMaxUpdater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeBatchSizeMax"); - - final static AtomicLongFieldUpdater executeSuccessCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeSuccessCount"); - final static AtomicLongFieldUpdater executeSpanNanoTotalUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeSpanNanoTotal"); - final static AtomicLongFieldUpdater executeSpanNanoMaxUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeSpanNanoMax"); - final static AtomicIntegerFieldUpdater runningCountUpdater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "runningCount"); - final static AtomicIntegerFieldUpdater concurrentMaxUpdater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "concurrentMax"); - final static AtomicLongFieldUpdater resultSetHoldTimeNanoUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "resultSetHoldTimeNano"); - final static AtomicLongFieldUpdater executeAndResultSetHoldTimeUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeAndResultSetHoldTime"); - - private String name; - private String file; - private String dbType; - - private volatile long executeNanoSpanMaxOccurTime; - - private volatile long executeErrorCount; - private volatile Throwable executeErrorLast; - private volatile long executeErrorLastTime; - - private volatile long updateCount; - private volatile long updateCountMax; - private volatile long fetchRowCount; - private volatile long fetchRowCountMax; - - private volatile long inTransactionCount; - - private volatile String lastSlowParameters; - - private boolean removed = false; - - private volatile long clobOpenCount; - private volatile long blobOpenCount; - private volatile long readStringLength; - private volatile long readBytesLength; - - private volatile long inputStreamOpenCount; - private volatile long readerOpenCount; - - final static AtomicLongFieldUpdater executeErrorCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeErrorCount"); - final static AtomicLongFieldUpdater updateCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "updateCount"); - final static AtomicLongFieldUpdater updateCountMaxUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "updateCountMax"); - final static AtomicLongFieldUpdater fetchRowCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "fetchRowCount"); - final static AtomicLongFieldUpdater fetchRowCountMaxUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "fetchRowCountMax"); - final static AtomicLongFieldUpdater inTransactionCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "inTransactionCount"); - - final static AtomicLongFieldUpdater clobOpenCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "clobOpenCount"); - final static AtomicLongFieldUpdater blobOpenCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "blobOpenCount"); - final static AtomicLongFieldUpdater readStringLengthUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "readStringLength"); - final static AtomicLongFieldUpdater readBytesLengthUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "readBytesLength"); - - final static AtomicLongFieldUpdater inputStreamOpenCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "inputStreamOpenCount"); - final static AtomicLongFieldUpdater readerOpenCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "readerOpenCount"); - - private volatile long histogram_0_1; - private volatile long histogram_1_10; - private volatile int histogram_10_100; - private volatile int histogram_100_1000; - private volatile int histogram_1000_10000; - private volatile int histogram_10000_100000; - private volatile int histogram_100000_1000000; - private volatile int histogram_1000000_more; - - final static AtomicLongFieldUpdater histogram_0_1_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "histogram_0_1"); - final static AtomicLongFieldUpdater histogram_1_10_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "histogram_1_10"); - final static AtomicIntegerFieldUpdater histogram_10_100_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "histogram_10_100"); - final static AtomicIntegerFieldUpdater histogram_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "histogram_100_1000"); - final static AtomicIntegerFieldUpdater histogram_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "histogram_1000_10000"); - final static AtomicIntegerFieldUpdater histogram_10000_100000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "histogram_10000_100000"); - final static AtomicIntegerFieldUpdater histogram_100000_1000000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "histogram_100000_1000000"); - final static AtomicIntegerFieldUpdater histogram_1000000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "histogram_1000000_more"); - - private volatile long executeAndResultHoldTime_0_1; - private volatile long executeAndResultHoldTime_1_10; - private volatile int executeAndResultHoldTime_10_100; - private volatile int executeAndResultHoldTime_100_1000; - private volatile int executeAndResultHoldTime_1000_10000; - private volatile int executeAndResultHoldTime_10000_100000; - private volatile int executeAndResultHoldTime_100000_1000000; - private volatile int executeAndResultHoldTime_1000000_more; - - final static AtomicLongFieldUpdater executeAndResultHoldTime_0_1_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeAndResultHoldTime_0_1"); - final static AtomicLongFieldUpdater executeAndResultHoldTime_1_10_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeAndResultHoldTime_1_10"); - final static AtomicIntegerFieldUpdater executeAndResultHoldTime_10_100_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeAndResultHoldTime_10_100"); - final static AtomicIntegerFieldUpdater executeAndResultHoldTime_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeAndResultHoldTime_100_1000"); - final static AtomicIntegerFieldUpdater executeAndResultHoldTime_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeAndResultHoldTime_1000_10000"); - final static AtomicIntegerFieldUpdater executeAndResultHoldTime_10000_100000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeAndResultHoldTime_10000_100000"); - final static AtomicIntegerFieldUpdater executeAndResultHoldTime_100000_1000000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeAndResultHoldTime_100000_1000000"); - final static AtomicIntegerFieldUpdater executeAndResultHoldTime_1000000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "executeAndResultHoldTime_1000000_more"); - - private volatile long fetchRowCount_0_1; - private volatile long fetchRowCount_1_10; - private volatile long fetchRowCount_10_100; - private volatile int fetchRowCount_100_1000; - private volatile int fetchRowCount_1000_10000; - private volatile int fetchRowCount_10000_more; - - final static AtomicLongFieldUpdater fetchRowCount_0_1_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "fetchRowCount_0_1"); - final static AtomicLongFieldUpdater fetchRowCount_1_10_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "fetchRowCount_1_10"); - final static AtomicLongFieldUpdater fetchRowCount_10_100_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "fetchRowCount_10_100"); - final static AtomicIntegerFieldUpdater fetchRowCount_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "fetchRowCount_100_1000"); - final static AtomicIntegerFieldUpdater fetchRowCount_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "fetchRowCount_1000_10000"); - final static AtomicIntegerFieldUpdater fetchRowCount_10000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "fetchRowCount_10000_more"); - - private volatile long updateCount_0_1; - private volatile long updateCount_1_10; - private volatile long updateCount_10_100; - private volatile int updateCount_100_1000; - private volatile int updateCount_1000_10000; - private volatile int updateCount_10000_more; - - final static AtomicLongFieldUpdater updateCount_0_1_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "updateCount_0_1"); - final static AtomicLongFieldUpdater updateCount_1_10_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "updateCount_1_10"); - final static AtomicLongFieldUpdater updateCount_10_100_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, - "updateCount_10_100"); - final static AtomicIntegerFieldUpdater updateCount_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "updateCount_100_1000"); - final static AtomicIntegerFieldUpdater updateCount_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "updateCount_1000_10000"); - final static AtomicIntegerFieldUpdater updateCount_10000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, - "updateCount_10000_more"); - - public JdbcSqlStat(String sql){ + private final String sql; + private long sqlHash; + private long id; + private String dataSource; + private long executeLastStartTime; + + private volatile long executeBatchSizeTotal; + private volatile int executeBatchSizeMax; + + private volatile long executeSuccessCount; + private volatile long executeSpanNanoTotal; + private volatile long executeSpanNanoMax; + private volatile int runningCount; + private volatile int concurrentMax; + private volatile long resultSetHoldTimeNano; + private volatile long executeAndResultSetHoldTime; + + static final AtomicLongFieldUpdater executeBatchSizeTotalUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeBatchSizeTotal"); + static final AtomicIntegerFieldUpdater executeBatchSizeMaxUpdater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeBatchSizeMax"); + + static final AtomicLongFieldUpdater executeSuccessCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeSuccessCount"); + static final AtomicLongFieldUpdater executeSpanNanoTotalUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeSpanNanoTotal"); + static final AtomicLongFieldUpdater executeSpanNanoMaxUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeSpanNanoMax"); + static final AtomicIntegerFieldUpdater runningCountUpdater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "runningCount"); + static final AtomicIntegerFieldUpdater concurrentMaxUpdater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "concurrentMax"); + static final AtomicLongFieldUpdater resultSetHoldTimeNanoUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "resultSetHoldTimeNano"); + static final AtomicLongFieldUpdater executeAndResultSetHoldTimeUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeAndResultSetHoldTime"); + + private String name; + private String file; + private String dbType; + + private volatile long executeNanoSpanMaxOccurTime; + + private volatile long executeErrorCount; + private volatile Throwable executeErrorLast; + private volatile long executeErrorLastTime; + + private volatile long updateCount; + private volatile long updateCountMax; + private volatile long fetchRowCount; + private volatile long fetchRowCountMax; + + private volatile long inTransactionCount; + + private volatile String lastSlowParameters; + + private boolean removed; + + private volatile long clobOpenCount; + private volatile long blobOpenCount; + private volatile long readStringLength; + private volatile long readBytesLength; + + private volatile long inputStreamOpenCount; + private volatile long readerOpenCount; + + static final AtomicLongFieldUpdater executeErrorCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeErrorCount"); + static final AtomicLongFieldUpdater updateCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "updateCount"); + static final AtomicLongFieldUpdater updateCountMaxUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "updateCountMax"); + static final AtomicLongFieldUpdater fetchRowCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "fetchRowCount"); + static final AtomicLongFieldUpdater fetchRowCountMaxUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "fetchRowCountMax"); + static final AtomicLongFieldUpdater inTransactionCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "inTransactionCount"); + + static final AtomicLongFieldUpdater clobOpenCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "clobOpenCount"); + static final AtomicLongFieldUpdater blobOpenCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "blobOpenCount"); + static final AtomicLongFieldUpdater readStringLengthUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "readStringLength"); + static final AtomicLongFieldUpdater readBytesLengthUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "readBytesLength"); + + static final AtomicLongFieldUpdater inputStreamOpenCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "inputStreamOpenCount"); + static final AtomicLongFieldUpdater readerOpenCountUpdater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "readerOpenCount"); + + private volatile long histogram_0_1; + private volatile long histogram_1_10; + private volatile int histogram_10_100; + private volatile int histogram_100_1000; + private volatile int histogram_1000_10000; + private volatile int histogram_10000_100000; + private volatile int histogram_100000_1000000; + private volatile int histogram_1000000_more; + + static final AtomicLongFieldUpdater histogram_0_1_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "histogram_0_1"); + static final AtomicLongFieldUpdater histogram_1_10_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "histogram_1_10"); + static final AtomicIntegerFieldUpdater histogram_10_100_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "histogram_10_100"); + static final AtomicIntegerFieldUpdater histogram_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "histogram_100_1000"); + static final AtomicIntegerFieldUpdater histogram_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "histogram_1000_10000"); + static final AtomicIntegerFieldUpdater histogram_10000_100000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "histogram_10000_100000"); + static final AtomicIntegerFieldUpdater histogram_100000_1000000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "histogram_100000_1000000"); + static final AtomicIntegerFieldUpdater histogram_1000000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "histogram_1000000_more"); + + private volatile long executeAndResultHoldTime_0_1; + private volatile long executeAndResultHoldTime_1_10; + private volatile int executeAndResultHoldTime_10_100; + private volatile int executeAndResultHoldTime_100_1000; + private volatile int executeAndResultHoldTime_1000_10000; + private volatile int executeAndResultHoldTime_10000_100000; + private volatile int executeAndResultHoldTime_100000_1000000; + private volatile int executeAndResultHoldTime_1000000_more; + + static final AtomicLongFieldUpdater executeAndResultHoldTime_0_1_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeAndResultHoldTime_0_1"); + static final AtomicLongFieldUpdater executeAndResultHoldTime_1_10_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeAndResultHoldTime_1_10"); + static final AtomicIntegerFieldUpdater executeAndResultHoldTime_10_100_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeAndResultHoldTime_10_100"); + static final AtomicIntegerFieldUpdater executeAndResultHoldTime_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeAndResultHoldTime_100_1000"); + static final AtomicIntegerFieldUpdater executeAndResultHoldTime_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeAndResultHoldTime_1000_10000"); + static final AtomicIntegerFieldUpdater executeAndResultHoldTime_10000_100000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeAndResultHoldTime_10000_100000"); + static final AtomicIntegerFieldUpdater executeAndResultHoldTime_100000_1000000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeAndResultHoldTime_100000_1000000"); + static final AtomicIntegerFieldUpdater executeAndResultHoldTime_1000000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "executeAndResultHoldTime_1000000_more"); + + private volatile long fetchRowCount_0_1; + private volatile long fetchRowCount_1_10; + private volatile long fetchRowCount_10_100; + private volatile int fetchRowCount_100_1000; + private volatile int fetchRowCount_1000_10000; + private volatile int fetchRowCount_10000_more; + + static final AtomicLongFieldUpdater fetchRowCount_0_1_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "fetchRowCount_0_1"); + static final AtomicLongFieldUpdater fetchRowCount_1_10_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "fetchRowCount_1_10"); + static final AtomicLongFieldUpdater fetchRowCount_10_100_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "fetchRowCount_10_100"); + static final AtomicIntegerFieldUpdater fetchRowCount_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "fetchRowCount_100_1000"); + static final AtomicIntegerFieldUpdater fetchRowCount_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "fetchRowCount_1000_10000"); + static final AtomicIntegerFieldUpdater fetchRowCount_10000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "fetchRowCount_10000_more"); + + private volatile long updateCount_0_1; + private volatile long updateCount_1_10; + private volatile long updateCount_10_100; + private volatile int updateCount_100_1000; + private volatile int updateCount_1000_10000; + private volatile int updateCount_10000_more; + + static final AtomicLongFieldUpdater updateCount_0_1_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "updateCount_0_1"); + static final AtomicLongFieldUpdater updateCount_1_10_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "updateCount_1_10"); + static final AtomicLongFieldUpdater updateCount_10_100_Updater = AtomicLongFieldUpdater.newUpdater(JdbcSqlStat.class, + "updateCount_10_100"); + static final AtomicIntegerFieldUpdater updateCount_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "updateCount_100_1000"); + static final AtomicIntegerFieldUpdater updateCount_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "updateCount_1000_10000"); + static final AtomicIntegerFieldUpdater updateCount_10000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(JdbcSqlStat.class, + "updateCount_10000_more"); + + public JdbcSqlStat(String sql) { this.sql = sql; this.id = DruidDriver.createSqlStatId(); } @@ -250,7 +245,7 @@ public void setDataSource(String dataSource) { this.dataSource = dataSource; } - public final static String getContextSqlName() { + public static final String getContextSqlName() { JdbcStatContext context = JdbcStatManager.getInstance().getStatContext(); if (context == null) { return null; @@ -258,7 +253,7 @@ public final static String getContextSqlName() { return context.getName(); } - public final static void setContextSqlName(String val) { + public static final void setContextSqlName(String val) { JdbcStatContext context = JdbcStatManager.getInstance().getStatContext(); if (context == null) { context = JdbcStatManager.getInstance().createStatContext(); @@ -268,7 +263,7 @@ public final static void setContextSqlName(String val) { context.setName(val); } - public final static String getContextSqlFile() { + public static final String getContextSqlFile() { JdbcStatContext context = JdbcStatManager.getInstance().getStatContext(); if (context == null) { return null; @@ -276,7 +271,7 @@ public final static String getContextSqlFile() { return context.getFile(); } - public final static void setContextSqlFile(String val) { + public static final void setContextSqlFile(String val) { JdbcStatContext context = JdbcStatManager.getInstance().getStatContext(); if (context == null) { context = JdbcStatManager.getInstance().createStatContext(); @@ -286,7 +281,7 @@ public final static void setContextSqlFile(String val) { context.setFile(val); } - public final static void setContextSql(String val) { + public static final void setContextSql(String val) { JdbcStatContext context = JdbcStatManager.getInstance().getStatContext(); if (context == null) { context = JdbcStatManager.getInstance().createStatContext(); @@ -491,7 +486,7 @@ public void addUpdateCount(int delta) { if (delta > 0) { updateCountUpdater.addAndGet(this, delta); } - for (;;) { + for (; ; ) { long max = updateCountMaxUpdater.get(this); if (delta <= max) { break; @@ -591,7 +586,7 @@ public void setId(long id) { public String getSql() { return sql; } - + public long getSqlHash() { if (sqlHash == 0) { sqlHash = Utils.fnv_64(sql); @@ -627,7 +622,7 @@ public Date getExecuteErrorLastTime() { public void addFetchRowCount(long delta) { fetchRowCountUpdater.addAndGet(this, delta); - for (;;) { + for (; ; ) { long max = fetchRowCountMaxUpdater.get(this); if (delta <= max) { break; @@ -657,7 +652,7 @@ public void addExecuteBatchCount(long batchSize) { executeBatchSizeTotalUpdater.addAndGet(this, batchSize); // executeBatchSizeMax - for (;;) { + for (; ; ) { int current = executeBatchSizeMaxUpdater.get(this); if (current >= batchSize) { break; @@ -680,7 +675,7 @@ public void incrementExecuteSuccessCount() { public void incrementRunningCount() { int val = runningCountUpdater.incrementAndGet(this); - for (;;) { + for (; ; ) { int max = concurrentMaxUpdater.get(this); if (val <= max) { break; @@ -759,7 +754,7 @@ private void histogramRecord(long nanoSpan) { public void addExecuteTime(long nanoSpan) { executeSpanNanoTotalUpdater.addAndGet(this, nanoSpan); - for (;;) { + for (; ; ) { long current = executeSpanNanoMaxUpdater.get(this); if (current >= nanoSpan) { break; @@ -800,15 +795,14 @@ public void incrementInTransactionCount() { inTransactionCountUpdater.incrementAndGet(this); } - private static CompositeType COMPOSITE_TYPE = null; + private static CompositeType COMPOSITE_TYPE; public static CompositeType getCompositeType() throws JMException { - if (COMPOSITE_TYPE != null) { return COMPOSITE_TYPE; } - OpenType[] indexTypes = new OpenType[] { + OpenType[] indexTypes = new OpenType[]{ // 0 - 4 SimpleType.LONG, // SimpleType.STRING, // @@ -867,7 +861,7 @@ public static CompositeType getCompositeType() throws JMException { SimpleType.LONG, // SimpleType.LONG, // SimpleType.LONG, // - + // 40 - SimpleType.LONG, // @@ -929,11 +923,11 @@ public static CompositeType getCompositeType() throws JMException { "ReadBytesLength", // "InputStreamOpenCount", // "ReaderOpenCount", // - + // 40 "HASH", // - // + // }; String[] indexDescriptions = indexNames; COMPOSITE_TYPE = new CompositeType("SqlStatistic", "Sql Statistic", indexNames, indexDescriptions, indexTypes); @@ -950,7 +944,7 @@ public Map getData() throws JMException { } public long[] getHistogramValues() { - return new long[] { + return new long[]{ // histogram_0_1, // histogram_1_10, // @@ -996,7 +990,7 @@ public long getExecuteAndResultSetHoldTimeMilis() { } public long[] getFetchRowCountHistogramValues() { - return new long[] { + return new long[]{ // fetchRowCount_0_1, // fetchRowCount_1_10, // @@ -1008,7 +1002,7 @@ public long[] getFetchRowCountHistogramValues() { } public long[] getUpdateCountHistogramValues() { - return new long[] { + return new long[]{ // updateCount_0_1, // updateCount_1_10, // @@ -1020,7 +1014,7 @@ public long[] getUpdateCountHistogramValues() { } public long[] getExecuteAndResultHoldTimeHistogramValues() { - return new long[] { + return new long[]{ // executeAndResultHoldTime_0_1, // executeAndResultHoldTime_1_10, // @@ -1074,7 +1068,7 @@ public int compareTo(JdbcSqlStat o) { if (o.sqlHash == this.sqlHash) { return 0; } - + return this.id < o.id ? -1 : 1; } } diff --git a/src/main/java/com/alibaba/druid/stat/JdbcSqlStatMBean.java b/src/main/java/com/alibaba/druid/stat/JdbcSqlStatMBean.java index 32eca40904..4f48a2a338 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcSqlStatMBean.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcSqlStatMBean.java @@ -21,7 +21,6 @@ * @author wenshao [szujobs@hotmail.com] */ public interface JdbcSqlStatMBean { - String getSql(); Date getExecuteLastStartTime(); diff --git a/src/main/java/com/alibaba/druid/stat/JdbcSqlStatValue.java b/src/main/java/com/alibaba/druid/stat/JdbcSqlStatValue.java index 20553378a6..319996346a 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcSqlStatValue.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcSqlStatValue.java @@ -15,152 +15,151 @@ */ package com.alibaba.druid.stat; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import javax.management.JMException; - import com.alibaba.druid.support.monitor.annotation.AggregateType; import com.alibaba.druid.support.monitor.annotation.MField; import com.alibaba.druid.support.monitor.annotation.MTable; import com.alibaba.druid.util.JMXUtils; import com.alibaba.druid.util.Utils; +import javax.management.JMException; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + @MTable(name = "druid_sql") public class JdbcSqlStatValue { + protected long id; - protected long id; - - protected String sql; + protected String sql; - @MField(groupBy = true, aggregate = AggregateType.None, hashFor = "sql", hashForType="sql") - private long sqlHash; + @MField(groupBy = true, aggregate = AggregateType.None, hashFor = "sql", hashForType = "sql") + private long sqlHash; @MField(aggregate = AggregateType.None) - protected String dataSource; + protected String dataSource; @MField(name = "lastStartTime", aggregate = AggregateType.Max) - protected long executeLastStartTime; + protected long executeLastStartTime; @MField(name = "batchTotal", aggregate = AggregateType.Sum) - protected long executeBatchSizeTotal; + protected long executeBatchSizeTotal; @MField(name = "batchToMax", aggregate = AggregateType.Max) - protected int executeBatchSizeMax; + protected int executeBatchSizeMax; @MField(name = "execSuccessCount", aggregate = AggregateType.Sum) - protected long executeSuccessCount; + protected long executeSuccessCount; @MField(name = "execNanoTotal", aggregate = AggregateType.Sum) - protected long executeSpanNanoTotal; + protected long executeSpanNanoTotal; @MField(name = "execNanoMax", aggregate = AggregateType.Sum) - protected long executeSpanNanoMax; + protected long executeSpanNanoMax; @MField(name = "running", aggregate = AggregateType.Last) - protected int runningCount; + protected int runningCount; @MField(aggregate = AggregateType.Max) - protected int concurrentMax; + protected int concurrentMax; @MField(name = "rsHoldTime", aggregate = AggregateType.Sum) - protected long resultSetHoldTimeNano; + protected long resultSetHoldTimeNano; @MField(name = "execRsHoldTime", aggregate = AggregateType.Sum) - protected long executeAndResultSetHoldTime; + protected long executeAndResultSetHoldTime; @MField(aggregate = AggregateType.None) - protected String name; + protected String name; @MField(aggregate = AggregateType.None) - protected String file; + protected String file; @MField(aggregate = AggregateType.None) - protected String dbType; + protected String dbType; @MField(name = "execNanoMaxOccurTime", aggregate = AggregateType.Max) - protected long executeNanoSpanMaxOccurTime; + protected long executeNanoSpanMaxOccurTime; @MField(name = "errorCount", aggregate = AggregateType.Sum) - protected long executeErrorCount; + protected long executeErrorCount; protected Throwable executeErrorLast; @MField(name = "errorLastMsg", aggregate = AggregateType.Last) - protected String executeErrorLastMessage; + protected String executeErrorLastMessage; @MField(name = "errorLastClass", aggregate = AggregateType.Last) - protected String executeErrorLastClass; + protected String executeErrorLastClass; @MField(name = "errorLastStackTrace", aggregate = AggregateType.Last) - protected String executeErrorLastStackTrace; + protected String executeErrorLastStackTrace; @MField(name = "errorLastTime", aggregate = AggregateType.Last) - protected long executeErrorLastTime; + protected long executeErrorLastTime; @MField(aggregate = AggregateType.Sum) - protected long updateCount; + protected long updateCount; @MField(aggregate = AggregateType.Sum) - protected long updateCountMax; + protected long updateCountMax; @MField(aggregate = AggregateType.Sum) - protected long fetchRowCount; + protected long fetchRowCount; @MField(aggregate = AggregateType.Sum) - protected long fetchRowCountMax; + protected long fetchRowCountMax; @MField(name = "inTxnCount", aggregate = AggregateType.Sum) - protected long inTransactionCount; + protected long inTransactionCount; @MField(aggregate = AggregateType.Last) - protected String lastSlowParameters; + protected String lastSlowParameters; @MField(aggregate = AggregateType.Sum) - protected long clobOpenCount; + protected long clobOpenCount; @MField(aggregate = AggregateType.Sum) - protected long blobOpenCount; + protected long blobOpenCount; @MField(aggregate = AggregateType.Sum) - protected long readStringLength; + protected long readStringLength; @MField(aggregate = AggregateType.Sum) - protected long readBytesLength; + protected long readBytesLength; @MField(aggregate = AggregateType.Sum) - protected long inputStreamOpenCount; + protected long inputStreamOpenCount; @MField(aggregate = AggregateType.Sum) - protected long readerOpenCount; + protected long readerOpenCount; @MField(name = "h1", aggregate = AggregateType.Sum) - protected long histogram_0_1; + protected long histogram_0_1; @MField(name = "h10", aggregate = AggregateType.Sum) - protected long histogram_1_10; + protected long histogram_1_10; @MField(name = "h100", aggregate = AggregateType.Sum) - protected int histogram_10_100; + protected int histogram_10_100; @MField(name = "h1000", aggregate = AggregateType.Sum) - protected int histogram_100_1000; + protected int histogram_100_1000; @MField(name = "h10000", aggregate = AggregateType.Sum) - protected int histogram_1000_10000; + protected int histogram_1000_10000; @MField(name = "h100000", aggregate = AggregateType.Sum) - protected int histogram_10000_100000; + protected int histogram_10000_100000; @MField(name = "h1000000", aggregate = AggregateType.Sum) - protected int histogram_100000_1000000; + protected int histogram_100000_1000000; @MField(name = "hmore", aggregate = AggregateType.Sum) - protected int histogram_1000000_more; + protected int histogram_1000000_more; public long[] getExecuteHistogram() { - return new long[] { histogram_0_1, // + return new long[]{histogram_0_1, // histogram_1_10, // histogram_10_100, // histogram_100_1000, // @@ -178,25 +177,25 @@ public long[] getExecuteHistogram() { protected long executeAndResultHoldTime_1_10; @MField(name = "eh100", aggregate = AggregateType.Sum) - protected int executeAndResultHoldTime_10_100; + protected int executeAndResultHoldTime_10_100; @MField(name = "eh1000", aggregate = AggregateType.Sum) - protected int executeAndResultHoldTime_100_1000; + protected int executeAndResultHoldTime_100_1000; @MField(name = "eh10000", aggregate = AggregateType.Sum) - protected int executeAndResultHoldTime_1000_10000; + protected int executeAndResultHoldTime_1000_10000; @MField(name = "eh100000", aggregate = AggregateType.Sum) - protected int executeAndResultHoldTime_10000_100000; + protected int executeAndResultHoldTime_10000_100000; @MField(name = "eh1000000", aggregate = AggregateType.Sum) - protected int executeAndResultHoldTime_100000_1000000; + protected int executeAndResultHoldTime_100000_1000000; @MField(name = "ehmore", aggregate = AggregateType.Sum) - protected int executeAndResultHoldTime_1000000_more; + protected int executeAndResultHoldTime_1000000_more; public long[] getExecuteAndResultHoldHistogram() { - return new long[] { executeAndResultHoldTime_0_1, // + return new long[]{executeAndResultHoldTime_0_1, // executeAndResultHoldTime_1_10, // executeAndResultHoldTime_10_100, // executeAndResultHoldTime_100_1000, // @@ -217,16 +216,16 @@ public long[] getExecuteAndResultHoldHistogram() { protected long fetchRowCount_10_100; @MField(name = "f1000", aggregate = AggregateType.Sum) - protected int fetchRowCount_100_1000; + protected int fetchRowCount_100_1000; @MField(name = "f10000", aggregate = AggregateType.Sum) - protected int fetchRowCount_1000_10000; + protected int fetchRowCount_1000_10000; @MField(name = "fmore", aggregate = AggregateType.Sum) - protected int fetchRowCount_10000_more; + protected int fetchRowCount_10000_more; public long[] getFetchRowHistogram() { - return new long[] { fetchRowCount_0_1, // + return new long[]{fetchRowCount_0_1, // fetchRowCount_1_10, // fetchRowCount_10_100, // fetchRowCount_100_1000, // @@ -245,16 +244,16 @@ public long[] getFetchRowHistogram() { protected long updateCount_10_100; @MField(name = "u1000", aggregate = AggregateType.Sum) - protected int updateCount_100_1000; + protected int updateCount_100_1000; @MField(name = "u10000", aggregate = AggregateType.Sum) - protected int updateCount_1000_10000; + protected int updateCount_1000_10000; @MField(name = "umore", aggregate = AggregateType.Sum) - protected int updateCount_10000_more; + protected int updateCount_10000_more; public long[] getUpdateHistogram() { - return new long[] { updateCount_0_1, // + return new long[]{updateCount_0_1, // updateCount_1_10, // updateCount_10_100, // updateCount_100_1000, // @@ -568,7 +567,7 @@ public void setReaderOpenCount(long readerOpenCount) { } public long[] getHistogramValues() { - return new long[] { + return new long[]{ // histogram_0_1, // histogram_1_10, // @@ -582,7 +581,7 @@ public long[] getHistogramValues() { } public long[] getFetchRowCountHistogramValues() { - return new long[] { + return new long[]{ // fetchRowCount_0_1, // fetchRowCount_1_10, // @@ -594,7 +593,7 @@ public long[] getFetchRowCountHistogramValues() { } public long[] getUpdateCountHistogramValues() { - return new long[] { + return new long[]{ // updateCount_0_1, // updateCount_1_10, // @@ -606,7 +605,7 @@ public long[] getUpdateCountHistogramValues() { } public long[] getExecuteAndResultHoldTimeHistogramValues() { - return new long[] { + return new long[]{ // executeAndResultHoldTime_0_1, // executeAndResultHoldTime_1_10, // diff --git a/src/main/java/com/alibaba/druid/stat/JdbcStatContext.java b/src/main/java/com/alibaba/druid/stat/JdbcStatContext.java index 0e2eaa0115..4c8090b404 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcStatContext.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcStatContext.java @@ -16,16 +16,14 @@ package com.alibaba.druid.stat; public class JdbcStatContext { - - private String name; - private String file; - private String sql; - private String requestId; + private String name; + private String file; + private String sql; + private String requestId; private boolean traceEnable; - public JdbcStatContext(){ - + public JdbcStatContext() { } public boolean isTraceEnable() { @@ -60,13 +58,12 @@ public void setFile(String file) { this.file = file; } - public String getSql() { - return sql; - } + public String getSql() { + return sql; + } - public void setSql(String sql) { - this.sql = sql; - } + public void setSql(String sql) { + this.sql = sql; + } - } diff --git a/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java b/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java index e087c1c27e..04e584d4ab 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java @@ -15,41 +15,32 @@ */ package com.alibaba.druid.stat; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicLong; - -import javax.management.JMException; -import javax.management.openmbean.ArrayType; -import javax.management.openmbean.CompositeDataSupport; -import javax.management.openmbean.CompositeType; -import javax.management.openmbean.OpenType; -import javax.management.openmbean.SimpleType; -import javax.management.openmbean.TabularData; -import javax.management.openmbean.TabularDataSupport; -import javax.management.openmbean.TabularType; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl; -public final class JdbcStatManager implements JdbcStatManagerMBean { +import javax.management.JMException; +import javax.management.openmbean.*; - private final AtomicLong sqlIdSeed = new AtomicLong(1000); +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicLong; - private final static JdbcStatManager instance = new JdbcStatManager(); +public final class JdbcStatManager implements JdbcStatManagerMBean { + private final AtomicLong sqlIdSeed = new AtomicLong(1000); - private final JdbcConnectionStat connectionStat = new JdbcConnectionStat(); - private final JdbcResultSetStat resultSetStat = new JdbcResultSetStat(); - private final JdbcStatementStat statementStat = new JdbcStatementStat(); + private static final JdbcStatManager instance = new JdbcStatManager(); - private final AtomicLong resetCount = new AtomicLong(); + private final JdbcConnectionStat connectionStat = new JdbcConnectionStat(); + private final JdbcResultSetStat resultSetStat = new JdbcResultSetStat(); + private final JdbcStatementStat statementStat = new JdbcStatementStat(); - public final ThreadLocal contextLocal = new ThreadLocal(); + private final AtomicLong resetCount = new AtomicLong(); - private JdbcStatManager(){ + public final ThreadLocal contextLocal = new ThreadLocal(); + private JdbcStatManager() { } public JdbcStatContext getStatContext() { @@ -84,15 +75,14 @@ public JdbcConnectionStat getConnectionStat() { return connectionStat; } - private static CompositeType COMPOSITE_TYPE = null; + private static CompositeType COMPOSITE_TYPE; public static CompositeType getDataSourceCompositeType() throws JMException { - if (COMPOSITE_TYPE != null) { return COMPOSITE_TYPE; } - OpenType[] indexTypes = new OpenType[] { + OpenType[] indexTypes = new OpenType[]{ // 0 - 4 SimpleType.LONG, // SimpleType.STRING, // @@ -172,8 +162,8 @@ public static CompositeType getDataSourceCompositeType() throws JMException { // 55 - new ArrayType(SimpleType.LONG, true) - // - // + // + // }; String[] indexNames = { @@ -189,59 +179,60 @@ public static CompositeType getDataSourceCompositeType() throws JMException { "RawDriverClassName", "RawDriverMajorVersion", "RawDriverMinorVersion", - "Properties" // - , + "Properties", // 10 - 14 "ConnectionActiveCount", "ConnectionActiveCountMax", "ConnectionCloseCount", "ConnectionCommitCount", - "ConnectionRollbackCount" // - , + "ConnectionRollbackCount", + // 15 - 19 "ConnectionConnectLastTime", "ConnectionConnectErrorCount", "ConnectionConnectErrorLastTime", "ConnectionConnectErrorLastMessage", - "ConnectionConnectErrorLastStackTrace" // - , + "ConnectionConnectErrorLastStackTrace", + // 20 - 24 "StatementCreateCount", "StatementPrepareCount", "StatementPreCallCount", "StatementExecuteCount", - "StatementRunningCount" // - , + "StatementRunningCount", // 25 - 29 "StatementConcurrentMax", "StatementCloseCount", "StatementErrorCount", "StatementLastErrorTime", - "StatementLastErrorMessage" // - , + "StatementLastErrorMessage", + // 30 - 34 "StatementLastErrorStackTrace", "StatementExecuteMillisTotal", "ConnectionConnectingCount", "StatementExecuteLastTime", - "ResultSetCloseCount" // - , + "ResultSetCloseCount", + // 35 -39 - "ResultSetOpenCount", "ResultSetOpenningCount", "ResultSetOpenningMax", "ResultSetFetchRowCount", - "ResultSetLastOpenTime" // - , + "ResultSetOpenCount", + "ResultSetOpenningCount", + "ResultSetOpenningMax", + "ResultSetFetchRowCount", + "ResultSetLastOpenTime", + // 40 - 44 - "ResultSetErrorCount", // - "ResultSetOpenningMillisTotal", // - "ResultSetLastErrorTime", // - "ResultSetLastErrorMessage", // - "ResultSetLastErrorStackTrace", // + "ResultSetErrorCount", + "ResultSetOpenningMillisTotal", + "ResultSetLastErrorTime", + "ResultSetLastErrorMessage", + "ResultSetLastErrorStackTrace", // 45 - 49 - "ConnectionConnectCount", // - "ConnectionErrorLastMessage", // - "ConnectionErrorLastStackTrace", // - "ConnectionConnectMillisTotal", // + "ConnectionConnectCount", + "ConnectionErrorLastMessage", + "ConnectionErrorLastStackTrace", + "ConnectionConnectMillisTotal", "ConnectionConnectingCountMax", // 50 - 54 @@ -253,7 +244,7 @@ public static CompositeType getDataSourceCompositeType() throws JMException { // 55 - "StatementHistogram", - // + // }; COMPOSITE_TYPE = new CompositeType("DataSourceStatistic", "DataSource Statistic", indexNames, diff --git a/src/main/java/com/alibaba/druid/stat/JdbcStatManagerFactoryBean.java b/src/main/java/com/alibaba/druid/stat/JdbcStatManagerFactoryBean.java index 70b8c4497c..c4bdbbd6cb 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcStatManagerFactoryBean.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcStatManagerFactoryBean.java @@ -18,7 +18,6 @@ import org.springframework.beans.factory.FactoryBean; public class JdbcStatManagerFactoryBean implements FactoryBean { - @Override public JdbcStatManager getObject() throws Exception { return JdbcStatManager.getInstance(); diff --git a/src/main/java/com/alibaba/druid/stat/JdbcStatManagerMBean.java b/src/main/java/com/alibaba/druid/stat/JdbcStatManagerMBean.java index 4afcac3e00..7c26e560e9 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcStatManagerMBean.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcStatManagerMBean.java @@ -19,7 +19,6 @@ import javax.management.openmbean.TabularData; public interface JdbcStatManagerMBean { - TabularData getDataSourceList() throws JMException; TabularData getSqlList() throws JMException; diff --git a/src/main/java/com/alibaba/druid/stat/JdbcStatementStat.java b/src/main/java/com/alibaba/druid/stat/JdbcStatementStat.java index eb7c7f8704..4f346ca82b 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcStatementStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcStatementStat.java @@ -15,37 +15,36 @@ */ package com.alibaba.druid.stat; -import java.util.Date; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; +import com.alibaba.druid.util.Histogram; +import com.alibaba.druid.util.JMXUtils; import javax.management.JMException; import javax.management.openmbean.CompositeData; -import com.alibaba.druid.util.Histogram; -import com.alibaba.druid.util.JMXUtils; +import java.util.Date; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; public class JdbcStatementStat implements JdbcStatementStatMBean { + private final AtomicLong createCount = new AtomicLong(0); // 执行createStatement的计数 + private final AtomicLong prepareCount = new AtomicLong(0); // 执行parepareStatement的计数 + private final AtomicLong prepareCallCount = new AtomicLong(0); // 执行preCall的计数 + private final AtomicLong closeCount = new AtomicLong(0); // Statement关闭的计数 - private final AtomicLong createCount = new AtomicLong(0); // 执行createStatement的计数 - private final AtomicLong prepareCount = new AtomicLong(0); // 执行parepareStatement的计数 - private final AtomicLong prepareCallCount = new AtomicLong(0); // 执行preCall的计数 - private final AtomicLong closeCount = new AtomicLong(0); // Statement关闭的计数 - - private final AtomicInteger runningCount = new AtomicInteger(); - private final AtomicInteger concurrentMax = new AtomicInteger(); + private final AtomicInteger runningCount = new AtomicInteger(); + private final AtomicInteger concurrentMax = new AtomicInteger(); - private final AtomicLong count = new AtomicLong(); - private final AtomicLong errorCount = new AtomicLong(); + private final AtomicLong count = new AtomicLong(); + private final AtomicLong errorCount = new AtomicLong(); - private final AtomicLong nanoTotal = new AtomicLong(); + private final AtomicLong nanoTotal = new AtomicLong(); - private Throwable lastError; - private long lastErrorTime; + private Throwable lastError; + private long lastErrorTime; - private long lastSampleTime = 0; + private long lastSampleTime; - private final Histogram histogram = new Histogram(new long[] { 10, 100, 1000, 1000 * 10 }); + private final Histogram histogram = new Histogram(new long[]{10, 100, 1000, 1000 * 10}); public long[] getHistogramRanges() { return histogram.getRanges(); @@ -85,7 +84,7 @@ public void afterExecute(long nanoSpan) { public void beforeExecute() { int invoking = runningCount.incrementAndGet(); - for (;;) { + for (; ; ) { int max = concurrentMax.get(); if (invoking > max) { if (concurrentMax.compareAndSet(max, invoking)) { diff --git a/src/main/java/com/alibaba/druid/stat/JdbcStatementStatMBean.java b/src/main/java/com/alibaba/druid/stat/JdbcStatementStatMBean.java index 18b2492e83..b648bbce46 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcStatementStatMBean.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcStatementStatMBean.java @@ -15,13 +15,12 @@ */ package com.alibaba.druid.stat; -import java.util.Date; - import javax.management.JMException; import javax.management.openmbean.CompositeData; -public interface JdbcStatementStatMBean { +import java.util.Date; +public interface JdbcStatementStatMBean { long getCreateCount(); long getPrepareCount(); diff --git a/src/main/java/com/alibaba/druid/stat/JdbcTraceManager.java b/src/main/java/com/alibaba/druid/stat/JdbcTraceManager.java index 6b5944210c..b41c2a7ba4 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcTraceManager.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcTraceManager.java @@ -17,8 +17,7 @@ @Deprecated public class JdbcTraceManager implements JdbcTraceManagerMBean { - - private final static JdbcTraceManager instance = new JdbcTraceManager(); + private static final JdbcTraceManager instance = new JdbcTraceManager(); public static JdbcTraceManager getInstance() { return instance; diff --git a/src/main/java/com/alibaba/druid/stat/JdbcTraceManagerMBean.java b/src/main/java/com/alibaba/druid/stat/JdbcTraceManagerMBean.java index 69bd8b741d..08184118ee 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcTraceManagerMBean.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcTraceManagerMBean.java @@ -16,6 +16,4 @@ package com.alibaba.druid.stat; public interface JdbcTraceManagerMBean { - - } diff --git a/src/main/java/com/alibaba/druid/stat/TableStat.java b/src/main/java/com/alibaba/druid/stat/TableStat.java index 99643c880b..e251eb0d92 100644 --- a/src/main/java/com/alibaba/druid/stat/TableStat.java +++ b/src/main/java/com/alibaba/druid/stat/TableStat.java @@ -28,23 +28,22 @@ import java.util.Map; public class TableStat { - int selectCount = 0; - int updateCount = 0; - int deleteCount = 0; - int insertCount = 0; - int dropCount = 0; - int mergeCount = 0; - int createCount = 0; - int alterCount = 0; - int createIndexCount = 0; - int dropIndexCount = 0; - int referencedCount = 0; - int addCount = 0; // odps add table - int addPartitionCount= 0; // odps add partition - int analyzeCount = 0; // odps analyze table + int selectCount; + int updateCount; + int deleteCount; + int insertCount; + int dropCount; + int mergeCount; + int createCount; + int alterCount; + int createIndexCount; + int dropIndexCount; + int referencedCount; + int addCount; // odps add table + int addPartitionCount; // odps add partition + int analyzeCount; // odps analyze table public TableStat() { - } public int getReferencedCount() { @@ -226,14 +225,14 @@ public String toString() { public static class Name { private final String name; - private final long hashCode64; + private final long hashCode64; - public Name(String name){ + public Name(String name) { this(name, FnvHash.hashCode64(name)); } - public Name(String name, long hashCode64){ - this.name = name; + public Name(String name, long hashCode64) { + this.name = name; this.hashCode64 = hashCode64; } @@ -243,7 +242,7 @@ public String getName() { public int hashCode() { long value = hashCode64(); - return (int)(value ^ (value >>> 32)); + return (int) (value ^ (value >>> 32)); } public long hashCode64() { @@ -341,9 +340,8 @@ public String toString() { } public static class Condition { - - private final Column column; - private final String operator; + private final Column column; + private final String operator; private final List values = new ArrayList(); public Condition(Column column, String operator) { @@ -436,31 +434,31 @@ public String toString() { } public static class Column { - private final String table; - private final String name; - private final long hashCode64; - - private boolean where; - private boolean select; - private boolean groupBy; - private boolean having; - private boolean join; - private boolean primaryKey; // for ddl - private boolean unique; // - private boolean update; - private Map attributes = new HashMap(); - private transient String fullName; + private final String table; + private final String name; + private final long hashCode64; + + private boolean where; + private boolean select; + private boolean groupBy; + private boolean having; + private boolean join; + private boolean primaryKey; // for ddl + private boolean unique; // + private boolean update; + private Map attributes = new HashMap(); + private transient String fullName; /** * @since 1.0.20 */ - private String dataType; + private String dataType; - public Column(String table, String name){ + public Column(String table, String name) { this(table, name, null); } - public Column(String table, String name, DbType dbType){ + public Column(String table, String name, DbType dbType) { this.table = table; this.name = name; @@ -469,11 +467,9 @@ public Column(String table, String name, DbType dbType){ if (dbType == null) { if (table.indexOf('`') != -1) { dbType = DbType.mysql; - } - else if (table.indexOf('[') != -1) { + } else if (table.indexOf('[') != -1) { dbType = DbType.sqlserver; - } - else if (table.indexOf('@') != -1) { + } else if (table.indexOf('@') != -1) { dbType = DbType.oracle; } } @@ -484,7 +480,7 @@ else if (table.indexOf('@') != -1) { } } - public Column(String table, String name, long hashCode64){ + public Column(String table, String name, long hashCode64) { this.table = table; this.name = name; this.hashCode64 = hashCode64; @@ -602,7 +598,7 @@ public void setAttributes(Map attributes) { public int hashCode() { long hash = hashCode64(); - return (int)(hash ^ (hash >>> 32)); + return (int) (hash ^ (hash >>> 32)); } public String toString() { @@ -635,12 +631,11 @@ public static enum Mode { DropIndex(256), // CreateIndex(512), // Replace(1024), - DESC(2048) - ; // + DESC(2048); // public final int mark; - private Mode(int mark){ + private Mode(int mark) { this.mark = mark; } } diff --git a/src/main/java/com/alibaba/druid/support/calcite/CalciteMySqlNodeVisitor.java b/src/main/java/com/alibaba/druid/support/calcite/CalciteMySqlNodeVisitor.java index 018e535356..6d18b0cfe3 100644 --- a/src/main/java/com/alibaba/druid/support/calcite/CalciteMySqlNodeVisitor.java +++ b/src/main/java/com/alibaba/druid/support/calcite/CalciteMySqlNodeVisitor.java @@ -26,7 +26,6 @@ public class CalciteMySqlNodeVisitor extends MySqlASTVisitorAdapter { static Map operators = new HashMap(); static { - List list = SqlStdOperatorTable.instance().getOperatorList(); for (SqlOperator op : list) { long h = FnvHash.hashCode64(op.getName()); @@ -48,7 +47,6 @@ public SqlNode getSqlNode() { return sqlNode; } - public boolean visit(SQLInsertStatement x) { SqlNodeList keywords = new SqlNodeList(new ArrayList(), SqlParserPos.ZERO); @@ -66,7 +64,6 @@ public boolean visit(SQLInsertStatement x) { SqlNode[] rows = new SqlNode[valuesList.size()]; for (int j = 0; j < valuesList.size(); j++) { - List values = valuesList.get(j).getValues(); SqlNode[] valueNodes = new SqlNode[values.size()]; @@ -102,7 +99,6 @@ private boolean visit(List valuesList) { SqlNode[] rows = new SqlNode[valuesList.size()]; for (int j = 0; j < valuesList.size(); j++) { - List values = valuesList.get(j).getValues(); SqlNode[] valueNodes = new SqlNode[values.size()]; @@ -120,8 +116,7 @@ private boolean visit(List valuesList) { } public boolean visit(MySqlUpdateStatement x) { - - if(x.getTableSource().getClass() != SQLExprTableSource.class) { + if (x.getTableSource().getClass() != SQLExprTableSource.class) { throw new UnsupportedOperationException("Support single table only for SqlUpdate statement of calcite."); } SQLExprTableSource tableSource = (SQLExprTableSource) x.getTableSource(); @@ -139,9 +134,8 @@ public boolean visit(MySqlUpdateStatement x) { SqlNode condition = convertToSqlNode(x.getWhere()); - SqlIdentifier alias = null; - if(x.getTableSource().getAlias() != null) { + if (x.getTableSource().getAlias() != null) { alias = new SqlIdentifier(tableSource.getAlias(), SqlParserPos.ZERO); } @@ -151,15 +145,13 @@ public boolean visit(MySqlUpdateStatement x) { } public boolean visit(MySqlDeleteStatement x) { - SQLExprTableSource tableSource = (SQLExprTableSource) x.getTableSource(); SqlNode targetTable = convertToSqlNode(tableSource.getExpr()); SqlNode condition = convertToSqlNode(x.getWhere()); - SqlIdentifier alias = null; - if(x.getTableSource().getAlias() != null) { + if (x.getTableSource().getAlias() != null) { alias = new SqlIdentifier(tableSource.getAlias(), SqlParserPos.ZERO); } @@ -170,7 +162,6 @@ public boolean visit(MySqlDeleteStatement x) { @Override public boolean visit(SQLUnionQuery x) { - SqlNode[] nodes; if (x.getRelations().size() > 2) { nodes = new SqlNode[x.getRelations().size()]; @@ -181,7 +172,7 @@ public boolean visit(SQLUnionQuery x) { SqlNode left = convertToSqlNode(x.getLeft()); SqlNode right = convertToSqlNode(x.getRight()); - nodes = new SqlNode[] {left, right}; + nodes = new SqlNode[]{left, right}; } //order by @@ -252,9 +243,9 @@ public boolean visit(SQLTableSource x) { Class clazz = x.getClass(); if (clazz == SQLJoinTableSource.class) { visit((SQLJoinTableSource) x); - } else if (clazz == SQLExprTableSource.class) { + } else if (clazz == SQLExprTableSource.class) { visit((SQLExprTableSource) x); - } else if (clazz == SQLSubqueryTableSource.class) { + } else if (clazz == SQLSubqueryTableSource.class) { visit((SQLSubqueryTableSource) x); } else { x.accept(this); @@ -277,8 +268,8 @@ public boolean visit(SQLExprTableSource x) { if (x.getAlias() != null) { SqlIdentifier alias = new SqlIdentifier(x.computeAlias(), SqlParserPos.ZERO); - SqlBasicCall as = new SqlBasicCall(SqlStdOperatorTable.AS, new SqlNode[] { table, alias }, - SqlParserPos.ZERO); + SqlBasicCall as = new SqlBasicCall(SqlStdOperatorTable.AS, new SqlNode[]{table, alias}, + SqlParserPos.ZERO); sqlNode = as; } else { sqlNode = table; @@ -308,58 +299,66 @@ public boolean visit(SQLJoinTableSource x) { switch (joinType) { case COMMA: this.sqlNode = new SqlJoin(SqlParserPos.ZERO, left, - SqlLiteral.createBoolean(false, SqlParserPos.ZERO), - JoinType.COMMA.symbol(SqlParserPos.ZERO), right, - JoinConditionType.NONE.symbol(SqlParserPos.ZERO), - null); + SqlLiteral.createBoolean(false, SqlParserPos.ZERO), + JoinType.COMMA.symbol(SqlParserPos.ZERO), right, + JoinConditionType.NONE.symbol(SqlParserPos.ZERO), + null); break; case JOIN: case INNER_JOIN: if (condition == null) { - this.sqlNode = new SqlJoin(SqlParserPos.ZERO - , left - , SqlLiteral.createBoolean(false, SqlParserPos.ZERO) - , JoinType.COMMA.symbol(SqlParserPos.ZERO) - , right - , conditionType - , null); + this.sqlNode = new SqlJoin( + SqlParserPos.ZERO, + left, + SqlLiteral.createBoolean(false, SqlParserPos.ZERO), + JoinType.COMMA.symbol(SqlParserPos.ZERO), + right, + conditionType, + null + ); } else { - this.sqlNode = new SqlJoin(SqlParserPos.ZERO, left - , SqlLiteral.createBoolean(false, SqlParserPos.ZERO) - , JoinType.INNER.symbol(SqlParserPos.ZERO), right - , conditionType - , condition); + this.sqlNode = new SqlJoin( + SqlParserPos.ZERO, + left, + SqlLiteral.createBoolean(false, SqlParserPos.ZERO), + JoinType.INNER.symbol(SqlParserPos.ZERO), + right, + conditionType, + condition + ); } break; case LEFT_OUTER_JOIN: this.sqlNode = new SqlJoin(SqlParserPos.ZERO, - left, - SqlLiteral.createBoolean(false, SqlParserPos.ZERO), - JoinType.LEFT.symbol(SqlParserPos.ZERO), - right, - conditionType, - condition); + left, + SqlLiteral.createBoolean(false, SqlParserPos.ZERO), + JoinType.LEFT.symbol(SqlParserPos.ZERO), + right, + conditionType, + condition); break; case RIGHT_OUTER_JOIN: this.sqlNode = new SqlJoin(SqlParserPos.ZERO, - left, - SqlLiteral.createBoolean(false, SqlParserPos.ZERO), - JoinType.RIGHT.symbol(SqlParserPos.ZERO), - right, - conditionType, - condition); + left, + SqlLiteral.createBoolean(false, SqlParserPos.ZERO), + JoinType.RIGHT.symbol(SqlParserPos.ZERO), + right, + conditionType, + condition); break; case NATURAL_JOIN: - this.sqlNode = new SqlJoin(SqlParserPos.ZERO, - left, - SqlLiteral.createBoolean(true, SqlParserPos.ZERO), - JoinType.COMMA.symbol(SqlParserPos.ZERO), - right, - JoinConditionType.NONE.symbol(SqlParserPos.ZERO), - null); + this.sqlNode = new SqlJoin( + SqlParserPos.ZERO, + left, + SqlLiteral.createBoolean(true, SqlParserPos.ZERO), + JoinType.COMMA.symbol(SqlParserPos.ZERO), + right, + JoinConditionType.NONE.symbol(SqlParserPos.ZERO), + null); break; case CROSS_JOIN: - this.sqlNode = new SqlJoin(SqlParserPos.ZERO, + this.sqlNode = new SqlJoin( + SqlParserPos.ZERO, left, SqlLiteral.createBoolean(false, SqlParserPos.ZERO), JoinType.CROSS.symbol(SqlParserPos.ZERO), @@ -377,15 +376,17 @@ public boolean visit(SQLJoinTableSource x) { null); break; case FULL_OUTER_JOIN: - this.sqlNode = new SqlJoin(SqlParserPos.ZERO - , left - , SqlLiteral.createBoolean(false, SqlParserPos.ZERO) - , JoinType.FULL.symbol(SqlParserPos.ZERO) - , right - , condition == null - ? JoinConditionType.NONE.symbol(SqlParserPos.ZERO) - : conditionType - , condition); + this.sqlNode = new SqlJoin( + SqlParserPos.ZERO, + left, + SqlLiteral.createBoolean(false, SqlParserPos.ZERO), + JoinType.FULL.symbol(SqlParserPos.ZERO), + right, + condition == null + ? JoinConditionType.NONE.symbol(SqlParserPos.ZERO) + : conditionType, + condition + ); break; default: throw new UnsupportedOperationException("unsupported : " + joinType); @@ -406,7 +407,7 @@ public boolean visit(SQLSubqueryTableSource x) { SqlNode[] operands; if (columns.isEmpty()) { - operands = new SqlNode[] { sqlNode, aliasIdentifier }; + operands = new SqlNode[]{sqlNode, aliasIdentifier}; } else { operands = new SqlNode[columns.size() + 2]; operands[0] = sqlNode; @@ -430,7 +431,7 @@ public boolean visit(SQLUnionQueryTableSource x) { if (alias != null) { SqlIdentifier aliasIdentifier = new SqlIdentifier(alias, SqlParserPos.ZERO); sqlNode = new SqlBasicCall(SqlStdOperatorTable.AS, - new SqlNode[] { sqlNode, aliasIdentifier }, + new SqlNode[]{sqlNode, aliasIdentifier}, SqlParserPos.ZERO); } @@ -446,7 +447,7 @@ public boolean visit(SQLInSubQueryExpr x) { } SqlNode right = convertToSqlNode(x.subQuery); - sqlNode = new SqlBasicCall(subOperator, new SqlNode[] { left, right }, SqlParserPos.ZERO); + sqlNode = new SqlBasicCall(subOperator, new SqlNode[]{left, right}, SqlParserPos.ZERO); return false; } @@ -581,74 +582,79 @@ public boolean visit(SQLSelectQueryBlock x) { SqlNodeList hints = convertHints(x.getHints()); if (orderBy != null && x.getParent() instanceof SQLUnionQuery) { - this.sqlNode = new com.alibaba.druid.support.calcite.TDDLSqlSelect(SqlParserPos.ZERO - , keywordList - , selectList - , from - , where - , groupBySqlNode - , having - , null - , null - , offset - , fetch - , hints - , null + this.sqlNode = new com.alibaba.druid.support.calcite.TDDLSqlSelect( + SqlParserPos.ZERO, + keywordList, + selectList, + from, + where, + groupBySqlNode, + having, + null, + null, + offset, + fetch, + hints, + null ); - sqlNode = new SqlOrderBy(SqlParserPos.ZERO - , sqlNode - , orderBySqlNode - , null - , fetch + sqlNode = new SqlOrderBy( + SqlParserPos.ZERO, + sqlNode, + orderBySqlNode, + null, + fetch ); } else { if (orderBySqlNode == null) { orderBySqlNode = SqlNodeList.EMPTY; } if (hints == null || SqlNodeList.isEmptyList(hints)) { - this.sqlNode = new SqlSelect(SqlParserPos.ZERO - , keywordList - , selectList - , from - , where - , groupBySqlNode - , having - , null - , SqlNodeList.EMPTY - , null - , null - , null + this.sqlNode = new SqlSelect( + SqlParserPos.ZERO, + keywordList, + selectList, + from, + where, + groupBySqlNode, + having, + null, + SqlNodeList.EMPTY, + null, + null, + null ); if ((!SqlNodeList.isEmptyList(orderBySqlNode)) || offset != null || fetch != null ) { - sqlNode = new SqlOrderBy(SqlParserPos.ZERO - , sqlNode - , orderBySqlNode - , offset - , fetch); + sqlNode = new SqlOrderBy( + SqlParserPos.ZERO, + sqlNode, + orderBySqlNode, + offset, + fetch + ); } } else { - this.sqlNode = new com.alibaba.druid.support.calcite.TDDLSqlSelect(SqlParserPos.ZERO - , keywordList - , selectList - , from - , where - , groupBySqlNode - , having - , null - , orderBySqlNode - , offset - , fetch - , hints - , null + this.sqlNode = new com.alibaba.druid.support.calcite.TDDLSqlSelect( + SqlParserPos.ZERO, + keywordList, + selectList, + from, + where, + groupBySqlNode, + having, + null, + orderBySqlNode, + offset, + fetch, + hints, + null ); } } - return false; } @@ -675,7 +681,7 @@ public boolean visit(SQLCastExpr x) { typeName = "DECIMAL"; } - SqlIdentifier dataTypeNode = (SqlIdentifier)convertToSqlNode( + SqlIdentifier dataTypeNode = (SqlIdentifier) convertToSqlNode( new SQLIdentifierExpr(typeName)); int scale = -1; @@ -683,25 +689,35 @@ public boolean visit(SQLCastExpr x) { List arguments = dataType.getArguments(); if (arguments != null && !arguments.isEmpty()) { - scale = ((SQLNumericLiteralExpr)arguments.get(0)).getNumber().intValue(); + scale = ((SQLNumericLiteralExpr) arguments.get(0)).getNumber().intValue(); if (arguments.size() > 1) { precision = ((SQLNumericLiteralExpr) arguments.get(1)).getNumber().intValue(); } } - SqlDataTypeSpec sqlDataTypeSpec - = new SqlDataTypeSpec( - new SqlBasicTypeNameSpec(toSqlTypeName(dataType), scale, precision, SqlParserPos.ZERO) - , SqlParserPos.ZERO); + SqlDataTypeSpec sqlDataTypeSpec = new SqlDataTypeSpec( + new SqlBasicTypeNameSpec( + toSqlTypeName(dataType), + scale, + precision, + SqlParserPos.ZERO + ), + SqlParserPos.ZERO + ); SqlOperator sqlOperator = new SqlCastFunction(); - this.sqlNode = new com.alibaba.druid.support.calcite.CalciteSqlBasicCall(sqlOperator, new SqlNode[]{ sqlNode, sqlDataTypeSpec}, SqlParserPos.ZERO, - false, functionQualifier); + this.sqlNode = new com.alibaba.druid.support.calcite.CalciteSqlBasicCall( + sqlOperator, + new SqlNode[]{sqlNode, sqlDataTypeSpec}, + SqlParserPos.ZERO, + false, + functionQualifier + ); return false; } - public boolean visit(SQLCaseExpr x) {// CASE WHEN + public boolean visit(SQLCaseExpr x) { SQLExpr valueExpr = x.getValueExpr(); SqlNode nodeValue = null; SqlNodeList nodeWhen = new SqlNodeList(SqlParserPos.ZERO); @@ -772,17 +788,18 @@ public boolean visit(SQLSelect x) { SqlOrderBy orderBy = (SqlOrderBy) query; SqlWith w = new SqlWith(SqlParserPos.ZERO, withList, orderBy.query); - sqlNode = new SqlOrderBy(SqlParserPos.ZERO - , w - , orderBy.orderList - , orderBy.offset - , orderBy.fetch + sqlNode = new SqlOrderBy( + SqlParserPos.ZERO, + w, + orderBy.orderList, + orderBy.offset, + orderBy.fetch ); } else { sqlNode = new SqlWith(SqlParserPos.ZERO, withList, query); } - if(query instanceof SqlSelect) { + if (query instanceof SqlSelect) { SqlSelect select = (SqlSelect) query; SqlNode fetch = select.getFetch(); SqlNodeList orderList = select.getOrderList(); @@ -797,11 +814,12 @@ public boolean visit(SQLSelect x) { orderByList = SqlNodeList.EMPTY; } - sqlNode = new SqlOrderBy(SqlParserPos.ZERO - , sqlNode - , orderByList - , null - , fetch + sqlNode = new SqlOrderBy( + SqlParserPos.ZERO, + sqlNode, + orderByList, + null, + fetch ); if (fetch != null) { @@ -834,10 +852,9 @@ public boolean visit(SQLWithSubqueryClause.Entry x) { @Override public boolean visit(SQLSelectStatement x) { - SqlNode sqlNode = convertToSqlNode(x.getSelect()); - if(sqlNode instanceof com.alibaba.druid.support.calcite.TDDLSqlSelect) { + if (sqlNode instanceof com.alibaba.druid.support.calcite.TDDLSqlSelect) { com.alibaba.druid.support.calcite.TDDLSqlSelect select = (com.alibaba.druid.support.calcite.TDDLSqlSelect) sqlNode; SqlNodeList headHints = convertHints(x.getHeadHintsDirect()); @@ -897,14 +914,15 @@ public boolean visit(SQLSelectItem x) { if (alias != null && alias.length() > 0) { String alias2 = x.getAlias2(); sqlNode = new SqlBasicCall(SqlStdOperatorTable.AS, - new SqlNode[] { sqlNode, new SqlIdentifier(SQLUtils.normalize(alias2, DbType.mysql), SqlParserPos.ZERO) }, + new SqlNode[]{sqlNode, new SqlIdentifier(SQLUtils.normalize(alias2, DbType.mysql), SqlParserPos.ZERO)}, SqlParserPos.ZERO); } return false; } - @Override public boolean visit(SQLIdentifierExpr x) { + @Override + public boolean visit(SQLIdentifierExpr x) { if (x.getName().equalsIgnoreCase("unknown")) { sqlNode = SqlLiteral.createUnknown(SqlParserPos.ZERO); return false; @@ -980,7 +998,7 @@ public boolean visit(SQLBinaryOpExprGroup x) { if (group == null) { group = calciteNode; } else { - group = new SqlBasicCall(operator, new SqlNode[] {group, calciteNode}, SqlParserPos.ZERO);; + group = new SqlBasicCall(operator, new SqlNode[]{group, calciteNode}, SqlParserPos.ZERO); } } this.sqlNode = group; @@ -1108,9 +1126,9 @@ public boolean visit(SQLBinaryOpExpr x) { } } } - break; + break; case IsNot: - if(rightExpr instanceof SQLNullExpr) { + if (rightExpr instanceof SQLNullExpr) { operator = SqlStdOperatorTable.IS_NOT_NULL; } else if (rightExpr instanceof SQLIdentifierExpr) { long hashCode64 = ((SQLIdentifierExpr) rightExpr).nameHashCode64(); @@ -1126,8 +1144,8 @@ public boolean visit(SQLBinaryOpExpr x) { } else if (hashCode64 == FnvHash.Constants.UNKNOWN) { operator = SqlStdOperatorTable.IS_NOT_UNKNOWN; } - } else if(rightExpr instanceof SQLBooleanExpr){ - if(((SQLBooleanExpr) rightExpr).getValue()){ + } else if (rightExpr instanceof SQLBooleanExpr) { + if (((SQLBooleanExpr) rightExpr).getValue()) { operator = SqlStdOperatorTable.IS_NOT_TRUE; } else { operator = SqlStdOperatorTable.IS_NOT_FALSE; @@ -1136,7 +1154,7 @@ public boolean visit(SQLBinaryOpExpr x) { break; case Escape: { SqlBasicCall like = (SqlBasicCall) left; - sqlNode = new SqlBasicCall(like.getOperator(), new SqlNode[] { like.operands[0], like.operands[1], right }, + sqlNode = new SqlBasicCall(like.getOperator(), new SqlNode[]{like.operands[0], like.operands[1], right}, SqlParserPos.ZERO); return false; } @@ -1145,12 +1163,11 @@ public boolean visit(SQLBinaryOpExpr x) { } - if (someOrAllOperator != null) { - this.sqlNode = new SqlBasicCall(someOrAllOperator, new SqlNode[] { left, right }, + this.sqlNode = new SqlBasicCall(someOrAllOperator, new SqlNode[]{left, right}, SqlParserPos.ZERO); } else { - if(operator == SqlStdOperatorTable.IS_NULL + if (operator == SqlStdOperatorTable.IS_NULL || operator == SqlStdOperatorTable.IS_NOT_NULL || operator == SqlStdOperatorTable.IS_TRUE || operator == SqlStdOperatorTable.IS_NOT_TRUE) { @@ -1159,7 +1176,7 @@ public boolean visit(SQLBinaryOpExpr x) { SqlParserPos.ZERO); } else { this.sqlNode = new SqlBasicCall(operator, - new SqlNode[]{left,right}, + new SqlNode[]{left, right}, SqlParserPos.ZERO); } } @@ -1187,8 +1204,8 @@ public boolean visit(SQLExistsExpr x) { SqlOperator sqlOperator = SqlStdOperatorTable.EXISTS; SqlNode sqlNode = sqlOperator.createCall(SqlParserPos.ZERO, convertToSqlNode(x.getSubQuery())); - if(x.isNot()){ - sqlNode = SqlStdOperatorTable.NOT.createCall(SqlParserPos.ZERO,sqlNode); + if (x.isNot()) { + sqlNode = SqlStdOperatorTable.NOT.createCall(SqlParserPos.ZERO, sqlNode); } this.sqlNode = sqlNode; return false; @@ -1278,7 +1295,6 @@ public boolean visit(SQLAggregateExpr x) { String methodName = x.getMethodName(); - long hashCode64 = x.methodNameHashCode64(); functionOperator = func(hashCode64); @@ -1305,7 +1321,7 @@ public boolean visit(SQLAggregateExpr x) { this.sqlNode = functionOperator.createCall(functionQualifier, SqlParserPos.ZERO, SqlParserUtil.toNodeArray(argNodes) - ); + ); SQLOrderBy orderBy = x.getOrderBy(); if (orderBy != null) { @@ -1331,15 +1347,16 @@ public boolean visit(SQLAggregateExpr x) { } SqlNode upperBound = createSymbol(windowingBetweenEndBound); - SqlWindow window = new SqlWindow(SqlParserPos.ZERO - , null - , null - , convertToSqlNodeList(over.getPartitionBy()) - , convertOrderby(over.getOrderBy()) - , SqlLiteral.createBoolean(isRow, SqlParserPos.ZERO) - , lowerBound - , upperBound - , null + SqlWindow window = new SqlWindow( + SqlParserPos.ZERO, + null, + null, + convertToSqlNodeList(over.getPartitionBy()), + convertOrderby(over.getOrderBy()), + SqlLiteral.createBoolean(isRow, SqlParserPos.ZERO), + lowerBound, + upperBound, + null ); sqlNode = SqlStdOperatorTable.OVER.createCall( SqlParserPos.ZERO, @@ -1347,7 +1364,6 @@ public boolean visit(SQLAggregateExpr x) { window); } - SQLExpr filter = x.getFilter(); if (filter != null) { SqlNode aggNode = this.sqlNode; @@ -1359,7 +1375,6 @@ public boolean visit(SQLAggregateExpr x) { sqlNode); } - return false; } @@ -1388,7 +1403,6 @@ public boolean visit(SQLMethodInvokeExpr x) { SqlOperator functionOperator = func(nameHashCode64); - String methodName = x.getMethodName(); if (functionOperator == null) { @@ -1399,9 +1413,9 @@ public boolean visit(SQLMethodInvokeExpr x) { this.sqlNode = new com.alibaba.druid.support.calcite.CalciteSqlBasicCall(functionOperator, new SqlNode[]{ - SqlLiteral.createSymbol(SqlTrimFunction.Flag.BOTH, SqlParserPos.ZERO) - , SqlCharStringLiteral.createCharString(" ", SqlParserPos.ZERO) - , sqlNode + SqlLiteral.createSymbol(SqlTrimFunction.Flag.BOTH, SqlParserPos.ZERO), + SqlCharStringLiteral.createCharString(" ", SqlParserPos.ZERO), + sqlNode }, SqlParserPos.ZERO, false, @@ -1422,7 +1436,6 @@ public boolean visit(SQLMethodInvokeExpr x) { SqlLiteral functionQualifier = null; - for (SQLExpr exp : arguments) { argNodes.add(convertToSqlNode(exp)); } @@ -1433,29 +1446,27 @@ public boolean visit(SQLMethodInvokeExpr x) { ) { SqlIdentifier arg0 = (SqlIdentifier) argNodes.get(0); TimeUnit timeUnit = TimeUnit.valueOf(arg0.toString().toUpperCase()); - argNodes.set(0 - , SqlLiteral.createSymbol(timeUnit, SqlParserPos.ZERO) - ); + argNodes.set(0, SqlLiteral.createSymbol(timeUnit, SqlParserPos.ZERO)); } this.sqlNode = new com.alibaba.druid.support.calcite.CalciteSqlBasicCall(functionOperator, - SqlParserUtil.toNodeArray(argNodes), - SqlParserPos.ZERO, - false, - functionQualifier); + SqlParserUtil.toNodeArray(argNodes), + SqlParserPos.ZERO, + false, + functionQualifier); return false; } public boolean visit(SQLInListExpr x) { SqlNodeList sqlNodes = convertToSqlNodeList(x.getTargetList()); SqlOperator sqlOperator = x.isNot() ? SqlStdOperatorTable.NOT_IN : SqlStdOperatorTable.IN; - sqlNode = new SqlBasicCall(sqlOperator, new SqlNode[] { convertToSqlNode(x.getExpr()), sqlNodes }, - SqlParserPos.ZERO); + sqlNode = new SqlBasicCall(sqlOperator, new SqlNode[]{convertToSqlNode(x.getExpr()), sqlNodes}, + SqlParserPos.ZERO); return false; } - public boolean visit(SQLVariantRefExpr x){ + public boolean visit(SQLVariantRefExpr x) { if ("?".equals(x.getName())) { this.sqlNode = new SqlDynamicParam(x.getIndex(), SqlParserPos.ZERO); @@ -1472,11 +1483,11 @@ public boolean visit(SQLUnaryExpr x) { switch (operator) { case NOT: this.sqlNode = SqlStdOperatorTable.NOT.createCall(SqlParserPos.ZERO, - convertToSqlNode(x.getExpr())); + convertToSqlNode(x.getExpr())); break; case Negative: this.sqlNode = SqlStdOperatorTable.UNARY_MINUS.createCall(SqlParserPos.ZERO, - convertToSqlNode(x.getExpr())); + convertToSqlNode(x.getExpr())); break; case Not: case Compl: @@ -1514,7 +1525,6 @@ protected SqlNodeList convertToSqlNodeList(List exprList) { return new SqlNodeList(nodes, SqlParserPos.ZERO); } - protected SqlNode convertToSqlNode(SQLObject ast) { if (ast == null) { return null; @@ -1535,16 +1545,16 @@ private SqlNodeList convertOrderby(SQLOrderBy orderBy) { for (SQLSelectOrderByItem item : items) { SqlNode node = convertToSqlNode(item.getExpr()); if (item.getType() == SQLOrderingSpecification.DESC) { - node = new SqlBasicCall(SqlStdOperatorTable.DESC, new SqlNode[] { node }, SqlParserPos.ZERO); + node = new SqlBasicCall(SqlStdOperatorTable.DESC, new SqlNode[]{node}, SqlParserPos.ZERO); } SQLSelectOrderByItem.NullsOrderType nullsOrderType = item.getNullsOrderType(); if (nullsOrderType != null) { switch (nullsOrderType) { case NullsFirst: - node = new SqlBasicCall(SqlStdOperatorTable.NULLS_FIRST, new SqlNode[] { node }, SqlParserPos.ZERO); + node = new SqlBasicCall(SqlStdOperatorTable.NULLS_FIRST, new SqlNode[]{node}, SqlParserPos.ZERO); break; case NullsLast: - node = new SqlBasicCall(SqlStdOperatorTable.NULLS_LAST, new SqlNode[] { node }, SqlParserPos.ZERO); + node = new SqlBasicCall(SqlStdOperatorTable.NULLS_LAST, new SqlNode[]{node}, SqlParserPos.ZERO); break; default: break; @@ -1574,7 +1584,6 @@ private SqlNodeList convertHints(List hints) { } private SqlNodeList convertTDDLHint(TDDLHint hint) { - List functions = hint.getFunctions(); List funNodes = new ArrayList(functions.size()); @@ -1590,10 +1599,10 @@ private SqlNodeList convertTDDLHint(TDDLHint hint) { SqlNode argValue = convertToSqlNode(argument.getValue()); List arg = new ArrayList(); - if(argName != null) { + if (argName != null) { arg.add(argName); } - if(argValue != null) { + if (argValue != null) { arg.add(argValue); } @@ -1609,7 +1618,7 @@ private SqlNodeList convertTDDLHint(TDDLHint hint) { SqlNode funNode = new SqlBasicCall( new SqlUnresolvedFunction(new SqlIdentifier(functionName, SqlParserPos.ZERO), null, null, - null, null, SqlFunctionCategory.USER_DEFINED_FUNCTION), argNodes, + null, null, SqlFunctionCategory.USER_DEFINED_FUNCTION), argNodes, SqlParserPos.ZERO); funNodes.add(funNode); @@ -1621,6 +1630,7 @@ private SqlNodeList convertTDDLHint(TDDLHint hint) { /** * If there are multiple VALUES, and all values in VALUES CLAUSE are literal, * convert the value clauses to a single value clause. + * * @param valuesClauseList * @return */ @@ -1646,7 +1656,7 @@ public static List convertToSingleValuesIfNeed( } public boolean visit(SQLIntervalExpr x) { - TimeUnit timeUnits[] = getTimeUnit(x.getUnit()); + TimeUnit[] timeUnits = getTimeUnit(x.getUnit()); List convertedArgs = new ArrayList(2); SqlIntervalQualifier unitNode = new SqlIntervalQualifier(timeUnits[0], timeUnits[1], SqlParserPos.ZERO); SqlLiteral valueNode = (SqlLiteral) convertToSqlNode(x.getValue()); @@ -1756,19 +1766,22 @@ public boolean visit(SQLNotExpr x) { @Override public boolean visit(SQLExtractExpr x) { x.getValue().accept(this); - TimeUnit timeUnits[] = getTimeUnit(x.getUnit()); + TimeUnit[] timeUnits = getTimeUnit(x.getUnit()); sqlNode = SqlStdOperatorTable.EXTRACT - .createCall(SqlParserPos.ZERO - , new SqlIntervalQualifier(timeUnits[0], timeUnits[1], SqlParserPos.ZERO) - , sqlNode); + .createCall( + SqlParserPos.ZERO, + new SqlIntervalQualifier(timeUnits[0], timeUnits[1], SqlParserPos.ZERO), + sqlNode + ); return false; } @Override public boolean visit(SQLGroupingSetExpr x) { - sqlNode = SqlStdOperatorTable.GROUPING_SETS.createCall(SqlParserPos.ZERO - , convertToSqlNodeList(x.getParameters()) + sqlNode = SqlStdOperatorTable.GROUPING_SETS.createCall( + SqlParserPos.ZERO, + convertToSqlNodeList(x.getParameters()) ); return false; } @@ -1785,18 +1798,20 @@ public boolean visit(SQLValuesQuery x) { return false; } - @Override public boolean visit(SQLUnnestTableSource x) { sqlNode = SqlStdOperatorTable.UNNEST - .createCall(SqlParserPos.ZERO - , convertToSqlNodeList(x.getItems())); + .createCall( + SqlParserPos.ZERO, + convertToSqlNodeList(x.getItems()) + ); String alias = x.getAlias(); if (alias != null) { - sqlNode = new SqlBasicCall(SqlStdOperatorTable.AS - , new SqlNode[] { sqlNode, new SqlIdentifier(alias, SqlParserPos.ZERO) } - , SqlParserPos.ZERO + sqlNode = new SqlBasicCall( + SqlStdOperatorTable.AS, + new SqlNode[]{sqlNode, new SqlIdentifier(alias, SqlParserPos.ZERO)}, + SqlParserPos.ZERO ); } return false; @@ -1812,12 +1827,13 @@ public boolean visit(SQLDefaultExpr x) { public boolean visit(MySqlExplainStatement x) { x.getStatement().accept(this); SqlNode explicandum = this.sqlNode; - sqlNode = new SqlExplain(SqlParserPos.ZERO - , explicandum - , SqlLiteral.createSymbol(SqlExplainLevel.EXPPLAN_ATTRIBUTES, SqlParserPos.ZERO) - , SqlLiteral.createSymbol(SqlExplain.Depth.PHYSICAL, SqlParserPos.ZERO) - , SqlLiteral.createSymbol(SqlExplainFormat.TEXT, SqlParserPos.ZERO) - , 0 + sqlNode = new SqlExplain( + SqlParserPos.ZERO, + explicandum, + SqlLiteral.createSymbol(SqlExplainLevel.EXPPLAN_ATTRIBUTES, SqlParserPos.ZERO), + SqlLiteral.createSymbol(SqlExplain.Depth.PHYSICAL, SqlParserPos.ZERO), + SqlLiteral.createSymbol(SqlExplainFormat.TEXT, SqlParserPos.ZERO), + 0 ); return false; } diff --git a/src/main/java/com/alibaba/druid/support/calcite/CalciteSqlBasicCall.java b/src/main/java/com/alibaba/druid/support/calcite/CalciteSqlBasicCall.java index 74464f3ecd..a79186cb45 100644 --- a/src/main/java/com/alibaba/druid/support/calcite/CalciteSqlBasicCall.java +++ b/src/main/java/com/alibaba/druid/support/calcite/CalciteSqlBasicCall.java @@ -10,13 +10,12 @@ * @author lijun.cailj 2017/11/21 */ public class CalciteSqlBasicCall extends SqlBasicCall { - public CalciteSqlBasicCall(SqlOperator operator, SqlNode[] operands, SqlParserPos pos) { super(operator, operands, pos); } public CalciteSqlBasicCall(SqlOperator operator, SqlNode[] operands, SqlParserPos pos, boolean expanded, - SqlLiteral functionQualifier) { + SqlLiteral functionQualifier) { super(operator, operands, pos, expanded, functionQualifier); } } diff --git a/src/main/java/com/alibaba/druid/support/calcite/TDDLSqlSelect.java b/src/main/java/com/alibaba/druid/support/calcite/TDDLSqlSelect.java index b6275af706..3d69a14d4f 100644 --- a/src/main/java/com/alibaba/druid/support/calcite/TDDLSqlSelect.java +++ b/src/main/java/com/alibaba/druid/support/calcite/TDDLSqlSelect.java @@ -11,7 +11,6 @@ * @author lijun.cailj 2017/11/29 */ public class TDDLSqlSelect extends SqlSelect { - private SqlNodeList hints; private SqlNodeList headHints; diff --git a/src/main/java/com/alibaba/druid/support/console/DruidStat.java b/src/main/java/com/alibaba/druid/support/console/DruidStat.java index 7d80df5343..c671fc8b58 100644 --- a/src/main/java/com/alibaba/druid/support/console/DruidStat.java +++ b/src/main/java/com/alibaba/druid/support/console/DruidStat.java @@ -15,13 +15,12 @@ */ package com.alibaba.druid.support.console; -import java.io.File; -import java.io.IOException; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Properties; +import com.alibaba.druid.stat.DruidStatService; +import com.alibaba.druid.support.json.JSONUtils; +import com.sun.tools.attach.AgentInitializationException; +import com.sun.tools.attach.AgentLoadException; +import com.sun.tools.attach.AttachNotSupportedException; +import com.sun.tools.attach.VirtualMachine; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -29,15 +28,15 @@ import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; -import com.alibaba.druid.stat.DruidStatService; -import com.alibaba.druid.support.json.JSONUtils; -import com.sun.tools.attach.AgentInitializationException; -import com.sun.tools.attach.AgentLoadException; -import com.sun.tools.attach.AttachNotSupportedException; -import com.sun.tools.attach.VirtualMachine; +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; public class DruidStat { - private static final String LOCAL_CONNECTOR_ADDRESS_PROP = "com.sun.management.jmxremote.localConnectorAddress"; public static void main(String[] args) throws Exception { @@ -60,8 +59,7 @@ public static void main(String[] args) throws Exception { @SuppressWarnings("all") public static void printDruidStat(Option option) throws Exception { - - PrintStream out = option.getPrintStream(); + PrintStream out = option.getPrintStream(); String address = loadManagementAgentAndGetAddress(option.getPid()); JMXServiceURL jmxUrl = new JMXServiceURL(address); JMXConnector jmxc = JMXConnectorFactory.connect(jmxUrl); @@ -71,52 +69,52 @@ public static void printDruidStat(Option option) throws Exception { List> content = (List>) invokeService(jmxConn, Option.DATA_SOURCE); TabledDataPrinter.printDataSourceData(content, option); } - + if (option.printSqlData()) { List> content = (List>) invokeService(jmxConn, Option.SQL); - if (content == null ) { - out.println("无SqlStat统计数据,请检查是否已执行了SQL"); - } else { - TabledDataPrinter.printSqlData(content, option); - } + if (content == null) { + out.println("无SqlStat统计数据,请检查是否已执行了SQL"); + } else { + TabledDataPrinter.printSqlData(content, option); + } } - + if (option.printActiveConn()) { List> content = (List>) invokeService(jmxConn, Option.ACTIVE_CONN); - if (content == null || content.isEmpty() ) { - out.println("目前无活动中的数据库连接"); - } else { - TabledDataPrinter.printActiveConnStack(content, option); - } + if (content == null || content.isEmpty()) { + out.println("目前无活动中的数据库连接"); + } else { + TabledDataPrinter.printActiveConnStack(content, option); + } } - + } @SuppressWarnings("all") - public static List getDataSourceIds(Option option) throws Exception{ - String address = loadManagementAgentAndGetAddress(option.getPid()); + public static List getDataSourceIds(Option option) throws Exception { + String address = loadManagementAgentAndGetAddress(option.getPid()); JMXServiceURL jmxUrl = new JMXServiceURL(address); JMXConnector jmxc = JMXConnectorFactory.connect(jmxUrl); MBeanServerConnection jmxConn = jmxc.getMBeanServerConnection(); - List> content = (List>) invokeService(jmxConn, Option.DATA_SOURCE); - TabledDataPrinter.printDataSourceData(content, option); + List> content = (List>) invokeService(jmxConn, Option.DATA_SOURCE); + TabledDataPrinter.printDataSourceData(content, option); - List result = new ArrayList(); - for (Map dsStat : content) { - Integer id = (Integer)dsStat.get("Identity"); - result.add(id); - } - return result; - } + List result = new ArrayList(); + for (Map dsStat : content) { + Integer id = (Integer) dsStat.get("Identity"); + result.add(id); + } + return result; + } @SuppressWarnings("all") public static Object invokeService(MBeanServerConnection jmxConn, int dataType) throws Exception { - String url = Option.getUrl(dataType); - ObjectName name = new ObjectName(DruidStatService.MBEAN_NAME); - String result = (String) jmxConn.invoke(name, "service", new String[] { url }, new String[] { String.class.getName() }); - Map o = (Map) JSONUtils.parse(result); - List> content = (List>) o.get("Content"); - return content; + String url = Option.getUrl(dataType); + ObjectName name = new ObjectName(DruidStatService.MBEAN_NAME); + String result = (String) jmxConn.invoke(name, "service", new String[]{url}, new String[]{String.class.getName()}); + Map o = (Map) JSONUtils.parse(result); + List> content = (List>) o.get("Content"); + return content; } private static String loadManagementAgentAndGetAddress(int vmid) throws IOException { diff --git a/src/main/java/com/alibaba/druid/support/console/Option.java b/src/main/java/com/alibaba/druid/support/console/Option.java index 18b8b50f81..0479b313b6 100644 --- a/src/main/java/com/alibaba/druid/support/console/Option.java +++ b/src/main/java/com/alibaba/druid/support/console/Option.java @@ -18,29 +18,28 @@ import java.io.PrintStream; public class Option { + public static final int DATA_SOURCE = 1; + public static final int SQL = 2; + public static final int ACTIVE_CONN = 4; - public static final int DATA_SOURCE = 1 ; - public static final int SQL = 2 ; - public static final int ACTIVE_CONN = 4 ; - - private int printDataType = 0; + private int printDataType; private int pid = -1; private int id = -1; - private int interval = -1; - private boolean detailPrint; + private int interval = -1; + private boolean detailPrint; - private PrintStream printStream = System.out; + private PrintStream printStream = System.out; public void addPrintDataType(int newValue) { - this.printDataType= this.printDataType | newValue; + this.printDataType = this.printDataType | newValue; } public static boolean isPrintHelp(String[] args) { - if (args == null ) { + if (args == null) { return true; } - for (String arg: args) { - if (arg.equals("-help") ) { + for (String arg : args) { + if (arg.equals("-help")) { return true; } } @@ -48,23 +47,25 @@ public static boolean isPrintHelp(String[] args) { } public boolean printSqlData() { - return ((printDataType & SQL) == SQL); + return ((printDataType & SQL) == SQL); } + public boolean printDataSourceData() { - return ( (printDataType & DATA_SOURCE) == DATA_SOURCE); + return ((printDataType & DATA_SOURCE) == DATA_SOURCE); } + public boolean printActiveConn() { - return ( (printDataType & ACTIVE_CONN) == ACTIVE_CONN); + return ((printDataType & ACTIVE_CONN) == ACTIVE_CONN); } public int getPrintDataType() { return this.printDataType; } - public void setPid(int pid) { - this.pid=pid; + this.pid = pid; } + public int getPid() { return this.pid; } @@ -82,91 +83,91 @@ public static String getUrl(int dataType) { } } - private static int parsePositiveInt(String v) { - try { + private static int parsePositiveInt(String v) { + try { return Integer.parseInt(v); - } catch (NumberFormatException e) { - return -1; - } - } + } catch (NumberFormatException e) { + return -1; + } + } - public static Option parseOptions(String[] args) throws OptionParseException{ + public static Option parseOptions(String[] args) throws OptionParseException { Option option = new Option(); - int i = 0; - if (args.length < 1 ) { + int i = 0; + if (args.length < 1) { throw new OptionParseException("not enough arguments!"); } while (i < args.length) { - int v1 = parsePositiveInt(args[i]); - - //check last two arguments - if ( (i == args.length - 2) && v1 > 0) { - int v2 = parsePositiveInt(args[i+1]); - if ( v2 > 0) { - option.setPid(v1); - option.setInterval(v2); - } else { - throw new OptionParseException("请在参数的最后位置上 指定 pid 和 refresh-interval"); - } - break; - } else if ( i == args.length -1 ) { - option.setPid(v1); - } - + int v1 = parsePositiveInt(args[i]); + + //check last two arguments + if ((i == args.length - 2) && v1 > 0) { + int v2 = parsePositiveInt(args[i + 1]); + if (v2 > 0) { + option.setPid(v1); + option.setInterval(v2); + } else { + throw new OptionParseException("请在参数的最后位置上 指定 pid 和 refresh-interval"); + } + break; + } else if (i == args.length - 1) { + option.setPid(v1); + } + if (args[i].equals("-sql")) { option.addPrintDataType(SQL); } else if (args[i].equals("-ds")) { option.addPrintDataType(DATA_SOURCE); - } else if (args[i].equals("-act")) { + } else if (args[i].equals("-act")) { option.addPrintDataType(ACTIVE_CONN); - } else if (args[i].equals("-detail")) { - option.setDetailPrint(true); + } else if (args[i].equals("-detail")) { + option.setDetailPrint(true); } else if (args[i].equals("-id")) { - try { - int id = Integer.parseInt(args[i+1]); - option.setId(id); - i++; - } catch (NumberFormatException e) { - throw new OptionParseException("id参数必须是整数"); - } + try { + int id = Integer.parseInt(args[i + 1]); + option.setId(id); + i++; + } catch (NumberFormatException e) { + throw new OptionParseException("id参数必须是整数"); + } } i++; - } - + } + if (option.getPrintDataType() == 0) { throw new OptionParseException("请在{'-sql','-ds','-act'}参数中选择一个或多个"); } - if (option.getPid() == -1 ) { + if (option.getPid() == -1) { throw new OptionParseException("请在参数中指定 pid"); } return option; } public static void printHelp(String errorMsg) { - printHelp(System.out, errorMsg); - } + printHelp(System.out, errorMsg); + } public static void printHelp() { - printHelp(System.out, null); - } + printHelp(System.out, null); + } public static void printHelp(PrintStream out, String errorMsg) { - if (errorMsg != null ) { - out.println(errorMsg); - out.println(); - } + if (errorMsg != null) { + out.println(errorMsg); + out.println(); + } out.println("Usage: druidStat -help | -sql -ds -act [-detail] [-id id] [refresh-interval]"); out.println(); out.println("参数: "); - out.println(" -help 打印此帮助信息"); - out.println(" -sql 打印SQL统计数据"); - out.println(" -ds 打印DataSource统计数据"); - out.println(" -act 打印活动连接的堆栈信息"); + out.println(" -help 打印此帮助信息"); + out.println(" -sql 打印SQL统计数据"); + out.println(" -ds 打印DataSource统计数据"); + out.println(" -act 打印活动连接的堆栈信息"); out.println(" -detail 打印统计数据的全部字段信息"); - out.println(" -id id 要打印的数据的具体id值" ); - out.println(" pid 使用druid连接池的jvm进程id"); - out.println(" refresh-interval 自动刷新时间间隔, 以秒为单位" ); + out.println(" -id id 要打印的数据的具体id值"); + out.println(" pid 使用druid连接池的jvm进程id"); + out.println(" refresh-interval 自动刷新时间间隔, 以秒为单位"); out.println(); out.println("说明: "); @@ -190,36 +191,38 @@ public static void printHelp(PrintStream out, String errorMsg) { out.println(" >druidStat -ds -sql -act 3983"); out.println(" 每隔5秒自动打印ds统计数据"); out.println(" >druidStat -ds 3983 5"); - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public void setDetailPrint(boolean detailPrint) { - this.detailPrint=detailPrint; - } - public boolean isDetailPrint() { - return this.detailPrint; - } - - public void setInterval(int interval) { - this.interval=interval; - } - public int getInterval() { - return this.interval; - } - - - public void setPrintStream(PrintStream printStream) { - this.printStream=printStream; - } - public PrintStream getPrintStream() { - return this.printStream; - } + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public void setDetailPrint(boolean detailPrint) { + this.detailPrint = detailPrint; + } + + public boolean isDetailPrint() { + return this.detailPrint; + } + + public void setInterval(int interval) { + this.interval = interval; + } + + public int getInterval() { + return this.interval; + } + + public void setPrintStream(PrintStream printStream) { + this.printStream = printStream; + } + + public PrintStream getPrintStream() { + return this.printStream; + } } diff --git a/src/main/java/com/alibaba/druid/support/console/OptionParseException.java b/src/main/java/com/alibaba/druid/support/console/OptionParseException.java index 2470f0168f..268f7b86a7 100644 --- a/src/main/java/com/alibaba/druid/support/console/OptionParseException.java +++ b/src/main/java/com/alibaba/druid/support/console/OptionParseException.java @@ -16,7 +16,6 @@ package com.alibaba.druid.support.console; public class OptionParseException extends Exception { - private static final long serialVersionUID = 1L; public OptionParseException(String msg) { @@ -24,7 +23,7 @@ public OptionParseException(String msg) { } public OptionParseException(String msg, Throwable cause) { - super(msg,cause); + super(msg, cause); } public OptionParseException(Throwable cause) { diff --git a/src/main/java/com/alibaba/druid/support/console/TableFormatter.java b/src/main/java/com/alibaba/druid/support/console/TableFormatter.java index 249a257659..3585b23a22 100644 --- a/src/main/java/com/alibaba/druid/support/console/TableFormatter.java +++ b/src/main/java/com/alibaba/druid/support/console/TableFormatter.java @@ -18,10 +18,9 @@ import java.util.List; public class TableFormatter { - - public static String format(List rows) { - String[] titleRow = rows.get(0); - int[] maxLens = new int[titleRow.length]; + public static String format(List rows) { + String[] titleRow = rows.get(0); + int[] maxLens = new int[titleRow.length]; for (String[] row : rows) { for (int j = 0; j < row.length; j++) { int len = displayLen(row[j]); @@ -30,55 +29,55 @@ public static String format(List rows) { } } } - StringBuilder sb = new StringBuilder(); - sb.append(makeSplitLine(maxLens)); - for (int i=0; i length) { - return old; - } - StringBuilder sb = new StringBuilder(old); - for (int i=0; i< length -vLen ; i++) { - sb.append(" "); - } - return sb.toString(); - } + public static String padStr(String old, int length) { + if (old == null) { + return ""; + } + int vLen = displayLen(old); + if (vLen > length) { + return old; + } + StringBuilder sb = new StringBuilder(old); + for (int i = 0; i < length - vLen; i++) { + sb.append(" "); + } + return sb.toString(); + } } diff --git a/src/main/java/com/alibaba/druid/support/console/TabledDataPrinter.java b/src/main/java/com/alibaba/druid/support/console/TabledDataPrinter.java index 28b38a9602..b6276ef0b3 100644 --- a/src/main/java/com/alibaba/druid/support/console/TabledDataPrinter.java +++ b/src/main/java/com/alibaba/druid/support/console/TabledDataPrinter.java @@ -15,41 +15,40 @@ */ package com.alibaba.druid.support.console; +import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.SQLUtils; + import java.io.PrintStream; import java.util.ArrayList; import java.util.List; import java.util.Map; -import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.SQLUtils; - public class TabledDataPrinter { + private static final int SQL_MAX_LEN = 32; + private static final int MAX_COL = 4; - private static final int SQL_MAX_LEN = 32; - private static final int MAX_COL = 4; - - private static final String[] sqlRowTitle = new String[] { "ID", "SQL", "ExecCount", "ExecTime", "ExecMax", "Txn", - "Error", "Update", "FetchRow", "Running", "Concurrent", "ExecRsHisto" }; + private static final String[] sqlRowTitle = new String[]{"ID", "SQL", "ExecCount", "ExecTime", "ExecMax", "Txn", + "Error", "Update", "FetchRow", "Running", "Concurrent", "ExecRsHisto"}; - private static final String[] sqlRowField = new String[] { "ID", "SQL", "ExecuteCount", "TotalTime", "MaxTimespan", + private static final String[] sqlRowField = new String[]{"ID", "SQL", "ExecuteCount", "TotalTime", "MaxTimespan", "InTransactionCount", "ErrorCount", "EffectedRowCount", "FetchRowCount", "RunningCount", "ConcurrentMax", - "ExecuteAndResultHoldTimeHistogram" }; + "ExecuteAndResultHoldTimeHistogram"}; - private static final String[] sqlColField = new String[] { "ID", "DataSource", "SQL", "ExecuteCount", "ErrorCount", + private static final String[] sqlColField = new String[]{"ID", "DataSource", "SQL", "ExecuteCount", "ErrorCount", "TotalTime", "LastTime", "MaxTimespan", "LastError", "EffectedRowCount", "FetchRowCount", "MaxTimespanOccurTime", "BatchSizeMax", "BatchSizeTotal", "ConcurrentMax", "RunningCount", "Name", "File", "LastErrorMessage", "LastErrorClass", "LastErrorStackTrace", "LastErrorTime", "DbType", "URL", "InTransactionCount", "Histogram", "LastSlowParameters", "ResultSetHoldTime", "ExecuteAndResultSetHoldTime", "FetchRowCountHistogram", "EffectedRowCountHistogram", - "ExecuteAndResultHoldTimeHistogram", "EffectedRowCountMax", "FetchRowCountMax", "ClobOpenCount" }; + "ExecuteAndResultHoldTimeHistogram", "EffectedRowCountMax", "FetchRowCountMax", "ClobOpenCount"}; - private static final String[] dsRowTitle = new String[] { "Identity", "DbType", "PoolingCount", "PoolingPeak", - "PoolingPeakTime", "ActiveCount", "ActivePeak", "ActivePeakTime", "ExecuteCount", "ErrorCount" }; + private static final String[] dsRowTitle = new String[]{"Identity", "DbType", "PoolingCount", "PoolingPeak", + "PoolingPeakTime", "ActiveCount", "ActivePeak", "ActivePeakTime", "ExecuteCount", "ErrorCount"}; - private static final String[] dsRowField = new String[] { "Identity", "DbType", "PoolingCount", "PoolingPeak", - "PoolingPeakTime", "ActiveCount", "ActivePeak", "ActivePeakTime", "ExecuteCount", "ErrorCount" }; + private static final String[] dsRowField = new String[]{"Identity", "DbType", "PoolingCount", "PoolingPeak", + "PoolingPeakTime", "ActiveCount", "ActivePeak", "ActivePeakTime", "ExecuteCount", "ErrorCount"}; - private static final String[] dsColField = new String[] { "Identity", "Name", "DbType", "DriverClassName", "URL", + private static final String[] dsColField = new String[]{"Identity", "Name", "DbType", "DriverClassName", "URL", "UserName", "FilterClassNames", "WaitThreadCount", "NotEmptyWaitCount", "NotEmptyWaitMillis", "PoolingCount", "PoolingPeak", "PoolingPeakTime", "ActiveCount", "ActivePeak", "ActivePeakTime", "InitialSize", "MinIdle", "MaxActive", "QueryTimeout", "TransactionQueryTimeout", "LoginTimeout", @@ -58,10 +57,10 @@ public class TabledDataPrinter { "LogicConnectCount", "LogicCloseCount", "LogicConnectErrorCount", "PhysicalConnectCount", "PhysicalCloseCount", "PhysicalConnectErrorCount", "ExecuteCount", "ErrorCount", "CommitCount", "RollbackCount", "PSCacheAccessCount", "PSCacheHitCount", "PSCacheMissCount", "StartTransactionCount", - "TransactionHistogram", "ConnectionHoldTimeHistogram", "RemoveAbandoned", "ClobOpenCount" }; + "TransactionHistogram", "ConnectionHoldTimeHistogram", "RemoveAbandoned", "ClobOpenCount"}; public static void printActiveConnStack(List> content, Option opt) { - PrintStream out = opt.getPrintStream(); + PrintStream out = opt.getPrintStream(); for (List stack : content) { for (String line : stack) { out.println(line); @@ -86,7 +85,7 @@ public static void printDataSourceData(List> content, Option } public static void _printDataSourceData(List> content, Option opt) { - PrintStream out = opt.getPrintStream(); + PrintStream out = opt.getPrintStream(); if (opt.getId() != -1) { List> matchedContent = new ArrayList>(); for (Map dsStat : content) { @@ -121,8 +120,7 @@ public static void printSqlData(List> content, Option opt) { } public static void _printSqlData(List> content, Option opt) { - - PrintStream out = opt.getPrintStream(); + PrintStream out = opt.getPrintStream(); if (opt.getId() != -1) { List> matchedContent = new ArrayList>(); for (Map sqlStat : content) { @@ -149,7 +147,6 @@ public static void _printSqlData(List> content, Option opt) } public static String getFormattedOutput(List> content, String[] title, String[] rowField) { - List printContents = new ArrayList(); printContents.add(title); diff --git a/src/main/java/com/alibaba/druid/support/hibernate/DruidConnectionProvider.java b/src/main/java/com/alibaba/druid/support/hibernate/DruidConnectionProvider.java index 6863159d31..cf1cca1cdf 100644 --- a/src/main/java/com/alibaba/druid/support/hibernate/DruidConnectionProvider.java +++ b/src/main/java/com/alibaba/druid/support/hibernate/DruidConnectionProvider.java @@ -15,24 +15,22 @@ */ package com.alibaba.druid.support.hibernate; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Map; - +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidDataSourceFactory; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.Configurable; import org.hibernate.service.spi.Stoppable; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidDataSourceFactory; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Map; public class DruidConnectionProvider implements ConnectionProvider, Configurable, Stoppable { - private static final long serialVersionUID = 1026193803901107651L; - private DruidDataSource dataSource; + private DruidDataSource dataSource; - public DruidConnectionProvider(){ + public DruidConnectionProvider() { dataSource = new DruidDataSource(); } diff --git a/src/main/java/com/alibaba/druid/support/http/AbstractWebStatImpl.java b/src/main/java/com/alibaba/druid/support/http/AbstractWebStatImpl.java index adccaf2d36..3c18e161f8 100644 --- a/src/main/java/com/alibaba/druid/support/http/AbstractWebStatImpl.java +++ b/src/main/java/com/alibaba/druid/support/http/AbstractWebStatImpl.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.support.http; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import com.alibaba.druid.filter.stat.StatFilterContextListenerAdapter; import com.alibaba.druid.support.http.stat.WebAppStat; import com.alibaba.druid.support.http.stat.WebRequestStat; @@ -27,25 +23,29 @@ import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.DruidWebUtils; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + public class AbstractWebStatImpl { - private final static Log LOG = LogFactory.getLog(AbstractWebStatImpl.class); + private static final Log LOG = LogFactory.getLog(AbstractWebStatImpl.class); - public final static int DEFAULT_MAX_STAT_SESSION_COUNT = 1000 * 1; + public static final int DEFAULT_MAX_STAT_SESSION_COUNT = 1000 * 1; - protected WebAppStat webAppStat = null; + protected WebAppStat webAppStat; - protected boolean sessionStatEnable = true; - protected int sessionStatMaxCount = DEFAULT_MAX_STAT_SESSION_COUNT; - protected boolean createSession = false; - protected boolean profileEnable = false; + protected boolean sessionStatEnable = true; + protected int sessionStatMaxCount = DEFAULT_MAX_STAT_SESSION_COUNT; + protected boolean createSession; + protected boolean profileEnable; - protected String contextPath; + protected String contextPath; - protected String principalSessionName; - protected String principalCookieName; - protected String realIpHeader; + protected String principalSessionName; + protected String principalCookieName; + protected String realIpHeader; - protected WebStatFilterContextListener statFilterContextListener = new WebStatFilterContextListener(); + protected WebStatFilterContextListener statFilterContextListener = new WebStatFilterContextListener(); public boolean isSessionStatEnable() { return sessionStatEnable; @@ -200,7 +200,6 @@ public String getPrincipal(HttpServletRequest httpRequest) { } public class WebStatFilterContextListener extends StatFilterContextListenerAdapter { - @Override public void addUpdateCount(int updateCount) { WebRequestStat reqStat = WebRequestStat.current(); diff --git a/src/main/java/com/alibaba/druid/support/http/MonitorClientContextListener.java b/src/main/java/com/alibaba/druid/support/http/MonitorClientContextListener.java index 69c560c786..e19ce11a03 100644 --- a/src/main/java/com/alibaba/druid/support/http/MonitorClientContextListener.java +++ b/src/main/java/com/alibaba/druid/support/http/MonitorClientContextListener.java @@ -15,13 +15,12 @@ */ package com.alibaba.druid.support.http; +import com.alibaba.druid.support.monitor.MonitorClient; + import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import com.alibaba.druid.support.monitor.MonitorClient; - public class MonitorClientContextListener implements ServletContextListener { - private MonitorClient client; @Override diff --git a/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java b/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java index 0093060d4a..bafde3fa28 100644 --- a/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java +++ b/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java @@ -15,9 +15,12 @@ */ package com.alibaba.druid.support.http; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; +import com.alibaba.druid.support.http.util.IPAddress; +import com.alibaba.druid.support.http.util.IPRange; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import com.alibaba.druid.util.StringUtils; +import com.alibaba.druid.util.Utils; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -25,28 +28,24 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import com.alibaba.druid.support.http.util.IPAddress; -import com.alibaba.druid.support.http.util.IPRange; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.StringUtils; -import com.alibaba.druid.util.Utils; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; @SuppressWarnings("serial") public abstract class ResourceServlet extends HttpServlet { + private static final Log LOG = LogFactory.getLog(ResourceServlet.class); - private final static Log LOG = LogFactory.getLog(ResourceServlet.class); - - public static final String SESSION_USER_KEY = "druid-user"; + public static final String SESSION_USER_KEY = "druid-user"; public static final String PARAM_NAME_USERNAME = "loginUsername"; public static final String PARAM_NAME_PASSWORD = "loginPassword"; - public static final String PARAM_NAME_ALLOW = "allow"; - public static final String PARAM_NAME_DENY = "deny"; - public static final String PARAM_REMOTE_ADDR = "remoteAddress"; + public static final String PARAM_NAME_ALLOW = "allow"; + public static final String PARAM_NAME_DENY = "deny"; + public static final String PARAM_REMOTE_ADDR = "remoteAddress"; protected final ResourceHandler handler; - public ResourceServlet(String resourcePath){ + public ResourceServlet(String resourcePath) { handler = new ResourceHandler(resourcePath); } @@ -128,7 +127,6 @@ protected void returnResourceFile(String fileName, String uri, HttpServletRespon public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String servletPath = request.getServletPath(); handler.service(request, response, servletPath, new ProcessCallback() { - @Override public String process(String url) { return ResourceServlet.this.process(url); @@ -163,15 +161,15 @@ public static interface ProcessCallback { } public static class ResourceHandler { - protected String username = null; - protected String password = null; + protected String username; + protected String password; protected List allowList = new ArrayList(); protected List denyList = new ArrayList(); protected String resourcePath; - protected String remoteAddressHeader = null; + protected String remoteAddressHeader; public ResourceHandler(String resourcePath) { this.resourcePath = resourcePath; @@ -180,7 +178,6 @@ public ResourceHandler(String resourcePath) { protected void returnResourceFile(String fileName, String uri, HttpServletResponse response) throws ServletException, IOException { - String filePath = getFilePath(fileName); if (filePath.endsWith(".html")) { @@ -215,7 +212,7 @@ protected String getFilePath(String fileName) { public boolean checkLoginParam(HttpServletRequest request) { String usernameParam = request.getParameter(PARAM_NAME_USERNAME); String passwordParam = request.getParameter(PARAM_NAME_PASSWORD); - if(null == username || null == password){ + if (null == username || null == password) { return false; } else if (username.equals(usernameParam) && password.equals(passwordParam)) { return true; @@ -279,10 +276,11 @@ public boolean isPermittedRequest(String remoteAddress) { return true; } - public void service(HttpServletRequest request - , HttpServletResponse response - , String servletPath - , ProcessCallback processCallback + public void service( + HttpServletRequest request, + HttpServletResponse response, + String servletPath, + ProcessCallback processCallback ) throws ServletException, IOException { String contextPath = request.getContextPath(); String requestURI = request.getRequestURI(); @@ -351,6 +349,5 @@ public void service(HttpServletRequest request returnResourceFile(path, uri, response); } - } } diff --git a/src/main/java/com/alibaba/druid/support/http/StatViewFilter.java b/src/main/java/com/alibaba/druid/support/http/StatViewFilter.java index 38edb58640..6037235fcb 100644 --- a/src/main/java/com/alibaba/druid/support/http/StatViewFilter.java +++ b/src/main/java/com/alibaba/druid/support/http/StatViewFilter.java @@ -24,13 +24,14 @@ import javax.servlet.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import java.io.IOException; import static com.alibaba.druid.support.http.ResourceServlet.*; public class StatViewFilter implements Filter { - public final static String PARAM_NAME_PATH = "path"; - private final static Log LOG = LogFactory.getLog(StatViewFilter.class); + public static final String PARAM_NAME_PATH = "path"; + private static final Log LOG = LogFactory.getLog(StatViewFilter.class); private String servletPath = "/druid"; private String resourcePath = "support/http/resources"; @@ -107,7 +108,9 @@ public void init(FilterConfig config) throws ServletException { } @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + public void doFilter(ServletRequest request, + ServletResponse response, + FilterChain chain) throws IOException, ServletException { HttpServletRequest httpReq = (HttpServletRequest) request; HttpServletResponse httpResp = (HttpServletResponse) response; String contextPath = ((HttpServletRequest) request).getContextPath(); @@ -130,6 +133,5 @@ public String process(String url) { @Override public void destroy() { - } } diff --git a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java index 7d3a88e7e8..61e6dec521 100644 --- a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java +++ b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java @@ -15,9 +15,9 @@ */ package com.alibaba.druid.support.http; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; +import com.alibaba.druid.stat.DruidStatService; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -28,38 +28,43 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.alibaba.druid.stat.DruidStatService; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; /** * 注意：避免直接调用Druid相关对象例如DruidDataSource等，相关调用要到DruidStatManagerFacade里用反射实现 - * + * * @author sandzhang[sandzhangtoo@gmail.com] */ public class StatViewServlet extends ResourceServlet { + private static final Log LOG = LogFactory.getLog(StatViewServlet.class); - private final static Log LOG = LogFactory.getLog(StatViewServlet.class); - - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - public static final String PARAM_NAME_RESET_ENABLE = "resetEnable"; + public static final String PARAM_NAME_RESET_ENABLE = "resetEnable"; - public static final String PARAM_NAME_JMX_URL = "jmxUrl"; - public static final String PARAM_NAME_JMX_USERNAME = "jmxUsername"; - public static final String PARAM_NAME_JMX_PASSWORD = "jmxPassword"; + public static final String PARAM_NAME_JMX_URL = "jmxUrl"; + public static final String PARAM_NAME_JMX_USERNAME = "jmxUsername"; + public static final String PARAM_NAME_JMX_PASSWORD = "jmxPassword"; - private DruidStatService statService = DruidStatService.getInstance(); + private DruidStatService statService = DruidStatService.getInstance(); - /** web.xml中配置的jmx的连接地址 */ - private String jmxUrl = null; - /** web.xml中配置的jmx的用户名 */ - private String jmxUsername = null; - /** web.xml中配置的jmx的密码 */ - private String jmxPassword = null; - private MBeanServerConnection conn = null; + /** + * web.xml中配置的jmx的连接地址 + */ + private String jmxUrl; + /** + * web.xml中配置的jmx的用户名 + */ + private String jmxUsername; + /** + * web.xml中配置的jmx的密码 + */ + private String jmxPassword; + private MBeanServerConnection conn; - public StatViewServlet(){ + public StatViewServlet() { super("support/http/resources"); } @@ -95,7 +100,7 @@ public void init() throws ServletException { /** * 读取servlet中的配置参数. - * + * * @param key 配置参数名 * @return 配置参数值，如果不存在当前配置参数，或者为配置参数长度为0，将返回null */ @@ -118,7 +123,7 @@ private String readInitParam(String key) { /** * 初始化jmx连接 - * + * * @throws IOException */ private void initJmxConn() throws IOException { @@ -127,7 +132,7 @@ private void initJmxConn() throws IOException { Map env = null; if (jmxUsername != null) { env = new HashMap(); - String[] credentials = new String[] { jmxUsername, jmxPassword }; + String[] credentials = new String[]{jmxUsername, jmxPassword}; env.put(JMXConnector.CREDENTIALS, credentials); } JMXConnector jmxc = JMXConnectorFactory.connect(url, env); @@ -137,24 +142,24 @@ private void initJmxConn() throws IOException { /** * 根据指定的url来获取jmx服务返回的内容. - * + * * @param connetion jmx连接 - * @param url url内容 + * @param url url内容 * @return the jmx返回的内容 * @throws Exception the exception */ private String getJmxResult(MBeanServerConnection connetion, String url) throws Exception { ObjectName name = new ObjectName(DruidStatService.MBEAN_NAME); - String result = (String) conn.invoke(name, "service", new String[] { url }, - new String[] { String.class.getName() }); + String result = (String) conn.invoke(name, "service", new String[]{url}, + new String[]{String.class.getName()}); return result; } /** * 程序首先判断是否存在jmx连接地址，如果不存在，则直接调用本地的druid服务； 如果存在，则调用远程jmx服务。在进行jmx通信，首先判断一下jmx连接是否已经建立成功，如果已经 * 建立成功，则直接进行通信，如果之前没有成功建立，则会尝试重新建立一遍。. - * + * * @param url 要连接的服务地址 * @return 调用服务后返回的json字符串 */ @@ -163,30 +168,34 @@ protected String process(String url) { if (jmxUrl == null) { resp = statService.service(url); } else { - if (conn == null) {// 连接在初始化时创建失败 - try {// 尝试重新连接 + if (conn == null) { + // 连接在初始化时创建失败 + try { + // 尝试重新连接 initJmxConn(); } catch (IOException e) { LOG.error("init jmx connection error", e); resp = DruidStatService.returnJSONResult(DruidStatService.RESULT_CODE_ERROR, - "init jmx connection error" + e.getMessage()); + "init jmx connection error" + e.getMessage()); } - if (conn != null) {// 连接成功 + if (conn != null) { + // 连接成功 try { resp = getJmxResult(conn, url); } catch (Exception e) { LOG.error("get jmx data error", e); resp = DruidStatService.returnJSONResult(DruidStatService.RESULT_CODE_ERROR, "get data error:" - + e.getMessage()); + + e.getMessage()); } } - } else {// 连接成功 + } else { + // 连接成功 try { resp = getJmxResult(conn, url); } catch (Exception e) { LOG.error("get jmx data error", e); resp = DruidStatService.returnJSONResult(DruidStatService.RESULT_CODE_ERROR, - "get data error" + e.getMessage()); + "get data error" + e.getMessage()); } } } diff --git a/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java b/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java index 13957ac9d5..c6f8e0cb8d 100644 --- a/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java +++ b/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java @@ -15,28 +15,8 @@ */ package com.alibaba.druid.support.http; -import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; - import com.alibaba.druid.filter.stat.StatFilterContext; -import com.alibaba.druid.support.http.stat.WebAppStat; -import com.alibaba.druid.support.http.stat.WebAppStatManager; -import com.alibaba.druid.support.http.stat.WebRequestStat; -import com.alibaba.druid.support.http.stat.WebSessionStat; -import com.alibaba.druid.support.http.stat.WebURIStat; +import com.alibaba.druid.support.http.stat.*; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.support.profile.ProfileEntryKey; @@ -46,34 +26,44 @@ import com.alibaba.druid.util.PatternMatcher; import com.alibaba.druid.util.ServletPathMatcher; +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponseWrapper; + +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + /** * 用于配置Web和Druid数据源之间的管理关联监控统计 - * + * * @author wenshao [szujobs@htomail.com] * @author Zhangming Qi [qizhanming@gmail.com] */ public class WebStatFilter extends AbstractWebStatImpl implements Filter { + private static final Log LOG = LogFactory.getLog(WebStatFilter.class); - private final static Log LOG = LogFactory.getLog(WebStatFilter.class); - - public final static String PARAM_NAME_PROFILE_ENABLE = "profileEnable"; - public final static String PARAM_NAME_SESSION_STAT_ENABLE = "sessionStatEnable"; - public final static String PARAM_NAME_SESSION_STAT_MAX_COUNT = "sessionStatMaxCount"; - public static final String PARAM_NAME_EXCLUSIONS = "exclusions"; + public static final String PARAM_NAME_PROFILE_ENABLE = "profileEnable"; + public static final String PARAM_NAME_SESSION_STAT_ENABLE = "sessionStatEnable"; + public static final String PARAM_NAME_SESSION_STAT_MAX_COUNT = "sessionStatMaxCount"; + public static final String PARAM_NAME_EXCLUSIONS = "exclusions"; public static final String PARAM_NAME_PRINCIPAL_SESSION_NAME = "principalSessionName"; - public static final String PARAM_NAME_PRINCIPAL_COOKIE_NAME = "principalCookieName"; - public static final String PARAM_NAME_REAL_IP_HEADER = "realIpHeader"; + public static final String PARAM_NAME_PRINCIPAL_COOKIE_NAME = "principalCookieName"; + public static final String PARAM_NAME_REAL_IP_HEADER = "realIpHeader"; /** * PatternMatcher used in determining which paths to react to for a given request. */ - protected PatternMatcher pathMatcher = new ServletPathMatcher(); + protected PatternMatcher pathMatcher = new ServletPathMatcher(); - private Set excludesPattern; + private Set excludesPattern; @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, - ServletException { + ServletException { HttpServletRequest httpRequest = (HttpServletRequest) request; HttpServletResponse httpResponse = (HttpServletResponse) response; StatHttpServletResponseWrapper responseWrapper = new StatHttpServletResponseWrapper(httpResponse); @@ -315,11 +305,11 @@ public WebStatFilterContextListener getStatFilterContextListener() { return statFilterContextListener; } - public final static class StatHttpServletResponseWrapper extends HttpServletResponseWrapper implements HttpServletResponse { + public static final class StatHttpServletResponseWrapper extends HttpServletResponseWrapper implements HttpServletResponse { //初始值应该设置为：HttpServletResponse.SC_OK，而不是 0。 private int status = HttpServletResponse.SC_OK; - public StatHttpServletResponseWrapper(HttpServletResponse response){ + public StatHttpServletResponseWrapper(HttpServletResponse response) { super(response); } diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java index 8f49397b73..52a26fd786 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java @@ -15,7 +15,9 @@ */ package com.alibaba.druid.support.http.stat; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import com.alibaba.druid.util.LRUCache; import java.util.ArrayList; import java.util.Iterator; @@ -29,108 +31,105 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.LRUCache; +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; public class WebAppStat { - - private final static Log LOG = LogFactory.getLog(WebAppStat.class); - - public final static int DEFAULT_MAX_STAT_URI_COUNT = 1000; - public final static int DEFAULT_MAX_STAT_SESSION_COUNT = 1000; - - private final static ThreadLocal currentLocal = new ThreadLocal(); - - private volatile int maxStatUriCount = DEFAULT_MAX_STAT_URI_COUNT; - private volatile int maxStatSessionCount = DEFAULT_MAX_STAT_SESSION_COUNT; - - private final AtomicInteger runningCount = new AtomicInteger(); - private final AtomicInteger concurrentMax = new AtomicInteger(); - private final AtomicLong requestCount = new AtomicLong(0); - private final AtomicLong sessionCount = new AtomicLong(0); - - private final AtomicLong jdbcFetchRowCount = new AtomicLong(); - private final AtomicLong jdbcUpdateCount = new AtomicLong(); - private final AtomicLong jdbcExecuteCount = new AtomicLong(); - private final AtomicLong jdbcExecuteTimeNano = new AtomicLong(); - - private final AtomicLong jdbcCommitCount = new AtomicLong(); - private final AtomicLong jdbcRollbackCount = new AtomicLong(); - - private final ConcurrentMap uriStatMap = new ConcurrentHashMap( - 16, - 0.75f, - 1); - private final LRUCache sessionStatMap; - - private final ReadWriteLock sessionStatLock = new ReentrantReadWriteLock(); - - private final AtomicLong uriStatMapFullCount = new AtomicLong(); - private final AtomicLong uriSessionMapFullCount = new AtomicLong(); - - private final AtomicLong osMacOSXCount = new AtomicLong(0); - private final AtomicLong osWindowsCount = new AtomicLong(0); - private final AtomicLong osLinuxCount = new AtomicLong(0); - private final AtomicLong osSymbianCount = new AtomicLong(0); - private final AtomicLong osFreeBSDCount = new AtomicLong(0); - private final AtomicLong osOpenBSDCount = new AtomicLong(0); - private final AtomicLong osAndroidCount = new AtomicLong(0); - - private final AtomicLong osWindows98Count = new AtomicLong(); - private final AtomicLong osWindowsXPCount = new AtomicLong(); - private final AtomicLong osWindows2000Count = new AtomicLong(); - private final AtomicLong osWindowsVistaCount = new AtomicLong(); - private final AtomicLong osWindows7Count = new AtomicLong(); - private final AtomicLong osWindows8Count = new AtomicLong(); - - private final AtomicLong osAndroid15Count = new AtomicLong(0); - private final AtomicLong osAndroid16Count = new AtomicLong(0); - private final AtomicLong osAndroid20Count = new AtomicLong(0); - private final AtomicLong osAndroid21Count = new AtomicLong(0); - private final AtomicLong osAndroid22Count = new AtomicLong(0); - private final AtomicLong osAndroid23Count = new AtomicLong(0); - private final AtomicLong osAndroid30Count = new AtomicLong(0); - private final AtomicLong osAndroid31Count = new AtomicLong(0); - private final AtomicLong osAndroid32Count = new AtomicLong(0); - private final AtomicLong osAndroid40Count = new AtomicLong(0); - private final AtomicLong osAndroid41Count = new AtomicLong(0); - private final AtomicLong osAndroid42Count = new AtomicLong(0); - private final AtomicLong osAndroid43Count = new AtomicLong(0); - - private final AtomicLong osLinuxUbuntuCount = new AtomicLong(0); - - private final AtomicLong browserIECount = new AtomicLong(0); - private final AtomicLong browserFirefoxCount = new AtomicLong(0); - private final AtomicLong browserChromeCount = new AtomicLong(0); - private final AtomicLong browserSafariCount = new AtomicLong(0); - private final AtomicLong browserOperaCount = new AtomicLong(0); - - private final AtomicLong browserIE5Count = new AtomicLong(0); - private final AtomicLong browserIE6Count = new AtomicLong(0); - private final AtomicLong browserIE7Count = new AtomicLong(0); - private final AtomicLong browserIE8Count = new AtomicLong(0); - private final AtomicLong browserIE9Count = new AtomicLong(0); - private final AtomicLong browserIE10Count = new AtomicLong(0); - - private final AtomicLong browser360SECount = new AtomicLong(0); - - private final AtomicLong deviceAndroidCount = new AtomicLong(0); - private final AtomicLong deviceIpadCount = new AtomicLong(0); - private final AtomicLong deviceIphoneCount = new AtomicLong(0); - private final AtomicLong deviceWindowsPhoneCount = new AtomicLong(0); - - private final AtomicLong botCount = new AtomicLong(); - private final AtomicLong botBaiduCount = new AtomicLong(); - private final AtomicLong botYoudaoCount = new AtomicLong(); - private final AtomicLong botGoogleCount = new AtomicLong(); - private final AtomicLong botMsnCount = new AtomicLong(); - private final AtomicLong botBingCount = new AtomicLong(); - private final AtomicLong botSosoCount = new AtomicLong(); - private final AtomicLong botSogouCount = new AtomicLong(); - private final AtomicLong botYahooCount = new AtomicLong(); - - private String contextPath; + private static final Log LOG = LogFactory.getLog(WebAppStat.class); + + public static final int DEFAULT_MAX_STAT_URI_COUNT = 1000; + public static final int DEFAULT_MAX_STAT_SESSION_COUNT = 1000; + + private static final ThreadLocal currentLocal = new ThreadLocal(); + + private volatile int maxStatUriCount = DEFAULT_MAX_STAT_URI_COUNT; + private volatile int maxStatSessionCount = DEFAULT_MAX_STAT_SESSION_COUNT; + + private final AtomicInteger runningCount = new AtomicInteger(); + private final AtomicInteger concurrentMax = new AtomicInteger(); + private final AtomicLong requestCount = new AtomicLong(0); + private final AtomicLong sessionCount = new AtomicLong(0); + + private final AtomicLong jdbcFetchRowCount = new AtomicLong(); + private final AtomicLong jdbcUpdateCount = new AtomicLong(); + private final AtomicLong jdbcExecuteCount = new AtomicLong(); + private final AtomicLong jdbcExecuteTimeNano = new AtomicLong(); + + private final AtomicLong jdbcCommitCount = new AtomicLong(); + private final AtomicLong jdbcRollbackCount = new AtomicLong(); + + private final ConcurrentMap uriStatMap = new ConcurrentHashMap( + 16, + 0.75f, + 1); + private final LRUCache sessionStatMap; + + private final ReadWriteLock sessionStatLock = new ReentrantReadWriteLock(); + + private final AtomicLong uriStatMapFullCount = new AtomicLong(); + private final AtomicLong uriSessionMapFullCount = new AtomicLong(); + + private final AtomicLong osMacOSXCount = new AtomicLong(0); + private final AtomicLong osWindowsCount = new AtomicLong(0); + private final AtomicLong osLinuxCount = new AtomicLong(0); + private final AtomicLong osSymbianCount = new AtomicLong(0); + private final AtomicLong osFreeBSDCount = new AtomicLong(0); + private final AtomicLong osOpenBSDCount = new AtomicLong(0); + private final AtomicLong osAndroidCount = new AtomicLong(0); + + private final AtomicLong osWindows98Count = new AtomicLong(); + private final AtomicLong osWindowsXPCount = new AtomicLong(); + private final AtomicLong osWindows2000Count = new AtomicLong(); + private final AtomicLong osWindowsVistaCount = new AtomicLong(); + private final AtomicLong osWindows7Count = new AtomicLong(); + private final AtomicLong osWindows8Count = new AtomicLong(); + + private final AtomicLong osAndroid15Count = new AtomicLong(0); + private final AtomicLong osAndroid16Count = new AtomicLong(0); + private final AtomicLong osAndroid20Count = new AtomicLong(0); + private final AtomicLong osAndroid21Count = new AtomicLong(0); + private final AtomicLong osAndroid22Count = new AtomicLong(0); + private final AtomicLong osAndroid23Count = new AtomicLong(0); + private final AtomicLong osAndroid30Count = new AtomicLong(0); + private final AtomicLong osAndroid31Count = new AtomicLong(0); + private final AtomicLong osAndroid32Count = new AtomicLong(0); + private final AtomicLong osAndroid40Count = new AtomicLong(0); + private final AtomicLong osAndroid41Count = new AtomicLong(0); + private final AtomicLong osAndroid42Count = new AtomicLong(0); + private final AtomicLong osAndroid43Count = new AtomicLong(0); + + private final AtomicLong osLinuxUbuntuCount = new AtomicLong(0); + + private final AtomicLong browserIECount = new AtomicLong(0); + private final AtomicLong browserFirefoxCount = new AtomicLong(0); + private final AtomicLong browserChromeCount = new AtomicLong(0); + private final AtomicLong browserSafariCount = new AtomicLong(0); + private final AtomicLong browserOperaCount = new AtomicLong(0); + + private final AtomicLong browserIE5Count = new AtomicLong(0); + private final AtomicLong browserIE6Count = new AtomicLong(0); + private final AtomicLong browserIE7Count = new AtomicLong(0); + private final AtomicLong browserIE8Count = new AtomicLong(0); + private final AtomicLong browserIE9Count = new AtomicLong(0); + private final AtomicLong browserIE10Count = new AtomicLong(0); + + private final AtomicLong browser360SECount = new AtomicLong(0); + + private final AtomicLong deviceAndroidCount = new AtomicLong(0); + private final AtomicLong deviceIpadCount = new AtomicLong(0); + private final AtomicLong deviceIphoneCount = new AtomicLong(0); + private final AtomicLong deviceWindowsPhoneCount = new AtomicLong(0); + + private final AtomicLong botCount = new AtomicLong(); + private final AtomicLong botBaiduCount = new AtomicLong(); + private final AtomicLong botYoudaoCount = new AtomicLong(); + private final AtomicLong botGoogleCount = new AtomicLong(); + private final AtomicLong botMsnCount = new AtomicLong(); + private final AtomicLong botBingCount = new AtomicLong(); + private final AtomicLong botSosoCount = new AtomicLong(); + private final AtomicLong botSogouCount = new AtomicLong(); + private final AtomicLong botYahooCount = new AtomicLong(); + + private String contextPath; public static WebAppStat current() { return currentLocal.get(); @@ -217,15 +216,15 @@ public void reset() { deviceWindowsPhoneCount.set(0); } - public WebAppStat(){ + public WebAppStat() { this(null); } - public WebAppStat(String contextPath){ + public WebAppStat(String contextPath) { this(contextPath, DEFAULT_MAX_STAT_SESSION_COUNT); } - public WebAppStat(String contextPath, int maxStatSessionCount){ + public WebAppStat(String contextPath, int maxStatSessionCount) { this.contextPath = contextPath; this.maxStatSessionCount = maxStatSessionCount; @@ -241,7 +240,7 @@ public void beforeInvoke() { int running = runningCount.incrementAndGet(); - for (;;) { + for (; ; ) { int max = concurrentMax.get(); if (running > max) { if (concurrentMax.compareAndSet(max, running)) { @@ -466,19 +465,19 @@ public long getRequestCount() { public Map getStatData() { return getStatValue(false).getStatData(); } - + public List getURIStatValueList(boolean reset) { List list = new ArrayList(this.uriStatMap.size()); - + for (WebURIStat uriStat : this.uriStatMap.values()) { WebURIStatValue statValue = uriStat.getValue(reset); - + if (statValue.getRunningCount() == 0 && statValue.getRequestCount() == 0) { continue; } list.add(statValue); } - + return list; } @@ -554,7 +553,6 @@ public void computeUserAgent(String userAgent) { } if (isIE) { - browserIECount.incrementAndGet(); char v1 = ' ', v2 = ' '; diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatManager.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatManager.java index 5ddca3daa6..60cdb7d9b8 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatManager.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatManager.java @@ -15,28 +15,23 @@ */ package com.alibaba.druid.support.http.stat; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.CopyOnWriteArraySet; - import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.util.StringUtils; -public class WebAppStatManager { +import java.util.*; +import java.util.concurrent.CopyOnWriteArraySet; - public final static String SYS_PROP_INSTANCES = "druid.web.webAppStat"; +public class WebAppStatManager { + public static final String SYS_PROP_INSTANCES = "druid.web.webAppStat"; - private final static WebAppStatManager instance = new WebAppStatManager(); + private static final WebAppStatManager instance = new WebAppStatManager(); - private Set webAppStatSet = null; + private Set webAppStatSet; public static WebAppStatManager getInstance() { return instance; } - + public synchronized WebAppStat getWebAppStat(String contextPath) { Set stats = getWebAppStatSet(); for (Object item : stats) { @@ -47,7 +42,7 @@ public synchronized WebAppStat getWebAppStat(String contextPath) { } } } - + WebAppStat stat = new WebAppStat(contextPath); this.addWebAppStatSet(stat); return stat; @@ -58,7 +53,7 @@ public Set getWebAppStatSet() { if (DruidDataSourceStatManager.isRegisterToSystemProperty()) { webAppStatSet = getWebAppStatSet0(); } else { - webAppStatSet = new CopyOnWriteArraySet(); + webAppStatSet = new CopyOnWriteArraySet(); } } @@ -103,7 +98,7 @@ public List> getSessionStatData() { return allAppUriStatDataList; } - + public Map getSessionStat(String sessionId) { Set stats = getWebAppStatSet(); @@ -113,20 +108,20 @@ public Map getSessionStat(String sessionId) { return statData; } } - + return null; } - + public Map getURIStatData(String uri) { Set stats = getWebAppStatSet(); - + for (Object stat : stats) { Map statData = WebAppStatUtils.getURIStatData(stat, uri); if (statData != null) { return statData; } } - + return null; } diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatUtils.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatUtils.java index 9e53240722..ebc08b4f47 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatUtils.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatUtils.java @@ -15,16 +15,15 @@ */ package com.alibaba.druid.support.http.stat; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; + import java.lang.reflect.Method; import java.util.List; import java.util.Map; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; - public class WebAppStatUtils { - - private final static Log LOG = LogFactory.getLog(WebAppStatUtils.class); + private static final Log LOG = LogFactory.getLog(WebAppStatUtils.class); @SuppressWarnings("unchecked") public static Map getStatData(Object webStat) { @@ -73,13 +72,13 @@ public static List> getSessionStatDataList(Object webStat) { return null; } } - + @SuppressWarnings("unchecked") public static Map getSessionStatData(Object webStat, String sessionId) { if (webStat.getClass() == WebAppStat.class) { return ((WebAppStat) webStat).getSessionStatData(sessionId); } - + try { Method method = webStat.getClass().getMethod("getSessionStatData", String.class); Object obj = method.invoke(webStat, sessionId); @@ -89,13 +88,13 @@ public static Map getSessionStatData(Object webStat, String sess return null; } } - + @SuppressWarnings("unchecked") public static Map getURIStatData(Object webStat, String uri) { if (webStat.getClass() == WebAppStat.class) { return ((WebAppStat) webStat).getURIStatData(uri); } - + try { Method method = webStat.getClass().getMethod("getURIStatData", String.class); Object obj = method.invoke(webStat, uri); diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatValue.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatValue.java index 7c82887cad..bc2117dd9d 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatValue.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStatValue.java @@ -15,170 +15,169 @@ */ package com.alibaba.druid.support.http.stat; -import java.util.LinkedHashMap; -import java.util.Map; - import com.alibaba.druid.support.monitor.annotation.AggregateType; import com.alibaba.druid.support.monitor.annotation.MField; import com.alibaba.druid.support.monitor.annotation.MTable; +import java.util.LinkedHashMap; +import java.util.Map; + @MTable(name = "druid_webapp") public class WebAppStatValue { - - @MField(groupBy = true, aggregate=AggregateType.None) + @MField(groupBy = true, aggregate = AggregateType.None) String contextPath; @MField(aggregate = AggregateType.Last) - int runningCount; + int runningCount; @MField(aggregate = AggregateType.Max) - int concurrentMax; + int concurrentMax; @MField(aggregate = AggregateType.Sum) - long requestCount; + long requestCount; @MField(aggregate = AggregateType.Last) - long sessionCount; + long sessionCount; @MField(aggregate = AggregateType.Sum) - long jdbcFetchRowCount; + long jdbcFetchRowCount; @MField(aggregate = AggregateType.Sum) - long jdbcUpdateCount; + long jdbcUpdateCount; @MField(aggregate = AggregateType.Sum) - long jdbcExecuteCount; + long jdbcExecuteCount; @MField(aggregate = AggregateType.Sum) - long jdbcExecuteTimeNano; + long jdbcExecuteTimeNano; @MField(aggregate = AggregateType.Sum) - long jdbcCommitCount; + long jdbcCommitCount; @MField(aggregate = AggregateType.Sum) - long jdbcRollbackCount; + long jdbcRollbackCount; @MField(aggregate = AggregateType.Sum) - long osMacOSXCount; + long osMacOSXCount; @MField(aggregate = AggregateType.Sum) - long osWindowsCount; + long osWindowsCount; @MField(aggregate = AggregateType.Sum) - long osLinuxCount; + long osLinuxCount; @MField(aggregate = AggregateType.Sum) - long osSymbianCount; + long osSymbianCount; @MField(aggregate = AggregateType.Sum) - long osFreeBSDCount; + long osFreeBSDCount; @MField(aggregate = AggregateType.Sum) - long osOpenBSDCount; + long osOpenBSDCount; @MField(aggregate = AggregateType.Sum) - long osAndroidCount; + long osAndroidCount; @MField(aggregate = AggregateType.Sum) - long osWindows98Count; + long osWindows98Count; @MField(aggregate = AggregateType.Sum) - long osWindowsXPCount; + long osWindowsXPCount; @MField(aggregate = AggregateType.Sum) - long osWindows2000Count; + long osWindows2000Count; @MField(aggregate = AggregateType.Sum) - long osWindowsVistaCount; + long osWindowsVistaCount; @MField(aggregate = AggregateType.Sum) - long osWindows7Count; + long osWindows7Count; @MField(aggregate = AggregateType.Sum) - long osWindows8Count; + long osWindows8Count; @MField(aggregate = AggregateType.Sum) - long osAndroid15Count; + long osAndroid15Count; @MField(aggregate = AggregateType.Sum) - long osAndroid16Count; + long osAndroid16Count; @MField(aggregate = AggregateType.Sum) - long osAndroid20Count; + long osAndroid20Count; @MField(aggregate = AggregateType.Sum) - long osAndroid21Count; + long osAndroid21Count; @MField(aggregate = AggregateType.Sum) - long osAndroid22Count; + long osAndroid22Count; @MField(aggregate = AggregateType.Sum) - long osAndroid23Count; + long osAndroid23Count; @MField(aggregate = AggregateType.Sum) - long osAndroid30Count; + long osAndroid30Count; @MField(aggregate = AggregateType.Sum) - long osAndroid31Count; + long osAndroid31Count; @MField(aggregate = AggregateType.Sum) - long osAndroid32Count; + long osAndroid32Count; @MField(aggregate = AggregateType.Sum) - long osAndroid40Count; + long osAndroid40Count; @MField(aggregate = AggregateType.Sum) - long osAndroid41Count; + long osAndroid41Count; @MField(aggregate = AggregateType.Sum) - long osAndroid42Count; + long osAndroid42Count; @MField(aggregate = AggregateType.Sum) - long osAndroid43Count; + long osAndroid43Count; @MField(aggregate = AggregateType.Sum) - long osLinuxUbuntuCount; + long osLinuxUbuntuCount; @MField(aggregate = AggregateType.Sum) - long browserIECount; + long browserIECount; @MField(aggregate = AggregateType.Sum) - long browserFirefoxCount; + long browserFirefoxCount; @MField(aggregate = AggregateType.Sum) - long browserChromeCount; + long browserChromeCount; @MField(aggregate = AggregateType.Sum) - long browserSafariCount; + long browserSafariCount; @MField(aggregate = AggregateType.Sum) - long browserOperaCount; + long browserOperaCount; @MField(aggregate = AggregateType.Sum) - long browserIE5Count; + long browserIE5Count; @MField(aggregate = AggregateType.Sum) - long browserIE6Count; + long browserIE6Count; @MField(aggregate = AggregateType.Sum) - long browserIE7Count; + long browserIE7Count; @MField(aggregate = AggregateType.Sum) - long browserIE8Count; + long browserIE8Count; @MField(aggregate = AggregateType.Sum) - long browserIE9Count; + long browserIE9Count; @MField(aggregate = AggregateType.Sum) - long browserIE10Count; + long browserIE10Count; @MField(aggregate = AggregateType.Sum) - long browser360SECount; + long browser360SECount; @MField(aggregate = AggregateType.Sum) - long deviceAndroidCount; + long deviceAndroidCount; @MField(aggregate = AggregateType.Sum) - long deviceIpadCount; + long deviceIpadCount; @MField(aggregate = AggregateType.Sum) - long deviceIphoneCount; + long deviceIphoneCount; @MField(aggregate = AggregateType.Sum) - long deviceWindowsPhoneCount; + long deviceWindowsPhoneCount; @MField(aggregate = AggregateType.Sum) - long botCount; + long botCount; @MField(aggregate = AggregateType.Sum) - long botBaiduCount; + long botBaiduCount; @MField(aggregate = AggregateType.Sum) - long botYoudaoCount; + long botYoudaoCount; @MField(aggregate = AggregateType.Sum) - long botGoogleCount; + long botGoogleCount; @MField(aggregate = AggregateType.Sum) - long botMsnCount; + long botMsnCount; @MField(aggregate = AggregateType.Sum) - long botBingCount; + long botBingCount; @MField(aggregate = AggregateType.Sum) - long botSosoCount; + long botSosoCount; @MField(aggregate = AggregateType.Sum) - long botSogouCount; + long botSogouCount; @MField(aggregate = AggregateType.Sum) - long botYahooCount; + long botYahooCount; public String getContextPath() { return contextPath; diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebRequestStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebRequestStat.java index a3ae0c8034..0b8ac764e2 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebRequestStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebRequestStat.java @@ -16,7 +16,6 @@ package com.alibaba.druid.support.http.stat; public class WebRequestStat { - private long startNano; private long startMillis; private long endNano; @@ -34,15 +33,14 @@ public class WebRequestStat { private long jdbcResultSetOpenCount; private long jdbcResultSetCloseCount; - public WebRequestStat(){ - + public WebRequestStat() { } - public WebRequestStat(long startNano){ + public WebRequestStat(long startNano) { this.startNano = startNano; } - public WebRequestStat(long startNano, long startMillis){ + public WebRequestStat(long startNano, long startMillis) { this.startNano = startNano; this.startMillis = startMillis; } diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStat.java index 6747f7bf76..c8af610877 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStat.java @@ -15,98 +15,97 @@ */ package com.alibaba.druid.support.http.stat; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; import java.util.Map; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; public class WebSessionStat { - - private final static Log LOG = LogFactory.getLog(WebSessionStat.class); - - private final String sessionId; - - private volatile int runningCount; - private volatile int concurrentMax; - final static AtomicIntegerFieldUpdater runningCountUpdater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, - "runningCount"); - final static AtomicIntegerFieldUpdater concurrentMaxUpdater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, - "concurrentMax"); - - private volatile long requestCount; - private volatile long requestErrorCount; - private volatile long requestTimeNano; - - final static AtomicLongFieldUpdater requestCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, - "requestCount"); - final static AtomicLongFieldUpdater requestErrorCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, - "requestErrorCount"); - final static AtomicLongFieldUpdater requestTimeNanoUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, - "requestTimeNano"); - - private volatile long jdbcFetchRowCount; - private volatile long jdbcUpdateCount; - private volatile long jdbcExecuteCount; - private volatile long jdbcExecuteTimeNano; - final static AtomicLongFieldUpdater jdbcFetchRowCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, - "jdbcFetchRowCount"); - final static AtomicLongFieldUpdater jdbcUpdateCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, - "jdbcUpdateCount"); - final static AtomicLongFieldUpdater jdbcExecuteCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, - "jdbcExecuteCount"); - final static AtomicLongFieldUpdater jdbcExecuteTimeNanoUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, - "jdbcExecuteTimeNano"); - - private volatile long jdbcCommitCount; - private volatile long jdbcRollbackCount; - final static AtomicLongFieldUpdater jdbcCommitCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, - "jdbcCommitCount"); - final static AtomicLongFieldUpdater jdbcRollbackCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, - "jdbcRollbackCount"); - - private long createTimeMillis = -1L; - private volatile long lastAccessTimeMillis = -1L; - - private String remoteAddresses; - - private String principal = null; - - private String userAgent; - - private volatile int requestIntervalHistogram_0_1; - private volatile int requestIntervalHistogram_1_10; - private volatile int requestIntervalHistogram_10_100; - private volatile int requestIntervalHistogram_100_1000; - private volatile int requestIntervalHistogram_1000_10000; - private volatile int requestIntervalHistogram_10000_100000; - private volatile int requestIntervalHistogram_100000_1000000; - private volatile int requestIntervalHistogram_1000000_10000000; - private volatile int requestIntervalHistogram_10000000_more; - - final static AtomicIntegerFieldUpdater requestIntervalHistogram_0_1_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, - "requestIntervalHistogram_0_1"); - final static AtomicIntegerFieldUpdater requestIntervalHistogram_1_10_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, - "requestIntervalHistogram_1_10"); - final static AtomicIntegerFieldUpdater requestIntervalHistogram_10_100_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, - "requestIntervalHistogram_10_100"); - final static AtomicIntegerFieldUpdater requestIntervalHistogram_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, - "requestIntervalHistogram_100_1000"); - final static AtomicIntegerFieldUpdater requestIntervalHistogram_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, - "requestIntervalHistogram_1000_10000"); - final static AtomicIntegerFieldUpdater requestIntervalHistogram_10000_100000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, - "requestIntervalHistogram_10000_100000"); - final static AtomicIntegerFieldUpdater requestIntervalHistogram_100000_1000000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, - "requestIntervalHistogram_100000_1000000"); - final static AtomicIntegerFieldUpdater requestIntervalHistogram_1000000_10000000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, - "requestIntervalHistogram_1000000_10000000"); - final static AtomicIntegerFieldUpdater requestIntervalHistogram_10000000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, - "requestIntervalHistogram_10000000_more"); - - public WebSessionStat(String sessionId){ + private static final Log LOG = LogFactory.getLog(WebSessionStat.class); + + private final String sessionId; + + private volatile int runningCount; + private volatile int concurrentMax; + static final AtomicIntegerFieldUpdater runningCountUpdater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, + "runningCount"); + static final AtomicIntegerFieldUpdater concurrentMaxUpdater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, + "concurrentMax"); + + private volatile long requestCount; + private volatile long requestErrorCount; + private volatile long requestTimeNano; + + static final AtomicLongFieldUpdater requestCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, + "requestCount"); + static final AtomicLongFieldUpdater requestErrorCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, + "requestErrorCount"); + static final AtomicLongFieldUpdater requestTimeNanoUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, + "requestTimeNano"); + + private volatile long jdbcFetchRowCount; + private volatile long jdbcUpdateCount; + private volatile long jdbcExecuteCount; + private volatile long jdbcExecuteTimeNano; + static final AtomicLongFieldUpdater jdbcFetchRowCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, + "jdbcFetchRowCount"); + static final AtomicLongFieldUpdater jdbcUpdateCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, + "jdbcUpdateCount"); + static final AtomicLongFieldUpdater jdbcExecuteCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, + "jdbcExecuteCount"); + static final AtomicLongFieldUpdater jdbcExecuteTimeNanoUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, + "jdbcExecuteTimeNano"); + + private volatile long jdbcCommitCount; + private volatile long jdbcRollbackCount; + static final AtomicLongFieldUpdater jdbcCommitCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, + "jdbcCommitCount"); + static final AtomicLongFieldUpdater jdbcRollbackCountUpdater = AtomicLongFieldUpdater.newUpdater(WebSessionStat.class, + "jdbcRollbackCount"); + + private long createTimeMillis = -1L; + private volatile long lastAccessTimeMillis = -1L; + + private String remoteAddresses; + + private String principal; + + private String userAgent; + + private volatile int requestIntervalHistogram_0_1; + private volatile int requestIntervalHistogram_1_10; + private volatile int requestIntervalHistogram_10_100; + private volatile int requestIntervalHistogram_100_1000; + private volatile int requestIntervalHistogram_1000_10000; + private volatile int requestIntervalHistogram_10000_100000; + private volatile int requestIntervalHistogram_100000_1000000; + private volatile int requestIntervalHistogram_1000000_10000000; + private volatile int requestIntervalHistogram_10000000_more; + + static final AtomicIntegerFieldUpdater requestIntervalHistogram_0_1_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, + "requestIntervalHistogram_0_1"); + static final AtomicIntegerFieldUpdater requestIntervalHistogram_1_10_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, + "requestIntervalHistogram_1_10"); + static final AtomicIntegerFieldUpdater requestIntervalHistogram_10_100_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, + "requestIntervalHistogram_10_100"); + static final AtomicIntegerFieldUpdater requestIntervalHistogram_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, + "requestIntervalHistogram_100_1000"); + static final AtomicIntegerFieldUpdater requestIntervalHistogram_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, + "requestIntervalHistogram_1000_10000"); + static final AtomicIntegerFieldUpdater requestIntervalHistogram_10000_100000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, + "requestIntervalHistogram_10000_100000"); + static final AtomicIntegerFieldUpdater requestIntervalHistogram_100000_1000000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, + "requestIntervalHistogram_100000_1000000"); + static final AtomicIntegerFieldUpdater requestIntervalHistogram_1000000_10000000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, + "requestIntervalHistogram_1000000_10000000"); + static final AtomicIntegerFieldUpdater requestIntervalHistogram_10000000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(WebSessionStat.class, + "requestIntervalHistogram_10000000_more"); + + public WebSessionStat(String sessionId) { super(); this.sessionId = sessionId; } @@ -209,7 +208,7 @@ private void requestIntervalHistogramRecord(long nanoSpan) { public void beforeInvoke() { int running = runningCountUpdater.incrementAndGet(this); - for (;;) { + for (; ; ) { int max = concurrentMaxUpdater.get(this); if (running > max) { if (concurrentMaxUpdater.compareAndSet(this, max, running)) { @@ -349,7 +348,7 @@ public void addJdbcRollbackCount(long rollbackCount) { } public long[] getRequestInterval() { - return new long[] { + return new long[]{ // requestIntervalHistogram_0_1, // requestIntervalHistogram_1_10, // @@ -396,7 +395,7 @@ public WebSessionStatValue getValue(boolean reset) { val.requestIntervalHistogram_10000_100000 = get(this, requestIntervalHistogram_10000_100000_Updater, reset); val.requestIntervalHistogram_100000_1000000 = get(this, requestIntervalHistogram_100000_1000000_Updater, reset); val.requestIntervalHistogram_1000000_10000000 = get(this, requestIntervalHistogram_1000000_10000000_Updater, - reset); + reset); val.requestIntervalHistogram_10000000_more = get(this, requestIntervalHistogram_10000000_more_Updater, reset); return val; diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStatValue.java b/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStatValue.java index af7327206d..bff064cd09 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStatValue.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStatValue.java @@ -20,35 +20,34 @@ import java.util.Map; public class WebSessionStatValue { - String sessionId; - int runningCount; - int concurrentMax; - long requestCount; - long requestErrorCount; - long requestTimeNano; - long jdbcFetchRowCount; - long jdbcUpdateCount; - long jdbcExecuteCount; - long jdbcExecuteTimeNano; - long jdbcCommitCount; - long jdbcRollbackCount; - long createTimeMillis; - long lastAccessTimeMillis; + int runningCount; + int concurrentMax; + long requestCount; + long requestErrorCount; + long requestTimeNano; + long jdbcFetchRowCount; + long jdbcUpdateCount; + long jdbcExecuteCount; + long jdbcExecuteTimeNano; + long jdbcCommitCount; + long jdbcRollbackCount; + long createTimeMillis; + long lastAccessTimeMillis; String remoteAddress; String principal; String userAgent; - int requestIntervalHistogram_0_1; - int requestIntervalHistogram_1_10; - int requestIntervalHistogram_10_100; - int requestIntervalHistogram_100_1000; - int requestIntervalHistogram_1000_10000; - int requestIntervalHistogram_10000_100000; - int requestIntervalHistogram_100000_1000000; - int requestIntervalHistogram_1000000_10000000; - int requestIntervalHistogram_10000000_more; + int requestIntervalHistogram_0_1; + int requestIntervalHistogram_1_10; + int requestIntervalHistogram_10_100; + int requestIntervalHistogram_100_1000; + int requestIntervalHistogram_1000_10000; + int requestIntervalHistogram_10000_100000; + int requestIntervalHistogram_100000_1000000; + int requestIntervalHistogram_1000000_10000000; + int requestIntervalHistogram_10000000_more; public String getSessionId() { return sessionId; @@ -209,9 +208,9 @@ public Date getLastAccessTime() { public long getJdbcExecuteTimeMillis() { return getJdbcExecuteTimeNano() / (1000 * 1000); } - + public long[] getRequestInterval() { - return new long[] { + return new long[]{ // requestIntervalHistogram_0_1, // requestIntervalHistogram_1_10, // diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebURIStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebURIStat.java index e4c84782e5..8c2f6dd8d2 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebURIStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebURIStat.java @@ -15,128 +15,127 @@ */ package com.alibaba.druid.support.http.stat; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; +import com.alibaba.druid.support.profile.ProfileStat; import java.util.Date; import java.util.Map; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.alibaba.druid.support.profile.ProfileStat; +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; public class WebURIStat { - - private final String uri; - - private volatile int runningCount; - private volatile int concurrentMax; - private volatile long requestCount; - private volatile long requestTimeNano; - private volatile long requestTimeNanoMax; - private volatile long requestTimeNanoMaxOccurTime; - - final static AtomicIntegerFieldUpdater runningCountUpdater = AtomicIntegerFieldUpdater.newUpdater(WebURIStat.class, - "runningCount"); - final static AtomicIntegerFieldUpdater concurrentMaxUpdater = AtomicIntegerFieldUpdater.newUpdater(WebURIStat.class, - "concurrentMax"); - final static AtomicLongFieldUpdater requestCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "requestCount"); - final static AtomicLongFieldUpdater requestTimeNanoUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "requestTimeNano"); - final static AtomicLongFieldUpdater requestTimeNanoMaxUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + private final String uri; + + private volatile int runningCount; + private volatile int concurrentMax; + private volatile long requestCount; + private volatile long requestTimeNano; + private volatile long requestTimeNanoMax; + private volatile long requestTimeNanoMaxOccurTime; + + static final AtomicIntegerFieldUpdater runningCountUpdater = AtomicIntegerFieldUpdater.newUpdater(WebURIStat.class, + "runningCount"); + static final AtomicIntegerFieldUpdater concurrentMaxUpdater = AtomicIntegerFieldUpdater.newUpdater(WebURIStat.class, + "concurrentMax"); + static final AtomicLongFieldUpdater requestCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "requestCount"); + static final AtomicLongFieldUpdater requestTimeNanoUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "requestTimeNano"); + static final AtomicLongFieldUpdater requestTimeNanoMaxUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, "requestTimeNanoMax"); - final static AtomicLongFieldUpdater requestTimeNanoMaxOccurTimeUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + static final AtomicLongFieldUpdater requestTimeNanoMaxOccurTimeUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, "requestTimeNanoMaxOccurTime"); - private volatile long jdbcFetchRowCount; - private volatile long jdbcFetchRowPeak; // 单次请求读取行数的峰值 - final static AtomicLongFieldUpdater jdbcFetchRowCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcFetchRowCount"); - final static AtomicLongFieldUpdater jdbcFetchRowPeakUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcFetchRowPeak"); - - private volatile long jdbcUpdateCount; - private volatile long jdbcUpdatePeak; // 单次请求更新行数的峰值 - final static AtomicLongFieldUpdater jdbcUpdateCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcUpdateCount"); - final static AtomicLongFieldUpdater jdbcUpdatePeakUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcUpdatePeak"); - - private volatile long jdbcExecuteCount; - private volatile long jdbcExecuteErrorCount; - private volatile long jdbcExecutePeak; // 单次请求执行SQL次数的峰值 - private volatile long jdbcExecuteTimeNano; - final static AtomicLongFieldUpdater jdbcExecuteCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcExecuteCount"); - final static AtomicLongFieldUpdater jdbcExecuteErrorCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcExecuteErrorCount"); - final static AtomicLongFieldUpdater jdbcExecutePeakUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcExecutePeak"); - final static AtomicLongFieldUpdater jdbcExecuteTimeNanoUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcExecuteTimeNano"); - - private volatile long jdbcCommitCount; - private volatile long jdbcRollbackCount; - final static AtomicLongFieldUpdater jdbcCommitCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcCommitCount"); - final static AtomicLongFieldUpdater jdbcRollbackCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcRollbackCount"); - - private volatile long jdbcPoolConnectionOpenCount; - private volatile long jdbcPoolConnectionCloseCount; - final static AtomicLongFieldUpdater jdbcPoolConnectionOpenCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcPoolConnectionOpenCount"); - final static AtomicLongFieldUpdater jdbcPoolConnectionCloseCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcPoolConnectionCloseCount"); - - private volatile long jdbcResultSetOpenCount; - private volatile long jdbcResultSetCloseCount; - - private volatile long errorCount; - - private volatile long lastAccessTimeMillis = -1L; - - private volatile ProfileStat profiletat = new ProfileStat(); - - final static AtomicLongFieldUpdater jdbcResultSetOpenCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcResultSetOpenCount"); - final static AtomicLongFieldUpdater jdbcResultSetCloseCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "jdbcResultSetCloseCount"); - final static AtomicLongFieldUpdater errorCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "errorCount"); - final static AtomicLongFieldUpdater lastAccessTimeMillisUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "lastAccessTimeMillis"); - - private final static ThreadLocal currentLocal = new ThreadLocal(); - - private volatile long histogram_0_1; - private volatile long histogram_1_10; - private volatile long histogram_10_100; - private volatile long histogram_100_1000; - private volatile int histogram_1000_10000; - private volatile int histogram_10000_100000; - private volatile int histogram_100000_1000000; - private volatile int histogram_1000000_more; - - final static AtomicLongFieldUpdater histogram_0_1_Updater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "histogram_0_1"); - final static AtomicLongFieldUpdater histogram_1_10_Updater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "histogram_1_10"); - final static AtomicLongFieldUpdater histogram_10_100_Updater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "histogram_10_100"); - final static AtomicLongFieldUpdater histogram_100_1000_Updater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, - "histogram_100_1000"); - final static AtomicIntegerFieldUpdater histogram_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebURIStat.class, - "histogram_1000_10000"); - final static AtomicIntegerFieldUpdater histogram_10000_100000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebURIStat.class, - "histogram_10000_100000"); - final static AtomicIntegerFieldUpdater histogram_100000_1000000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebURIStat.class, - "histogram_100000_1000000"); - final static AtomicIntegerFieldUpdater histogram_1000000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(WebURIStat.class, - "histogram_1000000_more"); - - public WebURIStat(String uri){ + private volatile long jdbcFetchRowCount; + private volatile long jdbcFetchRowPeak; // 单次请求读取行数的峰值 + static final AtomicLongFieldUpdater jdbcFetchRowCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcFetchRowCount"); + static final AtomicLongFieldUpdater jdbcFetchRowPeakUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcFetchRowPeak"); + + private volatile long jdbcUpdateCount; + private volatile long jdbcUpdatePeak; // 单次请求更新行数的峰值 + static final AtomicLongFieldUpdater jdbcUpdateCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcUpdateCount"); + static final AtomicLongFieldUpdater jdbcUpdatePeakUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcUpdatePeak"); + + private volatile long jdbcExecuteCount; + private volatile long jdbcExecuteErrorCount; + private volatile long jdbcExecutePeak; // 单次请求执行SQL次数的峰值 + private volatile long jdbcExecuteTimeNano; + static final AtomicLongFieldUpdater jdbcExecuteCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcExecuteCount"); + static final AtomicLongFieldUpdater jdbcExecuteErrorCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcExecuteErrorCount"); + static final AtomicLongFieldUpdater jdbcExecutePeakUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcExecutePeak"); + static final AtomicLongFieldUpdater jdbcExecuteTimeNanoUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcExecuteTimeNano"); + + private volatile long jdbcCommitCount; + private volatile long jdbcRollbackCount; + static final AtomicLongFieldUpdater jdbcCommitCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcCommitCount"); + static final AtomicLongFieldUpdater jdbcRollbackCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcRollbackCount"); + + private volatile long jdbcPoolConnectionOpenCount; + private volatile long jdbcPoolConnectionCloseCount; + static final AtomicLongFieldUpdater jdbcPoolConnectionOpenCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcPoolConnectionOpenCount"); + static final AtomicLongFieldUpdater jdbcPoolConnectionCloseCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcPoolConnectionCloseCount"); + + private volatile long jdbcResultSetOpenCount; + private volatile long jdbcResultSetCloseCount; + + private volatile long errorCount; + + private volatile long lastAccessTimeMillis = -1L; + + private volatile ProfileStat profiletat = new ProfileStat(); + + static final AtomicLongFieldUpdater jdbcResultSetOpenCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcResultSetOpenCount"); + static final AtomicLongFieldUpdater jdbcResultSetCloseCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "jdbcResultSetCloseCount"); + static final AtomicLongFieldUpdater errorCountUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "errorCount"); + static final AtomicLongFieldUpdater lastAccessTimeMillisUpdater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "lastAccessTimeMillis"); + + private static final ThreadLocal currentLocal = new ThreadLocal(); + + private volatile long histogram_0_1; + private volatile long histogram_1_10; + private volatile long histogram_10_100; + private volatile long histogram_100_1000; + private volatile int histogram_1000_10000; + private volatile int histogram_10000_100000; + private volatile int histogram_100000_1000000; + private volatile int histogram_1000000_more; + + static final AtomicLongFieldUpdater histogram_0_1_Updater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "histogram_0_1"); + static final AtomicLongFieldUpdater histogram_1_10_Updater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "histogram_1_10"); + static final AtomicLongFieldUpdater histogram_10_100_Updater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "histogram_10_100"); + static final AtomicLongFieldUpdater histogram_100_1000_Updater = AtomicLongFieldUpdater.newUpdater(WebURIStat.class, + "histogram_100_1000"); + static final AtomicIntegerFieldUpdater histogram_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebURIStat.class, + "histogram_1000_10000"); + static final AtomicIntegerFieldUpdater histogram_10000_100000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebURIStat.class, + "histogram_10000_100000"); + static final AtomicIntegerFieldUpdater histogram_100000_1000000_Updater = AtomicIntegerFieldUpdater.newUpdater(WebURIStat.class, + "histogram_100000_1000000"); + static final AtomicIntegerFieldUpdater histogram_1000000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(WebURIStat.class, + "histogram_1000000_more"); + + public WebURIStat(String uri) { super(); this.uri = uri; } @@ -154,7 +153,7 @@ public void beforeInvoke() { int running = runningCountUpdater.incrementAndGet(this); - for (;;) { + for (; ; ) { int max = concurrentMaxUpdater.get(this); if (running > max) { if (concurrentMaxUpdater.compareAndSet(this, max, running)) { @@ -177,7 +176,7 @@ public void afterInvoke(Throwable error, long nanos) { runningCountUpdater.decrementAndGet(this); requestTimeNanoUpdater.addAndGet(this, nanos); - for (;;) { + for (; ; ) { long current = requestTimeNanoMaxUpdater.get(this); if (current < nanos) { if (requestTimeNanoMaxUpdater.compareAndSet(this, current, nanos)) { @@ -206,7 +205,7 @@ public void afterInvoke(Throwable error, long nanos) { long fetchRowCount = localStat.getJdbcFetchRowCount(); this.addJdbcFetchRowCount(fetchRowCount); - for (;;) { + for (; ; ) { long peak = jdbcFetchRowPeakUpdater.get(this); if (fetchRowCount <= peak) { break; @@ -221,7 +220,7 @@ public void afterInvoke(Throwable error, long nanos) { long executeCount = localStat.getJdbcExecuteCount(); this.addJdbcExecuteCount(executeCount); - for (;;) { + for (; ; ) { long peak = jdbcExecutePeakUpdater.get(this); if (executeCount <= peak) { break; @@ -236,7 +235,7 @@ public void afterInvoke(Throwable error, long nanos) { long updateCount = localStat.getJdbcUpdateCount(); this.addJdbcUpdateCount(updateCount); - for (;;) { + for (; ; ) { long peak = jdbcUpdatePeakUpdater.get(this); if (updateCount <= peak) { break; @@ -437,7 +436,7 @@ public ProfileStat getProfiletat() { } public long[] getHistogramValues() { - return new long[] { + return new long[]{ // histogram_0_1, // histogram_1_10, // @@ -487,7 +486,7 @@ public WebURIStatValue getValue(boolean reset) { val.setLastAccessTimeMillis(get(this, lastAccessTimeMillisUpdater, reset)); val.setProfileEntryStatValueList(this.getProfiletat().getStatValue(reset)); - + val.histogram_0_1 = get(this, histogram_0_1_Updater, reset); val.histogram_1_10 = get(this, histogram_1_10_Updater, reset); val.histogram_10_100 = get(this, histogram_10_100_Updater, reset); diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebURIStatValue.java b/src/main/java/com/alibaba/druid/support/http/stat/WebURIStatValue.java index 72497e8170..505d14ac51 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebURIStatValue.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebURIStatValue.java @@ -15,116 +15,111 @@ */ package com.alibaba.druid.support.http.stat; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - import com.alibaba.druid.support.monitor.annotation.AggregateType; import com.alibaba.druid.support.monitor.annotation.MField; import com.alibaba.druid.support.monitor.annotation.MTable; import com.alibaba.druid.support.profile.ProfileEntryStatValue; +import java.util.*; + @MTable(name = "druid_weburi") public class WebURIStatValue { - @MField(groupBy = true, aggregate = AggregateType.None) - protected String uri; + protected String uri; @MField(aggregate = AggregateType.Last) - protected int runningCount; + protected int runningCount; @MField(aggregate = AggregateType.Max) - protected int concurrentMax; + protected int concurrentMax; @MField(aggregate = AggregateType.Sum) - protected long requestCount; + protected long requestCount; @MField(aggregate = AggregateType.Sum) - protected long requestTimeNano; + protected long requestTimeNano; @MField(aggregate = AggregateType.Max) - protected long requestTimeNanoMax; + protected long requestTimeNanoMax; @MField(aggregate = AggregateType.Last) - protected Date requestTimeNanoMaxOccurTime; + protected Date requestTimeNanoMaxOccurTime; @MField(aggregate = AggregateType.Sum) - protected long jdbcFetchRowCount; + protected long jdbcFetchRowCount; @MField(aggregate = AggregateType.Max) - protected long jdbcFetchRowPeak; + protected long jdbcFetchRowPeak; @MField(aggregate = AggregateType.Sum) - protected long jdbcUpdateCount; + protected long jdbcUpdateCount; @MField(aggregate = AggregateType.Max) - protected long jdbcUpdatePeak; + protected long jdbcUpdatePeak; @MField(aggregate = AggregateType.Sum) - protected long jdbcExecuteCount; + protected long jdbcExecuteCount; @MField(aggregate = AggregateType.Sum) - protected long jdbcExecuteErrorCount; + protected long jdbcExecuteErrorCount; @MField(aggregate = AggregateType.Max) - protected long jdbcExecutePeak; // 单次请求执行SQL次数的峰值 + protected long jdbcExecutePeak; // 单次请求执行SQL次数的峰值 @MField(aggregate = AggregateType.Sum) - protected long jdbcExecuteTimeNano; + protected long jdbcExecuteTimeNano; @MField(aggregate = AggregateType.Sum) - protected long jdbcCommitCount; + protected long jdbcCommitCount; @MField(aggregate = AggregateType.Sum) - protected long jdbcRollbackCount; + protected long jdbcRollbackCount; @MField(aggregate = AggregateType.Sum) - protected long jdbcPoolConnectionOpenCount; + protected long jdbcPoolConnectionOpenCount; @MField(aggregate = AggregateType.Sum) - protected long jdbcPoolConnectionCloseCount; + protected long jdbcPoolConnectionCloseCount; @MField(aggregate = AggregateType.Sum) - protected long jdbcResultSetOpenCount; + protected long jdbcResultSetOpenCount; @MField(aggregate = AggregateType.Sum) - protected long jdbcResultSetCloseCount; + protected long jdbcResultSetCloseCount; @MField(aggregate = AggregateType.Sum) - protected long errorCount; + protected long errorCount; @MField(aggregate = AggregateType.Last) - protected Date lastAccessTime = null; + protected Date lastAccessTime; private List profileEntryStatValueList; @MField(name = "h1", aggregate = AggregateType.Sum) - protected long histogram_0_1; + protected long histogram_0_1; @MField(name = "h10", aggregate = AggregateType.Sum) - protected long histogram_1_10; + protected long histogram_1_10; @MField(name = "h100", aggregate = AggregateType.Sum) - protected long histogram_10_100; + protected long histogram_10_100; @MField(name = "h1000", aggregate = AggregateType.Sum) - protected long histogram_100_1000; + protected long histogram_100_1000; @MField(name = "h10000", aggregate = AggregateType.Sum) - protected int histogram_1000_10000; + protected int histogram_1000_10000; @MField(name = "h100000", aggregate = AggregateType.Sum) - protected int histogram_10000_100000; + protected int histogram_10000_100000; @MField(name = "h1000000", aggregate = AggregateType.Sum) - protected int histogram_100000_1000000; + protected int histogram_100000_1000000; @MField(name = "hmore", aggregate = AggregateType.Sum) - protected int histogram_1000000_more; + protected int histogram_1000000_more; public long[] getHistogram() { - return new long[] { histogram_0_1, // + return new long[]{histogram_0_1, // histogram_1_10, // histogram_10_100, // histogram_100_1000, // diff --git a/src/main/java/com/alibaba/druid/support/http/util/IPAddress.java b/src/main/java/com/alibaba/druid/support/http/util/IPAddress.java index 394d0402af..0339a74443 100644 --- a/src/main/java/com/alibaba/druid/support/http/util/IPAddress.java +++ b/src/main/java/com/alibaba/druid/support/http/util/IPAddress.java @@ -22,22 +22,24 @@ * @version 1.0 */ public class IPAddress implements Cloneable { + /** + * IP address + */ + protected int ipAddress; - /** IP address */ - protected int ipAddress = 0; - - public IPAddress(String ipAddressStr){ + public IPAddress(String ipAddressStr) { ipAddress = parseIPAddress(ipAddressStr); } - public IPAddress(int address){ + public IPAddress(int address) { ipAddress = address; } // ------------------------------------------------------------------------- + /** * Return the integer representation of the IP address. - * + * * @return The IP address. */ public final int getIPAddress() { @@ -45,9 +47,10 @@ public final int getIPAddress() { } // ------------------------------------------------------------------------- + /** * Return the string representation of the IP Address following the common decimal-dotted notation xxx.xxx.xxx.xxx. - * + * * @return Return the string representation of the IP address. */ public String toString() { @@ -73,9 +76,10 @@ public String toString() { } // ------------------------------------------------------------------------- + /** * Check if the IP address is belongs to a Class A IP address. - * + * * @return Return true if the encapsulated IP address belongs to a class A IP address, otherwise * returne false. */ @@ -84,9 +88,10 @@ public final boolean isClassA() { } // ------------------------------------------------------------------------- + /** * Check if the IP address is belongs to a Class B IP address. - * + * * @return Return true if the encapsulated IP address belongs to a class B IP address, otherwise * returne false. */ @@ -95,9 +100,10 @@ public final boolean isClassB() { } // ------------------------------------------------------------------------- + /** * Check if the IP address is belongs to a Class C IP address. - * + * * @return Return true if the encapsulated IP address belongs to a class C IP address, otherwise * returne false. */ @@ -106,13 +112,14 @@ public final boolean isClassC() { } // ------------------------------------------------------------------------- + /** * Convert a decimal-dotted notation representation of an IP address into an 32 bits interger value. - * + * * @param ipAddressStr Decimal-dotted notation (xxx.xxx.xxx.xxx) of the IP address. * @return Return the 32 bits integer representation of the IP address. - * @exception InvalidIPAddressException Throws this exception if the specified IP address is not compliant to the - * decimal-dotted notation xxx.xxx.xxx.xxx. + * @throws InvalidIPAddressException Throws this exception if the specified IP address is not compliant to the + * decimal-dotted notation xxx.xxx.xxx.xxx. */ final int parseIPAddress(String ipAddressStr) { int result = 0; @@ -127,14 +134,12 @@ final int parseIPAddress(String ipAddressStr) { // get the 3 first numbers int offset = 0; for (int i = 0; i < 3; i++) { - // get the position of the first dot int index = tmp.indexOf('.'); // if there is not a dot then the ip string representation is // not compliant to the decimal-dotted notation. if (index != -1) { - // get the number before the dot and convert it into // an integer. String numberStr = tmp.substring(0, index); diff --git a/src/main/java/com/alibaba/druid/support/http/util/IPRange.java b/src/main/java/com/alibaba/druid/support/http/util/IPRange.java index 47ce6a7188..e1b9ef792b 100644 --- a/src/main/java/com/alibaba/druid/support/http/util/IPRange.java +++ b/src/main/java/com/alibaba/druid/support/http/util/IPRange.java @@ -22,29 +22,36 @@ * specifying the network address 130.5.5.25 with a subnet mask of 255.255.255.0 can also be expressed as 130.5.5.25/24. * The prefix-length notation is more compact and easier to understand than writing out the mask in its traditional * dotted-decimal format. + * * @author Marcel Dullaart * @version 1.0 * @see IPAddress */ public class IPRange { + /** + * IP address + */ + private IPAddress ipAddress; - /** IP address */ - private IPAddress ipAddress = null; - - /** IP subnet mask */ - private IPAddress ipSubnetMask = null; + /** + * IP subnet mask + */ + private IPAddress ipSubnetMask; - /** extended network prefix */ - private int extendedNetworkPrefix = 0; + /** + * extended network prefix + */ + private int extendedNetworkPrefix; - public IPRange(String range){ + public IPRange(String range) { parseRange(range); } // ------------------------------------------------------------------------- + /** * Return the encapsulated IP address. - * + * * @return The IP address. */ public final IPAddress getIPAddress() { @@ -52,9 +59,10 @@ public final IPAddress getIPAddress() { } // ------------------------------------------------------------------------- + /** * Return the encapsulated subnet mask - * + * * @return The IP range's subnet mask. */ public final IPAddress getIPSubnetMask() { @@ -62,9 +70,10 @@ public final IPAddress getIPSubnetMask() { } // ------------------------------------------------------------------------- + /** * Return the extended extended network prefix. - * + * * @return Return the extended network prefix. */ public final int getExtendedNetworkPrefix() { @@ -72,9 +81,10 @@ public final int getExtendedNetworkPrefix() { } // ------------------------------------------------------------------------- + /** * Convert the IP Range into a string representation. - * + * * @return Return the string representation of the IP Address following the common format xxx.xxx.xxx.xxx/xx (IP * address/extended network prefixs). */ @@ -83,11 +93,12 @@ public String toString() { } // ------------------------------------------------------------------------- + /** * Parse the IP range string representation. - * + * * @param range String representation of the IP range. - * @exception IllegalArgumentException Throws this exception if the specified range is not a valid IP network range. + * @throws IllegalArgumentException Throws this exception if the specified range is not a valid IP network range. */ final void parseRange(String range) { if (range == null) { @@ -114,7 +125,6 @@ final void parseRange(String range) { ipSubnetMask = computeMaskFromNetworkPrefix(extendedNetworkPrefix); } } catch (NumberFormatException ex) { - // the remaining part is not a valid decimal value. // Check if it's a decimal-dotted notation. ipSubnetMask = new IPAddress(subnetStr); @@ -128,15 +138,15 @@ final void parseRange(String range) { } // ------------------------------------------------------------------------- + /** * Compute the extended network prefix from the IP subnet mask. - * + * * @param mask Reference to the subnet mask IP number. * @return Return the extended network prefix. Return -1 if the specified mask cannot be converted into a extended * prefix network. */ private int computeNetworkPrefixFromMask(IPAddress mask) { - int result = 0; int tmp = mask.getIPAddress(); @@ -161,7 +171,6 @@ public static String toDecimalString(String inBinaryIpAddress) { int octet = Integer.parseInt(binary[c], 2); decimalIp.append(octet); if (c < 3) { - decimalIp.append('.'); } } @@ -169,14 +178,14 @@ public static String toDecimalString(String inBinaryIpAddress) { } // ------------------------------------------------------------------------- + /** * Convert a extended network prefix integer into an IP number. - * + * * @param prefix The network prefix number. * @return Return the IP number corresponding to the extended network prefix. */ private IPAddress computeMaskFromNetworkPrefix(int prefix) { - /* * int subnet = 0; for (int i=0; itrue if the specified IP address is in the encapsulated IP range, otherwise return * false. diff --git a/src/main/java/com/alibaba/druid/support/ibatis/DruidDataSourceFactory.java b/src/main/java/com/alibaba/druid/support/ibatis/DruidDataSourceFactory.java index da2d99348a..41ce661ee2 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/DruidDataSourceFactory.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/DruidDataSourceFactory.java @@ -15,12 +15,11 @@ */ package com.alibaba.druid.support.ibatis; -import java.util.Map; - import javax.sql.DataSource; -public class DruidDataSourceFactory implements com.ibatis.sqlmap.engine.datasource.DataSourceFactory { +import java.util.Map; +public class DruidDataSourceFactory implements com.ibatis.sqlmap.engine.datasource.DataSourceFactory { private DataSource dataSource; @SuppressWarnings("rawtypes") diff --git a/src/main/java/com/alibaba/druid/support/ibatis/IbatisUtils.java b/src/main/java/com/alibaba/druid/support/ibatis/IbatisUtils.java index c4725fbb21..78523aefaf 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/IbatisUtils.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/IbatisUtils.java @@ -15,9 +15,6 @@ */ package com.alibaba.druid.support.ibatis; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.ibatis.sqlmap.client.SqlMapExecutor; @@ -25,13 +22,16 @@ import com.ibatis.sqlmap.engine.impl.SqlMapSessionImpl; import com.ibatis.sqlmap.engine.scope.SessionScope; +import java.lang.reflect.Field; +import java.lang.reflect.Method; + public class IbatisUtils { - private static Log LOG = LogFactory.getLog(IbatisUtils.class); + private static Log LOG = LogFactory.getLog(IbatisUtils.class); - private static boolean VERSION_2_3_4 = false; + private static boolean VERSION_2_3_4; - private static Method methodGetId = null; - private static Method methodGetResource = null; + private static Method methodGetId; + private static Method methodGetResource; private static Field sessionField; static { @@ -68,7 +68,7 @@ public static SqlMapExecutor setClientImpl(SqlMapExecutor session, SqlMapClientI /** * 通过反射的方式得到id，能够兼容2.3.0和2.3.4 - * + * * @return */ protected static String getId(Object statement) { @@ -93,7 +93,7 @@ protected static String getId(Object statement) { /** * 通过反射的方式得到resource，能够兼容2.3.0和2.3.4 - * + * * @return */ protected static String getResource(Object statement) { @@ -118,12 +118,12 @@ public static void set(SqlMapSessionImpl session, SqlMapClientImpl client) { } } } - + if (sessionField != null) { SessionScope sessionScope; try { sessionScope = (SessionScope) sessionField.get(session); - + if (sessionScope != null) { if (sessionScope.getSqlMapClient() != null && sessionScope.getSqlMapClient().getClass() == SqlMapClientImpl.class) { sessionScope.setSqlMapClient(client); diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanNameAutoProxyCreator.java b/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanNameAutoProxyCreator.java index 3c035cbc25..341c22b73a 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanNameAutoProxyCreator.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanNameAutoProxyCreator.java @@ -15,23 +15,21 @@ */ package com.alibaba.druid.support.ibatis; -import java.util.ArrayList; -import java.util.List; - +import com.ibatis.sqlmap.client.SqlMapClient; +import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.aop.TargetSource; import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator; -import com.ibatis.sqlmap.client.SqlMapClient; -import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient; +import java.util.ArrayList; +import java.util.List; -@SuppressWarnings({ "serial", "deprecation" }) +@SuppressWarnings({"serial", "deprecation"}) public class SpringIbatisBeanNameAutoProxyCreator extends BeanNameAutoProxyCreator implements SpringIbatisBeanNameAutoProxyCreatorMBean { + private static final Log LOG = LogFactory.getLog(SpringIbatisBeanNameAutoProxyCreator.class); - private final static Log LOG = LogFactory.getLog(SpringIbatisBeanNameAutoProxyCreator.class); - - private List proxyBeanNames = new ArrayList(); + private List proxyBeanNames = new ArrayList(); public List getProxyBeanNames() { return proxyBeanNames; diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanNameAutoProxyCreatorMBean.java b/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanNameAutoProxyCreatorMBean.java index 781150c456..d5e86da883 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanNameAutoProxyCreatorMBean.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanNameAutoProxyCreatorMBean.java @@ -17,7 +17,6 @@ import java.util.List; - public interface SpringIbatisBeanNameAutoProxyCreatorMBean { List getProxyBeanNames(); } diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreator.java b/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreator.java index 924bc74a64..e74b78e987 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreator.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreator.java @@ -15,9 +15,8 @@ */ package com.alibaba.druid.support.ibatis; -import java.util.ArrayList; -import java.util.List; - +import com.ibatis.sqlmap.client.SqlMapClient; +import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.aop.TargetSource; @@ -26,23 +25,22 @@ import org.springframework.beans.factory.FactoryBean; import org.springframework.util.PatternMatchUtils; -import com.ibatis.sqlmap.client.SqlMapClient; -import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient; +import java.util.ArrayList; +import java.util.List; /** * 类BeanTypeAutoProxyCreator.java的实现描述：使用配置类型代替Springframework中配置名称的实现 - * + * * @author hualiang.lihl 2011-12-31 上午10:48:20 */ @SuppressWarnings("deprecation") public class SpringIbatisBeanTypeAutoProxyCreator extends AbstractAutoProxyCreator implements SpringIbatisBeanTypeAutoProxyCreatorMBean { + private static final Log LOG = LogFactory.getLog(SpringIbatisBeanTypeAutoProxyCreator.class); - private final static Log LOG = LogFactory.getLog(SpringIbatisBeanTypeAutoProxyCreator.class); - - private static final long serialVersionUID = -9094985530794052264L; + private static final long serialVersionUID = -9094985530794052264L; - private List beanNames = new ArrayList(); - private final List proxyBeanNames = new ArrayList(); + private List beanNames = new ArrayList(); + private final List proxyBeanNames = new ArrayList(); /** * Identify as bean to proxy if the bean name is in the configured list of names. @@ -63,7 +61,7 @@ protected Object[] getAdvicesAndAdvisorsForBean(Class beanClass, String beanName return DO_NOT_PROXY; } - @SuppressWarnings({ "rawtypes" }) + @SuppressWarnings("rawtypes") protected Object createProxy(Class beanClass, String beanName, Object[] specificInterceptors, TargetSource targetSource) { try { @@ -92,8 +90,8 @@ protected Object createProxy(Class beanClass, String beanName, Object[] specific *

* The default implementation checks for "xxx*", "*xxx" and "*xxx*" matches, as well as direct equality. Can be * overridden in subclasses. - * - * @param beanName the bean name to check + * + * @param beanName the bean name to check * @param mappedName the name in the configured list of names * @return if the names match * @see org.springframework.util.PatternMatchUtils#simpleMatch(String, String) diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreatorMBean.java b/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreatorMBean.java index b154482959..83e611a547 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreatorMBean.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreatorMBean.java @@ -18,6 +18,5 @@ import java.util.List; public interface SpringIbatisBeanTypeAutoProxyCreatorMBean { - List getProxyBeanNames(); } diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapClientImplWrapper.java b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapClientImplWrapper.java index cd9fc85571..238c01d2df 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapClientImplWrapper.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapClientImplWrapper.java @@ -15,14 +15,6 @@ */ package com.alibaba.druid.support.ibatis; -import java.lang.reflect.Method; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - import com.alibaba.druid.stat.JdbcSqlStat; import com.ibatis.common.util.PaginatedList; import com.ibatis.sqlmap.client.SqlMapExecutor; @@ -32,243 +24,250 @@ import com.ibatis.sqlmap.engine.impl.SqlMapClientImpl; import com.ibatis.sqlmap.engine.impl.SqlMapSessionImpl; +import java.lang.reflect.Method; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + @SuppressWarnings("deprecation") public class SqlMapClientImplWrapper extends SqlMapClientImpl { - - private SqlMapClientImpl raw; - - private static Method getLocalSqlMapSessionMethod = null; - - private ConcurrentMap statementInfoMap = new ConcurrentHashMap(16, 0.75f, 1); - - public SqlMapClientImplWrapper(SqlMapClientImpl raw) { - super(raw.getDelegate()); - this.raw = raw; - } - - public void setLocal(String id, SqlMapExecutor executor) { - IbatisStatementInfo stmtInfo = statementInfoMap.get(id); - - if (stmtInfo != null) { - JdbcSqlStat.setContextSqlName(stmtInfo.getId()); - JdbcSqlStat.setContextSqlFile(stmtInfo.getResource()); - return; - } - - Object statement = null; - if (executor instanceof SqlMapSessionImpl) { - statement = ((SqlMapSessionImpl) executor).getMappedStatement(id); - } - - if (executor instanceof SqlMapClientImpl) { - statement = ((SqlMapClientImpl) executor).getMappedStatement(id); - } - - if (statement == null) { - return; - } - - String stmtId = IbatisUtils.getId(statement); - String stmtResource = IbatisUtils.getResource(statement); - stmtInfo = new IbatisStatementInfo(stmtId, stmtResource); - statementInfoMap.putIfAbsent(id, stmtInfo); - - JdbcSqlStat.setContextSqlName(stmtId); - JdbcSqlStat.setContextSqlFile(stmtResource); - } - - protected SqlMapSessionWrapper getLocalSqlMapSessionWrapper() { - try { - if (getLocalSqlMapSessionMethod == null) { - getLocalSqlMapSessionMethod = raw.getClass().getDeclaredMethod( - "getLocalSqlMapSession"); - getLocalSqlMapSessionMethod.setAccessible(true); - } - SqlMapSessionImpl sessionImpl = (SqlMapSessionImpl) getLocalSqlMapSessionMethod - .invoke(raw); - IbatisUtils.set(sessionImpl, this); - return new SqlMapSessionWrapper(raw, sessionImpl); - } catch (Exception e) { - throw new IllegalStateException(e.getMessage(), e); - } - } - - public SqlMapSession openSession(Connection conn) { - SqlMapSession session = raw.openSession(conn); - IbatisUtils.setClientImpl(session, this); - return new SqlMapSessionWrapper(raw, session); - } - - public SqlMapSession getSession() { - SqlMapSession session = raw.getSession(); - IbatisUtils.setClientImpl(session, this); - return new SqlMapSessionWrapper(raw, session); - } - - // ///// - public Object insert(String id, Object param) throws SQLException { - return getLocalSqlMapSessionWrapper().insert(id, param); - } - - public Object insert(String id) throws SQLException { - return getLocalSqlMapSessionWrapper().insert(id); - } - - public int update(String id, Object param) throws SQLException { - return getLocalSqlMapSessionWrapper().update(id, param); - } - - public int update(String id) throws SQLException { - return getLocalSqlMapSessionWrapper().update(id); - } - - public int delete(String id, Object param) throws SQLException { - return getLocalSqlMapSessionWrapper().delete(id, param); - } - - public int delete(String id) throws SQLException { - return getLocalSqlMapSessionWrapper().delete(id); - } - - public Object queryForObject(String id, Object paramObject) - throws SQLException { - return getLocalSqlMapSessionWrapper().queryForObject(id, paramObject); - } - - public Object queryForObject(String id) throws SQLException { - return getLocalSqlMapSessionWrapper().queryForObject(id); - } - - public Object queryForObject(String id, Object paramObject, - Object resultObject) throws SQLException { - return getLocalSqlMapSessionWrapper().queryForObject(id, paramObject, - resultObject); - } - - @SuppressWarnings("rawtypes") - public List queryForList(String id, Object paramObject) throws SQLException { - return getLocalSqlMapSessionWrapper().queryForList(id, paramObject); - } - - @SuppressWarnings("rawtypes") - public List queryForList(String id) throws SQLException { - return getLocalSqlMapSessionWrapper().queryForList(id); - } - - @SuppressWarnings("rawtypes") - public List queryForList(String id, Object paramObject, int skip, int max) - throws SQLException { - return getLocalSqlMapSessionWrapper().queryForList(id, paramObject, - skip, max); - } - - @SuppressWarnings("rawtypes") - public List queryForList(String id, int skip, int max) throws SQLException { - return getLocalSqlMapSessionWrapper().queryForList(id, skip, max); - } - - /** - * @deprecated All paginated list features have been deprecated - */ - public PaginatedList queryForPaginatedList(String id, Object paramObject, - int pageSize) throws SQLException { - return getLocalSqlMapSessionWrapper().queryForPaginatedList(id, - paramObject, pageSize); - } - - /** - * @deprecated All paginated list features have been deprecated - */ - public PaginatedList queryForPaginatedList(String id, int pageSize) - throws SQLException { - return getLocalSqlMapSessionWrapper().queryForPaginatedList(id, - pageSize); - } - - @SuppressWarnings("rawtypes") - public Map queryForMap(String id, Object paramObject, String keyProp) - throws SQLException { - return getLocalSqlMapSessionWrapper().queryForMap(id, paramObject, - keyProp); - } - - @SuppressWarnings("rawtypes") - public Map queryForMap(String id, Object paramObject, String keyProp, - String valueProp) throws SQLException { - return getLocalSqlMapSessionWrapper().queryForMap(id, paramObject, - keyProp, valueProp); - } - - public void queryWithRowHandler(String id, Object paramObject, - RowHandler rowHandler) throws SQLException { - getLocalSqlMapSessionWrapper().queryWithRowHandler(id, paramObject, - rowHandler); - } - - public void queryWithRowHandler(String id, RowHandler rowHandler) - throws SQLException { - getLocalSqlMapSessionWrapper().queryWithRowHandler(id, rowHandler); - } - - public void startTransaction() throws SQLException { - getLocalSqlMapSessionWrapper().startTransaction(); - } - - public void startTransaction(int transactionIsolation) throws SQLException { - getLocalSqlMapSessionWrapper().startTransaction(transactionIsolation); - } - - public void commitTransaction() throws SQLException { - getLocalSqlMapSessionWrapper().commitTransaction(); - } - - public void endTransaction() throws SQLException { - try { - getLocalSqlMapSessionWrapper().endTransaction(); - } finally { - getLocalSqlMapSessionWrapper().close(); - } - } - - public void startBatch() throws SQLException { - getLocalSqlMapSessionWrapper().startBatch(); - } - - public int executeBatch() throws SQLException { - return getLocalSqlMapSessionWrapper().executeBatch(); - } - - @SuppressWarnings("rawtypes") - public List executeBatchDetailed() throws SQLException, BatchException { - return getLocalSqlMapSessionWrapper().executeBatchDetailed(); - } - - public void setUserConnection(Connection connection) throws SQLException { - try { - getLocalSqlMapSessionWrapper().setUserConnection(connection); - } finally { - if (connection == null) { - getLocalSqlMapSessionWrapper().close(); - } - } - } - - public static class IbatisStatementInfo { - private final String id; - private final String resource; - - public IbatisStatementInfo(String id, String resource) { - this.id = id; - this.resource = resource; - } - - public String getId() { - return id; - } - - public String getResource() { - return resource; - } - - } + private SqlMapClientImpl raw; + + private static Method getLocalSqlMapSessionMethod; + + private ConcurrentMap statementInfoMap = new ConcurrentHashMap(16, 0.75f, 1); + + public SqlMapClientImplWrapper(SqlMapClientImpl raw) { + super(raw.getDelegate()); + this.raw = raw; + } + + public void setLocal(String id, SqlMapExecutor executor) { + IbatisStatementInfo stmtInfo = statementInfoMap.get(id); + + if (stmtInfo != null) { + JdbcSqlStat.setContextSqlName(stmtInfo.getId()); + JdbcSqlStat.setContextSqlFile(stmtInfo.getResource()); + return; + } + + Object statement = null; + if (executor instanceof SqlMapSessionImpl) { + statement = ((SqlMapSessionImpl) executor).getMappedStatement(id); + } + + if (executor instanceof SqlMapClientImpl) { + statement = ((SqlMapClientImpl) executor).getMappedStatement(id); + } + + if (statement == null) { + return; + } + + String stmtId = IbatisUtils.getId(statement); + String stmtResource = IbatisUtils.getResource(statement); + stmtInfo = new IbatisStatementInfo(stmtId, stmtResource); + statementInfoMap.putIfAbsent(id, stmtInfo); + + JdbcSqlStat.setContextSqlName(stmtId); + JdbcSqlStat.setContextSqlFile(stmtResource); + } + + protected SqlMapSessionWrapper getLocalSqlMapSessionWrapper() { + try { + if (getLocalSqlMapSessionMethod == null) { + getLocalSqlMapSessionMethod = raw.getClass().getDeclaredMethod( + "getLocalSqlMapSession"); + getLocalSqlMapSessionMethod.setAccessible(true); + } + SqlMapSessionImpl sessionImpl = (SqlMapSessionImpl) getLocalSqlMapSessionMethod + .invoke(raw); + IbatisUtils.set(sessionImpl, this); + return new SqlMapSessionWrapper(raw, sessionImpl); + } catch (Exception e) { + throw new IllegalStateException(e.getMessage(), e); + } + } + + public SqlMapSession openSession(Connection conn) { + SqlMapSession session = raw.openSession(conn); + IbatisUtils.setClientImpl(session, this); + return new SqlMapSessionWrapper(raw, session); + } + + public SqlMapSession getSession() { + SqlMapSession session = raw.getSession(); + IbatisUtils.setClientImpl(session, this); + return new SqlMapSessionWrapper(raw, session); + } + + // ///// + public Object insert(String id, Object param) throws SQLException { + return getLocalSqlMapSessionWrapper().insert(id, param); + } + + public Object insert(String id) throws SQLException { + return getLocalSqlMapSessionWrapper().insert(id); + } + + public int update(String id, Object param) throws SQLException { + return getLocalSqlMapSessionWrapper().update(id, param); + } + + public int update(String id) throws SQLException { + return getLocalSqlMapSessionWrapper().update(id); + } + + public int delete(String id, Object param) throws SQLException { + return getLocalSqlMapSessionWrapper().delete(id, param); + } + + public int delete(String id) throws SQLException { + return getLocalSqlMapSessionWrapper().delete(id); + } + + public Object queryForObject(String id, Object paramObject) + throws SQLException { + return getLocalSqlMapSessionWrapper().queryForObject(id, paramObject); + } + + public Object queryForObject(String id) throws SQLException { + return getLocalSqlMapSessionWrapper().queryForObject(id); + } + + public Object queryForObject(String id, Object paramObject, + Object resultObject) throws SQLException { + return getLocalSqlMapSessionWrapper().queryForObject(id, paramObject, + resultObject); + } + + @SuppressWarnings("rawtypes") + public List queryForList(String id, Object paramObject) throws SQLException { + return getLocalSqlMapSessionWrapper().queryForList(id, paramObject); + } + + @SuppressWarnings("rawtypes") + public List queryForList(String id) throws SQLException { + return getLocalSqlMapSessionWrapper().queryForList(id); + } + + @SuppressWarnings("rawtypes") + public List queryForList(String id, Object paramObject, int skip, int max) + throws SQLException { + return getLocalSqlMapSessionWrapper().queryForList(id, paramObject, + skip, max); + } + + @SuppressWarnings("rawtypes") + public List queryForList(String id, int skip, int max) throws SQLException { + return getLocalSqlMapSessionWrapper().queryForList(id, skip, max); + } + + /** + * @deprecated All paginated list features have been deprecated + */ + public PaginatedList queryForPaginatedList(String id, Object paramObject, + int pageSize) throws SQLException { + return getLocalSqlMapSessionWrapper().queryForPaginatedList(id, + paramObject, pageSize); + } + + /** + * @deprecated All paginated list features have been deprecated + */ + public PaginatedList queryForPaginatedList(String id, int pageSize) + throws SQLException { + return getLocalSqlMapSessionWrapper().queryForPaginatedList(id, + pageSize); + } + + @SuppressWarnings("rawtypes") + public Map queryForMap(String id, Object paramObject, String keyProp) + throws SQLException { + return getLocalSqlMapSessionWrapper().queryForMap(id, paramObject, + keyProp); + } + + @SuppressWarnings("rawtypes") + public Map queryForMap(String id, Object paramObject, String keyProp, + String valueProp) throws SQLException { + return getLocalSqlMapSessionWrapper().queryForMap(id, paramObject, + keyProp, valueProp); + } + + public void queryWithRowHandler(String id, Object paramObject, + RowHandler rowHandler) throws SQLException { + getLocalSqlMapSessionWrapper().queryWithRowHandler(id, paramObject, + rowHandler); + } + + public void queryWithRowHandler(String id, RowHandler rowHandler) + throws SQLException { + getLocalSqlMapSessionWrapper().queryWithRowHandler(id, rowHandler); + } + + public void startTransaction() throws SQLException { + getLocalSqlMapSessionWrapper().startTransaction(); + } + + public void startTransaction(int transactionIsolation) throws SQLException { + getLocalSqlMapSessionWrapper().startTransaction(transactionIsolation); + } + + public void commitTransaction() throws SQLException { + getLocalSqlMapSessionWrapper().commitTransaction(); + } + + public void endTransaction() throws SQLException { + try { + getLocalSqlMapSessionWrapper().endTransaction(); + } finally { + getLocalSqlMapSessionWrapper().close(); + } + } + + public void startBatch() throws SQLException { + getLocalSqlMapSessionWrapper().startBatch(); + } + + public int executeBatch() throws SQLException { + return getLocalSqlMapSessionWrapper().executeBatch(); + } + + @SuppressWarnings("rawtypes") + public List executeBatchDetailed() throws SQLException, BatchException { + return getLocalSqlMapSessionWrapper().executeBatchDetailed(); + } + + public void setUserConnection(Connection connection) throws SQLException { + try { + getLocalSqlMapSessionWrapper().setUserConnection(connection); + } finally { + if (connection == null) { + getLocalSqlMapSessionWrapper().close(); + } + } + } + + public static class IbatisStatementInfo { + private final String id; + private final String resource; + + public IbatisStatementInfo(String id, String resource) { + this.id = id; + this.resource = resource; + } + + public String getId() { + return id; + } + + public String getResource() { + return resource; + } + + } } diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapClientWrapper.java b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapClientWrapper.java index 18f441ad30..a30be5ad14 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapClientWrapper.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapClientWrapper.java @@ -15,11 +15,6 @@ */ package com.alibaba.druid.support.ibatis; -import java.sql.Connection; -import java.sql.SQLException; - -import javax.sql.DataSource; - import com.ibatis.sqlmap.client.SqlMapClient; import com.ibatis.sqlmap.client.SqlMapSession; import com.ibatis.sqlmap.engine.execution.SqlExecutor; @@ -28,17 +23,21 @@ import com.ibatis.sqlmap.engine.mapping.result.ResultObjectFactory; import com.ibatis.sqlmap.engine.mapping.statement.MappedStatement; +import javax.sql.DataSource; + +import java.sql.Connection; +import java.sql.SQLException; + @SuppressWarnings("deprecation") public class SqlMapClientWrapper extends SqlMapExecutorWrapper implements SqlMapClient, ExtendedSqlMapClient { - protected final ExtendedSqlMapClient client; - public SqlMapClientWrapper(ExtendedSqlMapClient client){ + public SqlMapClientWrapper(ExtendedSqlMapClient client) { super(client, client); this.client = client; - + } - + public ExtendedSqlMapClient getClient() { return this.client; } diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapExecutorWrapper.java b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapExecutorWrapper.java index c92a9e63f4..95400d0a43 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapExecutorWrapper.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapExecutorWrapper.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.support.ibatis; -import java.sql.SQLException; -import java.util.List; -import java.util.Map; - import com.ibatis.common.util.PaginatedList; import com.ibatis.sqlmap.client.SqlMapExecutor; import com.ibatis.sqlmap.client.event.RowHandler; @@ -26,15 +22,18 @@ import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient; import com.ibatis.sqlmap.engine.impl.SqlMapClientImpl; +import java.sql.SQLException; +import java.util.List; +import java.util.Map; + @SuppressWarnings("deprecation") public class SqlMapExecutorWrapper implements SqlMapExecutor { + private SqlMapExecutor executor; - private SqlMapExecutor executor; - - protected final SqlMapClientImpl clientImpl; + protected final SqlMapClientImpl clientImpl; protected final SqlMapClientImplWrapper clientImplWrapper; - public SqlMapExecutorWrapper(ExtendedSqlMapClient client, SqlMapExecutor executor){ + public SqlMapExecutorWrapper(ExtendedSqlMapClient client, SqlMapExecutor executor) { this.executor = executor; this.clientImpl = client.getClass() == SqlMapClientImpl.class ? (SqlMapClientImpl) client : null; @@ -42,60 +41,60 @@ public SqlMapExecutorWrapper(ExtendedSqlMapClient client, SqlMapExecutor executo } public Object insert(String id, Object parameterObject) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.insert(id, parameterObject); } public Object insert(String id) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.insert(id); } public int update(String id, Object parameterObject) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.update(id, parameterObject); } public int update(String id) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.update(id); } public int delete(String id, Object parameterObject) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.delete(id, parameterObject); } public int delete(String id) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.delete(id); } public Object queryForObject(String id, Object parameterObject) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.queryForObject(id, parameterObject); } public Object queryForObject(String id) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.queryForObject(id); } public Object queryForObject(String id, Object parameterObject, Object resultObject) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.queryForObject(id, parameterObject, resultObject); @@ -103,7 +102,7 @@ public Object queryForObject(String id, Object parameterObject, Object resultObj @SuppressWarnings("rawtypes") public List queryForList(String id, Object parameterObject) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.queryForList(id, parameterObject); @@ -111,7 +110,7 @@ public List queryForList(String id, Object parameterObject) throws SQLException @SuppressWarnings("rawtypes") public List queryForList(String id) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.queryForList(id); @@ -119,7 +118,7 @@ public List queryForList(String id) throws SQLException { @SuppressWarnings("rawtypes") public List queryForList(String id, Object parameterObject, int skip, int max) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.queryForList(id, parameterObject, skip, max); @@ -127,33 +126,33 @@ public List queryForList(String id, Object parameterObject, int skip, int max) t @SuppressWarnings("rawtypes") public List queryForList(String id, int skip, int max) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.queryForList(id, skip, max); } public void queryWithRowHandler(String id, Object parameterObject, RowHandler rowHandler) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); executor.queryWithRowHandler(id, parameterObject, rowHandler); } public void queryWithRowHandler(String id, RowHandler rowHandler) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); executor.queryWithRowHandler(id, rowHandler); } public PaginatedList queryForPaginatedList(String id, Object parameterObject, int pageSize) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.queryForPaginatedList(id, parameterObject, pageSize); } public PaginatedList queryForPaginatedList(String id, int pageSize) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.queryForPaginatedList(id, pageSize); @@ -161,7 +160,7 @@ public PaginatedList queryForPaginatedList(String id, int pageSize) throws SQLEx @SuppressWarnings("rawtypes") public Map queryForMap(String id, Object parameterObject, String keyProp) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.queryForMap(id, parameterObject, keyProp); @@ -169,7 +168,7 @@ public Map queryForMap(String id, Object parameterObject, String keyProp) throws @SuppressWarnings("rawtypes") public Map queryForMap(String id, Object parameterObject, String keyProp, String valueProp) throws SQLException { - clientImplWrapper.setLocal(id, executor); + clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.queryForMap(id, parameterObject, keyProp, valueProp); @@ -181,7 +180,6 @@ public void startBatch() throws SQLException { } public int executeBatch() throws SQLException { - IbatisUtils.setClientImpl(executor, clientImplWrapper); return executor.executeBatch(); } diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapSessionWrapper.java b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapSessionWrapper.java index baf5883d09..2b0bf19f98 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapSessionWrapper.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapSessionWrapper.java @@ -15,24 +15,24 @@ */ package com.alibaba.druid.support.ibatis; -import java.sql.Connection; -import java.sql.SQLException; +import com.ibatis.sqlmap.client.SqlMapSession; +import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient; import javax.sql.DataSource; -import com.ibatis.sqlmap.client.SqlMapSession; -import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient; +import java.sql.Connection; +import java.sql.SQLException; @SuppressWarnings("deprecation") public class SqlMapSessionWrapper extends SqlMapExecutorWrapper implements SqlMapSession { - private SqlMapSession session; - - public SqlMapSessionWrapper(ExtendedSqlMapClient client, SqlMapSession session){ + private SqlMapSession session; + + public SqlMapSessionWrapper(ExtendedSqlMapClient client, SqlMapSession session) { super(client, session); this.session = session; } - - public void startTransaction() throws SQLException { + + public void startTransaction() throws SQLException { session.startTransaction(); } diff --git a/src/main/java/com/alibaba/druid/support/jconsole/DruidDataSourcePanel.java b/src/main/java/com/alibaba/druid/support/jconsole/DruidDataSourcePanel.java index ff406697e6..5692c283f0 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/DruidDataSourcePanel.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/DruidDataSourcePanel.java @@ -15,24 +15,21 @@ */ package com.alibaba.druid.support.jconsole; -import java.awt.BorderLayout; -import java.awt.GridLayout; -import java.util.ArrayList; -import java.util.LinkedHashMap; - -import javax.swing.BorderFactory; -import javax.swing.JPanel; -import javax.swing.JTable; -import javax.swing.border.TitledBorder; - import com.alibaba.druid.support.jconsole.model.DruidTableCellRenderer; import com.alibaba.druid.support.jconsole.model.DruidTableModel; import com.alibaba.druid.support.jconsole.util.TableDataProcessor; import com.alibaba.druid.support.jconsole.util.TableDataProcessor.ColumnData; +import javax.swing.*; +import javax.swing.border.TitledBorder; + +import java.awt.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; + /** * service的请求地址：/datasource.json - * + *

* 请求service返回的json格式： * 

  * {"ResultCode":1,
@@ -56,17 +53,16 @@
  *          }]
  * }
  *
- * + * * @author yunnysunny [yunnysunny@gmail.com] - * */ + */ public class DruidDataSourcePanel extends DruidPanel { - - private static final long serialVersionUID = 1L; - private static final String REQUEST_URL = "/datasource.json"; + private static final long serialVersionUID = 1L; + private static final String REQUEST_URL = "/datasource.json"; private static final String KEY_WORD_IDENTITY = "Identity"; - private JPanel contentPanel; + private JPanel contentPanel; - public DruidDataSourcePanel(){ + public DruidDataSourcePanel() { super(); this.url = REQUEST_URL; diff --git a/src/main/java/com/alibaba/druid/support/jconsole/DruidDriverPanel.java b/src/main/java/com/alibaba/druid/support/jconsole/DruidDriverPanel.java index 7a4da44623..2dab2de601 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/DruidDriverPanel.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/DruidDriverPanel.java @@ -15,17 +15,17 @@ */ package com.alibaba.druid.support.jconsole; -import java.util.ArrayList; -import java.util.LinkedHashMap; - import com.alibaba.druid.support.jconsole.model.DruidTableCellRenderer; import com.alibaba.druid.support.jconsole.model.DruidTableModel; import com.alibaba.druid.support.jconsole.util.TableDataProcessor; import com.alibaba.druid.support.jconsole.util.TableDataProcessor.ColumnData; +import java.util.ArrayList; +import java.util.LinkedHashMap; + /** * 请求地址：/basic.json - * + *

* 请求返回的json格式： * 

  * {"ResultCode":1,"Content":
@@ -35,15 +35,14 @@
  *          }
  * }
  *
- * + * * @author yunnysunny [yunnysunny@gmail.com] - * */ + */ public class DruidDriverPanel extends DruidPanel { + private static final long serialVersionUID = 1L; + private static final String REQUEST_URL = "/basic.json"; - private static final long serialVersionUID = 1L; - private static final String REQUEST_URL = "/basic.json"; - - public DruidDriverPanel(){ + public DruidDriverPanel() { super(); url = REQUEST_URL; } diff --git a/src/main/java/com/alibaba/druid/support/jconsole/DruidPanel.java b/src/main/java/com/alibaba/druid/support/jconsole/DruidPanel.java index ec80133db3..12bb499aeb 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/DruidPanel.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/DruidPanel.java @@ -15,80 +15,93 @@ */ package com.alibaba.druid.support.jconsole; -import java.awt.event.ComponentEvent; -import java.awt.event.ComponentListener; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedHashMap; - -import javax.management.MBeanServerConnection; -import javax.swing.BorderFactory; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.border.TitledBorder; - import com.alibaba.druid.support.jconsole.model.DruidTableModel; import com.alibaba.druid.support.jconsole.util.TableDataProcessor; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.sun.tools.jconsole.JConsoleContext; +import javax.management.MBeanServerConnection; +import javax.swing.*; +import javax.swing.border.TitledBorder; + +import java.awt.event.ComponentEvent; +import java.awt.event.ComponentListener; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedHashMap; + /** * druid面板的抽象类 在类在实现的时候，通过url地址获取数据，解析此数据，然后显示在界面中 - * + * * @author yunnysunny [yunnysunny@gmail.com] */ public abstract class DruidPanel extends JPanel { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 1L; - - /** 默认面板刷新的间隔时间 */ + /** + * 默认面板刷新的间隔时间 + */ protected static final long DEFAULT_ACTIVE_TIME = 5 * 60 * 1000; - /** 版权信息字符串 */ - private static final String COPYRIGHT_STRING = "powered by yunnysunny"; - - /** 滚动条面板 */ - protected JScrollPane scrollPane; - /** 表格模板 */ - protected DruidTableModel tableModel; - /** 表格 */ - protected JTable table; - /** 版权面板 */ - protected JPanel copyrightPanel; - /** json请求的地址 */ - protected String url; - - /** 界面刷新的间隔时间，单位为毫秒. */ - protected long activeTime; - /** 上次刷新的时间 */ - protected long lastRefreshTime; - /** 与界面管理的MBeanServerConnection对象 */ + /** + * 版权信息字符串 + */ + private static final String COPYRIGHT_STRING = "powered by yunnysunny"; + + /** + * 滚动条面板 + */ + protected JScrollPane scrollPane; + /** + * 表格模板 + */ + protected DruidTableModel tableModel; + /** + * 表格 + */ + protected JTable table; + /** + * 版权面板 + */ + protected JPanel copyrightPanel; + /** + * json请求的地址 + */ + protected String url; + + /** + * 界面刷新的间隔时间，单位为毫秒. + */ + protected long activeTime; + /** + * 上次刷新的时间 + */ + protected long lastRefreshTime; + /** + * 与界面管理的MBeanServerConnection对象 + */ protected MBeanServerConnection conn; - private final static Log LOG = LogFactory.getLog(DruidPanel.class); + private static final Log LOG = LogFactory.getLog(DruidPanel.class); /** * 根据传入的刷新时间间隔来初始化. - * + * * @param activeTime 刷新时间间隔 */ - protected DruidPanel(long activeTime){ + protected DruidPanel(long activeTime) { this.activeTime = activeTime; } /** * 初始化刷新时间间隔为默认值 */ - protected DruidPanel(){ + protected DruidPanel() { activeTime = DEFAULT_ACTIVE_TIME; } - - /** * 调用完service之后，各个子类对于解析后的数据的具体处理 - * + * * @param data 解析后的数据 */ protected abstract void tableDataProcess(ArrayList> data); @@ -96,8 +109,8 @@ protected DruidPanel(){ /** * 如果是第一次调用，则生成表格对象；否则根据当前时间来和上次刷新时间的间隔， * 是否大于对象初始化时设定的时间间隔来判断是否刷新表格数据。 - * - * @param url service的地址 + * + * @param url service的地址 * @param conn MBeanServerConnection对象 * @throws Exception */ @@ -128,10 +141,8 @@ protected void addOrRefreshTable(String url) throws Exception { needRefresh = true; lastRefreshTime = timeNow; this.addComponentListener(new ComponentListener() { - @Override public void componentShown(ComponentEvent arg0) { - } @Override @@ -142,12 +153,10 @@ public void componentResized(ComponentEvent arg0) { @Override public void componentMoved(ComponentEvent arg0) { - } @Override public void componentHidden(ComponentEvent arg0) { - } }); } else { @@ -159,7 +168,7 @@ public void componentHidden(ComponentEvent arg0) { if (needRefresh) { LOG.debug("refresh" + timeNow); ArrayList> data = TableDataProcessor.parseData(TableDataProcessor.getData(url, - conn)); + conn)); if (data != null) { tableDataProcess(data); } diff --git a/src/main/java/com/alibaba/druid/support/jconsole/DruidPlugin.java b/src/main/java/com/alibaba/druid/support/jconsole/DruidPlugin.java index cb01cd30ec..beada4f975 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/DruidPlugin.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/DruidPlugin.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.support.jconsole; -import java.util.LinkedHashMap; -import java.util.Map; +import com.sun.tools.jconsole.JConsolePlugin; -import javax.swing.JPanel; -import javax.swing.SwingWorker; +import javax.swing.*; -import com.sun.tools.jconsole.JConsolePlugin; +import java.util.LinkedHashMap; +import java.util.Map; public class DruidPlugin extends JConsolePlugin { - private final Map tabs = new LinkedHashMap(); - public DruidPlugin(){ + public DruidPlugin() { tabs.put("Druid-Driver", new DruidDriverPanel()); tabs.put("Druid-DataSource", new DruidDataSourcePanel()); tabs.put("Druid-SQL", new DruidSQLPanel()); @@ -41,7 +39,6 @@ public Map getTabs() { @Override public SwingWorker newSwingWorker() { SwingWorker worer = new SwingWorker() { - @Override protected Object doInBackground() throws Exception { return DruidPlugin.this.doInBackground(); @@ -55,7 +52,7 @@ protected Object doInBackground() throws Exception { for (JPanel panel : tabs.values()) { ((DruidPanel) panel).doInBackground(this.getContext()); } - + return null; } diff --git a/src/main/java/com/alibaba/druid/support/jconsole/DruidSQLPanel.java b/src/main/java/com/alibaba/druid/support/jconsole/DruidSQLPanel.java index e419e44fde..21fd5f234f 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/DruidSQLPanel.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/DruidSQLPanel.java @@ -15,6 +15,13 @@ */ package com.alibaba.druid.support.jconsole; +import com.alibaba.druid.support.jconsole.model.*; + +import javax.swing.*; +import javax.swing.border.BevelBorder; +import javax.swing.table.JTableHeader; +import javax.swing.table.TableColumnModel; + import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; @@ -22,142 +29,125 @@ import java.util.LinkedHashMap; import java.util.Map.Entry; -import javax.swing.JLabel; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.SwingConstants; -import javax.swing.border.BevelBorder; -import javax.swing.table.JTableHeader; -import javax.swing.table.TableColumnModel; - -import com.alibaba.druid.support.jconsole.model.ColumnGroup; -import com.alibaba.druid.support.jconsole.model.DruidTableModel; -import com.alibaba.druid.support.jconsole.model.GroupableTableHeader; -import com.alibaba.druid.support.jconsole.model.GroupableTableHeaderUI; -import com.alibaba.druid.support.jconsole.model.RowHeaderTable; - /** * 请求地址 /sql.json - * + *

* 返回数据格式： * 

  * {
-    "ResultCode": 1,
-    "Content": [
-        {
-            "BatchSizeMax": 0,
-            "BatchSizeTotal": 0,
-            "ConcurrentMax": 1,
-            "DbType": "h2",
-            "EffectedRowCount": 18,
-            "EffectedRowCountHistogram": [
-                0,6,0,0,0,0
-            ],
-            "EffectedRowCountMax": 4,
-            "ErrorCount": 0,
-            "ExecuteAndResultHoldTimeHistogram": [
-                5,0,1,0,0,0,0,0
-            ],
-            "ExecuteAndResultSetHoldTime": 0,
-            "ExecuteCount": 6,
-            "FetchRowCount": 0,
-            "FetchRowCountHistogram": [
-                6,0,0,0,0,0
-            ],
-            "FetchRowCountMax": 0,
-            "Histogram": [
-                5,0,1,0,0,0,0,0
-            ],
-            "ID": 9,
-            "InTransactionCount": 6,
-            "LastSlowParameters": "[4]",
-            "LastTime": "2012-08-22 02:57:56",
-            "MaxTimespan": 18,
-            "MaxTimespanOccurTime": "2012-08-22 12:38:56",
-            "ResultSetHoldTime": 0,
-            "RunningCount": 0,
-            "SQL": "delete from acct_group_permission where group_id=?",
-            "TotalTime": 21
-        },
-     ]
-  }
-
- - @author yunnysunny [yunnysunny@gmail.com] - * */ + * "ResultCode": 1, + * "Content": [ + * { + * "BatchSizeMax": 0, + * "BatchSizeTotal": 0, + * "ConcurrentMax": 1, + * "DbType": "h2", + * "EffectedRowCount": 18, + * "EffectedRowCountHistogram": [ + * 0,6,0,0,0,0 + * ], + * "EffectedRowCountMax": 4, + * "ErrorCount": 0, + * "ExecuteAndResultHoldTimeHistogram": [ + * 5,0,1,0,0,0,0,0 + * ], + * "ExecuteAndResultSetHoldTime": 0, + * "ExecuteCount": 6, + * "FetchRowCount": 0, + * "FetchRowCountHistogram": [ + * 6,0,0,0,0,0 + * ], + * "FetchRowCountMax": 0, + * "Histogram": [ + * 5,0,1,0,0,0,0,0 + * ], + * "ID": 9, + * "InTransactionCount": 6, + * "LastSlowParameters": "[4]", + * "LastTime": "2012-08-22 02:57:56", + * "MaxTimespan": 18, + * "MaxTimespanOccurTime": "2012-08-22 12:38:56", + * "ResultSetHoldTime": 0, + * "RunningCount": 0, + * "SQL": "delete from acct_group_permission where group_id=?", + * "TotalTime": 21 + * }, + * ] + * } + * + * + * @author yunnysunny [yunnysunny@gmail.com] + */ public class DruidSQLPanel extends DruidPanel { + private static final long serialVersionUID = 1L; + private static final String REQUEST_URL = "/sql.json"; + private static final ArrayList SHOW_LIST = new ArrayList() { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 1L; - private static final String REQUEST_URL = "/sql.json"; - private static final ArrayList SHOW_LIST = new ArrayList() { - - private static final long serialVersionUID = 1L; - - { - add("SQL"); - add("ExecuteCount"); - add("TotalTime"); - add("InTransactionCount"); - add("ErrorCount"); - add("EffectedRowCount"); - add("FetchRowCount"); - add("RunningCount"); - add("ConcurrentMax"); - add("Histogram"); - add("EffectedRowCountHistogram"); - add("ExecuteAndResultHoldTimeHistogram"); - add("FetchRowCountHistogram"); - } - - }; - private static final ArrayList REAL_SHOW_LIST = new ArrayList() { + { + add("SQL"); + add("ExecuteCount"); + add("TotalTime"); + add("InTransactionCount"); + add("ErrorCount"); + add("EffectedRowCount"); + add("FetchRowCount"); + add("RunningCount"); + add("ConcurrentMax"); + add("Histogram"); + add("EffectedRowCountHistogram"); + add("ExecuteAndResultHoldTimeHistogram"); + add("FetchRowCountHistogram"); + } - private static final long serialVersionUID = 1L; + }; + private static final ArrayList REAL_SHOW_LIST = new ArrayList() { + private static final long serialVersionUID = 1L; - { - add("SQL"); - add("ExecuteCount"); - add("TotalTime"); - add("InTransactionCount"); - add("ErrorCount"); - add("EffectedRowCount"); - add("FetchRowCount"); - add("RunningCount"); - add("ConcurrentMax"); - add("Histogram"); - add("EffectedRowCountHistogram"); - add("ExecuteAndResultHoldTimeHistogram"); - add("FetchRowCountHistogram"); - } - }; - private static final String HISTOGRAM = "Histogram"; - private static final String Effected_RowCount_HISOGRAM = "EffectedRowCountHistogram"; - private static final String ExecuteAndResult_Hold_HISOGRAM = "ExecuteAndResultHoldTimeHistogram"; - private static final String FetchRowCount_HISOGRAM = "FetchRowCountHistogram"; - private static final ArrayList ARRAY_DATA_MAP = new ArrayList() { + { + add("SQL"); + add("ExecuteCount"); + add("TotalTime"); + add("InTransactionCount"); + add("ErrorCount"); + add("EffectedRowCount"); + add("FetchRowCount"); + add("RunningCount"); + add("ConcurrentMax"); + add("Histogram"); + add("EffectedRowCountHistogram"); + add("ExecuteAndResultHoldTimeHistogram"); + add("FetchRowCountHistogram"); + } + }; + private static final String HISTOGRAM = "Histogram"; + private static final String Effected_RowCount_HISOGRAM = "EffectedRowCountHistogram"; + private static final String ExecuteAndResult_Hold_HISOGRAM = "ExecuteAndResultHoldTimeHistogram"; + private static final String FetchRowCount_HISOGRAM = "FetchRowCountHistogram"; + private static final ArrayList ARRAY_DATA_MAP = new ArrayList() { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 1L; - { - add(HISTOGRAM); - add(Effected_RowCount_HISOGRAM); - add(ExecuteAndResult_Hold_HISOGRAM); - add(FetchRowCount_HISOGRAM); - } - }; - private static final int FIST_LIST_OFFSET = 9; + { + add(HISTOGRAM); + add(Effected_RowCount_HISOGRAM); + add(ExecuteAndResult_Hold_HISOGRAM); + add(FetchRowCount_HISOGRAM); + } + }; + private static final int FIST_LIST_OFFSET = 9; - private ColumnGroup groupHistogram; - private ColumnGroup groupEffectedRowCountHistogram; - private ColumnGroup groupExecuteAndResultHoldTimeHistogram; - private ColumnGroup groupFetchRowCountHistogram; - private ArrayList listHistogram; - private ArrayList listEffectedRowCountHistogram; - private ArrayList listExecuteAndResultHoldTimeHistogram; - private ArrayList listFetchRowCountHistogram; - private ArrayList ids; - private static final String JSON_ID_NAME = "ID"; + private ColumnGroup groupHistogram; + private ColumnGroup groupEffectedRowCountHistogram; + private ColumnGroup groupExecuteAndResultHoldTimeHistogram; + private ColumnGroup groupFetchRowCountHistogram; + private ArrayList listHistogram; + private ArrayList listEffectedRowCountHistogram; + private ArrayList listExecuteAndResultHoldTimeHistogram; + private ArrayList listFetchRowCountHistogram; + private ArrayList ids; + private static final String JSON_ID_NAME = "ID"; - public DruidSQLPanel(){ + public DruidSQLPanel() { super(); this.url = REQUEST_URL; } @@ -177,7 +167,7 @@ private void addGroupData(String keyNow, int index) { /** * 数据预处理，将没有用到的数据删除掉，将牵扯到时间分布的数据拆分出来。 - * + * * @param data 要处理的数据 * @return 最终的处理结果 */ @@ -196,7 +186,7 @@ private ArrayList> preProcess(ArrayList dataNow : data) { // 先把不需要显示的内容删除掉 - for (Iterator> it = dataNow.entrySet().iterator(); it.hasNext();) { + for (Iterator> it = dataNow.entrySet().iterator(); it.hasNext(); ) { Entry entry = it.next(); String key = entry.getKey(); Object value = entry.getValue(); @@ -211,11 +201,11 @@ private ArrayList> preProcess(ArrayList) { - dataNow.remove(arrayKey); if (dataIndex == 0) { REAL_SHOW_LIST.remove(arrayKey); @@ -248,7 +238,6 @@ private ArrayList> preProcess(ArrayList> data) { table = new JTable() { - private static final long serialVersionUID = 1L; @Override protected JTableHeader createDefaultTableHeader() { - return new GroupableTableHeader(columnModel); } }; @@ -292,12 +279,12 @@ protected JTableHeader createDefaultTableHeader() { table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); addTableGroup(); table.addMouseListener(new MouseAdapter() { - public void mouseClicked(MouseEvent e) { - if (e.getClickCount() == 2) {// 点击几次，这里是双击事件 + if (e.getClickCount() == 2) { + // 点击几次，这里是双击事件 int row = table.getSelectedRow(); String id = ids.get(row); - new DruidSqlDetailFrame(id,conn); + new DruidSqlDetailFrame(id, conn); } } }); diff --git a/src/main/java/com/alibaba/druid/support/jconsole/DruidSqlDetailFrame.java b/src/main/java/com/alibaba/druid/support/jconsole/DruidSqlDetailFrame.java index c20e4f28e7..8858c05f4b 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/DruidSqlDetailFrame.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/DruidSqlDetailFrame.java @@ -15,26 +15,6 @@ */ package com.alibaba.druid.support.jconsole; -import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.GridLayout; -import java.awt.Toolkit; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map.Entry; - -import javax.management.MBeanServerConnection; -import javax.swing.BorderFactory; -import javax.swing.JFrame; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.JTextArea; -import javax.swing.border.TitledBorder; -import javax.swing.table.JTableHeader; -import javax.swing.table.TableColumn; - import com.alibaba.druid.support.jconsole.model.DruidTableCellRenderer; import com.alibaba.druid.support.jconsole.model.DruidTableModel; import com.alibaba.druid.support.jconsole.util.TableDataProcessor; @@ -42,213 +22,262 @@ import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; +import javax.management.MBeanServerConnection; +import javax.swing.*; +import javax.swing.border.TitledBorder; +import javax.swing.table.JTableHeader; +import javax.swing.table.TableColumn; + +import java.awt.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map.Entry; + // TODO: Auto-generated Javadoc + /** * sql语句的详细信息 - * + *

* 调用服务地址：/sql-{id}.json * 返回信息： * 

  * {
-    "ResultCode": 1,
-    "Content": {
-            "ExecuteCount": 15,
-            "ReadStringLength": 0,
-            "LastSlowParameters": null,
-            "BlobOpenCount": 0,
-            "InputStreamOpenCount": 0,
-            "DbType": "mysql",
-            "DataSource": null,
-            "RunningCount": 0,
-            "parsedRelationships": "[]",
-            "ConcurrentMax": 1,
-            "LastErrorClass": null,
-            "MaxTimespan": 125,
-            "InTransactionCount": 0,
-            "ID": 3,
-            "parsedFields": "[]",
-            "EffectedRowCount": 0,
-            "BatchSizeTotal": 0,
-            "URL": null,
-            "ExecuteAndResultSetHoldTime": 0,
-            "LastErrorMessage": null,
-            "FetchRowCountHistogram": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0
-            ],
-            "FetchRowCountMax": 0,
-            "Histogram": [
-                0,
-                0,
-                13,
-                2,
-                0,
-                0,
-                0,
-                0
-            ],
-            "parsedOrderbycolumns": "[]",
-            "ErrorCount": 0,
-            "SQL": "DROP TABLE t_big",
-            "ClobOpenCount": 0,
-            "LastTime": "2012-09-14 21:35:10",
-            "File": null,
-            "LastErrorStackTrace": null,
-            "LastError": null,
-            "EffectedRowCountHistogram": [
-                15,
-                0,
-                0,
-                0,
-                0,
-                0
-            ],
-            "TotalTime": 742,
-            "formattedSql": "DROP TABLE t_big",
-            "Name": null,
-            "MaxTimespanOccurTime": "2012/09/14 09:35:00:758",
-            "parsedTable": "{t_big=Drop}",
-            "BatchSizeMax": 0,
-            "ReadBytesLength": 0,
-            "EffectedRowCountMax": 0,
-            "FetchRowCount": 0,
-            "parsedConditions": "[]",
-            "ResultSetHoldTime": 0,
-            "ReaderOpenCount": 0,
-            "ExecuteAndResultHoldTimeHistogram": [
-                0,
-                0,
-                13,
-                2,
-                0,
-                0,
-                0,
-                0
-            ],
-            "LastErrorTime": null
-        }
-    }
+ * "ResultCode": 1,
+ * "Content": {
+ * "ExecuteCount": 15,
+ * "ReadStringLength": 0,
+ * "LastSlowParameters": null,
+ * "BlobOpenCount": 0,
+ * "InputStreamOpenCount": 0,
+ * "DbType": "mysql",
+ * "DataSource": null,
+ * "RunningCount": 0,
+ * "parsedRelationships": "[]",
+ * "ConcurrentMax": 1,
+ * "LastErrorClass": null,
+ * "MaxTimespan": 125,
+ * "InTransactionCount": 0,
+ * "ID": 3,
+ * "parsedFields": "[]",
+ * "EffectedRowCount": 0,
+ * "BatchSizeTotal": 0,
+ * "URL": null,
+ * "ExecuteAndResultSetHoldTime": 0,
+ * "LastErrorMessage": null,
+ * "FetchRowCountHistogram": [
+ * 0,
+ * 0,
+ * 0,
+ * 0,
+ * 0,
+ * 0
+ * ],
+ * "FetchRowCountMax": 0,
+ * "Histogram": [
+ * 0,
+ * 0,
+ * 13,
+ * 2,
+ * 0,
+ * 0,
+ * 0,
+ * 0
+ * ],
+ * "parsedOrderbycolumns": "[]",
+ * "ErrorCount": 0,
+ * "SQL": "DROP TABLE t_big",
+ * "ClobOpenCount": 0,
+ * "LastTime": "2012-09-14 21:35:10",
+ * "File": null,
+ * "LastErrorStackTrace": null,
+ * "LastError": null,
+ * "EffectedRowCountHistogram": [
+ * 15,
+ * 0,
+ * 0,
+ * 0,
+ * 0,
+ * 0
+ * ],
+ * "TotalTime": 742,
+ * "formattedSql": "DROP TABLE t_big",
+ * "Name": null,
+ * "MaxTimespanOccurTime": "2012/09/14 09:35:00:758",
+ * "parsedTable": "{t_big=Drop}",
+ * "BatchSizeMax": 0,
+ * "ReadBytesLength": 0,
+ * "EffectedRowCountMax": 0,
+ * "FetchRowCount": 0,
+ * "parsedConditions": "[]",
+ * "ResultSetHoldTime": 0,
+ * "ReaderOpenCount": 0,
+ * "ExecuteAndResultHoldTimeHistogram": [
+ * 0,
+ * 0,
+ * 13,
+ * 2,
+ * 0,
+ * 0,
+ * 0,
+ * 0
+ * ],
+ * "LastErrorTime": null
+ * }
+ * }
  *
+ * * @author yunnysunny [yunnysunny@gmail.com] - * */ + */ public class DruidSqlDetailFrame extends JFrame { + /** + * The Constant serialVersionUID. + */ + private static final long serialVersionUID = 1L; - /** The Constant serialVersionUID. */ - private static final long serialVersionUID = 1L; - - /** service的地址的根路径. */ - private static final String BASE_URL = "/sql"; - - /** json中格式化sql的键名. */ - private static final String KEY_FORMAT_SQL = "formattedSql"; - - /** json中sql的键名. */ - private static final String KEY_SQL = "SQL"; - - /** sql语句的索引. */ - private String id; - - /** MBeanServerConnection对象. */ - private MBeanServerConnection conn; - - /** 解析信息内容表格的标题列. */ - private static final ArrayList PARESE_TITLE_LIST = new ArrayList() { - - private static final long serialVersionUID = 1L; + /** + * service的地址的根路径. + */ + private static final String BASE_URL = "/sql"; - { - add("parsedTable"); - add("parsedFields"); - add("parsedConditions"); - add("parsedRelationships"); - add("parsedOrderbycolumns"); + /** + * json中格式化sql的键名. + */ + private static final String KEY_FORMAT_SQL = "formattedSql"; - } - }; + /** + * json中sql的键名. + */ + private static final String KEY_SQL = "SQL"; - /** 慢查询信息表格的标题列. */ - private static final ArrayList LAST_SLOW_TITLE_LIST = new ArrayList() { + /** + * sql语句的索引. + */ + private String id; - private static final long serialVersionUID = 1L; + /** + * MBeanServerConnection对象. + */ + private MBeanServerConnection conn; - { - add("MaxTimespan"); - add("MaxTimespanOccurTime"); - add("LastSlowParameters"); - } - }; + /** + * 解析信息内容表格的标题列. + */ + private static final ArrayList PARESE_TITLE_LIST = new ArrayList() { + private static final long serialVersionUID = 1L; - /** 错误信息表格的标题列. */ - private static final ArrayList LAST_ERROR_TITLE_LIST = new ArrayList() { + { + add("parsedTable"); + add("parsedFields"); + add("parsedConditions"); + add("parsedRelationships"); + add("parsedOrderbycolumns"); - private static final long serialVersionUID = 1L; + } + }; - { - add("LastErrorMessage"); - add("LastErrorClass"); - add("LastErrorTime"); - add("LastErrorStackTrace"); - } - }; + /** + * 慢查询信息表格的标题列. + */ + private static final ArrayList LAST_SLOW_TITLE_LIST = new ArrayList() { + private static final long serialVersionUID = 1L; - /** 其他信息表格的标题列. */ - private static final ArrayList OTHER_ERROR_TITLE_LIST = new ArrayList() { + { + add("MaxTimespan"); + add("MaxTimespanOccurTime"); + add("LastSlowParameters"); + } + }; - private static final long serialVersionUID = 1L; + /** + * 错误信息表格的标题列. + */ + private static final ArrayList LAST_ERROR_TITLE_LIST = new ArrayList() { + private static final long serialVersionUID = 1L; + + { + add("LastErrorMessage"); + add("LastErrorClass"); + add("LastErrorTime"); + add("LastErrorStackTrace"); + } + }; - { - add("BatchSizeMax"); - add("BatchSizeTotal"); - add("BlobOpenCount"); - add("ClobOpenCount"); - add("ReaderOpenCount"); - add("InputStreamOpenCount"); - add("ReadStringLength"); - add("ReadBytesLength"); - } - }; + /** + * 其他信息表格的标题列. + */ + private static final ArrayList OTHER_ERROR_TITLE_LIST = new ArrayList() { + private static final long serialVersionUID = 1L; + + { + add("BatchSizeMax"); + add("BatchSizeTotal"); + add("BlobOpenCount"); + add("ClobOpenCount"); + add("ReaderOpenCount"); + add("InputStreamOpenCount"); + add("ReadStringLength"); + add("ReadBytesLength"); + } + }; - /** 解析信息数据. */ + /** + * 解析信息数据. + */ private ArrayList> parseData; - /** 慢查询信息数据. */ + /** + * 慢查询信息数据. + */ private ArrayList> lastSlowData; - /** 错误信息数据. */ + /** + * 错误信息数据. + */ private ArrayList> lastErrorData; - /** 其他信息数据. */ + /** + * 其他信息数据. + */ private ArrayList> otherData; - /** 各个数据表格中最大的数据列长度. */ - private int maxListLen; + /** + * 各个数据表格中最大的数据列长度. + */ + private int maxListLen; - /** 格式化好的sql语句内容. */ - private String formatSql; + /** + * 格式化好的sql语句内容. + */ + private String formatSql; - /** 未格式化的sql语句内容. */ - private String sql; + /** + * 未格式化的sql语句内容. + */ + private String sql; - /** 窗体的宽度. */ - private static final int WIDTH = 800; + /** + * 窗体的宽度. + */ + private static final int WIDTH = 800; - /** 窗体的高度. */ - private static final int HEIGHT = 600; + /** + * 窗体的高度. + */ + private static final int HEIGHT = 600; - /** The Constant LOG. */ - private final static Log LOG = LogFactory.getLog(DruidSqlDetailFrame.class); + /** + * The Constant LOG. + */ + private static final Log LOG = LogFactory.getLog(DruidSqlDetailFrame.class); /** * Instantiates a new druid sql detail frame. - * - * @param id sql语句索引 + * + * @param id sql语句索引 * @param conn MBeanServerConnection对象 */ - public DruidSqlDetailFrame(String id, MBeanServerConnection conn){ + public DruidSqlDetailFrame(String id, MBeanServerConnection conn) { this.id = id; this.conn = conn; getMaxListLen(); @@ -258,7 +287,7 @@ public DruidSqlDetailFrame(String id, MBeanServerConnection conn){ /** * 获取各个数据表格中最大的数据列长度 - * + * * @return the max list len */ private void getMaxListLen() { @@ -285,7 +314,7 @@ private void init() { try { ArrayList> data = TableDataProcessor.parseData(TableDataProcessor.getData(url, - conn)); + conn)); if (data != null) { LinkedHashMap contentEle = data.get(0); formatSql = (String) contentEle.remove(KEY_FORMAT_SQL); @@ -302,7 +331,7 @@ private void init() { lastSlowData = new ArrayList>(1); lastErrorData = new ArrayList>(1); otherData = new ArrayList>(1); - for (Iterator> it = contentEle.entrySet().iterator(); it.hasNext();) { + for (Iterator> it = contentEle.entrySet().iterator(); it.hasNext(); ) { Entry entry = it.next(); String key = entry.getKey(); Object value = entry.getValue(); @@ -334,10 +363,10 @@ private void init() { /** * 将表格添加到contentPanel对象内部。 - * + * * @param contentPanel JPanel对象 * @param 当前表格的标题 - * @param data 当前表格的数据 + * @param data 当前表格的数据 */ private void addTable(JPanel contentPanel, String title, ArrayList> data) { final JPanel content1 = new JPanel(); @@ -360,7 +389,7 @@ private void addTable(JPanel contentPanel, String title, ArrayList vector = null; - /** 合并后单元格显示的文本信息 */ - protected String text = null; - /** 合并的单元格内部两个最小JTableHeader的间隙,其实就是去掉线后那个Border */ - private int margin = 0; +public class ColumnGroup { + /** + * 合并的JTableHeader的Renderer + */ + protected TableCellRenderer renderer; + /** + * 合并的单元格的各个实际的最小单元格存储结构 + */ + protected Vector vector; + /** + * 合并后单元格显示的文本信息 + */ + protected String text; + /** + * 合并的单元格内部两个最小JTableHeader的间隙,其实就是去掉线后那个Border + */ + private int margin; - public ColumnGroup(String text){ + public ColumnGroup(String text) { this(null, text); } - public ColumnGroup(TableCellRenderer renderer, String text){ + public ColumnGroup(TableCellRenderer renderer, String text) { if (renderer == null) { this.renderer = new DefaultTableCellRenderer() { - private static final long serialVersionUID = 1L; @Override @@ -73,17 +76,19 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole /** * 增加单元格 - * + * * @param obj */ public void add(Object obj) { - if (obj == null) return; + if (obj == null) { + return; + } vector.addElement(obj); } /** * 根据JTable的某一列取得它的所有的包含列, - * + * * @param column * @param group * @return @@ -91,14 +96,16 @@ public void add(Object obj) { public Vector getColumnGroups(TableColumn column, Vector group) { // 通过递归判断列到底属于那个ColumnGroup group.addElement(this); - if (vector.contains(column)) return group; + if (vector.contains(column)) { + return group; + } Enumeration enumeration = vector.elements(); while (enumeration.hasMoreElements()) { Object obj = enumeration.nextElement(); if (obj instanceof ColumnGroup) { @SuppressWarnings("unchecked") Vector groups = ((ColumnGroup) obj).getColumnGroups(column, - (Vector) group.clone()); + (Vector) group.clone()); if (groups != null) { return groups; } @@ -117,7 +124,7 @@ public Object getHeaderValue() { /** * 取得合并后的单元格的大小 - * + * * @return */ public int getSize() { @@ -127,7 +134,7 @@ public int getSize() { /** * 取得合并后的单元格的大小,这个方法需要计算,首先 是取得一个没有合并的最小单元格的JTableHeader 的大小 * 通过Renderer取得组件 - * + * * @return */ public Dimension getSize(JTable table) { diff --git a/src/main/java/com/alibaba/druid/support/jconsole/model/DruidTableCellRenderer.java b/src/main/java/com/alibaba/druid/support/jconsole/model/DruidTableCellRenderer.java index 59894e63d3..6f53ae3e40 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/model/DruidTableCellRenderer.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/model/DruidTableCellRenderer.java @@ -15,25 +15,21 @@ */ package com.alibaba.druid.support.jconsole.model; -import java.awt.Color; -import java.awt.Component; - -import javax.swing.JLabel; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.TableCellRenderer; +import java.awt.*; + /** * @author yunnysunny[yunnysunny@gmail.com] - * */ + */ public class DruidTableCellRenderer extends JLabel implements TableCellRenderer { - private static final long serialVersionUID = 1L; // This method is called each time a cell in a column // using this renderer needs to be rendered. public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - if ((column == 0)) { setBackground(Color.lightGray); } diff --git a/src/main/java/com/alibaba/druid/support/jconsole/model/DruidTableModel.java b/src/main/java/com/alibaba/druid/support/jconsole/model/DruidTableModel.java index 6985412eaa..955de8b902 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/model/DruidTableModel.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/model/DruidTableModel.java @@ -15,32 +15,35 @@ */ package com.alibaba.druid.support.jconsole.model; -import java.util.ArrayList; -import java.util.LinkedHashMap; - import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; +import java.util.ArrayList; +import java.util.LinkedHashMap; + /** * 自定义duird监控数据表格模板类 - * + * * @author yunnysunny[yunnysunny@gmail.com] */ public class DruidTableModel implements TableModel { - - /** 数据内容. */ + /** + * 数据内容. + */ private ArrayList> list; - /** 自定义列名集合. */ - private ArrayList showKeys; + /** + * 自定义列名集合. + */ + private ArrayList showKeys; - public DruidTableModel(ArrayList> list){ + public DruidTableModel(ArrayList> list) { super(); this.list = list; showKeys = null; } - public DruidTableModel(ArrayList> list, ArrayList showKeys){ + public DruidTableModel(ArrayList> list, ArrayList showKeys) { super(); this.list = list; this.showKeys = showKeys; @@ -102,7 +105,8 @@ public int getRowCount() { */ @Override public Object getValueAt(int rowIndex, int columnIndex) { - if (list != null && rowIndex < list.size()) {// 没有超出最大行数 + if (list != null && rowIndex < list.size()) { + // 没有超出最大行数 LinkedHashMap dataNow = list.get(rowIndex); if (showKeys != null) { int titleLen = showKeys.size(); @@ -126,17 +130,14 @@ public boolean isCellEditable(int rowIndex, int columnIndex) { @Override public void addTableModelListener(TableModelListener l) { - } @Override public void removeTableModelListener(TableModelListener l) { - } @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - } } diff --git a/src/main/java/com/alibaba/druid/support/jconsole/model/GroupableTableHeader.java b/src/main/java/com/alibaba/druid/support/jconsole/model/GroupableTableHeader.java index c59fd10e87..580c730b63 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/model/GroupableTableHeader.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/model/GroupableTableHeader.java @@ -15,20 +15,19 @@ */ package com.alibaba.druid.support.jconsole.model; -import java.util.Enumeration; -import java.util.Vector; - import javax.swing.table.JTableHeader; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; -public class GroupableTableHeader extends JTableHeader { +import java.util.Enumeration; +import java.util.Vector; - private static final long serialVersionUID = 1L; +public class GroupableTableHeader extends JTableHeader { + private static final long serialVersionUID = 1L; // private static final String uiClassID = "GroupableTableHeaderUI"; - protected Vector columnGroups = null; + protected Vector columnGroups; - public GroupableTableHeader(TableColumnModel model){ + public GroupableTableHeader(TableColumnModel model) { super(model); setUI(new GroupableTableHeaderUI()); setReorderingAllowed(false); diff --git a/src/main/java/com/alibaba/druid/support/jconsole/model/GroupableTableHeaderUI.java b/src/main/java/com/alibaba/druid/support/jconsole/model/GroupableTableHeaderUI.java index 2fd72f7a78..3a8e44ae49 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/model/GroupableTableHeaderUI.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/model/GroupableTableHeaderUI.java @@ -15,27 +15,16 @@ */ package com.alibaba.druid.support.jconsole.model; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Rectangle; +import javax.swing.*; +import javax.swing.plaf.basic.BasicTableHeaderUI; +import javax.swing.table.*; + +import java.awt.*; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JTable; -import javax.swing.UIManager; -import javax.swing.plaf.basic.BasicTableHeaderUI; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.JTableHeader; -import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableColumn; -import javax.swing.table.TableColumnModel; - public class GroupableTableHeaderUI extends BasicTableHeaderUI { - private int m_height; private Dimension createHeaderSize(long width) { @@ -68,7 +57,6 @@ public int getHeaderHeight() { TableCellRenderer renderer = aColumn.getHeaderRenderer(); if (renderer == null) { renderer = new DefaultTableCellRenderer() { - private static final long serialVersionUID = 1L; @Override @@ -88,7 +76,7 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole }; } Component comp = renderer.getTableCellRendererComponent(header.getTable(), aColumn.getHeaderValue(), false, - false, -1, column); + false, -1, column); int cHeight = comp.getPreferredSize().height; Enumeration enumeration = ((GroupableTableHeader) header).getColumnGroups(aColumn); if (enumeration != null) { @@ -176,7 +164,6 @@ private void paintCell(Graphics g, Rectangle cellRect, int columnIndex) { // if (renderer == null) { renderer = new DefaultTableCellRenderer() { - private static final long serialVersionUID = 1L; @Override @@ -198,7 +185,7 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole String headerValue = aColumn.getHeaderValue().toString(); Component component = renderer.getTableCellRendererComponent(header.getTable(), headerValue, false, false, -1, - columnIndex); + columnIndex); rendererPane.add(component); rendererPane.paintComponent(g, component, header, cellRect.x, cellRect.y, cellRect.width, cellRect.height, true); @@ -209,7 +196,6 @@ private void paintCell(Graphics g, Rectangle cellRect, ColumnGroup cGroup) { // if (renderer == null) { renderer = new DefaultTableCellRenderer() { - private static final long serialVersionUID = 1L; @Override @@ -231,7 +217,7 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole String headerValue = cGroup.getHeaderValue().toString(); Component component = renderer.getTableCellRendererComponent(header.getTable(), headerValue, false, false, -1, - -1); + -1); rendererPane.add(component); rendererPane.paintComponent(g, component, header, cellRect.x, cellRect.y, cellRect.width, cellRect.height, true); diff --git a/src/main/java/com/alibaba/druid/support/jconsole/model/RowHeaderRenderer.java b/src/main/java/com/alibaba/druid/support/jconsole/model/RowHeaderRenderer.java new file mode 100644 index 0000000000..65a1d183d4 --- /dev/null +++ b/src/main/java/com/alibaba/druid/support/jconsole/model/RowHeaderRenderer.java @@ -0,0 +1,103 @@ +package com.alibaba.druid.support.jconsole.model; + +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.JTableHeader; +import javax.swing.table.TableCellRenderer; + +import java.awt.*; +import java.util.ArrayList; + +/** + * 用于显示RowHeader的JTable的渲染器，当选择某行时，该行颜色会发生变化 + */ +final class RowHeaderRenderer extends JLabel implements TableCellRenderer, ListSelectionListener { + private static final long serialVersionUID = 1L; + private JTable refTable; // 需要添加rowHeader的JTable + private JTable tableShow; // 用于显示rowHeader的JTable + private ArrayList headerList; + private int rowHeightNow; + private int rowSpan; + + public RowHeaderRenderer(JTable refTable, JTable tableShow) { + this(null, refTable, tableShow, 0); + } + + public RowHeaderRenderer(ArrayList headerList, JTable refTable, JTable tableShow, int rowSpan) { + this.headerList = headerList; + this.refTable = refTable; + this.tableShow = tableShow; + // 增加监听器，实现当在refTable中选择行时，RowHeader会发生颜色变化 + ListSelectionModel listModel = refTable.getSelectionModel(); + listModel.addListSelectionListener(this); + rowHeightNow = refTable.getRowCount() * refTable.getRowHeight(); + this.rowSpan = rowSpan; + if (rowSpan > 1) { + rowHeightNow = rowSpan * refTable.getRowHeight(); + } + } + + public Component getTableCellRendererComponent(JTable table, Object obj, boolean isSelected, boolean hasFocus, + int row, int col) { + int rowCountNow = refTable.getRowCount() / rowSpan; + ((DefaultTableModel) table.getModel()).setRowCount(rowCountNow); + JTableHeader header = refTable.getTableHeader(); + this.setOpaque(true); + setBorder(UIManager.getBorder("TableHeader.cellBorder")); // 设置为TableHeader的边框类型 + setHorizontalAlignment(CENTER); // 让text居中显示 + setBackground(header.getBackground()); // 设置背景色为TableHeader的背景色 + if (isSelect(row)) // 当选取单元格时,在row header上设置成选取颜色 + { + setForeground(Color.white); + setBackground(Color.lightGray); + } else { + setForeground(header.getForeground()); + } + setFont(header.getFont()); + if (row <= rowCountNow) { + showCol(row); + } + return this; + } + + private void showCol(int row) { + String text = null; + if (headerList != null && row < headerList.size()) { + text = headerList.get(row); + } else { + text = String.valueOf(row + 1); + } + if (rowSpan > 1) { + setText(text); + this.tableShow.setRowHeight(row, rowHeightNow); + } else { + setText(text); + } + + } + + public void valueChanged(ListSelectionEvent e) { + this.tableShow.repaint(); + } + + private boolean isSelect(int row) { + int[] sel = refTable.getSelectedRows(); + if (rowSpan <= 1) { + for (int item : sel) { + if (item == row) { + return true; + } + } + } else { + for (int item : sel) { + if (item / rowSpan == row) { + return true; + } + } + } + + return false; + } +} diff --git a/src/main/java/com/alibaba/druid/support/jconsole/model/RowHeaderTable.java b/src/main/java/com/alibaba/druid/support/jconsole/model/RowHeaderTable.java index 8810197a67..f054cc6d93 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/model/RowHeaderTable.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/model/RowHeaderTable.java @@ -15,141 +15,37 @@ */ package com.alibaba.druid.support.jconsole.model; -import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; -import java.util.ArrayList; - -import javax.swing.JLabel; -import javax.swing.JTable; -import javax.swing.ListSelectionModel; -import javax.swing.UIManager; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; +import javax.swing.*; import javax.swing.table.DefaultTableModel; -import javax.swing.table.JTableHeader; -import javax.swing.table.TableCellRenderer; + +import java.awt.*; +import java.util.ArrayList; /** * 用于显示RowHeader的JTable，只需要将其加入JScrollPane的RowHeaderView即可为JTable生成行标题 */ public class RowHeaderTable extends JTable { - private static final long serialVersionUID = 1L; /** * 为JTable添加RowHeader， - * - * @param refTable 需要添加rowHeader的JTable + * + * @param refTable 需要添加rowHeader的JTable * @param columnWidth rowHeader的宽度 */ - public RowHeaderTable(JTable refTable, int columnWidth){ + public RowHeaderTable(JTable refTable, int columnWidth) { this(null, refTable, columnWidth, 1); } - public RowHeaderTable(ArrayList title, JTable refTable, int columnWidth){ + public RowHeaderTable(ArrayList title, JTable refTable, int columnWidth) { this(title, refTable, columnWidth, 1); } - public RowHeaderTable(ArrayList title, JTable refTable, int columnWidth, int rowSpan){ + public RowHeaderTable(ArrayList title, JTable refTable, int columnWidth, int rowSpan) { super(new DefaultTableModel(refTable.getRowCount() / rowSpan, 1)); - this.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);// 不可以调整列宽 + this.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); // 不可以调整列宽 this.getColumnModel().getColumn(0).setPreferredWidth(columnWidth); - this.setDefaultRenderer(Object.class, new RowHeaderRenderer(title, refTable, this, rowSpan));// 设置渲染器 + this.setDefaultRenderer(Object.class, new RowHeaderRenderer(title, refTable, this, rowSpan)); // 设置渲染器 this.setPreferredScrollableViewportSize(new Dimension(columnWidth, 0)); } } - -/** - * 用于显示RowHeader的JTable的渲染器，当选择某行时，该行颜色会发生变化 - */ -final class RowHeaderRenderer extends JLabel implements TableCellRenderer, ListSelectionListener { - - private static final long serialVersionUID = 1L; - private JTable refTable; // 需要添加rowHeader的JTable - private JTable tableShow; // 用于显示rowHeader的JTable - private ArrayList headerList; - private int rowHeightNow; - private int rowSpan; - - public RowHeaderRenderer(JTable refTable, JTable tableShow){ - this(null, refTable, tableShow, 0); - } - - public RowHeaderRenderer(ArrayList headerList, JTable refTable, JTable tableShow, int rowSpan){ - this.headerList = headerList; - this.refTable = refTable; - this.tableShow = tableShow; - // 增加监听器，实现当在refTable中选择行时，RowHeader会发生颜色变化 - ListSelectionModel listModel = refTable.getSelectionModel(); - listModel.addListSelectionListener(this); - rowHeightNow = refTable.getRowCount() * refTable.getRowHeight(); - this.rowSpan = rowSpan; - if (rowSpan > 1) { - rowHeightNow = rowSpan * refTable.getRowHeight(); - } - } - - public Component getTableCellRendererComponent(JTable table, Object obj, boolean isSelected, boolean hasFocus, - int row, int col) { - int rowCountNow = refTable.getRowCount() / rowSpan; - ((DefaultTableModel) table.getModel()).setRowCount(rowCountNow); - JTableHeader header = refTable.getTableHeader(); - this.setOpaque(true); - setBorder(UIManager.getBorder("TableHeader.cellBorder"));// 设置为TableHeader的边框类型 - setHorizontalAlignment(CENTER);// 让text居中显示 - setBackground(header.getBackground());// 设置背景色为TableHeader的背景色 - if (isSelect(row)) // 当选取单元格时,在row header上设置成选取颜色 - { - setForeground(Color.white); - setBackground(Color.lightGray); - } else { - setForeground(header.getForeground()); - } - setFont(header.getFont()); - if (row <= rowCountNow) { - showCol(row); - } - return this; - } - - private void showCol(int row) { - - String text = null; - if (headerList != null && row < headerList.size()) { - text = headerList.get(row); - } else { - text = String.valueOf(row + 1); - } - if (rowSpan > 1) { - setText(text); - this.tableShow.setRowHeight(row, rowHeightNow); - } else { - setText(text); - } - - } - - public void valueChanged(ListSelectionEvent e) { - this.tableShow.repaint(); - } - - private boolean isSelect(int row) { - int[] sel = refTable.getSelectedRows(); - if (rowSpan <= 1) { - for (int item : sel) { - if (item == row) { - return true; - } - } - } else { - for (int item : sel) { - if (item / rowSpan == row) { - return true; - } - } - } - - return false; - } -} diff --git a/src/main/java/com/alibaba/druid/support/jconsole/util/TableDataProcessor.java b/src/main/java/com/alibaba/druid/support/jconsole/util/TableDataProcessor.java index 421c657c3e..5f2c9eacc6 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/util/TableDataProcessor.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/util/TableDataProcessor.java @@ -15,51 +15,59 @@ */ package com.alibaba.druid.support.jconsole.util; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; - import com.alibaba.druid.stat.DruidStatService; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + /** * 表格数据处理类 - * + * * @author yunnysunny [yunnysunny@gmail.com] */ public final class TableDataProcessor { + /** + * 名称列的列名. + */ + private static final String COLUMN_KEY_NAME = "名称"; - /** 名称列的列名. */ - private static final String COLUMN_KEY_NAME = "名称"; - - /** 内容列的列名. */ - private static final String COLUMN_VALUE_NAME = "值"; + /** + * 内容列的列名. + */ + private static final String COLUMN_VALUE_NAME = "值"; - /** 返回码在json中的键名 */ - private static final String RESP_JSON_RESULT_KEY = "ResultCode"; - /** 内容在json中的键名 */ + /** + * 返回码在json中的键名 + */ + private static final String RESP_JSON_RESULT_KEY = "ResultCode"; + /** + * 内容在json中的键名 + */ private static final String RESP_JSON_CONTENT_KEY = "Content"; - /** 成功的返回码 */ - protected static final int RESP_SUCCESS_RESULT = 1; - private final static Log LOG = LogFactory.getLog(TableDataProcessor.class); + /** + * 成功的返回码 + */ + protected static final int RESP_SUCCESS_RESULT = 1; + private static final Log LOG = LogFactory.getLog(TableDataProcessor.class); /** * TableDataProcessor的构造函数 */ - private TableDataProcessor(){ - + private TableDataProcessor() { } /** * 将行数据转化为列数据 由于json中的数据是按照一条条的记录返回的， * 而在显示的时候需要按照“名称”、“值”两列显示，所以要做转化。 - * + * * @param rowData 原始数据 * @param keyword 关键字,可以为null * @return 生成的列数据的对象 @@ -95,7 +103,7 @@ public static ColumnData row2col(ArrayList> rowDat /** * 将行数据转化为多个表格中的列数据 和row2col类似，只不过这里是返回多个表格数据 - * + * * @param rowData 原始数据 * @param keyword the keyword * @return 生成的列数据的对象 @@ -132,17 +140,17 @@ public static ColumnData multiRow2Col(ArrayList> r /** * 将行数据转化为列数据，这里只是调用了，将第二个参数置为null。 - * + * * @param rowData 原始数据 * @return 生成的列数据的对象 */ public static ColumnData row2col(ArrayList> rowData) { return row2col(rowData, null); } - + /** * 解析调用service后得到JSON数据 - * + * * @param respData 获取到的json对象 * @return 返回解析后的数据 */ @@ -169,8 +177,8 @@ public static ArrayList> parseData(Object respData /** * 调用service，返回数据 - * - * @param url service的地址 + * + * @param url service的地址 * @param conn MBeanServerConnection对象 * @return 调用service后返回的数据 * @throws Exception @@ -179,8 +187,8 @@ public static Object getData(String url, MBeanServerConnection conn) throws Exce Object o = null; ObjectName name = new ObjectName(DruidStatService.MBEAN_NAME); - String result = (String) conn.invoke(name, "service", new String[] { url }, - new String[] { String.class.getName() }); + String result = (String) conn.invoke(name, "service", new String[]{url}, + new String[]{String.class.getName()}); o = JSONUtils.parse(result); if (LOG.isDebugEnabled()) { LOG.debug(o.toString()); @@ -192,29 +200,36 @@ public static Object getData(String url, MBeanServerConnection conn) throws Exce * The Class ColumnData. */ public static class ColumnData { + /** + * 关键字集合. + */ + private ArrayList names; - /** 关键字集合. */ - private ArrayList names; - - /** 单个表格数据. */ + /** + * 单个表格数据. + */ private ArrayList> data; - /** 多个表格数据. */ + /** + * 多个表格数据. + */ private ArrayList>> tableData; - /** 返回的数据总数，如果返回单个表格，则为表格行数；如果返回多个表格数据，则为表格个数. */ - private int count; + /** + * 返回的数据总数，如果返回单个表格，则为表格行数；如果返回多个表格数据，则为表格个数. + */ + private int count; /** * ColumnData构造函数 */ - public ColumnData(){ + public ColumnData() { super(); } /** * 获取关键字集合 - * + * * @return the names */ public ArrayList getNames() { @@ -223,7 +238,7 @@ public ArrayList getNames() { /** * 设置关键字集合 - * + * * @param names the new names */ public void setNames(ArrayList names) { @@ -232,7 +247,7 @@ public void setNames(ArrayList names) { /** * 获取单个表格数据 - * + * * @return the data */ public ArrayList> getData() { @@ -241,7 +256,7 @@ public ArrayList> getData() { /** * 设置单个表格数据 - * + * * @param data the data */ public void setData(ArrayList> data) { @@ -250,7 +265,7 @@ public void setData(ArrayList> data) { /** * 返回的数据总数，如果返回单个表格，则为表格行数；如果返回多个表格数据，则为表格个数 - * + * * @return the count */ public int getCount() { @@ -259,7 +274,7 @@ public int getCount() { /** * Sets the count. - * + * * @param count the new count */ public void setCount(int count) { @@ -268,7 +283,7 @@ public void setCount(int count) { /** * 返回多个表格数据 - * + * * @return the table data */ public ArrayList>> getTableData() { @@ -277,7 +292,7 @@ public ArrayList>> getTableData() { /** * 设置多个表格数据 - * + * * @param tableData the table data */ public void setTableData(ArrayList>> tableData) { diff --git a/src/main/java/com/alibaba/druid/support/json/JSONParser.java b/src/main/java/com/alibaba/druid/support/json/JSONParser.java index 7f2e77fdd4..90b99d1910 100644 --- a/src/main/java/com/alibaba/druid/support/json/JSONParser.java +++ b/src/main/java/com/alibaba/druid/support/json/JSONParser.java @@ -15,25 +15,24 @@ */ package com.alibaba.druid.support.json; +import com.alibaba.druid.sql.parser.CharTypes; + import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.alibaba.druid.sql.parser.CharTypes; - public class JSONParser { - private String text; - private int index = 0; - private char ch; + private int index; + private char ch; - private Token token; + private Token token; private String stringValue; - private long longValue; + private long longValue; private double doubleValue; - public JSONParser(String text){ + public JSONParser(String text) { this.text = text; ch = text.charAt(0); nextToken(); @@ -94,7 +93,7 @@ public List parseArray() { accept(Token.LBRACKET); ArrayList list = new ArrayList(); - for (;;) { + for (; ; ) { if (token == Token.RBRACKET) { break; } @@ -116,7 +115,7 @@ public Map parseMap() { accept(Token.LBRACE); Map map = new LinkedHashMap(); - for (;;) { + for (; ; ) { if (token == Token.RBRACE) { break; } @@ -161,7 +160,7 @@ final void nextToken() { return; } - for (;;) { + for (; ; ) { if (CharTypes.isWhitespace(ch)) { nextChar(); continue; @@ -242,7 +241,7 @@ private void scanDigit() { int dotCount = 0; StringBuilder digitBuf = new StringBuilder(); - for (;;) { + for (; ; ) { digitBuf.append(ch); nextChar(); @@ -278,7 +277,7 @@ private void scanDigit() { private void scanString() { nextChar(); StringBuilder strBuf = new StringBuilder(); - for (;;) { + for (; ; ) { if (index >= text.length()) { throw new IllegalArgumentException("illegal string : " + strBuf); } @@ -310,7 +309,7 @@ private void scanString() { char c3 = ch; nextChar(); char c4 = ch; - int val = Integer.parseInt(new String(new char[] { c1, c2, c3, c4 }), 16); + int val = Integer.parseInt(new String(new char[]{c1, c2, c3, c4}), 16); strBuf.append((char) val); } else { throw new IllegalArgumentException("illegal string : " + strBuf); @@ -353,17 +352,15 @@ enum Token { LBRACKET("["), // RBRACKET("]"), // COMMA(","), // - COLON(":"), - - ; + COLON(":"); public final String name; - Token(){ + Token() { this(null); } - Token(String name){ + Token(String name) { this.name = name; } } diff --git a/src/main/java/com/alibaba/druid/support/json/JSONUtils.java b/src/main/java/com/alibaba/druid/support/json/JSONUtils.java index e7a735231c..8ca8a1cf4b 100644 --- a/src/main/java/com/alibaba/druid/support/json/JSONUtils.java +++ b/src/main/java/com/alibaba/druid/support/json/JSONUtils.java @@ -16,13 +16,12 @@ package com.alibaba.druid.support.json; public class JSONUtils { - public static String toJSONString(Object o) { JSONWriter writer = new JSONWriter(); writer.writeObject(o); return writer.toString(); } - + public static Object parse(String text) { JSONParser parser = new JSONParser(text); return parser.parse(); diff --git a/src/main/java/com/alibaba/druid/support/json/JSONWriter.java b/src/main/java/com/alibaba/druid/support/json/JSONWriter.java index db705eacc6..911823e4fa 100644 --- a/src/main/java/com/alibaba/druid/support/json/JSONWriter.java +++ b/src/main/java/com/alibaba/druid/support/json/JSONWriter.java @@ -15,24 +15,21 @@ */ package com.alibaba.druid.support.json; -import java.text.SimpleDateFormat; -import java.util.Collection; -import java.util.Date; -import java.util.Map; +import com.alibaba.druid.sql.visitor.SQLEvalVisitor; +import com.alibaba.druid.util.Utils; import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; -import com.alibaba.druid.sql.visitor.SQLEvalVisitor; -import com.alibaba.druid.util.Utils; +import java.text.SimpleDateFormat; +import java.util.Collection; +import java.util.Date; +import java.util.Map; public class JSONWriter { + private StringBuilder out; - private StringBuilder out; - - - - public JSONWriter(){ + public JSONWriter() { this.out = new StringBuilder(); } @@ -47,12 +44,12 @@ public void writeComma() { public void writeArrayEnd() { write(']'); } - + public void writeNull() { write("null"); } - - @SuppressWarnings({ "unchecked", "rawtypes" }) + + @SuppressWarnings({"unchecked", "rawtypes"}) public void writeObject(Object o) { if (o == null) { writeNull(); @@ -129,7 +126,7 @@ public void writeObject(Object o) { writeMap((Map) o); return; } - + if (o == SQLEvalVisitor.EVAL_VALUE_NULL) { write("null"); return; @@ -206,7 +203,7 @@ public void writeString(String text) { writeNull(); return; } - + write('"'); for (int i = 0; i < text.length(); ++i) { char c = text.charAt(i); diff --git a/src/main/java/com/alibaba/druid/support/logging/JakartaCommonsLoggingImpl.java b/src/main/java/com/alibaba/druid/support/logging/JakartaCommonsLoggingImpl.java index 20df2fd852..ea35299ef3 100644 --- a/src/main/java/com/alibaba/druid/support/logging/JakartaCommonsLoggingImpl.java +++ b/src/main/java/com/alibaba/druid/support/logging/JakartaCommonsLoggingImpl.java @@ -19,7 +19,6 @@ import org.apache.commons.logging.LogFactory; public class JakartaCommonsLoggingImpl implements com.alibaba.druid.support.logging.Log { - private Log log; private int errorCount; @@ -28,14 +27,14 @@ public class JakartaCommonsLoggingImpl implements com.alibaba.druid.support.logg private int debugCount; /** - * @since 0.2.1 * @param log + * @since 0.2.1 */ - public JakartaCommonsLoggingImpl(Log log){ + public JakartaCommonsLoggingImpl(Log log) { this.log = log; } - public JakartaCommonsLoggingImpl(String loggerName){ + public JakartaCommonsLoggingImpl(String loggerName) { log = LogFactory.getLog(loggerName); } diff --git a/src/main/java/com/alibaba/druid/support/logging/Jdk14LoggingImpl.java b/src/main/java/com/alibaba/druid/support/logging/Jdk14LoggingImpl.java index 2a16595ec4..c5a58e99bb 100644 --- a/src/main/java/com/alibaba/druid/support/logging/Jdk14LoggingImpl.java +++ b/src/main/java/com/alibaba/druid/support/logging/Jdk14LoggingImpl.java @@ -19,17 +19,16 @@ import java.util.logging.Logger; public class Jdk14LoggingImpl implements Log { - private Logger log; - private int errorCount; - private int warnCount; - private int infoCount; - private int debugCount; + private int errorCount; + private int warnCount; + private int infoCount; + private int debugCount; private String loggerName; - public Jdk14LoggingImpl(String loggerName){ + public Jdk14LoggingImpl(String loggerName) { this.loggerName = loggerName; log = Logger.getLogger(loggerName); } diff --git a/src/main/java/com/alibaba/druid/support/logging/Log.java b/src/main/java/com/alibaba/druid/support/logging/Log.java index e43f4d6411..dc9686d323 100644 --- a/src/main/java/com/alibaba/druid/support/logging/Log.java +++ b/src/main/java/com/alibaba/druid/support/logging/Log.java @@ -16,7 +16,6 @@ package com.alibaba.druid.support.logging; public interface Log { - boolean isDebugEnabled(); void error(String msg, Throwable e); @@ -36,7 +35,7 @@ public interface Log { void warn(String msg); void warn(String msg, Throwable e); - + boolean isErrorEnabled(); int getErrorCount(); diff --git a/src/main/java/com/alibaba/druid/support/logging/Log4j2Impl.java b/src/main/java/com/alibaba/druid/support/logging/Log4j2Impl.java index 6a1214f28a..1e212cf273 100644 --- a/src/main/java/com/alibaba/druid/support/logging/Log4j2Impl.java +++ b/src/main/java/com/alibaba/druid/support/logging/Log4j2Impl.java @@ -20,23 +20,22 @@ * limitations under the License. */ public class Log4j2Impl implements Log { - private Logger log; - private int errorCount; - private int warnCount; - private int infoCount; - private int debugCount; + private int errorCount; + private int warnCount; + private int infoCount; + private int debugCount; /** - * @since 0.2.21 * @param log + * @since 0.2.21 */ - public Log4j2Impl(Logger log){ + public Log4j2Impl(Logger log) { this.log = log; } - public Log4j2Impl(String loggerName){ + public Log4j2Impl(String loggerName) { log = LogManager.getLogger(loggerName); } @@ -109,7 +108,7 @@ public void info(String msg) { public boolean isWarnEnabled() { return log.isEnabled(Level.WARN); } - + public boolean isErrorEnabled() { return log.isErrorEnabled(); } diff --git a/src/main/java/com/alibaba/druid/support/logging/Log4jImpl.java b/src/main/java/com/alibaba/druid/support/logging/Log4jImpl.java index 4cb9be529e..c3cd363dfd 100644 --- a/src/main/java/com/alibaba/druid/support/logging/Log4jImpl.java +++ b/src/main/java/com/alibaba/druid/support/logging/Log4jImpl.java @@ -19,28 +19,27 @@ import org.apache.log4j.Logger; public class Log4jImpl implements Log { - private static final String callerFQCN = Log4jImpl.class.getName(); - private Logger log; + private Logger log; - private int errorCount; - private int warnCount; - private int infoCount; - private int debugCount; + private int errorCount; + private int warnCount; + private int infoCount; + private int debugCount; /** - * @since 0.2.21 * @param log + * @since 0.2.21 */ - public Log4jImpl(Logger log){ + public Log4jImpl(Logger log) { this.log = log; } - public Log4jImpl(String loggerName){ + public Log4jImpl(String loggerName) { log = Logger.getLogger(loggerName); } - + public Logger getLog() { return log; } @@ -110,7 +109,7 @@ public void info(String msg) { public boolean isWarnEnabled() { return log.isEnabledFor(Level.WARN); } - + public boolean isErrorEnabled() { return log.isEnabledFor(Level.ERROR); } diff --git a/src/main/java/com/alibaba/druid/support/logging/LogFactory.java b/src/main/java/com/alibaba/druid/support/logging/LogFactory.java index b2ca8a0deb..b4b5549ff9 100644 --- a/src/main/java/com/alibaba/druid/support/logging/LogFactory.java +++ b/src/main/java/com/alibaba/druid/support/logging/LogFactory.java @@ -19,22 +19,21 @@ @SuppressWarnings("rawtypes") public class LogFactory { - private static Constructor logConstructor; static { - String logType= System.getProperty("druid.logType"); - if(logType != null){ - if(logType.equalsIgnoreCase("slf4j")){ + String logType = System.getProperty("druid.logType"); + if (logType != null) { + if (logType.equalsIgnoreCase("slf4j")) { tryImplementation("org.slf4j.Logger", "com.alibaba.druid.support.logging.SLF4JImpl"); - }else if(logType.equalsIgnoreCase("log4j")){ + } else if (logType.equalsIgnoreCase("log4j")) { tryImplementation("org.apache.log4j.Logger", "com.alibaba.druid.support.logging.Log4jImpl"); - }else if(logType.equalsIgnoreCase("log4j2")){ + } else if (logType.equalsIgnoreCase("log4j2")) { tryImplementation("org.apache.logging.log4j.Logger", "com.alibaba.druid.support.logging.Log4j2Impl"); - }else if(logType.equalsIgnoreCase("commonsLog")){ + } else if (logType.equalsIgnoreCase("commonsLog")) { tryImplementation("org.apache.commons.logging.LogFactory", "com.alibaba.druid.support.logging.JakartaCommonsLoggingImpl"); - }else if(logType.equalsIgnoreCase("jdkLog")){ + } else if (logType.equalsIgnoreCase("jdkLog")) { tryImplementation("java.util.logging.Logger", "com.alibaba.druid.support.logging.Jdk14LoggingImpl"); } } @@ -43,7 +42,7 @@ public class LogFactory { tryImplementation("org.apache.log4j.Logger", "com.alibaba.druid.support.logging.Log4jImpl"); tryImplementation("org.apache.logging.log4j.Logger", "com.alibaba.druid.support.logging.Log4j2Impl"); tryImplementation("org.apache.commons.logging.LogFactory", - "com.alibaba.druid.support.logging.JakartaCommonsLoggingImpl"); + "com.alibaba.druid.support.logging.JakartaCommonsLoggingImpl"); tryImplementation("java.util.logging.Logger", "com.alibaba.druid.support.logging.Jdk14LoggingImpl"); if (logConstructor == null) { @@ -64,7 +63,7 @@ private static void tryImplementation(String testClassName, String implClassName try { Resources.classForName(testClassName); Class implClass = Resources.classForName(implClassName); - logConstructor = implClass.getConstructor(new Class[] { String.class }); + logConstructor = implClass.getConstructor(new Class[]{String.class}); Class declareClass = logConstructor.getDeclaringClass(); if (!Log.class.isAssignableFrom(declareClass)) { @@ -101,7 +100,7 @@ public static synchronized void selectLog4JLogging() { try { Resources.classForName("org.apache.log4j.Logger"); Class implClass = Resources.classForName("com.alibaba.druid.support.logging.Log4jImpl"); - logConstructor = implClass.getConstructor(new Class[] { String.class }); + logConstructor = implClass.getConstructor(new Class[]{String.class}); } catch (Throwable t) { //ignore } @@ -112,7 +111,7 @@ public static synchronized void selectJavaLogging() { try { Resources.classForName("java.util.logging.Logger"); Class implClass = Resources.classForName("com.alibaba.druid.support.logging.Jdk14LoggingImpl"); - logConstructor = implClass.getConstructor(new Class[] { String.class }); + logConstructor = implClass.getConstructor(new Class[]{String.class}); } catch (Throwable t) { //ignore } diff --git a/src/main/java/com/alibaba/druid/support/logging/NoLoggingImpl.java b/src/main/java/com/alibaba/druid/support/logging/NoLoggingImpl.java index 052c200dd4..977faf9dd2 100644 --- a/src/main/java/com/alibaba/druid/support/logging/NoLoggingImpl.java +++ b/src/main/java/com/alibaba/druid/support/logging/NoLoggingImpl.java @@ -16,19 +16,18 @@ package com.alibaba.druid.support.logging; public class NoLoggingImpl implements Log { - - private int infoCount; - private int errorCount; - private int warnCount; - private int debugCount; + private int infoCount; + private int errorCount; + private int warnCount; + private int debugCount; private String loggerName; - - private boolean debugEnable = false; + + private boolean debugEnable; private boolean infoEnable = true; private boolean warnEnable = true; private boolean errorEnable = true; - public NoLoggingImpl(String loggerName){ + public NoLoggingImpl(String loggerName) { this.loggerName = loggerName; } @@ -44,7 +43,7 @@ public void error(String s, Throwable e) { if (!errorEnable) { return; } - + error(s); if (e != null) { @@ -119,7 +118,7 @@ public int getDebugCount() { public boolean isErrorEnabled() { return errorEnable; } - + public void setErrorEnabled(boolean value) { this.errorEnable = value; } diff --git a/src/main/java/com/alibaba/druid/support/logging/Resources.java b/src/main/java/com/alibaba/druid/support/logging/Resources.java index 862410947e..d417593a3c 100644 --- a/src/main/java/com/alibaba/druid/support/logging/Resources.java +++ b/src/main/java/com/alibaba/druid/support/logging/Resources.java @@ -15,20 +15,18 @@ */ package com.alibaba.druid.support.logging; - /** * A class to simplify access to resources through the classloader. */ public final class Resources extends Object { - private static ClassLoader defaultClassLoader; - private Resources(){ + private Resources() { } /** * Returns the default classloader (may be null). - * + * * @return The default classloader */ public static ClassLoader getDefaultClassLoader() { @@ -37,7 +35,7 @@ public static ClassLoader getDefaultClassLoader() { /** * Sets the default classloader - * + * * @param defaultClassLoader - the new default ClassLoader */ public static void setDefaultClassLoader(ClassLoader defaultClassLoader) { @@ -46,7 +44,7 @@ public static void setDefaultClassLoader(ClassLoader defaultClassLoader) { /** * Loads a class - * + * * @param className - the class to load * @return The loaded class * @throws ClassNotFoundException If the class cannot be found (duh!) diff --git a/src/main/java/com/alibaba/druid/support/logging/SLF4JImpl.java b/src/main/java/com/alibaba/druid/support/logging/SLF4JImpl.java index 6c17e9e8b5..c821353325 100644 --- a/src/main/java/com/alibaba/druid/support/logging/SLF4JImpl.java +++ b/src/main/java/com/alibaba/druid/support/logging/SLF4JImpl.java @@ -20,9 +20,9 @@ import org.slf4j.spi.LocationAwareLogger; public class SLF4JImpl implements Log { - private static final String callerFQCN = SLF4JImpl.class.getName(); private static final Logger testLogger = LoggerFactory.getLogger(SLF4JImpl.class); + static { // if the logger is not a LocationAwareLogger instance, it can not get correct stack StackTraceElement // so ignore this implementation. @@ -30,17 +30,18 @@ public class SLF4JImpl implements Log { throw new UnsupportedOperationException(testLogger.getClass() + " is not a suitable logger"); } } - private int errorCount; - private int warnCount; - private int infoCount; - private int debugCount; + + private int errorCount; + private int warnCount; + private int infoCount; + private int debugCount; private LocationAwareLogger log; - public SLF4JImpl(LocationAwareLogger log){ + public SLF4JImpl(LocationAwareLogger log) { this.log = log; } - public SLF4JImpl(String loggerName){ + public SLF4JImpl(String loggerName) { this.log = (LocationAwareLogger) LoggerFactory.getLogger(loggerName); } @@ -88,7 +89,7 @@ public void debug(String msg, Throwable e) { public boolean isWarnEnabled() { return log.isWarnEnabled(); } - + @Override public boolean isErrorEnabled() { return log.isErrorEnabled(); diff --git a/src/main/java/com/alibaba/druid/support/metrics/MetricCollector.java b/src/main/java/com/alibaba/druid/support/metrics/MetricCollector.java index 1a0e3bee77..b093887976 100644 --- a/src/main/java/com/alibaba/druid/support/metrics/MetricCollector.java +++ b/src/main/java/com/alibaba/druid/support/metrics/MetricCollector.java @@ -16,8 +16,6 @@ package com.alibaba.druid.support.metrics; public class MetricCollector { - public void collect() throws Exception { - } } diff --git a/src/main/java/com/alibaba/druid/support/monitor/MonitorClient.java b/src/main/java/com/alibaba/druid/support/monitor/MonitorClient.java index de2375453e..91bb80a53b 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/MonitorClient.java +++ b/src/main/java/com/alibaba/druid/support/monitor/MonitorClient.java @@ -15,23 +15,6 @@ */ package com.alibaba.druid.support.monitor; -import static com.alibaba.druid.util.Utils.getBoolean; -import static com.alibaba.druid.util.Utils.getInteger; - -import java.lang.management.ManagementFactory; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.util.ArrayList; -import java.util.Date; -import java.util.Enumeration; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceStatValue; import com.alibaba.druid.stat.DruidDataSourceStatManager; @@ -50,36 +33,46 @@ import com.alibaba.druid.util.Utils; import com.alibaba.druid.wall.WallProviderStatValue; -public class MonitorClient { +import java.lang.management.ManagementFactory; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.util.*; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +import static com.alibaba.druid.util.Utils.getBoolean; +import static com.alibaba.druid.util.Utils.getInteger; - private final static Log LOG = LogFactory.getLog(MonitorClient.class); +public class MonitorClient { + private static final Log LOG = LogFactory.getLog(MonitorClient.class); - private final static long DEFAULT_TIME_BETWEEN_COLLECT = 60 * 5; + private static final long DEFAULT_TIME_BETWEEN_COLLECT = 60 * 5; private ScheduledExecutorService scheduler; - private int schedulerThreadSize = 1; + private int schedulerThreadSize = 1; - private long timeBetweenSqlCollect = DEFAULT_TIME_BETWEEN_COLLECT; - private long timeBetweenSpringCollect = DEFAULT_TIME_BETWEEN_COLLECT; - private long timeBetweenWebUriCollect = DEFAULT_TIME_BETWEEN_COLLECT; - private TimeUnit timeUnit = TimeUnit.SECONDS; + private long timeBetweenSqlCollect = DEFAULT_TIME_BETWEEN_COLLECT; + private long timeBetweenSpringCollect = DEFAULT_TIME_BETWEEN_COLLECT; + private long timeBetweenWebUriCollect = DEFAULT_TIME_BETWEEN_COLLECT; + private TimeUnit timeUnit = TimeUnit.SECONDS; - private boolean collectSqlEnable = true; - private boolean collectSqlWallEnable = true; - private boolean collectSpringMethodEnable = true; - private boolean collectWebAppEnable = true; - private boolean collectWebURIEnable = true; + private boolean collectSqlEnable = true; + private boolean collectSqlWallEnable = true; + private boolean collectSpringMethodEnable = true; + private boolean collectWebAppEnable = true; + private boolean collectWebURIEnable = true; - private MonitorDao dao; + private MonitorDao dao; - private String domain; - private String app; - private String cluster; - private String host; - private String ip; - private int pid; + private String domain; + private String app; + private String cluster; + private String host; + private String ip; + private int pid; - public MonitorClient(){ + public MonitorClient() { String name = ManagementFactory.getRuntimeMXBean().getName(); String[] items = name.split("@"); @@ -175,7 +168,6 @@ public void configFromProperty(Properties properties) { } public void stop() { - } public void start() { @@ -186,7 +178,6 @@ public void start() { } scheduler.scheduleAtFixedRate(new Runnable() { - @Override public void run() { collectSql(); @@ -194,7 +185,6 @@ public void run() { }, timeBetweenSqlCollect, timeBetweenSqlCollect, timeUnit); scheduler.scheduleAtFixedRate(new Runnable() { - @Override public void run() { collectSpringMethod(); @@ -202,7 +192,6 @@ public void run() { }, timeBetweenSpringCollect, timeBetweenSpringCollect, timeUnit); scheduler.scheduleAtFixedRate(new Runnable() { - @Override public void run() { collectWebURI(); diff --git a/src/main/java/com/alibaba/druid/support/monitor/MonitorContext.java b/src/main/java/com/alibaba/druid/support/monitor/MonitorContext.java index 131d7ce690..f3b6cc121f 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/MonitorContext.java +++ b/src/main/java/com/alibaba/druid/support/monitor/MonitorContext.java @@ -20,22 +20,20 @@ import java.util.Map; public class MonitorContext { - - public static String DEFAULT_DOMAIN; + public static String DEFAULT_DOMAIN; private final Map attributes = new HashMap(); - private String domain = "default"; - private String app = "default"; - private String cluster = "default"; - private String host; - private int pid; - - private Date collectTime; - private Date startTime; + private String domain = "default"; + private String app = "default"; + private String cluster = "default"; + private String host; + private int pid; - public MonitorContext(){ + private Date collectTime; + private Date startTime; + public MonitorContext() { } public Date getCollectTime() { diff --git a/src/main/java/com/alibaba/druid/support/monitor/MonitorServlet.java b/src/main/java/com/alibaba/druid/support/monitor/MonitorServlet.java index 42b00d4920..4c5b5b5c01 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/MonitorServlet.java +++ b/src/main/java/com/alibaba/druid/support/monitor/MonitorServlet.java @@ -15,18 +15,17 @@ */ package com.alibaba.druid.support.monitor; +import com.alibaba.druid.support.http.ResourceServlet; + import java.util.HashSet; import java.util.Set; -import com.alibaba.druid.support.http.ResourceServlet; - @SuppressWarnings("serial") public class MonitorServlet extends ResourceServlet { + private String mappingPath = "support/http/resources"; + private Set mapping = new HashSet(); - private String mappingPath = "support/http/resources"; - private Set mapping = new HashSet(); - - public MonitorServlet(){ + public MonitorServlet() { super("support/monitor/resources"); mapping.add("/css/bootstrap.min.css"); diff --git a/src/main/java/com/alibaba/druid/support/monitor/annotation/MField.java b/src/main/java/com/alibaba/druid/support/monitor/annotation/MField.java index 3c4670c10e..5857c4644a 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/annotation/MField.java +++ b/src/main/java/com/alibaba/druid/support/monitor/annotation/MField.java @@ -21,9 +21,8 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.FIELD }) +@Target(ElementType.FIELD) public @interface MField { - String name() default ""; boolean groupBy() default false; diff --git a/src/main/java/com/alibaba/druid/support/monitor/annotation/MTable.java b/src/main/java/com/alibaba/druid/support/monitor/annotation/MTable.java index beddfa82fd..d5b1c2a318 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/annotation/MTable.java +++ b/src/main/java/com/alibaba/druid/support/monitor/annotation/MTable.java @@ -21,8 +21,7 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.TYPE }) +@Target(ElementType.TYPE) public @interface MTable { - String name(); } diff --git a/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDao.java b/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDao.java index 0c95cf524f..bb967c60b3 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDao.java +++ b/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDao.java @@ -15,11 +15,6 @@ */ package com.alibaba.druid.support.monitor.dao; -import java.sql.SQLException; -import java.util.Date; -import java.util.List; -import java.util.Map; - import com.alibaba.druid.pool.DruidDataSourceStatValue; import com.alibaba.druid.stat.JdbcSqlStatValue; import com.alibaba.druid.support.http.stat.WebAppStatValue; @@ -28,8 +23,12 @@ import com.alibaba.druid.support.spring.stat.SpringMethodStatValue; import com.alibaba.druid.wall.WallProviderStatValue; -public interface MonitorDao { +import java.sql.SQLException; +import java.util.Date; +import java.util.List; +import java.util.Map; +public interface MonitorDao { void saveSql(MonitorContext ctx, List statList); void saveSqlWall(MonitorContext ctx, List statList); diff --git a/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java b/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java index 72cc4a0061..907d976f7c 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java +++ b/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java @@ -15,24 +15,6 @@ */ package com.alibaba.druid.support.monitor.dao; -import java.lang.reflect.Field; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Timestamp; -import java.sql.Types; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -import javax.sql.DataSource; - import com.alibaba.druid.DruidRuntimeException; import com.alibaba.druid.pool.DruidDataSourceStatValue; import com.alibaba.druid.stat.JdbcSqlStatValue; @@ -56,45 +38,57 @@ import com.alibaba.druid.wall.WallSqlStatValue; import com.alibaba.druid.wall.WallTableStatValue; -public class MonitorDaoJdbcImpl implements MonitorDao { +import javax.sql.DataSource; - private final static Log LOG = LogFactory.getLog(MonitorDaoJdbcImpl.class); - - private DataSource dataSource; - - private BeanInfo dataSourceStatBeanInfo = new BeanInfo( - DruidDataSourceStatValue.class); - private BeanInfo sqlStatBeanInfo = new BeanInfo( - JdbcSqlStatValue.class); - private BeanInfo springMethodStatBeanInfo = new BeanInfo( - SpringMethodStatValue.class); - private BeanInfo webURIStatBeanInfo = new BeanInfo( - WebURIStatValue.class); - private BeanInfo webAppStatBeanInfo = new BeanInfo( - WebAppStatValue.class); - - private BeanInfo wallProviderStatBeanInfo = new BeanInfo( - WallProviderStatValue.class); - private BeanInfo wallSqlStatBeanInfo = new BeanInfo( - WallSqlStatValue.class); - private BeanInfo wallTableStatBeanInfo = new BeanInfo( - WallTableStatValue.class); - private BeanInfo wallFunctionStatBeanInfo = new BeanInfo( - WallFunctionStatValue.class); - - private ConcurrentMap> cacheMap = new ConcurrentHashMap>(); - - public MonitorDaoJdbcImpl(){ +import java.lang.reflect.Field; +import java.sql.*; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +public class MonitorDaoJdbcImpl implements MonitorDao { + private static final Log LOG = LogFactory.getLog(MonitorDaoJdbcImpl.class); + + private DataSource dataSource; + + private BeanInfo dataSourceStatBeanInfo = new BeanInfo( + DruidDataSourceStatValue.class); + private BeanInfo sqlStatBeanInfo = new BeanInfo( + JdbcSqlStatValue.class); + private BeanInfo springMethodStatBeanInfo = new BeanInfo( + SpringMethodStatValue.class); + private BeanInfo webURIStatBeanInfo = new BeanInfo( + WebURIStatValue.class); + private BeanInfo webAppStatBeanInfo = new BeanInfo( + WebAppStatValue.class); + + private BeanInfo wallProviderStatBeanInfo = new BeanInfo( + WallProviderStatValue.class); + private BeanInfo wallSqlStatBeanInfo = new BeanInfo( + WallSqlStatValue.class); + private BeanInfo wallTableStatBeanInfo = new BeanInfo( + WallTableStatValue.class); + private BeanInfo wallFunctionStatBeanInfo = new BeanInfo( + WallFunctionStatValue.class); + + private ConcurrentMap> cacheMap = new ConcurrentHashMap>(); + + public MonitorDaoJdbcImpl() { } public void createTables(String dbType) { - String[] resources = new String[] { "basic.sql", // + String[] resources = new String[]{"basic.sql", // "const.sql", // "datasource.sql", // "springmethod.sql", // "sql.sql", // "webapp.sql", // - "weburi.sql", "wall.sql" }; + "weburi.sql", "wall.sql"}; for (String item : resources) { String path = "/support/monitor/" + dbType + "/" + item; @@ -177,7 +171,6 @@ static Integer getInteger(Map filters, String key) { } if (value instanceof String) { - String text = (String) value; if (StringUtils.isEmpty(text)) { return null; @@ -202,7 +195,6 @@ static Date getDate(Map filters, String key) { } if (value instanceof String) { - String text = (String) value; if (StringUtils.isEmpty(text)) { return null; @@ -591,7 +583,7 @@ public String buildInsertSql(BeanInfo beanInfo) { StringBuilder buf = new StringBuilder(); buf.append("INSERT INTO ") // - .append(getTableName(beanInfo)); + .append(getTableName(beanInfo)); buf.append(" (domain, app, cluster, host, pid, collectTime"); List fields = beanInfo.getFields(); @@ -658,16 +650,15 @@ static void setParam(PreparedStatement stmt, int paramIndex, Date value) throws } public static class BeanInfo { - - private final Class clazz; - private final List fields = new ArrayList(); + private final Class clazz; + private final List fields = new ArrayList(); private final List groupByFields = new ArrayList(); - private final List hashFields = new ArrayList(); - private final String tableName; + private final List hashFields = new ArrayList(); + private final String tableName; - private String insertSql; + private String insertSql; - public BeanInfo(Class clazz){ + public BeanInfo(Class clazz) { this.clazz = clazz; { @@ -770,13 +761,12 @@ public void cachePut(String type, Long hash, String value) { } public static class FieldInfo { - - private final Field field; + private final Field field; private final String columnName; - private final Field hashFor; + private final Field hashFor; private final String hashForType; - public FieldInfo(Field field, String columnName, Field hashFor, String hashForType){ + public FieldInfo(Field field, String columnName, Field hashFor, String hashForType) { this.field = field; this.columnName = columnName; this.hashFor = hashFor; @@ -824,7 +814,7 @@ public List listApp(String domain) throws SQLException { List list = new ArrayList(); String sql = "select id, domain, app from druid_app " // - + " where domain = ?"; + + " where domain = ?"; Connection conn = null; PreparedStatement stmt = null; ResultSet rs = null; @@ -849,7 +839,7 @@ public List listApp(String domain) throws SQLException { public MonitorApp findApp(String domain, String app) throws SQLException { String sql = "select id, domain, app from druid_app " // - + " where domain = ? and app = ?"; + + " where domain = ? and app = ?"; Connection conn = null; PreparedStatement stmt = null; ResultSet rs = null; @@ -887,7 +877,7 @@ public List listCluster(String domain, String app) throws SQLExc List list = new ArrayList(); String sql = "select id, domain, app, cluster from druid_cluster " // - + " where domain = ?"; + + " where domain = ?"; if (app != null) { sql += " and app = ?"; @@ -930,7 +920,7 @@ public void insertClusterIfNotExits(String domain, String app, String cluster) t public MonitorCluster findCluster(String domain, String app, String cluster) throws SQLException { String sql = "select id, domain, app, cluster from druid_cluster " // - + " where domain = ? and app = ? and cluster = ?"; + + " where domain = ? and app = ? and cluster = ?"; Connection conn = null; PreparedStatement stmt = null; ResultSet rs = null; @@ -971,19 +961,19 @@ public void insertOrUpdateInstance(String domain, String app, String cluster, St MonitorInstance monitorInst = findInst(domain, app, cluster, host); if (monitorInst == null) { String sql = "insert into druid_inst (domain, app, cluster, host, ip, lastActiveTime, lastPID) " // - + " values (?, ?, ?, ?, ?, ?, ?)"; + + " values (?, ?, ?, ?, ?, ?, ?)"; JdbcUtils.execute(dataSource, sql, domain, app, cluster, host, ip, startTime, pid); } else { String sql = "update druid_inst set ip = ?, lastActiveTime = ?, lastPID = ? " // - + " where domain = ? and app = ? and cluster = ? and host = ? "; + + " where domain = ? and app = ? and cluster = ? and host = ? "; JdbcUtils.execute(dataSource, sql, ip, startTime, pid, domain, app, cluster, host); } } public MonitorInstance findInst(String domain, String app, String cluster, String host) throws SQLException { String sql = "select id, domain, app, cluster, host, ip, lastActiveTime, lastPID from druid_inst " // - + " where domain = ? and app = ? and cluster = ? and host = ? " // - + " limit 1"; + + " where domain = ? and app = ? and cluster = ? and host = ? " // + + " limit 1"; Connection conn = null; PreparedStatement stmt = null; ResultSet rs = null; @@ -1013,7 +1003,7 @@ public List listInst(String domain, String app, String cluster) List list = new ArrayList(); String sql = "select id, domain, app, cluster, host, ip, lastActiveTime, lastPID from druid_inst " // - + "where domain = ?"; + + "where domain = ?"; if (app != null) { sql += " and app = ?"; diff --git a/src/main/java/com/alibaba/druid/support/monitor/entity/MonitorApp.java b/src/main/java/com/alibaba/druid/support/monitor/entity/MonitorApp.java index 4cdde9b8eb..be10a3b890 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/entity/MonitorApp.java +++ b/src/main/java/com/alibaba/druid/support/monitor/entity/MonitorApp.java @@ -16,8 +16,7 @@ package com.alibaba.druid.support.monitor.entity; public class MonitorApp { - - private long id; + private long id; private String domain; private String app; diff --git a/src/main/java/com/alibaba/druid/support/monitor/entity/MonitorCluster.java b/src/main/java/com/alibaba/druid/support/monitor/entity/MonitorCluster.java index 6bf731214f..f431fdc714 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/entity/MonitorCluster.java +++ b/src/main/java/com/alibaba/druid/support/monitor/entity/MonitorCluster.java @@ -16,8 +16,7 @@ package com.alibaba.druid.support.monitor.entity; public class MonitorCluster { - - private long id; + private long id; private String domain; private String app; private String cluster; diff --git a/src/main/java/com/alibaba/druid/support/monitor/entity/MonitorInstance.java b/src/main/java/com/alibaba/druid/support/monitor/entity/MonitorInstance.java index c89a98ee3c..311a783934 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/entity/MonitorInstance.java +++ b/src/main/java/com/alibaba/druid/support/monitor/entity/MonitorInstance.java @@ -18,15 +18,14 @@ import java.util.Date; public class MonitorInstance { - - private long id; + private long id; private String domain; private String app; private String cluster; private String host; private String ip; - private Date lastActiveTime; - private Long lastPID; + private Date lastActiveTime; + private Long lastPID; public long getId() { return id; diff --git a/src/main/java/com/alibaba/druid/support/opds/udf/ExportColumns.java b/src/main/java/com/alibaba/druid/support/opds/udf/ExportColumns.java index 807a1cfc9a..7a55edb22d 100644 --- a/src/main/java/com/alibaba/druid/support/opds/udf/ExportColumns.java +++ b/src/main/java/com/alibaba/druid/support/opds/udf/ExportColumns.java @@ -25,7 +25,6 @@ import java.util.List; public class ExportColumns extends UDF { - public String evaluate(String sql) { return evaluate(sql, null); } diff --git a/src/main/java/com/alibaba/druid/support/opds/udf/ExportConditionColumns.java b/src/main/java/com/alibaba/druid/support/opds/udf/ExportConditionColumns.java index 91bb97c053..6ba953d9fe 100644 --- a/src/main/java/com/alibaba/druid/support/opds/udf/ExportConditionColumns.java +++ b/src/main/java/com/alibaba/druid/support/opds/udf/ExportConditionColumns.java @@ -25,7 +25,6 @@ import java.util.List; public class ExportConditionColumns extends UDF { - public String evaluate(String sql) { return evaluate(sql, null); } @@ -46,7 +45,7 @@ public String evaluate(String sql, String dbTypeName) { if ((!column.isWhere()) && !column.isJoin()) { continue; } - + if (buf.length() != 0) { buf.append(','); } diff --git a/src/main/java/com/alibaba/druid/support/opds/udf/ExportConditions.java b/src/main/java/com/alibaba/druid/support/opds/udf/ExportConditions.java index cdedbe1b6a..75d7557af8 100644 --- a/src/main/java/com/alibaba/druid/support/opds/udf/ExportConditions.java +++ b/src/main/java/com/alibaba/druid/support/opds/udf/ExportConditions.java @@ -29,11 +29,10 @@ import java.util.List; public class ExportConditions extends UDF { - public String evaluate(String sql) { return evaluate(sql, null); } - + public String evaluate(String sql, String dbType) { return evaluate(sql, dbType, null); } @@ -55,7 +54,7 @@ public String evaluate(String sql, String dbTypeName, Boolean compactValues) { Column column = condition.getColumn(); String operator = condition.getOperator(); List values = condition.getValues(); - + List row = new ArrayList(); row.add(column.getTable()); row.add(column.getName()); @@ -64,7 +63,7 @@ public String evaluate(String sql, String dbTypeName, Boolean compactValues) { row.add(null); } else if (values.size() == 1) { if (compactValues != null && compactValues.booleanValue()) { - row.add(values); + row.add(values); } else { row.add(values.get(0)); } diff --git a/src/main/java/com/alibaba/druid/support/opds/udf/ExportSelectListColumns.java b/src/main/java/com/alibaba/druid/support/opds/udf/ExportSelectListColumns.java index e409629244..042bcde458 100644 --- a/src/main/java/com/alibaba/druid/support/opds/udf/ExportSelectListColumns.java +++ b/src/main/java/com/alibaba/druid/support/opds/udf/ExportSelectListColumns.java @@ -25,7 +25,6 @@ import java.util.List; public class ExportSelectListColumns extends UDF { - public String evaluate(String sql) { return evaluate(sql, null); } @@ -45,7 +44,7 @@ public String evaluate(String sql, String dbType) { if (!column.isSelect()) { continue; } - + if (buf.length() != 0) { buf.append(','); } diff --git a/src/main/java/com/alibaba/druid/support/opds/udf/ExportTables.java b/src/main/java/com/alibaba/druid/support/opds/udf/ExportTables.java index 29f3ded81f..8e193d233a 100644 --- a/src/main/java/com/alibaba/druid/support/opds/udf/ExportTables.java +++ b/src/main/java/com/alibaba/druid/support/opds/udf/ExportTables.java @@ -26,7 +26,6 @@ import java.util.Map; public class ExportTables extends UDF { - public String evaluate(String sql) throws Throwable { return evaluate(sql, null, false); } diff --git a/src/main/java/com/alibaba/druid/support/opds/udf/MetaSqlExtract.java b/src/main/java/com/alibaba/druid/support/opds/udf/MetaSqlExtract.java index 43622ab2b5..0700881d19 100644 --- a/src/main/java/com/alibaba/druid/support/opds/udf/MetaSqlExtract.java +++ b/src/main/java/com/alibaba/druid/support/opds/udf/MetaSqlExtract.java @@ -3,7 +3,7 @@ import com.aliyun.odps.udf.UDF; import org.apache.commons.lang.StringEscapeUtils; -public class MetaSqlExtract extends UDF { +public class MetaSqlExtract extends UDF { public String evaluate(String xml) { if (xml == null || xml.length() == 0) { return null; diff --git a/src/main/java/com/alibaba/druid/support/opds/udf/SqlCodeStat.java b/src/main/java/com/alibaba/druid/support/opds/udf/SqlCodeStat.java index 90620f6148..f6a24012da 100644 --- a/src/main/java/com/alibaba/druid/support/opds/udf/SqlCodeStat.java +++ b/src/main/java/com/alibaba/druid/support/opds/udf/SqlCodeStat.java @@ -1,19 +1,19 @@ package com.alibaba.druid.support.opds.udf; -import com.alibaba.druid.sql.dialect.hive.ast.HiveInsert; -import com.alibaba.druid.sql.dialect.hive.ast.HiveMultiInsertStatement; -import com.alibaba.druid.sql.dialect.odps.ast.OdpsReadStatement; -import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONWriter; -import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.ast.expr.*; import com.alibaba.druid.sql.ast.statement.*; +import com.alibaba.druid.sql.dialect.hive.ast.HiveInsert; +import com.alibaba.druid.sql.dialect.hive.ast.HiveMultiInsertStatement; +import com.alibaba.druid.sql.dialect.odps.ast.OdpsReadStatement; import com.alibaba.druid.sql.dialect.odps.ast.OdpsSelectQueryBlock; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitorAdapter; +import com.alibaba.druid.sql.parser.SQLParserFeature; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONWriter; +import com.alibaba.fastjson2.annotation.JSONField; import com.aliyun.odps.udf.UDF; import java.util.List; @@ -31,9 +31,12 @@ public String evaluate(String sql, String dbTypeName, boolean throwError) { DbType dbType = dbTypeName == null ? null : DbType.valueOf(dbTypeName); try { - List stmtList = SQLUtils.parseStatements(sql, DbType.odps - , SQLParserFeature.EnableMultiUnion - , SQLParserFeature.EnableSQLBinaryOpExprGroup); + List stmtList = SQLUtils.parseStatements( + sql, + DbType.odps, + SQLParserFeature.EnableMultiUnion, + SQLParserFeature.EnableSQLBinaryOpExprGroup + ); CodeStatVisitor v = new CodeStatVisitor(); for (SQLStatement stmt : stmtList) { @@ -48,7 +51,6 @@ public String evaluate(String sql, String dbTypeName, boolean throwError) { return null; } - } public static class SqlStat { @@ -190,14 +192,14 @@ public void preVisit(SQLObject x) { stat.insertInto++; } } - } else if (x instanceof SQLDropStatement) { + } else if (x instanceof SQLDropStatement) { stat.drop++; if (x instanceof SQLDropTableStatement) { stat.dropTable++; - } else if (x instanceof SQLDropViewStatement) { + } else if (x instanceof SQLDropViewStatement) { stat.dropView++; } - } else if (x instanceof SQLCreateStatement) { + } else if (x instanceof SQLCreateStatement) { stat.create++; if (x instanceof SQLCreateTableStatement) { stat.createTable++; @@ -343,9 +345,11 @@ public boolean visit(SQLExistsExpr x) { } public String toString() { - return JSON.toJSONString(stat - , JSONWriter.Feature.PrettyFormat - , JSONWriter.Feature.NotWriteDefaultValue); + return JSON.toJSONString( + stat, + JSONWriter.Feature.PrettyFormat, + JSONWriter.Feature.NotWriteDefaultValue + ); } public java.util.Map toMap() { diff --git a/src/main/java/com/alibaba/druid/support/opds/udf/SqlFormat.java b/src/main/java/com/alibaba/druid/support/opds/udf/SqlFormat.java index 95216afd84..ff20b3a861 100644 --- a/src/main/java/com/alibaba/druid/support/opds/udf/SqlFormat.java +++ b/src/main/java/com/alibaba/druid/support/opds/udf/SqlFormat.java @@ -3,7 +3,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.aliyun.odps.udf.UDF; diff --git a/src/main/java/com/alibaba/druid/support/opds/udf/SqlTypeUDF.java b/src/main/java/com/alibaba/druid/support/opds/udf/SqlTypeUDF.java index 5768106e67..9b7c72c0bb 100644 --- a/src/main/java/com/alibaba/druid/support/opds/udf/SqlTypeUDF.java +++ b/src/main/java/com/alibaba/druid/support/opds/udf/SqlTypeUDF.java @@ -242,7 +242,7 @@ public String evaluate(String sql, String dbTypeName, boolean throwError) { int semiCnt = 0; for_: - for(Token token = null;;) { + for (Token token = null; ; ) { lexer.nextToken(); if (token == Token.VARIANT && lexer.token() == Token.COLONEQ) { @@ -262,7 +262,6 @@ public String evaluate(String sql, String dbTypeName, boolean throwError) { } } } catch (ParserException ignored) { - } sqlType = SQLType.ERROR; @@ -331,7 +330,6 @@ private String getSqlTypeForSingleLineSql(String sql, DbType dbType) { } return sqlType.name(); } catch (ParserException ignored) { - } return null; } diff --git a/src/main/java/com/alibaba/druid/support/profile/ProfileEntry.java b/src/main/java/com/alibaba/druid/support/profile/ProfileEntry.java index fee68bf54d..b99af5d286 100644 --- a/src/main/java/com/alibaba/druid/support/profile/ProfileEntry.java +++ b/src/main/java/com/alibaba/druid/support/profile/ProfileEntry.java @@ -16,14 +16,13 @@ package com.alibaba.druid.support.profile; public class ProfileEntry { - - private final ProfileEntry parent; + private final ProfileEntry parent; private final ProfileEntryKey key; - private int executeCount = 0; - private long executeTimeNanos = 0; + private int executeCount; + private long executeTimeNanos; - public ProfileEntry(ProfileEntry parent, ProfileEntryKey key){ + public ProfileEntry(ProfileEntry parent, ProfileEntryKey key) { this.parent = parent; this.key = key; } diff --git a/src/main/java/com/alibaba/druid/support/profile/ProfileEntryKey.java b/src/main/java/com/alibaba/druid/support/profile/ProfileEntryKey.java index f93e05b342..ab623dfd4e 100644 --- a/src/main/java/com/alibaba/druid/support/profile/ProfileEntryKey.java +++ b/src/main/java/com/alibaba/druid/support/profile/ProfileEntryKey.java @@ -20,7 +20,7 @@ public class ProfileEntryKey { private final String name; private final String type; - public ProfileEntryKey(String parentName, String name, String type){ + public ProfileEntryKey(String parentName, String name, String type) { this.parentName = parentName; this.name = name; this.type = type; @@ -37,7 +37,7 @@ public String getName() { public String getType() { return type; } - + public void fillValue(ProfileEntryStatValue value) { value.setParentName(parentName); value.setName(name); diff --git a/src/main/java/com/alibaba/druid/support/profile/ProfileEntryReqStat.java b/src/main/java/com/alibaba/druid/support/profile/ProfileEntryReqStat.java index fde7634dfd..a8150d6a3d 100644 --- a/src/main/java/com/alibaba/druid/support/profile/ProfileEntryReqStat.java +++ b/src/main/java/com/alibaba/druid/support/profile/ProfileEntryReqStat.java @@ -16,7 +16,6 @@ package com.alibaba.druid.support.profile; public class ProfileEntryReqStat { - private long executeCount; private long executeTimeNanos; diff --git a/src/main/java/com/alibaba/druid/support/profile/ProfileEntryStat.java b/src/main/java/com/alibaba/druid/support/profile/ProfileEntryStat.java index 8aa8b92a44..fecd44598a 100644 --- a/src/main/java/com/alibaba/druid/support/profile/ProfileEntryStat.java +++ b/src/main/java/com/alibaba/druid/support/profile/ProfileEntryStat.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.support.profile; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; - import java.util.concurrent.atomic.AtomicLongFieldUpdater; -public class ProfileEntryStat { +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; - private volatile long executeCount = 0; - private volatile long executeTimeNanos = 0; +public class ProfileEntryStat { + private volatile long executeCount; + private volatile long executeTimeNanos; private static final AtomicLongFieldUpdater executeCountUpdater; private static final AtomicLongFieldUpdater executeTimeNanosUpdater; diff --git a/src/main/java/com/alibaba/druid/support/profile/ProfileEntryStatValue.java b/src/main/java/com/alibaba/druid/support/profile/ProfileEntryStatValue.java index f88373ffc8..8fb250c3ac 100644 --- a/src/main/java/com/alibaba/druid/support/profile/ProfileEntryStatValue.java +++ b/src/main/java/com/alibaba/druid/support/profile/ProfileEntryStatValue.java @@ -19,12 +19,11 @@ import java.util.Map; public class ProfileEntryStatValue { - private String parentName; private String name; private String type; - private long executeCount = 0; - private long executeTimeNanos = 0; + private long executeCount; + private long executeTimeNanos; public String getParentName() { return parentName; diff --git a/src/main/java/com/alibaba/druid/support/profile/ProfileStat.java b/src/main/java/com/alibaba/druid/support/profile/ProfileStat.java index b57b08b720..baaaa7ae94 100644 --- a/src/main/java/com/alibaba/druid/support/profile/ProfileStat.java +++ b/src/main/java/com/alibaba/druid/support/profile/ProfileStat.java @@ -15,19 +15,14 @@ */ package com.alibaba.druid.support.profile; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; public class ProfileStat { - private Map entries = new LinkedHashMap(4); - private ReadWriteLock lock = new ReentrantReadWriteLock(); + private ReadWriteLock lock = new ReentrantReadWriteLock(); public Map getEntries() { return entries; @@ -50,7 +45,6 @@ public void record(Map requestStatsMap) { } private ProfileEntryStat getProfileEntry(ProfileEntryKey entryKey) { - lock.readLock().lock(); try { ProfileEntryStat entryStat = entries.get(entryKey); @@ -75,9 +69,8 @@ private ProfileEntryStat getProfileEntry(ProfileEntryKey entryKey) { } public List> getStatData() { - List statValueList = getStatValue(false); - + int size = statValueList.size(); List> list = new ArrayList>(size); for (ProfileEntryStatValue profileEntryStatValue : statValueList) { diff --git a/src/main/java/com/alibaba/druid/support/profile/Profiler.java b/src/main/java/com/alibaba/druid/support/profile/Profiler.java index 38129331d3..ac987bf050 100644 --- a/src/main/java/com/alibaba/druid/support/profile/Profiler.java +++ b/src/main/java/com/alibaba/druid/support/profile/Profiler.java @@ -19,14 +19,13 @@ import java.util.Map; public class Profiler { + public static final String PROFILE_TYPE_WEB = "WEB"; + public static final String PROFILE_TYPE_SPRING = "SPRING"; + public static final String PROFILE_TYPE_SQL = "SQL"; - public static final String PROFILE_TYPE_WEB = "WEB"; - public static final String PROFILE_TYPE_SPRING = "SPRING"; - public static final String PROFILE_TYPE_SQL = "SQL"; + private static ThreadLocal> statsMapLocal = new ThreadLocal>(); - private static ThreadLocal> statsMapLocal = new ThreadLocal>(); - - private final static ThreadLocal currentLocal = new ThreadLocal(); + private static final ThreadLocal currentLocal = new ThreadLocal(); public static boolean isEnable() { return statsMapLocal != null; diff --git a/src/main/java/com/alibaba/druid/support/quartz/DruidQuartzConnectionProvider.java b/src/main/java/com/alibaba/druid/support/quartz/DruidQuartzConnectionProvider.java index aea6964d76..3db2869b05 100644 --- a/src/main/java/com/alibaba/druid/support/quartz/DruidQuartzConnectionProvider.java +++ b/src/main/java/com/alibaba/druid/support/quartz/DruidQuartzConnectionProvider.java @@ -15,14 +15,12 @@ */ package com.alibaba.druid.support.quartz; -import java.sql.SQLException; - +import com.alibaba.druid.pool.DruidDataSource; import org.quartz.utils.ConnectionProvider; -import com.alibaba.druid.pool.DruidDataSource; +import java.sql.SQLException; public class DruidQuartzConnectionProvider extends DruidDataSource implements ConnectionProvider { - private static final long serialVersionUID = 1L; public void initialize() throws SQLException { diff --git a/src/main/java/com/alibaba/druid/support/simplejndi/DruidDataSourceConverter.java b/src/main/java/com/alibaba/druid/support/simplejndi/DruidDataSourceConverter.java index 7d3fb56ab1..4f6159ebbb 100644 --- a/src/main/java/com/alibaba/druid/support/simplejndi/DruidDataSourceConverter.java +++ b/src/main/java/com/alibaba/druid/support/simplejndi/DruidDataSourceConverter.java @@ -16,57 +16,56 @@ package com.alibaba.druid.support.simplejndi; -import java.sql.SQLException; -import java.util.Properties; - -import org.osjava.sj.loader.convert.Converter; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceFactory; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; +import org.osjava.sj.loader.convert.Converter; + +import java.sql.SQLException; +import java.util.Properties; /** * 支持simple-jndi *

配置示例：

* 
-pgDruidTest/converter=com.alibaba.druid.support.simplejndi.DruidDataSourceConverter
-pgDruidTest/type=javax.sql.DataSource
-pgDruidTest/driverClassName=org.postgresql.Driver
-pgDruidTest/url=jdbc:postgresql://127.0.0.1:5432/kettleRep
-pgDruidTest/username=postgres
-pgDruidTest/password=postgres
-pgDruidTest/maxActive=50
-pgDruidTest/minIdle=10
-pgDruidTest/initialSize=5
-pgDruidTest/validationQuery=SELECT 1
-pgDruidTest/maxWait=10000
-pgDruidTest/removeabandoned=true
-pgDruidTest/removeabandonedtimeout=60
-pgDruidTest/logabandoned=false
-pgDruidTest/filters=stat,config,log4j
-pgDruidTest/connectionProperties=druid.log.stmt.executableSql=true
-
- * date: 2016年1月31日 下午12:54:10 + * pgDruidTest/converter=com.alibaba.druid.support.simplejndi.DruidDataSourceConverter + * pgDruidTest/type=javax.sql.DataSource + * pgDruidTest/driverClassName=org.postgresql.Driver + * pgDruidTest/url=jdbc:postgresql://127.0.0.1:5432/kettleRep + * pgDruidTest/username=postgres + * pgDruidTest/password=postgres + * pgDruidTest/maxActive=50 + * pgDruidTest/minIdle=10 + * pgDruidTest/initialSize=5 + * pgDruidTest/validationQuery=SELECT 1 + * pgDruidTest/maxWait=10000 + * pgDruidTest/removeabandoned=true + * pgDruidTest/removeabandonedtimeout=60 + * pgDruidTest/logabandoned=false + * pgDruidTest/filters=stat,config,log4j + * pgDruidTest/connectionProperties=druid.log.stmt.executableSql=true + * + * date: 2016年1月31日 下午12:54:10 + * * @author jinjuma@yeah.net */ public class DruidDataSourceConverter implements Converter { + private static final Log LOG = LogFactory.getLog(DruidDataSourceConverter.class); - private final static Log LOG = LogFactory.getLog(DruidDataSourceConverter.class); - /** - * - * @see org.osjava.sj.loader.convert.Converter#convert(java.util.Properties, java.lang.String) - */ - @Override - public Object convert(Properties properties, String type) { + /** + * @see org.osjava.sj.loader.convert.Converter#convert(java.util.Properties, java.lang.String) + */ + @Override + public Object convert(Properties properties, String type) { try { DruidDataSource dataSource = new DruidDataSource(); - DruidDataSourceFactory.config(dataSource, properties); - return dataSource; - } catch (SQLException e) { - LOG.error("properties:"+properties, e); - } + DruidDataSourceFactory.config(dataSource, properties); + return dataSource; + } catch (SQLException e) { + LOG.error("properties:" + properties, e); + } return null; - } + } } diff --git a/src/main/java/com/alibaba/druid/support/spring/DruidLobCreator.java b/src/main/java/com/alibaba/druid/support/spring/DruidLobCreator.java index 6d3add1b36..abcdf1f2ac 100644 --- a/src/main/java/com/alibaba/druid/support/spring/DruidLobCreator.java +++ b/src/main/java/com/alibaba/druid/support/spring/DruidLobCreator.java @@ -15,6 +15,9 @@ */ package com.alibaba.druid.support.spring; +import com.alibaba.druid.util.JdbcUtils; +import org.springframework.jdbc.support.lob.LobCreator; + import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; @@ -23,12 +26,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; -import org.springframework.jdbc.support.lob.LobCreator; - -import com.alibaba.druid.util.JdbcUtils; - public class DruidLobCreator implements LobCreator { - @Override public void setBlobAsBytes(PreparedStatement ps, int paramIndex, byte[] content) throws SQLException { Blob blob = ps.getConnection().createBlob(); @@ -37,8 +35,11 @@ public void setBlobAsBytes(PreparedStatement ps, int paramIndex, byte[] content) } @Override - public void setBlobAsBinaryStream(PreparedStatement ps, int paramIndex, InputStream contentStream, int contentLength) - throws SQLException { + public void setBlobAsBinaryStream(PreparedStatement ps, + int paramIndex, + InputStream contentStream, + int contentLength) + throws SQLException { ps.setBlob(paramIndex, contentStream, contentLength); } @@ -51,7 +52,7 @@ public void setClobAsString(PreparedStatement ps, int paramIndex, String content @Override public void setClobAsAsciiStream(PreparedStatement ps, int paramIndex, InputStream asciiStream, int contentLength) - throws SQLException { + throws SQLException { if (asciiStream != null) { Clob clob = ps.getConnection().createClob(); @@ -79,14 +80,16 @@ public void setClobAsAsciiStream(PreparedStatement ps, int paramIndex, InputStre } @Override - public void setClobAsCharacterStream(PreparedStatement ps, int paramIndex, Reader characterStream, int contentLength) - throws SQLException { + public void setClobAsCharacterStream(PreparedStatement ps, + int paramIndex, + Reader characterStream, + int contentLength) + throws SQLException { ps.setClob(paramIndex, characterStream, contentLength); } @Override public void close() { - } } diff --git a/src/main/java/com/alibaba/druid/support/spring/DruidLobHandler.java b/src/main/java/com/alibaba/druid/support/spring/DruidLobHandler.java index 08bf507af9..b686abe9ea 100644 --- a/src/main/java/com/alibaba/druid/support/spring/DruidLobHandler.java +++ b/src/main/java/com/alibaba/druid/support/spring/DruidLobHandler.java @@ -15,6 +15,9 @@ */ package com.alibaba.druid.support.spring; +import org.springframework.jdbc.support.lob.AbstractLobHandler; +import org.springframework.jdbc.support.lob.LobCreator; + import java.io.InputStream; import java.io.Reader; import java.sql.Blob; @@ -22,11 +25,7 @@ import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.jdbc.support.lob.AbstractLobHandler; -import org.springframework.jdbc.support.lob.LobCreator; - public class DruidLobHandler extends AbstractLobHandler { - public byte[] getBlobAsBytes(ResultSet rs, int columnIndex) throws SQLException { Blob blob = rs.getBlob(columnIndex); diff --git a/src/main/java/com/alibaba/druid/support/spring/DruidNativeJdbcExtractor.java b/src/main/java/com/alibaba/druid/support/spring/DruidNativeJdbcExtractor.java index 6e25ef9668..e01097ca06 100644 --- a/src/main/java/com/alibaba/druid/support/spring/DruidNativeJdbcExtractor.java +++ b/src/main/java/com/alibaba/druid/support/spring/DruidNativeJdbcExtractor.java @@ -15,17 +15,11 @@ */ package com.alibaba.druid.support.spring; -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - import org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractorAdapter; -public class DruidNativeJdbcExtractor extends NativeJdbcExtractorAdapter { +import java.sql.*; +public class DruidNativeJdbcExtractor extends NativeJdbcExtractorAdapter { protected Connection doGetNativeConnection(Connection con) throws SQLException { return (Connection) con.unwrap(Connection.class); } diff --git a/src/main/java/com/alibaba/druid/support/spring/MBeanServerFactoryBean.java b/src/main/java/com/alibaba/druid/support/spring/MBeanServerFactoryBean.java index 495bf4606a..50f21326f3 100644 --- a/src/main/java/com/alibaba/druid/support/spring/MBeanServerFactoryBean.java +++ b/src/main/java/com/alibaba/druid/support/spring/MBeanServerFactoryBean.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.support.spring; -import java.lang.management.ManagementFactory; +import org.springframework.beans.factory.FactoryBean; import javax.management.MBeanServer; -import org.springframework.beans.factory.FactoryBean; +import java.lang.management.ManagementFactory; public class MBeanServerFactoryBean implements FactoryBean { - public MBeanServer getObject() throws Exception { return ManagementFactory.getPlatformMBeanServer(); } diff --git a/src/main/java/com/alibaba/druid/support/spring/mvc/StatHandlerInterceptor.java b/src/main/java/com/alibaba/druid/support/spring/mvc/StatHandlerInterceptor.java index 1af6f589e8..6482f58aad 100644 --- a/src/main/java/com/alibaba/druid/support/spring/mvc/StatHandlerInterceptor.java +++ b/src/main/java/com/alibaba/druid/support/spring/mvc/StatHandlerInterceptor.java @@ -15,38 +15,33 @@ */ package com.alibaba.druid.support.spring.mvc; -import java.util.Map; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.HandlerMapping; -import org.springframework.web.servlet.ModelAndView; - import com.alibaba.druid.filter.stat.StatFilterContext; import com.alibaba.druid.support.http.AbstractWebStatImpl; -import com.alibaba.druid.support.http.stat.WebAppStat; -import com.alibaba.druid.support.http.stat.WebAppStatManager; -import com.alibaba.druid.support.http.stat.WebRequestStat; -import com.alibaba.druid.support.http.stat.WebSessionStat; -import com.alibaba.druid.support.http.stat.WebURIStat; +import com.alibaba.druid.support.http.stat.*; import com.alibaba.druid.support.profile.ProfileEntryKey; import com.alibaba.druid.support.profile.ProfileEntryReqStat; import com.alibaba.druid.support.profile.Profiler; import com.alibaba.druid.util.DruidWebUtils; +import org.springframework.beans.factory.DisposableBean; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.HandlerMapping; +import org.springframework.web.servlet.ModelAndView; -public class StatHandlerInterceptor extends AbstractWebStatImpl implements HandlerInterceptor, InitializingBean, DisposableBean { +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; - public StatHandlerInterceptor(){ +import java.util.Map; +public class StatHandlerInterceptor extends AbstractWebStatImpl implements HandlerInterceptor, InitializingBean, DisposableBean { + public StatHandlerInterceptor() { } @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + public boolean preHandle(HttpServletRequest request, + HttpServletResponse response, + Object handler) throws Exception { final WebAppStat webAppStat = getWebAppStat(request); String requestURI = getRequestURI(request); @@ -101,7 +96,6 @@ public WebAppStat getWebAppStat(HttpServletRequest request) { @Override public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { - } @Override diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/BeanTypeAutoProxyCreator.java b/src/main/java/com/alibaba/druid/support/spring/stat/BeanTypeAutoProxyCreator.java index 37f1cd61ef..11e6af3933 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/BeanTypeAutoProxyCreator.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/BeanTypeAutoProxyCreator.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.support.spring.stat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.springframework.aop.TargetSource; import org.springframework.aop.framework.autoproxy.AbstractAutoProxyCreator; import org.springframework.beans.factory.BeanFactory; @@ -29,20 +25,23 @@ import org.springframework.util.Assert; import org.springframework.util.PatternMatchUtils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** * 类BeanTypeAutoProxyCreator.java的实现描述：使用配置类型代替Springframework中配置名称的实现 - * + * * @author hualiang.lihl 2011-12-31 上午10:48:20 */ public class BeanTypeAutoProxyCreator extends AbstractAutoProxyCreator implements InitializingBean, ApplicationContextAware { + private static final long serialVersionUID = -9094985530794052264L; - private static final long serialVersionUID = -9094985530794052264L; - - private Class targetBeanType; + private Class targetBeanType; private ApplicationContext context; - private List beanNames = new ArrayList(); + private List beanNames = new ArrayList(); /** * @param targetClass the targetClass to set @@ -79,8 +78,8 @@ protected Object[] getAdvicesAndAdvisorsForBean(Class beanClass, String beanName *

* The default implementation checks for "xxx*", "*xxx" and "*xxx*" matches, as well as direct equality. Can be * overridden in subclasses. - * - * @param beanName the bean name to check + * + * @param beanName the bean name to check * @param mappedName the name in the configured list of names * @return if the names match * @see org.springframework.util.PatternMatchUtils#simpleMatch(String, String) diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/DruidStatInterceptor.java b/src/main/java/com/alibaba/druid/support/spring/stat/DruidStatInterceptor.java index ce65e815e9..7fcd9bc568 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/DruidStatInterceptor.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/DruidStatInterceptor.java @@ -15,31 +15,28 @@ */ package com.alibaba.druid.support.spring.stat; -import java.lang.reflect.Method; - +import com.alibaba.druid.filter.stat.StatFilterContext; +import com.alibaba.druid.filter.stat.StatFilterContextListenerAdapter; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.springframework.aop.TargetSource; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; -import com.alibaba.druid.filter.stat.StatFilterContext; -import com.alibaba.druid.filter.stat.StatFilterContextListenerAdapter; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; +import java.lang.reflect.Method; public class DruidStatInterceptor implements MethodInterceptor, InitializingBean, DisposableBean { + public static final String PROP_NAME_PROFILE = "druid.profile"; - public static final String PROP_NAME_PROFILE = "druid.profile"; + private static final Log LOG = LogFactory.getLog(DruidStatInterceptor.class); - private final static Log LOG = LogFactory.getLog(DruidStatInterceptor.class); - - private static SpringStat springStat = new SpringStat(); + private static SpringStat springStat = new SpringStat(); private SpringMethodContextListener statContextListener = new SpringMethodContextListener(); - public DruidStatInterceptor(){ - + public DruidStatInterceptor() { } @Override @@ -154,7 +151,6 @@ public SpringMethodInfo getMethodInfo(MethodInvocation invocation) { } class SpringMethodContextListener extends StatFilterContextListenerAdapter { - @Override public void addUpdateCount(int updateCount) { SpringMethodStat springMethodStat = SpringMethodStat.current(); diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodInfo.java b/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodInfo.java index 24aee8c3b0..7577a1cbad 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodInfo.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodInfo.java @@ -18,13 +18,12 @@ import java.lang.reflect.Method; public class SpringMethodInfo { - - private String signature; + private String signature; private Class instanceClass; - private Method method; + private Method method; - public SpringMethodInfo(Class instanceClass, Method method){ + public SpringMethodInfo(Class instanceClass, Method method) { this.instanceClass = instanceClass; this.method = method; } @@ -65,11 +64,11 @@ public boolean equals(Object obj) { if (!method.getName().equals(other.method.getName())) { return false; } - + if (method.getParameterTypes().length != other.method.getParameterTypes().length) { return false; } - + for (int i = 0; i < method.getParameterTypes().length; ++i) { if (!method.getParameterTypes()[i].getName().equals(other.method.getParameterTypes()[i].getName())) { return false; diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodStat.java b/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodStat.java index 93d26963f2..54ed06c1fd 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodStat.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodStat.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.support.spring.stat; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; +import com.alibaba.druid.support.profile.Profiler; import java.util.Date; import java.util.Map; @@ -24,65 +24,64 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.alibaba.druid.support.profile.Profiler; +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; public class SpringMethodStat { - - private final static ThreadLocal currentLocal = new ThreadLocal(); - - private final SpringMethodInfo methodInfo; - - private final AtomicInteger runningCount = new AtomicInteger(); - private final AtomicInteger concurrentMax = new AtomicInteger(); - private final AtomicLong executeCount = new AtomicLong(0); - private final AtomicLong executeErrorCount = new AtomicLong(0); - private final AtomicLong executeTimeNano = new AtomicLong(); - - private final AtomicLong jdbcFetchRowCount = new AtomicLong(); - private final AtomicLong jdbcUpdateCount = new AtomicLong(); - private final AtomicLong jdbcExecuteCount = new AtomicLong(); - private final AtomicLong jdbcExecuteErrorCount = new AtomicLong(); - private final AtomicLong jdbcExecuteTimeNano = new AtomicLong(); - - private final AtomicLong jdbcCommitCount = new AtomicLong(); - private final AtomicLong jdbcRollbackCount = new AtomicLong(); - - private final AtomicLong jdbcPoolConnectionOpenCount = new AtomicLong(); - private final AtomicLong jdbcPoolConnectionCloseCount = new AtomicLong(); - - private final AtomicLong jdbcResultSetOpenCount = new AtomicLong(); - private final AtomicLong jdbcResultSetCloseCount = new AtomicLong(); - - private volatile Throwable lastError; - private volatile long lastErrorTimeMillis; - - private volatile long histogram_0_1; - private volatile long histogram_1_10; - private volatile long histogram_10_100; - private volatile long histogram_100_1000; - private volatile int histogram_1000_10000; - private volatile int histogram_10000_100000; - private volatile int histogram_100000_1000000; - private volatile int histogram_1000000_more; - - final static AtomicLongFieldUpdater histogram_0_1_Updater = AtomicLongFieldUpdater.newUpdater(SpringMethodStat.class, - "histogram_0_1"); - final static AtomicLongFieldUpdater histogram_1_10_Updater = AtomicLongFieldUpdater.newUpdater(SpringMethodStat.class, - "histogram_1_10"); - final static AtomicLongFieldUpdater histogram_10_100_Updater = AtomicLongFieldUpdater.newUpdater(SpringMethodStat.class, - "histogram_10_100"); - final static AtomicLongFieldUpdater histogram_100_1000_Updater = AtomicLongFieldUpdater.newUpdater(SpringMethodStat.class, - "histogram_100_1000"); - final static AtomicIntegerFieldUpdater histogram_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(SpringMethodStat.class, - "histogram_1000_10000"); - final static AtomicIntegerFieldUpdater histogram_10000_100000_Updater = AtomicIntegerFieldUpdater.newUpdater(SpringMethodStat.class, - "histogram_10000_100000"); - final static AtomicIntegerFieldUpdater histogram_100000_1000000_Updater = AtomicIntegerFieldUpdater.newUpdater(SpringMethodStat.class, - "histogram_100000_1000000"); - final static AtomicIntegerFieldUpdater histogram_1000000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(SpringMethodStat.class, - "histogram_1000000_more"); - - public SpringMethodStat(SpringMethodInfo methodInfo){ + private static final ThreadLocal currentLocal = new ThreadLocal(); + + private final SpringMethodInfo methodInfo; + + private final AtomicInteger runningCount = new AtomicInteger(); + private final AtomicInteger concurrentMax = new AtomicInteger(); + private final AtomicLong executeCount = new AtomicLong(0); + private final AtomicLong executeErrorCount = new AtomicLong(0); + private final AtomicLong executeTimeNano = new AtomicLong(); + + private final AtomicLong jdbcFetchRowCount = new AtomicLong(); + private final AtomicLong jdbcUpdateCount = new AtomicLong(); + private final AtomicLong jdbcExecuteCount = new AtomicLong(); + private final AtomicLong jdbcExecuteErrorCount = new AtomicLong(); + private final AtomicLong jdbcExecuteTimeNano = new AtomicLong(); + + private final AtomicLong jdbcCommitCount = new AtomicLong(); + private final AtomicLong jdbcRollbackCount = new AtomicLong(); + + private final AtomicLong jdbcPoolConnectionOpenCount = new AtomicLong(); + private final AtomicLong jdbcPoolConnectionCloseCount = new AtomicLong(); + + private final AtomicLong jdbcResultSetOpenCount = new AtomicLong(); + private final AtomicLong jdbcResultSetCloseCount = new AtomicLong(); + + private volatile Throwable lastError; + private volatile long lastErrorTimeMillis; + + private volatile long histogram_0_1; + private volatile long histogram_1_10; + private volatile long histogram_10_100; + private volatile long histogram_100_1000; + private volatile int histogram_1000_10000; + private volatile int histogram_10000_100000; + private volatile int histogram_100000_1000000; + private volatile int histogram_1000000_more; + + static final AtomicLongFieldUpdater histogram_0_1_Updater = AtomicLongFieldUpdater.newUpdater(SpringMethodStat.class, + "histogram_0_1"); + static final AtomicLongFieldUpdater histogram_1_10_Updater = AtomicLongFieldUpdater.newUpdater(SpringMethodStat.class, + "histogram_1_10"); + static final AtomicLongFieldUpdater histogram_10_100_Updater = AtomicLongFieldUpdater.newUpdater(SpringMethodStat.class, + "histogram_10_100"); + static final AtomicLongFieldUpdater histogram_100_1000_Updater = AtomicLongFieldUpdater.newUpdater(SpringMethodStat.class, + "histogram_100_1000"); + static final AtomicIntegerFieldUpdater histogram_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(SpringMethodStat.class, + "histogram_1000_10000"); + static final AtomicIntegerFieldUpdater histogram_10000_100000_Updater = AtomicIntegerFieldUpdater.newUpdater(SpringMethodStat.class, + "histogram_10000_100000"); + static final AtomicIntegerFieldUpdater histogram_100000_1000000_Updater = AtomicIntegerFieldUpdater.newUpdater(SpringMethodStat.class, + "histogram_100000_1000000"); + static final AtomicIntegerFieldUpdater histogram_1000000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(SpringMethodStat.class, + "histogram_1000000_more"); + + public SpringMethodStat(SpringMethodInfo methodInfo) { this.methodInfo = methodInfo; } @@ -120,7 +119,7 @@ public SpringMethodStatValue getStatValue(boolean reset) { this.lastError = null; this.lastErrorTimeMillis = 0; } - + val.histogram_0_1 = get(this, histogram_0_1_Updater, reset); val.histogram_1_10 = get(this, histogram_1_10_Updater, reset); val.histogram_10_100 = get(this, histogram_10_100_Updater, reset); @@ -184,7 +183,7 @@ public void beforeInvoke() { int running = runningCount.incrementAndGet(); - for (;;) { + for (; ; ) { int max = concurrentMax.get(); if (running > max) { if (concurrentMax.compareAndSet(max, running)) { @@ -237,7 +236,7 @@ private void histogramRecord(long nanos) { } public long[] getHistogramValues() { - return new long[] { + return new long[]{ // histogram_0_1, // histogram_1_10, // diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodStatValue.java b/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodStatValue.java index e014fb421d..5b4e926e14 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodStatValue.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodStatValue.java @@ -15,71 +15,70 @@ */ package com.alibaba.druid.support.spring.stat; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.Map; - import com.alibaba.druid.support.monitor.annotation.AggregateType; import com.alibaba.druid.support.monitor.annotation.MField; import com.alibaba.druid.support.monitor.annotation.MTable; import com.alibaba.druid.util.Utils; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Map; + @MTable(name = "druid_springmethod") public class SpringMethodStatValue { - - @MField(groupBy = true, aggregate=AggregateType.None) + @MField(groupBy = true, aggregate = AggregateType.None) private String className; - @MField(groupBy = true, aggregate=AggregateType.None) + @MField(groupBy = true, aggregate = AggregateType.None) private String signature; @MField(aggregate = AggregateType.Last) - private int runningCount; + private int runningCount; @MField(aggregate = AggregateType.Max) - private int concurrentMax; + private int concurrentMax; @MField(aggregate = AggregateType.Sum) - private long executeCount; + private long executeCount; @MField(aggregate = AggregateType.Sum) - private long executeErrorCount; + private long executeErrorCount; @MField(aggregate = AggregateType.Sum) - private long executeTimeNano; + private long executeTimeNano; @MField(aggregate = AggregateType.Sum) - private long jdbcFetchRowCount; + private long jdbcFetchRowCount; @MField(aggregate = AggregateType.Sum) - private long jdbcUpdateCount; + private long jdbcUpdateCount; @MField(aggregate = AggregateType.Sum) - private long jdbcExecuteCount; + private long jdbcExecuteCount; @MField(aggregate = AggregateType.Sum) - private long jdbcExecuteErrorCount; + private long jdbcExecuteErrorCount; @MField(aggregate = AggregateType.Sum) - private long jdbcExecuteTimeNano; + private long jdbcExecuteTimeNano; @MField(aggregate = AggregateType.Sum) - private long jdbcCommitCount; + private long jdbcCommitCount; @MField(aggregate = AggregateType.Sum) - private long jdbcRollbackCount; + private long jdbcRollbackCount; @MField(aggregate = AggregateType.Sum) - private long jdbcPoolConnectionOpenCount; + private long jdbcPoolConnectionOpenCount; @MField(aggregate = AggregateType.Sum) - private long jdbcPoolConnectionCloseCount; + private long jdbcPoolConnectionCloseCount; @MField(aggregate = AggregateType.Sum) - private long jdbcResultSetOpenCount; + private long jdbcResultSetOpenCount; @MField(aggregate = AggregateType.Sum) - private long jdbcResultSetCloseCount; + private long jdbcResultSetCloseCount; @MField(aggregate = AggregateType.Last) private String lastErrorClass; @@ -91,31 +90,31 @@ public class SpringMethodStatValue { private String lastErrorStackTrace; @MField(aggregate = AggregateType.Last) - private long lastErrorTimeMillis; + private long lastErrorTimeMillis; - @MField(name = "h1", aggregate=AggregateType.Sum) - long histogram_0_1; + @MField(name = "h1", aggregate = AggregateType.Sum) + long histogram_0_1; - @MField(name = "h10", aggregate=AggregateType.Sum) - long histogram_1_10; + @MField(name = "h10", aggregate = AggregateType.Sum) + long histogram_1_10; - @MField(name = "h100", aggregate=AggregateType.Sum) - long histogram_10_100; + @MField(name = "h100", aggregate = AggregateType.Sum) + long histogram_10_100; - @MField(name = "h1000", aggregate=AggregateType.Sum) - long histogram_100_1000; + @MField(name = "h1000", aggregate = AggregateType.Sum) + long histogram_100_1000; - @MField(name = "h10000", aggregate=AggregateType.Sum) - int histogram_1000_10000; + @MField(name = "h10000", aggregate = AggregateType.Sum) + int histogram_1000_10000; - @MField(name = "h100000", aggregate=AggregateType.Sum) - int histogram_10000_100000; + @MField(name = "h100000", aggregate = AggregateType.Sum) + int histogram_10000_100000; - @MField(name = "h1000000", aggregate=AggregateType.Sum) - int histogram_100000_1000000; + @MField(name = "h1000000", aggregate = AggregateType.Sum) + int histogram_100000_1000000; - @MField(name = "hmore", aggregate=AggregateType.Sum) - int histogram_1000000_more; + @MField(name = "hmore", aggregate = AggregateType.Sum) + int histogram_1000000_more; public String getClassName() { return className; @@ -294,7 +293,7 @@ public Date getLastErrorTime() { } public long[] getHistogram() { - return new long[] { + return new long[]{ // histogram_0_1, // histogram_1_10, // diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/SpringStat.java b/src/main/java/com/alibaba/druid/support/spring/stat/SpringStat.java index 82e5dd7322..e223cc8844 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/SpringStat.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/SpringStat.java @@ -22,11 +22,9 @@ import java.util.concurrent.ConcurrentMap; public class SpringStat { - private ConcurrentMap methodStats = new ConcurrentHashMap(16, 0.75f, 1); - public SpringStat(){ - + public SpringStat() { } public void reset() { @@ -48,20 +46,20 @@ public SpringMethodStat getMethodStat(SpringMethodInfo methodInfo, boolean creat return methodStat; } - + public List getStatList(boolean reset) { List statValueList = new ArrayList(this.methodStats.size()); - + for (SpringMethodStat methodStat : this.methodStats.values()) { SpringMethodStatValue statValue = methodStat.getStatValue(reset); - + if (statValue.getRunningCount() == 0 && statValue.getExecuteCount() == 0) { continue; } - + statValueList.add(statValue); } - + return statValueList; } @@ -90,7 +88,7 @@ public Map getMethodStatData(String clazz, String method) { return methodStat.getStatData(); } } - + return null; } } diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/SpringStatManager.java b/src/main/java/com/alibaba/druid/support/spring/stat/SpringStatManager.java index e6ed253c6d..e972aa853d 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/SpringStatManager.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/SpringStatManager.java @@ -15,22 +15,17 @@ */ package com.alibaba.druid.support.spring.stat; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.CopyOnWriteArraySet; - import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class SpringStatManager { +import java.util.*; +import java.util.concurrent.CopyOnWriteArraySet; - public final static String SYS_PROP_INSTANCES = "druid.spring.springStat"; +public class SpringStatManager { + public static final String SYS_PROP_INSTANCES = "druid.spring.springStat"; - private final static SpringStatManager instance = new SpringStatManager(); + private static final SpringStatManager instance = new SpringStatManager(); - private Set springStatSet = null; + private Set springStatSet; public static SpringStatManager getInstance() { return instance; @@ -41,7 +36,7 @@ public Set getSpringStatSet() { if (DruidDataSourceStatManager.isRegisterToSystemProperty()) { springStatSet = getSpringStatSetFromSysProperty(); } else { - springStatSet = new CopyOnWriteArraySet(); + springStatSet = new CopyOnWriteArraySet(); } } @@ -83,20 +78,20 @@ public List> getMethodStatData() { return allMethodStatDataList; } - + public Map getMethodStatData(String clazz, String method) { Set stats = getSpringStatSet(); - + for (Object stat : stats) { Map statData = SpringStatUtils.getMethodStatData(stat, clazz, method); if (statData != null) { return statData; } } - + return null; } - + public void resetStat() { Set stats = getSpringStatSet(); diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/SpringStatUtils.java b/src/main/java/com/alibaba/druid/support/spring/stat/SpringStatUtils.java index 9fe0cfe495..4f181d4a1d 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/SpringStatUtils.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/SpringStatUtils.java @@ -15,16 +15,15 @@ */ package com.alibaba.druid.support.spring.stat; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; + import java.lang.reflect.Method; import java.util.List; import java.util.Map; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; - public class SpringStatUtils { - - private final static Log LOG = LogFactory.getLog(SpringStatUtils.class); + private static final Log LOG = LogFactory.getLog(SpringStatUtils.class); @SuppressWarnings("unchecked") public static List> getMethodStatDataList(Object methodStat) { @@ -41,13 +40,13 @@ public static List> getMethodStatDataList(Object methodStat) return null; } } - + @SuppressWarnings("unchecked") public static Map getMethodStatData(Object methodStat, String clazz, String methodSignature) { if (methodStat.getClass() == SpringStat.class) { return ((SpringStat) methodStat).getMethodStatData(clazz, methodSignature); } - + try { Method method = methodStat.getClass().getMethod("getMethodStatData", String.class, String.class); Object obj = method.invoke(methodStat, clazz, methodSignature); diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/annotation/Stat.java b/src/main/java/com/alibaba/druid/support/spring/stat/annotation/Stat.java index 3076c347a9..38593b72d2 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/annotation/Stat.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/annotation/Stat.java @@ -15,14 +15,10 @@ */ package com.alibaba.druid.support.spring.stat.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface Stat { -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/annotation/StatAnnotationAdvisor.java b/src/main/java/com/alibaba/druid/support/spring/stat/annotation/StatAnnotationAdvisor.java index 27fe9ef476..8e1df85a3b 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/annotation/StatAnnotationAdvisor.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/annotation/StatAnnotationAdvisor.java @@ -15,6 +15,7 @@ */ package com.alibaba.druid.support.spring.stat.annotation; +import com.alibaba.druid.support.spring.stat.DruidStatInterceptor; import org.aopalliance.aop.Advice; import org.springframework.aop.Pointcut; import org.springframework.aop.support.AbstractPointcutAdvisor; @@ -24,46 +25,43 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; -import com.alibaba.druid.support.spring.stat.DruidStatInterceptor; - @SuppressWarnings("serial") public class StatAnnotationAdvisor extends AbstractPointcutAdvisor implements BeanFactoryAware { + private Advice advice; + private Pointcut pointcut; + private DruidStatInterceptor druidStatInterceptor; + + public StatAnnotationAdvisor(DruidStatInterceptor druidStatInterceptor) { + this.druidStatInterceptor = druidStatInterceptor; + this.advice = buildAdvice(); + this.pointcut = buildPointcut(); + } + + public Pointcut getPointcut() { + return this.pointcut; + } + + public Advice getAdvice() { + return this.advice; + } - private Advice advice; - private Pointcut pointcut; - private DruidStatInterceptor druidStatInterceptor; - - public StatAnnotationAdvisor(DruidStatInterceptor druidStatInterceptor) { - this.druidStatInterceptor = druidStatInterceptor; - this.advice = buildAdvice(); - this.pointcut = buildPointcut(); - } + public void setBeanFactory(BeanFactory beanFactory) throws BeansException { + if (this.advice instanceof BeanFactoryAware) { + ((BeanFactoryAware) this.advice).setBeanFactory(beanFactory); + } + } - public Pointcut getPointcut() { - return this.pointcut; - } + protected Advice buildAdvice() { + return druidStatInterceptor; + } - public Advice getAdvice() { - return this.advice; - } + protected Pointcut buildPointcut() { + Pointcut cpc = new AnnotationMatchingPointcut(Stat.class, true); + Pointcut mpc = AnnotationMatchingPointcut.forMethodAnnotation(Stat.class); - public void setBeanFactory(BeanFactory beanFactory) throws BeansException { - if (this.advice instanceof BeanFactoryAware) { - ((BeanFactoryAware) this.advice).setBeanFactory(beanFactory); - } - } - - protected Advice buildAdvice() { - return druidStatInterceptor; - } + ComposablePointcut result = new ComposablePointcut(cpc).union(mpc); - protected Pointcut buildPointcut() { - Pointcut cpc = new AnnotationMatchingPointcut(Stat.class, true); - Pointcut mpc = AnnotationMatchingPointcut.forMethodAnnotation(Stat.class); - - ComposablePointcut result = new ComposablePointcut(cpc).union(mpc); - - return result; - } + return result; + } } diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/annotation/StatAnnotationBeanPostProcessor.java b/src/main/java/com/alibaba/druid/support/spring/stat/annotation/StatAnnotationBeanPostProcessor.java index 6d61a25bf1..186ba6aa40 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/annotation/StatAnnotationBeanPostProcessor.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/annotation/StatAnnotationBeanPostProcessor.java @@ -15,26 +15,24 @@ */ package com.alibaba.druid.support.spring.stat.annotation; -import javax.annotation.Resource; - +import com.alibaba.druid.support.spring.stat.DruidStatInterceptor; import org.springframework.aop.framework.AbstractAdvisingBeanPostProcessor; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; -import com.alibaba.druid.support.spring.stat.DruidStatInterceptor; +import javax.annotation.Resource; @SuppressWarnings("serial") public class StatAnnotationBeanPostProcessor extends AbstractAdvisingBeanPostProcessor implements BeanFactoryAware { + @Resource(name = "druid-stat-interceptor") + private DruidStatInterceptor druidStatInterceptor; - @Resource(name="druid-stat-interceptor") - private DruidStatInterceptor druidStatInterceptor; - - public void setBeanFactory(BeanFactory beanFactory) throws BeansException { - setBeforeExistingAdvisors(true); - StatAnnotationAdvisor advisor = new StatAnnotationAdvisor(druidStatInterceptor); - advisor.setBeanFactory(beanFactory); - this.advisor = advisor; - } + public void setBeanFactory(BeanFactory beanFactory) throws BeansException { + setBeforeExistingAdvisors(true); + StatAnnotationAdvisor advisor = new StatAnnotationAdvisor(druidStatInterceptor); + advisor.setBeanFactory(beanFactory); + this.advisor = advisor; + } } diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/config/DruidStatBeanDefinitionParser.java b/src/main/java/com/alibaba/druid/support/spring/stat/config/DruidStatBeanDefinitionParser.java index 3007293c13..10e6cdeec5 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/config/DruidStatBeanDefinitionParser.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/config/DruidStatBeanDefinitionParser.java @@ -26,50 +26,47 @@ import org.w3c.dom.Element; public class DruidStatBeanDefinitionParser implements BeanDefinitionParser { + public static final String STAT_ANNOTATION_PROCESSOR_BEAN_NAME = "com.alibaba.druid.support.spring.stat.annotation.internalStatAnnotationBeanPostProcessor"; + public static final String STAT_ANNOTATION_PROCESSOR_BEAN_CLASS = "com.alibaba.druid.support.spring.stat.annotation.StatAnnotationBeanPostProcessor"; + public static final String STAT_ANNOTATION_ADVICE_BEAN_NAME = "druid-stat-interceptor"; + public static final String STAT_ANNOTATION_ADVICE_BEAN_CLASS = "com.alibaba.druid.support.spring.stat.DruidStatInterceptor"; - public static final String STAT_ANNOTATION_PROCESSOR_BEAN_NAME = "com.alibaba.druid.support.spring.stat.annotation.internalStatAnnotationBeanPostProcessor"; - public static final String STAT_ANNOTATION_PROCESSOR_BEAN_CLASS = "com.alibaba.druid.support.spring.stat.annotation.StatAnnotationBeanPostProcessor"; - public static final String STAT_ANNOTATION_ADVICE_BEAN_NAME = "druid-stat-interceptor"; - public static final String STAT_ANNOTATION_ADVICE_BEAN_CLASS = "com.alibaba.druid.support.spring.stat.DruidStatInterceptor"; - - @Override - public BeanDefinition parse(Element element, ParserContext parserContext) { - Object source = parserContext.extractSource(element); + @Override + public BeanDefinition parse(Element element, ParserContext parserContext) { + Object source = parserContext.extractSource(element); - CompositeComponentDefinition compDefinition = new CompositeComponentDefinition(element.getTagName(), source); - parserContext.pushContainingComponent(compDefinition); + CompositeComponentDefinition compDefinition = new CompositeComponentDefinition(element.getTagName(), source); + parserContext.pushContainingComponent(compDefinition); - BeanDefinitionRegistry registry = parserContext.getRegistry(); + BeanDefinitionRegistry registry = parserContext.getRegistry(); - if (registry.containsBeanDefinition(STAT_ANNOTATION_PROCESSOR_BEAN_NAME)) { - parserContext.getReaderContext().error( - "Only one DruidStatBeanDefinitionParser may exist within the context.", source); - } else { - BeanDefinitionBuilder builder = BeanDefinitionBuilder - .genericBeanDefinition(STAT_ANNOTATION_PROCESSOR_BEAN_CLASS); - builder.getRawBeanDefinition().setSource(source); - registerComponent(parserContext, builder, STAT_ANNOTATION_PROCESSOR_BEAN_NAME); - } - - if (!registry.containsBeanDefinition(STAT_ANNOTATION_ADVICE_BEAN_NAME)) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder - .genericBeanDefinition(STAT_ANNOTATION_ADVICE_BEAN_CLASS); - builder.getRawBeanDefinition().setSource(source); - registerComponent(parserContext, builder, STAT_ANNOTATION_ADVICE_BEAN_NAME); - } - - parserContext.popAndRegisterContainingComponent(); + if (registry.containsBeanDefinition(STAT_ANNOTATION_PROCESSOR_BEAN_NAME)) { + parserContext.getReaderContext().error( + "Only one DruidStatBeanDefinitionParser may exist within the context.", source); + } else { + BeanDefinitionBuilder builder = BeanDefinitionBuilder + .genericBeanDefinition(STAT_ANNOTATION_PROCESSOR_BEAN_CLASS); + builder.getRawBeanDefinition().setSource(source); + registerComponent(parserContext, builder, STAT_ANNOTATION_PROCESSOR_BEAN_NAME); + } - return null; - } + if (!registry.containsBeanDefinition(STAT_ANNOTATION_ADVICE_BEAN_NAME)) { + BeanDefinitionBuilder builder = BeanDefinitionBuilder + .genericBeanDefinition(STAT_ANNOTATION_ADVICE_BEAN_CLASS); + builder.getRawBeanDefinition().setSource(source); + registerComponent(parserContext, builder, STAT_ANNOTATION_ADVICE_BEAN_NAME); + } - private static void registerComponent(ParserContext parserContext, BeanDefinitionBuilder builder, - String beanName) { + parserContext.popAndRegisterContainingComponent(); - builder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); - parserContext.getRegistry().registerBeanDefinition(beanName, builder.getBeanDefinition()); - BeanDefinitionHolder holder = new BeanDefinitionHolder(builder.getBeanDefinition(), beanName); - parserContext.registerComponent(new BeanComponentDefinition(holder)); - } + return null; + } -} \ No newline at end of file + private static void registerComponent(ParserContext parserContext, BeanDefinitionBuilder builder, + String beanName) { + builder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); + parserContext.getRegistry().registerBeanDefinition(beanName, builder.getBeanDefinition()); + BeanDefinitionHolder holder = new BeanDefinitionHolder(builder.getBeanDefinition(), beanName); + parserContext.registerComponent(new BeanComponentDefinition(holder)); + } +} diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/config/DruidStatNamespaceHandler.java b/src/main/java/com/alibaba/druid/support/spring/stat/config/DruidStatNamespaceHandler.java index 6ecc7c9128..2ed3af30e8 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/config/DruidStatNamespaceHandler.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/config/DruidStatNamespaceHandler.java @@ -18,10 +18,8 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport; public class DruidStatNamespaceHandler extends NamespaceHandlerSupport { - - @Override - public void init() { - registerBeanDefinitionParser("annotation-driven", new DruidStatBeanDefinitionParser()); - } - -} \ No newline at end of file + @Override + public void init() { + registerBeanDefinitionParser("annotation-driven", new DruidStatBeanDefinitionParser()); + } +} diff --git a/src/main/java/com/alibaba/druid/util/Base64.java b/src/main/java/com/alibaba/druid/util/Base64.java index 90815668aa..0cbdef2187 100644 --- a/src/main/java/com/alibaba/druid/util/Base64.java +++ b/src/main/java/com/alibaba/druid/util/Base64.java @@ -17,13 +17,12 @@ /** * Static methods for translating Base64 encoded strings to byte arrays and vice-versa. - * + * * @author Josh Bloch * @version %I%, %G% * @since 1.4 */ public class Base64 { - /** * Translates the specified byte array into a Base64 string as per Preferences.put(byte[]). */ @@ -84,10 +83,10 @@ private static String byteArrayToBase64(byte[] a, boolean alternate) { * This array is a lookup table that translates 6-bit positive integer index values into their "Base64 Alphabet" * equivalents as specified in Table 1 of RFC 2045. */ - private static final char intToBase64[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', + private static final char[] intToBase64 = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', - '3', '4', '5', '6', '7', '8', '9', '+', '/' }; + '3', '4', '5', '6', '7', '8', '9', '+', '/'}; /** * This array is a lookup table that translates 6-bit positive integer index values into their @@ -95,10 +94,10 @@ private static String byteArrayToBase64(byte[] a, boolean alternate) { * alternate alphabet does not use the capital letters. It is designed for use in environments where "case folding" * occurs. */ - private static final char intToAltBase64[] = { '!', '"', '#', '$', '%', '&', '\'', '(', ')', ',', '-', '.', ':', + private static final char[] intToAltBase64 = {'!', '"', '#', '$', '%', '&', '\'', '(', ')', ',', '-', '.', ':', ';', '<', '>', '@', '[', ']', '^', '`', '_', '{', '|', '}', '~', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', - '3', '4', '5', '6', '7', '8', '9', '+', '?' }; + '3', '4', '5', '6', '7', '8', '9', '+', '?'}; /** * Translates the specified Base64 string (as per Preferences.get(byte[])) into a byte array. @@ -165,7 +164,7 @@ private static byte[] base64ToByteArray(String s, boolean alternate) { /** * Translates the specified character, which is assumed to be in the "Base 64 Alphabet" into its equivalent 6-bit * positive integer. - * + * * @throw IllegalArgumentException or ArrayOutOfBoundsException if c is not in the Base64 Alphabet. */ private static int base64toInt(char c, byte[] alphaToInt) { @@ -181,20 +180,20 @@ private static int base64toInt(char c, byte[] alphaToInt) { * Table 1 of RFC 2045) into their 6-bit positive integer equivalents. Characters that are not in the Base64 * alphabet but fall within the bounds of the array are translated to -1. */ - private static final byte base64ToInt[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + private static final byte[] base64ToInt = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51 }; + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51}; /** * This array is the analogue of base64ToInt, but for the nonstandard variant that avoids the use of uppercase * alphabetic characters. */ - private static final byte altBase64ToInt[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + private static final byte[] altBase64ToInt = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, -1, 62, 9, 10, 11, -1, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 12, 13, 14, -1, 15, 63, 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 17, -1, 18, 19, 21, 20, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 22, 23, 24, 25 }; + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 22, 23, 24, 25}; } diff --git a/src/main/java/com/alibaba/druid/util/DaemonThreadFactory.java b/src/main/java/com/alibaba/druid/util/DaemonThreadFactory.java index 59e23a9373..e149612411 100644 --- a/src/main/java/com/alibaba/druid/util/DaemonThreadFactory.java +++ b/src/main/java/com/alibaba/druid/util/DaemonThreadFactory.java @@ -22,12 +22,11 @@ * @author sandzhang [sandzhangtoo@gmail.com] */ public class DaemonThreadFactory implements ThreadFactory { - private AtomicInteger threadNo = new AtomicInteger(1); - private final String nameStart; - private final String nameEnd = "]"; + private final String nameStart; + private final String nameEnd = "]"; - public DaemonThreadFactory(String poolName){ + public DaemonThreadFactory(String poolName) { nameStart = "[" + poolName + "-"; } diff --git a/src/main/java/com/alibaba/druid/util/DruidDataSourceUtils.java b/src/main/java/com/alibaba/druid/util/DruidDataSourceUtils.java index f816f7b954..c763f61246 100644 --- a/src/main/java/com/alibaba/druid/util/DruidDataSourceUtils.java +++ b/src/main/java/com/alibaba/druid/util/DruidDataSourceUtils.java @@ -15,25 +15,24 @@ */ package com.alibaba.druid.util; -import java.lang.reflect.Method; -import java.util.List; -import java.util.Map; - -import javax.management.ObjectName; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; -public class DruidDataSourceUtils { +import javax.management.ObjectName; - private final static Log LOG = LogFactory.getLog(DruidDataSourceUtils.class); +import java.lang.reflect.Method; +import java.util.List; +import java.util.Map; + +public class DruidDataSourceUtils { + private static final Log LOG = LogFactory.getLog(DruidDataSourceUtils.class); public static String getUrl(Object druidDataSource) { if (druidDataSource.getClass() == DruidDataSource.class) { return ((DruidDataSource) druidDataSource).getUrl(); } - + try { Method method = druidDataSource.getClass().getMethod("getUrl"); Object obj = method.invoke(druidDataSource); @@ -43,12 +42,12 @@ public static String getUrl(Object druidDataSource) { return null; } } - + public static long getID(Object druidDataSource) { if (druidDataSource.getClass() == DruidDataSource.class) { return ((DruidDataSource) druidDataSource).getID(); } - + try { Method method = druidDataSource.getClass().getMethod("getID"); Object obj = method.invoke(druidDataSource); @@ -58,12 +57,12 @@ public static long getID(Object druidDataSource) { return -1; } } - + public static String getName(Object druidDataSource) { if (druidDataSource.getClass() == DruidDataSource.class) { return ((DruidDataSource) druidDataSource).getName(); } - + try { Method method = druidDataSource.getClass().getMethod("getName"); Object obj = method.invoke(druidDataSource); @@ -78,7 +77,7 @@ public static ObjectName getObjectName(Object druidDataSource) { if (druidDataSource.getClass() == DruidDataSource.class) { return ((DruidDataSource) druidDataSource).getObjectName(); } - + try { Method method = druidDataSource.getClass().getMethod("getObjectName"); Object obj = method.invoke(druidDataSource); @@ -93,7 +92,7 @@ public static Object getSqlStat(Object druidDataSource, int sqlId) { if (druidDataSource.getClass() == DruidDataSource.class) { return ((DruidDataSource) druidDataSource).getSqlStat(sqlId); } - + try { Method method = druidDataSource.getClass().getMethod("getSqlStat", int.class); return method.invoke(druidDataSource, sqlId); @@ -107,7 +106,7 @@ public static boolean isRemoveAbandoned(Object druidDataSource) { if (druidDataSource.getClass() == DruidDataSource.class) { return ((DruidDataSource) druidDataSource).isRemoveAbandoned(); } - + try { Method method = druidDataSource.getClass().getMethod("isRemoveAbandoned"); Object obj = method.invoke(druidDataSource); @@ -123,7 +122,7 @@ public static Map getStatDataForMBean(Object druidDataSource) { if (druidDataSource.getClass() == DruidDataSource.class) { return ((DruidDataSource) druidDataSource).getStatDataForMBean(); } - + try { Method method = druidDataSource.getClass().getMethod("getStatDataForMBean"); Object obj = method.invoke(druidDataSource); @@ -139,7 +138,7 @@ public static Map getStatData(Object druidDataSource) { if (druidDataSource.getClass() == DruidDataSource.class) { return ((DruidDataSource) druidDataSource).getStatData(); } - + try { Method method = druidDataSource.getClass().getMethod("getStatData"); Object obj = method.invoke(druidDataSource); @@ -150,12 +149,12 @@ public static Map getStatData(Object druidDataSource) { } } - @SuppressWarnings({ "rawtypes" }) + @SuppressWarnings("rawtypes") public static Map getSqlStatMap(Object druidDataSource) { if (druidDataSource.getClass() == DruidDataSource.class) { return ((DruidDataSource) druidDataSource).getSqlStatMap(); } - + try { Method method = druidDataSource.getClass().getMethod("getSqlStatMap"); Object obj = method.invoke(druidDataSource); @@ -165,13 +164,13 @@ public static Map getSqlStatMap(Object druidDataSource) { return null; } } - - @SuppressWarnings({ "rawtypes", "unchecked" }) + + @SuppressWarnings({"rawtypes", "unchecked"}) public static Map getWallStatMap(Object druidDataSource) { if (druidDataSource.getClass() == DruidDataSource.class) { return ((DruidDataSource) druidDataSource).getWallStatMap(); } - + try { Method method = druidDataSource.getClass().getMethod("getWallStatMap"); Object obj = method.invoke(druidDataSource); @@ -181,13 +180,13 @@ public static Map getWallStatMap(Object druidDataSource) { return null; } } - + @SuppressWarnings("unchecked") public static List> getPoolingConnectionInfo(Object druidDataSource) { if (druidDataSource.getClass() == DruidDataSource.class) { return ((DruidDataSource) druidDataSource).getPoolingConnectionInfo(); } - + try { Method method = druidDataSource.getClass().getMethod("getPoolingConnectionInfo"); Object obj = method.invoke(druidDataSource); @@ -197,13 +196,13 @@ public static List> getPoolingConnectionInfo(Object druidDat return null; } } - + @SuppressWarnings("unchecked") public static List getActiveConnectionStackTrace(Object druidDataSource) { if (druidDataSource.getClass() == DruidDataSource.class) { return ((DruidDataSource) druidDataSource).getActiveConnectionStackTrace(); } - + try { Method method = druidDataSource.getClass().getMethod("getActiveConnectionStackTrace"); Object obj = method.invoke(druidDataSource); diff --git a/src/main/java/com/alibaba/druid/util/DruidPasswordCallback.java b/src/main/java/com/alibaba/druid/util/DruidPasswordCallback.java index 75c27bc8c2..2447550fa9 100644 --- a/src/main/java/com/alibaba/druid/util/DruidPasswordCallback.java +++ b/src/main/java/com/alibaba/druid/util/DruidPasswordCallback.java @@ -15,23 +15,22 @@ */ package com.alibaba.druid.util; -import java.util.Properties; - import javax.security.auth.callback.PasswordCallback; -public class DruidPasswordCallback extends PasswordCallback { +import java.util.Properties; +public class DruidPasswordCallback extends PasswordCallback { private static final long serialVersionUID = 1L; - private String url; + private String url; - private Properties properties; + private Properties properties; - public DruidPasswordCallback(){ + public DruidPasswordCallback() { this("druidDataSource password", false); } - public DruidPasswordCallback(String prompt, boolean echoOn){ + public DruidPasswordCallback(String prompt, boolean echoOn) { super(prompt, echoOn); } diff --git a/src/main/java/com/alibaba/druid/util/DruidWebUtils.java b/src/main/java/com/alibaba/druid/util/DruidWebUtils.java index 567a3f20fa..e300d547fa 100644 --- a/src/main/java/com/alibaba/druid/util/DruidWebUtils.java +++ b/src/main/java/com/alibaba/druid/util/DruidWebUtils.java @@ -20,7 +20,6 @@ import javax.servlet.http.HttpServletRequest; public class DruidWebUtils { - public static String getRemoteAddr(HttpServletRequest request) { String ip = request.getHeader("x-forwarded-for"); if (ip != null && !isValidAddress(ip)) { @@ -59,8 +58,11 @@ private static boolean isValidAddress(String ip) { for (int i = 0; i < ip.length(); ++i) { char ch = ip.charAt(i); if (ch >= '0' && ch <= '9') { + // ignored } else if (ch >= 'A' && ch <= 'F') { + // ignored } else if (ch >= 'a' && ch <= 'f') { + // ignored } else if (ch == '.' || ch == ':') { // } else { diff --git a/src/main/java/com/alibaba/druid/util/FnvHash.java b/src/main/java/com/alibaba/druid/util/FnvHash.java index 6b8718d735..92ded03e71 100644 --- a/src/main/java/com/alibaba/druid/util/FnvHash.java +++ b/src/main/java/com/alibaba/druid/util/FnvHash.java @@ -18,8 +18,8 @@ import java.util.Arrays; public final class FnvHash { - public final static long BASIC = 0xcbf29ce484222325L; - public final static long PRIME = 0x100000001b3L; + public static final long BASIC = 0xcbf29ce484222325L; + public static final long PRIME = 0x100000001b3L; public static long fnv1a_64(String input) { if (input == null) { @@ -105,6 +105,7 @@ public static long fnv1a_64(char[] chars) { /** * lower and normalized and fnv_1a_64 + * * @param name * @return */ @@ -280,6 +281,7 @@ public static long[] fnv1a_64_lower(String[] strings, boolean sort) { /** * normalized and lower and fnv1a_64_hash + * * @param owner * @param name * @return @@ -305,7 +307,7 @@ public static long hashCode64(String owner, String name) { } int start = quote ? 1 : 0; - int end = quote ? len - 1 : len; + int end = quote ? len - 1 : len; for (int j = start; j < end; ++j) { char ch = item.charAt(j); @@ -321,7 +323,6 @@ public static long hashCode64(String owner, String name) { hashCode *= PRIME; } - if (name != null) { String item = name; @@ -340,7 +341,7 @@ public static long hashCode64(String owner, String name) { } int start = quote ? 1 : 0; - int end = quote ? len - 1 : len; + int end = quote ? len - 1 : len; for (int j = start; j < end; ++j) { char ch = item.charAt(j); diff --git a/src/main/java/com/alibaba/druid/util/H2Utils.java b/src/main/java/com/alibaba/druid/util/H2Utils.java index 3c24918686..7c6792aad5 100644 --- a/src/main/java/com/alibaba/druid/util/H2Utils.java +++ b/src/main/java/com/alibaba/druid/util/H2Utils.java @@ -15,36 +15,34 @@ */ package com.alibaba.druid.util; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.sql.Connection; -import java.sql.SQLException; - -import javax.sql.XAConnection; - import org.h2.jdbc.JdbcConnection; import org.h2.jdbcx.JdbcDataSourceFactory; import org.h2.jdbcx.JdbcXAConnection; import org.h2.message.TraceObject; -public class H2Utils { +import javax.sql.XAConnection; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.sql.Connection; +import java.sql.SQLException; +public class H2Utils { private static volatile Constructor constructor; - private static volatile Method method; + private static volatile Method method; - public static final int XA_DATA_SOURCE = 13; + public static final int XA_DATA_SOURCE = 13; public static Object createJdbcDataSourceFactory() { return new JdbcDataSourceFactory(); } public static XAConnection createXAConnection(Object factory, Connection physicalConn) throws SQLException { - try { if (constructor == null) { constructor = JdbcXAConnection.class.getDeclaredConstructor(JdbcDataSourceFactory.class, int.class, - JdbcConnection.class); + JdbcConnection.class); constructor.setAccessible(true); } diff --git a/src/main/java/com/alibaba/druid/util/HexBin.java b/src/main/java/com/alibaba/druid/util/HexBin.java index 03aa7d6d5f..3c205a4566 100644 --- a/src/main/java/com/alibaba/druid/util/HexBin.java +++ b/src/main/java/com/alibaba/druid/util/HexBin.java @@ -17,17 +17,16 @@ /** * format validation This class encodes/decodes hexadecimal data - * + * * @author Jeffrey Rodriguez * @version $Id: HexBin.java,v 1.4 2007/07/19 04:38:32 ofung Exp $ */ public final class HexBin { - - static private final int BASE_LENGTH = 128; - static private final int LOOKUP_LENGTH = 16; - static final private byte[] HEX_NUMBER_TABLE = new byte[BASE_LENGTH]; - static final private char[] UPPER_CHARS = new char[LOOKUP_LENGTH]; - static final private char[] LOWER_CHARS = new char[LOOKUP_LENGTH]; + private static final int BASE_LENGTH = 128; + private static final int LOOKUP_LENGTH = 16; + private static final byte[] HEX_NUMBER_TABLE = new byte[BASE_LENGTH]; + private static final char[] UPPER_CHARS = new char[LOOKUP_LENGTH]; + private static final char[] LOWER_CHARS = new char[LOOKUP_LENGTH]; static { for (int i = 0; i < BASE_LENGTH; i++) { @@ -52,7 +51,7 @@ public final class HexBin { LOWER_CHARS[i] = (char) ('a' + i - 10); } } - + public static String encode(byte[] bytes) { return encode(bytes, true); } @@ -75,11 +74,11 @@ public static String encode(byte[] bytes, boolean upperCase) { /** * Decode hex string to a byte array - * + * * @param encoded encoded string * @return return array of byte to encode */ - static public byte[] decode(String encoded) { + public static byte[] decode(String encoded) { if (encoded == null) { return null; } diff --git a/src/main/java/com/alibaba/druid/util/Histogram.java b/src/main/java/com/alibaba/druid/util/Histogram.java index 543ca929a8..38d77b4a4a 100644 --- a/src/main/java/com/alibaba/druid/util/Histogram.java +++ b/src/main/java/com/alibaba/druid/util/Histogram.java @@ -19,11 +19,10 @@ import java.util.concurrent.atomic.AtomicLongArray; public class Histogram { - - private final long[] ranges; + private final long[] ranges; private final AtomicLongArray rangeCounters; - public Histogram(long... ranges){ + public Histogram(long... ranges) { this.ranges = ranges; this.rangeCounters = new AtomicLongArray(ranges.length + 1); } @@ -38,7 +37,7 @@ public static Histogram makeHistogram(int rangeCount) { return new Histogram(rangeValues); } - public Histogram(TimeUnit timeUnit, long... ranges){ + public Histogram(TimeUnit timeUnit, long... ranges) { this.ranges = new long[ranges.length]; for (int i = 0; i < ranges.length; i++) { this.ranges[i] = TimeUnit.MILLISECONDS.convert(ranges[i], timeUnit); diff --git a/src/main/java/com/alibaba/druid/util/JMXUtils.java b/src/main/java/com/alibaba/druid/util/JMXUtils.java index 9ff65fc526..59fb496b7e 100644 --- a/src/main/java/com/alibaba/druid/util/JMXUtils.java +++ b/src/main/java/com/alibaba/druid/util/JMXUtils.java @@ -15,25 +15,20 @@ */ package com.alibaba.druid.util; -import java.lang.management.ManagementFactory; -import java.util.HashMap; -import java.util.Map; - import javax.management.InstanceAlreadyExistsException; import javax.management.JMException; import javax.management.MBeanServer; import javax.management.ObjectName; -import javax.management.openmbean.CompositeData; -import javax.management.openmbean.CompositeDataSupport; -import javax.management.openmbean.CompositeType; -import javax.management.openmbean.OpenType; -import javax.management.openmbean.SimpleType; +import javax.management.openmbean.*; + +import java.lang.management.ManagementFactory; +import java.util.HashMap; +import java.util.Map; /** * @author wenshao [szujobs@hotmail.com] */ public final class JMXUtils { - public static ObjectName register(String name, Object mbean) { try { ObjectName objectName = new ObjectName(name); @@ -64,18 +59,18 @@ public static void unregister(String name) { } - private static final String[] THROWABLE_COMPOSITE_INDEX_NAMES = { "message", "class", "stackTrace" }; - private static final String[] THROWABLE_COMPOSITE_INDEX_DESCRIPTIONS = { "message", "class", "stackTrace" }; - private static final OpenType[] THROWABLE_COMPOSITE_INDEX_TYPES = new OpenType[] { SimpleType.STRING, - SimpleType.STRING, SimpleType.STRING }; + private static final String[] THROWABLE_COMPOSITE_INDEX_NAMES = {"message", "class", "stackTrace"}; + private static final String[] THROWABLE_COMPOSITE_INDEX_DESCRIPTIONS = {"message", "class", "stackTrace"}; + private static final OpenType[] THROWABLE_COMPOSITE_INDEX_TYPES = new OpenType[]{SimpleType.STRING, + SimpleType.STRING, SimpleType.STRING}; - private static CompositeType THROWABLE_COMPOSITE_TYPE = null; + private static CompositeType THROWABLE_COMPOSITE_TYPE; public static CompositeType getThrowableCompositeType() throws JMException { if (THROWABLE_COMPOSITE_TYPE == null) { THROWABLE_COMPOSITE_TYPE = new CompositeType("Throwable", "Throwable", THROWABLE_COMPOSITE_INDEX_NAMES, - THROWABLE_COMPOSITE_INDEX_DESCRIPTIONS, - THROWABLE_COMPOSITE_INDEX_TYPES); + THROWABLE_COMPOSITE_INDEX_DESCRIPTIONS, + THROWABLE_COMPOSITE_INDEX_TYPES); } return THROWABLE_COMPOSITE_TYPE; diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java index 1b95209e20..23332adb71 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -18,140 +18,138 @@ import com.alibaba.druid.DbType; public interface JdbcConstants { + DbType JTDS = DbType.jtds; - DbType JTDS = DbType.jtds; + String MOCK = "mock"; - String MOCK = "mock"; + DbType HSQL = DbType.hsql; - DbType HSQL = DbType.hsql; + DbType DB2 = DbType.db2; - DbType DB2 = DbType.db2; + String DB2_DRIVER = "com.ibm.db2.jcc.DB2Driver"; // Type4 + String DB2_DRIVER2 = "COM.ibm.db2.jdbc.app.DB2Driver"; // Type2 + String DB2_DRIVER3 = "COM.ibm.db2.jdbc.net.DB2Driver"; // Type3 - String DB2_DRIVER = "com.ibm.db2.jcc.DB2Driver"; // Type4 - String DB2_DRIVER2 = "COM.ibm.db2.jdbc.app.DB2Driver"; // Type2 - String DB2_DRIVER3 = "COM.ibm.db2.jdbc.net.DB2Driver"; // Type3 + DbType POSTGRESQL = DbType.postgresql; + String POSTGRESQL_DRIVER = "org.postgresql.Driver"; - DbType POSTGRESQL = DbType.postgresql; - String POSTGRESQL_DRIVER = "org.postgresql.Driver"; + DbType SYBASE = DbType.sybase; - DbType SYBASE = DbType.sybase; - - DbType SQL_SERVER = DbType.sqlserver; - String SQL_SERVER_DRIVER = "com.microsoft.jdbc.sqlserver.SQLServerDriver"; + DbType SQL_SERVER = DbType.sqlserver; + String SQL_SERVER_DRIVER = "com.microsoft.jdbc.sqlserver.SQLServerDriver"; String SQL_SERVER_DRIVER_SQLJDBC4 = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; - String SQL_SERVER_DRIVER_JTDS = "net.sourceforge.jtds.jdbc.Driver"; + String SQL_SERVER_DRIVER_JTDS = "net.sourceforge.jtds.jdbc.Driver"; + + DbType ORACLE = DbType.oracle; + String ORACLE_DRIVER = "oracle.jdbc.OracleDriver"; + String ORACLE_DRIVER2 = "oracle.jdbc.driver.OracleDriver"; - DbType ORACLE = DbType.oracle; - String ORACLE_DRIVER = "oracle.jdbc.OracleDriver"; - String ORACLE_DRIVER2 = "oracle.jdbc.driver.OracleDriver"; + DbType ALI_ORACLE = DbType.ali_oracle; + String ALI_ORACLE_DRIVER = "com.alibaba.jdbc.AlibabaDriver"; - DbType ALI_ORACLE = DbType.ali_oracle; - String ALI_ORACLE_DRIVER = "com.alibaba.jdbc.AlibabaDriver"; + DbType MYSQL = DbType.mysql; + String MYSQL_DRIVER = "com.mysql.jdbc.Driver"; + String MYSQL_DRIVER_6 = "com.mysql.cj.jdbc.Driver"; + String MYSQL_DRIVER_REPLICATE = "com.mysql.jdbc."; - DbType MYSQL = DbType.mysql; - String MYSQL_DRIVER = "com.mysql.jdbc.Driver"; - String MYSQL_DRIVER_6 = "com.mysql.cj.jdbc.Driver"; - String MYSQL_DRIVER_REPLICATE = "com.mysql.jdbc."; + String MARIADB = "mariadb"; + String MARIADB_DRIVER = "org.mariadb.jdbc.Driver"; - String MARIADB = "mariadb"; - String MARIADB_DRIVER = "org.mariadb.jdbc.Driver"; + DbType TIDB = DbType.tidb; + String TIDB_DRIVER = "io.tidb.bigdata.jdbc.TiDBDriver"; - DbType TIDB = DbType.tidb; - String TIDB_DRIVER = "io.tidb.bigdata.jdbc.TiDBDriver"; + DbType DERBY = DbType.derby; - DbType DERBY = DbType.derby; + String HBASE = "hbase"; - String HBASE = "hbase"; + DbType HIVE = DbType.hive; + String HIVE_DRIVER = "org.apache.hive.jdbc.HiveDriver"; - DbType HIVE = DbType.hive; - String HIVE_DRIVER = "org.apache.hive.jdbc.HiveDriver"; + DbType H2 = DbType.h2; + String H2_DRIVER = "org.h2.Driver"; - DbType H2 = DbType.h2; - String H2_DRIVER = "org.h2.Driver"; + DbType DM = DbType.dm; + String DM_DRIVER = "dm.jdbc.driver.DmDriver"; - DbType DM = DbType.dm; - String DM_DRIVER = "dm.jdbc.driver.DmDriver"; + DbType KINGBASE = DbType.kingbase; + String KINGBASE_DRIVER = "com.kingbase.Driver"; + String KINGBASE8_DRIVER = "com.kingbase8.Driver"; - DbType KINGBASE = DbType.kingbase; - String KINGBASE_DRIVER = "com.kingbase.Driver"; - String KINGBASE8_DRIVER = "com.kingbase8.Driver"; + DbType GBASE = DbType.gbase; + String GBASE_DRIVER = "com.gbase.jdbc.Driver"; - DbType GBASE = DbType.gbase; - String GBASE_DRIVER = "com.gbase.jdbc.Driver"; + DbType XUGU = DbType.xugu; + String XUGU_DRIVER = "com.xugu.cloudjdbc.Driver"; - DbType XUGU = DbType.xugu; - String XUGU_DRIVER = "com.xugu.cloudjdbc.Driver"; + DbType OCEANBASE = DbType.oceanbase; + DbType OCEANBASE_ORACLE = DbType.oceanbase_oracle; + String OCEANBASE_DRIVER = "com.alipay.oceanbase.jdbc.Driver"; + String OCEANBASE_DRIVER2 = "com.oceanbase.jdbc.Driver"; - DbType OCEANBASE = DbType.oceanbase; - DbType OCEANBASE_ORACLE = DbType.oceanbase_oracle; - String OCEANBASE_DRIVER = "com.alipay.oceanbase.jdbc.Driver"; - String OCEANBASE_DRIVER2 = "com.oceanbase.jdbc.Driver"; + DbType INFORMIX = DbType.informix; - DbType INFORMIX = DbType.informix; - /** * 阿里云odps */ - DbType ODPS = DbType.odps; - String ODPS_DRIVER = "com.aliyun.odps.jdbc.OdpsDriver"; + DbType ODPS = DbType.odps; + String ODPS_DRIVER = "com.aliyun.odps.jdbc.OdpsDriver"; - String TERADATA = "teradata"; - String TERADATA_DRIVER = "com.teradata.jdbc.TeraDriver"; + String TERADATA = "teradata"; + String TERADATA_DRIVER = "com.teradata.jdbc.TeraDriver"; /** * Log4JDBC */ - String LOG4JDBC = "log4jdbc"; - String LOG4JDBC_DRIVER = "net.sf.log4jdbc.DriverSpy"; + String LOG4JDBC = "log4jdbc"; + String LOG4JDBC_DRIVER = "net.sf.log4jdbc.DriverSpy"; - String PHOENIX = "phoenix"; - String PHOENIX_DRIVER = "org.apache.phoenix.jdbc.PhoenixDriver"; - DbType ENTERPRISEDB = DbType.edb; - String ENTERPRISEDB_DRIVER = "com.edb.Driver"; + String PHOENIX = "phoenix"; + String PHOENIX_DRIVER = "org.apache.phoenix.jdbc.PhoenixDriver"; + DbType ENTERPRISEDB = DbType.edb; + String ENTERPRISEDB_DRIVER = "com.edb.Driver"; - String KYLIN = "kylin"; - String KYLIN_DRIVER = "org.apache.kylin.jdbc.Driver"; + String KYLIN = "kylin"; + String KYLIN_DRIVER = "org.apache.kylin.jdbc.Driver"; + String SQLITE = "sqlite"; + String SQLITE_DRIVER = "org.sqlite.JDBC"; - String SQLITE = "sqlite"; - String SQLITE_DRIVER = "org.sqlite.JDBC"; + String ALIYUN_ADS = "aliyun_ads"; + DbType ALIYUN_DRDS = DbType.drds; - String ALIYUN_ADS = "aliyun_ads"; - DbType ALIYUN_DRDS = DbType.drds; + String PRESTO = "presto"; + String PRESTO_DRIVER = "com.facebook.presto.jdbc.PrestoDriver"; - String PRESTO = "presto"; - String PRESTO_DRIVER = "com.facebook.presto.jdbc.PrestoDriver"; + String TRINO = "trino"; + String TRINO_DRIVER = "io.trino.jdbc.TrinoDriver"; - String TRINO = "trino"; - String TRINO_DRIVER = "io.trino.jdbc.TrinoDriver"; + String ELASTIC_SEARCH = "elastic_search"; - String ELASTIC_SEARCH = "elastic_search"; - - String ELASTIC_SEARCH_DRIVER = "com.alibaba.xdriver.elastic.jdbc.ElasticDriver"; + String ELASTIC_SEARCH_DRIVER = "com.alibaba.xdriver.elastic.jdbc.ElasticDriver"; - DbType CLICKHOUSE = DbType.clickhouse; - String CLICKHOUSE_DRIVER = "ru.yandex.clickhouse.ClickHouseDriver"; + DbType CLICKHOUSE = DbType.clickhouse; + String CLICKHOUSE_DRIVER = "ru.yandex.clickhouse.ClickHouseDriver"; - String KDB = "kdb"; - String KDB_DRIVER = "com.inspur.jdbc.KdDriver"; + String KDB = "kdb"; + String KDB_DRIVER = "com.inspur.jdbc.KdDriver"; /** * Aliyun PolarDB */ - DbType POLARDB = DbType.polardb; - String POLARDB_DRIVER = "com.aliyun.polardb.Driver"; + DbType POLARDB = DbType.polardb; + String POLARDB_DRIVER = "com.aliyun.polardb.Driver"; /** * GreenPlum */ - DbType GREENPLUM = DbType.greenplum; - String GREENPLUM_DRIVER = "com.pivotal.jdbc.GreenplumDriver"; + DbType GREENPLUM = DbType.greenplum; + String GREENPLUM_DRIVER = "com.pivotal.jdbc.GreenplumDriver"; /** * oscar */ - DbType OSCAR = DbType.oscar; - String OSCAR_DRIVER = "com.oscar.Driver"; + DbType OSCAR = DbType.oscar; + String OSCAR_DRIVER = "com.oscar.Driver"; - DbType TYDB = DbType.tydb; - String TYDB_DRIVER = "com.dbcp.jdbc.Driver"; + DbType TYDB = DbType.tydb; + String TYDB_DRIVER = "com.dbcp.jdbc.Driver"; } diff --git a/src/main/java/com/alibaba/druid/util/JdbcSqlStatUtils.java b/src/main/java/com/alibaba/druid/util/JdbcSqlStatUtils.java index 63e79eaedf..9c33bb1321 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcSqlStatUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcSqlStatUtils.java @@ -15,6 +15,10 @@ */ package com.alibaba.druid.util; +import com.alibaba.druid.stat.JdbcSqlStat; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; + import java.lang.reflect.Method; import java.util.Arrays; import java.util.Map; @@ -23,13 +27,8 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.alibaba.druid.stat.JdbcSqlStat; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; - public class JdbcSqlStatUtils { - - private final static Log LOG = LogFactory.getLog(JdbcSqlStatUtils.class); + private static final Log LOG = LogFactory.getLog(JdbcSqlStatUtils.class); @SuppressWarnings("unchecked") public static Map getData(Object jdbcSqlStat) { @@ -77,7 +76,7 @@ public static long get(T stat, AtomicLongFieldUpdater updater, boolean re return updater.get(stat); } } - + public static long get(AtomicLong counter, boolean reset) { if (reset) { return counter.getAndSet(0); @@ -85,7 +84,7 @@ public static long get(AtomicLong counter, boolean reset) { return counter.get(); } } - + public static int get(AtomicInteger counter, boolean reset) { if (reset) { return counter.getAndSet(0); diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 092482ebe8..72cb6e9715 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -15,43 +15,34 @@ */ package com.alibaba.druid.util; +import com.alibaba.druid.DbType; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; + +import javax.sql.DataSource; + import java.io.Closeable; import java.io.InputStream; import java.io.PrintStream; import java.net.URL; import java.sql.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.sql.DataSource; - -import com.alibaba.druid.DbType; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; +import java.util.*; /** * @author wenshao [szujobs@hotmail.com] */ public final class JdbcUtils implements JdbcConstants { - - private final static Log LOG = LogFactory.getLog(JdbcUtils.class); + private static final Log LOG = LogFactory.getLog(JdbcUtils.class); private static final Properties DRIVER_URL_MAPPING = new Properties(); - private static Boolean mysql_driver_version_6 = null; + private static Boolean mysql_driver_version_6; static { try { ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); if (ctxClassLoader != null) { - for (Enumeration e = ctxClassLoader.getResources("META-INF/druid-driver.properties"); e.hasMoreElements();) { + for (Enumeration e = ctxClassLoader.getResources("META-INF/druid-driver.properties"); e.hasMoreElements(); ) { URL url = e.nextElement(); Properties property = new Properties(); @@ -161,12 +152,15 @@ public static void close(Clob x) { public static void printResultSet(ResultSet rs) throws SQLException { printResultSet(rs, System.out); } - + public static void printResultSet(ResultSet rs, PrintStream out) throws SQLException { printResultSet(rs, out, true, "\t"); } - public static void printResultSet(ResultSet rs, PrintStream out, boolean printHeader, String seperator) throws SQLException { + public static void printResultSet(ResultSet rs, + PrintStream out, + boolean printHeader, + String seperator) throws SQLException { ResultSetMetaData metadata = rs.getMetaData(); int columnCount = metadata.getColumnCount(); if (printHeader) { @@ -181,7 +175,6 @@ public static void printResultSet(ResultSet rs, PrintStream out, boolean printHe out.println(); while (rs.next()) { - for (int columnIndex = 1; columnIndex <= columnCount; ++columnIndex) { if (columnIndex != 1) { out.print(seperator); @@ -192,7 +185,7 @@ public static void printResultSet(ResultSet rs, PrintStream out, boolean printHe if (type == Types.VARCHAR || type == Types.CHAR || type == Types.NVARCHAR || type == Types.NCHAR) { out.print(rs.getString(columnIndex)); } else if (type == Types.DATE) { - Date date = rs.getDate(columnIndex); + java.util.Date date = rs.getDate(columnIndex); if (rs.wasNull()) { out.print("null"); } else { @@ -401,7 +394,7 @@ public static String getDriverClassName(String rawUrl) throws SQLException { if (rawUrl == null) { return null; } - + if (rawUrl.startsWith("jdbc:derby:")) { return "org.apache.derby.jdbc.EmbeddedDriver"; } else if (rawUrl.startsWith("jdbc:mysql:")) { @@ -421,7 +414,7 @@ public static String getDriverClassName(String rawUrl) throws SQLException { } else if (rawUrl.startsWith("jdbc:tidb:")) { return TIDB_DRIVER; } else if (rawUrl.startsWith("jdbc:oracle:") // - || rawUrl.startsWith("JDBC:oracle:")) { + || rawUrl.startsWith("JDBC:oracle:")) { return ORACLE_DRIVER; } else if (rawUrl.startsWith("jdbc:alibaba:oracle:")) { return ALI_ORACLE_DRIVER; @@ -517,9 +510,9 @@ public static String getDriverClassName(String rawUrl) throws SQLException { return JdbcConstants.ELASTIC_SEARCH_DRIVER; } else if (rawUrl.startsWith("jdbc:clickhouse:")) { return JdbcConstants.CLICKHOUSE_DRIVER; - } else if(rawUrl.startsWith("jdbc:presto:")) { + } else if (rawUrl.startsWith("jdbc:presto:")) { return JdbcConstants.PRESTO_DRIVER; - } else if(rawUrl.startsWith("jdbc:trino:")) { + } else if (rawUrl.startsWith("jdbc:trino:")) { return JdbcConstants.TRINO_DRIVER; } else if (rawUrl.startsWith("jdbc:inspur:")) { return JdbcConstants.KDB_DRIVER; @@ -642,7 +635,7 @@ public static DbType getDbTypeRaw(String rawUrl, String driverClassName) { return DbType.polardb; } else if (rawUrl.startsWith("jdbc:highgo:")) { return DbType.highgo; - } else if (rawUrl.startsWith("jdbc:pivotal:greenplum:")||rawUrl.startsWith("jdbc:datadirect:greenplum:")) { + } else if (rawUrl.startsWith("jdbc:pivotal:greenplum:") || rawUrl.startsWith("jdbc:datadirect:greenplum:")) { return DbType.greenplum; } else { return null; @@ -765,12 +758,12 @@ public static void execute(Connection conn, String sql, List parameters) } public static List> executeQuery(DataSource dataSource, String sql, Object... parameters) - throws SQLException { + throws SQLException { return executeQuery(dataSource, sql, Arrays.asList(parameters)); } public static List> executeQuery(DataSource dataSource, String sql, List parameters) - throws SQLException { + throws SQLException { Connection conn = null; try { conn = dataSource.getConnection(); @@ -781,7 +774,7 @@ public static List> executeQuery(DataSource dataSource, Stri } public static List> executeQuery(Connection conn, String sql, List parameters) - throws SQLException { + throws SQLException { List> rows = new ArrayList>(); PreparedStatement stmt = null; @@ -822,7 +815,7 @@ private static void setParameters(PreparedStatement stmt, List parameter } public static void insertToTable(DataSource dataSource, String tableName, Map data) - throws SQLException { + throws SQLException { Connection conn = null; try { conn = dataSource.getConnection(); @@ -840,9 +833,9 @@ public static void insertToTable(Connection conn, String tableName, Map names) { StringBuilder sql = new StringBuilder() // - .append("insert into ") // - .append(tableName) // - .append("("); // + .append("insert into ") // + .append(tableName) // + .append("("); // int nameCount = 0; for (String name : names) { @@ -864,10 +857,12 @@ public static String makeInsertToTableSql(String tableName, Collection n return sql.toString(); } - public static void executeQuery(DataSource dataSource - , ResultSetConsumer consumer - , String sql - , Object... parameters) throws SQLException { + public static void executeQuery( + DataSource dataSource, + ResultSetConsumer consumer, + String sql, + Object... parameters + ) throws SQLException { Connection conn = null; PreparedStatement stmt = null; ResultSet rs = null; @@ -910,7 +905,10 @@ public static String getCreateTableScript(Connection conn, DbType dbType) throws return getCreateTableScript(conn, dbType, true, true); } - public static String getCreateTableScript(Connection conn, DbType dbType, boolean sorted, boolean simplify) throws SQLException { + public static String getCreateTableScript(Connection conn, + DbType dbType, + boolean sorted, + boolean simplify) throws SQLException { if (isMysqlDbType(dbType)) { return MySqlUtils.getCreateTableScript(conn, sorted, simplify); } diff --git a/src/main/java/com/alibaba/druid/util/LRUCache.java b/src/main/java/com/alibaba/druid/util/LRUCache.java index f0d126a96d..811fc44e70 100644 --- a/src/main/java/com/alibaba/druid/util/LRUCache.java +++ b/src/main/java/com/alibaba/druid/util/LRUCache.java @@ -19,15 +19,14 @@ import java.util.Map; public class LRUCache extends LinkedHashMap { - private static final long serialVersionUID = 1L; - private final int maxSize; + private final int maxSize; - public LRUCache(int maxSize){ + public LRUCache(int maxSize) { this(maxSize, 16, 0.75f, false); } - public LRUCache(int maxSize, int initialCapacity, float loadFactor, boolean accessOrder){ + public LRUCache(int maxSize, int initialCapacity, float loadFactor, boolean accessOrder) { super(initialCapacity, loadFactor, accessOrder); this.maxSize = maxSize; } diff --git a/src/main/java/com/alibaba/druid/util/ListDG.java b/src/main/java/com/alibaba/druid/util/ListDG.java index baaeed0c16..80436a2152 100644 --- a/src/main/java/com/alibaba/druid/util/ListDG.java +++ b/src/main/java/com/alibaba/druid/util/ListDG.java @@ -17,11 +17,12 @@ /** * Java: 无回路有向图(Directed Acyclic Graph)的拓扑排序 - * 该DAG图是通过邻接表实现的。 - * + * 该DAG图是通过邻接表实现的。 + *

* author skywang * date 2014/04/22 */ + import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -48,7 +49,7 @@ private class ENode { private class VNode { Object data; // 顶点信息 ENode firstEdge; // 指向第一条依附该顶点的弧 - }; + } private List mVexs; // 顶点数组 @@ -60,7 +61,6 @@ private class VNode { * edges -- 边数组 */ public ListDG(List vexs, List edges) { - // 初始化"顶点数"和"边数" int vlen = vexs.size(); int elen = edges.size(); @@ -89,10 +89,11 @@ public ListDG(List vexs, List edges) { ENode node1 = new ENode(); node1.ivex = p2; // 将node1链接到"p1所在链表的末尾" - if(mVexs.get(p1).firstEdge == null) + if (mVexs.get(p1).firstEdge == null) { mVexs.get(p1).firstEdge = node1; - else + } else { linkLast(mVexs.get(p1).firstEdge, node1); + } } } @@ -102,8 +103,9 @@ public ListDG(List vexs, List edges) { private void linkLast(ENode list, ENode node) { ENode p = list; - while(p.nextEdge!=null) + while (p.nextEdge != null) { p = p.nextEdge; + } p.nextEdge = node; } @@ -111,9 +113,11 @@ private void linkLast(ENode list, ENode node) { * 返回ch位置 */ private int getPosition(Object ch) { - for(int i=0; i queue; // 辅组队列 - ins = new int[num]; + ins = new int[num]; //tops = new Object[num]; queue = new LinkedList(); // 统计每个顶点的入度数 - for(int i = 0; i < num; i++) { - + for (int i = 0; i < num; i++) { ENode node = mVexs.get(i).firstEdge; while (node != null) { ins[node.ivex]++; @@ -232,29 +238,32 @@ public boolean topologicalSort(Object[] tops) { } // 将所有入度为0的顶点入队列 - for(int i = 0; i < num; i ++) - if(ins[i] == 0) - queue.offer(i); // 入队列 + for (int i = 0; i < num; i++) { + if (ins[i] == 0) { + queue.offer(i); // 入队列 + } + } - while (!queue.isEmpty()) { // 队列非空 - int j = queue.poll().intValue(); // 出队列。j是顶点的序号 - tops[index++] = mVexs.get(j).data; // 将该顶点添加到tops中，tops是排序结果 - ENode node = mVexs.get(j).firstEdge;// 获取以该顶点为起点的出边队列 + while (!queue.isEmpty()) { // 队列非空 + int j = queue.poll().intValue(); // 出队列。j是顶点的序号 + tops[index++] = mVexs.get(j).data; // 将该顶点添加到tops中，tops是排序结果 + ENode node = mVexs.get(j).firstEdge; // 获取以该顶点为起点的出边队列 // 将与"node"关联的节点的入度减1； // 若减1之后，该节点的入度为0；则将该节点添加到队列中。 - while(node != null) { + while (node != null) { // 将节点(序号为node.ivex)的入度减1。 ins[node.ivex]--; // 若节点的入度为0，则将其"入队列" - if( ins[node.ivex] == 0) + if (ins[node.ivex] == 0) { queue.offer(node.ivex); // 入队列 + } node = node.nextEdge; } } - if(index != num) { + if (index != num) { return false; } @@ -283,4 +292,4 @@ public boolean topologicalSort(Object[] tops) { // //pG.BFS(); // 广度优先遍历 // pG.topologicalSort(); // 拓扑排序 // } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/util/MapComparator.java b/src/main/java/com/alibaba/druid/util/MapComparator.java index 1b9f635daa..985830e253 100644 --- a/src/main/java/com/alibaba/druid/util/MapComparator.java +++ b/src/main/java/com/alibaba/druid/util/MapComparator.java @@ -25,11 +25,10 @@ * @author sandzhang[sandzhangtoo@gmail.com] */ public class MapComparator implements Comparator> { - private boolean isDesc; - private K orderByKey; + private K orderByKey; - public MapComparator(K orderByKey, boolean isDesc){ + public MapComparator(K orderByKey, boolean isDesc) { this.orderByKey = orderByKey; this.isDesc = isDesc; } diff --git a/src/main/java/com/alibaba/druid/util/MySqlUtils.java b/src/main/java/com/alibaba/druid/util/MySqlUtils.java index cf06eb08b1..43fb0816fe 100644 --- a/src/main/java/com/alibaba/druid/util/MySqlUtils.java +++ b/src/main/java/com/alibaba/druid/util/MySqlUtils.java @@ -20,6 +20,7 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import javax.sql.XAConnection; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -31,42 +32,40 @@ import java.text.SimpleDateFormat; import java.time.*; import java.util.*; -import java.util.Date; public class MySqlUtils { - static Class utilClass; - static boolean utilClassError = false; - static boolean utilClass_isJdbc4 = false; - - static Class class_5_connection= null; - static Method method_5_getPinGlobalTxToPhysicalConnection = null; - static Class class_5_suspendableXAConnection = null; - static Constructor constructor_5_suspendableXAConnection = null; - static Class class_5_JDBC4SuspendableXAConnection = null; - static Constructor constructor_5_JDBC4SuspendableXAConnection = null; - static Class class_5_MysqlXAConnection = null; - static Constructor constructor_5_MysqlXAConnection = null; - - static Class class_ConnectionImpl = null; - static Method method_getId = null; - static boolean method_getId_error = false; - - static Class class_6_ConnectionImpl = null; - static Method method_6_getId = null; - - volatile static Class class_6_connection= null; - volatile static Method method_6_getPropertySet = null; - volatile static Method method_6_getBooleanReadableProperty = null; - volatile static Method method_6_getValue = null; - volatile static boolean method_6_getValue_error = false; - - volatile static Class class_6_suspendableXAConnection = null; - volatile static Method method_6_getInstance = null; - volatile static boolean method_6_getInstance_error = false; - volatile static Method method_6_getInstanceXA = null; - volatile static boolean method_6_getInstanceXA_error = false; - volatile static Class class_6_JDBC4SuspendableXAConnection = null; - + static Class utilClass; + static boolean utilClassError; + static boolean utilClass_isJdbc4; + + static Class class_5_connection; + static Method method_5_getPinGlobalTxToPhysicalConnection; + static Class class_5_suspendableXAConnection; + static Constructor constructor_5_suspendableXAConnection; + static Class class_5_JDBC4SuspendableXAConnection; + static Constructor constructor_5_JDBC4SuspendableXAConnection; + static Class class_5_MysqlXAConnection; + static Constructor constructor_5_MysqlXAConnection; + + static Class class_ConnectionImpl; + static Method method_getId; + static boolean method_getId_error; + + static Class class_6_ConnectionImpl; + static Method method_6_getId; + + static volatile Class class_6_connection; + static volatile Method method_6_getPropertySet; + static volatile Method method_6_getBooleanReadableProperty; + static volatile Method method_6_getValue; + static volatile boolean method_6_getValue_error; + + static volatile Class class_6_suspendableXAConnection; + static volatile Method method_6_getInstance; + static volatile boolean method_6_getInstance_error; + static volatile Method method_6_getInstanceXA; + static volatile boolean method_6_getInstanceXA_error; + static volatile Class class_6_JDBC4SuspendableXAConnection; public static XAConnection createXAConnection(Driver driver, Connection physicalConn) throws SQLException { final int major = driver.getMajorVersion(); @@ -116,7 +115,7 @@ public static XAConnection createXAConnection(Driver driver, Connection physical class_6_connection = Class.forName("com.mysql.cj.api.jdbc.JdbcConnection"); } catch (Throwable t) { } - + try { // maybe 8.0.11 or higher version, try again with com.mysql.cj.jdbc.JdbcConnection if (class_6_connection == null) { @@ -140,8 +139,7 @@ public static XAConnection createXAConnection(Driver driver, Connection physical .getMethod("getValue"); } - } - else { + } else { method_6_getPropertySet = class_6_connection.getMethod("getPropertySet"); method_6_getBooleanReadableProperty = Class.forName("com.mysql.cj.api.conf.PropertySet").getMethod("getBooleanReadableProperty", String.class); method_6_getValue = Class.forName("com.mysql.cj.api.conf.ReadableProperty").getMethod("getValue"); @@ -156,8 +154,8 @@ public static XAConnection createXAConnection(Driver driver, Connection physical // pinGlobalTxToPhysicalConnection Boolean pinGlobTx = (Boolean) method_6_getValue.invoke( method_6_getBooleanReadableProperty.invoke( - method_6_getPropertySet.invoke(physicalConn) - , "pinGlobalTxToPhysicalConnection" + method_6_getPropertySet.invoke(physicalConn), + "pinGlobalTxToPhysicalConnection" ) ); @@ -206,7 +204,7 @@ public static String buildKillQuerySql(Connection connection, SQLException error return null; } - return "KILL QUERY " + threadId; + return "KILL QUERY " + threadId; } @@ -299,7 +297,6 @@ public static List getTableDDL(Connection conn, List tables) thr JdbcUtils.close(stmt); } - return ddlList; } @@ -317,7 +314,7 @@ public static String getCreateTableScript(Connection conn, boolean sorted, boole } String ddlScript = buf.toString(); - if (! (sorted || simplify)) { + if (!(sorted || simplify)) { return ddlScript; } @@ -337,19 +334,19 @@ public static String getCreateTableScript(Connection conn, boolean sorted, boole return SQLUtils.toSQLString(stmtList, DbType.mysql); } - private static transient Class class_connectionImpl = null; - private static transient boolean class_connectionImpl_Error = false; - private static transient Method method_getIO = null; - private static transient boolean method_getIO_error = false; - private static transient Class class_MysqlIO = null; - private static transient boolean class_MysqlIO_Error = false; - private static transient Method method_getLastPacketReceivedTimeMs = null; - private static transient boolean method_getLastPacketReceivedTimeMs_error = false; + private static transient Class class_connectionImpl; + private static transient boolean class_connectionImpl_Error; + private static transient Method method_getIO; + private static transient boolean method_getIO_error; + private static transient Class class_MysqlIO; + private static transient boolean class_MysqlIO_Error; + private static transient Method method_getLastPacketReceivedTimeMs; + private static transient boolean method_getLastPacketReceivedTimeMs_error; - private volatile static boolean mysqlJdbcVersion6 = false; - private static transient Class classJdbc = null; - private static transient Method getIdleFor = null; - private static transient boolean getIdleForError = false; + private static volatile boolean mysqlJdbcVersion6; + private static transient Class classJdbc; + private static transient Method getIdleFor; + private static transient boolean getIdleForError; public static Long getId(Object conn) { if (conn == null) { @@ -405,7 +402,7 @@ public static long getLastPacketReceivedTimeMs(Connection conn) throws SQLExcept return -1; } - if(mysqlJdbcVersion6){ + if (mysqlJdbcVersion6) { if (classJdbc == null) { classJdbc = Utils.loadClass("com.mysql.cj.jdbc.JdbcConnection"); } @@ -435,7 +432,7 @@ public static long getLastPacketReceivedTimeMs(Connection conn) throws SQLExcept return System.currentTimeMillis() - ((Long) - getIdleFor.invoke(connImpl)) + getIdleFor.invoke(connImpl)) .longValue(); } catch (Exception e) { throw new SQLException("getIdleFor error", e); @@ -493,8 +490,8 @@ public static long getLastPacketReceivedTimeMs(Connection conn) throws SQLExcept } } - static Class class_5_CommunicationsException = null; - static Class class_6_CommunicationsException = null; + static Class class_5_CommunicationsException; + static Class class_6_CommunicationsException; public static Class getCommunicationsExceptionClass() { if (class_5_CommunicationsException != null) { @@ -518,13 +515,12 @@ public static Class getCommunicationsExceptionClass() { return null; } - public final static Charset GBK = Charset.forName("GBK"); - public final static Charset BIG5 = Charset.forName("BIG5"); - public final static Charset UTF8 = Charset.forName("UTF-8"); - public final static Charset UTF16 = Charset.forName("UTF-16"); - public final static Charset UTF32 = Charset.forName("UTF-32"); - public final static Charset ASCII = Charset.forName("ASCII"); - + public static final Charset GBK = Charset.forName("GBK"); + public static final Charset BIG5 = Charset.forName("BIG5"); + public static final Charset UTF8 = Charset.forName("UTF-8"); + public static final Charset UTF16 = Charset.forName("UTF-16"); + public static final Charset UTF32 = Charset.forName("UTF-32"); + public static final Charset ASCII = Charset.forName("ASCII"); public static void loadDataTypes(Set dataTypes) { Utils.loadFromFile("META-INF/druid/parser/mysql/builtin_datatypes", dataTypes); @@ -802,8 +798,8 @@ public static BigDecimal decimal(BigDecimal value, int precision, int scale) { } return new BigDecimal( - sign ? MAX_INT[precision - 1] : MIN_INT[precision - 1] - , scale + sign ? MAX_INT[precision - 1] : MIN_INT[precision - 1], + scale ); } @@ -1128,8 +1124,7 @@ public static java.util.Date parseDate(String str, TimeZone timeZone) { // yyyy-MM-dd HH.mm.ss if (c4 == '-' && c7 == '-' && (c10 == ' ' || c10 == 'T') - && ((c13 == ':' && c16 == ':') || (c13 == '.' && c16 == '.'))) - { + && ((c13 == ':' && c16 == ':') || (c13 == '.' && c16 == '.'))) { M0 = c5; M1 = c6; d0 = c8; @@ -1164,7 +1159,6 @@ public static java.util.Date parseDate(String str, TimeZone timeZone) { final char c21 = str.charAt(21); final char c22 = str.charAt(22); - if (c19 == '.') { S0 = c20; S1 = c21; @@ -1189,7 +1183,7 @@ public static java.util.Date parseDate(String str, TimeZone timeZone) { return null; } - nanos = (c23 - '0') * 100000 + nanos = (c23 - '0') * 100000 + (c24 - '0') * 10000 + (c25 - '0') * 1000 + (c26 - '0') * 100 @@ -1305,7 +1299,7 @@ public static java.util.Date parseDate(String str, TimeZone timeZone) { S2 = x0; lastOff = length - 5; } else if ((x2 == '+' || x2 == '-') && length == offset + 5) { - String zoneIdStr = new String(new char[] {x2, x1, x0}); + String zoneIdStr = new String(new char[]{x2, x1, x0}); zoneId = ZoneId.of(zoneIdStr); lastOff = length - 4; } else { @@ -1385,7 +1379,7 @@ public static java.util.Date parseDate(String str, TimeZone timeZone) { return null; } - ZonedDateTime zdt = null; + ZonedDateTime zdt; if (h0 == 0) { zdt = LocalDate .of(year, month, dayOfMonth) @@ -1405,7 +1399,7 @@ public static java.util.Date parseDate(String str, TimeZone timeZone) { .atZone(zoneId); } - return Date.from( + return java.util.Date.from( zdt.toInstant() ); } @@ -1415,7 +1409,6 @@ public static long parseMillis(byte[] str, TimeZone timeZone) { throw new IllegalArgumentException(new String(str, UTF8)); } - return parseMillis(str, 0, str.length, timeZone); } @@ -1586,8 +1579,7 @@ public static ZonedDateTime parseDateTime(final byte[] str, final int off, final // yyyy-MM-dd HH:mm:ss if (c4 == '-' && c7 == '-' && (c10 == ' ' || c10 == 'T') - && c13 == ':' && c16 == ':') - { + && c13 == ':' && c16 == ':') { M0 = c5; M1 = c6; d0 = c8; @@ -1648,7 +1640,7 @@ public static ZonedDateTime parseDateTime(final byte[] str, final int off, final throw new IllegalArgumentException(new String(str, UTF8)); } - nanos = (c23 - '0') * 100000 + nanos = (c23 - '0') * 100000 + (c24 - '0') * 10000 + (c25 - '0') * 1000 + (c26 - '0') * 100 @@ -1669,7 +1661,7 @@ public static ZonedDateTime parseDateTime(final byte[] str, final int off, final throw new IllegalArgumentException(new String(str, UTF8)); } - nanos = (c23 - '0') * 100000 + nanos = (c23 - '0') * 100000 + (c24 - '0') * 10000 + (c25 - '0') * 1000 + (c26 - '0') * 100 @@ -1687,7 +1679,7 @@ public static ZonedDateTime parseDateTime(final byte[] str, final int off, final throw new IllegalArgumentException(new String(str, UTF8)); } - nanos = (c23 - '0') * 100000 + nanos = (c23 - '0') * 100000 + (c24 - '0') * 10000 + (c25 - '0') * 1000 + (c26 - '0') * 100; @@ -1702,7 +1694,7 @@ public static ZonedDateTime parseDateTime(final byte[] str, final int off, final throw new IllegalArgumentException(new String(str, UTF8)); } - nanos = (c23 - '0') * 100000 + nanos = (c23 - '0') * 100000 + (c24 - '0') * 10000 + (c25 - '0') * 1000; } @@ -1911,7 +1903,7 @@ public static ZonedDateTime parseDateTime(final byte[] str, final int off, final return zdt; } - private final static String[] parseFormats = new String[] { + private static final String[] parseFormats = new String[]{ "HH:mm:ss", "yyyyMMdd", "yyyyMMddHHmmss", @@ -1926,8 +1918,9 @@ public static ZonedDateTime parseDateTime(final byte[] str, final int off, final "yyyy-MM-dd'T'HH:mm:ss", "yyyy-MM-dd'T'HH:mm:ss.SSS", }; - private final static long[] parseFormatCodes; - static { + private static final long[] parseFormatCodes; + + static { long[] codes = new long[parseFormats.length]; for (int i = 0; i < parseFormats.length; i++) { codes[i] = FnvHash.fnv1a_64(parseFormats[i]); diff --git a/src/main/java/com/alibaba/druid/util/OracleUtils.java b/src/main/java/com/alibaba/druid/util/OracleUtils.java index 1a65a7ff64..77cfddb898 100644 --- a/src/main/java/com/alibaba/druid/util/OracleUtils.java +++ b/src/main/java/com/alibaba/druid/util/OracleUtils.java @@ -15,27 +15,12 @@ */ package com.alibaba.druid.util; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.sql.XAConnection; -import javax.transaction.xa.XAException; - import com.alibaba.druid.DbType; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; - import oracle.jdbc.OracleConnection; import oracle.jdbc.OracleResultSet; import oracle.jdbc.OracleStatement; @@ -44,9 +29,14 @@ import oracle.jdbc.xa.client.OracleXAConnection; import oracle.sql.ROWID; -public class OracleUtils { +import javax.sql.XAConnection; +import javax.transaction.xa.XAException; + +import java.sql.*; +import java.util.*; - private final static Log LOG = LogFactory.getLog(OracleUtils.class); +public class OracleUtils { + private static final Log LOG = LogFactory.getLog(OracleUtils.class); public static XAConnection OracleXAConnection(Connection oracleConnection) throws XAException { String oracleConnectionClassName = oracleConnection.getClass().getName(); @@ -59,11 +49,11 @@ public static XAConnection OracleXAConnection(Connection oracleConnection) throw public static int getRowPrefetch(PreparedStatement stmt) throws SQLException { OracleStatement oracleStmt = stmt.unwrap(OracleStatement.class); - + if (oracleStmt == null) { return -1; } - + return oracleStmt.getRowPrefetch(); } @@ -312,7 +302,7 @@ public static String getCreateTableScript(Connection conn, boolean sorted, boole String ddlScript = buf.toString(); - if (! (sorted || simplify)) { + if (!(sorted || simplify)) { return ddlScript; } diff --git a/src/main/java/com/alibaba/druid/util/PGUtils.java b/src/main/java/com/alibaba/druid/util/PGUtils.java index b7cfd13a23..fc750cbb14 100644 --- a/src/main/java/com/alibaba/druid/util/PGUtils.java +++ b/src/main/java/com/alibaba/druid/util/PGUtils.java @@ -15,23 +15,18 @@ */ package com.alibaba.druid.util; +import org.postgresql.core.BaseConnection; +import org.postgresql.xa.PGXAConnection; + +import javax.sql.XAConnection; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.sql.XAConnection; - -import org.postgresql.core.BaseConnection; -import org.postgresql.xa.PGXAConnection; +import java.util.*; public class PGUtils { - public static XAConnection createXAConnection(Connection physicalConn) throws SQLException { return new PGXAConnection((BaseConnection) physicalConn); } @@ -57,6 +52,7 @@ public static List showTables(Connection conn) throws SQLException { } private static Set keywords; + public static boolean isKeyword(String name) { if (name == null) { return false; @@ -75,7 +71,8 @@ public static boolean isKeyword(String name) { return words.contains(name_lower); } - private final static long[] pseudoColumnHashCodes; + private static final long[] pseudoColumnHashCodes; + static { long[] array = { FnvHash.Constants.CURRENT_TIMESTAMP diff --git a/src/main/java/com/alibaba/druid/util/PatternMatcher.java b/src/main/java/com/alibaba/druid/util/PatternMatcher.java index f271f19d31..d6fc2aec6b 100644 --- a/src/main/java/com/alibaba/druid/util/PatternMatcher.java +++ b/src/main/java/com/alibaba/druid/util/PatternMatcher.java @@ -19,17 +19,16 @@ * Interface for components that can match source strings against a specified pattern string. * Different implementations can support different pattern types, for example, Ant style path expressions, or regular * expressions, or other types of text based patterns. - * + * * @since 0.2.6 */ public interface PatternMatcher { - /** * Returns true if the given source matches the specified pattern, * false otherwise. - * + * * @param pattern the pattern to match against - * @param source the source to match + * @param source the source to match * @return true if the given source matches the specified pattern, * false otherwise. */ diff --git a/src/main/java/com/alibaba/druid/util/ResultSetConsumer.java b/src/main/java/com/alibaba/druid/util/ResultSetConsumer.java index 734a141645..40b5aa3f89 100644 --- a/src/main/java/com/alibaba/druid/util/ResultSetConsumer.java +++ b/src/main/java/com/alibaba/druid/util/ResultSetConsumer.java @@ -23,5 +23,6 @@ */ public interface ResultSetConsumer { T apply(ResultSet rs) throws SQLException; + void accept(T object); } diff --git a/src/main/java/com/alibaba/druid/util/ServletPathMatcher.java b/src/main/java/com/alibaba/druid/util/ServletPathMatcher.java index 2915020b27..9775738f4b 100644 --- a/src/main/java/com/alibaba/druid/util/ServletPathMatcher.java +++ b/src/main/java/com/alibaba/druid/util/ServletPathMatcher.java @@ -16,58 +16,57 @@ package com.alibaba.druid.util; public class ServletPathMatcher implements PatternMatcher { + private static final ServletPathMatcher INSTANCE = new ServletPathMatcher(); - private final static ServletPathMatcher INSTANCE = new ServletPathMatcher(); + public static ServletPathMatcher getInstance() { + return INSTANCE; + } - public static ServletPathMatcher getInstance() { - return INSTANCE; - } - - /** - *

- * three type: endsWithMatch(eg. /xxx*=/xxx/xyz), startsWithMatch(eg. - * *.xxx=abc.xxx), equals(eg. /xxx=/xxx). - *

- * Notice: *xxx* will match *xxxyyyy. endsWithMatch first. - */ - @Override - public boolean matches(String pattern, String source) { - if (pattern == null || source == null) { - return false; - } - pattern = pattern.trim(); - source = source.trim(); - if (pattern.endsWith("*")) { - // pattern: /druid* source:/druid/index.html - int length = pattern.length() - 1; - if (source.length() >= length) { - if (pattern.substring(0, length).equals( - source.substring(0, length))) { - return true; - } - } - } else if (pattern.startsWith("*")) { - // pattern: *.html source:/xx/xx.html - int length = pattern.length() - 1; - if (source.length() >= length - && source.endsWith(pattern.substring(1))) { - return true; - } - } else if (pattern.contains("*")) { - // pattern: /druid/*/index.html source:/druid/admin/index.html - int start = pattern.indexOf("*"); - int end = pattern.lastIndexOf("*"); - if (source.startsWith(pattern.substring(0, start)) - && source.endsWith(pattern.substring(end + 1))) { - return true; - } - } else { - // pattern: /druid/index.html source:/druid/index.html - if (pattern.equals(source)) { - return true; - } - } - return false; - } + /** + *

+ * three type: endsWithMatch(eg. /xxx*=/xxx/xyz), startsWithMatch(eg. + * *.xxx=abc.xxx), equals(eg. /xxx=/xxx). + *

+ * Notice: *xxx* will match *xxxyyyy. endsWithMatch first. + */ + @Override + public boolean matches(String pattern, String source) { + if (pattern == null || source == null) { + return false; + } + pattern = pattern.trim(); + source = source.trim(); + if (pattern.endsWith("*")) { + // pattern: /druid* source:/druid/index.html + int length = pattern.length() - 1; + if (source.length() >= length) { + if (pattern.substring(0, length).equals( + source.substring(0, length))) { + return true; + } + } + } else if (pattern.startsWith("*")) { + // pattern: *.html source:/xx/xx.html + int length = pattern.length() - 1; + if (source.length() >= length + && source.endsWith(pattern.substring(1))) { + return true; + } + } else if (pattern.contains("*")) { + // pattern: /druid/*/index.html source:/druid/admin/index.html + int start = pattern.indexOf("*"); + int end = pattern.lastIndexOf("*"); + if (source.startsWith(pattern.substring(0, start)) + && source.endsWith(pattern.substring(end + 1))) { + return true; + } + } else { + // pattern: /druid/index.html source:/druid/index.html + if (pattern.equals(source)) { + return true; + } + } + return false; + } } diff --git a/src/main/java/com/alibaba/druid/util/StringUtils.java b/src/main/java/com/alibaba/druid/util/StringUtils.java index 26c075ffbe..3eb773bda6 100644 --- a/src/main/java/com/alibaba/druid/util/StringUtils.java +++ b/src/main/java/com/alibaba/druid/util/StringUtils.java @@ -15,17 +15,16 @@ */ package com.alibaba.druid.util; -import java.util.Calendar; -import java.util.TimeZone; - import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; +import java.util.Calendar; +import java.util.TimeZone; + /** * @author sandzhang[sandzhangtoo@gmail.com] */ public class StringUtils { - private static final Log LOG = LogFactory.getLog(StringUtils.class); private StringUtils() { @@ -33,7 +32,7 @@ private StringUtils() { /** * Example: subString("12345","1","4")=23 - * + * * @param src * @param start * @param to @@ -45,10 +44,10 @@ public static Integer subStringToInteger(String src, String start, String to) { /** * Example: subString("abcd","a","c")="b" - * + * * @param src * @param start null while start from index=0 - * @param to null while to index=src.length + * @param to null while to index=src.length * @return */ public static String subString(String src, String start, String to) { @@ -57,10 +56,10 @@ public static String subString(String src, String start, String to) { /** * Example: subString("abcdc","a","c",true)="bcd" - * + * * @param src - * @param start null while start from index=0 - * @param to null while to index=src.length + * @param start null while start from index=0 + * @param to null while to index=src.length * @param toLast true while to index=src.lastIndexOf(to) * @return */ @@ -95,7 +94,7 @@ public static Integer stringToInteger(String in) { if (in.length() == 0) { return null; } - + try { return Integer.parseInt(in); } catch (NumberFormatException e) { @@ -110,7 +109,7 @@ public static boolean equals(String a, String b) { } return a.equals(b); } - + public static boolean equalsIgnoreCase(String a, String b) { if (a == null) { return b == null; @@ -121,7 +120,7 @@ public static boolean equalsIgnoreCase(String a, String b) { public static boolean isEmpty(CharSequence value) { return value == null || value.length() == 0; } - + public static int lowerHashCode(String text) { if (text == null) { return 0; @@ -354,25 +353,25 @@ public static String formatDateTime19(long millis, TimeZone timeZone) { int second = cale.get(Calendar.SECOND); char[] chars = new char[19]; - chars[0] = (char) (year/1000 + '0'); - chars[1] = (char) ((year/100)%10 + '0'); - chars[2] = (char) ((year/10)%10 + '0'); - chars[3] = (char) (year%10 + '0'); + chars[0] = (char) (year / 1000 + '0'); + chars[1] = (char) ((year / 100) % 10 + '0'); + chars[2] = (char) ((year / 10) % 10 + '0'); + chars[3] = (char) (year % 10 + '0'); chars[4] = '-'; - chars[5] = (char) (month/10 + '0'); - chars[6] = (char) (month%10 + '0'); + chars[5] = (char) (month / 10 + '0'); + chars[6] = (char) (month % 10 + '0'); chars[7] = '-'; - chars[8] = (char) (dayOfMonth/10 + '0'); - chars[9] = (char) (dayOfMonth%10 + '0'); + chars[8] = (char) (dayOfMonth / 10 + '0'); + chars[9] = (char) (dayOfMonth % 10 + '0'); chars[10] = ' '; - chars[11] = (char) (hour/10 + '0'); - chars[12] = (char) (hour%10 + '0'); + chars[11] = (char) (hour / 10 + '0'); + chars[12] = (char) (hour % 10 + '0'); chars[13] = ':'; - chars[14] = (char) (minute/10 + '0'); - chars[15] = (char) (minute%10 + '0'); + chars[14] = (char) (minute / 10 + '0'); + chars[15] = (char) (minute % 10 + '0'); chars[16] = ':'; - chars[17] = (char) (second/10 + '0'); - chars[18] = (char) (second%10 + '0'); + chars[17] = (char) (second / 10 + '0'); + chars[18] = (char) (second % 10 + '0'); return new String(chars); } @@ -384,7 +383,7 @@ public static String removeNameQuotes(String s) { char c0 = s.charAt(0); char last = s.charAt(len - 1); - if (c0 == last && (c0 == '`' || c0 == '\'' || c0 == '\"') ) { + if (c0 == last && (c0 == '`' || c0 == '\'' || c0 == '\"')) { return s.substring(1, len - 1); } return s; diff --git a/src/main/java/com/alibaba/druid/util/TransactionInfo.java b/src/main/java/com/alibaba/druid/util/TransactionInfo.java index 5a4e563502..de0eae918f 100644 --- a/src/main/java/com/alibaba/druid/util/TransactionInfo.java +++ b/src/main/java/com/alibaba/druid/util/TransactionInfo.java @@ -19,13 +19,12 @@ import java.util.List; public class TransactionInfo { - - private final long id; + private final long id; private final List sqlList = new ArrayList(4); - private final long startTimeMillis; - private long endTimeMillis; + private final long startTimeMillis; + private long endTimeMillis; - public TransactionInfo(long id){ + public TransactionInfo(long id) { this.id = id; this.startTimeMillis = System.currentTimeMillis(); } diff --git a/src/main/java/com/alibaba/druid/util/Utils.java b/src/main/java/com/alibaba/druid/util/Utils.java index fc3627921c..336e505c9b 100644 --- a/src/main/java/com/alibaba/druid/util/Utils.java +++ b/src/main/java/com/alibaba/druid/util/Utils.java @@ -15,16 +15,7 @@ */ package com.alibaba.druid.util; -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.io.Reader; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; +import java.io.*; import java.lang.management.ManagementFactory; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -34,8 +25,7 @@ import java.util.Set; public class Utils { - - public final static int DEFAULT_BUFFER_SIZE = 1024 * 4; + public static final int DEFAULT_BUFFER_SIZE = 1024 * 4; public static String read(InputStream in) { if (in == null) { @@ -259,7 +249,7 @@ public static Class loadClass(String className) { private static Date startTime; - public final static Date getStartTime() { + public static final Date getStartTime() { if (startTime == null) { startTime = new Date(ManagementFactory.getRuntimeMXBean().getStartTime()); } @@ -277,58 +267,57 @@ public static long murmurhash2_64(String text) { * * @author Viliam Holub */ -public static long murmurhash2_64(final byte[] data, int length, int seed) { - final long m = 0xc6a4a7935bd1e995L; - final int r = 47; - - long h = (seed & 0xffffffffl) ^ (length * m); - - int length8 = length / 8; - - for (int i = 0; i < length8; i++) { - final int i8 = i * 8; - long k = ((long) data[i8 + 0] & 0xff) // - + (((long) data[i8 + 1] & 0xff) << 8) // - + (((long) data[i8 + 2] & 0xff) << 16)// - + (((long) data[i8 + 3] & 0xff) << 24) // - + (((long) data[i8 + 4] & 0xff) << 32)// - + (((long) data[i8 + 5] & 0xff) << 40)// - + (((long) data[i8 + 6] & 0xff) << 48) // - + (((long) data[i8 + 7] & 0xff) << 56); - - k *= m; - k ^= k >>> r; - k *= m; - - h ^= k; - h *= m; - } - - switch (length % 8) { - case 7: - h ^= (long) (data[(length & ~7) + 6] & 0xff) << 48; - case 6: - h ^= (long) (data[(length & ~7) + 5] & 0xff) << 40; - case 5: - h ^= (long) (data[(length & ~7) + 4] & 0xff) << 32; - case 4: - h ^= (long) (data[(length & ~7) + 3] & 0xff) << 24; - case 3: - h ^= (long) (data[(length & ~7) + 2] & 0xff) << 16; - case 2: - h ^= (long) (data[(length & ~7) + 1] & 0xff) << 8; - case 1: - h ^= (long) (data[length & ~7] & 0xff); + public static long murmurhash2_64(final byte[] data, int length, int seed) { + final long m = 0xc6a4a7935bd1e995L; + final int r = 47; + + long h = (seed & 0xffffffffL) ^ (length * m); + + int length8 = length / 8; + + for (int i = 0; i < length8; i++) { + final int i8 = i * 8; + long k = ((long) data[i8 + 0] & 0xff) // + + (((long) data[i8 + 1] & 0xff) << 8) // + + (((long) data[i8 + 2] & 0xff) << 16)// + + (((long) data[i8 + 3] & 0xff) << 24) // + + (((long) data[i8 + 4] & 0xff) << 32)// + + (((long) data[i8 + 5] & 0xff) << 40)// + + (((long) data[i8 + 6] & 0xff) << 48) // + + (((long) data[i8 + 7] & 0xff) << 56); + + k *= m; + k ^= k >>> r; + k *= m; + + h ^= k; h *= m; - } - ; + } - h ^= h >>> r; - h *= m; - h ^= h >>> r; + switch (length % 8) { + case 7: + h ^= (long) (data[(length & ~7) + 6] & 0xff) << 48; + case 6: + h ^= (long) (data[(length & ~7) + 5] & 0xff) << 40; + case 5: + h ^= (long) (data[(length & ~7) + 4] & 0xff) << 32; + case 4: + h ^= (long) (data[(length & ~7) + 3] & 0xff) << 24; + case 3: + h ^= (long) (data[(length & ~7) + 2] & 0xff) << 16; + case 2: + h ^= (long) (data[(length & ~7) + 1] & 0xff) << 8; + case 1: + h ^= (long) (data[length & ~7] & 0xff); + h *= m; + } - return h; -} + h ^= h >>> r; + h *= m; + h ^= h >>> r; + + return h; + } public static byte[] md5Bytes(String text) { MessageDigest msgDigest = null; @@ -369,12 +358,11 @@ public static boolean equals(Object a, Object b) { public static String hex(int hash) { byte[] bytes = new byte[4]; - bytes[3] = (byte) (hash ); - bytes[2] = (byte) (hash >>> 8); + bytes[3] = (byte) (hash); + bytes[2] = (byte) (hash >>> 8); bytes[1] = (byte) (hash >>> 16); bytes[0] = (byte) (hash >>> 24); - char[] chars = new char[8]; for (int i = 0; i < 4; ++i) { byte b = bytes[i]; @@ -393,8 +381,8 @@ public static String hex(int hash) { public static String hex(long hash) { byte[] bytes = new byte[8]; - bytes[7] = (byte) (hash ); - bytes[6] = (byte) (hash >>> 8); + bytes[7] = (byte) (hash); + bytes[6] = (byte) (hash >>> 8); bytes[5] = (byte) (hash >>> 16); bytes[4] = (byte) (hash >>> 24); bytes[3] = (byte) (hash >>> 32); @@ -420,8 +408,8 @@ public static String hex(long hash) { public static String hex_t(long hash) { byte[] bytes = new byte[8]; - bytes[7] = (byte) (hash ); - bytes[6] = (byte) (hash >>> 8); + bytes[7] = (byte) (hash); + bytes[6] = (byte) (hash >>> 8); bytes[5] = (byte) (hash >>> 16); bytes[4] = (byte) (hash >>> 24); bytes[3] = (byte) (hash >>> 32); diff --git a/src/main/java/com/alibaba/druid/util/jdbc/ConnectionBase.java b/src/main/java/com/alibaba/druid/util/jdbc/ConnectionBase.java index 7d6af00874..f0e125cf0b 100644 --- a/src/main/java/com/alibaba/druid/util/jdbc/ConnectionBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/ConnectionBase.java @@ -23,19 +23,18 @@ import java.util.Properties; public abstract class ConnectionBase implements Connection { - - private boolean autoCommit = true; - private String catalog; - private int transactionIsolation; - private int holdability; - private Map> typeMap = new HashMap>(); - private SQLWarning warnings; - private boolean readOnly; - - private String url; - private Properties info; - - public ConnectionBase(String url, Properties info){ + private boolean autoCommit = true; + private String catalog; + private int transactionIsolation; + private int holdability; + private Map> typeMap = new HashMap>(); + private SQLWarning warnings; + private boolean readOnly; + + private String url; + private Properties info; + + public ConnectionBase(String url, Properties info) { this.url = url; this.info = info; } @@ -68,9 +67,8 @@ public void setCatalog(String catalog) throws SQLException { public String getCatalog() throws SQLException { return catalog; } - + public void checkState() throws SQLException { - } @Override diff --git a/src/main/java/com/alibaba/druid/util/jdbc/LocalResultSet.java b/src/main/java/com/alibaba/druid/util/jdbc/LocalResultSet.java index 5f0460962c..5466345c2a 100644 --- a/src/main/java/com/alibaba/druid/util/jdbc/LocalResultSet.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/LocalResultSet.java @@ -21,11 +21,10 @@ import java.util.List; public class LocalResultSet extends ResultSetBase { + private int rowIndex = -1; + private List rows = new ArrayList(); - private int rowIndex = -1; - private List rows = new ArrayList(); - - public LocalResultSet(Statement statement){ + public LocalResultSet(Statement statement) { super(statement); } @@ -45,7 +44,7 @@ public synchronized boolean next() throws SQLException { } return false; } - + public Object getObjectInternal(int columnIndex) { Object[] row = rows.get(rowIndex); return row[columnIndex - 1]; diff --git a/src/main/java/com/alibaba/druid/util/jdbc/PreparedStatementBase.java b/src/main/java/com/alibaba/druid/util/jdbc/PreparedStatementBase.java index 54de5af306..92cdfeacc6 100644 --- a/src/main/java/com/alibaba/druid/util/jdbc/PreparedStatementBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/PreparedStatementBase.java @@ -15,41 +15,26 @@ */ package com.alibaba.druid.util.jdbc; +import com.alibaba.druid.mock.MockParameterMetaData; +import com.alibaba.druid.mock.MockResultSetMetaData; + import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; import java.net.URL; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.Date; -import java.sql.NClob; -import java.sql.ParameterMetaData; -import java.sql.PreparedStatement; -import java.sql.Ref; -import java.sql.ResultSetMetaData; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLXML; -import java.sql.Time; -import java.sql.Timestamp; +import java.sql.*; import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import com.alibaba.druid.mock.MockParameterMetaData; -import com.alibaba.druid.mock.MockResultSetMetaData; - public abstract class PreparedStatementBase extends StatementBase implements PreparedStatement { + private List parameters = new ArrayList(); - private List parameters = new ArrayList(); - - private MockParameterMetaData metadata = new MockParameterMetaData(); + private MockParameterMetaData metadata = new MockParameterMetaData(); private MockResultSetMetaData resultSetMetaData = new MockResultSetMetaData(); - public PreparedStatementBase(Connection connection){ + public PreparedStatementBase(Connection connection) { super(connection); } diff --git a/src/main/java/com/alibaba/druid/util/jdbc/ResultSetBase.java b/src/main/java/com/alibaba/druid/util/jdbc/ResultSetBase.java index 2714e46fa7..1bc157671b 100644 --- a/src/main/java/com/alibaba/druid/util/jdbc/ResultSetBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/ResultSetBase.java @@ -19,38 +19,22 @@ import java.io.Reader; import java.math.BigDecimal; import java.net.URL; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Date; -import java.sql.NClob; -import java.sql.Ref; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.SQLWarning; -import java.sql.SQLXML; -import java.sql.Statement; -import java.sql.Time; -import java.sql.Timestamp; +import java.sql.*; import java.util.Calendar; import java.util.Map; public abstract class ResultSetBase implements ResultSet { - - protected boolean closed = false; - protected boolean wasNull = false; - private SQLWarning warning; - private String cursorName; - private int fetchSize = 0; - private int fetchDirection = 0; - - protected Statement statement; + protected boolean closed; + protected boolean wasNull; + private SQLWarning warning; + private String cursorName; + private int fetchSize; + private int fetchDirection; + + protected Statement statement; protected ResultSetMetaData metaData; - public ResultSetBase(Statement statement){ + public ResultSetBase(Statement statement) { super(); this.statement = statement; } diff --git a/src/main/java/com/alibaba/druid/util/jdbc/ResultSetMetaDataBase.java b/src/main/java/com/alibaba/druid/util/jdbc/ResultSetMetaDataBase.java index 0fd19a6a01..b78f90389f 100644 --- a/src/main/java/com/alibaba/druid/util/jdbc/ResultSetMetaDataBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/ResultSetMetaDataBase.java @@ -21,9 +21,7 @@ import java.util.List; public class ResultSetMetaDataBase implements ResultSetMetaData { - - public ResultSetMetaDataBase(){ - + public ResultSetMetaDataBase() { } private final List columns = new ArrayList(); @@ -31,7 +29,7 @@ public ResultSetMetaDataBase(){ public List getColumns() { return columns; } - + public int findColumn(String columnName) throws SQLException { for (int i = 0; i < columns.size(); ++i) { ColumnMetaData column = columns.get(i); @@ -39,7 +37,7 @@ public int findColumn(String columnName) throws SQLException { return i + 1; } } - + throw new SQLException("column '" + columnName + "' not found."); } @@ -106,7 +104,7 @@ public int getColumnDisplaySize(int column) throws SQLException { public String getColumnLabel(int column) throws SQLException { return getColumn(column).getColumnLabel(); } - + public ColumnMetaData getColumn(int column) { return columns.get(column - 1); } @@ -172,27 +170,26 @@ public String getColumnClassName(int column) throws SQLException { } public static class ColumnMetaData { - - private boolean autoIncrement = false; + private boolean autoIncrement; private boolean caseSensitive; private boolean searchable; private boolean currency; - private int nullable = 0; + private int nullable; private boolean signed; - private int columnDisplaySize; - private String columnLabel; - private String columnName; - private String schemaName; - private int precision; - private int scale; - private String tableName; - private String catalogName; - private int columnType; - private String columnTypeName; + private int columnDisplaySize; + private String columnLabel; + private String columnName; + private String schemaName; + private int precision; + private int scale; + private String tableName; + private String catalogName; + private int columnType; + private String columnTypeName; private boolean readOnly; private boolean writable; private boolean definitelyWritable; - private String columnClassName; + private String columnClassName; public boolean isAutoIncrement() { return autoIncrement; diff --git a/src/main/java/com/alibaba/druid/util/jdbc/StatementBase.java b/src/main/java/com/alibaba/druid/util/jdbc/StatementBase.java index 399dbc5de4..04bee98bc5 100644 --- a/src/main/java/com/alibaba/druid/util/jdbc/StatementBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/StatementBase.java @@ -15,38 +15,32 @@ */ package com.alibaba.druid.util.jdbc; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.SQLWarning; -import java.sql.Statement; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockConnectionClosedException; -public abstract class StatementBase implements Statement { +import java.sql.*; - private Connection connection; - private int fetchDirection; - private int fetchSize; - private int resultSetType; - private int resultSetConcurrency; - private int resultSetHoldability; - private int maxFieldSize; - private int maxRows; - private int queryTimeout; - private boolean escapeProcessing; - private String cursorName; - private SQLWarning warnings; - private int updateCount; - protected boolean closed = false; - private boolean poolable; +public abstract class StatementBase implements Statement { + private Connection connection; + private int fetchDirection; + private int fetchSize; + private int resultSetType; + private int resultSetConcurrency; + private int resultSetHoldability; + private int maxFieldSize; + private int maxRows; + private int queryTimeout; + private boolean escapeProcessing; + private String cursorName; + private SQLWarning warnings; + private int updateCount; + protected boolean closed; + private boolean poolable; protected ResultSet generatedKeys; protected ResultSet resultSet; - public StatementBase(Connection connection){ + public StatementBase(Connection connection) { super(); this.connection = connection; } diff --git a/src/main/java/com/alibaba/druid/wall/Violation.java b/src/main/java/com/alibaba/druid/wall/Violation.java index c7d2e4586a..41dce49e0b 100644 --- a/src/main/java/com/alibaba/druid/wall/Violation.java +++ b/src/main/java/com/alibaba/druid/wall/Violation.java @@ -16,7 +16,6 @@ package com.alibaba.druid.wall; public interface Violation { - int getErrorCode(); String getMessage(); diff --git a/src/main/java/com/alibaba/druid/wall/WallCheckResult.java b/src/main/java/com/alibaba/druid/wall/WallCheckResult.java index 6bcee4769e..0ca88e827a 100644 --- a/src/main/java/com/alibaba/druid/wall/WallCheckResult.java +++ b/src/main/java/com/alibaba/druid/wall/WallCheckResult.java @@ -15,33 +15,33 @@ */ package com.alibaba.druid.wall; +import com.alibaba.druid.sql.ast.SQLStatement; + import java.util.Collections; import java.util.List; import java.util.Map; -import com.alibaba.druid.sql.ast.SQLStatement; - public class WallCheckResult { - private final List statementList; - private final Map tableStats; + private final List statementList; + private final Map tableStats; - private final List violations; + private final List violations; private final Map functionStats; - private final boolean syntaxError; + private final boolean syntaxError; - private final WallSqlStat sqlStat; + private final WallSqlStat sqlStat; - private String sql; + private String sql; - private List updateCheckItems; + private List updateCheckItems; - public WallCheckResult(){ + public WallCheckResult() { this(null); } - public WallCheckResult(WallSqlStat sqlStat, List stmtList){ + public WallCheckResult(WallSqlStat sqlStat, List stmtList) { if (sqlStat != null) { tableStats = sqlStat.getTableStats(); violations = sqlStat.getViolations(); @@ -58,13 +58,13 @@ public WallCheckResult(WallSqlStat sqlStat, List stmtList){ this.sqlStat = sqlStat; } - public WallCheckResult(WallSqlStat sqlStat){ - this(sqlStat, Collections. emptyList()); + public WallCheckResult(WallSqlStat sqlStat) { + this(sqlStat, Collections.emptyList()); } public WallCheckResult(WallSqlStat sqlStat, List violations, Map tableStats, Map functionStats, List statementList, - boolean syntaxError){ + boolean syntaxError) { this.sqlStat = sqlStat; this.tableStats = tableStats; this.violations = violations; diff --git a/src/main/java/com/alibaba/druid/wall/WallConfig.java b/src/main/java/com/alibaba/druid/wall/WallConfig.java index 017c847c26..886b82770f 100644 --- a/src/main/java/com/alibaba/druid/wall/WallConfig.java +++ b/src/main/java/com/alibaba/druid/wall/WallConfig.java @@ -15,128 +15,123 @@ */ package com.alibaba.druid.wall; -import static com.alibaba.druid.util.Utils.getBoolean; -import static com.alibaba.druid.util.Utils.getInteger; -import static com.alibaba.druid.wall.spi.WallVisitorUtils.loadResource; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.wall.spi.WallVisitorUtils; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; +import java.util.*; import java.util.concurrent.ConcurrentSkipListSet; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.wall.spi.WallVisitorUtils; +import static com.alibaba.druid.util.Utils.getBoolean; +import static com.alibaba.druid.util.Utils.getInteger; +import static com.alibaba.druid.wall.spi.WallVisitorUtils.loadResource; public class WallConfig implements WallConfigMBean { + private boolean noneBaseStatementAllow; - private boolean noneBaseStatementAllow = false; + private boolean callAllow = true; + private boolean selelctAllow = true; + private boolean selectIntoAllow = true; + private boolean selectIntoOutfileAllow; + private boolean selectWhereAlwayTrueCheck = true; + private boolean selectHavingAlwayTrueCheck = true; + private boolean selectUnionCheck = true; + private boolean selectMinusCheck = true; + private boolean selectExceptCheck = true; + private boolean selectIntersectCheck = true; + private boolean createTableAllow = true; + private boolean dropTableAllow = true; + private boolean alterTableAllow = true; + private boolean renameTableAllow = true; + private boolean hintAllow = true; + private boolean lockTableAllow = true; + private boolean startTransactionAllow = true; + private boolean blockAllow = true; - private boolean callAllow = true; - private boolean selelctAllow = true; - private boolean selectIntoAllow = true; - private boolean selectIntoOutfileAllow = false; - private boolean selectWhereAlwayTrueCheck = true; - private boolean selectHavingAlwayTrueCheck = true; - private boolean selectUnionCheck = true; - private boolean selectMinusCheck = true; - private boolean selectExceptCheck = true; - private boolean selectIntersectCheck = true; - private boolean createTableAllow = true; - private boolean dropTableAllow = true; - private boolean alterTableAllow = true; - private boolean renameTableAllow = true; - private boolean hintAllow = true; - private boolean lockTableAllow = true; - private boolean startTransactionAllow = true; - private boolean blockAllow = true; + private boolean conditionAndAlwayTrueAllow; + private boolean conditionAndAlwayFalseAllow; + private boolean conditionDoubleConstAllow; + private boolean conditionLikeTrueAllow = true; - private boolean conditionAndAlwayTrueAllow = false; - private boolean conditionAndAlwayFalseAllow = false; - private boolean conditionDoubleConstAllow = false; - private boolean conditionLikeTrueAllow = true; + private boolean selectAllColumnAllow = true; - private boolean selectAllColumnAllow = true; + private boolean deleteAllow = true; + private boolean deleteWhereAlwayTrueCheck = true; + private boolean deleteWhereNoneCheck; - private boolean deleteAllow = true; - private boolean deleteWhereAlwayTrueCheck = true; - private boolean deleteWhereNoneCheck = false; + private boolean updateAllow = true; + private boolean updateWhereAlayTrueCheck = true; + private boolean updateWhereNoneCheck; - private boolean updateAllow = true; - private boolean updateWhereAlayTrueCheck = true; - private boolean updateWhereNoneCheck = false; + private boolean insertAllow = true; + private boolean mergeAllow = true; + private boolean minusAllow = true; + private boolean intersectAllow = true; + private boolean replaceAllow = true; + private boolean setAllow = true; + private boolean commitAllow = true; + private boolean rollbackAllow = true; + private boolean useAllow = true; - private boolean insertAllow = true; - private boolean mergeAllow = true; - private boolean minusAllow = true; - private boolean intersectAllow = true; - private boolean replaceAllow = true; - private boolean setAllow = true; - private boolean commitAllow = true; - private boolean rollbackAllow = true; - private boolean useAllow = true; + private boolean multiStatementAllow; - private boolean multiStatementAllow = false; + private boolean truncateAllow = true; - private boolean truncateAllow = true; + private boolean commentAllow; + private boolean strictSyntaxCheck = true; + private boolean constArithmeticAllow = true; + private boolean limitZeroAllow; - private boolean commentAllow = false; - private boolean strictSyntaxCheck = true; - private boolean constArithmeticAllow = true; - private boolean limitZeroAllow = false; + private boolean describeAllow = true; + private boolean showAllow = true; - private boolean describeAllow = true; - private boolean showAllow = true; + private boolean schemaCheck = true; + private boolean tableCheck = true; + private boolean functionCheck = true; + private boolean objectCheck = true; + private boolean variantCheck = true; - private boolean schemaCheck = true; - private boolean tableCheck = true; - private boolean functionCheck = true; - private boolean objectCheck = true; - private boolean variantCheck = true; + private boolean mustParameterized; - private boolean mustParameterized = false; + private boolean doPrivilegedAllow; - private boolean doPrivilegedAllow = false; + protected final Set denyFunctions = new ConcurrentSkipListSet(); + protected final Set denyTables = new ConcurrentSkipListSet(); + protected final Set denySchemas = new ConcurrentSkipListSet(); + protected final Set denyVariants = new ConcurrentSkipListSet(); + protected final Set denyObjects = new ConcurrentSkipListSet(); - protected final Set denyFunctions = new ConcurrentSkipListSet(); - protected final Set denyTables = new ConcurrentSkipListSet(); - protected final Set denySchemas = new ConcurrentSkipListSet(); - protected final Set denyVariants = new ConcurrentSkipListSet(); - protected final Set denyObjects = new ConcurrentSkipListSet(); + protected final Set permitFunctions = new ConcurrentSkipListSet(); + protected final Set permitTables = new ConcurrentSkipListSet(); + protected final Set permitSchemas = new ConcurrentSkipListSet(); + protected final Set permitVariants = new ConcurrentSkipListSet(); - protected final Set permitFunctions = new ConcurrentSkipListSet(); - protected final Set permitTables = new ConcurrentSkipListSet(); - protected final Set permitSchemas = new ConcurrentSkipListSet(); - protected final Set permitVariants = new ConcurrentSkipListSet(); + protected final Set readOnlyTables = new ConcurrentSkipListSet(); - protected final Set readOnlyTables = new ConcurrentSkipListSet(); + private String dir; - private String dir; + private boolean inited; - private boolean inited; + private String tenantTablePattern; + private String tenantColumn; + private TenantCallBack tenantCallBack; - private String tenantTablePattern; - private String tenantColumn; - private TenantCallBack tenantCallBack; + private boolean wrapAllow = true; + private boolean metadataAllow = true; - private boolean wrapAllow = true; - private boolean metadataAllow = true; + private boolean conditionOpXorAllow; + private boolean conditionOpBitwseAllow = true; - private boolean conditionOpXorAllow = false; - private boolean conditionOpBitwseAllow = true; + private boolean caseConditionConstAllow; - private boolean caseConditionConstAllow = false; - - private boolean completeInsertValuesCheck = false; - private int insertValuesCheckSize = 3; + private boolean completeInsertValuesCheck; + private int insertValuesCheckSize = 3; - private int selectLimit = -1; + private int selectLimit = -1; protected Map> updateCheckColumns = new HashMap>(); - protected WallUpdateCheckHandler updateCheckHandler; + protected WallUpdateCheckHandler updateCheckHandler; - public WallConfig(){ + public WallConfig() { this.configFromProperties(System.getProperties()); } @@ -280,7 +275,7 @@ public boolean isInited() { return inited; } - public WallConfig(String dir){ + public WallConfig(String dir) { this(); this.dir = dir; this.init(); @@ -326,9 +321,9 @@ public void setNoneBaseStatementAllow(boolean noneBaseStatementAllow) { /** * allow mysql describe statement - * - * @since 0.2.10 + * * @return + * @since 0.2.10 */ public boolean isDescribeAllow() { return describeAllow; @@ -336,7 +331,7 @@ public boolean isDescribeAllow() { /** * set allow mysql describe statement - * + * * @since 0.2.10 */ public void setDescribeAllow(boolean describeAllow) { @@ -676,8 +671,7 @@ public void setHintAllow(boolean hintAllow) { this.hintAllow = hintAllow; } - public static abstract interface TenantCallBack { - + public interface TenantCallBack { public static enum StatementType { SELECT, UPDATE, INSERT, DELETE } @@ -688,14 +682,14 @@ public static enum StatementType { /** * 返回resultset隐藏列名 - * + * * @param tableName */ String getHiddenColumn(String tableName); /** * resultset返回值中如果包含tenantColumn的回调函数 - * + * * @param value tenantColumn对应的值 */ void filterResultsetTenantColumn(Object value); @@ -705,7 +699,6 @@ public boolean isSelectAllow() { return selelctAllow; } - public void setSelectAllow(boolean selelctAllow) { this.selelctAllow = selelctAllow; } @@ -724,7 +717,6 @@ public void setSelelctAllow(boolean selelctAllow) { this.setSelectAllow(selelctAllow); } - public boolean isSelectWhereAlwayTrueCheck() { return selectWhereAlwayTrueCheck; } diff --git a/src/main/java/com/alibaba/druid/wall/WallConfigMBean.java b/src/main/java/com/alibaba/druid/wall/WallConfigMBean.java index 2a0cc99a11..dba0964bf8 100644 --- a/src/main/java/com/alibaba/druid/wall/WallConfigMBean.java +++ b/src/main/java/com/alibaba/druid/wall/WallConfigMBean.java @@ -18,7 +18,6 @@ import java.util.Set; public interface WallConfigMBean { - boolean isInited(); String getDir(); diff --git a/src/main/java/com/alibaba/druid/wall/WallContext.java b/src/main/java/com/alibaba/druid/wall/WallContext.java index bc295362c2..0484c68263 100644 --- a/src/main/java/com/alibaba/druid/wall/WallContext.java +++ b/src/main/java/com/alibaba/druid/wall/WallContext.java @@ -22,27 +22,26 @@ import java.util.Map; public class WallContext { - - private final static ThreadLocal contextLocal = new ThreadLocal(); - - private WallSqlStat sqlStat; - private Map tableStats; - private Map functionStats; - private final DbType dbType; - private int commentCount; - private int warnings = 0; - private int unionWarnings = 0; - private int updateNoneConditionWarnings = 0; - private int deleteNoneConditionWarnings = 0; - private int likeNumberWarnings = 0; - - private List wallUpdateCheckItems; - - public WallContext(String dbType){ + private static final ThreadLocal contextLocal = new ThreadLocal(); + + private WallSqlStat sqlStat; + private Map tableStats; + private Map functionStats; + private final DbType dbType; + private int commentCount; + private int warnings; + private int unionWarnings; + private int updateNoneConditionWarnings; + private int deleteNoneConditionWarnings; + private int likeNumberWarnings; + + private List wallUpdateCheckItems; + + public WallContext(String dbType) { this(DbType.of(dbType)); } - public WallContext(DbType dbType){ + public WallContext(DbType dbType) { this.dbType = dbType; } diff --git a/src/main/java/com/alibaba/druid/wall/WallDenyStat.java b/src/main/java/com/alibaba/druid/wall/WallDenyStat.java index 053fc79b7a..1fc1ea58f1 100644 --- a/src/main/java/com/alibaba/druid/wall/WallDenyStat.java +++ b/src/main/java/com/alibaba/druid/wall/WallDenyStat.java @@ -19,18 +19,17 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater; public class WallDenyStat { + private volatile long denyCount; - private volatile long denyCount; + private volatile long lastDenyTimeMillis; - private volatile long lastDenyTimeMillis; + private volatile long resetCount; - private volatile long resetCount; + static final AtomicLongFieldUpdater denyCountUpdater = AtomicLongFieldUpdater.newUpdater(WallDenyStat.class, + "denyCount"); - final static AtomicLongFieldUpdater denyCountUpdater = AtomicLongFieldUpdater.newUpdater(WallDenyStat.class, - "denyCount"); - - final static AtomicLongFieldUpdater resetCountUpdater = AtomicLongFieldUpdater.newUpdater(WallDenyStat.class, - "resetCount"); + static final AtomicLongFieldUpdater resetCountUpdater = AtomicLongFieldUpdater.newUpdater(WallDenyStat.class, + "resetCount"); public long incrementAndGetDenyCount() { lastDenyTimeMillis = System.currentTimeMillis(); diff --git a/src/main/java/com/alibaba/druid/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java index 62c58b71e9..6bfe5ef606 100644 --- a/src/main/java/com/alibaba/druid/wall/WallFilter.java +++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java @@ -15,43 +15,11 @@ */ package com.alibaba.druid.wall; -import static com.alibaba.druid.util.Utils.getBoolean; - -import java.io.InputStream; -import java.io.Reader; -import java.math.BigDecimal; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.DatabaseMetaData; -import java.sql.NClob; -import java.sql.Ref; -import java.sql.ResultSetMetaData; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLXML; -import java.sql.Wrapper; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - import com.alibaba.druid.DbType; import com.alibaba.druid.VERSION; import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; -import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; -import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.proxy.jdbc.DataSourceProxy; -import com.alibaba.druid.proxy.jdbc.JdbcParameter; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetMetaDataProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetProxy; -import com.alibaba.druid.proxy.jdbc.StatementProxy; +import com.alibaba.druid.proxy.jdbc.*; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLValuableExpr; import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; @@ -65,25 +33,32 @@ import com.alibaba.druid.wall.spi.*; import com.alibaba.druid.wall.violation.SyntaxErrorViolation; -public class WallFilter extends FilterAdapter implements WallFilterMBean { +import java.io.InputStream; +import java.io.Reader; +import java.math.BigDecimal; +import java.sql.*; +import java.util.*; - private final static Log LOG = LogFactory.getLog(WallFilter.class); +import static com.alibaba.druid.util.Utils.getBoolean; - private boolean inited = false; +public class WallFilter extends FilterAdapter implements WallFilterMBean { + private static final Log LOG = LogFactory.getLog(WallFilter.class); - private WallProvider provider; + private boolean inited; + + private WallProvider provider; private String dbTypeName; - private WallConfig config; + private WallConfig config; - private volatile boolean logViolation = false; - private volatile boolean throwException = true; + private volatile boolean logViolation; + private volatile boolean throwException = true; - public final static String ATTR_SQL_STAT = "wall.sqlStat"; - public final static String ATTR_UPDATE_CHECK_ITEMS = "wall.updateCheckItems"; + public static final String ATTR_SQL_STAT = "wall.sqlStat"; + public static final String ATTR_UPDATE_CHECK_ITEMS = "wall.updateCheckItems"; - public WallFilter(){ + public WallFilter() { configFromProperties(System.getProperties()); } @@ -101,7 +76,7 @@ public void configFromProperties(Properties properties) { this.throwException = value; } } - + if (this.config != null) { this.config.configFromProperties(properties); } @@ -109,7 +84,6 @@ public void configFromProperties(Properties properties) { @Override public synchronized void init(DataSourceProxy dataSource) { - if (dataSource == null) { LOG.error("dataSource should not be null"); return; @@ -195,7 +169,7 @@ public synchronized void init(DataSourceProxy dataSource) { default: throw new IllegalStateException("dbType not support : " + dbType + ", url " + dataSource.getUrl()); } - + provider.setName(dataSource.getName()); this.inited = true; @@ -258,11 +232,11 @@ public WallConfig getConfig() { public void setConfig(WallConfig config) { this.config = config; } - + public void setTenantColumn(String tenantColumn) { this.config.setTenantColumn(tenantColumn); } - + public String getTenantColumn() { return this.config.getTenantColumn(); } @@ -289,7 +263,7 @@ public void preparedStatement_addBatch(FilterChain chain, PreparedStatementProxy @Override public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql) - throws SQLException { + throws SQLException { String dbType = connection.getDirectDataSource().getDbType(); WallContext context = WallContext.create(dbType); try { @@ -324,7 +298,7 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con @Override public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { String dbType = connection.getDirectDataSource().getDbType(); WallContext context = WallContext.create(dbType); try { @@ -332,7 +306,7 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con context.setWallUpdateCheckItems(result.getUpdateCheckItems()); sql = result.getSql(); PreparedStatementProxy stmt = chain.connection_prepareStatement(connection, sql, resultSetType, - resultSetConcurrency); + resultSetConcurrency); setSqlStatAttribute(stmt); return stmt; } finally { @@ -351,7 +325,7 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con context.setWallUpdateCheckItems(result.getUpdateCheckItems()); sql = result.getSql(); PreparedStatementProxy stmt = chain.connection_prepareStatement(connection, sql, resultSetType, - resultSetConcurrency, resultSetHoldability); + resultSetConcurrency, resultSetHoldability); setSqlStatAttribute(stmt); return stmt; } finally { @@ -395,7 +369,7 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con @Override public CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy connection, String sql) - throws SQLException { + throws SQLException { String dbType = connection.getDirectDataSource().getDbType(); WallContext context = WallContext.create(dbType); try { @@ -413,7 +387,7 @@ public CallableStatementProxy connection_prepareCall(FilterChain chain, Connecti @Override public CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { String dbType = connection.getDirectDataSource().getDbType(); WallContext context = WallContext.create(dbType); try { @@ -421,7 +395,7 @@ public CallableStatementProxy connection_prepareCall(FilterChain chain, Connecti context.setWallUpdateCheckItems(result.getUpdateCheckItems()); sql = result.getSql(); CallableStatementProxy stmt = chain.connection_prepareCall(connection, sql, resultSetType, - resultSetConcurrency); + resultSetConcurrency); setSqlStatAttribute(stmt); return stmt; } finally { @@ -440,7 +414,7 @@ public CallableStatementProxy connection_prepareCall(FilterChain chain, Connecti context.setWallUpdateCheckItems(result.getUpdateCheckItems()); sql = result.getSql(); CallableStatementProxy stmt = chain.connection_prepareCall(connection, sql, resultSetType, - resultSetConcurrency, resultSetHoldability); + resultSetConcurrency, resultSetHoldability); setSqlStatAttribute(stmt); return stmt; } finally { @@ -476,7 +450,7 @@ public boolean statement_execute(FilterChain chain, StatementProxy statement, St @Override public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { createWallContext(statement); try { sql = check(sql); @@ -497,8 +471,8 @@ public boolean statement_execute(FilterChain chain, StatementProxy statement, St } @Override - public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { createWallContext(statement); try { sql = check(sql); @@ -519,8 +493,8 @@ public boolean statement_execute(FilterChain chain, StatementProxy statement, St } @Override - public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, String[] columnNames) + throws SQLException { createWallContext(statement); try { sql = check(sql); @@ -565,7 +539,7 @@ public int[] statement_executeBatch(FilterChain chain, StatementProxy statement) @Override public ResultSetProxy statement_executeQuery(FilterChain chain, StatementProxy statement, String sql) - throws SQLException { + throws SQLException { createWallContext(statement); try { sql = check(sql); @@ -598,7 +572,7 @@ public int statement_executeUpdate(FilterChain chain, StatementProxy statement, @Override public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { createWallContext(statement); try { sql = check(sql); @@ -614,8 +588,8 @@ public int statement_executeUpdate(FilterChain chain, StatementProxy statement, } @Override - public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { createWallContext(statement); try { sql = check(sql); @@ -640,8 +614,8 @@ private WallContext createWallContext(StatementProxy statement) { } @Override - public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, String[] columnNames) + throws SQLException { createWallContext(statement); try { sql = check(sql); @@ -680,7 +654,7 @@ public boolean preparedStatement_execute(FilterChain chain, PreparedStatementPro @Override public ResultSetProxy preparedStatement_executeQuery(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { + throws SQLException { try { ResultSetProxy resultSetProxy = chain.preparedStatement_executeQuery(statement); preprocessResultSet(resultSetProxy); @@ -692,7 +666,8 @@ public ResultSetProxy preparedStatement_executeQuery(FilterChain chain, Prepared } @Override - public int preparedStatement_executeUpdate(FilterChain chain, PreparedStatementProxy statement) throws SQLException { + public int preparedStatement_executeUpdate(FilterChain chain, + PreparedStatementProxy statement) throws SQLException { try { wallUpdateCheck(statement); @@ -924,7 +899,7 @@ public void resultSet_close(FilterChain chain, ResultSetProxy resultSet) throws @Override public int resultSet_findColumn(FilterChain chain, ResultSetProxy resultSet, String columnLabel) - throws SQLException { + throws SQLException { int physicalColumn = chain.resultSet_findColumn(resultSet, columnLabel); return resultSet.getLogicColumn(physicalColumn); } @@ -936,25 +911,25 @@ public Array resultSet_getArray(FilterChain chain, ResultSetProxy resultSet, int @Override public InputStream resultSet_getAsciiStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getAsciiStream(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @Override public BigDecimal resultSet_getBigDecimal(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getBigDecimal(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @Override public BigDecimal resultSet_getBigDecimal(FilterChain chain, ResultSetProxy resultSet, int columnIndex, int scale) - throws SQLException { + throws SQLException { return chain.resultSet_getBigDecimal(resultSet, resultSet.getPhysicalColumn(columnIndex), scale); } @Override public java.io.InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getBinaryStream(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @@ -965,7 +940,7 @@ public Blob resultSet_getBlob(FilterChain chain, ResultSetProxy resultSet, int c @Override public boolean resultSet_getBoolean(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getBoolean(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @@ -981,7 +956,7 @@ public byte[] resultSet_getBytes(FilterChain chain, ResultSetProxy resultSet, in @Override public java.io.Reader resultSet_getCharacterStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getCharacterStream(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @@ -992,18 +967,20 @@ public Clob resultSet_getClob(FilterChain chain, ResultSetProxy resultSet, int c @Override public java.sql.Date resultSet_getDate(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getDate(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @Override public java.sql.Date resultSet_getDate(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Calendar cal) - throws SQLException { + throws SQLException { return chain.resultSet_getDate(resultSet, resultSet.getPhysicalColumn(columnIndex), cal); } @Override - public double resultSet_getDouble(FilterChain chain, ResultSetProxy resultSet, int columnIndex) throws SQLException { + public double resultSet_getDouble(FilterChain chain, + ResultSetProxy resultSet, + int columnIndex) throws SQLException { return chain.resultSet_getDouble(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @@ -1024,7 +1001,7 @@ public long resultSet_getLong(FilterChain chain, ResultSetProxy resultSet, int c @Override public java.io.Reader resultSet_getNCharacterStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getNCharacterStream(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @@ -1035,17 +1012,22 @@ public NClob resultSet_getNClob(FilterChain chain, ResultSetProxy resultSet, int @Override public String resultSet_getNString(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getNString(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @Override - public Object resultSet_getObject(FilterChain chain, ResultSetProxy resultSet, int columnIndex) throws SQLException { + public Object resultSet_getObject(FilterChain chain, + ResultSetProxy resultSet, + int columnIndex) throws SQLException { return chain.resultSet_getObject(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @Override - public T resultSet_getObject(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Class type) throws SQLException { + public T resultSet_getObject(FilterChain chain, + ResultSetProxy resultSet, + int columnIndex, + Class type) throws SQLException { return chain.resultSet_getObject(resultSet, resultSet.getPhysicalColumn(columnIndex), type); } @@ -1066,7 +1048,9 @@ public RowId resultSet_getRowId(FilterChain chain, ResultSetProxy resultSet, int } @Override - public SQLXML resultSet_getSQLXML(FilterChain chain, ResultSetProxy resultSet, int columnIndex) throws SQLException { + public SQLXML resultSet_getSQLXML(FilterChain chain, + ResultSetProxy resultSet, + int columnIndex) throws SQLException { return chain.resultSet_getSQLXML(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @@ -1076,25 +1060,27 @@ public short resultSet_getShort(FilterChain chain, ResultSetProxy resultSet, int } @Override - public String resultSet_getString(FilterChain chain, ResultSetProxy resultSet, int columnIndex) throws SQLException { + public String resultSet_getString(FilterChain chain, + ResultSetProxy resultSet, + int columnIndex) throws SQLException { return chain.resultSet_getString(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @Override public java.sql.Time resultSet_getTime(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getTime(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @Override public java.sql.Time resultSet_getTime(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Calendar cal) - throws SQLException { + throws SQLException { return chain.resultSet_getTime(resultSet, resultSet.getPhysicalColumn(columnIndex), cal); } @Override public java.sql.Timestamp resultSet_getTimestamp(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getTimestamp(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @@ -1106,19 +1092,19 @@ public java.sql.Timestamp resultSet_getTimestamp(FilterChain chain, ResultSetPro @Override public java.net.URL resultSet_getURL(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getURL(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @Override public java.io.InputStream resultSet_getUnicodeStream(FilterChain chain, ResultSetProxy resultSet, int columnIndex) - throws SQLException { + throws SQLException { return chain.resultSet_getUnicodeStream(resultSet, resultSet.getPhysicalColumn(columnIndex)); } @Override public void resultSet_updateArray(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Array x) - throws SQLException { + throws SQLException { chain.resultSet_updateArray(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @@ -1142,7 +1128,7 @@ public void resultSet_updateAsciiStream(FilterChain chain, ResultSetProxy result @Override public void resultSet_updateBigDecimal(FilterChain chain, ResultSetProxy resultSet, int columnIndex, BigDecimal x) - throws SQLException { + throws SQLException { chain.resultSet_updateBigDecimal(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @@ -1178,25 +1164,25 @@ public void resultSet_updateBlob(FilterChain chain, ResultSetProxy resultSet, in @Override public void resultSet_updateBlob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Blob x) - throws SQLException { + throws SQLException { chain.resultSet_updateBlob(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @Override public void resultSet_updateBoolean(FilterChain chain, ResultSetProxy resultSet, int columnIndex, boolean x) - throws SQLException { + throws SQLException { chain.resultSet_updateBoolean(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @Override public void resultSet_updateByte(FilterChain chain, ResultSetProxy resultSet, int columnIndex, byte x) - throws SQLException { + throws SQLException { chain.resultSet_updateByte(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @Override public void resultSet_updateBytes(FilterChain chain, ResultSetProxy resultSet, int columnIndex, byte[] x) - throws SQLException { + throws SQLException { chain.resultSet_updateBytes(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @@ -1220,13 +1206,13 @@ public void resultSet_updateCharacterStream(FilterChain chain, ResultSetProxy re @Override public void resultSet_updateClob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Clob x) - throws SQLException { + throws SQLException { chain.resultSet_updateClob(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @Override public void resultSet_updateClob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Reader reader) - throws SQLException { + throws SQLException { chain.resultSet_updateClob(resultSet, resultSet.getPhysicalColumn(columnIndex), reader); } @@ -1238,31 +1224,31 @@ public void resultSet_updateClob(FilterChain chain, ResultSetProxy resultSet, in @Override public void resultSet_updateDate(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Date x) - throws SQLException { + throws SQLException { chain.resultSet_updateDate(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @Override public void resultSet_updateDouble(FilterChain chain, ResultSetProxy resultSet, int columnIndex, double x) - throws SQLException { + throws SQLException { chain.resultSet_updateDouble(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @Override public void resultSet_updateFloat(FilterChain chain, ResultSetProxy resultSet, int columnIndex, float x) - throws SQLException { + throws SQLException { chain.resultSet_updateFloat(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @Override public void resultSet_updateInt(FilterChain chain, ResultSetProxy resultSet, int columnIndex, int x) - throws SQLException { + throws SQLException { chain.resultSet_updateInt(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @Override public void resultSet_updateLong(FilterChain chain, ResultSetProxy resultSet, int columnIndex, long x) - throws SQLException { + throws SQLException { chain.resultSet_updateLong(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @@ -1280,13 +1266,13 @@ public void resultSet_updateNCharacterStream(FilterChain chain, ResultSetProxy r @Override public void resultSet_updateNClob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, NClob nClob) - throws SQLException { + throws SQLException { chain.resultSet_updateNClob(resultSet, resultSet.getPhysicalColumn(columnIndex), nClob); } @Override public void resultSet_updateNClob(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Reader reader) - throws SQLException { + throws SQLException { chain.resultSet_updateNClob(resultSet, resultSet.getPhysicalColumn(columnIndex), reader); } @@ -1298,7 +1284,7 @@ public void resultSet_updateNClob(FilterChain chain, ResultSetProxy resultSet, i @Override public void resultSet_updateNString(FilterChain chain, ResultSetProxy resultSet, int columnIndex, String nString) - throws SQLException { + throws SQLException { chain.resultSet_updateNString(resultSet, resultSet.getPhysicalColumn(columnIndex), nString); } @@ -1309,7 +1295,7 @@ public void resultSet_updateNull(FilterChain chain, ResultSetProxy resultSet, in @Override public void resultSet_updateObject(FilterChain chain, ResultSetProxy resultSet, int columnIndex, Object x) - throws SQLException { + throws SQLException { chain.resultSet_updateObject(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @@ -1321,37 +1307,37 @@ public void resultSet_updateObject(FilterChain chain, ResultSetProxy resultSet, @Override public void resultSet_updateRef(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Ref x) - throws SQLException { + throws SQLException { chain.resultSet_updateRef(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @Override public void resultSet_updateRowId(FilterChain chain, ResultSetProxy resultSet, int columnIndex, RowId x) - throws SQLException { + throws SQLException { chain.resultSet_updateRowId(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @Override public void resultSet_updateShort(FilterChain chain, ResultSetProxy resultSet, int columnIndex, short x) - throws SQLException { + throws SQLException { chain.resultSet_updateShort(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @Override public void resultSet_updateSQLXML(FilterChain chain, ResultSetProxy resultSet, int columnIndex, SQLXML xmlObject) - throws SQLException { + throws SQLException { chain.resultSet_updateSQLXML(resultSet, resultSet.getPhysicalColumn(columnIndex), xmlObject); } @Override public void resultSet_updateString(FilterChain chain, ResultSetProxy resultSet, int columnIndex, String x) - throws SQLException { + throws SQLException { chain.resultSet_updateString(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @Override public void resultSet_updateTime(FilterChain chain, ResultSetProxy resultSet, int columnIndex, java.sql.Time x) - throws SQLException { + throws SQLException { chain.resultSet_updateTime(resultSet, resultSet.getPhysicalColumn(columnIndex), x); } @@ -1378,133 +1364,136 @@ public boolean resultSet_next(FilterChain chain, ResultSetProxy resultSet) throw } @Override - public int resultSetMetaData_getColumnCount(FilterChain chain, ResultSetMetaDataProxy metaData) throws SQLException { + public int resultSetMetaData_getColumnCount(FilterChain chain, + ResultSetMetaDataProxy metaData) throws SQLException { int count = chain.resultSetMetaData_getColumnCount(metaData); return count - metaData.getResultSetProxy().getHiddenColumnCount(); } @Override public boolean resultSetMetaData_isAutoIncrement(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isAutoIncrement(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public boolean resultSetMetaData_isCaseSensitive(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isCaseSensitive(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public boolean resultSetMetaData_isSearchable(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isSearchable(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public boolean resultSetMetaData_isCurrency(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isCurrency(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public int resultSetMetaData_isNullable(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isNullable(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public boolean resultSetMetaData_isSigned(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isSigned(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public int resultSetMetaData_getColumnDisplaySize(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getColumnDisplaySize(metaData, - metaData.getResultSetProxy().getPhysicalColumn(column)); + metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public String resultSetMetaData_getColumnLabel(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getColumnLabel(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public String resultSetMetaData_getColumnName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getColumnName(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public String resultSetMetaData_getSchemaName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getSchemaName(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public int resultSetMetaData_getPrecision(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getPrecision(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public int resultSetMetaData_getScale(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getScale(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public String resultSetMetaData_getTableName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getTableName(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public String resultSetMetaData_getCatalogName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getCatalogName(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public int resultSetMetaData_getColumnType(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getColumnType(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public String resultSetMetaData_getColumnTypeName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getColumnTypeName(metaData, - metaData.getResultSetProxy().getPhysicalColumn(column)); + metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public boolean resultSetMetaData_isReadOnly(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isReadOnly(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public boolean resultSetMetaData_isWritable(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_isWritable(metaData, metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override - public boolean resultSetMetaData_isDefinitelyWritable(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + public boolean resultSetMetaData_isDefinitelyWritable(FilterChain chain, + ResultSetMetaDataProxy metaData, + int column) + throws SQLException { return chain.resultSetMetaData_isDefinitelyWritable(metaData, - metaData.getResultSetProxy().getPhysicalColumn(column)); + metaData.getResultSetProxy().getPhysicalColumn(column)); } @Override public String resultSetMetaData_getColumnClassName(FilterChain chain, ResultSetMetaDataProxy metaData, int column) - throws SQLException { + throws SQLException { return chain.resultSetMetaData_getColumnClassName(metaData, - metaData.getResultSetProxy().getPhysicalColumn(column)); + metaData.getResultSetProxy().getPhysicalColumn(column)); } public long getViolationCount() { @@ -1582,7 +1571,7 @@ private void preprocessResultSet(ResultSetProxy resultSet) throws SQLException { } if (!StringUtils.isEmpty(tenantColumn) - && null != tenantColumn && tenantColumn.equalsIgnoreCase(metaData.getColumnName(physicalColumn))) { + && null != tenantColumn && tenantColumn.equalsIgnoreCase(metaData.getColumnName(physicalColumn))) { tenantColumns.add(physicalColumn); } } diff --git a/src/main/java/com/alibaba/druid/wall/WallFilterMBean.java b/src/main/java/com/alibaba/druid/wall/WallFilterMBean.java index 74f68562b3..5181d6a468 100644 --- a/src/main/java/com/alibaba/druid/wall/WallFilterMBean.java +++ b/src/main/java/com/alibaba/druid/wall/WallFilterMBean.java @@ -19,7 +19,6 @@ import java.util.Set; public interface WallFilterMBean { - String getDbType(); boolean isLogViolation(); @@ -27,22 +26,22 @@ public interface WallFilterMBean { void setLogViolation(boolean logViolation); boolean isThrowException(); - + void setThrowException(boolean throwException); - + boolean isInited(); - + void clearProviderCache(); - + Set getProviderWhiteList(); - + String check(String sql) throws SQLException; - + long getViolationCount(); - + void resetViolationCount(); - + void clearWhiteList(); - + boolean checkValid(String sql); } diff --git a/src/main/java/com/alibaba/druid/wall/WallFunctionStat.java b/src/main/java/com/alibaba/druid/wall/WallFunctionStat.java index 3a27c8f46d..f3f560e525 100644 --- a/src/main/java/com/alibaba/druid/wall/WallFunctionStat.java +++ b/src/main/java/com/alibaba/druid/wall/WallFunctionStat.java @@ -15,17 +15,16 @@ */ package com.alibaba.druid.wall; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; - import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -public class WallFunctionStat { +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; - private volatile long invokeCount; - final static AtomicLongFieldUpdater invokeCountUpdater = AtomicLongFieldUpdater.newUpdater(WallFunctionStat.class, - "invokeCount"); +public class WallFunctionStat { + private volatile long invokeCount; + static final AtomicLongFieldUpdater invokeCountUpdater = AtomicLongFieldUpdater.newUpdater(WallFunctionStat.class, + "invokeCount"); public long getInvokeCount() { return invokeCount; diff --git a/src/main/java/com/alibaba/druid/wall/WallFunctionStatValue.java b/src/main/java/com/alibaba/druid/wall/WallFunctionStatValue.java index 20cc713fcc..64ee3a7203 100644 --- a/src/main/java/com/alibaba/druid/wall/WallFunctionStatValue.java +++ b/src/main/java/com/alibaba/druid/wall/WallFunctionStatValue.java @@ -15,27 +15,25 @@ */ package com.alibaba.druid.wall; -import java.util.LinkedHashMap; -import java.util.Map; - import com.alibaba.druid.support.monitor.annotation.AggregateType; import com.alibaba.druid.support.monitor.annotation.MField; import com.alibaba.druid.support.monitor.annotation.MTable; +import java.util.LinkedHashMap; +import java.util.Map; + @MTable(name = "druid_wall_function") public class WallFunctionStatValue { - - @MField(groupBy=true, aggregate=AggregateType.None) + @MField(groupBy = true, aggregate = AggregateType.None) private String name; - @MField(aggregate=AggregateType.Sum) - private long invokeCount; - - public WallFunctionStatValue(){ + @MField(aggregate = AggregateType.Sum) + private long invokeCount; + public WallFunctionStatValue() { } - public WallFunctionStatValue(String name){ + public WallFunctionStatValue(String name) { this.name = name; } diff --git a/src/main/java/com/alibaba/druid/wall/WallProvider.java b/src/main/java/com/alibaba/druid/wall/WallProvider.java index 854fe88437..5823348e6b 100644 --- a/src/main/java/com/alibaba/druid/wall/WallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/WallProvider.java @@ -15,21 +15,6 @@ */ package com.alibaba.druid.wall; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; - -import java.security.PrivilegedAction; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLName; @@ -37,11 +22,7 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlHintStatement; -import com.alibaba.druid.sql.parser.Lexer; -import com.alibaba.druid.sql.parser.NotAllowCommentException; -import com.alibaba.druid.sql.parser.ParserException; -import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.sql.parser.Token; +import com.alibaba.druid.sql.parser.*; import com.alibaba.druid.sql.visitor.ExportParameterVisitor; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.LRUCache; @@ -51,63 +32,72 @@ import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; import com.alibaba.druid.wall.violation.SyntaxErrorViolation; -public abstract class WallProvider { +import java.security.PrivilegedAction; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; - private String name; +public abstract class WallProvider { + private String name; - private final Map attributes = new ConcurrentHashMap( - 1, - 0.75f, - 1); + private final Map attributes = new ConcurrentHashMap( + 1, + 0.75f, + 1); - private boolean whiteListEnable = true; - private LRUCache whiteList; + private boolean whiteListEnable = true; + private LRUCache whiteList; - private int MAX_SQL_LENGTH = 8192; // 8k + private int MAX_SQL_LENGTH = 8192; // 8k - private int whiteSqlMaxSize = 1000; + private int whiteSqlMaxSize = 1000; - private boolean blackListEnable = true; - private LRUCache blackList; - private LRUCache blackMergedList; + private boolean blackListEnable = true; + private LRUCache blackList; + private LRUCache blackMergedList; - private int blackSqlMaxSize = 200; + private int blackSqlMaxSize = 200; - protected final WallConfig config; + protected final WallConfig config; - private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); - private static final ThreadLocal privileged = new ThreadLocal(); + private static final ThreadLocal privileged = new ThreadLocal(); - private final ConcurrentMap functionStats = new ConcurrentHashMap( - 16, - 0.75f, - 1); - private final ConcurrentMap tableStats = new ConcurrentHashMap( - 16, - 0.75f, - 1); + private final ConcurrentMap functionStats = new ConcurrentHashMap( + 16, + 0.75f, + 1); + private final ConcurrentMap tableStats = new ConcurrentHashMap( + 16, + 0.75f, + 1); - public final WallDenyStat commentDeniedStat = new WallDenyStat(); + public final WallDenyStat commentDeniedStat = new WallDenyStat(); - protected DbType dbType = null; - protected final AtomicLong checkCount = new AtomicLong(); - protected final AtomicLong hardCheckCount = new AtomicLong(); - protected final AtomicLong whiteListHitCount = new AtomicLong(); - protected final AtomicLong blackListHitCount = new AtomicLong(); - protected final AtomicLong syntaxErrorCount = new AtomicLong(); - protected final AtomicLong violationCount = new AtomicLong(); - protected final AtomicLong violationEffectRowCount = new AtomicLong(); + protected DbType dbType; + protected final AtomicLong checkCount = new AtomicLong(); + protected final AtomicLong hardCheckCount = new AtomicLong(); + protected final AtomicLong whiteListHitCount = new AtomicLong(); + protected final AtomicLong blackListHitCount = new AtomicLong(); + protected final AtomicLong syntaxErrorCount = new AtomicLong(); + protected final AtomicLong violationCount = new AtomicLong(); + protected final AtomicLong violationEffectRowCount = new AtomicLong(); - public WallProvider(WallConfig config){ + public WallProvider(WallConfig config) { this.config = config; } - public WallProvider(WallConfig config, String dbType){ + public WallProvider(WallConfig config, String dbType) { this(config, DbType.of(dbType)); } - public WallProvider(WallConfig config, DbType dbType){ + public WallProvider(WallConfig config, DbType dbType) { this.config = config; this.dbType = dbType; } @@ -250,7 +240,6 @@ public WallConfig getConfig() { public WallSqlStat addWhiteSql(String sql, Map tableStats, Map functionStats, boolean syntaxError) { - if (!whiteListEnable) { WallSqlStat stat = new WallSqlStat(tableStats, functionStats, syntaxError); return stat; @@ -375,7 +364,7 @@ public Set getWhiteList() { lock.readLock().unlock(); } - return Collections. unmodifiableSet(hashSet); + return Collections.unmodifiableSet(hashSet); } public Set getSqlList() { @@ -393,7 +382,7 @@ public Set getSqlList() { lock.readLock().unlock(); } - return Collections. unmodifiableSet(hashSet); + return Collections.unmodifiableSet(hashSet); } public Set getBlackList() { @@ -407,7 +396,7 @@ public Set getBlackList() { lock.readLock().unlock(); } - return Collections. unmodifiableSet(hashSet); + return Collections.unmodifiableSet(hashSet); } public void clearCache() { @@ -516,7 +505,6 @@ public boolean checkValid(String sql) { .getViolations() .isEmpty(); } finally { - if (originalContext == null) { WallContext.clearContext(); } @@ -626,13 +614,13 @@ private WallCheckResult checkInternal(String sql) { parser.setParseCompleteValues(false); parser.setParseValuesSize(config.getInsertValuesCheckSize()); } - + parser.parseStatementList(statementList); final Token lastToken = parser.getLexer().token(); if (lastToken != Token.EOF && config.isStrictSyntaxCheck()) { violations.add(new IllegalSQLObjectViolation(ErrorCode.SYNTAX_ERROR, "not terminal sql, token " - + lastToken, sql)); + + lastToken, sql)); } endOfComment = parser.getLexer().isEndOfComment(); } catch (NotAllowCommentException e) { @@ -659,7 +647,7 @@ private WallCheckResult checkInternal(String sql) { if (statementList.size() > 0) { boolean lastIsHint = false; - for (int i=0; i map = statValue.toMap(); String text = JSONUtils.toJSONString(map); diff --git a/src/main/java/com/alibaba/druid/wall/WallProviderStatValue.java b/src/main/java/com/alibaba/druid/wall/WallProviderStatValue.java index a581fc52de..318d4300eb 100644 --- a/src/main/java/com/alibaba/druid/wall/WallProviderStatValue.java +++ b/src/main/java/com/alibaba/druid/wall/WallProviderStatValue.java @@ -15,44 +15,42 @@ */ package com.alibaba.druid.wall; +import com.alibaba.druid.support.monitor.annotation.AggregateType; +import com.alibaba.druid.support.monitor.annotation.MField; +import com.alibaba.druid.support.monitor.annotation.MTable; + import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.alibaba.druid.support.monitor.annotation.AggregateType; -import com.alibaba.druid.support.monitor.annotation.MField; -import com.alibaba.druid.support.monitor.annotation.MTable; - @MTable(name = "druid_wall") public class WallProviderStatValue { - @MField(aggregate = AggregateType.None) - private String name; + private String name; @MField(aggregate = AggregateType.Sum) - private long checkCount; + private long checkCount; @MField(aggregate = AggregateType.Sum) - private long hardCheckCount; + private long hardCheckCount; @MField(aggregate = AggregateType.Sum) - private long violationCount; + private long violationCount; @MField(aggregate = AggregateType.Sum) - private long whiteListHitCount; + private long whiteListHitCount; @MField(aggregate = AggregateType.Sum) - private long blackListHitCount; + private long blackListHitCount; @MField(aggregate = AggregateType.Sum) - private long syntaxErrorCount; + private long syntaxErrorCount; @MField(aggregate = AggregateType.Sum) - private long violationEffectRowCount; + private long violationEffectRowCount; - private final List tables = new ArrayList(); + private final List tables = new ArrayList(); private final List functions = new ArrayList(); - private final List whiteList = new ArrayList(); - private final List blackList = new ArrayList(); - - public WallProviderStatValue(){ + private final List whiteList = new ArrayList(); + private final List blackList = new ArrayList(); + public WallProviderStatValue() { } public String getName() { diff --git a/src/main/java/com/alibaba/druid/wall/WallSQLException.java b/src/main/java/com/alibaba/druid/wall/WallSQLException.java index db14c93beb..105a8f1d73 100644 --- a/src/main/java/com/alibaba/druid/wall/WallSQLException.java +++ b/src/main/java/com/alibaba/druid/wall/WallSQLException.java @@ -18,14 +18,13 @@ import java.sql.SQLException; public class WallSQLException extends SQLException { - private static final long serialVersionUID = 1L; - public WallSQLException(String reason, Throwable cause){ + public WallSQLException(String reason, Throwable cause) { super(reason, cause); } - public WallSQLException(String reason){ + public WallSQLException(String reason) { super(reason); } diff --git a/src/main/java/com/alibaba/druid/wall/WallSqlFunctionStat.java b/src/main/java/com/alibaba/druid/wall/WallSqlFunctionStat.java index 0e48066683..aaafa60328 100644 --- a/src/main/java/com/alibaba/druid/wall/WallSqlFunctionStat.java +++ b/src/main/java/com/alibaba/druid/wall/WallSqlFunctionStat.java @@ -16,7 +16,6 @@ package com.alibaba.druid.wall; public class WallSqlFunctionStat { - private int invokeCount; public int getInvokeCount() { @@ -26,7 +25,7 @@ public int getInvokeCount() { public void incrementInvokeCount() { this.invokeCount++; } - + public void addInvokeCount(int value) { this.invokeCount += value; } diff --git a/src/main/java/com/alibaba/druid/wall/WallSqlStat.java b/src/main/java/com/alibaba/druid/wall/WallSqlStat.java index 5d6b3de0d2..57d5484517 100644 --- a/src/main/java/com/alibaba/druid/wall/WallSqlStat.java +++ b/src/main/java/com/alibaba/druid/wall/WallSqlStat.java @@ -15,48 +15,47 @@ */ package com.alibaba.druid.wall; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; - import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -public class WallSqlStat { +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; - private volatile long executeCount; - private volatile long executeErrorCount; - private volatile long fetchRowCount; - private volatile long updateCount; +public class WallSqlStat { + private volatile long executeCount; + private volatile long executeErrorCount; + private volatile long fetchRowCount; + private volatile long updateCount; - final static AtomicLongFieldUpdater executeCountUpdater = AtomicLongFieldUpdater.newUpdater(WallSqlStat.class, - "executeCount"); - final static AtomicLongFieldUpdater executeErrorCountUpdater = AtomicLongFieldUpdater.newUpdater(WallSqlStat.class, - "executeErrorCount"); + static final AtomicLongFieldUpdater executeCountUpdater = AtomicLongFieldUpdater.newUpdater(WallSqlStat.class, + "executeCount"); + static final AtomicLongFieldUpdater executeErrorCountUpdater = AtomicLongFieldUpdater.newUpdater(WallSqlStat.class, + "executeErrorCount"); - final static AtomicLongFieldUpdater fetchRowCountUpdater = AtomicLongFieldUpdater.newUpdater(WallSqlStat.class, - "fetchRowCount"); - final static AtomicLongFieldUpdater updateCountUpdater = AtomicLongFieldUpdater.newUpdater(WallSqlStat.class, - "updateCount"); - private final Map tableStats; + static final AtomicLongFieldUpdater fetchRowCountUpdater = AtomicLongFieldUpdater.newUpdater(WallSqlStat.class, + "fetchRowCount"); + static final AtomicLongFieldUpdater updateCountUpdater = AtomicLongFieldUpdater.newUpdater(WallSqlStat.class, + "updateCount"); + private final Map tableStats; - private final List violations; + private final List violations; - private final Map functionStats; + private final Map functionStats; - private final boolean syntaxError; + private final boolean syntaxError; - private String sample; + private String sample; - private long sqlHash; + private long sqlHash; public WallSqlStat(Map tableStats, Map functionStats, - boolean syntaxError){ - this(tableStats, functionStats, Collections. emptyList(), syntaxError); + boolean syntaxError) { + this(tableStats, functionStats, Collections.emptyList(), syntaxError); } public WallSqlStat(Map tableStats, Map functionStats, - List violations, boolean syntaxError){ + List violations, boolean syntaxError) { this.violations = violations; this.tableStats = tableStats; this.functionStats = functionStats; diff --git a/src/main/java/com/alibaba/druid/wall/WallSqlStatValue.java b/src/main/java/com/alibaba/druid/wall/WallSqlStatValue.java index b38cfb8918..78ecd361c7 100644 --- a/src/main/java/com/alibaba/druid/wall/WallSqlStatValue.java +++ b/src/main/java/com/alibaba/druid/wall/WallSqlStatValue.java @@ -15,46 +15,44 @@ */ package com.alibaba.druid.wall; -import java.util.LinkedHashMap; -import java.util.Map; - import com.alibaba.druid.support.monitor.annotation.AggregateType; import com.alibaba.druid.support.monitor.annotation.MField; import com.alibaba.druid.support.monitor.annotation.MTable; +import java.util.LinkedHashMap; +import java.util.Map; + @MTable(name = "druid_wall_sql") public class WallSqlStatValue { - - private String sql; + private String sql; @MField(groupBy = true, aggregate = AggregateType.None, hashFor = "sql", hashForType = "sql") - private long sqlHash; + private long sqlHash; - private String sqlSample; + private String sqlSample; @MField(groupBy = true, aggregate = AggregateType.None, hashFor = "sqlSample", hashForType = "sqlSample") - private long sqlSampleHash; + private long sqlSampleHash; @MField(aggregate = AggregateType.Sum) - private long executeCount; + private long executeCount; @MField(aggregate = AggregateType.Sum) - private long executeErrorCount; + private long executeErrorCount; @MField(aggregate = AggregateType.Sum) - private long fetchRowCount; + private long fetchRowCount; @MField(aggregate = AggregateType.Sum) - private long updateCount; + private long updateCount; @MField(aggregate = AggregateType.Last) private boolean syntaxError; @MField(aggregate = AggregateType.Last) - private String violationMessage; - - public WallSqlStatValue(){ + private String violationMessage; + public WallSqlStatValue() { } public String getSql() { @@ -136,7 +134,7 @@ public Map toMap() { sqlStatMap.put("sample", sqlSample); } sqlStatMap.put("executeCount", getExecuteCount()); - + if (executeErrorCount > 0) { sqlStatMap.put("executeErrorCount", executeErrorCount); } diff --git a/src/main/java/com/alibaba/druid/wall/WallSqlTableStat.java b/src/main/java/com/alibaba/druid/wall/WallSqlTableStat.java index b751bd2ae5..f391e85422 100644 --- a/src/main/java/com/alibaba/druid/wall/WallSqlTableStat.java +++ b/src/main/java/com/alibaba/druid/wall/WallSqlTableStat.java @@ -16,18 +16,17 @@ * limitations under the License. */ public class WallSqlTableStat { - - private int selectCount; - private int selectIntoCount; - private int insertCount; - private int updateCount; - private int deleteCount; - private int truncateCount; - private int createCount; - private int alterCount; - private int dropCount; - private int replaceCount; - private int showCount; + private int selectCount; + private int selectIntoCount; + private int insertCount; + private int updateCount; + private int deleteCount; + private int truncateCount; + private int createCount; + private int alterCount; + private int dropCount; + private int replaceCount; + private int showCount; private String sample; diff --git a/src/main/java/com/alibaba/druid/wall/WallTableStat.java b/src/main/java/com/alibaba/druid/wall/WallTableStat.java index 38942822a3..d78e58867f 100644 --- a/src/main/java/com/alibaba/druid/wall/WallTableStat.java +++ b/src/main/java/com/alibaba/druid/wall/WallTableStat.java @@ -15,125 +15,123 @@ */ package com.alibaba.druid.wall; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; +import com.alibaba.druid.support.json.JSONUtils; import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.alibaba.druid.support.json.JSONUtils; +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; public class WallTableStat { - - private volatile long selectCount; - private volatile long selectIntoCount; - private volatile long insertCount; - private volatile long updateCount; - private volatile long deleteCount; - private volatile long truncateCount; - private volatile long createCount; - private volatile long alterCount; - private volatile long dropCount; - private volatile long replaceCount; - private volatile long deleteDataCount; - private volatile long updateDataCount; - private volatile long insertDataCount; - private volatile long fetchRowCount; - - final static AtomicLongFieldUpdater selectCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "selectCount"); - final static AtomicLongFieldUpdater selectIntoCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "selectIntoCount"); - final static AtomicLongFieldUpdater insertCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "insertCount"); - final static AtomicLongFieldUpdater updateCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "updateCount"); - final static AtomicLongFieldUpdater deleteCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "deleteCount"); - final static AtomicLongFieldUpdater truncateCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "truncateCount"); - final static AtomicLongFieldUpdater createCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "createCount"); - final static AtomicLongFieldUpdater alterCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "alterCount"); - final static AtomicLongFieldUpdater dropCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "dropCount"); - final static AtomicLongFieldUpdater replaceCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "replaceCount"); - - final static AtomicLongFieldUpdater deleteDataCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "deleteDataCount"); - final static AtomicLongFieldUpdater insertDataCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "insertDataCount"); - final static AtomicLongFieldUpdater updateDataCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "updateDataCount"); - - final static AtomicLongFieldUpdater fetchRowCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "fetchRowCount"); - - private volatile long fetchRowCount_0_1; - private volatile long fetchRowCount_1_10; - private volatile long fetchRowCount_10_100; - private volatile int fetchRowCount_100_1000; - private volatile int fetchRowCount_1000_10000; - private volatile int fetchRowCount_10000_more; - - final static AtomicLongFieldUpdater fetchRowCount_0_1_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "fetchRowCount_0_1"); - final static AtomicLongFieldUpdater fetchRowCount_1_10_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "fetchRowCount_1_10"); - final static AtomicLongFieldUpdater fetchRowCount_10_100_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "fetchRowCount_10_100"); - final static AtomicIntegerFieldUpdater fetchRowCount_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, - "fetchRowCount_100_1000"); - final static AtomicIntegerFieldUpdater fetchRowCount_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, - "fetchRowCount_1000_10000"); - final static AtomicIntegerFieldUpdater fetchRowCount_10000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, - "fetchRowCount_10000_more"); - - private volatile long updateDataCount_0_1; - private volatile long updateDataCount_1_10; - private volatile long updateDataCount_10_100; - private volatile int updateDataCount_100_1000; - private volatile int updateDataCount_1000_10000; - private volatile int updateDataCount_10000_more; - - final static AtomicLongFieldUpdater updateDataCount_0_1_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "updateDataCount_0_1"); - final static AtomicLongFieldUpdater updateDataCount_1_10_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "updateDataCount_1_10"); - final static AtomicLongFieldUpdater updateDataCount_10_100_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "updateDataCount_10_100"); - final static AtomicIntegerFieldUpdater updateDataCount_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, - "updateDataCount_100_1000"); - final static AtomicIntegerFieldUpdater updateDataCount_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, - "updateDataCount_1000_10000"); - final static AtomicIntegerFieldUpdater updateDataCount_10000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, - "updateDataCount_10000_more"); - - private volatile long deleteDataCount_0_1; - private volatile long deleteDataCount_1_10; - private volatile long deleteDataCount_10_100; - private volatile int deleteDataCount_100_1000; - private volatile int deleteDataCount_1000_10000; - private volatile int deleteDataCount_10000_more; - - final static AtomicLongFieldUpdater deleteDataCount_0_1_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "deleteDataCount_0_1"); - final static AtomicLongFieldUpdater deleteDataCount_1_10_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "deleteDataCount_1_10"); - final static AtomicLongFieldUpdater deleteDataCount_10_100_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, - "deleteDataCount_10_100"); - final static AtomicIntegerFieldUpdater deleteDataCount_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, - "deleteDataCount_100_1000"); - final static AtomicIntegerFieldUpdater deleteDataCount_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, - "deleteDataCount_1000_10000"); - final static AtomicIntegerFieldUpdater deleteDataCount_10000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, - "deleteDataCount_10000_more"); - - public WallTableStat(){ - + private volatile long selectCount; + private volatile long selectIntoCount; + private volatile long insertCount; + private volatile long updateCount; + private volatile long deleteCount; + private volatile long truncateCount; + private volatile long createCount; + private volatile long alterCount; + private volatile long dropCount; + private volatile long replaceCount; + private volatile long deleteDataCount; + private volatile long updateDataCount; + private volatile long insertDataCount; + private volatile long fetchRowCount; + + static final AtomicLongFieldUpdater selectCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "selectCount"); + static final AtomicLongFieldUpdater selectIntoCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "selectIntoCount"); + static final AtomicLongFieldUpdater insertCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "insertCount"); + static final AtomicLongFieldUpdater updateCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "updateCount"); + static final AtomicLongFieldUpdater deleteCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "deleteCount"); + static final AtomicLongFieldUpdater truncateCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "truncateCount"); + static final AtomicLongFieldUpdater createCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "createCount"); + static final AtomicLongFieldUpdater alterCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "alterCount"); + static final AtomicLongFieldUpdater dropCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "dropCount"); + static final AtomicLongFieldUpdater replaceCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "replaceCount"); + + static final AtomicLongFieldUpdater deleteDataCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "deleteDataCount"); + static final AtomicLongFieldUpdater insertDataCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "insertDataCount"); + static final AtomicLongFieldUpdater updateDataCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "updateDataCount"); + + static final AtomicLongFieldUpdater fetchRowCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "fetchRowCount"); + + private volatile long fetchRowCount_0_1; + private volatile long fetchRowCount_1_10; + private volatile long fetchRowCount_10_100; + private volatile int fetchRowCount_100_1000; + private volatile int fetchRowCount_1000_10000; + private volatile int fetchRowCount_10000_more; + + static final AtomicLongFieldUpdater fetchRowCount_0_1_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "fetchRowCount_0_1"); + static final AtomicLongFieldUpdater fetchRowCount_1_10_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "fetchRowCount_1_10"); + static final AtomicLongFieldUpdater fetchRowCount_10_100_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "fetchRowCount_10_100"); + static final AtomicIntegerFieldUpdater fetchRowCount_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, + "fetchRowCount_100_1000"); + static final AtomicIntegerFieldUpdater fetchRowCount_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, + "fetchRowCount_1000_10000"); + static final AtomicIntegerFieldUpdater fetchRowCount_10000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, + "fetchRowCount_10000_more"); + + private volatile long updateDataCount_0_1; + private volatile long updateDataCount_1_10; + private volatile long updateDataCount_10_100; + private volatile int updateDataCount_100_1000; + private volatile int updateDataCount_1000_10000; + private volatile int updateDataCount_10000_more; + + static final AtomicLongFieldUpdater updateDataCount_0_1_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "updateDataCount_0_1"); + static final AtomicLongFieldUpdater updateDataCount_1_10_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "updateDataCount_1_10"); + static final AtomicLongFieldUpdater updateDataCount_10_100_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "updateDataCount_10_100"); + static final AtomicIntegerFieldUpdater updateDataCount_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, + "updateDataCount_100_1000"); + static final AtomicIntegerFieldUpdater updateDataCount_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, + "updateDataCount_1000_10000"); + static final AtomicIntegerFieldUpdater updateDataCount_10000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, + "updateDataCount_10000_more"); + + private volatile long deleteDataCount_0_1; + private volatile long deleteDataCount_1_10; + private volatile long deleteDataCount_10_100; + private volatile int deleteDataCount_100_1000; + private volatile int deleteDataCount_1000_10000; + private volatile int deleteDataCount_10000_more; + + static final AtomicLongFieldUpdater deleteDataCount_0_1_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "deleteDataCount_0_1"); + static final AtomicLongFieldUpdater deleteDataCount_1_10_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "deleteDataCount_1_10"); + static final AtomicLongFieldUpdater deleteDataCount_10_100_Updater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class, + "deleteDataCount_10_100"); + static final AtomicIntegerFieldUpdater deleteDataCount_100_1000_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, + "deleteDataCount_100_1000"); + static final AtomicIntegerFieldUpdater deleteDataCount_1000_10000_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, + "deleteDataCount_1000_10000"); + static final AtomicIntegerFieldUpdater deleteDataCount_10000_more_Updater = AtomicIntegerFieldUpdater.newUpdater(WallTableStat.class, + "deleteDataCount_10000_more"); + + public WallTableStat() { } public long getSelectCount() { @@ -181,7 +179,7 @@ public long getDeleteDataCount() { } public long[] getDeleteDataCountHistogramValues() { - return new long[] { + return new long[]{ // deleteDataCount_0_1, // deleteDataCount_1_10, // @@ -194,7 +192,7 @@ public long[] getDeleteDataCountHistogramValues() { public void addDeleteDataCount(long delta) { deleteDataCountUpdater.addAndGet(this, delta); - + if (delta < 1) { deleteDataCount_0_1_Updater.incrementAndGet(this); } else if (delta < 10) { @@ -215,7 +213,7 @@ public long getUpdateDataCount() { } public long[] getUpdateDataCountHistogramValues() { - return new long[] { + return new long[]{ // updateDataCount_0_1, // updateDataCount_1_10, // @@ -257,7 +255,7 @@ public long getFetchRowCount() { } public long[] getFetchRowCountHistogramValues() { - return new long[] { + return new long[]{ // fetchRowCount_0_1, // fetchRowCount_1_10, // @@ -350,7 +348,6 @@ public void addSqlTableStat(WallSqlTableStat stat) { } public String toString() { - Map map = toMap(); return JSONUtils.toJSONString(map); diff --git a/src/main/java/com/alibaba/druid/wall/WallTableStatValue.java b/src/main/java/com/alibaba/druid/wall/WallTableStatValue.java index 5dea38aa01..783304d551 100644 --- a/src/main/java/com/alibaba/druid/wall/WallTableStatValue.java +++ b/src/main/java/com/alibaba/druid/wall/WallTableStatValue.java @@ -15,60 +15,59 @@ */ package com.alibaba.druid.wall; -import java.util.LinkedHashMap; -import java.util.Map; - import com.alibaba.druid.support.monitor.annotation.AggregateType; import com.alibaba.druid.support.monitor.annotation.MField; import com.alibaba.druid.support.monitor.annotation.MTable; +import java.util.LinkedHashMap; +import java.util.Map; + @MTable(name = "druid_wall_table") public class WallTableStatValue { - @MField(aggregate = AggregateType.None) private String name; @MField(aggregate = AggregateType.Sum) - private long selectCount; + private long selectCount; @MField(aggregate = AggregateType.Sum) - private long selectIntoCount; + private long selectIntoCount; @MField(aggregate = AggregateType.Sum) - private long insertCount; + private long insertCount; @MField(aggregate = AggregateType.Sum) - private long updateCount; + private long updateCount; @MField(aggregate = AggregateType.Sum) - private long deleteCount; + private long deleteCount; @MField(aggregate = AggregateType.Sum) - private long truncateCount; + private long truncateCount; @MField(aggregate = AggregateType.Sum) - private long createCount; + private long createCount; @MField(aggregate = AggregateType.Sum) - private long alterCount; + private long alterCount; @MField(aggregate = AggregateType.Sum) - private long dropCount; + private long dropCount; @MField(aggregate = AggregateType.Sum) - private long replaceCount; + private long replaceCount; @MField(aggregate = AggregateType.Sum) - private long deleteDataCount; + private long deleteDataCount; @MField(aggregate = AggregateType.Sum) - private long updateDataCount; + private long updateDataCount; @MField(aggregate = AggregateType.Sum) - private long insertDataCount; + private long insertDataCount; @MField(aggregate = AggregateType.Sum) - private long fetchRowCount; + private long fetchRowCount; @MField(name = "f1", aggregate = AggregateType.Sum) protected long fetchRowCount_0_1; @@ -80,14 +79,14 @@ public class WallTableStatValue { protected long fetchRowCount_10_100; @MField(name = "f1000", aggregate = AggregateType.Sum) - protected int fetchRowCount_100_1000; + protected int fetchRowCount_100_1000; @MField(name = "f10000", aggregate = AggregateType.Sum) - protected int fetchRowCount_1000_10000; + protected int fetchRowCount_1000_10000; @MField(name = "fmore", aggregate = AggregateType.Sum) - protected int fetchRowCount_10000_more; - + protected int fetchRowCount_10000_more; + @MField(name = "u1", aggregate = AggregateType.Sum) protected long updateDataCount_0_1; @@ -98,14 +97,14 @@ public class WallTableStatValue { protected long updateDataCount_10_100; @MField(name = "u1000", aggregate = AggregateType.Sum) - protected int updateDataCount_100_1000; + protected int updateDataCount_100_1000; @MField(name = "u10000", aggregate = AggregateType.Sum) - protected int updateDataCount_1000_10000; + protected int updateDataCount_1000_10000; @MField(name = "umore", aggregate = AggregateType.Sum) - protected int updateDataCount_10000_more; - + protected int updateDataCount_10000_more; + @MField(name = "del_1", aggregate = AggregateType.Sum) protected long deleteDataCount_0_1; @@ -116,16 +115,16 @@ public class WallTableStatValue { protected long deleteDataCount_10_100; @MField(name = "del_1000", aggregate = AggregateType.Sum) - protected int deleteDataCount_100_1000; + protected int deleteDataCount_100_1000; @MField(name = "del_10000", aggregate = AggregateType.Sum) - protected int deleteDataCount_1000_10000; + protected int deleteDataCount_1000_10000; @MField(name = "del_more", aggregate = AggregateType.Sum) - protected int deleteDataCount_10000_more; + protected int deleteDataCount_10000_more; public long[] getDeleteDataHistogram() { - return new long[] { deleteDataCount_0_1, // + return new long[]{deleteDataCount_0_1, // deleteDataCount_1_10, // deleteDataCount_10_100, // deleteDataCount_100_1000, // @@ -134,16 +133,16 @@ public long[] getDeleteDataHistogram() { }; } - public WallTableStatValue(){ + public WallTableStatValue() { this(null); } - public WallTableStatValue(String name){ + public WallTableStatValue(String name) { this.name = name; } public long[] getFetchRowHistogram() { - return new long[] { fetchRowCount_0_1, // + return new long[]{fetchRowCount_0_1, // fetchRowCount_1_10, // fetchRowCount_10_100, // fetchRowCount_100_1000, // @@ -154,15 +153,14 @@ public long[] getFetchRowHistogram() { public long getTotalExecuteCount() { return selectCount // - + selectIntoCount // - + insertCount // - + updateCount // - + deleteCount // - + truncateCount // - + createCount // - + dropCount // - + replaceCount // - ; + + selectIntoCount // + + insertCount // + + updateCount // + + deleteCount // + + truncateCount // + + createCount // + + dropCount // + + replaceCount; } public String getName() { @@ -264,9 +262,9 @@ public void setDeleteDataCount(long deleteDataCount) { public long getUpdateDataCount() { return updateDataCount; } - + public long[] getUpdateDataHistogram() { - return new long[] { updateDataCount_0_1, // + return new long[]{updateDataCount_0_1, // updateDataCount_1_10, // updateDataCount_10_100, // updateDataCount_100_1000, // diff --git a/src/main/java/com/alibaba/druid/wall/WallUpdateCheckItem.java b/src/main/java/com/alibaba/druid/wall/WallUpdateCheckItem.java index 8b81d1d466..be313d11d8 100644 --- a/src/main/java/com/alibaba/druid/wall/WallUpdateCheckItem.java +++ b/src/main/java/com/alibaba/druid/wall/WallUpdateCheckItem.java @@ -15,10 +15,10 @@ */ package com.alibaba.druid.wall; -import java.util.List; - import com.alibaba.druid.sql.ast.SQLExpr; +import java.util.List; + /** * Created by wenshao on 14/08/2017. */ diff --git a/src/main/java/com/alibaba/druid/wall/WallUtils.java b/src/main/java/com/alibaba/druid/wall/WallUtils.java index 9354480811..11861f61c7 100644 --- a/src/main/java/com/alibaba/druid/wall/WallUtils.java +++ b/src/main/java/com/alibaba/druid/wall/WallUtils.java @@ -15,11 +15,7 @@ */ package com.alibaba.druid.wall; -import com.alibaba.druid.wall.spi.DB2WallProvider; -import com.alibaba.druid.wall.spi.MySqlWallProvider; -import com.alibaba.druid.wall.spi.OracleWallProvider; -import com.alibaba.druid.wall.spi.PGWallProvider; -import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import com.alibaba.druid.wall.spi.*; public class WallUtils { public static boolean isValidateDB2(String sql) { @@ -31,7 +27,7 @@ public static boolean isValidateDB2(String sql, WallConfig config) { DB2WallProvider provider = new DB2WallProvider(config); return provider.checkValid(sql); } - + public static boolean isValidatePostgres(String sql) { PGWallProvider provider = new PGWallProvider(); return provider.checkValid(sql); @@ -41,7 +37,7 @@ public static boolean isValidatePostgres(String sql, WallConfig config) { PGWallProvider provider = new PGWallProvider(config); return provider.checkValid(sql); } - + public static boolean isValidateMySql(String sql) { MySqlWallProvider provider = new MySqlWallProvider(); return provider.checkValid(sql); @@ -61,12 +57,12 @@ public static boolean isValidateOracle(String sql, WallConfig config) { OracleWallProvider provider = new OracleWallProvider(config); return provider.checkValid(sql); } - + public static boolean isValidateSqlServer(String sql) { SQLServerWallProvider provider = new SQLServerWallProvider(); return provider.checkValid(sql); } - + public static boolean isValidateSqlServer(String sql, WallConfig config) { SQLServerWallProvider provider = new SQLServerWallProvider(config); return provider.checkValid(sql); diff --git a/src/main/java/com/alibaba/druid/wall/WallVisitor.java b/src/main/java/com/alibaba/druid/wall/WallVisitor.java index 5eace257e2..bccd420d73 100644 --- a/src/main/java/com/alibaba/druid/wall/WallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/WallVisitor.java @@ -15,22 +15,20 @@ */ package com.alibaba.druid.wall; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.ast.expr.*; import com.alibaba.druid.sql.ast.statement.*; -import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.wall.spi.WallVisitorUtils; import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; -public interface WallVisitor extends SQLASTVisitor { +import java.util.List; +public interface WallVisitor extends SQLASTVisitor { WallConfig getConfig(); WallProvider getProvider(); @@ -50,7 +48,7 @@ default String toSQL(SQLObject obj) { void setSqlModified(boolean sqlModified); DbType getDbType(); - + boolean isSqlEndOfComment(); void setSqlEndOfComment(boolean sqlEndOfComment); @@ -152,7 +150,7 @@ default boolean visit(SQLSelectStatement x) { if (!config.isSelectAllow()) { this.getViolations() .add(new IllegalSQLObjectViolation(ErrorCode.SELECT_NOT_ALLOW, "select not allow", - this.toSQL(x))); + this.toSQL(x))); return false; } diff --git a/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallProvider.java b/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallProvider.java index 42301b8460..d7230b2a0c 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallProvider.java @@ -25,16 +25,14 @@ import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallVisitor; - public class ClickhouseWallProvider extends WallProvider { + public static final String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/clickhouse"; - public final static String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/clickhouse"; - - public ClickhouseWallProvider(){ + public ClickhouseWallProvider() { this(new WallConfig(DEFAULT_CONFIG_DIR)); } - public ClickhouseWallProvider(WallConfig config){ + public ClickhouseWallProvider(WallConfig config) { super(config, DbType.clickhouse); } diff --git a/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallVisitor.java index b6816f5eb5..b61fb7d1e1 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/ClickhouseWallVisitor.java @@ -21,8 +21,8 @@ import com.alibaba.druid.wall.WallVisitor; public class ClickhouseWallVisitor extends WallVisitorBase implements WallVisitor, PGASTVisitor { - public ClickhouseWallVisitor(WallProvider provider){ - super (provider); + public ClickhouseWallVisitor(WallProvider provider) { + super(provider); } @Override diff --git a/src/main/java/com/alibaba/druid/wall/spi/DB2WallProvider.java b/src/main/java/com/alibaba/druid/wall/spi/DB2WallProvider.java index ae3ee85311..77b357ef1b 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/DB2WallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/spi/DB2WallProvider.java @@ -25,16 +25,14 @@ import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallVisitor; - public class DB2WallProvider extends WallProvider { + public static final String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/db2"; - public final static String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/db2"; - - public DB2WallProvider(){ + public DB2WallProvider() { this(new WallConfig(DEFAULT_CONFIG_DIR)); } - public DB2WallProvider(WallConfig config){ + public DB2WallProvider(WallConfig config) { super(config, DbType.db2); } diff --git a/src/main/java/com/alibaba/druid/wall/spi/DB2WallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/DB2WallVisitor.java index 0c4a5a9311..9fdd894c8b 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/DB2WallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/DB2WallVisitor.java @@ -21,8 +21,8 @@ import com.alibaba.druid.wall.WallVisitor; public class DB2WallVisitor extends WallVisitorBase implements WallVisitor, DB2ASTVisitor { - public DB2WallVisitor(WallProvider provider){ - super (provider); + public DB2WallVisitor(WallProvider provider) { + super(provider); } @Override @@ -38,7 +38,6 @@ public boolean isDenyTable(String name) { return !this.provider.checkDenyTable(name); } - @Override public DbType getDbType() { return DbType.db2; diff --git a/src/main/java/com/alibaba/druid/wall/spi/MySqlWallProvider.java b/src/main/java/com/alibaba/druid/wall/spi/MySqlWallProvider.java index 1638fbbbf5..ec2a14a747 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/MySqlWallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/spi/MySqlWallProvider.java @@ -26,22 +26,22 @@ import com.alibaba.druid.wall.WallVisitor; public class MySqlWallProvider extends WallProvider { + public static final String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/mysql"; - public final static String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/mysql"; - - public MySqlWallProvider(){ + public MySqlWallProvider() { this(new WallConfig(DEFAULT_CONFIG_DIR)); } - public MySqlWallProvider(WallConfig config){ + public MySqlWallProvider(WallConfig config) { super(config, DbType.mysql); } @Override public SQLStatementParser createParser(String sql) { - return new MySqlStatementParser(sql - , SQLParserFeature.EnableSQLBinaryOpExprGroup - , SQLParserFeature.StrictForWall + return new MySqlStatementParser( + sql, + SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.StrictForWall ); } diff --git a/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java index 1f86988b93..8914b7b316 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java @@ -16,20 +16,23 @@ package com.alibaba.druid.wall.spi; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.ast.expr.*; +import com.alibaba.druid.sql.ast.SQLObject; +import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; +import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; +import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlOutFileExpr; import com.alibaba.druid.sql.dialect.mysql.ast.statement.*; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; -import com.alibaba.druid.wall.*; +import com.alibaba.druid.wall.WallProvider; +import com.alibaba.druid.wall.WallVisitor; import com.alibaba.druid.wall.spi.WallVisitorUtils.WallTopStatementContext; import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; public class MySqlWallVisitor extends WallVisitorBase implements WallVisitor, MySqlASTVisitor { - public MySqlWallVisitor(WallProvider provider){ - super (provider); + public MySqlWallVisitor(WallProvider provider) { + super(provider); } @Override @@ -71,7 +74,7 @@ public boolean visit(SQLPropertyExpr x) { if (varName.equalsIgnoreCase("@@session") || varName.equalsIgnoreCase("@@global")) { if (!(parent instanceof SQLSelectItem) && !(parent instanceof SQLAssignItem)) { violations.add(new IllegalSQLObjectViolation(ErrorCode.VARIANT_DENY, - "variable in condition not allow", toSQL(x))); + "variable in condition not allow", toSQL(x))); return false; } @@ -80,14 +83,14 @@ public boolean visit(SQLPropertyExpr x) { if (!isTop) { boolean allow = true; if (isDeny(varName) - && (WallVisitorUtils.isWhereOrHaving(x) || WallVisitorUtils.checkSqlExpr(varExpr))) { + && (WallVisitorUtils.isWhereOrHaving(x) || WallVisitorUtils.checkSqlExpr(varExpr))) { allow = false; } if (!allow) { violations.add(new IllegalSQLObjectViolation(ErrorCode.VARIANT_DENY, - "variable not allow : " + x.getName(), - toSQL(x))); + "variable not allow : " + x.getName(), + toSQL(x))); } } } @@ -143,10 +146,9 @@ public boolean visit(SQLVariantRefExpr x) { } if (varName.startsWith("@@") && !checkVar(x.getParent(), x.getName())) { - final WallTopStatementContext topStatementContext = WallVisitorUtils.getWallTopStatementContext(); if (topStatementContext != null - && (topStatementContext.fromSysSchema() || topStatementContext.fromSysTable())) { + && (topStatementContext.fromSysSchema() || topStatementContext.fromSysTable())) { return false; } @@ -159,7 +161,7 @@ public boolean visit(SQLVariantRefExpr x) { if (!allow) { violations.add(new IllegalSQLObjectViolation(ErrorCode.VARIANT_DENY, "variable not allow : " - + x.getName(), toSQL(x))); + + x.getName(), toSQL(x))); } } } diff --git a/src/main/java/com/alibaba/druid/wall/spi/OracleWallProvider.java b/src/main/java/com/alibaba/druid/wall/spi/OracleWallProvider.java index 4779b8e7ab..e24f5669da 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/OracleWallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/spi/OracleWallProvider.java @@ -26,14 +26,13 @@ import com.alibaba.druid.wall.WallVisitor; public class OracleWallProvider extends WallProvider { + public static final String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/oracle"; - public final static String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/oracle"; - - public OracleWallProvider(){ + public OracleWallProvider() { this(new WallConfig(DEFAULT_CONFIG_DIR)); } - public OracleWallProvider(WallConfig config){ + public OracleWallProvider(WallConfig config) { super(config, DbType.oracle); } diff --git a/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java index aa155c7665..137d772e96 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java @@ -27,8 +27,8 @@ import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; public class OracleWallVisitor extends WallVisitorBase implements WallVisitor, OracleASTVisitor { - public OracleWallVisitor(WallProvider provider){ - super (provider); + public OracleWallVisitor(WallProvider provider) { + super(provider); } @Override @@ -41,7 +41,7 @@ public boolean visit(SQLIdentifierExpr x) { name = WallVisitorUtils.form(name); if (config.isVariantCheck() && config.getDenyVariants().contains(name)) { getViolations().add(new IllegalSQLObjectViolation(ErrorCode.VARIANT_DENY, "variable not allow : " + name, - toSQL(x))); + toSQL(x))); } return true; } @@ -72,7 +72,7 @@ public boolean visit(InsertIntoClause x) { public boolean visit(OracleMultiInsertStatement x) { if (!config.isInsertAllow()) { this.getViolations().add(new IllegalSQLObjectViolation(ErrorCode.INSERT_NOT_ALLOW, "insert not allow", - this.toSQL(x))); + this.toSQL(x))); return false; } WallVisitorUtils.initWallTopStatementContext(); diff --git a/src/main/java/com/alibaba/druid/wall/spi/PGWallProvider.java b/src/main/java/com/alibaba/druid/wall/spi/PGWallProvider.java index 7e6911344a..c1a02ea86a 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/PGWallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/spi/PGWallProvider.java @@ -25,16 +25,14 @@ import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallVisitor; - public class PGWallProvider extends WallProvider { + public static final String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/postgres"; - public final static String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/postgres"; - - public PGWallProvider(){ + public PGWallProvider() { this(new WallConfig(DEFAULT_CONFIG_DIR)); } - public PGWallProvider(WallConfig config){ + public PGWallProvider(WallConfig config) { super(config, DbType.postgresql); } diff --git a/src/main/java/com/alibaba/druid/wall/spi/PGWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/PGWallVisitor.java index b231bebe85..e959bdf230 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/PGWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/PGWallVisitor.java @@ -21,8 +21,8 @@ import com.alibaba.druid.wall.WallVisitor; public class PGWallVisitor extends WallVisitorBase implements WallVisitor, PGASTVisitor { - public PGWallVisitor(WallProvider provider){ - super (provider); + public PGWallVisitor(WallProvider provider) { + super(provider); } @Override diff --git a/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallProvider.java b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallProvider.java index 4bb4ce2322..9fd80d04b9 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallProvider.java @@ -27,19 +27,18 @@ /** * SQLServerProvider - * + * * @author RaymondXiu * @version 1.0, 2012-3-17 */ public class SQLServerWallProvider extends WallProvider { + public static final String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/sqlserver"; - public final static String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/sqlserver"; - - public SQLServerWallProvider(){ + public SQLServerWallProvider() { this(new WallConfig(DEFAULT_CONFIG_DIR)); } - public SQLServerWallProvider(WallConfig config){ + public SQLServerWallProvider(WallConfig config) { super(config, DbType.sqlserver); } diff --git a/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java index 57b9a0c1c5..1470b31026 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java @@ -16,20 +16,22 @@ package com.alibaba.druid.wall.spi; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.expr.*; -import com.alibaba.druid.sql.ast.statement.*; +import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; +import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; +import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; +import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.dialect.sqlserver.ast.expr.SQLServerObjectReferenceExpr; import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement; import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor; -import com.alibaba.druid.wall.*; +import com.alibaba.druid.wall.WallProvider; +import com.alibaba.druid.wall.WallVisitor; import com.alibaba.druid.wall.spi.WallVisitorUtils.WallTopStatementContext; import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; public class SQLServerWallVisitor extends WallVisitorBase implements WallVisitor, SQLServerASTVisitor { - - public SQLServerWallVisitor(WallProvider provider){ - super (provider); + public SQLServerWallVisitor(WallProvider provider) { + super(provider); } @Override @@ -56,7 +58,6 @@ public boolean visit(SQLIdentifierExpr x) { return true; } - @Override public boolean visit(SQLMethodInvokeExpr x) { if (x.getParent() instanceof SQLExprTableSource) { @@ -80,10 +81,9 @@ public boolean visit(SQLVariantRefExpr x) { } if (config.isVariantCheck() && varName.startsWith("@@")) { - final WallTopStatementContext topStatementContext = WallVisitorUtils.getWallTopStatementContext(); if (topStatementContext != null - && (topStatementContext.fromSysSchema() || topStatementContext.fromSysTable())) { + && (topStatementContext.fromSysSchema() || topStatementContext.fromSysTable())) { return false; } @@ -94,7 +94,7 @@ public boolean visit(SQLVariantRefExpr x) { if (!allow) { violations.add(new IllegalSQLObjectViolation(ErrorCode.VARIANT_DENY, "variable not allow : " - + x.getName(), toSQL(x))); + + x.getName(), toSQL(x))); } } diff --git a/src/main/java/com/alibaba/druid/wall/spi/SQLiteWallProvider.java b/src/main/java/com/alibaba/druid/wall/spi/SQLiteWallProvider.java index fef97dc205..4306e038b8 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/SQLiteWallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/spi/SQLiteWallProvider.java @@ -11,13 +11,13 @@ import com.alibaba.druid.wall.WallVisitor; public class SQLiteWallProvider extends WallProvider { - public final static String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/sqlite"; + public static final String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/sqlite"; - public SQLiteWallProvider(){ + public SQLiteWallProvider() { this(new WallConfig(DEFAULT_CONFIG_DIR)); } - public SQLiteWallProvider(WallConfig config){ + public SQLiteWallProvider(WallConfig config) { super(config, DbType.sqlite); } diff --git a/src/main/java/com/alibaba/druid/wall/spi/SQLiteWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/SQLiteWallVisitor.java index 4730a395a7..3ab12cff79 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/SQLiteWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/SQLiteWallVisitor.java @@ -22,8 +22,8 @@ import com.alibaba.druid.wall.WallVisitor; public class SQLiteWallVisitor extends WallVisitorBase implements WallVisitor, MySqlASTVisitor { - public SQLiteWallVisitor(WallProvider provider){ - super (provider); + public SQLiteWallVisitor(WallProvider provider) { + super(provider); } @Override diff --git a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorBase.java b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorBase.java index ccac454b21..617bbc54b0 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorBase.java +++ b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorBase.java @@ -9,8 +9,8 @@ public abstract class WallVisitorBase implements WallVisitor { protected final WallConfig config; protected final WallProvider provider; protected final List violations = new ArrayList(); - protected boolean sqlModified = false; - protected boolean sqlEndOfComment = false; + protected boolean sqlModified; + protected boolean sqlEndOfComment; protected List updateCheckItems; public WallVisitorBase(WallProvider provider) { diff --git a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java index 7792aa179b..741aedbd58 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java @@ -57,16 +57,14 @@ import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; public class WallVisitorUtils { + private static final Log LOG = LogFactory.getLog(WallVisitorUtils.class); - private final static Log LOG = LogFactory.getLog(WallVisitorUtils.class); + public static final String HAS_TRUE_LIKE = "hasTrueLike"; - public final static String HAS_TRUE_LIKE = "hasTrueLike"; - - public final static String[] whiteHints = { "LOCAL", "TEMPORARY", "SQL_NO_CACHE", "SQL_CACHE", "HIGH_PRIORITY", - "LOW_PRIORITY", "STRAIGHT_JOIN", "SQL_BUFFER_RESULT", "SQL_BIG_RESULT", "SQL_SMALL_RESULT", "DELAYED" }; + public static final String[] whiteHints = {"LOCAL", "TEMPORARY", "SQL_NO_CACHE", "SQL_CACHE", "HIGH_PRIORITY", + "LOW_PRIORITY", "STRAIGHT_JOIN", "SQL_BUFFER_RESULT", "SQL_BIG_RESULT", "SQL_SMALL_RESULT", "DELAYED"}; public static void check(WallVisitor visitor, SQLInListExpr x) { - } public static boolean check(WallVisitor visitor, SQLBinaryOpExpr x) { @@ -225,7 +223,7 @@ public static void checkSelelct(WallVisitor visitor, SQLSelectQueryBlock x) { if (Boolean.TRUE == whereValue) { if (visitor.getConfig().isSelectWhereAlwayTrueCheck() && visitor.isSqlEndOfComment() - && !isSimpleConstExpr(where)) {// 简单表达式 + && !isSimpleConstExpr(where)) { addViolation(visitor, ErrorCode.ALWAYS_TRUE, "select alway true condition not allow", x); } } @@ -297,7 +295,7 @@ private static boolean isSimpleConstExpr(SQLExpr sqlExpr) { } for (SQLExpr part : parts) { - if(isFirst(part)) { + if (isFirst(part)) { Object evalValue = part.getAttribute(EVAL_VALUE); if (evalValue == null) { if (part instanceof SQLBooleanExpr) { @@ -401,10 +399,8 @@ private static void checkJoinSelectForMultiTenant(WallVisitor visitor, SQLJoinTa } private static boolean isSelectStatmentForMultiTenant(SQLSelectQueryBlock queryBlock) { - SQLObject parent = queryBlock.getParent(); while (parent != null) { - if (parent instanceof SQLUnionQuery) { SQLObject x = parent; parent = x.getParent(); @@ -873,7 +869,7 @@ public static void checkUpdate(WallVisitor visitor, SQLUpdateStatement x) { checkCondition(visitor, where); if (Boolean.TRUE == getConditionValue(visitor, where, config.isUpdateWhereAlayTrueCheck())) { - if (config.isUpdateWhereAlayTrueCheck() && visitor.isSqlEndOfComment()&& !isSimpleConstExpr(where)) { + if (config.isUpdateWhereAlayTrueCheck() && visitor.isSqlEndOfComment() && !isSimpleConstExpr(where)) { addViolation(visitor, ErrorCode.ALWAYS_TRUE, "update alway true condition not allow", x); } } @@ -1110,7 +1106,6 @@ private static Object getValue_and(WallVisitor visitor, List groupList) int dalConst = 0; Boolean allTrue = Boolean.TRUE; for (int i = groupList.size() - 1; i >= 0; --i) { - SQLExpr item = groupList.get(i); Object result = getValue(visitor, item); Boolean booleanVal = SQLEvalVisitorUtils.castToBoolean(result); @@ -1200,7 +1195,7 @@ public static boolean isFirst(SQLObject x) { return true; } - for (;;) { + for (; ; ) { SQLObject parent = x.getParent(); if (!(parent instanceof SQLExpr)) { return true; @@ -1223,7 +1218,6 @@ public static boolean isFirst(SQLObject x) { } private static boolean hasWhere(SQLSelectQuery selectQuery) { - if (selectQuery instanceof SQLSelectQueryBlock) { return ((SQLSelectQueryBlock) selectQuery).getWhere() != null; } else if (selectQuery instanceof SQLUnionQuery) { @@ -1239,7 +1233,7 @@ public static boolean checkSqlExpr(SQLExpr x) { // check groupby, orderby, limit } SQLObject obj = x; - for (;;) { + for (; ; ) { SQLObject parent = obj.getParent(); if (parent == null) { @@ -1265,7 +1259,7 @@ public static boolean isWhereOrHaving(SQLObject x) { return false; } - for (;;) { + for (; ; ) { SQLObject parent = x.getParent(); if (parent == null) { @@ -1326,11 +1320,10 @@ public static boolean isWhereOrHaving(SQLObject x) { } public static class WallTopStatementContext { + private boolean fromSysTable; + private boolean fromSysSchema; - private boolean fromSysTable = false; - private boolean fromSysSchema = false; - - private boolean fromPermitTable = false; + private boolean fromPermitTable; public boolean fromSysTable() { return fromSysTable; @@ -1358,12 +1351,11 @@ public void setFromPermitTable(boolean fromPermitTable) { } public static class WallConditionContext { - - private boolean partAlwayTrue = false; - private boolean partAlwayFalse = false; - private boolean constArithmetic = false; - private boolean xor = false; - private boolean bitwise = false; + private boolean partAlwayTrue; + private boolean partAlwayFalse; + private boolean constArithmetic; + private boolean xor; + private boolean bitwise; public boolean hasPartAlwayTrue() { return partAlwayTrue; @@ -1407,7 +1399,7 @@ public void setBitwise(boolean bitwise) { } - private static ThreadLocal wallConditionContextLocal = new ThreadLocal(); + private static ThreadLocal wallConditionContextLocal = new ThreadLocal(); private static ThreadLocal wallTopStatementContextLocal = new ThreadLocal(); public static WallConditionContext getWallConditionContext() { @@ -1524,7 +1516,6 @@ public static Object getValue(WallVisitor visitor, SQLExpr x) { } if (x instanceof SQLQueryExpr) { - if (isSimpleCountTableSource(visitor, ((SQLQueryExpr) x).getSubQuery())) { return Integer.valueOf(1); } @@ -1562,12 +1553,11 @@ public static Object getValue(WallVisitor visitor, SQLExpr x) { || x instanceof SQLBetweenExpr // || x instanceof SQLInListExpr // || x instanceof SQLUnaryExpr // - ) { + ) { return eval(visitor, dbType, x, Collections.emptyList()); } if (x instanceof SQLCaseExpr) { - if (visitor != null && !visitor.getConfig().isCaseConditionConstAllow()) { SQLCaseExpr caseExpr = (SQLCaseExpr) x; @@ -1666,7 +1656,6 @@ public static boolean isSimpleCaseTableSource(WallVisitor visitor, SQLSelect sel if (query instanceof SQLSelectQueryBlock) { SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) query; - if (queryBlock.getWhere() != null) { Object whereValue = getValue(visitor, queryBlock.getWhere()); if (whereValue instanceof Boolean) { @@ -1790,7 +1779,7 @@ public static SQLSelectQueryBlock getQueryBlock(SQLObject x) { } public static boolean isTopNoneFromSelect(WallVisitor visitor, SQLObject x) { - for (;;) { + for (; ; ) { if ((x.getParent() instanceof SQLExpr) || (x.getParent() instanceof Item)) { x = x.getParent(); } else { @@ -1830,7 +1819,7 @@ public static boolean isTopNoneFromSelect(WallVisitor visitor, SQLObject x) { private static boolean isTopFromDenySchema(WallVisitor visitor, SQLMethodInvokeExpr x) { SQLObject parent = x.getParent(); - for (;; ) { + for (; ; ) { if (parent instanceof SQLExpr || parent instanceof Item || parent instanceof SQLSelectItem) { parent = parent.getParent(); } else { @@ -1868,8 +1857,6 @@ private static boolean isTopFromDenySchema(WallVisitor visitor, SQLMethodInvokeE return false; } - - return false; } @@ -1883,7 +1870,6 @@ private static boolean checkSchema(WallVisitor visitor, SQLExpr x) { String owner = ((SQLName) x).getSimpleName(); owner = WallVisitorUtils.form(owner); if (isInTableSource(x) && !visitor.getProvider().checkDenySchema(owner)) { - if (!isTopStatementWithTableSource(x) && !isFirstSelectTableSource(x) && !isFirstInSubQuery(x)) { SQLObject parent = x.getParent(); while (parent != null && !(parent instanceof SQLStatement)) { @@ -1944,8 +1930,7 @@ private static boolean checkSchema(WallVisitor visitor, SQLExpr x) { } private static boolean isInTableSource(SQLObject x) { - - for (;;) { + for (; ; ) { if (x instanceof SQLExpr) { x = x.getParent(); } else { @@ -1960,7 +1945,7 @@ private static boolean isInTableSource(SQLObject x) { } private static boolean isFirstInSubQuery(SQLObject x) { - for (;;) { + for (; ; ) { if (x instanceof SQLExpr) { x = x.getParent(); } else { @@ -1975,7 +1960,6 @@ private static boolean isFirstInSubQuery(SQLObject x) { SQLSelect sqlSelect = null; SQLObject parent = x.getParent(); while (parent != null) { - if (parent instanceof SQLSelect) { sqlSelect = (SQLSelect) parent; break; @@ -2014,8 +1998,7 @@ private static boolean isFirstInSubQuery(SQLObject x) { } private static boolean isFirstSelectTableSource(SQLObject x) { - - for (;;) { + for (; ; ) { if (x instanceof SQLExpr) { x = x.getParent(); } else { @@ -2030,7 +2013,6 @@ private static boolean isFirstSelectTableSource(SQLObject x) { SQLSelectQueryBlock queryBlock = null; SQLObject parent = x.getParent(); while (parent != null) { - // if (parent instanceof SQLJoinTableSource) { // SQLJoinTableSource join = (SQLJoinTableSource) parent; // if (join.getRight() == x && hasTableSource(join.getLeft())) { @@ -2078,7 +2060,6 @@ private static boolean isFirstSelectTableSource(SQLObject x) { } private static boolean hasTableSource(SQLSelectQuery x) { - if (x instanceof SQLUnionQuery) { SQLUnionQuery union = (SQLUnionQuery) x; return hasTableSource(union.getLeft()) || hasTableSource(union.getRight()); @@ -2115,8 +2096,7 @@ private static boolean hasTableSource(SQLTableSource x) { } private static boolean isTopStatementWithTableSource(SQLObject x) { - - for (;;) { + for (; ; ) { if (x instanceof SQLExpr) { x = x.getParent(); } else { @@ -2138,7 +2118,7 @@ private static boolean isTopStatementWithTableSource(SQLObject x) { } private static boolean isTopSelectItem(SQLObject x) { - for (;;) { + for (; ; ) { if ((x.getParent() instanceof SQLExpr) || (x.getParent() instanceof Item)) { x = x.getParent(); } else { @@ -2155,7 +2135,6 @@ private static boolean isTopSelectItem(SQLObject x) { } private static boolean isTopSelectStatement(SQLObject x) { - if (!(x instanceof SQLSelectQueryBlock)) { return false; } @@ -2233,7 +2212,6 @@ public static boolean check(WallVisitor visitor, SQLExprTableSource x) { if (visitor.isDenyTable(tableName) && !(topStatementContext != null && topStatementContext.fromPermitTable())) { - if (isTopStatementWithTableSource(x) || isFirstSelectTableSource(x)) { if (topStatementContext != null) { topStatementContext.setFromSysTable(Boolean.TRUE); @@ -2297,7 +2275,6 @@ public static boolean checkUnion(WallVisitor visitor, SQLUnionQuery x) { && ((SQLUnionQuery) left).getOperator() == operator && !right.isParenthesized() && x.getOrderBy() == null) { - SQLUnionQuery leftUnion = (SQLUnionQuery) left; List rights = new ArrayList(); @@ -2417,7 +2394,7 @@ public static boolean queryBlockFromIsNull(WallVisitor visitor, SQLSelectQuery q itemIsConst = false; break; } - if(item.getAlias() != null ) { + if (item.getAlias() != null) { itemHasAlias = true; break; } @@ -2537,7 +2514,7 @@ private static void readFromInputStream(Set names, InputStream in) throw BufferedReader reader = null; try { reader = new BufferedReader(new InputStreamReader(in)); - for (;;) { + for (; ; ) { String line = reader.readLine(); if (line == null) { break; @@ -2625,7 +2602,7 @@ public static void preVisitCheck(WallVisitor visitor, SQLObject x) { denyMessage = "replace not allow"; errorCode = ErrorCode.REPLACE_NOT_ALLOW; } else if (x instanceof SQLDescribeStatement - || (x instanceof MySqlExplainStatement && ((MySqlExplainStatement)x).isDescribe())) { + || (x instanceof MySqlExplainStatement && ((MySqlExplainStatement) x).isDescribe())) { allow = config.isDescribeAllow(); denyMessage = "describe not allow"; errorCode = ErrorCode.DESC_NOT_ALLOW; @@ -2728,11 +2705,11 @@ public static void check(WallVisitor visitor, SQLCommentHint x) { } } - if(!isWhite) { + if (!isWhite) { if (text.startsWith("SET")) { SQLStatementParser parser = new MySqlStatementParser(text); List statementList = parser.parseStatementList(); - if (statementList != null && statementList.size() > 0) { + if (statementList != null && statementList.size() > 0) { SQLStatement statement = statementList.get(0); if (statement instanceof SQLSetStatement) { isWhite = true; diff --git a/src/main/java/com/alibaba/druid/wall/violation/ErrorCode.java b/src/main/java/com/alibaba/druid/wall/violation/ErrorCode.java index 202c54f508..079ac66aa5 100644 --- a/src/main/java/com/alibaba/druid/wall/violation/ErrorCode.java +++ b/src/main/java/com/alibaba/druid/wall/violation/ErrorCode.java @@ -16,77 +16,76 @@ package com.alibaba.druid.wall.violation; public interface ErrorCode { + public static final int SYNTAX_ERROR = 1001; + public static final int SELECT_NOT_ALLOW = 1002; + public static final int SELECT_INTO_NOT_ALLOW = 1003; + public static final int INSERT_NOT_ALLOW = 1004; + public static final int DELETE_NOT_ALLOW = 1005; + public static final int UPDATE_NOT_ALLOW = 1006; + public static final int MINUS_NOT_ALLOW = 1007; + public static final int INTERSET_NOT_ALLOW = 1008; + public static final int MERGE_NOT_ALLOW = 1009; + public static final int REPLACE_NOT_ALLOW = 1010; - public final static int SYNTAX_ERROR = 1001; - public final static int SELECT_NOT_ALLOW = 1002; - public final static int SELECT_INTO_NOT_ALLOW = 1003; - public final static int INSERT_NOT_ALLOW = 1004; - public final static int DELETE_NOT_ALLOW = 1005; - public final static int UPDATE_NOT_ALLOW = 1006; - public final static int MINUS_NOT_ALLOW = 1007; - public final static int INTERSET_NOT_ALLOW = 1008; - public final static int MERGE_NOT_ALLOW = 1009; - public final static int REPLACE_NOT_ALLOW = 1010; - - public final static int HINT_NOT_ALLOW = 1400; + public static final int HINT_NOT_ALLOW = 1400; - public final static int CALL_NOT_ALLOW = 1300; - public final static int COMMIT_NOT_ALLOW = 1301; - public final static int ROLLBACK_NOT_ALLOW = 1302; - public final static int START_TRANSACTION_NOT_ALLOW = 1303; - public final static int BLOCK_NOT_ALLOW = 1304; + public static final int CALL_NOT_ALLOW = 1300; + public static final int COMMIT_NOT_ALLOW = 1301; + public static final int ROLLBACK_NOT_ALLOW = 1302; + public static final int START_TRANSACTION_NOT_ALLOW = 1303; + public static final int BLOCK_NOT_ALLOW = 1304; - public final static int SET_NOT_ALLOW = 1200; - public final static int DESC_NOT_ALLOW = 1201; - public final static int SHOW_NOT_ALLOW = 1202; - public final static int USE_NOT_ALLOW = 1203; + public static final int SET_NOT_ALLOW = 1200; + public static final int DESC_NOT_ALLOW = 1201; + public static final int SHOW_NOT_ALLOW = 1202; + public static final int USE_NOT_ALLOW = 1203; - public final static int NONE_BASE_STATEMENT_NOT_ALLOW = 1999; + public static final int NONE_BASE_STATEMENT_NOT_ALLOW = 1999; - public final static int TRUNCATE_NOT_ALLOW = 1100; - public final static int CREATE_TABLE_NOT_ALLOW = 1101; - public final static int ALTER_TABLE_NOT_ALLOW = 1102; - public final static int DROP_TABLE_NOT_ALLOW = 1103; - public final static int COMMENT_STATEMENT_NOT_ALLOW = 1104; - public final static int RENAME_TABLE_NOT_ALLOW = 1105; - public final static int LOCK_TABLE_NOT_ALLOW = 1106; + public static final int TRUNCATE_NOT_ALLOW = 1100; + public static final int CREATE_TABLE_NOT_ALLOW = 1101; + public static final int ALTER_TABLE_NOT_ALLOW = 1102; + public static final int DROP_TABLE_NOT_ALLOW = 1103; + public static final int COMMENT_STATEMENT_NOT_ALLOW = 1104; + public static final int RENAME_TABLE_NOT_ALLOW = 1105; + public static final int LOCK_TABLE_NOT_ALLOW = 1106; - public final static int LIMIT_ZERO = 2200; - public final static int MULTI_STATEMENT = 2201; + public static final int LIMIT_ZERO = 2200; + public static final int MULTI_STATEMENT = 2201; - public final static int FUNCTION_DENY = 2001; - public final static int SCHEMA_DENY = 2002; - public final static int VARIANT_DENY = 2003; - public final static int TABLE_DENY = 2004; - public final static int OBJECT_DENY = 2005; + public static final int FUNCTION_DENY = 2001; + public static final int SCHEMA_DENY = 2002; + public static final int VARIANT_DENY = 2003; + public static final int TABLE_DENY = 2004; + public static final int OBJECT_DENY = 2005; - public final static int ALWAYS_TRUE = 2100; - public final static int CONST_ARITHMETIC = 2101; - public final static int XOR = 2102; - public final static int BITWISE = 2103; - public final static int NONE_CONDITION = 2104; - public final static int LIKE_NUMBER = 2105; - public final static int EMPTY_QUERY_HAS_CONDITION = 2106; - public final static int DOUBLE_CONST_CONDITION = 2107; - public final static int SAME_CONST_LIKE = 2108; - public final static int CONST_CASE_CONDITION = 2109; - public final static int EVIL_HINTS = 2110; - public final static int EVIL_NAME = 2111; - public final static int EVIL_CONCAT = 2112; - public final static int ALWAYS_FALSE = 2113; + public static final int ALWAYS_TRUE = 2100; + public static final int CONST_ARITHMETIC = 2101; + public static final int XOR = 2102; + public static final int BITWISE = 2103; + public static final int NONE_CONDITION = 2104; + public static final int LIKE_NUMBER = 2105; + public static final int EMPTY_QUERY_HAS_CONDITION = 2106; + public static final int DOUBLE_CONST_CONDITION = 2107; + public static final int SAME_CONST_LIKE = 2108; + public static final int CONST_CASE_CONDITION = 2109; + public static final int EVIL_HINTS = 2110; + public static final int EVIL_NAME = 2111; + public static final int EVIL_CONCAT = 2112; + public static final int ALWAYS_FALSE = 2113; - public final static int NOT_PARAMETERIZED = 2200; - public final static int MULTI_TENANT = 2201; + public static final int NOT_PARAMETERIZED = 2200; + public static final int MULTI_TENANT = 2201; - public final static int INTO_OUTFILE = 3000; + public static final int INTO_OUTFILE = 3000; - public final static int READ_ONLY = 4000; - public final static int UNION = 5000; - public final static int INVALID_JOIN_CONDITION = 6000; + public static final int READ_ONLY = 4000; + public static final int UNION = 5000; + public static final int INVALID_JOIN_CONDITION = 6000; - public final static int COMPOUND = 8000; + public static final int COMPOUND = 8000; - public final static int UPDATE_CHECK_FAIL = 9000; + public static final int UPDATE_CHECK_FAIL = 9000; - public final static int OTHER = 9999; + public static final int OTHER = 9999; } diff --git a/src/main/java/com/alibaba/druid/wall/violation/IllegalSQLObjectViolation.java b/src/main/java/com/alibaba/druid/wall/violation/IllegalSQLObjectViolation.java index b131389e09..28439ee8e8 100644 --- a/src/main/java/com/alibaba/druid/wall/violation/IllegalSQLObjectViolation.java +++ b/src/main/java/com/alibaba/druid/wall/violation/IllegalSQLObjectViolation.java @@ -18,12 +18,11 @@ import com.alibaba.druid.wall.Violation; public class IllegalSQLObjectViolation implements Violation { - private final String message; private final String sqlPart; private final int errorCode; - public IllegalSQLObjectViolation(int errorCode, String message, String sqlPart){ + public IllegalSQLObjectViolation(int errorCode, String message, String sqlPart) { this.errorCode = errorCode; this.message = message; this.sqlPart = sqlPart; @@ -37,7 +36,6 @@ public String toString() { return this.sqlPart; } - public String getMessage() { return message; } @@ -47,5 +45,4 @@ public int getErrorCode() { return errorCode; } - } diff --git a/src/main/java/com/alibaba/druid/wall/violation/SyntaxErrorViolation.java b/src/main/java/com/alibaba/druid/wall/violation/SyntaxErrorViolation.java index 921a2c96e8..f601c81630 100644 --- a/src/main/java/com/alibaba/druid/wall/violation/SyntaxErrorViolation.java +++ b/src/main/java/com/alibaba/druid/wall/violation/SyntaxErrorViolation.java @@ -18,12 +18,11 @@ import com.alibaba.druid.wall.Violation; public class SyntaxErrorViolation implements Violation { - private final Exception exception; - private final String sql; + private final String sql; - public SyntaxErrorViolation(Exception exception, String sql){ + public SyntaxErrorViolation(Exception exception, String sql) { super(); this.exception = exception; this.sql = sql; diff --git a/src/main/resources/META-INF/druid-driver.properties b/src/main/resources/META-INF/druid-driver.properties index 677c39c412..44e5188458 100644 --- a/src/main/resources/META-INF/druid-driver.properties +++ b/src/main/resources/META-INF/druid-driver.properties @@ -1,16 +1,16 @@ -jdbc:derby:=org.apache.derby.jdbc.EmbeddedDriver +jdbc:derby:=org.apache.derby.jdbc.EmbeddedDriver jdbc:mysql:=com.mysql.jdbc.Driver jdbc:log4jdbc:=net.sf.log4jdbc.DriverSpy jdbc:oracle:=oracle.jdbc.driver.OracleDriver -jdbc:microsoft:=com.microsoft.jdbc.sqlserver.SQLServerDriver -jdbc:jtds:=net.sourceforge.jtds.jdbc.Driver -jdbc:postgresql:=org.postgresql.Driver -jdbc:fake:=com.alibaba.druid.mock.MockDriver -jdbc:hsqldb:=org.hsqldb.jdbcDriver +jdbc:microsoft:=com.microsoft.jdbc.sqlserver.SQLServerDriver +jdbc:jtds:=net.sourceforge.jtds.jdbc.Driver +jdbc:postgresql:=org.postgresql.Driver +jdbc:fake:=com.alibaba.druid.mock.MockDriver +jdbc:hsqldb:=org.hsqldb.jdbcDriver jdbc:db2:=COM.ibm.db2.jdbc.app.DB2Driver -jdbc:sqlite:=org.sqlite.JDBC -jdbc:ingres:=com.ingres.jdbc.IngresDriver -jdbc:h2:=org.h2.Driver +jdbc:sqlite:=org.sqlite.JDBC +jdbc:ingres:=com.ingres.jdbc.IngresDriver +jdbc:h2:=org.h2.Driver jdbc:mckoi:=com.mckoi.JDBCDriver jdbc:clickhouse:=ru.yandex.clickhouse.ClickHouseDriver -jdbc:highgo:=com.highgo.jdbc.Driver \ No newline at end of file +jdbc:highgo:=com.highgo.jdbc.Driver diff --git a/src/main/resources/META-INF/druid-filter.properties b/src/main/resources/META-INF/druid-filter.properties index ca9f2537e1..b9b2ebbd2e 100644 --- a/src/main/resources/META-INF/druid-filter.properties +++ b/src/main/resources/META-INF/druid-filter.properties @@ -10,4 +10,4 @@ druid.filters.commonlogging=com.alibaba.druid.filter.logging.CommonsLogFilter druid.filters.commonLogging=com.alibaba.druid.filter.logging.CommonsLogFilter druid.filters.wall=com.alibaba.druid.wall.WallFilter druid.filters.config=com.alibaba.druid.filter.config.ConfigFilter -druid.filters.haRandomValidator=com.alibaba.druid.pool.ha.selector.RandomDataSourceValidateFilter \ No newline at end of file +druid.filters.haRandomValidator=com.alibaba.druid.pool.ha.selector.RandomDataSourceValidateFilter diff --git a/src/main/resources/META-INF/stat.xsd b/src/main/resources/META-INF/stat.xsd index bd0892ba78..fed33097c3 100644 --- a/src/main/resources/META-INF/stat.xsd +++ b/src/main/resources/META-INF/stat.xsd @@ -1,17 +1,17 @@ - - - - - - - - - + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:beans="http://www.springframework.org/schema/beans" + targetNamespace="http://www.alibaba.com/schema/stat" + elementFormDefault="qualified" + attributeFormDefault="unqualified"> + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/support/http/resources/activeConnectionStackTrace.html b/src/main/resources/support/http/resources/activeConnectionStackTrace.html index 5b945d27b0..7ed4b72617 100644 --- a/src/main/resources/support/http/resources/activeConnectionStackTrace.html +++ b/src/main/resources/support/http/resources/activeConnectionStackTrace.html @@ -1,69 +1,70 @@ - + Druid ActiveConnection StackTrace - - + + - - - - -
-

ActiveConnection StackTrace for Datasource + + + + +
+

ActiveConnection StackTrace for Datasource [View JSON API] -

-
- -
+

+
+
- - + $(document).ready(function () { + druid.activeConnectionStackTrace.init(); + }); + + diff --git a/src/main/resources/support/http/resources/api.html b/src/main/resources/support/http/resources/api.html index 9789c2d78f..a1b2fb7989 100644 --- a/src/main/resources/support/http/resources/api.html +++ b/src/main/resources/support/http/resources/api.html @@ -1,84 +1,89 @@ - - Druid Stat JSON API - - - - - - - - - - -
-

- JSON API -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescription
basic.jsonbasic info.
datasource.jsonDatsSourceStat List
datasource-{id}.jsonDatasourceStat for id={id},id is DatsSourceStat.ID
- Example: druid/datasource-1.json
activeConnectionStackTrace-{datasourceId}.jsonStrackTrace for activeConnection in datasource which datasource.id={datasourceId},id is DatsSourceStat.ID
- Required: set removeAbandoned=true
- Example: druid/activeConnectionStackTrace-1.json
sql.jsonSqlStat for id={id} ,id is SqlStat.ID
- Example: druid/sql-1.json
WallStat.jsonWallStat List
wall-{id}.jsonWallStat for id={id},id is DatsSourceStat.ID
- Example: druid/wall-1.json
basic.json
weburi.json -
websession.json -
reset-all.json Reset all stat
-
- + + Druid Stat JSON API + + + + + + + + + + +
+

+ JSON API +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescription
basic.jsonbasic info.
datasource.jsonDatsSourceStat List
datasource-{id}.jsonDatasourceStat for id={id},id is DatsSourceStat.ID
+ Example: druid/datasource-1.json +
activeConnectionStackTrace-{datasourceId}.jsonStrackTrace for activeConnection in datasource which datasource.id={datasourceId},id is + DatsSourceStat.ID
+ Required: set removeAbandoned=true
+ Example: druid/activeConnectionStackTrace-1.json +
sql.jsonSqlStat for id={id} ,id is SqlStat.ID
+ Example: druid/sql-1.json +
WallStat.jsonWallStat List
wall-{id}.jsonWallStat for id={id},id is DatsSourceStat.ID
+ Example: druid/wall-1.json +
basic.json
weburi.json +
websession.json +
reset-all.json Reset all stat
+
+ diff --git a/src/main/resources/support/http/resources/connectionInfo.html b/src/main/resources/support/http/resources/connectionInfo.html index 7db29f2f81..e48a9f40ca 100644 --- a/src/main/resources/support/http/resources/connectionInfo.html +++ b/src/main/resources/support/http/resources/connectionInfo.html @@ -1,135 +1,137 @@ - - Druid Spring Stat - - - - - - - - -
-
-
-

- Pooling Connection Info List for Datasource- -

- - - - - - - - - - - - - - - - -
IDUseCntKACheckCntLastActiveTimeConnectTimeHoldabilityTranIsolationAutoCommitReadOnly - Pscache
- - - - - - - -
sqldfRowPrefetchrowPrefetchhitCount
-
-
-
-
- - + + + + +
+
+
+

+ Pooling Connection Info List for Datasource- +

+ + + + + + + + + + + + + + + + +
IDUseCntKACheckCntLastActiveTimeConnectTimeHoldabilityTranIsolationAutoCommitReadOnly + Pscache
+ + + + + + + + + +
sqldfRowPrefetchrowPrefetchhitCount
+
+
+
+
- var html = ""; - for ( var i = 0; i < statList.length; i++) { - var stat = statList[i]; - var newRow = sqlStatTable.insertRow(-1); - html += ""; - html += "" + stat.connectionId + ""; - html += "" + stat.useCount + ""; - html += "" + stat.keepAliveCheckCount + ""; - - if (stat.lastActiveTime) - html += "" + stat.lastActiveTime + ""; - else - html += ""; - - html += "" + stat.connectTime + ""; - html += "" + stat.holdability + ""; - html += "" + stat.transactionIsolation + ""; - html += "" + stat.autoCommit + ""; - html += "" + stat.readoOnly + ""; - if (stat.pscache) - html += "" + druid.connectionInfo.getPsCacheInfo(stat.pscache) + ""; - else - html += ""; - html += ""; - } - $("#dataTable tbody").html(html); - druid.common.stripes(); - }, - - getPsCacheInfo : function(pscache) { - var result = ''; - for ( var i = 0; i < pscache.length; i++) { - var stmt = pscache[i]; - result += ''; - result += '"; - result += '"; - result += '"; - result += '"; - result += ''; - } + - + handleAjaxResult: function (data) { + var statList = data.Content; + if (statList == null) return; + + var sqlStatTable = document.getElementById("dataTable"); + while (sqlStatTable.rows.length > 1) { + sqlStatTable.deleteRow(1); + } + + var html = ""; + for (var i = 0; i < statList.length; i++) { + var stat = statList[i]; + var newRow = sqlStatTable.insertRow(-1); + html += ""; + html += ""; + html += ""; + html += ""; + + if (stat.lastActiveTime) + html += ""; + else + html += ""; + + html += ""; + html += ""; + html += ""; + html += ""; + html += ""; + if (stat.pscache) + html += ""; + else + html += ""; + html += ""; + } + $("#dataTable tbody").html(html); + druid.common.stripes(); + }, + + getPsCacheInfo: function (pscache) { + var result = '
' + stmt.sql + "' + stmt.defaultRowPrefetch + "' + stmt.rowPrefetch + "' + stmt.hitCount + "
" + stat.connectionId + "" + stat.useCount + "" + stat.keepAliveCheckCount + "" + stat.lastActiveTime + "" + stat.connectTime + "" + stat.holdability + "" + stat.transactionIsolation + "" + stat.autoCommit + "" + stat.readoOnly + "" + druid.connectionInfo.getPsCacheInfo(stat.pscache) + "
'; + for (var i = 0; i < pscache.length; i++) { + var stmt = pscache[i]; + result += ''; + result += '"; + result += '"; + result += '"; + result += '"; + result += ''; + } + + result += "
' + stmt.sql + "' + stmt.defaultRowPrefetch + "' + stmt.rowPrefetch + "' + stmt.hitCount + "
"; + return result; + } + } + }(); + + $(document).ready(function () { + druid.connectionInfo.init(); + }); + + diff --git a/src/main/resources/support/http/resources/css/style.css b/src/main/resources/support/http/resources/css/style.css index 08d488d368..11cdf2a465 100644 --- a/src/main/resources/support/http/resources/css/style.css +++ b/src/main/resources/support/http/resources/css/style.css @@ -1,17 +1,20 @@ -body{ - font-size:12px; - padding-top: 60px; - padding-bottom: 40px; +body { + font-size: 12px; + padding-top: 60px; + padding-bottom: 40px; } + a { - cursor:pointer; + cursor: pointer; } + #dataTable th > a { color: #555555; } + #dataTable th { - background-color: #E5E5E5; + background-color: #E5E5E5; border-bottom-color: #FFC40D; color: #555555; cursor: pointer; @@ -25,19 +28,20 @@ a { } .td_lable { - font-weight: bold; - width: 220px; - background-color: #E5E5E5; + font-weight: bold; + width: 220px; + background-color: #E5E5E5; } .striped { - background-color: #fff; + background-color: #fff; } #dataTable1 th > a { color: #555555; } + #dataTable1 th { background-color: #E5E5E5; border-bottom-color: #FFC40D; @@ -49,6 +53,7 @@ a { #dataTable2 th > a { color: #555555; } + #dataTable2 th { background-color: #E5E5E5; border-bottom-color: #FFC40D; diff --git a/src/main/resources/support/http/resources/datasource.html b/src/main/resources/support/http/resources/datasource.html index e6b1fadc0e..c192a2cbf0 100644 --- a/src/main/resources/support/http/resources/datasource.html +++ b/src/main/resources/support/http/resources/datasource.html @@ -1,448 +1,513 @@ - - Druid DataSourceStat - - - - - - - - - - - -
-
-
-

- DataSourceStat List - View JSON API -

-
(*) property for user to setup
-
-
-
- - + + + + + + - var tmpl = $('#datasource-tmpl').html(); - var doTtmpl = doT.template(tmpl); - var contentHtml = doTtmpl(data); - - $(".span12 h3").after(contentHtml); - - $('#datasourceTab a').click(function (e) { - e.preventDefault(); - $(this).tab('show'); - }); - druid.lang.trigger(); - }, - dataType: "json" - }); - } +
+
+
+

+ DataSourceStat List + View JSON API +

+
(*) property for user to setup +
+
+
+
+ + - + return { + init: function () { + druid.common.buildHead(1); + this.ajaxRequestForBasicInfo(); + }, + ajaxRequestForBasicInfo: function () { + $.ajax({ + type: 'POST', + url: "datasource.json", + success: function (data) { + + var tmpl = $('#datasource-tmpl').html(); + var doTtmpl = doT.template(tmpl); + var contentHtml = doTtmpl(data); + + $(".span12 h3").after(contentHtml); + + $('#datasourceTab a').click(function (e) { + e.preventDefault(); + $(this).tab('show'); + }); + druid.lang.trigger(); + }, + dataType: "json" + }); + } + + } + }(); + + $(document).ready(function () { + druid.datasource.init(); + }); + + diff --git a/src/main/resources/support/http/resources/header.html b/src/main/resources/support/http/resources/header.html index 9a1ae17eb6..50cae48e5d 100644 --- a/src/main/resources/support/http/resources/header.html +++ b/src/main/resources/support/http/resources/header.html @@ -1,25 +1,28 @@ -
- English | 中文 -
-
-
-
- Druid Monitor -
- - Reset All - Log And Reset -
-
-
-
+ +
+
+
+ Druid + Monitor +
+ + Reset All + Log And Reset +
+
+
+
diff --git a/src/main/resources/support/http/resources/index.html b/src/main/resources/support/http/resources/index.html index 72c017f3b3..33dc0bb479 100644 --- a/src/main/resources/support/http/resources/index.html +++ b/src/main/resources/support/http/resources/index.html @@ -1,100 +1,100 @@ - - Druid Stat Index - - - - - - - - - -
-

- Stat Index - View JSON API -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Version -
Drivers
ResetEnable
ResetCount
JavaVersion
JavaVMName
JavaClassPath
StartTime
-
- - + + Druid Stat Index + + + + + + + + + +
+

+ Stat Index + View JSON API +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Version +
Drivers
ResetEnable
ResetCount
JavaVersion
JavaVMName
JavaClassPath
StartTime
+
+ + diff --git a/src/main/resources/support/http/resources/js/common.js b/src/main/resources/support/http/resources/js/common.js index fdccbf4ace..19c61278c0 100644 --- a/src/main/resources/support/http/resources/js/common.js +++ b/src/main/resources/support/http/resources/js/common.js @@ -1,172 +1,172 @@ $.namespace("druid.common"); -druid.common = function () { - var statViewOrderBy = ''; - var statViewOrderBy_old = ''; - var statViewOrderType = 'asc'; - var isOrderRequest = false; - - // only one page for now - var sqlViewPage = 1; - var sqlViewPerPageCount = 1000000; - - return { - init : function() { - this.buildFooter(); - druid.lang.init(); - }, - - buildHead : function(index) { - $.get('header.html',function(html) { - $(document.body).prepend(html); - druid.lang.trigger(); - $(".navbar .nav li").eq(index).addClass("active"); - },"html"); - - }, - - buildFooter : function() { - - var html =''; - $(document.body).append(html); - }, - - ajaxRequestForReset : function() { - if(!confirm("Are you sure to reset all stat? It'll clear all stat data !")){ - return; - } - - $.ajax({ - type: 'POST', - url: "reset-all.json", - success: function(data) { - if (data.ResultCode == 1) { - alert("already reset all stat"); - } - }, - dataType: "json" - }); - }, - - ajaxRequestForLogAndReset : function() { - if(!confirm("Are you sure to reset data source stat? It'll clear and log all stat data !")){ - return; - } - - $.ajax({ - type: 'POST', - url: "log-and-reset.json", - success: function(data) { - if (data.ResultCode == 1) { - alert("already reset all stat"); - } - }, - dataType: "json" - }); - }, - - getAjaxUrl : function(uri) { - var result = uri; - - if (statViewOrderBy != undefined) - result += 'orderBy=' + statViewOrderBy + '&'; - - if (statViewOrderType != undefined) - result += 'orderType=' + statViewOrderType + '&'; - - if (sqlViewPage != undefined) - result += 'page=' + sqlViewPage + '&'; - - if (sqlViewPerPageCount != undefined) - result += 'perPageCount=' + sqlViewPerPageCount + '&'; - - return result; - }, - - resetSortMark : function() { - var divObj = document.getElementById('th-' + statViewOrderBy); - var old_divObj = document.getElementById('th-' + statViewOrderBy_old); - var replaceToStr = ''; - if (old_divObj) { - var html = old_divObj.innerHTML; - if (statViewOrderBy_old.indexOf('[') > 0) - replaceToStr = '-'; - html = html.replace('▲', replaceToStr); - html = html.replace('▼', replaceToStr); - old_divObj.innerHTML = html - } - if (divObj) { - var html = divObj.innerHTML; - if (statViewOrderBy.indexOf('[') > 0) - html = ''; - - if (statViewOrderType == 'asc') { - html += '▲'; - } else if (statViewOrderType == 'desc') { - html += '▼'; - } - divObj.innerHTML = html; - } - isOrderRequest = true; - - this.ajaxRequestForBasicInfo(); - return false; - }, - - setOrderBy : function(orderBy) { - if (statViewOrderBy != orderBy) { - statViewOrderBy_old = statViewOrderBy; - statViewOrderBy = orderBy; - statViewOrderType = 'desc'; - druid.common.resetSortMark(); - return; - } - - statViewOrderBy_old = statViewOrderBy; - - if (statViewOrderType == 'asc') - statViewOrderType = 'desc' - else - statViewOrderType = 'asc'; - - druid.common.resetSortMark(); - }, - - ajaxuri : "", - handleCallback:null, - handleAjaxResult : function(data) { - druid.common.handleCallback(data); - if (!isOrderRequest) { - druid.lang.trigger(); - } - },//ajax 处理函数 - ajaxRequestForBasicInfo : function() { - $.ajax({ - type: 'POST', - url: druid.common.getAjaxUrl(druid.common.ajaxuri), - success: function(data) { - druid.common.handleAjaxResult(data); - }, - dataType: "json" - }); - }, - - subSqlString : function(sql, len) { - if (sql == undefined || sql == null) { - return ''; - } - - if (sql.length <= len) - return sql; - return sql.substr(0, len) + '...'; - }, - - stripes : function() { +druid.common = function () { + var statViewOrderBy = ''; + var statViewOrderBy_old = ''; + var statViewOrderType = 'asc'; + var isOrderRequest = false; + + // only one page for now + var sqlViewPage = 1; + var sqlViewPerPageCount = 1000000; + + return { + init: function () { + this.buildFooter(); + druid.lang.init(); + }, + + buildHead: function (index) { + $.get('header.html', function (html) { + $(document.body).prepend(html); + druid.lang.trigger(); + $(".navbar .nav li").eq(index).addClass("active"); + }, "html"); + + }, + + buildFooter: function () { + + var html = ''; + $(document.body).append(html); + }, + + ajaxRequestForReset: function () { + if (!confirm("Are you sure to reset all stat? It'll clear all stat data !")) { + return; + } + + $.ajax({ + type: 'POST', + url: "reset-all.json", + success: function (data) { + if (data.ResultCode == 1) { + alert("already reset all stat"); + } + }, + dataType: "json" + }); + }, + + ajaxRequestForLogAndReset: function () { + if (!confirm("Are you sure to reset data source stat? It'll clear and log all stat data !")) { + return; + } + + $.ajax({ + type: 'POST', + url: "log-and-reset.json", + success: function (data) { + if (data.ResultCode == 1) { + alert("already reset all stat"); + } + }, + dataType: "json" + }); + }, + + getAjaxUrl: function (uri) { + var result = uri; + + if (statViewOrderBy != undefined) + result += 'orderBy=' + statViewOrderBy + '&'; + + if (statViewOrderType != undefined) + result += 'orderType=' + statViewOrderType + '&'; + + if (sqlViewPage != undefined) + result += 'page=' + sqlViewPage + '&'; + + if (sqlViewPerPageCount != undefined) + result += 'perPageCount=' + sqlViewPerPageCount + '&'; + + return result; + }, + + resetSortMark: function () { + var divObj = document.getElementById('th-' + statViewOrderBy); + var old_divObj = document.getElementById('th-' + statViewOrderBy_old); + var replaceToStr = ''; + if (old_divObj) { + var html = old_divObj.innerHTML; + if (statViewOrderBy_old.indexOf('[') > 0) + replaceToStr = '-'; + html = html.replace('▲', replaceToStr); + html = html.replace('▼', replaceToStr); + old_divObj.innerHTML = html + } + if (divObj) { + var html = divObj.innerHTML; + if (statViewOrderBy.indexOf('[') > 0) + html = ''; + + if (statViewOrderType == 'asc') { + html += '▲'; + } else if (statViewOrderType == 'desc') { + html += '▼'; + } + divObj.innerHTML = html; + } + isOrderRequest = true; + + this.ajaxRequestForBasicInfo(); + return false; + }, + + setOrderBy: function (orderBy) { + if (statViewOrderBy != orderBy) { + statViewOrderBy_old = statViewOrderBy; + statViewOrderBy = orderBy; + statViewOrderType = 'desc'; + druid.common.resetSortMark(); + return; + } + + statViewOrderBy_old = statViewOrderBy; + + if (statViewOrderType == 'asc') + statViewOrderType = 'desc' + else + statViewOrderType = 'asc'; + + druid.common.resetSortMark(); + }, + + ajaxuri: "", + handleCallback: null, + handleAjaxResult: function (data) { + druid.common.handleCallback(data); + if (!isOrderRequest) { + druid.lang.trigger(); + } + },//ajax 处理函数 + ajaxRequestForBasicInfo: function () { + $.ajax({ + type: 'POST', + url: druid.common.getAjaxUrl(druid.common.ajaxuri), + success: function (data) { + druid.common.handleAjaxResult(data); + }, + dataType: "json" + }); + }, + + subSqlString: function (sql, len) { + if (sql == undefined || sql == null) { + return ''; + } + + if (sql.length <= len) + return sql; + return sql.substr(0, len) + '...'; + }, + + stripes: function () { $("#dataTable tbody tr").each(function () { $(this).removeClass("striped"); }); @@ -174,30 +174,30 @@ druid.common = function () { $(this).addClass("striped"); }); }, - - getUrlVar : function(name) { + + getUrlVar: function (name) { var vars = {}; - var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) { + var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function (m, key, value) { vars[key] = value; }); - return vars[name]; + return vars[name]; } - } + } }(); -$(document).ready(function() { - druid.common.init(); +$(document).ready(function () { + druid.common.init(); }); -function replace (data) { - if((!data)||data === undefined){ - return ''; - }else{ - return format(data); - } +function replace(data) { + if ((!data) || data === undefined) { + return ''; + } else { + return format(data); + } } function format(s) { - var str=s+=''; - return str.replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,"); + var str = s += ''; + return str.replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,"); } diff --git a/src/main/resources/support/http/resources/js/doT.js b/src/main/resources/support/http/resources/js/doT.js index beb31e267e..cf73b62a1e 100644 --- a/src/main/resources/support/http/resources/js/doT.js +++ b/src/main/resources/support/http/resources/js/doT.js @@ -2,134 +2,143 @@ // 2011, Laura Doktorova, https://github.com/olado/doT // Licensed under the MIT license. -(function() { - "use strict"; +(function () { + "use strict"; - var doT = { - version: '1.0.17', - templateSettings: { - evaluate: /\{\{([\s\S]+?\}?)\}\}/g, - interpolate: /\{\{=([\s\S]+?)\}\}/g, - encode: /\{\{!([\s\S]+?)\}\}/g, - use: /\{\{#([\s\S]+?)\}\}/g, - useParams: /(^|[^\w$])def(?:\.|\[[\'\"])([\w$\.]+)(?:[\'\"]\])?\s*\:\s*([\w$\.]+|\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})/g, - define: /\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g, - defineParams:/^\s*([\w$]+):([\s\S]+)/, - conditional: /\{\{\?(\?)?\s*([\s\S]*?)\s*\}\}/g, - iterate: /\{\{~\s*(?:\}\}|([\s\S]+?)\s*\:\s*([\w$]+)\s*(?:\:\s*([\w$]+))?\s*\}\})/g, - varname: 'it', - strip: true, - append: true, - selfcontained: false - }, - template: undefined, //fn, compile template - compile: undefined //fn, for express - }; + var doT = { + version: '1.0.17', + templateSettings: { + evaluate: /\{\{([\s\S]+?\}?)\}\}/g, + interpolate: /\{\{=([\s\S]+?)\}\}/g, + encode: /\{\{!([\s\S]+?)\}\}/g, + use: /\{\{#([\s\S]+?)\}\}/g, + useParams: /(^|[^\w$])def(?:\.|\[[\'\"])([\w$\.]+)(?:[\'\"]\])?\s*\:\s*([\w$\.]+|\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})/g, + define: /\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g, + defineParams: /^\s*([\w$]+):([\s\S]+)/, + conditional: /\{\{\?(\?)?\s*([\s\S]*?)\s*\}\}/g, + iterate: /\{\{~\s*(?:\}\}|([\s\S]+?)\s*\:\s*([\w$]+)\s*(?:\:\s*([\w$]+))?\s*\}\})/g, + varname: 'it', + strip: true, + append: true, + selfcontained: false + }, + template: undefined, //fn, compile template + compile: undefined //fn, for express + }; - if (typeof module !== 'undefined' && module.exports) { - module.exports = doT; - } else if (typeof define === 'function' && define.amd) { - define(function(){return doT;}); - } else { - (function(){ return this || (0,eval)('this'); }()).doT = doT; - } + if (typeof module !== 'undefined' && module.exports) { + module.exports = doT; + } else if (typeof define === 'function' && define.amd) { + define(function () { + return doT; + }); + } else { + (function () { + return this || (0, eval)('this'); + }()).doT = doT; + } - function encodeHTMLSource() { - var encodeHTMLRules = { "&": "&", "<": "<", ">": ">", '"': '"', "'": ''', "/": '/' }, - matchHTML = /&(?!#?\w+;)|<|>|"|'|\//g; - return function() { - return this ? this.replace(matchHTML, function(m) {return encodeHTMLRules[m] || m;}) : this; - }; - } - String.prototype.encodeHTML = encodeHTMLSource(); + function encodeHTMLSource() { + var encodeHTMLRules = {"&": "&", "<": "<", ">": ">", '"': '"', "'": ''', "/": '/'}, + matchHTML = /&(?!#?\w+;)|<|>|"|'|\//g; + return function () { + return this ? this.replace(matchHTML, function (m) { + return encodeHTMLRules[m] || m; + }) : this; + }; + } - var startend = { - append: { start: "'+(", end: ")+'", endencode: "||'').toString().encodeHTML()+'" }, - split: { start: "';out+=(", end: ");out+='", endencode: "||'').toString().encodeHTML();out+='"} - }, skip = /$^/; + String.prototype.encodeHTML = encodeHTMLSource(); - function resolveDefs(c, block, def) { - return ((typeof block === 'string') ? block : block.toString()) - .replace(c.define || skip, function(m, code, assign, value) { - if (code.indexOf('def.') === 0) { - code = code.substring(4); - } - if (!(code in def)) { - if (assign === ':') { - if (c.defineParams) value.replace(c.defineParams, function(m, param, v) { - def[code] = {arg: param, text: v}; - }); - if (!(code in def)) def[code]= value; - } else { - new Function("def", "def['"+code+"']=" + value)(def); - } - } - return ''; - }) - .replace(c.use || skip, function(m, code) { - if (c.useParams) code = code.replace(c.useParams, function(m, s, d, param) { - if (def[d] && def[d].arg && param) { - var rw = (d+":"+param).replace(/'|\\/g, '_'); - def.__exp = def.__exp || {}; - def.__exp[rw] = def[d].text.replace(new RegExp("(^|[^\\w$])" + def[d].arg + "([^\\w$])", "g"), "$1" + param + "$2"); - return s + "def.__exp['"+rw+"']"; - } - }); - var v = new Function("def", "return " + code)(def); - return v ? resolveDefs(c, v, def) : v; - }); - } + var startend = { + append: {start: "'+(", end: ")+'", endencode: "||'').toString().encodeHTML()+'"}, + split: {start: "';out+=(", end: ");out+='", endencode: "||'').toString().encodeHTML();out+='"} + }, skip = /$^/; - function unescape(code) { - return code.replace(/\\('|\\)/g, "$1").replace(/[\r\t\n]/g, ' '); - } + function resolveDefs(c, block, def) { + return ((typeof block === 'string') ? block : block.toString()) + .replace(c.define || skip, function (m, code, assign, value) { + if (code.indexOf('def.') === 0) { + code = code.substring(4); + } + if (!(code in def)) { + if (assign === ':') { + if (c.defineParams) value.replace(c.defineParams, function (m, param, v) { + def[code] = {arg: param, text: v}; + }); + if (!(code in def)) def[code] = value; + } else { + new Function("def", "def['" + code + "']=" + value)(def); + } + } + return ''; + }) + .replace(c.use || skip, function (m, code) { + if (c.useParams) code = code.replace(c.useParams, function (m, s, d, param) { + if (def[d] && def[d].arg && param) { + var rw = (d + ":" + param).replace(/'|\\/g, '_'); + def.__exp = def.__exp || {}; + def.__exp[rw] = def[d].text.replace(new RegExp("(^|[^\\w$])" + def[d].arg + "([^\\w$])", "g"), "$1" + param + "$2"); + return s + "def.__exp['" + rw + "']"; + } + }); + var v = new Function("def", "return " + code)(def); + return v ? resolveDefs(c, v, def) : v; + }); + } - doT.template = function(tmpl, c, def) { - c = c || doT.templateSettings; - var cse = c.append ? startend.append : startend.split, needhtmlencode, sid = 0, indv, - str = (c.use || c.define) ? resolveDefs(c, tmpl, def || {}) : tmpl; + function unescape(code) { + return code.replace(/\\('|\\)/g, "$1").replace(/[\r\t\n]/g, ' '); + } - str = ("var out='" + (c.strip ? str.replace(/(^|\r|\n)\t* +| +\t*(\r|\n|$)/g,' ') - .replace(/\r|\n|\t|\/\*[\s\S]*?\*\//g,''): str) - .replace(/'|\\/g, '\\$&') - .replace(c.interpolate || skip, function(m, code) { - return cse.start + unescape(code) + cse.end; - }) - .replace(c.encode || skip, function(m, code) { - needhtmlencode = true; - return cse.start + unescape(code) + cse.endencode; - }) - .replace(c.conditional || skip, function(m, elsecase, code) { - return elsecase ? - (code ? "';}else if(" + unescape(code) + "){out+='" : "';}else{out+='") : - (code ? "';if(" + unescape(code) + "){out+='" : "';}out+='"); - }) - .replace(c.iterate || skip, function(m, iterate, vname, iname) { - if (!iterate) return "';} } out+='"; - sid+=1; indv=iname || "i"+sid; iterate=unescape(iterate); - return "';var arr"+sid+"="+iterate+";if(arr"+sid+"){var "+vname+","+indv+"=-1,l"+sid+"=arr"+sid+".length-1;while("+indv+"100 s]', '事务运行时间分布，分布区间为[0-1 ms, 1-10 ms, 10-100 ms, 100-1 s, 1-10 s, 10-100 s, >100 s]'], - 'PoolingCountDesc' : ['The current usefull connection count', '当前连接池中的数目'],// - 'PoolingPeakDesc' : ['The usefull connection peak count', '连接池中数目的峰值'], - 'PoolingPeakTimeDesc' : ['The usefull connection peak time', '连接池数目峰值出现的时间'], - 'ActiveCountDesc' : ['The current active connection count', '当前连接池中活跃连接数'], - 'ActivePeakDesc' : ['The current active connection peak count', '连接池中活跃连接数峰值'], - 'ActivePeakTimeDesc' : ['The active connection peak time', '活跃连接池峰值出现的时间'], - 'LogicConnectCountDesc' : ['Total connect times from datasource', '产生的逻辑连接建立总数'], - 'LogicCloseCountDesc' : ['Total close connect times from datasource', '产生的逻辑连接关闭总数'], - 'LogicConnectErrorCountDesc' : ['Total connect error times', '产生的逻辑连接出错总数'], - 'RecycleErrorCount' : ['Logic Connection Recycle Count', '逻辑连接回收重用次数'], - 'PhysicalConnectCountDesc' : ['Create physical connnection count', '产生的物理连接建立总数'], - 'PhysicalCloseCountDesc' : ['Close physical connnection count', '产生的物理关闭总数'], - 'DiscardCountDesc' : ['Discard connection count with validate fail', '校验连接失败丢弃连接次数'], - 'PhysicalConnectErrorCountDesc' : ['Total physical connect error times', '产生的物理连接失败总数'], - 'ExecuteCountDesc' : ['', ''], - 'ErrorCountDesc' : ['', ''], - 'CommitCountDesc' : ['', '事务提交次数'], - 'RollbackCountDesc' : ['', '事务回滚次数'], - 'PSCacheAccessCountDesc' : ['PerpareStatement access count', 'PSCache访问总数'], - 'PSCacheHitCountDesc' : ['PerpareStatement hit count', 'PSCache命中次数'], - 'PSCacheMissCountDesc' : ['PerpareStatement miss count', 'PSCache不命中次数'],// - 'PreparedStatementOpenCount' : ['Real PreparedStatement Open Count', '真实PreparedStatement打开次数'],// - 'PreparedStatementClosedCount' : ['Real PreparedStatement Closed Count', '真实PreparedStatement关闭次数'],// - 'ConnectionHoldTimeHistogramDesc' : ['The histogram values of connection hold time, [0-1 ms, 1-10 ms, 10-100 ms, 100ms-1s, 1-10 s, 10-100 s, 100-1000 s, >1000 s]', '连接持有时间分布，分布区间为[0-1 ms, 1-10 ms, 10-100 ms, 100ms-1s, 1-10 s, 10-100 s, 100-1000 s, >1000 s]'], - 'ClobOpenCountDesc' : ['', 'Clob打开数'], - 'BlobOpenCountDesc' : ['', 'Blob打开数'], - /**spring-detail*/ - 'Class' : ['Class', 'Class'], - 'Method' : ['Method', 'Method'], - 'ExecuteErrorCount' : ['ExecuteErrorCount', '执行出错数'], - 'ExecuteTimeMillis' : ['ExecuteTimeMillis', '执行时间'], - 'RunningCount' : ['RunningCount', '执行中'], - 'ConcurrentMax' : ['ConcurrentMax', '最大并发'], - 'JdbcExecuteCount' : ['JdbcExecuteCount', 'Jdbc执行数'], - 'JdbcExecuteErrorCount' : ['JdbcExecErrorCount', 'Jdbc出错数'], - 'JdbcExecuteTimeMillis' : ['JdbcExecTimeMillis', 'Jdbc时间'], - 'JdbcCommitCount' : ['CommitCount', '事务提交数'], - 'JdbcRollbackCount' : ['RollbackCount', '事务回滚数'], - 'JdbcFetchRowCount' : ['FetchRowCount', '读取行数'], - 'JdbcUpdateCount' : ['UpdateCount', '更新行数'], - 'JdbcPoolConnectionOpenCount' : ['JdbcPoolConnectionOpenCount', '连接池获取连接次数'], - 'JdbcPoolConnectionCloseCount' : ['JdbcPoolConnectionCloseCount', '连接池关闭连接次数'], - 'JdbcResultSetOpenCount' : ['JdbcResultSetOpenCount', 'ResultSet打开次数'], - 'JdbcResultSetCloseCount' : ['JdbcResultSetCloseCount', 'ResultSet关闭次数'], - /**sql-detail*/ - 'ParseView' : ['ParseView', '解析信息'],// - 'Tables' : [' Tables', '表'], - 'Fields' : ['Fields', '字段'], - 'Coditions' : ['Coditions', '条件'], - 'Relationships' : ['Relationships', '关联'], - 'OrderByColumns' : ['OrderByColumns', '排序字段'], - 'LastSlowView' : ['LastSlowView', '最后慢查询'], - 'MaxTimespan' : ['MaxTimespan', '最慢'], - 'MaxTimespanOccurTime' : ['MaxTimespanOccurTime', '最慢发生时间'], - 'LastSlowParameters' : ['LastSlowParameters', '最后慢查询参数'], - 'LastErrorView' : ['LastErrorView', '最后错误视图'], - 'LastErrorMessage' : ['LastErrorMessage', '最后错误信息'], - 'LastErrorClass' : ['LastErrorClass', '最后错误类'], - 'LastErrorTime' : ['LastErrorTime', '最后错误时间'], - 'LastErrorStackTrace' : ['LastErrorStackTrace', '最后错误堆栈'], - 'OtherView' : ['OtherView', '其他信息'], - 'BatchSizeMax' : ['BatchSizeMax', '批处理最大值'],//// - 'BatchSizeTotal' : ['BatchSizeTotal', '批处理总数'],// - 'ReaderOpenCount' : ['ReaderOpenCount', 'reader打开次数'],// - 'InputStreamOpenCount' : ['InputStreamOpenCount', 'inputstream打开次数'], - 'ReadStringLength' : ['ReadStringLength', '读取字符串长度'],// - 'ReadBytesLength' : ['ReadBytesLength', '读取字节长度'],// - - 'ExecHisto':['ExecHisto','执行时间分布'], - 'ExecRsHisto':['ExecRsHisto','执行+RS时分布'], - 'FetchRowHisto':['FetchRowHisto','读取行分布'], - 'UpdateHisto':['UpdateHisto','更新行分布'], - 'InTransactionCount' : ['Txn','事务执行'], - 'MaxTimespanDesc' : ['Execute Time Millis Max','最慢的执行耗时'], - 'InTransactionCountDesc' : ['Execute In Transaction Count','在事务中运行的次数'], - - 'count1ms':['count of 0-1 ms','0-1毫秒次数'], - 'count10ms':['count of 1-10 ms','1-10毫秒次数'], - 'count100ms':['count of 10-100 ms','10-100毫秒次数'], - 'count1s':['count of 100ms-1s','100-1000毫秒次数'], - 'count10s':['count of 1-10 s','1-10秒次数'], - 'count100s':['count of 10-100 s','10-100秒次数'], - 'count1000s':['count of 100-1000 s','100-1000秒次数'], - 'countBg1000s':['count of >1000 s','大于1000秒次数'], - - 'fetch0':['count of 0 FetchRow','读取行数为0'], - 'fetch9':['count of 1-9 FetchRow','读取行数1-9'], - 'fetch99':['count of 10-99 FetchRow','读取行数10-99'], - 'fetch999':['count of 100-999 FetchRow','读取行数100-999'], - 'fetch9999':['count of 1000-9999 FetchRow','读取行数1000-9999'], - 'fetch99999':['count of >9999 FetchRow','读取行数大于9999'], - - 'update0':['count of 0 UpdateCount','更新行数为0'], - 'update9':['count of 1-9 UpdateCount','更新行数1-9'], - 'update99':['count of 10-99 UpdateCount','更新行数10-99'], - 'update999':['count of 100-999 UpdateCount','更新行数100-999'], - 'update9999':['count of 1000-9999 UpdateCount','更新行数1000-9999'], - 'update99999':['count of >9999 UpdateCount','更新行数大于9999'], - /**wall*/ - 'CheckCount':['CheckCount', '检查次数'], - 'HardCheckCount':['HardCheckCount', '硬检查次数'], - 'ViolationCount':['ViolationCount', '非法次数'], - 'BlackListHitCount':['BlackListHitCount', '黑名单命中次数'], - 'BlackListSize':['BlackListSize', '黑名单长度'], - 'WhiteListHitCount':['WhiteListHitCount', '白名单命中次数'], - 'WhiteListSize':['WhiteListSize', '白名单长度'], - 'SyntaxErrrorCount':['SyntaxErrrorCount', '语法错误次数'], - 'TableName':['TableName', '表名'], - 'TableNumber':['Number','序号'], - - 'Sample':['Sample','样本'], - 'ExecuteCount':['ExecuteCount','执行数'], - 'FetchRowCount':['FetchRowCount','读取行数'], - 'SQLUpdateCount':['UpdateCount','更新行数'], - - 'SelectCount':['SelectCount', 'Select数'], - 'SelectIntoCount':['SelectIntoCount', 'SelectInto数'], - 'InsertCount':['InsertCount', 'Insert数'], - 'UpdateCount':['UpdateCount', 'Update数'], - 'DeleteCount':['DeleteCount', 'Delete数'], - 'TruncateCount':['TruncateCount', 'Truncate数'], - 'CreateCount':['CreateCount', 'Create数'], - 'AlterCount':['AlterCount', 'Alter数'], - 'DropCount':['DropCount', 'Drop数'], - 'ReplaceCount':['ReplaceCount', 'Replace数'], - 'DeleteDataCount':['DeleteDataCount', '删除数据行数'], - 'UpdateDataCount':['UpdateDataCount', '更新数据行数'], - 'FetchRowCount':['FetchRowCount', '读取行数'], - 'WallStat':['Wall Stat', '防御统计'], - 'TableStat':['Table Stat', '表访问统计'], - 'FunctionStat':['Function Stat', '函数调用统计'], - 'SQLStatWhiteList':['SQL Stat - White List', 'SQL防御统计 - 白名单'], - 'SQLStatBlackList':['SQL Stat - Black List', 'SQL防御统计 - 黑名单'], - /**session-detail*/ - 'PrincipalOnly':['Principal Only', 'Principal过滤'], - 'SESSIONID':['SESSIONID', 'SESSIONID'], - 'UserAgent':['UserAgent', 'UserAgent'], - 'Principal':['Principal', 'Principal'], - 'CreateTime':['CreateTime', '创建时间'], - 'LastAccessTime':['LastAccessTime', '最后访问时间'], - 'RemoteAddress':['RemoteAddress', '访问ip地址'], - 'RequestCount':['RequestCount', '请求次数'], - 'RequestTimeMillisTotal':['RequestTimeMillisTotal', '总共请求时间'], - 'RequestInterval':['RequestInterval', '请求间隔'], - /**weburi-detail*/ - 'RefreshPeriod':['Refresh Period', '刷新时间'], - 'SuspendRefresh':['Suspend Refresh', '暂停刷新'], - 'RequestTimeMillis':['RequestTimeMillisTotal', '请求时间（和）'], - 'RequestTimeMillisMax':['RequestTimeMillisMax', '请求最慢（单次）'], - 'RequestTimeMillisMaxOccurTime':['RequestTimeMillisMaxOccurTime', '请求最慢发生时间'], - 'JdbcExecutePeak':['JdbcExecutePeak', 'jdbc执行峰值'], - 'JdbcFetchRowPeak':['JdbcFetchRowPeak', 'jdbc查询取回行数峰值'], - 'JdbcUpdatePeak':['JdbcUpdatePeak', 'jdbc更新峰值'], - 'Histogram':['Histogram','区间分布'] - - }; - - var COOKIE_LANG_NAME = "cookie_lang"; - - function log(str) { - if (typeof (console) != 'undefined' && typeof(console.log) != 'undefined') { - console.log(str); - } else { - $('body').append('"); - } - } - - function setCookie(name,value,expires,path,domain,secure) - { - var expDays = expires*24*60*60*1000; - var expDate = new Date(); - expDate.setTime(expDate.getTime()+expDays); - var expString = ((expires==null) ? "": (";expires="+expDate.toGMTString())); - var pathString = ((path==null) ? "": (";path="+path)); - var domainString = ((domain==null) ? "": (";domain="+domain)); - var secureString = ((secure==true) ? ";secure": ""); - document.cookie = name + "="+ escape(value) + expString + pathString + domainString + secureString; - } + 'StatIndex': ['Stat Index', '统计索引'], + 'ViewJSONAPI': ['View JSON API', '查看JSON API'], + 'Version': ['Version', '版本'], + 'Drivers': ['Drivers', '驱动'], + 'ResetEnable': ['ResetEnable', '是否允许重置'], + 'ResetCount': ['ResetCount', '重置次数'], + 'JavaVersion': ['JavaVersion', 'Java版本'], + 'JavaVMName': ['JavaVMName', 'JVM名称'], + 'JavaClassPath': ['JavaClassPath', 'classpath路径'], + 'StartTime': ['StartTime', '启动时间'], - function getCookie(name) - { - var result = null; - var myCookie = document.cookie + ";"; - var searchName = name + "="; - var startOfCookie = myCookie.indexOf(searchName); - var endOfCookie; - if (startOfCookie != -1) - { - startOfCookie += searchName.length; - endOfCookie = myCookie.indexOf(";",startOfCookie); - result = unescape(myCookie.substring(startOfCookie,endOfCookie)); - } - return result; - } - - function setText($obj) { - var key = $obj.attr('langKey'); - if (typeof(lang[key]) != 'undefined') { - var text = lang[key][druid.lang.langNow]; - $obj.text(lang[key][druid.lang.langNow]); - } else { - log('key [' + key + '] not found'); - } - } - function setTitle($obj) { - var key = $obj.attr('langKey'); - if (typeof(lang[key]) != 'undefined') { - var title = lang[key][druid.lang.langNow]; - $obj.attr('title', title); - } else { - log('key [' + key + '] not found'); - } - } - - return { - langNow : LANG_CN, - EVENT_LOAD_FINISHED : 'loadFinished', - init : function(langNow) { - if (typeof(langNow) != 'undefined') { - this.setLangType(langNow); - } else { - var langInCookie = getCookie(COOKIE_LANG_NAME); - if (langInCookie == LANG_CN || langInCookie == LANG_EN) { - this.setLangType(langInCookie); - } - } - $(document).on(this.EVENT_LOAD_FINISHED, '.lang', function() { - log('load lang'); - setText($(this)); - }); - $(document).on(this.EVENT_LOAD_FINISHED, '.langTitle', function() { - log('load title'); - setTitle($(this)); - }); - this.trigger(); - - $(document).on('click','.langSelector',function() { - var langSelected = $(this).attr('langNow'); - druid.lang.setLangType(langSelected); - druid.lang.trigger(); - return false; - }); - }, - setLangType : function (langNow) { - this.langNow = langNow; - setCookie(COOKIE_LANG_NAME,langNow,30,'/'); - }, - getLangType : function () { - return this.langNow; - }, - show : function($parent) { - var $obj; - var $objTitle; - if ($parent) { - $obj = $parent.find('.lang'); - $objTitle = $parent.find('.langTitle'); - } else { - $obj = $('.lang'); - $objTitle = $('.langTitle'); - } - $obj.each(function() { - setText($(this)); - }); - $objTitle.each(function() { - setTitle($(this)); - }); - }, - trigger : function() { - log('to load lang now'); - $('.lang').trigger(this.EVENT_LOAD_FINISHED);//触发语言显示事件 - $('.langTitle').trigger(this.EVENT_LOAD_FINISHED);//触发语言显示事件 - } - } + 'DataSourceStatList': ['DataSourceStat List', '数据源列表'], + 'UserName': ['UserName', '用户名'], + 'URL': ['URL', '连接地址'], + 'DbType': ['DbType', '数据库类型'], + 'DriverClassName': ['DriverClassName', '驱动类名'], + 'FilterClassNames': ['FilterClassNames', 'filter类名'], + 'TestOnBorrow': ['TestOnBorrow', '获取连接时检测'], + 'TestWhileIdle': ['TestWhileIdle', '空闲时检测'], + 'TestOnReturn': ['TestOnReturn', '连接放回连接池时检测'], + 'InitialSize': ['InitialSize', '初始化连接大小'], + 'MinIdle': ['MinIdle', '最小空闲连接数'], + 'MaxActive': ['MaxActive', '最大连接数'], + 'QueryTimeout': ['QueryTimeout', '查询超时时间'], + 'TransactionQueryTimeout': ['TransactionQueryTimeout', '事务查询超时时间'],// + 'LoginTimeout': ['LoginTimeout', '登录超时时间'],// + 'ValidConnectionCheckerClassName': ['ValidConnectionCheckerClassName', '连接有效性检查类名'], + 'ExceptionSorterClassName': ['ExceptionSorterClassName', 'ExceptionSorter类名'],// + 'DefaultAutoCommit': ['DefaultAutoCommit', '默认autocommit设置'], + 'DefaultReadOnly': ['DefaultReadOnly', '默认只读设置'], + 'DefaultTransactionIsolation': ['DefaultTransactionIsolation', '默认事务隔离'],// + 'NotEmptyWaitCount': ['NotEmptyWaitCount', '累计总次数'],// + 'NotEmptyWaitMillis': ['NotEmptyWaitMillis', '等待总时长'],// + 'WaitThreadCount': ['WaitThreadCount', '等待线程数量'], + 'StartTransactionCount': ['StartTransactionCount', '事务启动数'],// + 'TransactionHistogram': ['TransactionHistogram', '事务时间分布'],// + 'PoolingCount': ['PoolingCount', '池中连接数'],// + 'PoolingPeak': ['PoolingPeak', '池中连接数峰值'],// + 'PoolingPeakTime': ['PoolingPeakTime', '池中连接数峰值时间'],//// + 'ActiveCount': ['ActiveCount', '活跃连接数'], + 'ActivePeak': ['ActivePeak', '活跃连接数峰值'],// + 'ActivePeakTime': ['ActivePeakTime', '活跃连接数峰值时间'], + 'LogicConnectCount': ['LogicConnectCount', '逻辑连接打开次数'], + 'LogicCloseCount': ['LogicCloseCount', '逻辑连接关闭次数'], + 'LogicConnectErrorCount': ['LogicConnectErrorCount', '逻辑连接错误次数'], + 'PhysicalConnectCount': ['PhysicalConnectCount', '物理连接打开次数'], + 'PhysicalCloseCount': ['PhysicalCloseCount', '物理关闭数量'], + 'PhysicalConnectErrorCount': ['PhysicalConnectErrorCount', '物理连接错误次数'], + 'DiscardCount': ['DiscardCount', '校验失败废弃连接数'], + 'ExecuteCount': ['ExecuteCount (Total)', '执行数(总共)'], + 'ErrorCount': ['ErrorCount', '错误数'], + 'CommitCount': ['CommitCount', '提交数'], + 'RollbackCount': ['RollbackCount', '回滚数'], + 'PSCacheAccessCount': ['PSCacheAccessCount', 'PSCache访问次数'], + 'PSCacheHitCount': ['PSCacheHitCount', 'PSCache命中次数'], + 'PSCacheMissCount': ['PSCacheMissCount', 'PSCache不命中次数'],// + 'ConnectionHoldTimeHistogram': ['ConnectionHoldTimeHistogram', '连接持有时间分布'], + 'ClobOpenCount': ['ClobOpenCount', 'Clob打开次数'], + 'BlobOpenCount': ['BlobOpenCount', 'Blob打开次数'], + 'KeepAliveCheckCount': ['KeepAliveCheckCount', 'KeepAlive检测次数'], + 'ActiveConnectionStackTrace': ['ActiveConnection StackTrace', '活跃连接堆栈查看'], + 'PollingConnectionInfo': ['PollingConnection Info', '连接池中连接信息'], + 'SQLList': ['SQL List', 'sql列表'], + + 'UserNameDesc': ['Specify the username used when creating a new connection.', '指定建立连接时使用的用户名'], + 'URLDesc': ['The JDBC driver connection URL', 'JDBC连接字符串'], + 'DbTypeDesc': ['database type', '数据库类型'], + 'DriverClassNameDesc': ['The fully qualifed name of the JDBC driver class', 'JDBC驱动的类名'], + 'FilterClassNamesDesc': ['All the fully qualifed name of the filter classes', 'filter的类名'], + 'TestOnBorrowDesc': [' Test or not when borrow a connection', '是否在获得连接后检测其可用性'], + 'TestWhileIdleDesc': ['Test or not when a connection is idle for a while', '是否在连接空闲一段时间后检测其可用性'], + 'TestOnReturnDesc': ['Test or not when return a connection', '是否在连接放回连接池后检测其可用性'], + 'InitialSizeDesc': ['The size of datasource connections to create when initial a datasource', '连接池建立时创建的初始化连接数'], + 'MinIdleDesc': ['The minimum number of connections a pool should hold. ', '连接池中最小的活跃连接数'], + 'MaxActiveDesc': ['The maximum number of connections for a pool', '连接池中最大的活跃连接数'], + 'QueryTimeoutDesc': ['', '查询超时时间'], + 'TransactionQueryTimeoutDesc': ['', '事务查询超时时间'], + 'LoginTimeoutDesc': ['', ''],/// + 'ValidConnectionCheckerClassNameDesc': ['', ''], + 'ExceptionSorterClassNameDesc': ['', ''], + 'DefaultAutoCommitDesc': ['', ''], + 'DefaultReadOnlyDesc': ['', ''], + 'DefaultTransactionIsolationDesc': ['', ''], + 'NotEmptyWaitCountDesc': ['Total times for wait to get a connection', '获取连接时累计等待多少次'],// + 'NotEmptyWaitMillisDesc': ['Total millis for wait to get a connection', '获取连接时累计等待多长时间'], + 'WaitThreadCountDesc': ['The current waiting thread count', '当前等待获取连接的线程数'], + 'StartTransactionCountDesc': ['The count of start transaction', '事务开始的个数'], + 'TransactionHistogramDesc': ['The histogram values of transaction time, [0-1 ms, 1-10 ms, 10-100 ms, 100-1 s, 1-10 s, 10-100 s, >100 s]', '事务运行时间分布，分布区间为[0-1 ms, 1-10 ms, 10-100 ms, 100-1 s, 1-10 s, 10-100 s, >100 s]'], + 'PoolingCountDesc': ['The current usefull connection count', '当前连接池中的数目'],// + 'PoolingPeakDesc': ['The usefull connection peak count', '连接池中数目的峰值'], + 'PoolingPeakTimeDesc': ['The usefull connection peak time', '连接池数目峰值出现的时间'], + 'ActiveCountDesc': ['The current active connection count', '当前连接池中活跃连接数'], + 'ActivePeakDesc': ['The current active connection peak count', '连接池中活跃连接数峰值'], + 'ActivePeakTimeDesc': ['The active connection peak time', '活跃连接池峰值出现的时间'], + 'LogicConnectCountDesc': ['Total connect times from datasource', '产生的逻辑连接建立总数'], + 'LogicCloseCountDesc': ['Total close connect times from datasource', '产生的逻辑连接关闭总数'], + 'LogicConnectErrorCountDesc': ['Total connect error times', '产生的逻辑连接出错总数'], + 'RecycleErrorCount': ['Logic Connection Recycle Count', '逻辑连接回收重用次数'], + 'PhysicalConnectCountDesc': ['Create physical connnection count', '产生的物理连接建立总数'], + 'PhysicalCloseCountDesc': ['Close physical connnection count', '产生的物理关闭总数'], + 'DiscardCountDesc': ['Discard connection count with validate fail', '校验连接失败丢弃连接次数'], + 'PhysicalConnectErrorCountDesc': ['Total physical connect error times', '产生的物理连接失败总数'], + 'ExecuteCountDesc': ['', ''], + 'ErrorCountDesc': ['', ''], + 'CommitCountDesc': ['', '事务提交次数'], + 'RollbackCountDesc': ['', '事务回滚次数'], + 'PSCacheAccessCountDesc': ['PerpareStatement access count', 'PSCache访问总数'], + 'PSCacheHitCountDesc': ['PerpareStatement hit count', 'PSCache命中次数'], + 'PSCacheMissCountDesc': ['PerpareStatement miss count', 'PSCache不命中次数'],// + 'PreparedStatementOpenCount': ['Real PreparedStatement Open Count', '真实PreparedStatement打开次数'],// + 'PreparedStatementClosedCount': ['Real PreparedStatement Closed Count', '真实PreparedStatement关闭次数'],// + 'ConnectionHoldTimeHistogramDesc': ['The histogram values of connection hold time, [0-1 ms, 1-10 ms, 10-100 ms, 100ms-1s, 1-10 s, 10-100 s, 100-1000 s, >1000 s]', '连接持有时间分布，分布区间为[0-1 ms, 1-10 ms, 10-100 ms, 100ms-1s, 1-10 s, 10-100 s, 100-1000 s, >1000 s]'], + 'ClobOpenCountDesc': ['', 'Clob打开数'], + 'BlobOpenCountDesc': ['', 'Blob打开数'], + /**spring-detail*/ + 'Class': ['Class', 'Class'], + 'Method': ['Method', 'Method'], + 'ExecuteErrorCount': ['ExecuteErrorCount', '执行出错数'], + 'ExecuteTimeMillis': ['ExecuteTimeMillis', '执行时间'], + 'RunningCount': ['RunningCount', '执行中'], + 'ConcurrentMax': ['ConcurrentMax', '最大并发'], + 'JdbcExecuteCount': ['JdbcExecuteCount', 'Jdbc执行数'], + 'JdbcExecuteErrorCount': ['JdbcExecErrorCount', 'Jdbc出错数'], + 'JdbcExecuteTimeMillis': ['JdbcExecTimeMillis', 'Jdbc时间'], + 'JdbcCommitCount': ['CommitCount', '事务提交数'], + 'JdbcRollbackCount': ['RollbackCount', '事务回滚数'], + 'JdbcFetchRowCount': ['FetchRowCount', '读取行数'], + 'JdbcUpdateCount': ['UpdateCount', '更新行数'], + 'JdbcPoolConnectionOpenCount': ['JdbcPoolConnectionOpenCount', '连接池获取连接次数'], + 'JdbcPoolConnectionCloseCount': ['JdbcPoolConnectionCloseCount', '连接池关闭连接次数'], + 'JdbcResultSetOpenCount': ['JdbcResultSetOpenCount', 'ResultSet打开次数'], + 'JdbcResultSetCloseCount': ['JdbcResultSetCloseCount', 'ResultSet关闭次数'], + /**sql-detail*/ + 'ParseView': ['ParseView', '解析信息'],// + 'Tables': [' Tables', '表'], + 'Fields': ['Fields', '字段'], + 'Coditions': ['Coditions', '条件'], + 'Relationships': ['Relationships', '关联'], + 'OrderByColumns': ['OrderByColumns', '排序字段'], + 'LastSlowView': ['LastSlowView', '最后慢查询'], + 'MaxTimespan': ['MaxTimespan', '最慢'], + 'MaxTimespanOccurTime': ['MaxTimespanOccurTime', '最慢发生时间'], + 'LastSlowParameters': ['LastSlowParameters', '最后慢查询参数'], + 'LastErrorView': ['LastErrorView', '最后错误视图'], + 'LastErrorMessage': ['LastErrorMessage', '最后错误信息'], + 'LastErrorClass': ['LastErrorClass', '最后错误类'], + 'LastErrorTime': ['LastErrorTime', '最后错误时间'], + 'LastErrorStackTrace': ['LastErrorStackTrace', '最后错误堆栈'], + 'OtherView': ['OtherView', '其他信息'], + 'BatchSizeMax': ['BatchSizeMax', '批处理最大值'],//// + 'BatchSizeTotal': ['BatchSizeTotal', '批处理总数'],// + 'ReaderOpenCount': ['ReaderOpenCount', 'reader打开次数'],// + 'InputStreamOpenCount': ['InputStreamOpenCount', 'inputstream打开次数'], + 'ReadStringLength': ['ReadStringLength', '读取字符串长度'],// + 'ReadBytesLength': ['ReadBytesLength', '读取字节长度'],// + + 'ExecHisto': ['ExecHisto', '执行时间分布'], + 'ExecRsHisto': ['ExecRsHisto', '执行+RS时分布'], + 'FetchRowHisto': ['FetchRowHisto', '读取行分布'], + 'UpdateHisto': ['UpdateHisto', '更新行分布'], + 'InTransactionCount': ['Txn', '事务执行'], + 'MaxTimespanDesc': ['Execute Time Millis Max', '最慢的执行耗时'], + 'InTransactionCountDesc': ['Execute In Transaction Count', '在事务中运行的次数'], + + 'count1ms': ['count of 0-1 ms', '0-1毫秒次数'], + 'count10ms': ['count of 1-10 ms', '1-10毫秒次数'], + 'count100ms': ['count of 10-100 ms', '10-100毫秒次数'], + 'count1s': ['count of 100ms-1s', '100-1000毫秒次数'], + 'count10s': ['count of 1-10 s', '1-10秒次数'], + 'count100s': ['count of 10-100 s', '10-100秒次数'], + 'count1000s': ['count of 100-1000 s', '100-1000秒次数'], + 'countBg1000s': ['count of >1000 s', '大于1000秒次数'], + + 'fetch0': ['count of 0 FetchRow', '读取行数为0'], + 'fetch9': ['count of 1-9 FetchRow', '读取行数1-9'], + 'fetch99': ['count of 10-99 FetchRow', '读取行数10-99'], + 'fetch999': ['count of 100-999 FetchRow', '读取行数100-999'], + 'fetch9999': ['count of 1000-9999 FetchRow', '读取行数1000-9999'], + 'fetch99999': ['count of >9999 FetchRow', '读取行数大于9999'], + + 'update0': ['count of 0 UpdateCount', '更新行数为0'], + 'update9': ['count of 1-9 UpdateCount', '更新行数1-9'], + 'update99': ['count of 10-99 UpdateCount', '更新行数10-99'], + 'update999': ['count of 100-999 UpdateCount', '更新行数100-999'], + 'update9999': ['count of 1000-9999 UpdateCount', '更新行数1000-9999'], + 'update99999': ['count of >9999 UpdateCount', '更新行数大于9999'], + /**wall*/ + 'CheckCount': ['CheckCount', '检查次数'], + 'HardCheckCount': ['HardCheckCount', '硬检查次数'], + 'ViolationCount': ['ViolationCount', '非法次数'], + 'BlackListHitCount': ['BlackListHitCount', '黑名单命中次数'], + 'BlackListSize': ['BlackListSize', '黑名单长度'], + 'WhiteListHitCount': ['WhiteListHitCount', '白名单命中次数'], + 'WhiteListSize': ['WhiteListSize', '白名单长度'], + 'SyntaxErrrorCount': ['SyntaxErrrorCount', '语法错误次数'], + 'TableName': ['TableName', '表名'], + 'TableNumber': ['Number', '序号'], + + 'Sample': ['Sample', '样本'], + 'ExecuteCount': ['ExecuteCount', '执行数'], + 'FetchRowCount': ['FetchRowCount', '读取行数'], + 'SQLUpdateCount': ['UpdateCount', '更新行数'], + + 'SelectCount': ['SelectCount', 'Select数'], + 'SelectIntoCount': ['SelectIntoCount', 'SelectInto数'], + 'InsertCount': ['InsertCount', 'Insert数'], + 'UpdateCount': ['UpdateCount', 'Update数'], + 'DeleteCount': ['DeleteCount', 'Delete数'], + 'TruncateCount': ['TruncateCount', 'Truncate数'], + 'CreateCount': ['CreateCount', 'Create数'], + 'AlterCount': ['AlterCount', 'Alter数'], + 'DropCount': ['DropCount', 'Drop数'], + 'ReplaceCount': ['ReplaceCount', 'Replace数'], + 'DeleteDataCount': ['DeleteDataCount', '删除数据行数'], + 'UpdateDataCount': ['UpdateDataCount', '更新数据行数'], + 'FetchRowCount': ['FetchRowCount', '读取行数'], + 'WallStat': ['Wall Stat', '防御统计'], + 'TableStat': ['Table Stat', '表访问统计'], + 'FunctionStat': ['Function Stat', '函数调用统计'], + 'SQLStatWhiteList': ['SQL Stat - White List', 'SQL防御统计 - 白名单'], + 'SQLStatBlackList': ['SQL Stat - Black List', 'SQL防御统计 - 黑名单'], + /**session-detail*/ + 'PrincipalOnly': ['Principal Only', 'Principal过滤'], + 'SESSIONID': ['SESSIONID', 'SESSIONID'], + 'UserAgent': ['UserAgent', 'UserAgent'], + 'Principal': ['Principal', 'Principal'], + 'CreateTime': ['CreateTime', '创建时间'], + 'LastAccessTime': ['LastAccessTime', '最后访问时间'], + 'RemoteAddress': ['RemoteAddress', '访问ip地址'], + 'RequestCount': ['RequestCount', '请求次数'], + 'RequestTimeMillisTotal': ['RequestTimeMillisTotal', '总共请求时间'], + 'RequestInterval': ['RequestInterval', '请求间隔'], + /**weburi-detail*/ + 'RefreshPeriod': ['Refresh Period', '刷新时间'], + 'SuspendRefresh': ['Suspend Refresh', '暂停刷新'], + 'RequestTimeMillis': ['RequestTimeMillisTotal', '请求时间（和）'], + 'RequestTimeMillisMax': ['RequestTimeMillisMax', '请求最慢（单次）'], + 'RequestTimeMillisMaxOccurTime': ['RequestTimeMillisMaxOccurTime', '请求最慢发生时间'], + 'JdbcExecutePeak': ['JdbcExecutePeak', 'jdbc执行峰值'], + 'JdbcFetchRowPeak': ['JdbcFetchRowPeak', 'jdbc查询取回行数峰值'], + 'JdbcUpdatePeak': ['JdbcUpdatePeak', 'jdbc更新峰值'], + 'Histogram': ['Histogram', '区间分布'] + + }; + + var COOKIE_LANG_NAME = "cookie_lang"; + + function log(str) { + if (typeof (console) != 'undefined' && typeof (console.log) != 'undefined') { + console.log(str); + } else { + $('body').append('"); + } + } + + function setCookie(name, value, expires, path, domain, secure) { + var expDays = expires * 24 * 60 * 60 * 1000; + var expDate = new Date(); + expDate.setTime(expDate.getTime() + expDays); + var expString = ((expires == null) ? "" : (";expires=" + expDate.toGMTString())); + var pathString = ((path == null) ? "" : (";path=" + path)); + var domainString = ((domain == null) ? "" : (";domain=" + domain)); + var secureString = ((secure == true) ? ";secure" : ""); + document.cookie = name + "=" + escape(value) + expString + pathString + domainString + secureString; + } + + function getCookie(name) { + var result = null; + var myCookie = document.cookie + ";"; + var searchName = name + "="; + var startOfCookie = myCookie.indexOf(searchName); + var endOfCookie; + if (startOfCookie != -1) { + startOfCookie += searchName.length; + endOfCookie = myCookie.indexOf(";", startOfCookie); + result = unescape(myCookie.substring(startOfCookie, endOfCookie)); + } + return result; + } + + function setText($obj) { + var key = $obj.attr('langKey'); + if (typeof (lang[key]) != 'undefined') { + var text = lang[key][druid.lang.langNow]; + $obj.text(lang[key][druid.lang.langNow]); + } else { + log('key [' + key + '] not found'); + } + } + + function setTitle($obj) { + var key = $obj.attr('langKey'); + if (typeof (lang[key]) != 'undefined') { + var title = lang[key][druid.lang.langNow]; + $obj.attr('title', title); + } else { + log('key [' + key + '] not found'); + } + } + + return { + langNow: LANG_CN, + EVENT_LOAD_FINISHED: 'loadFinished', + init: function (langNow) { + if (typeof (langNow) != 'undefined') { + this.setLangType(langNow); + } else { + var langInCookie = getCookie(COOKIE_LANG_NAME); + if (langInCookie == LANG_CN || langInCookie == LANG_EN) { + this.setLangType(langInCookie); + } + } + $(document).on(this.EVENT_LOAD_FINISHED, '.lang', function () { + log('load lang'); + setText($(this)); + }); + $(document).on(this.EVENT_LOAD_FINISHED, '.langTitle', function () { + log('load title'); + setTitle($(this)); + }); + this.trigger(); + + $(document).on('click', '.langSelector', function () { + var langSelected = $(this).attr('langNow'); + druid.lang.setLangType(langSelected); + druid.lang.trigger(); + return false; + }); + }, + setLangType: function (langNow) { + this.langNow = langNow; + setCookie(COOKIE_LANG_NAME, langNow, 30, '/'); + }, + getLangType: function () { + return this.langNow; + }, + show: function ($parent) { + var $obj; + var $objTitle; + if ($parent) { + $obj = $parent.find('.lang'); + $objTitle = $parent.find('.langTitle'); + } else { + $obj = $('.lang'); + $objTitle = $('.langTitle'); + } + $obj.each(function () { + setText($(this)); + }); + $objTitle.each(function () { + setTitle($(this)); + }); + }, + trigger: function () { + log('to load lang now'); + $('.lang').trigger(this.EVENT_LOAD_FINISHED);//触发语言显示事件 + $('.langTitle').trigger(this.EVENT_LOAD_FINISHED);//触发语言显示事件 + } + } }(); diff --git a/src/main/resources/support/http/resources/login.html b/src/main/resources/support/http/resources/login.html index d4d0f614b6..8edb72f4df 100644 --- a/src/main/resources/support/http/resources/login.html +++ b/src/main/resources/support/http/resources/login.html @@ -1,112 +1,115 @@ - + druid monitor - + -
-
-
- -
-
-
- + $(document).ready(function () { + $("#loginBtn").click(druid.login.login); + $("input[name=loginUsername]").keypress(druid.login.unamecr); + $("input[name=loginPassword]").keypress(druid.login.upasscr); + }); + \ No newline at end of file diff --git a/src/main/resources/support/http/resources/nopermit.html b/src/main/resources/support/http/resources/nopermit.html index 0522edef6f..d3f245415e 100644 --- a/src/main/resources/support/http/resources/nopermit.html +++ b/src/main/resources/support/http/resources/nopermit.html @@ -1,14 +1,14 @@ - + - + - - -
-
-

Sorry, you are not permitted to view this page.

-
- + + +
+
+

Sorry, you are not permitted to view this page.

+
+ diff --git a/src/main/resources/support/http/resources/spring-detail.html b/src/main/resources/support/http/resources/spring-detail.html index d64cebf255..405d69f21e 100644 --- a/src/main/resources/support/http/resources/spring-detail.html +++ b/src/main/resources/support/http/resources/spring-detail.html @@ -1,153 +1,153 @@ - - Druid Spring Stat - - - - - - - - - -
-
-
-

- Spring View - View JSON API -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Class
Method
ExecuteCount
ExecuteErrorCount
ExecuteTimeMillis
RunningCount
ConcurrentMax
JdbcExecuteCount
JdbcExecuteErrorCount
JdbcExecuteTimeMillis
JdbcCommitCount
JdbcRollbackCount
JdbcFetchRowCount
JdbcUpdateCount
JdbcPoolConnectionOpenCount
JdbcPoolConnectionCloseCount
JdbcResultSetOpenCount
JdbcResultSetCloseCount
-
- Close -
-
-
-
- + + + + - $(document).ready(function() { - druid.springdetail.init(); - }); - - +
+
+
+

+ Spring View + View JSON API +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Class
Method
ExecuteCount
ExecuteErrorCount
ExecuteTimeMillis
RunningCount
ConcurrentMax
JdbcExecuteCount
JdbcExecuteErrorCount
JdbcExecuteTimeMillis
JdbcCommitCount
JdbcRollbackCount
JdbcFetchRowCount
JdbcUpdateCount
JdbcPoolConnectionOpenCount
JdbcPoolConnectionCloseCount
JdbcResultSetOpenCount
JdbcResultSetCloseCount
+
+ Close +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/support/http/resources/spring.html b/src/main/resources/support/http/resources/spring.html index e190569107..d522d3a24e 100644 --- a/src/main/resources/support/http/resources/spring.html +++ b/src/main/resources/support/http/resources/spring.html @@ -1,110 +1,123 @@ - - Druid Spring Stat - - - - - - - - - -
-
-
-

- Spring Stat - View JSON API -

- - - - - - - - - - - - - - - - - - - - -
NClassMethodExecuteCountExecuteTimeMillisRunningCountConcurrentMaxJdbcExecuteCountJdbcExecuteTimeMillisJdbcCommitCountJdbcRollbackCountJdbcFetchRowCountJdbcUpdateCountHistogram
[ - - - - - - - - - - - - - - - - ] -
-
-
-
- - + + Druid Spring Stat + + + + + + + + + +
+
+
+

+ Spring Stat + View JSON API +

+ + + + + + + + + + + + + + + + + + + + +
NClassMethodExecuteCount + ExecuteTimeMillisRunningCount + ConcurrentMax + JdbcExecuteCount + JdbcExecuteTimeMillisJdbcCommitCount + JdbcRollbackCountJdbcFetchRowCountJdbcUpdateCount + Histogram
[ + - + - + - + - + - + - + - + - ] +
+
+
+
+ + diff --git a/src/main/resources/support/http/resources/sql-detail.html b/src/main/resources/support/http/resources/sql-detail.html index 5f35f98b23..d43d37cfca 100644 --- a/src/main/resources/support/http/resources/sql-detail.html +++ b/src/main/resources/support/http/resources/sql-detail.html @@ -1,187 +1,194 @@ - - Druid SQL Stat - - - - - - - - - -
-
-
-

- FULL SQL - View JSON API -

-
-

Format View:

- -
-
-

ParseView:

- - - - - - - - - - - - - - - - - - - - -
Tables
Fields
Coditions
Relationships
OrderByColumns
-

LastSlowView:

- - - - - - - - - - - - -
MaxTimespan
MaxTimespanOccurTime
LastSlowParameters
-

LastErrorView:

- - - - - - - - - - - - - - - - -
LastErrorMessage
LastErrorClass
LastErrorTime
LastErrorStackTrace
-

OtherView:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
BatchSizeMax
BatchSizeTotal
BlobOpenCount
ClobOpenCount
ReaderOpenCount
InputStreamOpenCount
ReadStringLength
ReadBytesLength
-
- Close -
-
-
-
- - + $(document).ready(function () { + druid.sqlDetail.init(); + }); + + diff --git a/src/main/resources/support/http/resources/sql.html b/src/main/resources/support/http/resources/sql.html index b847ff96f6..9ddde2665a 100644 --- a/src/main/resources/support/http/resources/sql.html +++ b/src/main/resources/support/http/resources/sql.html @@ -1,185 +1,214 @@ - - Druid SQL Stat - - - - - - - - - - -
-
-
-

- SQL Stat - View JSON API - - - + - Suspend Refresh + Suspend Refresh -

- - - - - - - - - - - - - - - - - - - - - -
NSQLExecCountExecTimeExecMaxTxnErrorUpdateFetchRowRunningConcurrentExecHisto
[ - - - - - - - - - - - - - - - - ] - 		ExecRsHisto
[ - - - - - - - - - - - - - - - - ] - 		FetchRowHisto
[ - - - - - - - - - - - - ] - 		UpdateHisto
[ - - - - - - - - - - - - ] -
-
-
-
- - + + + + + + + + + + + + + + + + + + + + + + +
NSQLExecCountExecTimeExecMaxTxnErrorUpdateFetchRowRunningConcurrentExecHisto
[ + - + - + - + - + - + - + - + - ] + 		ExecRsHisto
[ + - + - + - + - + - + - + - + - ] + 		FetchRowHisto
[ + - + - + - + - + - + - ] + 		UpdateHisto
[ + - + - + - + - + - + - ] +
+
+ + + + diff --git a/src/main/resources/support/http/resources/wall.html b/src/main/resources/support/http/resources/wall.html index 7b663e78c7..95936a70dc 100644 --- a/src/main/resources/support/http/resources/wall.html +++ b/src/main/resources/support/http/resources/wall.html @@ -1,388 +1,426 @@ -Druid DataSourceStat - - - - - - - + Druid DataSourceStat + + + + + + + -
-
-
-

- Wall Stat View JSON API -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- CheckCount
- HardCheckCount
- ViolationCount
- BlackListHitCount
- BlackListSize
- WhiteListHitCount
- WhiteListSize
- SyntaxErrrorCount
+
+
+
+

+ Wall Stat View JSON API +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ CheckCount +
+ HardCheckCount +
+ ViolationCount +
+ BlackListHitCount +
+ BlackListSize +
+ WhiteListHitCount +
+ WhiteListSize +
+ SyntaxErrrorCount +
-

Table Stat

- - - - - - - - - - - - - - - - - - - - - - - - -
TableNumberTableNameSelectCountSelectCountInsertCountUpdateCountDeleteCountTruncateCountCreateCountAlterCountDropCountReplaceCountDeleteDataCountDeleteDataHisto
[ - - - - - - - - - - - - ] - 		UpdateDataCountUpdateDataHisto
[ - - - - - - - - - - - - ] - 		FetchRowCountFetchRowHisto
[ - - - - - - - - - - - - ] -
+

Table Stat

+ + + + + + + + + + + + + + + + + + + + + + + + +
TableNumberTableNameSelectCountSelectCountInsertCountUpdateCountDeleteCountTruncateCountCreateCountAlterCountDropCountReplaceCountDeleteDataCountDeleteDataHisto
[ + - + - + - + - + - + - ] + 		UpdateDataCountUpdateDataHisto
[ + - + - + - + - + - + - ] + 		FetchRowCountFetchRowHisto
[ + - + - + - + - + - + - ] +
-

Function Stat

- - - - - - - - -
Function NameInvokeCount
+

Function Stat

+ + + + + + + + +
Function NameInvokeCount
-

SQL Stat - White List

- - - - - - - - - - - - - -
TableNumberSQLSampleExecuteCountExecuteErrorCountFetchRowCountUpdateCount
- -

SQL Stat - Black List

- - - - - - - - - - - - - -
TableNumberSQLSampleviolationMessageExecuteCountFetchRowCountUpdateCount
-
-
-
- + if (black.sample === undefined) { + html += ""; + } else { + html += '' + + black.sample + ""; + } + + if (black.violationMessage === undefined) { + html += ""; + } else { + html += "" + black.violationMessage + ""; + } + + if (black.executeCount === undefined) { + html += ""; + } else { + html += "" + black.executeCount + ""; + } + + if (black.fetchRowCount === undefined) { + html += ""; + } else { + html += "" + black.fetchRowCount + ""; + } + + if (black.updateCount === undefined) { + html += ""; + } else { + html += "" + black.updateCount + ""; + } + } + $("#dataTable4 tbody").html(html); + } + } + } + }(); + + $(document).ready(function () { + druid.wall.init(); + }); + diff --git a/src/main/resources/support/http/resources/webapp.html b/src/main/resources/support/http/resources/webapp.html index 79fb120d28..16e95a0b5b 100644 --- a/src/main/resources/support/http/resources/webapp.html +++ b/src/main/resources/support/http/resources/webapp.html @@ -1,92 +1,92 @@ - - Druid WebApp Stat - - - - - - - - - - - -
-
-
-

- WebAppStat List - View JSON API -

-
-
-
- - + + + + + + - var tmpl = $('#webapp-template').html(); - var contents = {'content' : datasourceList}; - var doTtmpl = doT.template(tmpl); - var contentHtml = doTtmpl(contents); - - $(".span12 h3").after(contentHtml); - - $('#datasourceTab a').click(function (e) { - e.preventDefault(); - $(this).tab('show'); - }); - druid.lang.trigger(); - }, - dataType: "json" - }); - } - - - } - }(); - - $(document).ready(function() { - druid.datasource.init(); - }); - - +
+
+
+

+ WebAppStat List + View JSON API +

+
+
+
+ + + diff --git a/src/main/resources/support/http/resources/websession-detail.html b/src/main/resources/support/http/resources/websession-detail.html index 13f5afafc1..ac5e5fb637 100644 --- a/src/main/resources/support/http/resources/websession-detail.html +++ b/src/main/resources/support/http/resources/websession-detail.html @@ -1,175 +1,175 @@ - - Druid Web Session Stat - - - - - - - - -
-
-
-

- Web Session View - View JSON API -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SESSIONID
UserAgent
Principal
CreateTime
LastAccessTime
RemoteAddress
RequestCount
RequestTimeMillisTotal
RequestInterval
RunningCount
ConcurrentMax
JdbcExecuteCount
JdbcExecuteTimeMillis
JdbcCommitCount
JdbcRollbackCount
JdbcFetchRowCount
JdbcUpdateCount
-
- Close -
-
-
-
- + + + + - $(document).ready(function() { - druid.websessiondetail.init(); - }); +
+
+
+

+ Web Session View + View JSON API +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SESSIONID
UserAgent
Principal
CreateTime
LastAccessTime
RemoteAddress
RequestCount
RequestTimeMillisTotal
RequestInterval
RunningCount
ConcurrentMax
JdbcExecuteCount
JdbcExecuteTimeMillis
JdbcCommitCount
JdbcRollbackCount
JdbcFetchRowCount
JdbcUpdateCount
+
+ Close +
+
+
+
+ - + ajaxRequestForBasicInfo: function () { + $.ajax({ + type: 'POST', + url: 'websession-' + sessionId + '.json', + success: function (data) { + if (data.Content == null) + return; + $("#SESSIONID").text(data.Content.SESSIONID) + if (data.Content.Principal) { + $("#Principal").text(data.Content.Principal) + } + + $("#CreateTime").text(data.Content.CreateTime) + $("#LastAccessTime").text(data.Content.LastAccessTime) + $("#UserAgent").text(data.Content.UserAgent) + $("#RemoteAddress").text(data.Content.RemoteAddress) + $("#RequestCount").text(data.Content.RequestCount) + $("#RequestTimeMillisTotal").text(data.Content.RequestTimeMillisTotal) + $("#RunningCount").text(data.Content.RunningCount) + $("#ConcurrentMax").text(data.Content.ConcurrentMax) + $("#JdbcExecuteCount").text(data.Content.JdbcExecuteCount) + $("#JdbcExecuteTimeMillis").text(data.Content.JdbcExecuteTimeMillis) + $("#JdbcCommitCount").text(data.Content.JdbcCommitCount) + $("#JdbcRollbackCount").text(data.Content.JdbcRollbackCount) + $("#JdbcFetchRowCount").text(data.Content.JdbcFetchRowCount) + $("#JdbcUpdateCount").text(data.Content.JdbcUpdateCount) + var html = '['; + html += '' + data.Content.RequestInterval[0] + ''; + html += ', ' + data.Content.RequestInterval[1] + ''; + html += ', ' + data.Content.RequestInterval[2] + ''; + html += ', ' + data.Content.RequestInterval[3] + ''; + html += ', ' + data.Content.RequestInterval[4] + ''; + html += ', ' + data.Content.RequestInterval[5] + ''; + html += ', ' + data.Content.RequestInterval[6] + ''; + html += ', ' + data.Content.RequestInterval[7] + ''; + html += ', ' + data.Content.RequestInterval[8] + ''; + html += ']'; + $("#RequestInterval").html(html); + }, + dataType: "json" + }); + } + } + }(); + + $(document).ready(function () { + druid.websessiondetail.init(); + }); + + + diff --git a/src/main/resources/support/http/resources/websession.html b/src/main/resources/support/http/resources/websession.html index ff1c848884..87da3c107e 100644 --- a/src/main/resources/support/http/resources/websession.html +++ b/src/main/resources/support/http/resources/websession.html @@ -1,159 +1,164 @@ - - Druid Web Session Stat - - - - - - - - - -
-
-
-

- Web Session Stat - View JSON API - + + Druid Web Session Stat + + + + + + + + + +
+
+
+

+ Web Session Stat + View JSON API + - - + - Suspend Refresh + Suspend Refresh -

- - - - - - - - - - - - - - - - - - - - - - -
NSESSIONIDPrincipalCreateTimeLastAccessTimeRemoteAddressRequestCountRequestTimeMillisTotalRunningCountConcurrentMaxJdbcExecuteCountJdbcExecuteTimeMillisJdbcCommitCountJdbcRollbackCountJdbcFetchRowCountJdbcUpdateCount
-
-
-
- - + $(document).ready(function () { + druid.websession.init(); + }); + + diff --git a/src/main/resources/support/http/resources/weburi-detail.html b/src/main/resources/support/http/resources/weburi-detail.html index 33d5e859ca..4609946994 100644 --- a/src/main/resources/support/http/resources/weburi-detail.html +++ b/src/main/resources/support/http/resources/weburi-detail.html @@ -1,226 +1,226 @@ - - Druid Web URI Stat - - - - - - - - - -
-
-
-

- Web URI View - View JSON API -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
URI
RequestCount
RequestTimeMillis
LastAccessTime
RunningCount
ConcurrentMax
JdbcExecuteCount
JdbcExecuteErrorCount
JdbcExecutePeak
JdbcExecuteTimeMillis
JdbcCommitCount
JdbcRollbackCount
JdbcFetchRowCount
JdbcFetchRowPeak
JdbcUpdateCount
JdbcUpdatePeak
JdbcPoolConnectionOpenCount
JdbcPoolConnectionCloseCount
JdbcResultSetOpenCount
JdbcResultSetCloseCount
- -

Profiles

- - - - - - - - - - - - -
NNameParentNameTypeExecuteCountExecuteTimeMillis
-
- Close -
-
-
-
- + + + + - $(document).ready(function() { - druid.weburidetail.init(); - }); - - +
+
+
+

+ Web URI View + View JSON API +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
URI
RequestCount
RequestTimeMillis
LastAccessTime
RunningCount
ConcurrentMax
JdbcExecuteCount
JdbcExecuteErrorCount
JdbcExecutePeak
JdbcExecuteTimeMillis
JdbcCommitCount
JdbcRollbackCount
JdbcFetchRowCount
JdbcFetchRowPeak
JdbcUpdateCount
JdbcUpdatePeak
JdbcPoolConnectionOpenCount
JdbcPoolConnectionCloseCount
JdbcResultSetOpenCount
JdbcResultSetCloseCount
+ +

Profiles

+ + + + + + + + + + + + +
NNameParentNameTypeExecuteCountExecuteTimeMillis
+
+ Close +
+
+
+
+ + diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html index b9491d5127..e97a051387 100644 --- a/src/main/resources/support/http/resources/weburi.html +++ b/src/main/resources/support/http/resources/weburi.html @@ -1,152 +1,161 @@ - - Druid Web URI Stat - - - - - - - - - -
-
-
-

- Web URI Stat - View JSON API - - - + - Suspend Refresh + Suspend Refresh -

- - - - - - - - - - - - - - - - - - - - - - -
NURIRequestCountRequestTimeMillisRequestTimeMillisMaxRunningCountConcurrentMaxJdbcExecuteCountJdbcExecuteErrorCountJdbcExecuteTimeMillisJdbcCommitCountJdbcRollbackCountJdbcFetchRowCountJdbcUpdateCountHistogram
[ - - - - - - - - - - - - - - - - ] -
-
-
-
- - + $(document).ready(function () { + druid.weburi.init(); + }); + + diff --git a/src/main/resources/support/monitor/mysql/basic.sql b/src/main/resources/support/monitor/mysql/basic.sql index e46305914a..a2e523a0e7 100644 --- a/src/main/resources/support/monitor/mysql/basic.sql +++ b/src/main/resources/support/monitor/mysql/basic.sql @@ -1,42 +1,49 @@ -create table druid_domain ( - id bigint(20) AUTO_INCREMENT NOT NULL, - domain varchar(45) NOT NULL, - PRIMARY KEY (id), - UNIQUE INDEX (domain) +create table druid_domain +( + id bigint(20) AUTO_INCREMENT NOT NULL, + domain varchar(45) NOT NULL, + PRIMARY KEY (id), + UNIQUE INDEX (domain) ); -insert into druid_domain (domain) values ('default'); +insert into druid_domain (domain) +values ('default'); -create table druid_app ( - id bigint(20) AUTO_INCREMENT NOT NULL, - domain varchar(45) NOT NULL, - app varchar(45) NOT NULL, - PRIMARY KEY (id), - UNIQUE (domain, app) +create table druid_app +( + id bigint(20) AUTO_INCREMENT NOT NULL, + domain varchar(45) NOT NULL, + app varchar(45) NOT NULL, + PRIMARY KEY (id), + UNIQUE (domain, app) ); -insert into druid_app (domain, app) values ('default', 'default'); +insert into druid_app (domain, app) +values ('default', 'default'); -create table druid_cluster ( - id bigint(20) AUTO_INCREMENT NOT NULL, - domain varchar(45) NOT NULL, - app varchar(45) NOT NULL, - cluster varchar(45) NOT NULL, - PRIMARY KEY (id), - UNIQUE (domain, app, cluster) +create table druid_cluster +( + id bigint(20) AUTO_INCREMENT NOT NULL, + domain varchar(45) NOT NULL, + app varchar(45) NOT NULL, + cluster varchar(45) NOT NULL, + PRIMARY KEY (id), + UNIQUE (domain, app, cluster) ); -insert into druid_cluster (domain, app, cluster) values ('default', 'default', 'default'); +insert into druid_cluster (domain, app, cluster) +values ('default', 'default', 'default'); -create table druid_inst ( - id bigint(20) AUTO_INCREMENT NOT NULL, - app varchar(45) NOT NULL, - domain varchar(45) NOT NULL, - cluster varchar(45) NOT NULL, - host varchar(128) NOT NULL, - ip varchar(32) NOT NULL, - lastActiveTime datetime NOT NULL, - lastPID bigint(20) NOT NULL, - PRIMARY KEY (id), - UNIQUE (domain, app, cluster, host) +create table druid_inst +( + id bigint(20) AUTO_INCREMENT NOT NULL, + app varchar(45) NOT NULL, + domain varchar(45) NOT NULL, + cluster varchar(45) NOT NULL, + host varchar(128) NOT NULL, + ip varchar(32) NOT NULL, + lastActiveTime datetime NOT NULL, + lastPID bigint(20) NOT NULL, + PRIMARY KEY (id), + UNIQUE (domain, app, cluster, host) ); \ No newline at end of file diff --git a/src/main/resources/support/monitor/mysql/const.sql b/src/main/resources/support/monitor/mysql/const.sql index b19467a61f..e93619910b 100644 --- a/src/main/resources/support/monitor/mysql/const.sql +++ b/src/main/resources/support/monitor/mysql/const.sql @@ -1,10 +1,11 @@ -CREATE TABLE druid_const ( - id bigint(20) AUTO_INCREMENT NOT NULL, - domain varchar(45) NOT NULL, - app varchar(45) NOT NULL, - type varchar(45) NOT NULL, - hash bigint(20) NOT NULL, - value text, - PRIMARY KEY (id), - UNIQUE (domain, app, type, hash) +CREATE TABLE druid_const +( + id bigint(20) AUTO_INCREMENT NOT NULL, + domain varchar(45) NOT NULL, + app varchar(45) NOT NULL, + type varchar(45) NOT NULL, + hash bigint(20) NOT NULL, + value text, + PRIMARY KEY (id), + UNIQUE (domain, app, type, hash) ) \ No newline at end of file diff --git a/src/main/resources/support/monitor/mysql/datasource.sql b/src/main/resources/support/monitor/mysql/datasource.sql index 1891094ce7..9a5bad24cd 100644 --- a/src/main/resources/support/monitor/mysql/datasource.sql +++ b/src/main/resources/support/monitor/mysql/datasource.sql @@ -1,47 +1,48 @@ -CREATE TABLE druid_datasource ( - id bigint(20) AUTO_INCREMENT NOT NULL, - domain varchar(45) NOT NULL, - app varchar(45) NOT NULL, - cluster varchar(45) NOT NULL, - host varchar(128), - pid int(10) NOT NULL, - collectTime datetime NOT NULL, - name varchar(256), - dbType varchar(256), - driverClassName varchar(256), - activeCount int(10), - activePeak int(10), - activePeakTime bigint(20), - poolingCount int(10), - poolingPeak int(10), - poolingPeakTime bigint(20), - connectCount bigint(20), - closeCount bigint(20), - waitThreadCount bigint(20), - notEmptyWaitCount bigint(20), - notEmptyWaitNanos bigint(20), - logicConnectErrorCount bigint(20), - physicalConnectCount bigint(20), - physicalCloseCount bigint(20), - physicalConnectErrorCount bigint(20), - executeCount bigint(20), - errorCount bigint(20), - commitCount bigint(20), - rollbackCount bigint(20), - pstmtCacheHitCount bigint(20), - pstmtCacheMissCount bigint(20), - startTransactionCount bigint(20), - txn_0_1 bigint(20), - txn_1_10 bigint(20), - txn_10_100 bigint(20), - txn_100_1000 bigint(20), - txn_1000_10000 bigint(20), - txn_10000_100000 bigint(20), - txn_more bigint(20), - clobOpenCount bigint(20), - blobOpenCount bigint(20), - sqlSkipCount bigint(20), - PRIMARY KEY (id) +CREATE TABLE druid_datasource +( + id bigint(20) AUTO_INCREMENT NOT NULL, + domain varchar(45) NOT NULL, + app varchar(45) NOT NULL, + cluster varchar(45) NOT NULL, + host varchar(128), + pid int(10) NOT NULL, + collectTime datetime NOT NULL, + name varchar(256), + dbType varchar(256), + driverClassName varchar(256), + activeCount int(10), + activePeak int(10), + activePeakTime bigint(20), + poolingCount int(10), + poolingPeak int(10), + poolingPeakTime bigint(20), + connectCount bigint(20), + closeCount bigint(20), + waitThreadCount bigint(20), + notEmptyWaitCount bigint(20), + notEmptyWaitNanos bigint(20), + logicConnectErrorCount bigint(20), + physicalConnectCount bigint(20), + physicalCloseCount bigint(20), + physicalConnectErrorCount bigint(20), + executeCount bigint(20), + errorCount bigint(20), + commitCount bigint(20), + rollbackCount bigint(20), + pstmtCacheHitCount bigint(20), + pstmtCacheMissCount bigint(20), + startTransactionCount bigint(20), + txn_0_1 bigint(20), + txn_1_10 bigint(20), + txn_10_100 bigint(20), + txn_100_1000 bigint(20), + txn_1000_10000 bigint(20), + txn_10000_100000 bigint(20), + txn_more bigint(20), + clobOpenCount bigint(20), + blobOpenCount bigint(20), + sqlSkipCount bigint(20), + PRIMARY KEY (id) ); CREATE INDEX druid_datasource_index ON druid_datasource (collectTime, domain, app); \ No newline at end of file diff --git a/src/main/resources/support/monitor/mysql/springmethod.sql b/src/main/resources/support/monitor/mysql/springmethod.sql index efe5ebc748..40383ffa7a 100644 --- a/src/main/resources/support/monitor/mysql/springmethod.sql +++ b/src/main/resources/support/monitor/mysql/springmethod.sql @@ -1,42 +1,43 @@ -CREATE TABLE druid_springmethod ( - id bigint(20) AUTO_INCREMENT NOT NULL, - domain varchar(45) NOT NULL, - app varchar(45) NOT NULL, - cluster varchar(45) NOT NULL, - host varchar(128), - pid int(10) NOT NULL, - collectTime datetime NOT NULL, - className varchar(256), - signature varchar(256), - runningCount int(10), - concurrentMax int(10), - executeCount bigint(20), - executeErrorCount bigint(20), - executeTimeNano bigint(20), - jdbcFetchRowCount bigint(20), - jdbcUpdateCount bigint(20), - jdbcExecuteCount bigint(20), - jdbcExecuteErrorCount bigint(20), - jdbcExecuteTimeNano bigint(20), - jdbcCommitCount bigint(20), - jdbcRollbackCount bigint(20), - jdbcPoolConnectionOpenCount bigint(20), - jdbcPoolConnectionCloseCount bigint(20), - jdbcResultSetOpenCount bigint(20), - jdbcResultSetCloseCount bigint(20), - lastErrorClass varchar(256), - lastErrorMessage varchar(256), - lastErrorStackTrace varchar(256), - lastErrorTimeMillis bigint(20), - h1 bigint(20), - h10 bigint(20), - h100 bigint(20), - h1000 bigint(20), - h10000 int(10), - h100000 int(10), - h1000000 int(10), - hmore int(10), - PRIMARY KEY (id) +CREATE TABLE druid_springmethod +( + id bigint(20) AUTO_INCREMENT NOT NULL, + domain varchar(45) NOT NULL, + app varchar(45) NOT NULL, + cluster varchar(45) NOT NULL, + host varchar(128), + pid int(10) NOT NULL, + collectTime datetime NOT NULL, + className varchar(256), + signature varchar(256), + runningCount int(10), + concurrentMax int(10), + executeCount bigint(20), + executeErrorCount bigint(20), + executeTimeNano bigint(20), + jdbcFetchRowCount bigint(20), + jdbcUpdateCount bigint(20), + jdbcExecuteCount bigint(20), + jdbcExecuteErrorCount bigint(20), + jdbcExecuteTimeNano bigint(20), + jdbcCommitCount bigint(20), + jdbcRollbackCount bigint(20), + jdbcPoolConnectionOpenCount bigint(20), + jdbcPoolConnectionCloseCount bigint(20), + jdbcResultSetOpenCount bigint(20), + jdbcResultSetCloseCount bigint(20), + lastErrorClass varchar(256), + lastErrorMessage varchar(256), + lastErrorStackTrace varchar(256), + lastErrorTimeMillis bigint(20), + h1 bigint(20), + h10 bigint(20), + h100 bigint(20), + h1000 bigint(20), + h10000 int(10), + h100000 int(10), + h1000000 int(10), + hmore int(10), + PRIMARY KEY (id) ); CREATE INDEX druid_springmethod_index ON druid_springmethod (collectTime, domain, app); \ No newline at end of file diff --git a/src/main/resources/support/monitor/mysql/sql.sql b/src/main/resources/support/monitor/mysql/sql.sql index 2448d42f25..851e5de0c0 100644 --- a/src/main/resources/support/monitor/mysql/sql.sql +++ b/src/main/resources/support/monitor/mysql/sql.sql @@ -1,73 +1,74 @@ -CREATE TABLE druid_sql ( - id bigint(20) AUTO_INCREMENT NOT NULL, - domain varchar(45) NOT NULL, - app varchar(45) NOT NULL, - cluster varchar(45) NOT NULL, - host varchar(128), - pid int(10) NOT NULL, - collectTime datetime NOT NULL, - sqlHash bigint(20), - dataSource varchar(256), - lastStartTime bigint(20), - batchTotal bigint(20), - batchToMax int(10), - execSuccessCount bigint(20), - execNanoTotal bigint(20), - execNanoMax bigint(20), - running int(10), - concurrentMax int(10), - rsHoldTime bigint(20), - execRsHoldTime bigint(20), - name varchar(256), - file varchar(256), - dbType varchar(256), - execNanoMaxOccurTime bigint(20), - errorCount bigint(20), - errorLastMsg varchar(256), - errorLastClass varchar(256), - errorLastStackTrace varchar(256), - errorLastTime bigint(20), - updateCount bigint(20), - updateCountMax bigint(20), - fetchRowCount bigint(20), - fetchRowCountMax bigint(20), - inTxnCount bigint(20), - lastSlowParameters varchar(256), - clobOpenCount bigint(20), - blobOpenCount bigint(20), - readStringLength bigint(20), - readBytesLength bigint(20), - inputStreamOpenCount bigint(20), - readerOpenCount bigint(20), - h1 bigint(20), - h10 bigint(20), - h100 int(10), - h1000 int(10), - h10000 int(10), - h100000 int(10), - h1000000 int(10), - hmore int(10), - eh1 bigint(20), - eh10 bigint(20), - eh100 int(10), - eh1000 int(10), - eh10000 int(10), - eh100000 int(10), - eh1000000 int(10), - ehmore int(10), - f1 bigint(20), - f10 bigint(20), - f100 bigint(20), - f1000 int(10), - f10000 int(10), - fmore int(10), - u1 bigint(20), - u10 bigint(20), - u100 bigint(20), - u1000 int(10), - u10000 int(10), - umore int(10), - PRIMARY KEY (id) +CREATE TABLE druid_sql +( + id bigint(20) AUTO_INCREMENT NOT NULL, + domain varchar(45) NOT NULL, + app varchar(45) NOT NULL, + cluster varchar(45) NOT NULL, + host varchar(128), + pid int(10) NOT NULL, + collectTime datetime NOT NULL, + sqlHash bigint(20), + dataSource varchar(256), + lastStartTime bigint(20), + batchTotal bigint(20), + batchToMax int(10), + execSuccessCount bigint(20), + execNanoTotal bigint(20), + execNanoMax bigint(20), + running int(10), + concurrentMax int(10), + rsHoldTime bigint(20), + execRsHoldTime bigint(20), + name varchar(256), + file varchar(256), + dbType varchar(256), + execNanoMaxOccurTime bigint(20), + errorCount bigint(20), + errorLastMsg varchar(256), + errorLastClass varchar(256), + errorLastStackTrace varchar(256), + errorLastTime bigint(20), + updateCount bigint(20), + updateCountMax bigint(20), + fetchRowCount bigint(20), + fetchRowCountMax bigint(20), + inTxnCount bigint(20), + lastSlowParameters varchar(256), + clobOpenCount bigint(20), + blobOpenCount bigint(20), + readStringLength bigint(20), + readBytesLength bigint(20), + inputStreamOpenCount bigint(20), + readerOpenCount bigint(20), + h1 bigint(20), + h10 bigint(20), + h100 int(10), + h1000 int(10), + h10000 int(10), + h100000 int(10), + h1000000 int(10), + hmore int(10), + eh1 bigint(20), + eh10 bigint(20), + eh100 int(10), + eh1000 int(10), + eh10000 int(10), + eh100000 int(10), + eh1000000 int(10), + ehmore int(10), + f1 bigint(20), + f10 bigint(20), + f100 bigint(20), + f1000 int(10), + f10000 int(10), + fmore int(10), + u1 bigint(20), + u10 bigint(20), + u100 bigint(20), + u1000 int(10), + u10000 int(10), + umore int(10), + PRIMARY KEY (id) ); CREATE INDEX druid_sql_index ON druid_sql (collectTime, domain, app); \ No newline at end of file diff --git a/src/main/resources/support/monitor/mysql/wall.sql b/src/main/resources/support/monitor/mysql/wall.sql index bdc61d84b3..1c6fe5dc53 100644 --- a/src/main/resources/support/monitor/mysql/wall.sql +++ b/src/main/resources/support/monitor/mysql/wall.sql @@ -1,79 +1,84 @@ -CREATE TABLE druid_wall( - id bigint(20) NOT NULL AUTO_INCREMENT, - domain varchar(45) NOT NULL, - app varchar(45) NOT NULL, - cluster varchar(45) NOT NULL, - host varchar(128), - pid int(10) NOT NULL, - collectTime datetime NOT NULL, - name varchar(256), - checkCount bigint(20), - hardCheckCount bigint(20), - violationCount bigint(20), - whiteListHitCount bigint(20), - blackListHitCount bigint(20), - syntaxErrorCount bigint(20), - violationEffectRowCount bigint(20), - PRIMARY KEY(id) +CREATE TABLE druid_wall +( + id bigint(20) NOT NULL AUTO_INCREMENT, + domain varchar(45) NOT NULL, + app varchar(45) NOT NULL, + cluster varchar(45) NOT NULL, + host varchar(128), + pid int(10) NOT NULL, + collectTime datetime NOT NULL, + name varchar(256), + checkCount bigint(20), + hardCheckCount bigint(20), + violationCount bigint(20), + whiteListHitCount bigint(20), + blackListHitCount bigint(20), + syntaxErrorCount bigint(20), + violationEffectRowCount bigint(20), + PRIMARY KEY (id) ); CREATE INDEX druid_wall_index ON druid_wall (collectTime, domain, app); -CREATE TABLE druid_wall_sql( - id bigint(20) NOT NULL AUTO_INCREMENT, - domain varchar(45) NOT NULL, - app varchar(45) NOT NULL, - cluster varchar(45) NOT NULL, - host varchar(128), pid int(10) NOT NULL, - collectTime datetime NOT NULL, - sqlHash bigint(20), - sqlSHash bigint(20), - sqlSampleHash bigint(20), - executeCount bigint(20), - fetchRowCount bigint(20), - updateCount bigint(20), - syntaxError int(1), - violationMessage varchar(256), - PRIMARY KEY(id) +CREATE TABLE druid_wall_sql +( + id bigint(20) NOT NULL AUTO_INCREMENT, + domain varchar(45) NOT NULL, + app varchar(45) NOT NULL, + cluster varchar(45) NOT NULL, + host varchar(128), + pid int(10) NOT NULL, + collectTime datetime NOT NULL, + sqlHash bigint(20), + sqlSHash bigint(20), + sqlSampleHash bigint(20), + executeCount bigint(20), + fetchRowCount bigint(20), + updateCount bigint(20), + syntaxError int(1), + violationMessage varchar(256), + PRIMARY KEY (id) ); CREATE INDEX druid_wall_sql_index ON druid_wall_sql (collectTime, domain, app); -CREATE TABLE druid_wall_table( - id bigint(20) NOT NULL AUTO_INCREMENT, - domain varchar(45) NOT NULL, - app varchar(45) NOT NULL, - cluster varchar(45) NOT NULL, - host varchar(128), - pid int(10) NOT NULL, - collectTime datetime NOT NULL, - name varchar(256), - selectCount bigint(20), - selectIntoCount bigint(20), - insertCount bigint(20), - updateCount bigint(20), - deleteCount bigint(20), - truncateCount bigint(20), - createCount bigint(20), - alterCount bigint(20), - dropCount bigint(20), - replaceCount bigint(20), - deleteDataCount bigint(20), - updateDataCount bigint(20), - insertDataCount bigint(20), - fetchRowCount bigint(20), - PRIMARY KEY(id) +CREATE TABLE druid_wall_table +( + id bigint(20) NOT NULL AUTO_INCREMENT, + domain varchar(45) NOT NULL, + app varchar(45) NOT NULL, + cluster varchar(45) NOT NULL, + host varchar(128), + pid int(10) NOT NULL, + collectTime datetime NOT NULL, + name varchar(256), + selectCount bigint(20), + selectIntoCount bigint(20), + insertCount bigint(20), + updateCount bigint(20), + deleteCount bigint(20), + truncateCount bigint(20), + createCount bigint(20), + alterCount bigint(20), + dropCount bigint(20), + replaceCount bigint(20), + deleteDataCount bigint(20), + updateDataCount bigint(20), + insertDataCount bigint(20), + fetchRowCount bigint(20), + PRIMARY KEY (id) ); CREATE INDEX druid_wall_table_index ON druid_wall_table (collectTime, domain, app); -CREATE TABLE druid_wall_function( - id bigint(20) NOT NULL AUTO_INCREMENT, - domain varchar(45) NOT NULL, - app varchar(45) NOT NULL, - cluster varchar(45) NOT NULL, - host varchar(128), - pid int(10) NOT NULL, - collectTime datetime NOT NULL, - name varchar(256), - invokeCount bigint(20), - PRIMARY KEY(id) +CREATE TABLE druid_wall_function +( + id bigint(20) NOT NULL AUTO_INCREMENT, + domain varchar(45) NOT NULL, + app varchar(45) NOT NULL, + cluster varchar(45) NOT NULL, + host varchar(128), + pid int(10) NOT NULL, + collectTime datetime NOT NULL, + name varchar(256), + invokeCount bigint(20), + PRIMARY KEY (id) ); CREATE INDEX druid_wall_function_index ON druid_wall_function (collectTime, domain, app); \ No newline at end of file diff --git a/src/main/resources/support/monitor/mysql/webapp.sql b/src/main/resources/support/monitor/mysql/webapp.sql index 513909bee9..f93f3a8c14 100644 --- a/src/main/resources/support/monitor/mysql/webapp.sql +++ b/src/main/resources/support/monitor/mysql/webapp.sql @@ -1,75 +1,76 @@ -CREATE TABLE druid_webapp ( - id bigint(20) AUTO_INCREMENT NOT NULL, - domain varchar(45) NOT NULL, - app varchar(45) NOT NULL, - cluster varchar(45) NOT NULL, - host varchar(128), - pid int(10) NOT NULL, - collectTime datetime NOT NULL, - contextPath varchar(256), - runningCount int(10), - concurrentMax int(10), - requestCount bigint(20), - sessionCount bigint(20), - jdbcFetchRowCount bigint(20), - jdbcUpdateCount bigint(20), - jdbcExecuteCount bigint(20), - jdbcExecuteTimeNano bigint(20), - jdbcCommitCount bigint(20), - jdbcRollbackCount bigint(20), - osMacOSXCount bigint(20), - osWindowsCount bigint(20), - osLinuxCount bigint(20), - osSymbianCount bigint(20), - osFreeBSDCount bigint(20), - osOpenBSDCount bigint(20), - osAndroidCount bigint(20), - osWindows98Count bigint(20), - osWindowsXPCount bigint(20), - osWindows2000Count bigint(20), - osWindowsVistaCount bigint(20), - osWindows7Count bigint(20), - osWindows8Count bigint(20), - osAndroid15Count bigint(20), - osAndroid16Count bigint(20), - osAndroid20Count bigint(20), - osAndroid21Count bigint(20), - osAndroid22Count bigint(20), - osAndroid23Count bigint(20), - osAndroid30Count bigint(20), - osAndroid31Count bigint(20), - osAndroid32Count bigint(20), - osAndroid40Count bigint(20), - osAndroid41Count bigint(20), - osAndroid42Count bigint(20), - osAndroid43Count bigint(20), - osLinuxUbuntuCount bigint(20), - browserIECount bigint(20), - browserFirefoxCount bigint(20), - browserChromeCount bigint(20), - browserSafariCount bigint(20), - browserOperaCount bigint(20), - browserIE5Count bigint(20), - browserIE6Count bigint(20), - browserIE7Count bigint(20), - browserIE8Count bigint(20), - browserIE9Count bigint(20), - browserIE10Count bigint(20), - browser360SECount bigint(20), - deviceAndroidCount bigint(20), - deviceIpadCount bigint(20), - deviceIphoneCount bigint(20), - deviceWindowsPhoneCount bigint(20), - botCount bigint(20), - botBaiduCount bigint(20), - botYoudaoCount bigint(20), - botGoogleCount bigint(20), - botMsnCount bigint(20), - botBingCount bigint(20), - botSosoCount bigint(20), - botSogouCount bigint(20), - botYahooCount bigint(20), - PRIMARY KEY (id) +CREATE TABLE druid_webapp +( + id bigint(20) AUTO_INCREMENT NOT NULL, + domain varchar(45) NOT NULL, + app varchar(45) NOT NULL, + cluster varchar(45) NOT NULL, + host varchar(128), + pid int(10) NOT NULL, + collectTime datetime NOT NULL, + contextPath varchar(256), + runningCount int(10), + concurrentMax int(10), + requestCount bigint(20), + sessionCount bigint(20), + jdbcFetchRowCount bigint(20), + jdbcUpdateCount bigint(20), + jdbcExecuteCount bigint(20), + jdbcExecuteTimeNano bigint(20), + jdbcCommitCount bigint(20), + jdbcRollbackCount bigint(20), + osMacOSXCount bigint(20), + osWindowsCount bigint(20), + osLinuxCount bigint(20), + osSymbianCount bigint(20), + osFreeBSDCount bigint(20), + osOpenBSDCount bigint(20), + osAndroidCount bigint(20), + osWindows98Count bigint(20), + osWindowsXPCount bigint(20), + osWindows2000Count bigint(20), + osWindowsVistaCount bigint(20), + osWindows7Count bigint(20), + osWindows8Count bigint(20), + osAndroid15Count bigint(20), + osAndroid16Count bigint(20), + osAndroid20Count bigint(20), + osAndroid21Count bigint(20), + osAndroid22Count bigint(20), + osAndroid23Count bigint(20), + osAndroid30Count bigint(20), + osAndroid31Count bigint(20), + osAndroid32Count bigint(20), + osAndroid40Count bigint(20), + osAndroid41Count bigint(20), + osAndroid42Count bigint(20), + osAndroid43Count bigint(20), + osLinuxUbuntuCount bigint(20), + browserIECount bigint(20), + browserFirefoxCount bigint(20), + browserChromeCount bigint(20), + browserSafariCount bigint(20), + browserOperaCount bigint(20), + browserIE5Count bigint(20), + browserIE6Count bigint(20), + browserIE7Count bigint(20), + browserIE8Count bigint(20), + browserIE9Count bigint(20), + browserIE10Count bigint(20), + browser360SECount bigint(20), + deviceAndroidCount bigint(20), + deviceIpadCount bigint(20), + deviceIphoneCount bigint(20), + deviceWindowsPhoneCount bigint(20), + botCount bigint(20), + botBaiduCount bigint(20), + botYoudaoCount bigint(20), + botGoogleCount bigint(20), + botMsnCount bigint(20), + botBingCount bigint(20), + botSosoCount bigint(20), + botSogouCount bigint(20), + botYahooCount bigint(20), + PRIMARY KEY (id) ); CREATE INDEX druid_webapp_index ON druid_webapp (collectTime, domain, app); \ No newline at end of file diff --git a/src/main/resources/support/monitor/mysql/weburi.sql b/src/main/resources/support/monitor/mysql/weburi.sql index 8715a9ba53..25cab65b62 100644 --- a/src/main/resources/support/monitor/mysql/weburi.sql +++ b/src/main/resources/support/monitor/mysql/weburi.sql @@ -1,41 +1,42 @@ -CREATE TABLE druid_weburi ( - id bigint(20) AUTO_INCREMENT NOT NULL, - domain varchar(45) NOT NULL, - app varchar(45) NOT NULL, - cluster varchar(45) NOT NULL, - host varchar(128), - pid int(10) NOT NULL, - collectTime datetime NOT NULL, - uri varchar(256), - runningCount int(10), - concurrentMax int(10), - requestCount bigint(20), - requestTimeNano bigint(20), - jdbcFetchRowCount bigint(20), - jdbcFetchRowPeak bigint(20), - jdbcUpdateCount bigint(20), - jdbcUpdatePeak bigint(20), - jdbcExecuteCount bigint(20), - jdbcExecuteErrorCount bigint(20), - jdbcExecutePeak bigint(20), - jdbcExecuteTimeNano bigint(20), - jdbcCommitCount bigint(20), - jdbcRollbackCount bigint(20), - jdbcPoolConnectionOpenCount bigint(20), - jdbcPoolConnectionCloseCount bigint(20), - jdbcResultSetOpenCount bigint(20), - jdbcResultSetCloseCount bigint(20), - errorCount bigint(20), - lastAccessTime datetime, - h1 bigint(20), - h10 bigint(20), - h100 bigint(20), - h1000 bigint(20), - h10000 int(10), - h100000 int(10), - h1000000 int(10), - hmore int(10), - PRIMARY KEY (id) +CREATE TABLE druid_weburi +( + id bigint(20) AUTO_INCREMENT NOT NULL, + domain varchar(45) NOT NULL, + app varchar(45) NOT NULL, + cluster varchar(45) NOT NULL, + host varchar(128), + pid int(10) NOT NULL, + collectTime datetime NOT NULL, + uri varchar(256), + runningCount int(10), + concurrentMax int(10), + requestCount bigint(20), + requestTimeNano bigint(20), + jdbcFetchRowCount bigint(20), + jdbcFetchRowPeak bigint(20), + jdbcUpdateCount bigint(20), + jdbcUpdatePeak bigint(20), + jdbcExecuteCount bigint(20), + jdbcExecuteErrorCount bigint(20), + jdbcExecutePeak bigint(20), + jdbcExecuteTimeNano bigint(20), + jdbcCommitCount bigint(20), + jdbcRollbackCount bigint(20), + jdbcPoolConnectionOpenCount bigint(20), + jdbcPoolConnectionCloseCount bigint(20), + jdbcResultSetOpenCount bigint(20), + jdbcResultSetCloseCount bigint(20), + errorCount bigint(20), + lastAccessTime datetime, + h1 bigint(20), + h10 bigint(20), + h100 bigint(20), + h1000 bigint(20), + h10000 int(10), + h100000 int(10), + h1000000 int(10), + hmore int(10), + PRIMARY KEY (id) ); CREATE INDEX druid_weburi_index ON druid_weburi (collectTime, domain, app); \ No newline at end of file diff --git a/src/main/resources/support/monitor/resources/index.html b/src/main/resources/support/monitor/resources/index.html index 059104f37a..2af0be8d94 100644 --- a/src/main/resources/support/monitor/resources/index.html +++ b/src/main/resources/support/monitor/resources/index.html @@ -1,10 +1,10 @@ -Druid-Monitor - - - + Druid-Monitor + + + diff --git a/src/main/resources/tpcds/create_tables.sql b/src/main/resources/tpcds/create_tables.sql index 6e765f5a43..af09745fea 100644 --- a/src/main/resources/tpcds/create_tables.sql +++ b/src/main/resources/tpcds/create_tables.sql @@ -1,100 +1,103 @@ drop table if exists call_center_text; create table call_center_text ( - cc_call_center_sk int, - cc_call_center_id string, - cc_rec_start_date string, - cc_rec_end_date string, - cc_closed_date_sk int, - cc_open_date_sk int, - cc_name string, - cc_class string, - cc_employees int, - cc_sq_ft int, - cc_hours string, - cc_manager string, - cc_mkt_id int, - cc_mkt_class string, - cc_mkt_desc string, - cc_market_manager string, - cc_division int, - cc_division_name string, - cc_company int, - cc_company_name string, - cc_street_number string, - cc_street_name string, - cc_street_type string, - cc_suite_number string, - cc_city string, - cc_county string, - cc_state string, - cc_zip string, - cc_country string, - cc_gmt_offset double, - cc_tax_percentage double + cc_call_center_sk int, + cc_call_center_id string, + cc_rec_start_date string, + cc_rec_end_date string, + cc_closed_date_sk int, + cc_open_date_sk int, + cc_name string, + cc_class string, + cc_employees int, + cc_sq_ft int, + cc_hours string, + cc_manager string, + cc_mkt_id int, + cc_mkt_class string, + cc_mkt_desc string, + cc_market_manager string, + cc_division int, + cc_division_name string, + cc_company int, + cc_company_name string, + cc_street_number string, + cc_street_name string, + cc_street_type string, + cc_suite_number string, + cc_city string, + cc_county string, + cc_state string, + cc_zip string, + cc_country string, + cc_gmt_offset double, + cc_tax_percentage double ) ; drop table if exists call_center; create table call_center -as (select * from call_center_text) +as (select * + from call_center_text) ; drop table if exists call_center_text; drop table if exists catalog_page_text; create table catalog_page_text ( - cp_catalog_page_sk int, - cp_catalog_page_id string, - cp_start_date_sk int, - cp_end_date_sk int, - cp_department string, - cp_catalog_number int, - cp_catalog_page_number int, - cp_description string, - cp_type string + cp_catalog_page_sk int, + cp_catalog_page_id string, + cp_start_date_sk int, + cp_end_date_sk int, + cp_department string, + cp_catalog_number int, + cp_catalog_page_number int, + cp_description string, + cp_type string ) ; drop table if exists catalog_page; create table catalog_page -as (select * from catalog_page_text) +as (select * + from catalog_page_text) ; drop table if exists catalog_page_text; drop table if exists catalog_returns_text; create table catalog_returns_text ( - cr_returned_date_sk int, - cr_returned_time_sk int, - cr_item_sk int, - cr_refunded_customer_sk int, - cr_refunded_cdemo_sk int, - cr_refunded_hdemo_sk int, - cr_refunded_addr_sk int, - cr_returning_customer_sk int, - cr_returning_cdemo_sk int, - cr_returning_hdemo_sk int, - cr_returning_addr_sk int, - cr_call_center_sk int, - cr_catalog_page_sk int, - cr_ship_mode_sk int, - cr_warehouse_sk int, - cr_reason_sk int, - cr_order_number int, - cr_return_quantity int, - cr_return_amount double, - cr_return_tax double, - cr_return_amt_inc_tax double, - cr_fee double, - cr_return_ship_cost double, - cr_refunded_cash double, - cr_reversed_charge double, - cr_store_credit double, - cr_net_loss double + cr_returned_date_sk int, + cr_returned_time_sk int, + cr_item_sk int, + cr_refunded_customer_sk int, + cr_refunded_cdemo_sk int, + cr_refunded_hdemo_sk int, + cr_refunded_addr_sk int, + cr_returning_customer_sk int, + cr_returning_cdemo_sk int, + cr_returning_hdemo_sk int, + cr_returning_addr_sk int, + cr_call_center_sk int, + cr_catalog_page_sk int, + cr_ship_mode_sk int, + cr_warehouse_sk int, + cr_reason_sk int, + cr_order_number int, + cr_return_quantity int, + cr_return_amount double, + cr_return_tax double, + cr_return_amt_inc_tax double, + cr_fee double, + cr_return_ship_cost double, + cr_refunded_cash double, + cr_reversed_charge double, + cr_store_credit double, + cr_net_loss double ) ; drop table if exists catalog_returns; create table catalog_returns -as (select * from catalog_returns_text) +as (select * + from catalog_returns_text) ; drop table if exists catalog_returns_text; @@ -102,74 +105,76 @@ drop table if exists catalog_returns_text; drop table if exists catalog_sales_text; create table catalog_sales_text ( - cs_sold_date_sk int, - cs_sold_time_sk int, - cs_ship_date_sk int, - cs_bill_customer_sk int, - cs_bill_cdemo_sk int, - cs_bill_hdemo_sk int, - cs_bill_addr_sk int, - cs_ship_customer_sk int, - cs_ship_cdemo_sk int, - cs_ship_hdemo_sk int, - cs_ship_addr_sk int, - cs_call_center_sk int, - cs_catalog_page_sk int, - cs_ship_mode_sk int, - cs_warehouse_sk int, - cs_item_sk int, - cs_promo_sk int, - cs_order_number int, - cs_quantity int, - cs_wholesale_cost double, - cs_list_price double, - cs_sales_price double, - cs_ext_discount_amt double, - cs_ext_sales_price double, - cs_ext_wholesale_cost double, - cs_ext_list_price double, - cs_ext_tax double, - cs_coupon_amt double, - cs_ext_ship_cost double, - cs_net_paid double, - cs_net_paid_inc_tax double, - cs_net_paid_inc_ship double, - cs_net_paid_inc_ship_tax double, - cs_net_profit double + cs_sold_date_sk int, + cs_sold_time_sk int, + cs_ship_date_sk int, + cs_bill_customer_sk int, + cs_bill_cdemo_sk int, + cs_bill_hdemo_sk int, + cs_bill_addr_sk int, + cs_ship_customer_sk int, + cs_ship_cdemo_sk int, + cs_ship_hdemo_sk int, + cs_ship_addr_sk int, + cs_call_center_sk int, + cs_catalog_page_sk int, + cs_ship_mode_sk int, + cs_warehouse_sk int, + cs_item_sk int, + cs_promo_sk int, + cs_order_number int, + cs_quantity int, + cs_wholesale_cost double, + cs_list_price double, + cs_sales_price double, + cs_ext_discount_amt double, + cs_ext_sales_price double, + cs_ext_wholesale_cost double, + cs_ext_list_price double, + cs_ext_tax double, + cs_coupon_amt double, + cs_ext_ship_cost double, + cs_net_paid double, + cs_net_paid_inc_tax double, + cs_net_paid_inc_ship double, + cs_net_paid_inc_ship_tax double, + cs_net_profit double ) ; drop table if exists catalog_sales; create table catalog_sales -as (select * from catalog_sales_text) +as (select * + from catalog_sales_text) ; drop table if exists catalog_sales_text; drop table if exists customer_text; create table customer_text ( - c_customer_sk int, - c_customer_id string, - c_current_cdemo_sk int, - c_current_hdemo_sk int, - c_current_addr_sk int, - c_first_shipto_date_sk int, - c_first_sales_date_sk int, - c_salutation string, - c_first_name string, - c_last_name string, - c_preferred_cust_flag string, - c_birth_day int, - c_birth_month int, - c_birth_year int, - c_birth_country string, - c_login string, - c_email_address string, - c_last_review_date string + c_customer_sk int, + c_customer_id string, + c_current_cdemo_sk int, + c_current_hdemo_sk int, + c_current_addr_sk int, + c_first_shipto_date_sk int, + c_first_sales_date_sk int, + c_salutation string, + c_first_name string, + c_last_name string, + c_preferred_cust_flag string, + c_birth_day int, + c_birth_month int, + c_birth_year int, + c_birth_country string, + c_login string, + c_email_address string, + c_last_review_date string ) ; drop table if exists customer; create table customer -as (select * from customer_text) +as (select * + from customer_text) ; drop table if exists customer_text; @@ -177,514 +182,533 @@ drop table if exists customer_text; drop table if exists customer_address_text; create table customer_address_text ( - ca_address_sk int, - ca_address_id string, - ca_street_number string, - ca_street_name string, - ca_street_type string, - ca_suite_number string, - ca_city string, - ca_county string, - ca_state string, - ca_zip string, - ca_country string, - ca_gmt_offset double, - ca_location_type string + ca_address_sk int, + ca_address_id string, + ca_street_number string, + ca_street_name string, + ca_street_type string, + ca_suite_number string, + ca_city string, + ca_county string, + ca_state string, + ca_zip string, + ca_country string, + ca_gmt_offset double, + ca_location_type string ) ; drop table if exists customer_address; create table customer_address -as (select * from customer_address_text) +as (select * + from customer_address_text) ; drop table if exists customer_address_text; drop table if exists customer_demographics_text; create table customer_demographics_text ( - cd_demo_sk int, - cd_gender string, - cd_marital_status string, - cd_education_status string, - cd_purchase_estimate int, - cd_credit_rating string, - cd_dep_count int, - cd_dep_employed_count int, - cd_dep_college_count int + cd_demo_sk int, + cd_gender string, + cd_marital_status string, + cd_education_status string, + cd_purchase_estimate int, + cd_credit_rating string, + cd_dep_count int, + cd_dep_employed_count int, + cd_dep_college_count int ) ; drop table if exists customer_demographics; create table customer_demographics -as (select * from customer_demographics_text) +as (select * + from customer_demographics_text) ; drop table if exists customer_demographics_text; drop table if exists date_dim_text; create table date_dim_text ( - d_date_sk int, - d_date_id string, - d_date string, - d_month_seq int, - d_week_seq int, - d_quarter_seq int, - d_year int, - d_dow int, - d_moy int, - d_dom int, - d_qoy int, - d_fy_year int, - d_fy_quarter_seq int, - d_fy_week_seq int, - d_day_name string, - d_quarter_name string, - d_holiday string, - d_weekend string, - d_following_holiday string, - d_first_dom int, - d_last_dom int, - d_same_day_ly int, - d_same_day_lq int, - d_current_day string, - d_current_week string, - d_current_month string, - d_current_quarter string, - d_current_year string + d_date_sk int, + d_date_id string, + d_date string, + d_month_seq int, + d_week_seq int, + d_quarter_seq int, + d_year int, + d_dow int, + d_moy int, + d_dom int, + d_qoy int, + d_fy_year int, + d_fy_quarter_seq int, + d_fy_week_seq int, + d_day_name string, + d_quarter_name string, + d_holiday string, + d_weekend string, + d_following_holiday string, + d_first_dom int, + d_last_dom int, + d_same_day_ly int, + d_same_day_lq int, + d_current_day string, + d_current_week string, + d_current_month string, + d_current_quarter string, + d_current_year string ) ; drop table if exists date_dim; create table date_dim -as (select * from date_dim_text) +as (select * + from date_dim_text) ; drop table if exists date_dim_text; drop table if exists household_demographics_text; create table household_demographics_text ( - hd_demo_sk int, - hd_income_band_sk int, - hd_buy_potential string, - hd_dep_count int, - hd_vehicle_count int + hd_demo_sk int, + hd_income_band_sk int, + hd_buy_potential string, + hd_dep_count int, + hd_vehicle_count int ) ; drop table if exists household_demographics; create table household_demographics -as (select * from household_demographics_text) +as (select * + from household_demographics_text) ; drop table if exists household_demographics_text; drop table if exists income_band_text; create table income_band_text ( - ib_income_band_sk int, - ib_lower_bound int, - ib_upper_bound int + ib_income_band_sk int, + ib_lower_bound int, + ib_upper_bound int ) ; drop table if exists income_band; create table income_band -as (select * from income_band_text) +as (select * + from income_band_text) ; drop table if exists income_band_text; drop table if exists inventory_text; create table inventory_text ( - inv_date_sk int, - inv_item_sk int, - inv_warehouse_sk int, - inv_quantity_on_hand bigint + inv_date_sk int, + inv_item_sk int, + inv_warehouse_sk int, + inv_quantity_on_hand bigint ) ; drop table if exists inventory; create table inventory -as (select * from inventory_text) +as (select * + from inventory_text) ; drop table if exists inventory_text; drop table if exists item_text; create table item_text ( - i_item_sk int, - i_item_id string, - i_rec_start_date string, - i_rec_end_date string, - i_item_desc string, - i_current_price double, - i_wholesale_cost double, - i_brand_id int, - i_brand string, - i_class_id int, - i_class string, - i_category_id int, - i_category string, - i_manufact_id int, - i_manufact string, - i_size string, - i_formulation string, - i_color string, - i_units string, - i_container string, - i_manager_id int, - i_product_name string + i_item_sk int, + i_item_id string, + i_rec_start_date string, + i_rec_end_date string, + i_item_desc string, + i_current_price double, + i_wholesale_cost double, + i_brand_id int, + i_brand string, + i_class_id int, + i_class string, + i_category_id int, + i_category string, + i_manufact_id int, + i_manufact string, + i_size string, + i_formulation string, + i_color string, + i_units string, + i_container string, + i_manager_id int, + i_product_name string ) ; drop table if exists item; create table item -as (select * from item_text) +as (select * + from item_text) ; drop table if exists item_text; drop table if exists promotion_text; create table promotion_text ( - p_promo_sk int, - p_promo_id string, - p_start_date_sk int, - p_end_date_sk int, - p_item_sk int, - p_cost double, - p_response_target int, - p_promo_name string, - p_channel_dmail string, - p_channel_email string, - p_channel_catalog string, - p_channel_tv string, - p_channel_radio string, - p_channel_press string, - p_channel_event string, - p_channel_demo string, - p_channel_details string, - p_purpose string, - p_discount_active string + p_promo_sk int, + p_promo_id string, + p_start_date_sk int, + p_end_date_sk int, + p_item_sk int, + p_cost double, + p_response_target int, + p_promo_name string, + p_channel_dmail string, + p_channel_email string, + p_channel_catalog string, + p_channel_tv string, + p_channel_radio string, + p_channel_press string, + p_channel_event string, + p_channel_demo string, + p_channel_details string, + p_purpose string, + p_discount_active string ) ; drop table if exists promotion; create table promotion -as (select * from promotion_text) +as (select * + from promotion_text) ; drop table if exists promotion_text; drop table if exists reason_text; create table reason_text ( - r_reason_sk int, - r_reason_id string, - r_reason_desc string + r_reason_sk int, + r_reason_id string, + r_reason_desc string ) ; drop table if exists reason; create table reason -as (select * from reason_text) +as (select * + from reason_text) ; drop table if exists reason_text; drop table if exists ship_mode_text; create table ship_mode_text ( - sm_ship_mode_sk int, - sm_ship_mode_id string, - sm_type string, - sm_code string, - sm_carrier string, - sm_contract string + sm_ship_mode_sk int, + sm_ship_mode_id string, + sm_type string, + sm_code string, + sm_carrier string, + sm_contract string ) ; drop table if exists ship_mode; create table ship_mode -as (select * from ship_mode_text) +as (select * + from ship_mode_text) ; drop table if exists ship_mode_text; drop table if exists store_text; create table store_text ( - s_store_sk int, - s_store_id string, - s_rec_start_date string, - s_rec_end_date string, - s_closed_date_sk int, - s_store_name string, - s_number_employees int, - s_floor_space int, - s_hours string, - s_manager string, - s_market_id int, - s_geography_class string, - s_market_desc string, - s_market_manager string, - s_division_id int, - s_division_name string, - s_company_id int, - s_company_name string, - s_street_number string, - s_street_name string, - s_street_type string, - s_suite_number string, - s_city string, - s_county string, - s_state string, - s_zip string, - s_country string, - s_gmt_offset double, - s_tax_precentage double + s_store_sk int, + s_store_id string, + s_rec_start_date string, + s_rec_end_date string, + s_closed_date_sk int, + s_store_name string, + s_number_employees int, + s_floor_space int, + s_hours string, + s_manager string, + s_market_id int, + s_geography_class string, + s_market_desc string, + s_market_manager string, + s_division_id int, + s_division_name string, + s_company_id int, + s_company_name string, + s_street_number string, + s_street_name string, + s_street_type string, + s_suite_number string, + s_city string, + s_county string, + s_state string, + s_zip string, + s_country string, + s_gmt_offset double, + s_tax_precentage double ) ; drop table if exists store; -create table store -as (select * from store_text) +create table store +as (select * + from store_text) ; drop table if exists store_text; drop table if exists store_returns_text; create table store_returns_text ( - sr_returned_date_sk int, - sr_return_time_sk int, - sr_item_sk int, - sr_customer_sk int, - sr_cdemo_sk int, - sr_hdemo_sk int, - sr_addr_sk int, - sr_store_sk int, - sr_reason_sk int, - sr_ticket_number int, - sr_return_quantity int, - sr_return_amt double, - sr_return_tax double, - sr_return_amt_inc_tax double, - sr_fee double, - sr_return_ship_cost double, - sr_refunded_cash double, - sr_reversed_charge double, - sr_store_credit double, - sr_net_loss double + sr_returned_date_sk int, + sr_return_time_sk int, + sr_item_sk int, + sr_customer_sk int, + sr_cdemo_sk int, + sr_hdemo_sk int, + sr_addr_sk int, + sr_store_sk int, + sr_reason_sk int, + sr_ticket_number int, + sr_return_quantity int, + sr_return_amt double, + sr_return_tax double, + sr_return_amt_inc_tax double, + sr_fee double, + sr_return_ship_cost double, + sr_refunded_cash double, + sr_reversed_charge double, + sr_store_credit double, + sr_net_loss double ) ; drop table if exists store_returns; -create table store_returns -as (select * from store_returns_text) +create table store_returns +as (select * + from store_returns_text) ; drop table if exists store_returns_text; drop table if exists store_sales_text; create table store_sales_text ( - ss_sold_date_sk int, - ss_sold_time_sk int, - ss_item_sk int, - ss_customer_sk int, - ss_cdemo_sk int, - ss_hdemo_sk int, - ss_addr_sk int, - ss_store_sk int, - ss_promo_sk int, - ss_ticket_number int, - ss_quantity int, - ss_wholesale_cost double, - ss_list_price double, - ss_sales_price double, - ss_ext_discount_amt double, - ss_ext_sales_price double, - ss_ext_wholesale_cost double, - ss_ext_list_price double, - ss_ext_tax double, - ss_coupon_amt double, - ss_net_paid double, - ss_net_paid_inc_tax double, - ss_net_profit double + ss_sold_date_sk int, + ss_sold_time_sk int, + ss_item_sk int, + ss_customer_sk int, + ss_cdemo_sk int, + ss_hdemo_sk int, + ss_addr_sk int, + ss_store_sk int, + ss_promo_sk int, + ss_ticket_number int, + ss_quantity int, + ss_wholesale_cost double, + ss_list_price double, + ss_sales_price double, + ss_ext_discount_amt double, + ss_ext_sales_price double, + ss_ext_wholesale_cost double, + ss_ext_list_price double, + ss_ext_tax double, + ss_coupon_amt double, + ss_net_paid double, + ss_net_paid_inc_tax double, + ss_net_profit double ) ; drop table if exists store_sales; create table store_sales -as (select * from store_sales_text) +as (select * + from store_sales_text) ; drop table if exists store_sales_text; drop table if exists time_dim_text; create table time_dim_text ( - t_time_sk int, - t_time_id string, - t_time int, - t_hour int, - t_minute int, - t_second int, - t_am_pm string, - t_shift string, - t_sub_shift string, - t_meal_time string + t_time_sk int, + t_time_id string, + t_time int, + t_hour int, + t_minute int, + t_second int, + t_am_pm string, + t_shift string, + t_sub_shift string, + t_meal_time string ) ; drop table if exists time_dim; create table time_dim -as (select * from time_dim_text) +as (select * + from time_dim_text) ; drop table if exists time_dim_text; drop table if exists warehouse_text; create table warehouse_text ( - w_warehouse_sk int, - w_warehouse_id string, - w_warehouse_name string, - w_warehouse_sq_ft int, - w_street_number string, - w_street_name string, - w_street_type string, - w_suite_number string, - w_city string, - w_county string, - w_state string, - w_zip string, - w_country string, - w_gmt_offset double + w_warehouse_sk int, + w_warehouse_id string, + w_warehouse_name string, + w_warehouse_sq_ft int, + w_street_number string, + w_street_name string, + w_street_type string, + w_suite_number string, + w_city string, + w_county string, + w_state string, + w_zip string, + w_country string, + w_gmt_offset double ) ; drop table if exists warehouse; create table warehouse -as (select * from warehouse_text) +as (select * + from warehouse_text) ; drop table if exists warehouse_text; drop table if exists web_page_text; create table web_page_text ( - wp_web_page_sk int, - wp_web_page_id string, - wp_rec_start_date string, - wp_rec_end_date string, - wp_creation_date_sk int, - wp_access_date_sk int, - wp_autogen_flag string, - wp_customer_sk int, - wp_url string, - wp_type string, - wp_char_count int, - wp_link_count int, - wp_image_count int, - wp_max_ad_count int + wp_web_page_sk int, + wp_web_page_id string, + wp_rec_start_date string, + wp_rec_end_date string, + wp_creation_date_sk int, + wp_access_date_sk int, + wp_autogen_flag string, + wp_customer_sk int, + wp_url string, + wp_type string, + wp_char_count int, + wp_link_count int, + wp_image_count int, + wp_max_ad_count int ) ; drop table if exists web_page; create table web_page -as (select * from web_page_text) +as (select * + from web_page_text) ; drop table if exists web_page_text; drop table if exists web_returns_text; create table web_returns_text ( - wr_returned_date_sk int, - wr_returned_time_sk int, - wr_item_sk int, - wr_refunded_customer_sk int, - wr_refunded_cdemo_sk int, - wr_refunded_hdemo_sk int, - wr_refunded_addr_sk int, - wr_returning_customer_sk int, - wr_returning_cdemo_sk int, - wr_returning_hdemo_sk int, - wr_returning_addr_sk int, - wr_web_page_sk int, - wr_reason_sk int, - wr_order_number int, - wr_return_quantity int, - wr_return_amt double, - wr_return_tax double, - wr_return_amt_inc_tax double, - wr_fee double, - wr_return_ship_cost double, - wr_refunded_cash double, - wr_reversed_charge double, - wr_account_credit double, - wr_net_loss double + wr_returned_date_sk int, + wr_returned_time_sk int, + wr_item_sk int, + wr_refunded_customer_sk int, + wr_refunded_cdemo_sk int, + wr_refunded_hdemo_sk int, + wr_refunded_addr_sk int, + wr_returning_customer_sk int, + wr_returning_cdemo_sk int, + wr_returning_hdemo_sk int, + wr_returning_addr_sk int, + wr_web_page_sk int, + wr_reason_sk int, + wr_order_number int, + wr_return_quantity int, + wr_return_amt double, + wr_return_tax double, + wr_return_amt_inc_tax double, + wr_fee double, + wr_return_ship_cost double, + wr_refunded_cash double, + wr_reversed_charge double, + wr_account_credit double, + wr_net_loss double ) ; drop table if exists web_returns; create table web_returns -as (select * from web_returns_text) +as (select * + from web_returns_text) ; drop table if exists web_returns_text; drop table if exists web_sales_text; create table web_sales_text ( - ws_sold_date_sk int, - ws_sold_time_sk int, - ws_ship_date_sk int, - ws_item_sk int, - ws_bill_customer_sk int, - ws_bill_cdemo_sk int, - ws_bill_hdemo_sk int, - ws_bill_addr_sk int, - ws_ship_customer_sk int, - ws_ship_cdemo_sk int, - ws_ship_hdemo_sk int, - ws_ship_addr_sk int, - ws_web_page_sk int, - ws_web_site_sk int, - ws_ship_mode_sk int, - ws_warehouse_sk int, - ws_promo_sk int, - ws_order_number int, - ws_quantity int, - ws_wholesale_cost double, - ws_list_price double, - ws_sales_price double, - ws_ext_discount_amt double, - ws_ext_sales_price double, - ws_ext_wholesale_cost double, - ws_ext_list_price double, - ws_ext_tax double, - ws_coupon_amt double, - ws_ext_ship_cost double, - ws_net_paid double, - ws_net_paid_inc_tax double, - ws_net_paid_inc_ship double, - ws_net_paid_inc_ship_tax double, - ws_net_profit double + ws_sold_date_sk int, + ws_sold_time_sk int, + ws_ship_date_sk int, + ws_item_sk int, + ws_bill_customer_sk int, + ws_bill_cdemo_sk int, + ws_bill_hdemo_sk int, + ws_bill_addr_sk int, + ws_ship_customer_sk int, + ws_ship_cdemo_sk int, + ws_ship_hdemo_sk int, + ws_ship_addr_sk int, + ws_web_page_sk int, + ws_web_site_sk int, + ws_ship_mode_sk int, + ws_warehouse_sk int, + ws_promo_sk int, + ws_order_number int, + ws_quantity int, + ws_wholesale_cost double, + ws_list_price double, + ws_sales_price double, + ws_ext_discount_amt double, + ws_ext_sales_price double, + ws_ext_wholesale_cost double, + ws_ext_list_price double, + ws_ext_tax double, + ws_coupon_amt double, + ws_ext_ship_cost double, + ws_net_paid double, + ws_net_paid_inc_tax double, + ws_net_paid_inc_ship double, + ws_net_paid_inc_ship_tax double, + ws_net_profit double ) ; drop table if exists web_sales; create table web_sales -as (select * from web_sales_text) +as (select * + from web_sales_text) ; drop table if exists web_sales_text; drop table if exists web_site_text; create table web_site_text ( - web_site_sk int, - web_site_id string, - web_rec_start_date string, - web_rec_end_date string, - web_name string, - web_open_date_sk int, - web_close_date_sk int, - web_class string, - web_manager string, - web_mkt_id int, - web_mkt_class string, - web_mkt_desc string, - web_market_manager string, - web_company_id int, - web_company_name string, - web_street_number string, - web_street_name string, - web_street_type string, - web_suite_number string, - web_city string, - web_county string, - web_state string, - web_zip string, - web_country string, - web_gmt_offset double, - web_tax_percentage double + web_site_sk int, + web_site_id string, + web_rec_start_date string, + web_rec_end_date string, + web_name string, + web_open_date_sk int, + web_close_date_sk int, + web_class string, + web_manager string, + web_mkt_id int, + web_mkt_class string, + web_mkt_desc string, + web_market_manager string, + web_company_id int, + web_company_name string, + web_street_number string, + web_street_name string, + web_street_type string, + web_suite_number string, + web_city string, + web_county string, + web_state string, + web_zip string, + web_country string, + web_gmt_offset double, + web_tax_percentage double ) ; drop table if exists web_site; create table web_site -as (select * from web_site_text) +as (select * + from web_site_text) ; drop table if exists web_site_text; diff --git a/src/main/resources/tpcds/query01.sql b/src/main/resources/tpcds/query01.sql index 4a53627b1b..f523414bc9 100644 --- a/src/main/resources/tpcds/query01.sql +++ b/src/main/resources/tpcds/query01.sql @@ -1,19 +1,19 @@ -WITH customer_total_return AS ( - SELECT sr_customer_sk AS ctr_customer_sk, sr_store_sk AS ctr_store_sk, sum(SR_RETURN_AMT) AS ctr_total_return - FROM store_returns, date_dim - WHERE sr_returned_date_sk = d_date_sk - AND d_year = 2000 - GROUP BY sr_customer_sk, sr_store_sk - ) +WITH customer_total_return AS (SELECT sr_customer_sk AS ctr_customer_sk, + sr_store_sk AS ctr_store_sk, + sum(SR_RETURN_AMT) AS ctr_total_return + FROM store_returns, + date_dim + WHERE sr_returned_date_sk = d_date_sk + AND d_year = 2000 + GROUP BY sr_customer_sk, sr_store_sk) SELECT c_customer_id -FROM customer_total_return ctr1, store, customer -WHERE ctr1.ctr_total_return > ( - SELECT avg(ctr_total_return) * 1.2 - FROM customer_total_return ctr2 - WHERE ctr1.ctr_store_sk = ctr2.ctr_store_sk - ) - AND s_store_sk = ctr1.ctr_store_sk - AND s_state = 'TN' - AND ctr1.ctr_customer_sk = c_customer_sk -ORDER BY c_customer_id -LIMIT 100 \ No newline at end of file +FROM customer_total_return ctr1, + store, + customer +WHERE ctr1.ctr_total_return > (SELECT avg(ctr_total_return) * 1.2 + FROM customer_total_return ctr2 + WHERE ctr1.ctr_store_sk = ctr2.ctr_store_sk) + AND s_store_sk = ctr1.ctr_store_sk + AND s_state = 'TN' + AND ctr1.ctr_customer_sk = c_customer_sk +ORDER BY c_customer_id LIMIT 100 \ No newline at end of file diff --git a/src/main/resources/tpcds/query02.sql b/src/main/resources/tpcds/query02.sql index 35773b3a1d..f91e28e3e2 100644 --- a/src/main/resources/tpcds/query02.sql +++ b/src/main/resources/tpcds/query02.sql @@ -1,66 +1,73 @@ -WITH wscs AS ( - SELECT sold_date_sk, sales_price - FROM ( - SELECT ws_sold_date_sk AS sold_date_sk, ws_ext_sales_price AS sales_price - FROM web_sales - UNION ALL - SELECT cs_sold_date_sk AS sold_date_sk, cs_ext_sales_price AS sales_price - FROM catalog_sales - ) x - ), - wswscs AS ( - SELECT d_week_seq - , sum(CASE - WHEN d_day_name = 'Sunday' THEN sales_price - ELSE NULL - END) AS sun_sales - , sum(CASE - WHEN d_day_name = 'Monday' THEN sales_price - ELSE NULL - END) AS mon_sales - , sum(CASE - WHEN d_day_name = 'Tuesday' THEN sales_price - ELSE NULL - END) AS tue_sales - , sum(CASE - WHEN d_day_name = 'Wednesday' THEN sales_price - ELSE NULL - END) AS wed_sales - , sum(CASE - WHEN d_day_name = 'Thursday' THEN sales_price - ELSE NULL - END) AS thu_sales - , sum(CASE - WHEN d_day_name = 'Friday' THEN sales_price - ELSE NULL - END) AS fri_sales - , sum(CASE - WHEN d_day_name = 'Saturday' THEN sales_price - ELSE NULL - END) AS sat_sales - FROM wscs, date_dim - WHERE d_date_sk = sold_date_sk - GROUP BY d_week_seq - ) -SELECT d_week_seq1, round(sun_sales1 / sun_sales2, 2) - , round(mon_sales1 / mon_sales2, 2) - , round(tue_sales1 / tue_sales2, 2) - , round(wed_sales1 / wed_sales2, 2) - , round(thu_sales1 / thu_sales2, 2) - , round(fri_sales1 / fri_sales2, 2) - , round(sat_sales1 / sat_sales2, 2) -FROM ( - SELECT wswscs.d_week_seq AS d_week_seq1, sun_sales AS sun_sales1, mon_sales AS mon_sales1, tue_sales AS tue_sales1, wed_sales AS wed_sales1 - , thu_sales AS thu_sales1, fri_sales AS fri_sales1, sat_sales AS sat_sales1 - FROM wswscs, date_dim - WHERE date_dim.d_week_seq = wswscs.d_week_seq - AND d_year = 2001 -) y, ( - SELECT wswscs.d_week_seq AS d_week_seq2, sun_sales AS sun_sales2, mon_sales AS mon_sales2, tue_sales AS tue_sales2, wed_sales AS wed_sales2 - , thu_sales AS thu_sales2, fri_sales AS fri_sales2, sat_sales AS sat_sales2 - FROM wswscs, date_dim - WHERE date_dim.d_week_seq = wswscs.d_week_seq - AND d_year = 2001 + 1 - ) z +WITH wscs AS (SELECT sold_date_sk, sales_price + FROM (SELECT ws_sold_date_sk AS sold_date_sk, ws_ext_sales_price AS sales_price + FROM web_sales + UNION ALL + SELECT cs_sold_date_sk AS sold_date_sk, cs_ext_sales_price AS sales_price + FROM catalog_sales) x), + wswscs AS (SELECT d_week_seq + , sum(CASE + WHEN d_day_name = 'Sunday' THEN sales_price + ELSE NULL + END) AS sun_sales + , sum(CASE + WHEN d_day_name = 'Monday' THEN sales_price + ELSE NULL + END) AS mon_sales + , sum(CASE + WHEN d_day_name = 'Tuesday' THEN sales_price + ELSE NULL + END) AS tue_sales + , sum(CASE + WHEN d_day_name = 'Wednesday' THEN sales_price + ELSE NULL + END) AS wed_sales + , sum(CASE + WHEN d_day_name = 'Thursday' THEN sales_price + ELSE NULL + END) AS thu_sales + , sum(CASE + WHEN d_day_name = 'Friday' THEN sales_price + ELSE NULL + END) AS fri_sales + , sum(CASE + WHEN d_day_name = 'Saturday' THEN sales_price + ELSE NULL + END) AS sat_sales + FROM wscs, + date_dim + WHERE d_date_sk = sold_date_sk + GROUP BY d_week_seq) +SELECT d_week_seq1 + , round(sun_sales1 / sun_sales2, 2) + , round(mon_sales1 / mon_sales2, 2) + , round(tue_sales1 / tue_sales2, 2) + , round(wed_sales1 / wed_sales2, 2) + , round(thu_sales1 / thu_sales2, 2) + , round(fri_sales1 / fri_sales2, 2) + , round(sat_sales1 / sat_sales2, 2) +FROM (SELECT wswscs.d_week_seq AS d_week_seq1 + , sun_sales AS sun_sales1 + , mon_sales AS mon_sales1 + , tue_sales AS tue_sales1 + , wed_sales AS wed_sales1 + , thu_sales AS thu_sales1 + , fri_sales AS fri_sales1 + , sat_sales AS sat_sales1 + FROM wswscs, + date_dim + WHERE date_dim.d_week_seq = wswscs.d_week_seq + AND d_year = 2001) y, + (SELECT wswscs.d_week_seq AS d_week_seq2 + , sun_sales AS sun_sales2 + , mon_sales AS mon_sales2 + , tue_sales AS tue_sales2 + , wed_sales AS wed_sales2 + , thu_sales AS thu_sales2 + , fri_sales AS fri_sales2 + , sat_sales AS sat_sales2 + FROM wswscs, + date_dim + WHERE date_dim.d_week_seq = wswscs.d_week_seq + AND d_year = 2001 + 1) z WHERE d_week_seq1 = d_week_seq2 - 53 ORDER BY d_week_seq1 \ No newline at end of file diff --git a/src/main/resources/tpcds/query03.sql b/src/main/resources/tpcds/query03.sql index 0c135df065..142d632bcb 100644 --- a/src/main/resources/tpcds/query03.sql +++ b/src/main/resources/tpcds/query03.sql @@ -1,9 +1,10 @@ SELECT dt.d_year, item.i_brand_id AS brand_id, item.i_brand AS brand, sum(ss_ext_sales_price) AS sum_agg -FROM date_dim dt, store_sales, item +FROM date_dim dt, + store_sales, + item WHERE dt.d_date_sk = store_sales.ss_sold_date_sk - AND store_sales.ss_item_sk = item.i_item_sk - AND item.i_manufact_id = 128 - AND dt.d_moy = 11 + AND store_sales.ss_item_sk = item.i_item_sk + AND item.i_manufact_id = 128 + AND dt.d_moy = 11 GROUP BY dt.d_year, item.i_brand, item.i_brand_id -ORDER BY dt.d_year, sum_agg DESC, brand_id -LIMIT 100 \ No newline at end of file +ORDER BY dt.d_year, sum_agg DESC, brand_id LIMIT 100 \ No newline at end of file diff --git a/src/main/resources/tpcds/query04.sql b/src/main/resources/tpcds/query04.sql index 4df5318b60..77123aaf8a 100644 --- a/src/main/resources/tpcds/query04.sql +++ b/src/main/resources/tpcds/query04.sql @@ -1,113 +1,114 @@ -with year_total as ( - select c_customer_id customer_id - ,c_first_name customer_first_name - ,c_last_name customer_last_name - ,c_preferred_cust_flag customer_preferred_cust_flag - ,c_birth_country customer_birth_country - ,c_login customer_login - ,c_email_address customer_email_address - ,d_year dyear - ,sum(((ss_ext_list_price-ss_ext_wholesale_cost-ss_ext_discount_amt)+ss_ext_sales_price)/2) year_total - ,'s' sale_type - from customer - ,store_sales - ,date_dim - where c_customer_sk = ss_customer_sk - and ss_sold_date_sk = d_date_sk - group by c_customer_id - ,c_first_name - ,c_last_name - ,c_preferred_cust_flag - ,c_birth_country - ,c_login - ,c_email_address - ,d_year - union all - select c_customer_id customer_id - ,c_first_name customer_first_name - ,c_last_name customer_last_name - ,c_preferred_cust_flag customer_preferred_cust_flag - ,c_birth_country customer_birth_country - ,c_login customer_login - ,c_email_address customer_email_address - ,d_year dyear - ,sum((((cs_ext_list_price-cs_ext_wholesale_cost-cs_ext_discount_amt)+cs_ext_sales_price)/2) ) year_total - ,'c' sale_type - from customer - ,catalog_sales - ,date_dim - where c_customer_sk = cs_bill_customer_sk - and cs_sold_date_sk = d_date_sk - group by c_customer_id - ,c_first_name - ,c_last_name - ,c_preferred_cust_flag - ,c_birth_country - ,c_login - ,c_email_address - ,d_year -union all - select c_customer_id customer_id - ,c_first_name customer_first_name - ,c_last_name customer_last_name - ,c_preferred_cust_flag customer_preferred_cust_flag - ,c_birth_country customer_birth_country - ,c_login customer_login - ,c_email_address customer_email_address - ,d_year dyear - ,sum((((ws_ext_list_price-ws_ext_wholesale_cost-ws_ext_discount_amt)+ws_ext_sales_price)/2) ) year_total - ,'w' sale_type - from customer - ,web_sales - ,date_dim - where c_customer_sk = ws_bill_customer_sk - and ws_sold_date_sk = d_date_sk - group by c_customer_id - ,c_first_name - ,c_last_name - ,c_preferred_cust_flag - ,c_birth_country - ,c_login - ,c_email_address - ,d_year - ) - select - t_s_secyear.customer_id - ,t_s_secyear.customer_first_name - ,t_s_secyear.customer_last_name - ,t_s_secyear.customer_preferred_cust_flag - from year_total t_s_firstyear - ,year_total t_s_secyear - ,year_total t_c_firstyear - ,year_total t_c_secyear - ,year_total t_w_firstyear - ,year_total t_w_secyear - where t_s_secyear.customer_id = t_s_firstyear.customer_id - and t_s_firstyear.customer_id = t_c_secyear.customer_id - and t_s_firstyear.customer_id = t_c_firstyear.customer_id - and t_s_firstyear.customer_id = t_w_firstyear.customer_id - and t_s_firstyear.customer_id = t_w_secyear.customer_id - and t_s_firstyear.sale_type = 's' - and t_c_firstyear.sale_type = 'c' - and t_w_firstyear.sale_type = 'w' - and t_s_secyear.sale_type = 's' - and t_c_secyear.sale_type = 'c' - and t_w_secyear.sale_type = 'w' - and t_s_firstyear.dyear = 2001 - and t_s_secyear.dyear = 2001+1 - and t_c_firstyear.dyear = 2001 - and t_c_secyear.dyear = 2001+1 - and t_w_firstyear.dyear = 2001 - and t_w_secyear.dyear = 2001+1 - and t_s_firstyear.year_total > 0 - and t_c_firstyear.year_total > 0 - and t_w_firstyear.year_total > 0 - and case when t_c_firstyear.year_total > 0 then t_c_secyear.year_total / t_c_firstyear.year_total else null end - > case when t_s_firstyear.year_total > 0 then t_s_secyear.year_total / t_s_firstyear.year_total else null end - and case when t_c_firstyear.year_total > 0 then t_c_secyear.year_total / t_c_firstyear.year_total else null end - > case when t_w_firstyear.year_total > 0 then t_w_secyear.year_total / t_w_firstyear.year_total else null end - order by t_s_secyear.customer_id - ,t_s_secyear.customer_first_name - ,t_s_secyear.customer_last_name - ,t_s_secyear.customer_preferred_cust_flag - limit 100 +with year_total as (select c_customer_id customer_id + , c_first_name customer_first_name + , c_last_name customer_last_name + , c_preferred_cust_flag customer_preferred_cust_flag + , c_birth_country customer_birth_country + , c_login customer_login + , c_email_address customer_email_address + , d_year dyear + , sum( + ((ss_ext_list_price - ss_ext_wholesale_cost - ss_ext_discount_amt) + ss_ext_sales_price) / 2) year_total + , 's' sale_type + from customer + , store_sales + , date_dim + where c_customer_sk = ss_customer_sk + and ss_sold_date_sk = d_date_sk + group by c_customer_id + , c_first_name + , c_last_name + , c_preferred_cust_flag + , c_birth_country + , c_login + , c_email_address + , d_year + union all + select c_customer_id customer_id + , c_first_name customer_first_name + , c_last_name customer_last_name + , c_preferred_cust_flag customer_preferred_cust_flag + , c_birth_country customer_birth_country + , c_login customer_login + , c_email_address customer_email_address + , d_year dyear + , sum(( + ((cs_ext_list_price - cs_ext_wholesale_cost - cs_ext_discount_amt) + cs_ext_sales_price) / + 2)) year_total + , 'c' sale_type + from customer + , catalog_sales + , date_dim + where c_customer_sk = cs_bill_customer_sk + and cs_sold_date_sk = d_date_sk + group by c_customer_id + , c_first_name + , c_last_name + , c_preferred_cust_flag + , c_birth_country + , c_login + , c_email_address + , d_year + union all + select c_customer_id customer_id + , c_first_name customer_first_name + , c_last_name customer_last_name + , c_preferred_cust_flag customer_preferred_cust_flag + , c_birth_country customer_birth_country + , c_login customer_login + , c_email_address customer_email_address + , d_year dyear + , sum(( + ((ws_ext_list_price - ws_ext_wholesale_cost - ws_ext_discount_amt) + ws_ext_sales_price) / + 2)) year_total + , 'w' sale_type + from customer + , web_sales + , date_dim + where c_customer_sk = ws_bill_customer_sk + and ws_sold_date_sk = d_date_sk + group by c_customer_id + , c_first_name + , c_last_name + , c_preferred_cust_flag + , c_birth_country + , c_login + , c_email_address + , d_year) +select t_s_secyear.customer_id + , t_s_secyear.customer_first_name + , t_s_secyear.customer_last_name + , t_s_secyear.customer_preferred_cust_flag +from year_total t_s_firstyear + , year_total t_s_secyear + , year_total t_c_firstyear + , year_total t_c_secyear + , year_total t_w_firstyear + , year_total t_w_secyear +where t_s_secyear.customer_id = t_s_firstyear.customer_id + and t_s_firstyear.customer_id = t_c_secyear.customer_id + and t_s_firstyear.customer_id = t_c_firstyear.customer_id + and t_s_firstyear.customer_id = t_w_firstyear.customer_id + and t_s_firstyear.customer_id = t_w_secyear.customer_id + and t_s_firstyear.sale_type = 's' + and t_c_firstyear.sale_type = 'c' + and t_w_firstyear.sale_type = 'w' + and t_s_secyear.sale_type = 's' + and t_c_secyear.sale_type = 'c' + and t_w_secyear.sale_type = 'w' + and t_s_firstyear.dyear = 2001 + and t_s_secyear.dyear = 2001 + 1 + and t_c_firstyear.dyear = 2001 + and t_c_secyear.dyear = 2001 + 1 + and t_w_firstyear.dyear = 2001 + and t_w_secyear.dyear = 2001 + 1 + and t_s_firstyear.year_total > 0 + and t_c_firstyear.year_total > 0 + and t_w_firstyear.year_total > 0 + and case when t_c_firstyear.year_total > 0 then t_c_secyear.year_total / t_c_firstyear.year_total else null end + > case when t_s_firstyear.year_total > 0 then t_s_secyear.year_total / t_s_firstyear.year_total else null end + and case when t_c_firstyear.year_total > 0 then t_c_secyear.year_total / t_c_firstyear.year_total else null end + > case when t_w_firstyear.year_total > 0 then t_w_secyear.year_total / t_w_firstyear.year_total else null end +order by t_s_secyear.customer_id + , t_s_secyear.customer_first_name + , t_s_secyear.customer_last_name + , t_s_secyear.customer_preferred_cust_flag limit 100 diff --git a/src/main/resources/tpcds/query05.sql b/src/main/resources/tpcds/query05.sql index 123f01683b..129dc99b1c 100644 --- a/src/main/resources/tpcds/query05.sql +++ b/src/main/resources/tpcds/query05.sql @@ -1,72 +1,108 @@ -WITH ssr AS ( - SELECT s_store_id, sum(sales_price) AS sales, sum(profit) AS profit - , sum(return_amt) AS returns, sum(net_loss) AS profit_loss - FROM ( - SELECT ss_store_sk AS store_sk, ss_sold_date_sk AS date_sk, ss_ext_sales_price AS sales_price, ss_net_profit AS profit, CAST(0 AS decimal(7, 2)) AS return_amt - , CAST(0 AS decimal(7, 2)) AS net_loss - FROM store_sales - UNION ALL - SELECT sr_store_sk AS store_sk, sr_returned_date_sk AS date_sk, CAST(0 AS decimal(7, 2)) AS sales_price, CAST(0 AS decimal(7, 2)) AS profit, sr_return_amt AS return_amt - , sr_net_loss AS net_loss - FROM store_returns - ) salesreturns, date_dim, store - WHERE date_sk = d_date_sk - AND d_date BETWEEN CAST('2000-08-23' AS date) AND date_add(CAST('2000-08-23' AS date), 14) - AND store_sk = s_store_sk - GROUP BY s_store_id - ), - csr AS ( - SELECT cp_catalog_page_id, sum(sales_price) AS sales, sum(profit) AS profit - , sum(return_amt) AS returns, sum(net_loss) AS profit_loss - FROM ( - SELECT cs_catalog_page_sk AS page_sk, cs_sold_date_sk AS date_sk, cs_ext_sales_price AS sales_price, cs_net_profit AS profit, CAST(0 AS decimal(7, 2)) AS return_amt - , CAST(0 AS decimal(7, 2)) AS net_loss - FROM catalog_sales - UNION ALL - SELECT cr_catalog_page_sk AS page_sk, cr_returned_date_sk AS date_sk, CAST(0 AS decimal(7, 2)) AS sales_price, CAST(0 AS decimal(7, 2)) AS profit, cr_return_amount AS return_amt - , cr_net_loss AS net_loss - FROM catalog_returns - ) salesreturns, date_dim, catalog_page - WHERE date_sk = d_date_sk - AND d_date BETWEEN CAST('2000-08-23' AS date) AND date_add(CAST('2000-08-23' AS date), 14) - AND page_sk = cp_catalog_page_sk - GROUP BY cp_catalog_page_id - ), - wsr AS ( - SELECT web_site_id, sum(sales_price) AS sales, sum(profit) AS profit - , sum(return_amt) AS returns, sum(net_loss) AS profit_loss - FROM ( - SELECT ws_web_site_sk AS wsr_web_site_sk, ws_sold_date_sk AS date_sk, ws_ext_sales_price AS sales_price, ws_net_profit AS profit, CAST(0 AS decimal(7, 2)) AS return_amt - , CAST(0 AS decimal(7, 2)) AS net_loss - FROM web_sales - UNION ALL - SELECT ws_web_site_sk AS wsr_web_site_sk, wr_returned_date_sk AS date_sk, CAST(0 AS decimal(7, 2)) AS sales_price, CAST(0 AS decimal(7, 2)) AS profit, wr_return_amt AS return_amt - , wr_net_loss AS net_loss - FROM web_returns - LEFT JOIN web_sales - ON wr_item_sk = ws_item_sk - AND wr_order_number = ws_order_number - ) salesreturns, date_dim, web_site - WHERE date_sk = d_date_sk - AND d_date BETWEEN CAST('2000-08-23' AS date) AND date_add(CAST('2000-08-23' AS date), 14) - AND wsr_web_site_sk = web_site_sk - GROUP BY web_site_id - ) -SELECT channel, id, sum(sales) AS sales - , sum(returns) AS returns, sum(profit) AS profit -FROM ( - SELECT 'store channel' AS channel, concat('store', s_store_id) AS id, sales - , returns, profit - profit_loss AS profit - FROM ssr - UNION ALL - SELECT 'catalog channel' AS channel, concat('catalog_page', cp_catalog_page_id) AS id, sales - , returns, profit - profit_loss AS profit - FROM csr - UNION ALL - SELECT 'web channel' AS channel, concat('web_site', web_site_id) AS id, sales - , returns, profit - profit_loss AS profit - FROM wsr -) x +WITH ssr AS (SELECT s_store_id + , sum(sales_price) AS sales + , sum(profit) AS profit + , sum(return_amt) AS returns + , sum(net_loss) AS profit_loss + FROM (SELECT ss_store_sk AS store_sk + , ss_sold_date_sk AS date_sk + , ss_ext_sales_price AS sales_price + , ss_net_profit AS profit + , CAST(0 AS decimal(7, 2)) AS return_amt + , CAST(0 AS decimal(7, 2)) AS net_loss + FROM store_sales + UNION ALL + SELECT sr_store_sk AS store_sk + , sr_returned_date_sk AS date_sk + , CAST(0 AS decimal(7, 2)) AS sales_price + , CAST(0 AS decimal(7, 2)) AS profit + , sr_return_amt AS return_amt + , sr_net_loss AS net_loss + FROM store_returns) salesreturns, + date_dim, + store + WHERE date_sk = d_date_sk + AND d_date BETWEEN CAST('2000-08-23' AS date) AND date_add(CAST('2000-08-23' AS date), 14) + AND store_sk = s_store_sk + GROUP BY s_store_id), + csr AS (SELECT cp_catalog_page_id + , sum(sales_price) AS sales + , sum(profit) AS profit + , sum(return_amt) AS returns + , sum(net_loss) AS profit_loss + FROM (SELECT cs_catalog_page_sk AS page_sk + , cs_sold_date_sk AS date_sk + , cs_ext_sales_price AS sales_price + , cs_net_profit AS profit + , CAST(0 AS decimal(7, 2)) AS return_amt + , CAST(0 AS decimal(7, 2)) AS net_loss + FROM catalog_sales + UNION ALL + SELECT cr_catalog_page_sk AS page_sk + , cr_returned_date_sk AS date_sk + , CAST(0 AS decimal(7, 2)) AS sales_price + , CAST(0 AS decimal(7, 2)) AS profit + , cr_return_amount AS return_amt + , cr_net_loss AS net_loss + FROM catalog_returns) salesreturns, + date_dim, + catalog_page + WHERE date_sk = d_date_sk + AND d_date BETWEEN CAST('2000-08-23' AS date) AND date_add(CAST('2000-08-23' AS date), 14) + AND page_sk = cp_catalog_page_sk + GROUP BY cp_catalog_page_id), + wsr AS (SELECT web_site_id + , sum(sales_price) AS sales + , sum(profit) AS profit + , sum(return_amt) AS returns + , sum(net_loss) AS profit_loss + FROM (SELECT ws_web_site_sk AS wsr_web_site_sk + , ws_sold_date_sk AS date_sk + , ws_ext_sales_price AS sales_price + , ws_net_profit AS profit + , CAST(0 AS decimal(7, 2)) AS return_amt + , CAST(0 AS decimal(7, 2)) AS net_loss + FROM web_sales + UNION ALL + SELECT ws_web_site_sk AS wsr_web_site_sk + , wr_returned_date_sk AS date_sk + , CAST(0 AS decimal(7, 2)) AS sales_price + , CAST(0 AS decimal(7, 2)) AS profit + , wr_return_amt AS return_amt + , wr_net_loss AS net_loss + FROM web_returns + LEFT JOIN web_sales + ON wr_item_sk = ws_item_sk + AND wr_order_number = ws_order_number) salesreturns, + date_dim, + web_site + WHERE date_sk = d_date_sk + AND d_date BETWEEN CAST('2000-08-23' AS date) AND date_add(CAST('2000-08-23' AS date), 14) + AND wsr_web_site_sk = web_site_sk + GROUP BY web_site_id) +SELECT channel + , id + , sum(sales) AS sales + , sum(returns) AS returns + , sum(profit) AS profit +FROM (SELECT 'store channel' AS channel + , concat('store', s_store_id) AS id + , sales + , returns + , profit - profit_loss AS profit + FROM ssr + UNION ALL + SELECT 'catalog channel' AS channel + , concat('catalog_page', cp_catalog_page_id) AS id + , sales + , returns + , profit - profit_loss AS profit + FROM csr + UNION ALL + SELECT 'web channel' AS channel + , concat('web_site', web_site_id) AS id + , sales + , returns + , profit - profit_loss AS profit + FROM wsr) x GROUP BY ROLLUP (channel, id) -ORDER BY channel, id -LIMIT 100 \ No newline at end of file +ORDER BY channel, id LIMIT 100 \ No newline at end of file diff --git a/src/main/resources/tpcds/query06.sql b/src/main/resources/tpcds/query06.sql index 418966902c..7259eb55ac 100644 --- a/src/main/resources/tpcds/query06.sql +++ b/src/main/resources/tpcds/query06.sql @@ -1,23 +1,22 @@ -select a.ca_state state, count(*) cnt - from customer_address a - ,customer c - ,store_sales s - ,date_dim d - ,item i - where a.ca_address_sk = c.c_current_addr_sk - and c.c_customer_sk = s.ss_customer_sk - and s.ss_sold_date_sk = d.d_date_sk - and s.ss_item_sk = i.i_item_sk - and d.d_month_seq = - (select distinct (d_month_seq) - from date_dim - where d_year = 2001 - and d_moy = 1 ) - and i.i_current_price > 1.2 * - (select avg(j.i_current_price) - from item j - where j.i_category = i.i_category) - group by a.ca_state - having count(*) >= 10 - order by cnt - limit 100 +select a.ca_state state, count(*) cnt +from customer_address a + , customer c + , store_sales s + , date_dim d + , item i +where a.ca_address_sk = c.c_current_addr_sk + and c.c_customer_sk = s.ss_customer_sk + and s.ss_sold_date_sk = d.d_date_sk + and s.ss_item_sk = i.i_item_sk + and d.d_month_seq = + (select distinct (d_month_seq) + from date_dim + where d_year = 2001 + and d_moy = 1) + and i.i_current_price > 1.2 * + (select avg(j.i_current_price) + from item j + where j.i_category = i.i_category) +group by a.ca_state +having count(*) >= 10 +order by cnt limit 100 diff --git a/src/main/resources/tpcds/query07.sql b/src/main/resources/tpcds/query07.sql index 62e32cb3eb..0c76984c71 100644 --- a/src/main/resources/tpcds/query07.sql +++ b/src/main/resources/tpcds/query07.sql @@ -1,18 +1,21 @@ -select i_item_id, - avg(ss_quantity) agg1, - avg(ss_list_price) agg2, - avg(ss_coupon_amt) agg3, - avg(ss_sales_price) agg4 - from store_sales, customer_demographics, date_dim, item, promotion - where ss_sold_date_sk = d_date_sk and - ss_item_sk = i_item_sk and - ss_cdemo_sk = cd_demo_sk and - ss_promo_sk = p_promo_sk and - cd_gender = 'M' and - cd_marital_status = 'S' and - cd_education_status = 'College' and - (p_channel_email = 'N' or p_channel_event = 'N') and - d_year = 2000 - group by i_item_id - order by i_item_id - limit 100 +select i_item_id, + avg(ss_quantity) agg1, + avg(ss_list_price) agg2, + avg(ss_coupon_amt) agg3, + avg(ss_sales_price) agg4 +from store_sales, + customer_demographics, + date_dim, + item, + promotion +where ss_sold_date_sk = d_date_sk + and ss_item_sk = i_item_sk + and ss_cdemo_sk = cd_demo_sk + and ss_promo_sk = p_promo_sk + and cd_gender = 'M' + and cd_marital_status = 'S' + and cd_education_status = 'College' + and (p_channel_email = 'N' or p_channel_event = 'N') + and d_year = 2000 +group by i_item_id +order by i_item_id limit 100 diff --git a/src/main/resources/tpcds/query08.sql b/src/main/resources/tpcds/query08.sql index e31c34c422..866e14cc85 100644 --- a/src/main/resources/tpcds/query08.sql +++ b/src/main/resources/tpcds/query08.sql @@ -1,105 +1,105 @@ -select s_store_name - ,sum(ss_net_profit) - from store_sales - ,date_dim - ,store, - (select ca_zip - from ( - SELECT substr(ca_zip,1,5) ca_zip - FROM customer_address - WHERE substr(ca_zip,1,5) IN ( - '24128','76232','65084','87816','83926','77556', - '20548','26231','43848','15126','91137', - '61265','98294','25782','17920','18426', - '98235','40081','84093','28577','55565', - '17183','54601','67897','22752','86284', - '18376','38607','45200','21756','29741', - '96765','23932','89360','29839','25989', - '28898','91068','72550','10390','18845', - '47770','82636','41367','76638','86198', - '81312','37126','39192','88424','72175', - '81426','53672','10445','42666','66864', - '66708','41248','48583','82276','18842', - '78890','49448','14089','38122','34425', - '79077','19849','43285','39861','66162', - '77610','13695','99543','83444','83041', - '12305','57665','68341','25003','57834', - '62878','49130','81096','18840','27700', - '23470','50412','21195','16021','76107', - '71954','68309','18119','98359','64544', - '10336','86379','27068','39736','98569', - '28915','24206','56529','57647','54917', - '42961','91110','63981','14922','36420', - '23006','67467','32754','30903','20260', - '31671','51798','72325','85816','68621', - '13955','36446','41766','68806','16725', - '15146','22744','35850','88086','51649', - '18270','52867','39972','96976','63792', - '11376','94898','13595','10516','90225', - '58943','39371','94945','28587','96576', - '57855','28488','26105','83933','25858', - '34322','44438','73171','30122','34102', - '22685','71256','78451','54364','13354', - '45375','40558','56458','28286','45266', - '47305','69399','83921','26233','11101', - '15371','69913','35942','15882','25631', - '24610','44165','99076','33786','70738', - '26653','14328','72305','62496','22152', - '10144','64147','48425','14663','21076', - '18799','30450','63089','81019','68893', - '24996','51200','51211','45692','92712', - '70466','79994','22437','25280','38935', - '71791','73134','56571','14060','19505', - '72425','56575','74351','68786','51650', - '20004','18383','76614','11634','18906', - '15765','41368','73241','76698','78567', - '97189','28545','76231','75691','22246', - '51061','90578','56691','68014','51103', - '94167','57047','14867','73520','15734', - '63435','25733','35474','24676','94627', - '53535','17879','15559','53268','59166', - '11928','59402','33282','45721','43933', - '68101','33515','36634','71286','19736', - '58058','55253','67473','41918','19515', - '36495','19430','22351','77191','91393', - '49156','50298','87501','18652','53179', - '18767','63193','23968','65164','68880', - '21286','72823','58470','67301','13394', - '31016','70372','67030','40604','24317', - '45748','39127','26065','77721','31029', - '31880','60576','24671','45549','13376', - '50016','33123','19769','22927','97789', - '46081','72151','15723','46136','51949', - '68100','96888','64528','14171','79777', - '28709','11489','25103','32213','78668', - '22245','15798','27156','37930','62971', - '21337','51622','67853','10567','38415', - '15455','58263','42029','60279','37125', - '56240','88190','50308','26859','64457', - '89091','82136','62377','36233','63837', - '58078','17043','30010','60099','28810', - '98025','29178','87343','73273','30469', - '64034','39516','86057','21309','90257', - '67875','40162','11356','73650','61810', - '72013','30431','22461','19512','13375', - '55307','30625','83849','68908','26689', - '96451','38193','46820','88885','84935', - '69035','83144','47537','56616','94983', - '48033','69952','25486','61547','27385', - '61860','58048','56910','16807','17871', - '35258','31387','35458','35576') - intersect - select ca_zip - from (SELECT substr(ca_zip,1,5) ca_zip,count(*) cnt - FROM customer_address, customer - WHERE ca_address_sk = c_current_addr_sk and - c_preferred_cust_flag='Y' - group by ca_zip - having count(*) > 10)A1)A2) V1 - where ss_store_sk = s_store_sk +select s_store_name + , sum(ss_net_profit) +from store_sales + , date_dim + , store + , (select ca_zip + from (SELECT substr(ca_zip, 1, 5) ca_zip + FROM customer_address + WHERE substr(ca_zip, 1, 5) IN ( + '24128', '76232', '65084', '87816', '83926', '77556', + '20548', '26231', '43848', '15126', '91137', + '61265', '98294', '25782', '17920', '18426', + '98235', '40081', '84093', '28577', '55565', + '17183', '54601', '67897', '22752', '86284', + '18376', '38607', '45200', '21756', '29741', + '96765', '23932', '89360', '29839', '25989', + '28898', '91068', '72550', '10390', '18845', + '47770', '82636', '41367', '76638', '86198', + '81312', '37126', '39192', '88424', '72175', + '81426', '53672', '10445', '42666', '66864', + '66708', '41248', '48583', '82276', '18842', + '78890', '49448', '14089', '38122', '34425', + '79077', '19849', '43285', '39861', '66162', + '77610', '13695', '99543', '83444', '83041', + '12305', '57665', '68341', '25003', '57834', + '62878', '49130', '81096', '18840', '27700', + '23470', '50412', '21195', '16021', '76107', + '71954', '68309', '18119', '98359', '64544', + '10336', '86379', '27068', '39736', '98569', + '28915', '24206', '56529', '57647', '54917', + '42961', '91110', '63981', '14922', '36420', + '23006', '67467', '32754', '30903', '20260', + '31671', '51798', '72325', '85816', '68621', + '13955', '36446', '41766', '68806', '16725', + '15146', '22744', '35850', '88086', '51649', + '18270', '52867', '39972', '96976', '63792', + '11376', '94898', '13595', '10516', '90225', + '58943', '39371', '94945', '28587', '96576', + '57855', '28488', '26105', '83933', '25858', + '34322', '44438', '73171', '30122', '34102', + '22685', '71256', '78451', '54364', '13354', + '45375', '40558', '56458', '28286', '45266', + '47305', '69399', '83921', '26233', '11101', + '15371', '69913', '35942', '15882', '25631', + '24610', '44165', '99076', '33786', '70738', + '26653', '14328', '72305', '62496', '22152', + '10144', '64147', '48425', '14663', '21076', + '18799', '30450', '63089', '81019', '68893', + '24996', '51200', '51211', '45692', '92712', + '70466', '79994', '22437', '25280', '38935', + '71791', '73134', '56571', '14060', '19505', + '72425', '56575', '74351', '68786', '51650', + '20004', '18383', '76614', '11634', '18906', + '15765', '41368', '73241', '76698', '78567', + '97189', '28545', '76231', '75691', '22246', + '51061', '90578', '56691', '68014', '51103', + '94167', '57047', '14867', '73520', '15734', + '63435', '25733', '35474', '24676', '94627', + '53535', '17879', '15559', '53268', '59166', + '11928', '59402', '33282', '45721', '43933', + '68101', '33515', '36634', '71286', '19736', + '58058', '55253', '67473', '41918', '19515', + '36495', '19430', '22351', '77191', '91393', + '49156', '50298', '87501', '18652', '53179', + '18767', '63193', '23968', '65164', '68880', + '21286', '72823', '58470', '67301', '13394', + '31016', '70372', '67030', '40604', '24317', + '45748', '39127', '26065', '77721', '31029', + '31880', '60576', '24671', '45549', '13376', + '50016', '33123', '19769', '22927', '97789', + '46081', '72151', '15723', '46136', '51949', + '68100', '96888', '64528', '14171', '79777', + '28709', '11489', '25103', '32213', '78668', + '22245', '15798', '27156', '37930', '62971', + '21337', '51622', '67853', '10567', '38415', + '15455', '58263', '42029', '60279', '37125', + '56240', '88190', '50308', '26859', '64457', + '89091', '82136', '62377', '36233', '63837', + '58078', '17043', '30010', '60099', '28810', + '98025', '29178', '87343', '73273', '30469', + '64034', '39516', '86057', '21309', '90257', + '67875', '40162', '11356', '73650', '61810', + '72013', '30431', '22461', '19512', '13375', + '55307', '30625', '83849', '68908', '26689', + '96451', '38193', '46820', '88885', '84935', + '69035', '83144', '47537', '56616', '94983', + '48033', '69952', '25486', '61547', '27385', + '61860', '58048', '56910', '16807', '17871', + '35258', '31387', '35458', '35576') + intersect + select ca_zip + from (SELECT substr(ca_zip, 1, 5) ca_zip, count(*) cnt + FROM customer_address, + customer + WHERE ca_address_sk = c_current_addr_sk + and c_preferred_cust_flag = 'Y' + group by ca_zip + having count(*) > 10) A1) A2) V1 +where ss_store_sk = s_store_sk and ss_sold_date_sk = d_date_sk - and d_qoy = 2 and d_year = 1998 - and (substr(s_zip,1,2) = substr(V1.ca_zip,1,2)) - group by s_store_name - order by s_store_name - limit 100 + and d_qoy = 2 + and d_year = 1998 + and (substr(s_zip, 1, 2) = substr(V1.ca_zip, 1, 2)) +group by s_store_name +order by s_store_name limit 100 diff --git a/src/main/resources/tpcds/query09.sql b/src/main/resources/tpcds/query09.sql index 8a03c62b7b..abdd1e57c7 100644 --- a/src/main/resources/tpcds/query09.sql +++ b/src/main/resources/tpcds/query09.sql @@ -1,48 +1,53 @@ -select case when (select count(*) - from store_sales - where ss_quantity between 1 and 20) > 74129 - then (select avg(ss_ext_discount_amt) - from store_sales - where ss_quantity between 1 and 20) - else (select avg(ss_net_paid) - from store_sales - where ss_quantity between 1 and 20) end bucket1 , - case when (select count(*) - from store_sales - where ss_quantity between 21 and 40) > 122840 - then (select avg(ss_ext_discount_amt) - from store_sales - where ss_quantity between 21 and 40) - else (select avg(ss_net_paid) - from store_sales - where ss_quantity between 21 and 40) end bucket2, - case when (select count(*) - from store_sales - where ss_quantity between 41 and 60) > 56580 - then (select avg(ss_ext_discount_amt) - from store_sales - where ss_quantity between 41 and 60) - else (select avg(ss_net_paid) - from store_sales - where ss_quantity between 41 and 60) end bucket3, - case when (select count(*) - from store_sales - where ss_quantity between 61 and 80) > 10097 - then (select avg(ss_ext_discount_amt) - from store_sales - where ss_quantity between 61 and 80) - else (select avg(ss_net_paid) - from store_sales - where ss_quantity between 61 and 80) end bucket4, - case when (select count(*) - from store_sales - where ss_quantity between 81 and 100) > 165306 - then (select avg(ss_ext_discount_amt) - from store_sales - where ss_quantity between 81 and 100) - else (select avg(ss_net_paid) - from store_sales - where ss_quantity between 81 and 100) end bucket5 +select case + when (select count(*) + from store_sales + where ss_quantity between 1 and 20) > 74129 + then (select avg(ss_ext_discount_amt) + from store_sales + where ss_quantity between 1 and 20) + else (select avg(ss_net_paid) + from store_sales + where ss_quantity between 1 and 20) end bucket1, + case + when (select count(*) + from store_sales + where ss_quantity between 21 and 40) > 122840 + then (select avg(ss_ext_discount_amt) + from store_sales + where ss_quantity between 21 and 40) + else (select avg(ss_net_paid) + from store_sales + where ss_quantity between 21 and 40) end bucket2, + case + when (select count(*) + from store_sales + where ss_quantity between 41 and 60) > 56580 + then (select avg(ss_ext_discount_amt) + from store_sales + where ss_quantity between 41 and 60) + else (select avg(ss_net_paid) + from store_sales + where ss_quantity between 41 and 60) end bucket3, + case + when (select count(*) + from store_sales + where ss_quantity between 61 and 80) > 10097 + then (select avg(ss_ext_discount_amt) + from store_sales + where ss_quantity between 61 and 80) + else (select avg(ss_net_paid) + from store_sales + where ss_quantity between 61 and 80) end bucket4, + case + when (select count(*) + from store_sales + where ss_quantity between 81 and 100) > 165306 + then (select avg(ss_ext_discount_amt) + from store_sales + where ss_quantity between 81 and 100) + else (select avg(ss_net_paid) + from store_sales + where ss_quantity between 81 and 100) end bucket5 from reason where r_reason_sk = 1 diff --git a/src/main/resources/tpcds/query10.sql b/src/main/resources/tpcds/query10.sql index 752d852f1d..00d10de59e 100644 --- a/src/main/resources/tpcds/query10.sql +++ b/src/main/resources/tpcds/query10.sql @@ -1,56 +1,57 @@ -select - cd_gender, - cd_marital_status, - cd_education_status, - count(*) cnt1, - cd_purchase_estimate, - count(*) cnt2, - cd_credit_rating, - count(*) cnt3, - cd_dep_count, - count(*) cnt4, - cd_dep_employed_count, - count(*) cnt5, - cd_dep_college_count, - count(*) cnt6 - from - customer c,customer_address ca,customer_demographics - where - c.c_current_addr_sk = ca.ca_address_sk and - ca_county in ('Rush County','Toole County','Jefferson County','Dona Ana County','La Porte County') and - cd_demo_sk = c.c_current_cdemo_sk and - exists (select * - from store_sales,date_dim - where c.c_customer_sk = ss_customer_sk and - ss_sold_date_sk = d_date_sk and - d_year = 2002 and - d_moy between 1 and 1+3) and - (exists (select * - from web_sales,date_dim - where c.c_customer_sk = ws_bill_customer_sk and - ws_sold_date_sk = d_date_sk and - d_year = 2002 and - d_moy between 1 ANd 1+3) or - exists (select * - from catalog_sales,date_dim - where c.c_customer_sk = cs_ship_customer_sk and - cs_sold_date_sk = d_date_sk and - d_year = 2002 and - d_moy between 1 and 1+3)) - group by cd_gender, - cd_marital_status, - cd_education_status, - cd_purchase_estimate, - cd_credit_rating, - cd_dep_count, - cd_dep_employed_count, - cd_dep_college_count - order by cd_gender, - cd_marital_status, - cd_education_status, - cd_purchase_estimate, - cd_credit_rating, - cd_dep_count, - cd_dep_employed_count, - cd_dep_college_count - limit 100 +select cd_gender, + cd_marital_status, + cd_education_status, + count(*) cnt1, + cd_purchase_estimate, + count(*) cnt2, + cd_credit_rating, + count(*) cnt3, + cd_dep_count, + count(*) cnt4, + cd_dep_employed_count, + count(*) cnt5, + cd_dep_college_count, + count(*) cnt6 +from customer c, + customer_address ca, + customer_demographics +where c.c_current_addr_sk = ca.ca_address_sk + and ca_county in ('Rush County', 'Toole County', 'Jefferson County', 'Dona Ana County', 'La Porte County') + and cd_demo_sk = c.c_current_cdemo_sk + and exists(select * + from store_sales, + date_dim + where c.c_customer_sk = ss_customer_sk + and ss_sold_date_sk = d_date_sk + and d_year = 2002 + and d_moy between 1 and 1 + 3) + and (exists(select * + from web_sales, + date_dim + where c.c_customer_sk = ws_bill_customer_sk + and ws_sold_date_sk = d_date_sk + and d_year = 2002 + and d_moy between 1 ANd 1 + 3) or + exists(select * + from catalog_sales, + date_dim + where c.c_customer_sk = cs_ship_customer_sk + and cs_sold_date_sk = d_date_sk + and d_year = 2002 + and d_moy between 1 and 1 + 3)) +group by cd_gender, + cd_marital_status, + cd_education_status, + cd_purchase_estimate, + cd_credit_rating, + cd_dep_count, + cd_dep_employed_count, + cd_dep_college_count +order by cd_gender, + cd_marital_status, + cd_education_status, + cd_purchase_estimate, + cd_credit_rating, + cd_dep_count, + cd_dep_employed_count, + cd_dep_college_count limit 100 diff --git a/src/main/resources/tpcds/query11.sql b/src/main/resources/tpcds/query11.sql index 671ddb1783..14fa239f9c 100644 --- a/src/main/resources/tpcds/query11.sql +++ b/src/main/resources/tpcds/query11.sql @@ -1,78 +1,74 @@ -with year_total as ( - select c_customer_id customer_id - ,c_first_name customer_first_name - ,c_last_name customer_last_name - ,c_preferred_cust_flag customer_preferred_cust_flag - ,c_birth_country customer_birth_country - ,c_login customer_login - ,c_email_address customer_email_address - ,d_year dyear - ,sum(ss_ext_list_price-ss_ext_discount_amt) year_total - ,'s' sale_type - from customer - ,store_sales - ,date_dim - where c_customer_sk = ss_customer_sk - and ss_sold_date_sk = d_date_sk - group by c_customer_id - ,c_first_name - ,c_last_name - ,c_preferred_cust_flag - ,c_birth_country - ,c_login - ,c_email_address - ,d_year - union all - select c_customer_id customer_id - ,c_first_name customer_first_name - ,c_last_name customer_last_name - ,c_preferred_cust_flag customer_preferred_cust_flag - ,c_birth_country customer_birth_country - ,c_login customer_login - ,c_email_address customer_email_address - ,d_year dyear - ,sum(ws_ext_list_price-ws_ext_discount_amt) year_total - ,'w' sale_type - from customer - ,web_sales - ,date_dim - where c_customer_sk = ws_bill_customer_sk - and ws_sold_date_sk = d_date_sk - group by c_customer_id - ,c_first_name - ,c_last_name - ,c_preferred_cust_flag - ,c_birth_country - ,c_login - ,c_email_address - ,d_year - ) - select - t_s_secyear.customer_id - ,t_s_secyear.customer_first_name - ,t_s_secyear.customer_last_name - ,t_s_secyear.customer_preferred_cust_flag - from year_total t_s_firstyear - ,year_total t_s_secyear - ,year_total t_w_firstyear - ,year_total t_w_secyear - where t_s_secyear.customer_id = t_s_firstyear.customer_id - and t_s_firstyear.customer_id = t_w_secyear.customer_id - and t_s_firstyear.customer_id = t_w_firstyear.customer_id - and t_s_firstyear.sale_type = 's' - and t_w_firstyear.sale_type = 'w' - and t_s_secyear.sale_type = 's' - and t_w_secyear.sale_type = 'w' - and t_s_firstyear.dyear = 2001 - and t_s_secyear.dyear = 2001+1 - and t_w_firstyear.dyear = 2001 - and t_w_secyear.dyear = 2001+1 - and t_s_firstyear.year_total > 0 - and t_w_firstyear.year_total > 0 - and case when t_w_firstyear.year_total > 0 then t_w_secyear.year_total / t_w_firstyear.year_total else 0.0 end - > case when t_s_firstyear.year_total > 0 then t_s_secyear.year_total / t_s_firstyear.year_total else 0.0 end - order by t_s_secyear.customer_id - ,t_s_secyear.customer_first_name - ,t_s_secyear.customer_last_name - ,t_s_secyear.customer_preferred_cust_flag - limit 100 +with year_total as (select c_customer_id customer_id + , c_first_name customer_first_name + , c_last_name customer_last_name + , c_preferred_cust_flag customer_preferred_cust_flag + , c_birth_country customer_birth_country + , c_login customer_login + , c_email_address customer_email_address + , d_year dyear + , sum(ss_ext_list_price - ss_ext_discount_amt) year_total + , 's' sale_type + from customer + , store_sales + , date_dim + where c_customer_sk = ss_customer_sk + and ss_sold_date_sk = d_date_sk + group by c_customer_id + , c_first_name + , c_last_name + , c_preferred_cust_flag + , c_birth_country + , c_login + , c_email_address + , d_year + union all + select c_customer_id customer_id + , c_first_name customer_first_name + , c_last_name customer_last_name + , c_preferred_cust_flag customer_preferred_cust_flag + , c_birth_country customer_birth_country + , c_login customer_login + , c_email_address customer_email_address + , d_year dyear + , sum(ws_ext_list_price - ws_ext_discount_amt) year_total + , 'w' sale_type + from customer + , web_sales + , date_dim + where c_customer_sk = ws_bill_customer_sk + and ws_sold_date_sk = d_date_sk + group by c_customer_id + , c_first_name + , c_last_name + , c_preferred_cust_flag + , c_birth_country + , c_login + , c_email_address + , d_year) +select t_s_secyear.customer_id + , t_s_secyear.customer_first_name + , t_s_secyear.customer_last_name + , t_s_secyear.customer_preferred_cust_flag +from year_total t_s_firstyear + , year_total t_s_secyear + , year_total t_w_firstyear + , year_total t_w_secyear +where t_s_secyear.customer_id = t_s_firstyear.customer_id + and t_s_firstyear.customer_id = t_w_secyear.customer_id + and t_s_firstyear.customer_id = t_w_firstyear.customer_id + and t_s_firstyear.sale_type = 's' + and t_w_firstyear.sale_type = 'w' + and t_s_secyear.sale_type = 's' + and t_w_secyear.sale_type = 'w' + and t_s_firstyear.dyear = 2001 + and t_s_secyear.dyear = 2001 + 1 + and t_w_firstyear.dyear = 2001 + and t_w_secyear.dyear = 2001 + 1 + and t_s_firstyear.year_total > 0 + and t_w_firstyear.year_total > 0 + and case when t_w_firstyear.year_total > 0 then t_w_secyear.year_total / t_w_firstyear.year_total else 0.0 end + > case when t_s_firstyear.year_total > 0 then t_s_secyear.year_total / t_s_firstyear.year_total else 0.0 end +order by t_s_secyear.customer_id + , t_s_secyear.customer_first_name + , t_s_secyear.customer_last_name + , t_s_secyear.customer_preferred_cust_flag limit 100 diff --git a/src/main/resources/tpcds/query12.sql b/src/main/resources/tpcds/query12.sql index 91cefc0481..069cfd2143 100644 --- a/src/main/resources/tpcds/query12.sql +++ b/src/main/resources/tpcds/query12.sql @@ -1,31 +1,25 @@ -select i_item_id - ,i_item_desc - ,i_category - ,i_class - ,i_current_price - ,sum(ws_ext_sales_price) as itemrevenue - ,sum(ws_ext_sales_price)*100/sum(sum(ws_ext_sales_price)) over - (partition by i_class) as revenueratio -from - web_sales - ,item - ,date_dim -where - ws_item_sk = i_item_sk - and i_category in ('Sports', 'Books', 'Home') - and ws_sold_date_sk = d_date_sk - and d_date between cast('1999-02-22' as date) - and date_add(cast('1999-02-22' as date), 30 ) -group by - i_item_id - ,i_item_desc - ,i_category - ,i_class - ,i_current_price -order by - i_category - ,i_class - ,i_item_id - ,i_item_desc - ,revenueratio - limit 100 +select i_item_id + , i_item_desc + , i_category + , i_class + , i_current_price + , sum(ws_ext_sales_price) as itemrevenue + , sum(ws_ext_sales_price) * 100 / sum(sum(ws_ext_sales_price)) over (partition by i_class) as revenueratio +from web_sales + , item + , date_dim +where ws_item_sk = i_item_sk + and i_category in ('Sports', 'Books', 'Home') + and ws_sold_date_sk = d_date_sk + and d_date between cast('1999-02-22' as date) + and date_add(cast('1999-02-22' as date), 30) +group by i_item_id + , i_item_desc + , i_category + , i_class + , i_current_price +order by i_category + , i_class + , i_item_id + , i_item_desc + , revenueratio limit 100 diff --git a/src/main/resources/tpcds/query13.sql b/src/main/resources/tpcds/query13.sql index 2e383ab06b..5ea7802fce 100644 --- a/src/main/resources/tpcds/query13.sql +++ b/src/main/resources/tpcds/query13.sql @@ -1,49 +1,50 @@ select avg(ss_quantity) - ,avg(ss_ext_sales_price) - ,avg(ss_ext_wholesale_cost) - ,sum(ss_ext_wholesale_cost) - from store_sales - ,store - ,customer_demographics - ,household_demographics - ,customer_address - ,date_dim - where s_store_sk = ss_store_sk - and ss_sold_date_sk = d_date_sk and d_year = 2001 - and((ss_hdemo_sk=hd_demo_sk - and cd_demo_sk = ss_cdemo_sk - and cd_marital_status = 'M' - and cd_education_status = 'Advanced Degree' - and ss_sales_price between 100.00 and 150.00 - and hd_dep_count = 3 - )or - (ss_hdemo_sk=hd_demo_sk - and cd_demo_sk = ss_cdemo_sk - and cd_marital_status = 'S' - and cd_education_status = 'College' - and ss_sales_price between 50.00 and 100.00 - and hd_dep_count = 1 - ) or - (ss_hdemo_sk=hd_demo_sk - and cd_demo_sk = ss_cdemo_sk - and cd_marital_status = 'W' - and cd_education_status = '2 yr Degree' - and ss_sales_price between 150.00 and 200.00 - and hd_dep_count = 1 - )) - and((ss_addr_sk = ca_address_sk - and ca_country = 'United States' - and ca_state in ('TX', 'OH', 'TX') - and ss_net_profit between 100 and 200 - ) or - (ss_addr_sk = ca_address_sk - and ca_country = 'United States' - and ca_state in ('OR', 'NM', 'KY') - and ss_net_profit between 150 and 300 - ) or - (ss_addr_sk = ca_address_sk - and ca_country = 'United States' - and ca_state in ('VA', 'TX', 'MS') - and ss_net_profit between 50 and 250 - )) + , avg(ss_ext_sales_price) + , avg(ss_ext_wholesale_cost) + , sum(ss_ext_wholesale_cost) +from store_sales + , store + , customer_demographics + , household_demographics + , customer_address + , date_dim +where s_store_sk = ss_store_sk + and ss_sold_date_sk = d_date_sk + and d_year = 2001 + and ((ss_hdemo_sk = hd_demo_sk + and cd_demo_sk = ss_cdemo_sk + and cd_marital_status = 'M' + and cd_education_status = 'Advanced Degree' + and ss_sales_price between 100.00 and 150.00 + and hd_dep_count = 3 + ) or + (ss_hdemo_sk = hd_demo_sk + and cd_demo_sk = ss_cdemo_sk + and cd_marital_status = 'S' + and cd_education_status = 'College' + and ss_sales_price between 50.00 and 100.00 + and hd_dep_count = 1 + ) or + (ss_hdemo_sk = hd_demo_sk + and cd_demo_sk = ss_cdemo_sk + and cd_marital_status = 'W' + and cd_education_status = '2 yr Degree' + and ss_sales_price between 150.00 and 200.00 + and hd_dep_count = 1 + )) + and ((ss_addr_sk = ca_address_sk + and ca_country = 'United States' + and ca_state in ('TX', 'OH', 'TX') + and ss_net_profit between 100 and 200 + ) or + (ss_addr_sk = ca_address_sk + and ca_country = 'United States' + and ca_state in ('OR', 'NM', 'KY') + and ss_net_profit between 150 and 300 + ) or + (ss_addr_sk = ca_address_sk + and ca_country = 'United States' + and ca_state in ('VA', 'TX', 'MS') + and ss_net_profit between 50 and 250 + )) diff --git a/src/main/resources/tpcds/query14.sql b/src/main/resources/tpcds/query14.sql index b110af303c..3ce5e0934a 100644 --- a/src/main/resources/tpcds/query14.sql +++ b/src/main/resources/tpcds/query14.sql @@ -1,195 +1,210 @@ -with cross_items as - (select i_item_sk ss_item_sk - from item, - (select iss.i_brand_id brand_id - ,iss.i_class_id class_id - ,iss.i_category_id category_id - from store_sales - ,item iss - ,date_dim d1 - where ss_item_sk = iss.i_item_sk - and ss_sold_date_sk = d1.d_date_sk - and d1.d_year between 1999 AND 1999 + 2 - intersect - select ics.i_brand_id - ,ics.i_class_id - ,ics.i_category_id - from catalog_sales - ,item ics - ,date_dim d2 - where cs_item_sk = ics.i_item_sk - and cs_sold_date_sk = d2.d_date_sk - and d2.d_year between 1999 AND 1999 + 2 - intersect - select iws.i_brand_id - ,iws.i_class_id - ,iws.i_category_id - from web_sales - ,item iws - ,date_dim d3 - where ws_item_sk = iws.i_item_sk - and ws_sold_date_sk = d3.d_date_sk - and d3.d_year between 1999 AND 1999 + 2) - where i_brand_id = brand_id - and i_class_id = class_id - and i_category_id = category_id -), - avg_sales as - (select avg(quantity*list_price) average_sales - from (select ss_quantity quantity - ,ss_list_price list_price - from store_sales - ,date_dim - where ss_sold_date_sk = d_date_sk - and d_year between 1999 and 1999 + 2 - union all - select cs_quantity quantity - ,cs_list_price list_price - from catalog_sales - ,date_dim - where cs_sold_date_sk = d_date_sk - and d_year between 1999 and 1999 + 2 - union all - select ws_quantity quantity - ,ws_list_price list_price - from web_sales - ,date_dim - where ws_sold_date_sk = d_date_sk - and d_year between 1999 and 1999 + 2) x) - select channel, i_brand_id,i_class_id,i_category_id,sum(sales), sum(number_sales) - from( - select 'store' channel, i_brand_id,i_class_id - ,i_category_id,sum(ss_quantity*ss_list_price) sales - , count(*) number_sales - from store_sales - ,item - ,date_dim - where ss_item_sk in (select ss_item_sk from cross_items) - and ss_item_sk = i_item_sk - and ss_sold_date_sk = d_date_sk - and d_year = 1999+2 - and d_moy = 11 - group by i_brand_id,i_class_id,i_category_id - having sum(ss_quantity*ss_list_price) > (select average_sales from avg_sales) - union all - select 'catalog' channel, i_brand_id,i_class_id,i_category_id, sum(cs_quantity*cs_list_price) sales, count(*) number_sales - from catalog_sales - ,item - ,date_dim - where cs_item_sk in (select ss_item_sk from cross_items) - and cs_item_sk = i_item_sk - and cs_sold_date_sk = d_date_sk - and d_year = 1999+2 - and d_moy = 11 - group by i_brand_id,i_class_id,i_category_id - having sum(cs_quantity*cs_list_price) > (select average_sales from avg_sales) - union all - select 'web' channel, i_brand_id,i_class_id,i_category_id, sum(ws_quantity*ws_list_price) sales , count(*) number_sales - from web_sales - ,item - ,date_dim - where ws_item_sk in (select ss_item_sk from cross_items) - and ws_item_sk = i_item_sk - and ws_sold_date_sk = d_date_sk - and d_year = 1999+2 - and d_moy = 11 - group by i_brand_id,i_class_id,i_category_id - having sum(ws_quantity*ws_list_price) > (select average_sales from avg_sales) - ) y - group by rollup (channel, i_brand_id,i_class_id,i_category_id) - order by channel,i_brand_id,i_class_id,i_category_id - limit 100; - with cross_items as - (select i_item_sk ss_item_sk - from item, - (select iss.i_brand_id brand_id - ,iss.i_class_id class_id - ,iss.i_category_id category_id - from store_sales - ,item iss - ,date_dim d1 - where ss_item_sk = iss.i_item_sk - and ss_sold_date_sk = d1.d_date_sk - and d1.d_year between 1999 AND 1999 + 2 - intersect - select ics.i_brand_id - ,ics.i_class_id - ,ics.i_category_id - from catalog_sales - ,item ics - ,date_dim d2 - where cs_item_sk = ics.i_item_sk - and cs_sold_date_sk = d2.d_date_sk - and d2.d_year between 1999 AND 1999 + 2 - intersect - select iws.i_brand_id - ,iws.i_class_id - ,iws.i_category_id - from web_sales - ,item iws - ,date_dim d3 - where ws_item_sk = iws.i_item_sk - and ws_sold_date_sk = d3.d_date_sk - and d3.d_year between 1999 AND 1999 + 2) x - where i_brand_id = brand_id - and i_class_id = class_id - and i_category_id = category_id -), - avg_sales as -(select avg(quantity*list_price) average_sales - from (select ss_quantity quantity - ,ss_list_price list_price - from store_sales - ,date_dim - where ss_sold_date_sk = d_date_sk - and d_year between 1999 and 1999 + 2 - union all - select cs_quantity quantity - ,cs_list_price list_price - from catalog_sales - ,date_dim - where cs_sold_date_sk = d_date_sk - and d_year between 1999 and 1999 + 2 - union all - select ws_quantity quantity - ,ws_list_price list_price - from web_sales - ,date_dim - where ws_sold_date_sk = d_date_sk - and d_year between 1999 and 1999 + 2) x) - select * from - (select 'store' channel, i_brand_id,i_class_id,i_category_id - ,sum(ss_quantity*ss_list_price) sales, count(*) number_sales - from store_sales - ,item - ,date_dim - where ss_item_sk in (select ss_item_sk from cross_items) - and ss_item_sk = i_item_sk - and ss_sold_date_sk = d_date_sk - and d_week_seq = (select d_week_seq - from date_dim - where d_year = 1999 + 1 - and d_moy = 12 - and d_dom = 11) - group by i_brand_id,i_class_id,i_category_id - having sum(ss_quantity*ss_list_price) > (select average_sales from avg_sales)) this_year, - (select 'store' channel_2, i_brand_id as i_brand_id_2, i_class_id as i_class_id_2 - ,i_category_id as i_category_id_2 , sum(ss_quantity*ss_list_price) sales_2, count(*) number_sales_2 - from store_sales - ,item - ,date_dim - where ss_item_sk in (select ss_item_sk from cross_items) - and ss_item_sk = i_item_sk - and ss_sold_date_sk = d_date_sk - and d_week_seq = (select d_week_seq - from date_dim - where d_year = 1999 - and d_moy = 12 - and d_dom = 11) - group by i_brand_id,i_class_id,i_category_id - having sum(ss_quantity*ss_list_price) > (select average_sales from avg_sales)) last_year - where this_year.i_brand_id= last_year.i_brand_id_2 - and this_year.i_class_id = last_year.i_class_id_2 - and this_year.i_category_id = last_year.i_category_id_2 - order by this_year.channel, this_year.i_brand_id, this_year.i_class_id, this_year.i_category_id - limit 100 +with cross_items as + (select i_item_sk ss_item_sk + from item, + (select iss.i_brand_id brand_id + , iss.i_class_id class_id + , iss.i_category_id category_id + from store_sales + , item iss + , date_dim d1 + where ss_item_sk = iss.i_item_sk + and ss_sold_date_sk = d1.d_date_sk + and d1.d_year between 1999 AND 1999 + 2 + intersect + select ics.i_brand_id + , ics.i_class_id + , ics.i_category_id + from catalog_sales + , item ics + , date_dim d2 + where cs_item_sk = ics.i_item_sk + and cs_sold_date_sk = d2.d_date_sk + and d2.d_year between 1999 AND 1999 + 2 + intersect + select iws.i_brand_id + , iws.i_class_id + , iws.i_category_id + from web_sales + , item iws + , date_dim d3 + where ws_item_sk = iws.i_item_sk + and ws_sold_date_sk = d3.d_date_sk + and d3.d_year between 1999 AND 1999 + 2) + where i_brand_id = brand_id + and i_class_id = class_id + and i_category_id = category_id), + avg_sales as + (select avg(quantity * list_price) average_sales + from (select ss_quantity quantity + , ss_list_price list_price + from store_sales + , date_dim + where ss_sold_date_sk = d_date_sk + and d_year between 1999 and 1999 + 2 + union all + select cs_quantity quantity + , cs_list_price list_price + from catalog_sales + , date_dim + where cs_sold_date_sk = d_date_sk + and d_year between 1999 and 1999 + 2 + union all + select ws_quantity quantity + , ws_list_price list_price + from web_sales + , date_dim + where ws_sold_date_sk = d_date_sk + and d_year between 1999 and 1999 + 2) x) +select channel, i_brand_id, i_class_id, i_category_id, sum(sales), sum(number_sales) +from (select 'store' channel + , i_brand_id + , i_class_id + , i_category_id + , sum(ss_quantity * ss_list_price) sales + , count(*) number_sales + from store_sales + , item + , date_dim + where ss_item_sk in (select ss_item_sk from cross_items) + and ss_item_sk = i_item_sk + and ss_sold_date_sk = d_date_sk + and d_year = 1999 + 2 + and d_moy = 11 + group by i_brand_id, i_class_id, i_category_id + having sum(ss_quantity * ss_list_price) > (select average_sales from avg_sales) + union all + select 'catalog' channel, + i_brand_id, + i_class_id, + i_category_id, + sum(cs_quantity * cs_list_price) sales, + count(*) number_sales + from catalog_sales + , item + , date_dim + where cs_item_sk in (select ss_item_sk from cross_items) + and cs_item_sk = i_item_sk + and cs_sold_date_sk = d_date_sk + and d_year = 1999 + 2 + and d_moy = 11 + group by i_brand_id, i_class_id, i_category_id + having sum(cs_quantity * cs_list_price) > (select average_sales from avg_sales) + union all + select 'web' channel, + i_brand_id, + i_class_id, + i_category_id, + sum(ws_quantity * ws_list_price) sales, + count(*) number_sales + from web_sales + , item + , date_dim + where ws_item_sk in (select ss_item_sk from cross_items) + and ws_item_sk = i_item_sk + and ws_sold_date_sk = d_date_sk + and d_year = 1999 + 2 + and d_moy = 11 + group by i_brand_id, i_class_id, i_category_id + having sum(ws_quantity * ws_list_price) > (select average_sales from avg_sales)) y +group by rollup (channel, i_brand_id, i_class_id, i_category_id) +order by channel, i_brand_id, i_class_id, i_category_id limit 100; +with cross_items as + (select i_item_sk ss_item_sk + from item, + (select iss.i_brand_id brand_id + , iss.i_class_id class_id + , iss.i_category_id category_id + from store_sales + , item iss + , date_dim d1 + where ss_item_sk = iss.i_item_sk + and ss_sold_date_sk = d1.d_date_sk + and d1.d_year between 1999 AND 1999 + 2 + intersect + select ics.i_brand_id + , ics.i_class_id + , ics.i_category_id + from catalog_sales + , item ics + , date_dim d2 + where cs_item_sk = ics.i_item_sk + and cs_sold_date_sk = d2.d_date_sk + and d2.d_year between 1999 AND 1999 + 2 + intersect + select iws.i_brand_id + , iws.i_class_id + , iws.i_category_id + from web_sales + , item iws + , date_dim d3 + where ws_item_sk = iws.i_item_sk + and ws_sold_date_sk = d3.d_date_sk + and d3.d_year between 1999 AND 1999 + 2) x + where i_brand_id = brand_id + and i_class_id = class_id + and i_category_id = category_id), + avg_sales as + (select avg(quantity * list_price) average_sales + from (select ss_quantity quantity + , ss_list_price list_price + from store_sales + , date_dim + where ss_sold_date_sk = d_date_sk + and d_year between 1999 and 1999 + 2 + union all + select cs_quantity quantity + , cs_list_price list_price + from catalog_sales + , date_dim + where cs_sold_date_sk = d_date_sk + and d_year between 1999 and 1999 + 2 + union all + select ws_quantity quantity + , ws_list_price list_price + from web_sales + , date_dim + where ws_sold_date_sk = d_date_sk + and d_year between 1999 and 1999 + 2) x) +select * +from (select 'store' channel + , i_brand_id + , i_class_id + , i_category_id + , sum(ss_quantity * ss_list_price) sales + , count(*) number_sales + from store_sales + , item + , date_dim + where ss_item_sk in (select ss_item_sk from cross_items) + and ss_item_sk = i_item_sk + and ss_sold_date_sk = d_date_sk + and d_week_seq = (select d_week_seq + from date_dim + where d_year = 1999 + 1 + and d_moy = 12 + and d_dom = 11) + group by i_brand_id, i_class_id, i_category_id + having sum(ss_quantity * ss_list_price) > (select average_sales from avg_sales)) this_year, + (select 'store' channel_2 + , i_brand_id as i_brand_id_2 + , i_class_id as i_class_id_2 + , i_category_id as i_category_id_2 + , sum(ss_quantity * ss_list_price) sales_2 + , count(*) number_sales_2 + from store_sales + , item + , date_dim + where ss_item_sk in (select ss_item_sk from cross_items) + and ss_item_sk = i_item_sk + and ss_sold_date_sk = d_date_sk + and d_week_seq = (select d_week_seq + from date_dim + where d_year = 1999 + and d_moy = 12 + and d_dom = 11) + group by i_brand_id, i_class_id, i_category_id + having sum(ss_quantity * ss_list_price) > (select average_sales from avg_sales)) last_year +where this_year.i_brand_id = last_year.i_brand_id_2 + and this_year.i_class_id = last_year.i_class_id_2 + and this_year.i_category_id = last_year.i_category_id_2 +order by this_year.channel, this_year.i_brand_id, this_year.i_class_id, this_year.i_category_id limit 100 diff --git a/src/main/resources/tpcds/query15.sql b/src/main/resources/tpcds/query15.sql index e838df9077..a1ae851cd0 100644 --- a/src/main/resources/tpcds/query15.sql +++ b/src/main/resources/tpcds/query15.sql @@ -1,17 +1,17 @@ -select ca_zip - ,sum(cs_sales_price) - from catalog_sales - ,customer - ,customer_address - ,date_dim - where cs_bill_customer_sk = c_customer_sk - and c_current_addr_sk = ca_address_sk - and ( substr(ca_zip,1,5) in ('85669', '86197','88274','83405','86475', - '85392', '85460', '80348', '81792') - or ca_state in ('CA','WA','GA') - or cs_sales_price > 500) - and cs_sold_date_sk = d_date_sk - and d_qoy = 2 and d_year = 2001 - group by ca_zip - order by ca_zip - limit 100 \ No newline at end of file +select ca_zip + , sum(cs_sales_price) +from catalog_sales + , customer + , customer_address + , date_dim +where cs_bill_customer_sk = c_customer_sk + and c_current_addr_sk = ca_address_sk + and (substr(ca_zip, 1, 5) in ('85669', '86197', '88274', '83405', '86475', + '85392', '85460', '80348', '81792') + or ca_state in ('CA', 'WA', 'GA') + or cs_sales_price > 500) + and cs_sold_date_sk = d_date_sk + and d_qoy = 2 + and d_year = 2001 +group by ca_zip +order by ca_zip limit 100 \ No newline at end of file diff --git a/src/main/resources/tpcds/query16.sql b/src/main/resources/tpcds/query16.sql index 43f2d00e21..ee3912d0cd 100644 --- a/src/main/resources/tpcds/query16.sql +++ b/src/main/resources/tpcds/query16.sql @@ -1,28 +1,24 @@ -select - count(distinct cs_order_number) as order_count - ,sum(cs_ext_ship_cost) as total_shipping_cost - ,sum(cs_net_profit) as total_net_profit -from - catalog_sales cs1 - ,date_dim - ,customer_address - ,call_center -where - d_date between cast('2002-2-01' as date) and - date_add(cast('2002-2-01' as date), 60 ) -and cs1.cs_ship_date_sk = d_date_sk -and cs1.cs_ship_addr_sk = ca_address_sk -and ca_state = 'GA' -and cs1.cs_call_center_sk = cc_call_center_sk -and cc_county in ('Williamson County','Williamson County','Williamson County','Williamson County', - 'Williamson County' -) -and exists (select * - from catalog_sales cs2 - where cs1.cs_order_number = cs2.cs_order_number - and cs1.cs_warehouse_sk <> cs2.cs_warehouse_sk) -and not exists(select * - from catalog_returns cr1 - where cs1.cs_order_number = cr1.cr_order_number) -order by count(distinct cs_order_number) - limit 100 +select count(distinct cs_order_number) as order_count + , sum(cs_ext_ship_cost) as total_shipping_cost + , sum(cs_net_profit) as total_net_profit +from catalog_sales cs1 + , date_dim + , customer_address + , call_center +where d_date between cast('2002-2-01' as date) and + date_add(cast('2002-2-01' as date), 60) + and cs1.cs_ship_date_sk = d_date_sk + and cs1.cs_ship_addr_sk = ca_address_sk + and ca_state = 'GA' + and cs1.cs_call_center_sk = cc_call_center_sk + and cc_county in ('Williamson County', 'Williamson County', 'Williamson County', 'Williamson County', + 'Williamson County' + ) + and exists(select * + from catalog_sales cs2 + where cs1.cs_order_number = cs2.cs_order_number + and cs1.cs_warehouse_sk <> cs2.cs_warehouse_sk) + and not exists(select * + from catalog_returns cr1 + where cs1.cs_order_number = cr1.cr_order_number) +order by count(distinct cs_order_number) limit 100 diff --git a/src/main/resources/tpcds/query17.sql b/src/main/resources/tpcds/query17.sql index a1bb556616..9adbd41ab9 100644 --- a/src/main/resources/tpcds/query17.sql +++ b/src/main/resources/tpcds/query17.sql @@ -1,42 +1,42 @@ -select i_item_id - ,i_item_desc - ,s_state - ,count(ss_quantity) as store_sales_quantitycount - ,avg(ss_quantity) as store_sales_quantityave - ,stddev_samp(ss_quantity) as store_sales_quantitystdev - ,stddev_samp(ss_quantity)/avg(ss_quantity) as store_sales_quantitycov - ,count(sr_return_quantity) as store_returns_quantitycount - ,avg(sr_return_quantity) as store_returns_quantityave - ,stddev_samp(sr_return_quantity) as store_returns_quantitystdev - ,stddev_samp(sr_return_quantity)/avg(sr_return_quantity) as store_returns_quantitycov - ,count(cs_quantity) as catalog_sales_quantitycount ,avg(cs_quantity) as catalog_sales_quantityave - ,stddev_samp(cs_quantity) as catalog_sales_quantitystdev - ,stddev_samp(cs_quantity)/avg(cs_quantity) as catalog_sales_quantitycov - from store_sales - ,store_returns - ,catalog_sales - ,date_dim d1 - ,date_dim d2 - ,date_dim d3 - ,store - ,item - where d1.d_quarter_name = '2001Q1' - and d1.d_date_sk = ss_sold_date_sk - and i_item_sk = ss_item_sk - and s_store_sk = ss_store_sk - and ss_customer_sk = sr_customer_sk - and ss_item_sk = sr_item_sk - and ss_ticket_number = sr_ticket_number - and sr_returned_date_sk = d2.d_date_sk - and d2.d_quarter_name in ('2001Q1','2001Q2','2001Q3') - and sr_customer_sk = cs_bill_customer_sk - and sr_item_sk = cs_item_sk - and cs_sold_date_sk = d3.d_date_sk - and d3.d_quarter_name in ('2001Q1','2001Q2','2001Q3') - group by i_item_id - ,i_item_desc - ,s_state - order by i_item_id - ,i_item_desc - ,s_state - limit 100 \ No newline at end of file +select i_item_id + , i_item_desc + , s_state + , count(ss_quantity) as store_sales_quantitycount + , avg(ss_quantity) as store_sales_quantityave + , stddev_samp(ss_quantity) as store_sales_quantitystdev + , stddev_samp(ss_quantity) / avg(ss_quantity) as store_sales_quantitycov + , count(sr_return_quantity) as store_returns_quantitycount + , avg(sr_return_quantity) as store_returns_quantityave + , stddev_samp(sr_return_quantity) as store_returns_quantitystdev + , stddev_samp(sr_return_quantity) / avg(sr_return_quantity) as store_returns_quantitycov + , count(cs_quantity) as catalog_sales_quantitycount + , avg(cs_quantity) as catalog_sales_quantityave + , stddev_samp(cs_quantity) as catalog_sales_quantitystdev + , stddev_samp(cs_quantity) / avg(cs_quantity) as catalog_sales_quantitycov +from store_sales + , store_returns + , catalog_sales + , date_dim d1 + , date_dim d2 + , date_dim d3 + , store + , item +where d1.d_quarter_name = '2001Q1' + and d1.d_date_sk = ss_sold_date_sk + and i_item_sk = ss_item_sk + and s_store_sk = ss_store_sk + and ss_customer_sk = sr_customer_sk + and ss_item_sk = sr_item_sk + and ss_ticket_number = sr_ticket_number + and sr_returned_date_sk = d2.d_date_sk + and d2.d_quarter_name in ('2001Q1', '2001Q2', '2001Q3') + and sr_customer_sk = cs_bill_customer_sk + and sr_item_sk = cs_item_sk + and cs_sold_date_sk = d3.d_date_sk + and d3.d_quarter_name in ('2001Q1', '2001Q2', '2001Q3') +group by i_item_id + , i_item_desc + , s_state +order by i_item_id + , i_item_desc + , s_state limit 100 \ No newline at end of file diff --git a/src/main/resources/tpcds/query18.sql b/src/main/resources/tpcds/query18.sql index e43a5bc4e6..bead08f617 100644 --- a/src/main/resources/tpcds/query18.sql +++ b/src/main/resources/tpcds/query18.sql @@ -1,31 +1,34 @@ -select i_item_id, - ca_country, - ca_state, - ca_county, - avg( cast(cs_quantity as decimal(12,2))) agg1, - avg( cast(cs_list_price as decimal(12,2))) agg2, - avg( cast(cs_coupon_amt as decimal(12,2))) agg3, - avg( cast(cs_sales_price as decimal(12,2))) agg4, - avg( cast(cs_net_profit as decimal(12,2))) agg5, - avg( cast(c_birth_year as decimal(12,2))) agg6, - avg( cast(cd1.cd_dep_count as decimal(12,2))) agg7 - from catalog_sales, customer_demographics cd1, - customer_demographics cd2, customer, customer_address, date_dim, item - where cs_sold_date_sk = d_date_sk and - cs_item_sk = i_item_sk and - cs_bill_cdemo_sk = cd1.cd_demo_sk and - cs_bill_customer_sk = c_customer_sk and - cd1.cd_gender = 'F' and - cd1.cd_education_status = 'Unknown' and - c_current_cdemo_sk = cd2.cd_demo_sk and - c_current_addr_sk = ca_address_sk and - c_birth_month in (1,6,8,9,12,2) and - d_year = 1998 and - ca_state in ('MS','IN','ND' - ,'OK','NM','VA','MS') - group by rollup (i_item_id, ca_country, ca_state, ca_county) - order by ca_country, - ca_state, - ca_county, - i_item_id - limit 100 +select i_item_id, + ca_country, + ca_state, + ca_county, + avg(cast(cs_quantity as decimal(12, 2))) agg1, + avg(cast(cs_list_price as decimal(12, 2))) agg2, + avg(cast(cs_coupon_amt as decimal(12, 2))) agg3, + avg(cast(cs_sales_price as decimal(12, 2))) agg4, + avg(cast(cs_net_profit as decimal(12, 2))) agg5, + avg(cast(c_birth_year as decimal(12, 2))) agg6, + avg(cast(cd1.cd_dep_count as decimal(12, 2))) agg7 +from catalog_sales, + customer_demographics cd1, + customer_demographics cd2, + customer, + customer_address, + date_dim, + item +where cs_sold_date_sk = d_date_sk + and cs_item_sk = i_item_sk + and cs_bill_cdemo_sk = cd1.cd_demo_sk + and cs_bill_customer_sk = c_customer_sk + and cd1.cd_gender = 'F' + and cd1.cd_education_status = 'Unknown' + and c_current_cdemo_sk = cd2.cd_demo_sk + and c_current_addr_sk = ca_address_sk + and c_birth_month in (1, 6, 8, 9, 12, 2) + and d_year = 1998 + and ca_state in ('MS', 'IN', 'ND', 'OK', 'NM', 'VA', 'MS') +group by rollup (i_item_id, ca_country, ca_state, ca_county) +order by ca_country, + ca_state, + ca_county, + i_item_id limit 100 diff --git a/src/main/resources/tpcds/query19.sql b/src/main/resources/tpcds/query19.sql index 0ce2adcaa7..dab7b9c068 100644 --- a/src/main/resources/tpcds/query19.sql +++ b/src/main/resources/tpcds/query19.sql @@ -1,22 +1,29 @@ -select i_brand_id brand_id, i_brand brand, i_manufact_id, i_manufact, - sum(ss_ext_sales_price) ext_price - from date_dim, store_sales, item,customer,customer_address,store - where d_date_sk = ss_sold_date_sk - and ss_item_sk = i_item_sk - and i_manager_id=8 - and d_moy=11 - and d_year=1998 - and ss_customer_sk = c_customer_sk - and c_current_addr_sk = ca_address_sk - and substr(ca_zip,1,5) <> substr(s_zip,1,5) - and ss_store_sk = s_store_sk - group by i_brand - ,i_brand_id - ,i_manufact_id - ,i_manufact - order by ext_price desc - ,i_brand - ,i_brand_id - ,i_manufact_id - ,i_manufact - limit 100 +select i_brand_id brand_id, + i_brand brand, + i_manufact_id, + i_manufact, + sum(ss_ext_sales_price) ext_price +from date_dim, + store_sales, + item, + customer, + customer_address, + store +where d_date_sk = ss_sold_date_sk + and ss_item_sk = i_item_sk + and i_manager_id = 8 + and d_moy = 11 + and d_year = 1998 + and ss_customer_sk = c_customer_sk + and c_current_addr_sk = ca_address_sk + and substr(ca_zip, 1, 5) <> substr(s_zip, 1, 5) + and ss_store_sk = s_store_sk +group by i_brand + , i_brand_id + , i_manufact_id + , i_manufact +order by ext_price desc + , i_brand + , i_brand_id + , i_manufact_id + , i_manufact limit 100 diff --git a/src/main/resources/tpcds/query20.sql b/src/main/resources/tpcds/query20.sql index 235c350549..930548e738 100644 --- a/src/main/resources/tpcds/query20.sql +++ b/src/main/resources/tpcds/query20.sql @@ -1,27 +1,25 @@ -select i_item_id - ,i_item_desc - ,i_category - ,i_class - ,i_current_price - ,sum(cs_ext_sales_price) as itemrevenue - ,sum(cs_ext_sales_price)*100/sum(sum(cs_ext_sales_price)) over - (partition by i_class) as revenueratio - from catalog_sales - ,item - ,date_dim - where cs_item_sk = i_item_sk - and i_category in ('Sports', 'Books', 'Home') - and cs_sold_date_sk = d_date_sk - and d_date between cast('1999-02-22' as date) - and date_add(cast('1999-02-22' as date), 30) - group by i_item_id - ,i_item_desc - ,i_category - ,i_class - ,i_current_price - order by i_category - ,i_class - ,i_item_id - ,i_item_desc - ,revenueratio - limit 100 +select i_item_id + , i_item_desc + , i_category + , i_class + , i_current_price + , sum(cs_ext_sales_price) as itemrevenue + , sum(cs_ext_sales_price) * 100 / sum(sum(cs_ext_sales_price)) over (partition by i_class) as revenueratio +from catalog_sales + , item + , date_dim +where cs_item_sk = i_item_sk + and i_category in ('Sports', 'Books', 'Home') + and cs_sold_date_sk = d_date_sk + and d_date between cast('1999-02-22' as date) + and date_add(cast('1999-02-22' as date), 30) +group by i_item_id + , i_item_desc + , i_category + , i_class + , i_current_price +order by i_category + , i_class + , i_item_id + , i_item_desc + , revenueratio limit 100 diff --git a/src/main/resources/tpcds/query21.sql b/src/main/resources/tpcds/query21.sql index d2a3f49c4c..d0943fcc2f 100644 --- a/src/main/resources/tpcds/query21.sql +++ b/src/main/resources/tpcds/query21.sql @@ -1,27 +1,29 @@ -select * - from(select w_warehouse_name - ,i_item_id - ,sum(case when (cast(d_date as date) < cast ('2000-03-11' as date)) - then inv_quantity_on_hand - else 0 end) as inv_before - ,sum(case when (cast(d_date as date) >= cast ('2000-03-11' as date)) - then inv_quantity_on_hand - else 0 end) as inv_after - from inventory - ,warehouse - ,item - ,date_dim - where i_current_price between 0.99 and 1.49 - and i_item_sk = inv_item_sk - and inv_warehouse_sk = w_warehouse_sk - and inv_date_sk = d_date_sk - and d_date between date_sub(cast ('2000-03-11' as date), 30 ) - and date_add(cast ('2000-03-11' as date), 30 ) - group by w_warehouse_name, i_item_id) x - where (case when inv_before > 0 - then inv_after / inv_before - else null - end) between 2.0/3.0 and 3.0/2.0 - order by w_warehouse_name - ,i_item_id - limit 100 +select * +from (select w_warehouse_name + , i_item_id + , sum(case + when (cast(d_date as date) < cast('2000-03-11' as date)) + then inv_quantity_on_hand + else 0 end) as inv_before + , sum(case + when (cast(d_date as date) >= cast('2000-03-11' as date)) + then inv_quantity_on_hand + else 0 end) as inv_after + from inventory + , warehouse + , item + , date_dim + where i_current_price between 0.99 and 1.49 + and i_item_sk = inv_item_sk + and inv_warehouse_sk = w_warehouse_sk + and inv_date_sk = d_date_sk + and d_date between date_sub(cast('2000-03-11' as date), 30) + and date_add(cast('2000-03-11' as date), 30) + group by w_warehouse_name, i_item_id) x +where (case + when inv_before > 0 + then inv_after / inv_before + else null + end) between 2.0 / 3.0 and 3.0 / 2.0 +order by w_warehouse_name + , i_item_id limit 100 diff --git a/src/main/resources/tpcds/query22.sql b/src/main/resources/tpcds/query22.sql index a4f795a4a7..9b222f48ba 100644 --- a/src/main/resources/tpcds/query22.sql +++ b/src/main/resources/tpcds/query22.sql @@ -1,17 +1,16 @@ -select i_product_name - ,i_brand - ,i_class - ,i_category - ,avg(inv_quantity_on_hand) qoh - from inventory - ,date_dim - ,item - where inv_date_sk=d_date_sk - and inv_item_sk=i_item_sk - and d_month_seq between 1200 and 1200 + 11 - group by rollup(i_product_name - ,i_brand - ,i_class - ,i_category) -order by qoh, i_product_name, i_brand, i_class, i_category - limit 100 +select i_product_name + , i_brand + , i_class + , i_category + , avg(inv_quantity_on_hand) qoh +from inventory + , date_dim + , item +where inv_date_sk = d_date_sk + and inv_item_sk = i_item_sk + and d_month_seq between 1200 and 1200 + 11 +group by rollup (i_product_name + , i_brand + , i_class + , i_category) +order by qoh, i_product_name, i_brand, i_class, i_category limit 100 diff --git a/src/main/resources/tpcds/query23.sql b/src/main/resources/tpcds/query23.sql index dc009be7dd..7f5f347795 100644 --- a/src/main/resources/tpcds/query23.sql +++ b/src/main/resources/tpcds/query23.sql @@ -1,104 +1,99 @@ with frequent_ss_items as - (select substr(i_item_desc,1,30) itemdesc,i_item_sk item_sk,d_date solddate,count(*) cnt - from store_sales - ,date_dim - ,item - where ss_sold_date_sk = d_date_sk - and ss_item_sk = i_item_sk - and d_year in (2000,2000+1,2000+2,2000+3) - group by substr(i_item_desc,1,30),i_item_sk,d_date - having count(*) >4), - max_store_sales as - (select max(csales) tpcds_cmax - from (select c_customer_sk,sum(ss_quantity*ss_sales_price) csales - from store_sales - ,customer - ,date_dim - where ss_customer_sk = c_customer_sk - and ss_sold_date_sk = d_date_sk - and d_year in (2000,2000+1,2000+2,2000+3) - group by c_customer_sk)), - best_ss_customer as - (select c_customer_sk,sum(ss_quantity*ss_sales_price) ssales - from store_sales - ,customer - where ss_customer_sk = c_customer_sk - group by c_customer_sk - having sum(ss_quantity*ss_sales_price) > (50/100.0) * (select - * -from - max_store_sales)) - select sum(sales) - from (select cs_quantity*cs_list_price sales - from catalog_sales - ,date_dim - where d_year = 2000 - and d_moy = 2 - and cs_sold_date_sk = d_date_sk - and cs_item_sk in (select item_sk from frequent_ss_items) - and cs_bill_customer_sk in (select c_customer_sk from best_ss_customer) + (select substr(i_item_desc, 1, 30) itemdesc, i_item_sk item_sk, d_date solddate, count(*) cnt + from store_sales + , date_dim + , item + where ss_sold_date_sk = d_date_sk + and ss_item_sk = i_item_sk + and d_year in (2000, 2000 + 1, 2000 + 2, 2000 + 3) + group by substr(i_item_desc, 1, 30), i_item_sk, d_date + having count(*) > 4), + max_store_sales as + (select max(csales) tpcds_cmax + from (select c_customer_sk, sum(ss_quantity * ss_sales_price) csales + from store_sales + , customer + , date_dim + where ss_customer_sk = c_customer_sk + and ss_sold_date_sk = d_date_sk + and d_year in (2000, 2000 + 1, 2000 + 2, 2000 + 3) + group by c_customer_sk)), + best_ss_customer as + (select c_customer_sk, sum(ss_quantity * ss_sales_price) ssales + from store_sales + , customer + where ss_customer_sk = c_customer_sk + group by c_customer_sk + having sum(ss_quantity * ss_sales_price) > (50 / 100.0) * (select * + from max_store_sales)) +select sum(sales) +from (select cs_quantity * cs_list_price sales + from catalog_sales + , date_dim + where d_year = 2000 + and d_moy = 2 + and cs_sold_date_sk = d_date_sk + and cs_item_sk in (select item_sk from frequent_ss_items) + and cs_bill_customer_sk in (select c_customer_sk from best_ss_customer) union all - select ws_quantity*ws_list_price sales - from web_sales - ,date_dim - where d_year = 2000 - and d_moy = 2 - and ws_sold_date_sk = d_date_sk - and ws_item_sk in (select item_sk from frequent_ss_items) - and ws_bill_customer_sk in (select c_customer_sk from best_ss_customer)) - limit 100; - with frequent_ss_items as - (select substr(i_item_desc,1,30) itemdesc,i_item_sk item_sk,d_date solddate,count(*) cnt - from store_sales - ,date_dim - ,item - where ss_sold_date_sk = d_date_sk - and ss_item_sk = i_item_sk - and d_year in (2000,2000 + 1,2000 + 2,2000 + 3) - group by substr(i_item_desc,1,30),i_item_sk,d_date - having count(*) >4), - max_store_sales as - (select max(csales) tpcds_cmax - from (select c_customer_sk,sum(ss_quantity*ss_sales_price) csales - from store_sales - ,customer - ,date_dim - where ss_customer_sk = c_customer_sk - and ss_sold_date_sk = d_date_sk - and d_year in (2000,2000+1,2000+2,2000+3) - group by c_customer_sk)), - best_ss_customer as - (select c_customer_sk,sum(ss_quantity*ss_sales_price) ssales - from store_sales - ,customer - where ss_customer_sk = c_customer_sk - group by c_customer_sk - having sum(ss_quantity*ss_sales_price) > (50/100.0) * (select - * - from max_store_sales)) - select c_last_name,c_first_name,sales - from (select c_last_name,c_first_name,sum(cs_quantity*cs_list_price) sales - from catalog_sales - ,customer - ,date_dim - where d_year = 2000 - and d_moy = 2 - and cs_sold_date_sk = d_date_sk - and cs_item_sk in (select item_sk from frequent_ss_items) - and cs_bill_customer_sk in (select c_customer_sk from best_ss_customer) - and cs_bill_customer_sk = c_customer_sk - group by c_last_name,c_first_name + select ws_quantity * ws_list_price sales + from web_sales + , date_dim + where d_year = 2000 + and d_moy = 2 + and ws_sold_date_sk = d_date_sk + and ws_item_sk in (select item_sk from frequent_ss_items) + and ws_bill_customer_sk in (select c_customer_sk from best_ss_customer)) limit 100; +with frequent_ss_items as + (select substr(i_item_desc, 1, 30) itemdesc, i_item_sk item_sk, d_date solddate, count(*) cnt + from store_sales + , date_dim + , item + where ss_sold_date_sk = d_date_sk + and ss_item_sk = i_item_sk + and d_year in (2000, 2000 + 1, 2000 + 2, 2000 + 3) + group by substr(i_item_desc, 1, 30), i_item_sk, d_date + having count(*) > 4), + max_store_sales as + (select max(csales) tpcds_cmax + from (select c_customer_sk, sum(ss_quantity * ss_sales_price) csales + from store_sales + , customer + , date_dim + where ss_customer_sk = c_customer_sk + and ss_sold_date_sk = d_date_sk + and d_year in (2000, 2000 + 1, 2000 + 2, 2000 + 3) + group by c_customer_sk)), + best_ss_customer as + (select c_customer_sk, sum(ss_quantity * ss_sales_price) ssales + from store_sales + , customer + where ss_customer_sk = c_customer_sk + group by c_customer_sk + having sum(ss_quantity * ss_sales_price) > (50 / 100.0) * (select * + from max_store_sales)) +select c_last_name, c_first_name, sales +from (select c_last_name, c_first_name, sum(cs_quantity * cs_list_price) sales + from catalog_sales + , customer + , date_dim + where d_year = 2000 + and d_moy = 2 + and cs_sold_date_sk = d_date_sk + and cs_item_sk in (select item_sk from frequent_ss_items) + and cs_bill_customer_sk in (select c_customer_sk from best_ss_customer) + and cs_bill_customer_sk = c_customer_sk + group by c_last_name, c_first_name union all - select c_last_name,c_first_name,sum(ws_quantity*ws_list_price) sales - from web_sales - ,customer - ,date_dim - where d_year = 2000 - and d_moy = 2 - and ws_sold_date_sk = d_date_sk - and ws_item_sk in (select item_sk from frequent_ss_items) - and ws_bill_customer_sk in (select c_customer_sk from best_ss_customer) - and ws_bill_customer_sk = c_customer_sk - group by c_last_name,c_first_name) - order by c_last_name,c_first_name,sales - limit 100 + select c_last_name, c_first_name, sum(ws_quantity * ws_list_price) sales + from web_sales + , customer + , date_dim + where d_year = 2000 + and d_moy = 2 + and ws_sold_date_sk = d_date_sk + and ws_item_sk in (select item_sk from frequent_ss_items) + and ws_bill_customer_sk in (select c_customer_sk from best_ss_customer) + and ws_bill_customer_sk = c_customer_sk + group by c_last_name, c_first_name) +order by c_last_name, c_first_name, sales limit 100 diff --git a/src/main/resources/tpcds/query24.sql b/src/main/resources/tpcds/query24.sql index 46eb60affb..006894b5a2 100644 --- a/src/main/resources/tpcds/query24.sql +++ b/src/main/resources/tpcds/query24.sql @@ -1,104 +1,104 @@ with ssales as -(select c_last_name - ,c_first_name - ,s_store_name - ,ca_state - ,s_state - ,i_color - ,i_current_price - ,i_manager_id - ,i_units - ,i_size - ,sum(ss_net_paid) netpaid -from store_sales - ,store_returns - ,store - ,item - ,customer - ,customer_address -where ss_ticket_number = sr_ticket_number - and ss_item_sk = sr_item_sk - and ss_customer_sk = c_customer_sk - and ss_item_sk = i_item_sk - and ss_store_sk = s_store_sk - and c_current_addr_sk = ca_address_sk - and c_birth_country <> upper(ca_country) - and s_zip = ca_zip -and s_market_id=8 -group by c_last_name - ,c_first_name - ,s_store_name - ,ca_state - ,s_state - ,i_color - ,i_current_price - ,i_manager_id - ,i_units - ,i_size) + (select c_last_name + , c_first_name + , s_store_name + , ca_state + , s_state + , i_color + , i_current_price + , i_manager_id + , i_units + , i_size + , sum(ss_net_paid) netpaid + from store_sales + , store_returns + , store + , item + , customer + , customer_address + where ss_ticket_number = sr_ticket_number + and ss_item_sk = sr_item_sk + and ss_customer_sk = c_customer_sk + and ss_item_sk = i_item_sk + and ss_store_sk = s_store_sk + and c_current_addr_sk = ca_address_sk + and c_birth_country <> upper(ca_country) + and s_zip = ca_zip + and s_market_id = 8 + group by c_last_name + , c_first_name + , s_store_name + , ca_state + , s_state + , i_color + , i_current_price + , i_manager_id + , i_units + , i_size) select c_last_name - ,c_first_name - ,s_store_name - ,sum(netpaid) paid + , c_first_name + , s_store_name + , sum(netpaid) paid from ssales where i_color = 'pale' group by c_last_name - ,c_first_name - ,s_store_name -having sum(netpaid) > (select 0.05*avg(netpaid) - from ssales) + , c_first_name + , s_store_name +having sum(netpaid) > (select 0.05 * avg(netpaid) + from ssales) order by c_last_name - ,c_first_name - ,s_store_name + , c_first_name + , s_store_name ; with ssales as -(select c_last_name - ,c_first_name - ,s_store_name - ,ca_state - ,s_state - ,i_color - ,i_current_price - ,i_manager_id - ,i_units - ,i_size - ,sum(ss_net_paid) netpaid -from store_sales - ,store_returns - ,store - ,item - ,customer - ,customer_address -where ss_ticket_number = sr_ticket_number - and ss_item_sk = sr_item_sk - and ss_customer_sk = c_customer_sk - and ss_item_sk = i_item_sk - and ss_store_sk = s_store_sk - and c_current_addr_sk = ca_address_sk - and c_birth_country <> upper(ca_country) - and s_zip = ca_zip - and s_market_id = 8 -group by c_last_name - ,c_first_name - ,s_store_name - ,ca_state - ,s_state - ,i_color - ,i_current_price - ,i_manager_id - ,i_units - ,i_size) + (select c_last_name + , c_first_name + , s_store_name + , ca_state + , s_state + , i_color + , i_current_price + , i_manager_id + , i_units + , i_size + , sum(ss_net_paid) netpaid + from store_sales + , store_returns + , store + , item + , customer + , customer_address + where ss_ticket_number = sr_ticket_number + and ss_item_sk = sr_item_sk + and ss_customer_sk = c_customer_sk + and ss_item_sk = i_item_sk + and ss_store_sk = s_store_sk + and c_current_addr_sk = ca_address_sk + and c_birth_country <> upper(ca_country) + and s_zip = ca_zip + and s_market_id = 8 + group by c_last_name + , c_first_name + , s_store_name + , ca_state + , s_state + , i_color + , i_current_price + , i_manager_id + , i_units + , i_size) select c_last_name - ,c_first_name - ,s_store_name - ,sum(netpaid) paid + , c_first_name + , s_store_name + , sum(netpaid) paid from ssales where i_color = 'chiffon' group by c_last_name - ,c_first_name - ,s_store_name -having sum(netpaid) > (select 0.05*avg(netpaid) - from ssales) + , c_first_name + , s_store_name +having sum(netpaid) > (select 0.05 * avg(netpaid) + from ssales) order by c_last_name - ,c_first_name - ,s_store_name + , c_first_name + , s_store_name diff --git a/src/main/resources/tpcds/query25.sql b/src/main/resources/tpcds/query25.sql index f075f0f185..7ac6a26e57 100644 --- a/src/main/resources/tpcds/query25.sql +++ b/src/main/resources/tpcds/query25.sql @@ -1,45 +1,39 @@ -select - i_item_id - ,i_item_desc - ,s_store_id - ,s_store_name - ,sum(ss_net_profit) as store_sales_profit - ,sum(sr_net_loss) as store_returns_loss - ,sum(cs_net_profit) as catalog_sales_profit - from - store_sales - ,store_returns - ,catalog_sales - ,date_dim d1 - ,date_dim d2 - ,date_dim d3 - ,store - ,item - where - d1.d_moy = 4 - and d1.d_year = 2001 - and d1.d_date_sk = ss_sold_date_sk - and i_item_sk = ss_item_sk - and s_store_sk = ss_store_sk - and ss_customer_sk = sr_customer_sk - and ss_item_sk = sr_item_sk - and ss_ticket_number = sr_ticket_number - and sr_returned_date_sk = d2.d_date_sk - and d2.d_moy between 4 and 10 - and d2.d_year = 2001 - and sr_customer_sk = cs_bill_customer_sk - and sr_item_sk = cs_item_sk - and cs_sold_date_sk = d3.d_date_sk - and d3.d_moy between 4 and 10 - and d3.d_year = 2001 - group by - i_item_id - ,i_item_desc - ,s_store_id - ,s_store_name - order by - i_item_id - ,i_item_desc - ,s_store_id - ,s_store_name - limit 100 +select i_item_id + , i_item_desc + , s_store_id + , s_store_name + , sum(ss_net_profit) as store_sales_profit + , sum(sr_net_loss) as store_returns_loss + , sum(cs_net_profit) as catalog_sales_profit +from store_sales + , store_returns + , catalog_sales + , date_dim d1 + , date_dim d2 + , date_dim d3 + , store + , item +where d1.d_moy = 4 + and d1.d_year = 2001 + and d1.d_date_sk = ss_sold_date_sk + and i_item_sk = ss_item_sk + and s_store_sk = ss_store_sk + and ss_customer_sk = sr_customer_sk + and ss_item_sk = sr_item_sk + and ss_ticket_number = sr_ticket_number + and sr_returned_date_sk = d2.d_date_sk + and d2.d_moy between 4 and 10 + and d2.d_year = 2001 + and sr_customer_sk = cs_bill_customer_sk + and sr_item_sk = cs_item_sk + and cs_sold_date_sk = d3.d_date_sk + and d3.d_moy between 4 and 10 + and d3.d_year = 2001 +group by i_item_id + , i_item_desc + , s_store_id + , s_store_name +order by i_item_id + , i_item_desc + , s_store_id + , s_store_name limit 100 diff --git a/src/main/resources/tpcds/query26.sql b/src/main/resources/tpcds/query26.sql index 038562973f..8fb725867a 100644 --- a/src/main/resources/tpcds/query26.sql +++ b/src/main/resources/tpcds/query26.sql @@ -1,18 +1,21 @@ -select i_item_id, - avg(cs_quantity) agg1, - avg(cs_list_price) agg2, - avg(cs_coupon_amt) agg3, - avg(cs_sales_price) agg4 - from catalog_sales, customer_demographics, date_dim, item, promotion - where cs_sold_date_sk = d_date_sk and - cs_item_sk = i_item_sk and - cs_bill_cdemo_sk = cd_demo_sk and - cs_promo_sk = p_promo_sk and - cd_gender = 'M' and - cd_marital_status = 'S' and - cd_education_status = 'College' and - (p_channel_email = 'N' or p_channel_event = 'N') and - d_year = 2000 - group by i_item_id - order by i_item_id - limit 100 +select i_item_id, + avg(cs_quantity) agg1, + avg(cs_list_price) agg2, + avg(cs_coupon_amt) agg3, + avg(cs_sales_price) agg4 +from catalog_sales, + customer_demographics, + date_dim, + item, + promotion +where cs_sold_date_sk = d_date_sk + and cs_item_sk = i_item_sk + and cs_bill_cdemo_sk = cd_demo_sk + and cs_promo_sk = p_promo_sk + and cd_gender = 'M' + and cd_marital_status = 'S' + and cd_education_status = 'College' + and (p_channel_email = 'N' or p_channel_event = 'N') + and d_year = 2000 +group by i_item_id +order by i_item_id limit 100 diff --git a/src/main/resources/tpcds/query27.sql b/src/main/resources/tpcds/query27.sql index 44699ccb6d..6cd6dc0239 100644 --- a/src/main/resources/tpcds/query27.sql +++ b/src/main/resources/tpcds/query27.sql @@ -1,20 +1,24 @@ -select i_item_id, - s_state, grouping(s_state) g_state, - avg(ss_quantity) agg1, - avg(ss_list_price) agg2, - avg(ss_coupon_amt) agg3, - avg(ss_sales_price) agg4 - from store_sales, customer_demographics, date_dim, store, item - where ss_sold_date_sk = d_date_sk and - ss_item_sk = i_item_sk and - ss_store_sk = s_store_sk and - ss_cdemo_sk = cd_demo_sk and - cd_gender = 'M' and - cd_marital_status = 'S' and - cd_education_status = 'College' and - d_year = 2002 and - s_state in ('TN','TN', 'TN', 'TN', 'TN', 'TN') - group by rollup (i_item_id, s_state) - order by i_item_id - ,s_state - limit 100 +select i_item_id, + s_state, + grouping(s_state) g_state, + avg(ss_quantity) agg1, + avg(ss_list_price) agg2, + avg(ss_coupon_amt) agg3, + avg(ss_sales_price) agg4 +from store_sales, + customer_demographics, + date_dim, + store, + item +where ss_sold_date_sk = d_date_sk + and ss_item_sk = i_item_sk + and ss_store_sk = s_store_sk + and ss_cdemo_sk = cd_demo_sk + and cd_gender = 'M' + and cd_marital_status = 'S' + and cd_education_status = 'College' + and d_year = 2002 + and s_state in ('TN', 'TN', 'TN', 'TN', 'TN', 'TN') +group by rollup (i_item_id, s_state) +order by i_item_id + , s_state limit 100 diff --git a/src/main/resources/tpcds/query28.sql b/src/main/resources/tpcds/query28.sql index 0985f943b7..801d2d6106 100644 --- a/src/main/resources/tpcds/query28.sql +++ b/src/main/resources/tpcds/query28.sql @@ -1,50 +1,49 @@ -select * -from (select avg(ss_list_price) B1_LP - ,count(ss_list_price) B1_CNT - ,count(distinct ss_list_price) B1_CNTD +select * +from (select avg(ss_list_price) B1_LP + , count(ss_list_price) B1_CNT + , count(distinct ss_list_price) B1_CNTD from store_sales where ss_quantity between 0 and 5 - and (ss_list_price between 8 and 8+10 - or ss_coupon_amt between 459 and 459+1000 - or ss_wholesale_cost between 57 and 57+20)) B1, - (select avg(ss_list_price) B2_LP - ,count(ss_list_price) B2_CNT - ,count(distinct ss_list_price) B2_CNTD + and (ss_list_price between 8 and 8 + 10 + or ss_coupon_amt between 459 and 459 + 1000 + or ss_wholesale_cost between 57 and 57 + 20)) B1, + (select avg(ss_list_price) B2_LP + , count(ss_list_price) B2_CNT + , count(distinct ss_list_price) B2_CNTD from store_sales where ss_quantity between 6 and 10 - and (ss_list_price between 90 and 90+10 - or ss_coupon_amt between 2323 and 2323+1000 - or ss_wholesale_cost between 31 and 31+20)) B2, - (select avg(ss_list_price) B3_LP - ,count(ss_list_price) B3_CNT - ,count(distinct ss_list_price) B3_CNTD + and (ss_list_price between 90 and 90 + 10 + or ss_coupon_amt between 2323 and 2323 + 1000 + or ss_wholesale_cost between 31 and 31 + 20)) B2, + (select avg(ss_list_price) B3_LP + , count(ss_list_price) B3_CNT + , count(distinct ss_list_price) B3_CNTD from store_sales where ss_quantity between 11 and 15 - and (ss_list_price between 142 and 142+10 - or ss_coupon_amt between 12214 and 12214+1000 - or ss_wholesale_cost between 79 and 79+20)) B3, - (select avg(ss_list_price) B4_LP - ,count(ss_list_price) B4_CNT - ,count(distinct ss_list_price) B4_CNTD + and (ss_list_price between 142 and 142 + 10 + or ss_coupon_amt between 12214 and 12214 + 1000 + or ss_wholesale_cost between 79 and 79 + 20)) B3, + (select avg(ss_list_price) B4_LP + , count(ss_list_price) B4_CNT + , count(distinct ss_list_price) B4_CNTD from store_sales where ss_quantity between 16 and 20 - and (ss_list_price between 135 and 135+10 - or ss_coupon_amt between 6071 and 6071+1000 - or ss_wholesale_cost between 38 and 38+20)) B4, - (select avg(ss_list_price) B5_LP - ,count(ss_list_price) B5_CNT - ,count(distinct ss_list_price) B5_CNTD + and (ss_list_price between 135 and 135 + 10 + or ss_coupon_amt between 6071 and 6071 + 1000 + or ss_wholesale_cost between 38 and 38 + 20)) B4, + (select avg(ss_list_price) B5_LP + , count(ss_list_price) B5_CNT + , count(distinct ss_list_price) B5_CNTD from store_sales where ss_quantity between 21 and 25 - and (ss_list_price between 122 and 122+10 - or ss_coupon_amt between 836 and 836+1000 - or ss_wholesale_cost between 17 and 17+20)) B5, - (select avg(ss_list_price) B6_LP - ,count(ss_list_price) B6_CNT - ,count(distinct ss_list_price) B6_CNTD + and (ss_list_price between 122 and 122 + 10 + or ss_coupon_amt between 836 and 836 + 1000 + or ss_wholesale_cost between 17 and 17 + 20)) B5, + (select avg(ss_list_price) B6_LP + , count(ss_list_price) B6_CNT + , count(distinct ss_list_price) B6_CNTD from store_sales where ss_quantity between 26 and 30 - and (ss_list_price between 154 and 154+10 - or ss_coupon_amt between 7326 and 7326+1000 - or ss_wholesale_cost between 7 and 7+20)) B6 - limit 100 + and (ss_list_price between 154 and 154 + 10 + or ss_coupon_amt between 7326 and 7326 + 1000 + or ss_wholesale_cost between 7 and 7 + 20)) B6 limit 100 diff --git a/src/main/resources/tpcds/query29.sql b/src/main/resources/tpcds/query29.sql index 48d2cd27d9..1a759be653 100644 --- a/src/main/resources/tpcds/query29.sql +++ b/src/main/resources/tpcds/query29.sql @@ -1,44 +1,38 @@ -select - i_item_id - ,i_item_desc - ,s_store_id - ,s_store_name - ,sum(ss_quantity) as store_sales_quantity - ,sum(sr_return_quantity) as store_returns_quantity - ,sum(cs_quantity) as catalog_sales_quantity - from - store_sales - ,store_returns - ,catalog_sales - ,date_dim d1 - ,date_dim d2 - ,date_dim d3 - ,store - ,item - where - d1.d_moy = 9 - and d1.d_year = 1999 - and d1.d_date_sk = ss_sold_date_sk - and i_item_sk = ss_item_sk - and s_store_sk = ss_store_sk - and ss_customer_sk = sr_customer_sk - and ss_item_sk = sr_item_sk - and ss_ticket_number = sr_ticket_number - and sr_returned_date_sk = d2.d_date_sk - and d2.d_moy between 9 and 9 + 3 - and d2.d_year = 1999 - and sr_customer_sk = cs_bill_customer_sk - and sr_item_sk = cs_item_sk - and cs_sold_date_sk = d3.d_date_sk - and d3.d_year in (1999,1999+1,1999+2) - group by - i_item_id - ,i_item_desc - ,s_store_id - ,s_store_name - order by - i_item_id - ,i_item_desc - ,s_store_id - ,s_store_name - limit 100 +select i_item_id + , i_item_desc + , s_store_id + , s_store_name + , sum(ss_quantity) as store_sales_quantity + , sum(sr_return_quantity) as store_returns_quantity + , sum(cs_quantity) as catalog_sales_quantity +from store_sales + , store_returns + , catalog_sales + , date_dim d1 + , date_dim d2 + , date_dim d3 + , store + , item +where d1.d_moy = 9 + and d1.d_year = 1999 + and d1.d_date_sk = ss_sold_date_sk + and i_item_sk = ss_item_sk + and s_store_sk = ss_store_sk + and ss_customer_sk = sr_customer_sk + and ss_item_sk = sr_item_sk + and ss_ticket_number = sr_ticket_number + and sr_returned_date_sk = d2.d_date_sk + and d2.d_moy between 9 and 9 + 3 + and d2.d_year = 1999 + and sr_customer_sk = cs_bill_customer_sk + and sr_item_sk = cs_item_sk + and cs_sold_date_sk = d3.d_date_sk + and d3.d_year in (1999, 1999 + 1, 1999 + 2) +group by i_item_id + , i_item_desc + , s_store_id + , s_store_name +order by i_item_id + , i_item_desc + , s_store_id + , s_store_name limit 100 diff --git a/src/main/resources/tpcds/query30.sql b/src/main/resources/tpcds/query30.sql index fca4057b8f..7e1b75411f 100644 --- a/src/main/resources/tpcds/query30.sql +++ b/src/main/resources/tpcds/query30.sql @@ -1,28 +1,38 @@ with customer_total_return as - (select wr_returning_customer_sk as ctr_customer_sk - ,ca_state as ctr_state, - sum(wr_return_amt) as ctr_total_return - from web_returns - ,date_dim - ,customer_address - where wr_returned_date_sk = d_date_sk - and d_year =2002 - and wr_returning_addr_sk = ca_address_sk - group by wr_returning_customer_sk - ,ca_state) - select c_customer_id,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag - ,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address - ,c_last_review_date,ctr_total_return - from customer_total_return ctr1 - ,customer_address - ,customer - where ctr1.ctr_total_return > (select avg(ctr_total_return)*1.2 - from customer_total_return ctr2 - where ctr1.ctr_state = ctr2.ctr_state) - and ca_address_sk = c_current_addr_sk - and ca_state = 'GA' - and ctr1.ctr_customer_sk = c_customer_sk - order by c_customer_id,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag - ,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address - ,c_last_review_date,ctr_total_return - limit 100 + (select wr_returning_customer_sk as ctr_customer_sk + , + ca_state as ctr_state, + sum(wr_return_amt) as ctr_total_return + from web_returns + , date_dim + , customer_address + where wr_returned_date_sk = d_date_sk + and d_year = 2002 + and wr_returning_addr_sk = ca_address_sk + group by wr_returning_customer_sk + , ca_state) +select c_customer_id + , c_salutation + , c_first_name + , c_last_name + , c_preferred_cust_flag + , c_birth_day + , c_birth_month + , c_birth_year + , c_birth_country + , c_login + , c_email_address + , c_last_review_date + , ctr_total_return +from customer_total_return ctr1 + , customer_address + , customer +where ctr1.ctr_total_return > (select avg(ctr_total_return) * 1.2 + from customer_total_return ctr2 + where ctr1.ctr_state = ctr2.ctr_state) + and ca_address_sk = c_current_addr_sk + and ca_state = 'GA' + and ctr1.ctr_customer_sk = c_customer_sk +order by c_customer_id, c_salutation, c_first_name, c_last_name, c_preferred_cust_flag + , c_birth_day, c_birth_month, c_birth_year, c_birth_country, c_login, c_email_address + , c_last_review_date, ctr_total_return limit 100 diff --git a/src/main/resources/tpcds/query31.sql b/src/main/resources/tpcds/query31.sql index 74e49a5e39..90b9a9f630 100644 --- a/src/main/resources/tpcds/query31.sql +++ b/src/main/resources/tpcds/query31.sql @@ -1,49 +1,50 @@ with ss as - (select ca_county,d_qoy, d_year,sum(ss_ext_sales_price) as store_sales - from store_sales,date_dim,customer_address - where ss_sold_date_sk = d_date_sk - and ss_addr_sk=ca_address_sk - group by ca_county,d_qoy, d_year), - ws as - (select ca_county,d_qoy, d_year,sum(ws_ext_sales_price) as web_sales - from web_sales,date_dim,customer_address - where ws_sold_date_sk = d_date_sk - and ws_bill_addr_sk=ca_address_sk - group by ca_county,d_qoy, d_year) - select - ss1.ca_county - ,ss1.d_year - ,ws2.web_sales/ws1.web_sales web_q1_q2_increase - ,ss2.store_sales/ss1.store_sales store_q1_q2_increase - ,ws3.web_sales/ws2.web_sales web_q2_q3_increase - ,ss3.store_sales/ss2.store_sales store_q2_q3_increase - from - ss ss1 - ,ss ss2 - ,ss ss3 - ,ws ws1 - ,ws ws2 - ,ws ws3 - where - ss1.d_qoy = 1 - and ss1.d_year = 2000 - and ss1.ca_county = ss2.ca_county - and ss2.d_qoy = 2 - and ss2.d_year = 2000 - and ss2.ca_county = ss3.ca_county - and ss3.d_qoy = 3 - and ss3.d_year = 2000 - and ss1.ca_county = ws1.ca_county - and ws1.d_qoy = 1 - and ws1.d_year = 2000 - and ws1.ca_county = ws2.ca_county - and ws2.d_qoy = 2 - and ws2.d_year = 2000 - and ws1.ca_county = ws3.ca_county - and ws3.d_qoy = 3 - and ws3.d_year =2000 - and case when ws1.web_sales > 0 then ws2.web_sales/ws1.web_sales else null end - > case when ss1.store_sales > 0 then ss2.store_sales/ss1.store_sales else null end - and case when ws2.web_sales > 0 then ws3.web_sales/ws2.web_sales else null end - > case when ss2.store_sales > 0 then ss3.store_sales/ss2.store_sales else null end - order by ss1.ca_county + (select ca_county, d_qoy, d_year, sum(ss_ext_sales_price) as store_sales + from store_sales, + date_dim, + customer_address + where ss_sold_date_sk = d_date_sk + and ss_addr_sk = ca_address_sk + group by ca_county, d_qoy, d_year), + ws as + (select ca_county, d_qoy, d_year, sum(ws_ext_sales_price) as web_sales + from web_sales, + date_dim, + customer_address + where ws_sold_date_sk = d_date_sk + and ws_bill_addr_sk = ca_address_sk + group by ca_county, d_qoy, d_year) +select ss1.ca_county + , ss1.d_year + , ws2.web_sales / ws1.web_sales web_q1_q2_increase + , ss2.store_sales / ss1.store_sales store_q1_q2_increase + , ws3.web_sales / ws2.web_sales web_q2_q3_increase + , ss3.store_sales / ss2.store_sales store_q2_q3_increase +from ss ss1 + , ss ss2 + , ss ss3 + , ws ws1 + , ws ws2 + , ws ws3 +where ss1.d_qoy = 1 + and ss1.d_year = 2000 + and ss1.ca_county = ss2.ca_county + and ss2.d_qoy = 2 + and ss2.d_year = 2000 + and ss2.ca_county = ss3.ca_county + and ss3.d_qoy = 3 + and ss3.d_year = 2000 + and ss1.ca_county = ws1.ca_county + and ws1.d_qoy = 1 + and ws1.d_year = 2000 + and ws1.ca_county = ws2.ca_county + and ws2.d_qoy = 2 + and ws2.d_year = 2000 + and ws1.ca_county = ws3.ca_county + and ws3.d_qoy = 3 + and ws3.d_year = 2000 + and case when ws1.web_sales > 0 then ws2.web_sales / ws1.web_sales else null end + > case when ss1.store_sales > 0 then ss2.store_sales / ss1.store_sales else null end + and case when ws2.web_sales > 0 then ws3.web_sales / ws2.web_sales else null end + > case when ss2.store_sales > 0 then ss3.store_sales / ss2.store_sales else null end +order by ss1.ca_county diff --git a/src/main/resources/tpcds/query32.sql b/src/main/resources/tpcds/query32.sql index ca4cd153fb..3e4ea5b412 100644 --- a/src/main/resources/tpcds/query32.sql +++ b/src/main/resources/tpcds/query32.sql @@ -1,25 +1,18 @@ -select sum(cs_ext_discount_amt) as excess_discount_amount -from - catalog_sales - ,item - ,date_dim -where -i_manufact_id = 977 -and i_item_sk = cs_item_sk -and d_date between '2000-01-27' and - date_add(cast('2000-01-27' as date), 90 ) -and d_date_sk = cs_sold_date_sk -and cs_ext_discount_amt - > ( - select - 1.3 * avg(cs_ext_discount_amt) - from - catalog_sales - ,date_dim - where - cs_item_sk = i_item_sk - and d_date between '2000-01-27' and - date_add(cast('2000-01-27' as date), 90 ) - and d_date_sk = cs_sold_date_sk - ) - limit 100 +select sum(cs_ext_discount_amt) as excess_discount_amount +from catalog_sales + , item + , date_dim +where i_manufact_id = 977 + and i_item_sk = cs_item_sk + and d_date between '2000-01-27' and + date_add(cast('2000-01-27' as date), 90) + and d_date_sk = cs_sold_date_sk + and cs_ext_discount_amt + > (select 1.3 * avg(cs_ext_discount_amt) + from catalog_sales + , date_dim + where cs_item_sk = i_item_sk + and d_date between '2000-01-27' and + date_add(cast('2000-01-27' as date), 90) + and d_date_sk = cs_sold_date_sk) + limit 100 diff --git a/src/main/resources/tpcds/query33.sql b/src/main/resources/tpcds/query33.sql index 53df422a1f..1cc5875da6 100644 --- a/src/main/resources/tpcds/query33.sql +++ b/src/main/resources/tpcds/query33.sql @@ -1,72 +1,59 @@ -with ss as ( - select - i_manufact_id,sum(ss_ext_sales_price) total_sales - from - store_sales, - date_dim, - customer_address, - item - where - i_manufact_id in (select - i_manufact_id -from - item -where i_category in ('Electronics')) - and ss_item_sk = i_item_sk - and ss_sold_date_sk = d_date_sk - and d_year = 1998 - and d_moy = 5 - and ss_addr_sk = ca_address_sk - and ca_gmt_offset = -5 - group by i_manufact_id), - cs as ( - select - i_manufact_id,sum(cs_ext_sales_price) total_sales - from - catalog_sales, - date_dim, - customer_address, - item - where - i_manufact_id in (select - i_manufact_id -from - item -where i_category in ('Electronics')) - and cs_item_sk = i_item_sk - and cs_sold_date_sk = d_date_sk - and d_year = 1998 - and d_moy = 5 - and cs_bill_addr_sk = ca_address_sk - and ca_gmt_offset = -5 - group by i_manufact_id), - ws as ( - select - i_manufact_id,sum(ws_ext_sales_price) total_sales - from - web_sales, - date_dim, - customer_address, - item - where - i_manufact_id in (select - i_manufact_id -from - item -where i_category in ('Electronics')) - and ws_item_sk = i_item_sk - and ws_sold_date_sk = d_date_sk - and d_year = 1998 - and d_moy = 5 - and ws_bill_addr_sk = ca_address_sk - and ca_gmt_offset = -5 - group by i_manufact_id) - select i_manufact_id ,sum(total_sales) total_sales - from (select * from ss - union all - select * from cs - union all - select * from ws) tmp1 - group by i_manufact_id - order by total_sales - limit 100 +with ss as (select i_manufact_id, + sum(ss_ext_sales_price) total_sales + from store_sales, + date_dim, + customer_address, + item + where i_manufact_id in (select i_manufact_id + from item + where i_category in ('Electronics')) + and ss_item_sk = i_item_sk + and ss_sold_date_sk = d_date_sk + and d_year = 1998 + and d_moy = 5 + and ss_addr_sk = ca_address_sk + and ca_gmt_offset = -5 + group by i_manufact_id), + cs as (select i_manufact_id, + sum(cs_ext_sales_price) total_sales + from catalog_sales, + date_dim, + customer_address, + item + where i_manufact_id in (select i_manufact_id + from item + where i_category in ('Electronics')) + and cs_item_sk = i_item_sk + and cs_sold_date_sk = d_date_sk + and d_year = 1998 + and d_moy = 5 + and cs_bill_addr_sk = ca_address_sk + and ca_gmt_offset = -5 + group by i_manufact_id), + ws as (select i_manufact_id, + sum(ws_ext_sales_price) total_sales + from web_sales, + date_dim, + customer_address, + item + where i_manufact_id in (select i_manufact_id + from item + where i_category in ('Electronics')) + and ws_item_sk = i_item_sk + and ws_sold_date_sk = d_date_sk + and d_year = 1998 + and d_moy = 5 + and ws_bill_addr_sk = ca_address_sk + and ca_gmt_offset = -5 + group by i_manufact_id) +select i_manufact_id, sum(total_sales) total_sales +from (select * + from ss + union all + select * + from cs + union all + select * + from ws) tmp1 +group by i_manufact_id +order by total_sales limit 100 diff --git a/src/main/resources/tpcds/query34.sql b/src/main/resources/tpcds/query34.sql index b2cf22d732..e40420ebc7 100644 --- a/src/main/resources/tpcds/query34.sql +++ b/src/main/resources/tpcds/query34.sql @@ -1,28 +1,33 @@ select c_last_name - ,c_first_name - ,c_salutation - ,c_preferred_cust_flag - ,ss_ticket_number - ,cnt from - (select ss_ticket_number - ,ss_customer_sk - ,count(*) cnt - from store_sales,date_dim,store,household_demographics - where store_sales.ss_sold_date_sk = date_dim.d_date_sk - and store_sales.ss_store_sk = store.s_store_sk - and store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk - and (date_dim.d_dom between 1 and 3 or date_dim.d_dom between 25 and 28) - and (household_demographics.hd_buy_potential = '>10000' or - household_demographics.hd_buy_potential = 'Unknown') - and household_demographics.hd_vehicle_count > 0 - and (case when household_demographics.hd_vehicle_count > 0 - then household_demographics.hd_dep_count/ household_demographics.hd_vehicle_count - else null - end) > 1.2 - and date_dim.d_year in (1999,1999+1,1999+2) - and store.s_county in ('Williamson County','Williamson County','Williamson County','Williamson County', - 'Williamson County','Williamson County','Williamson County','Williamson County') - group by ss_ticket_number,ss_customer_sk) dn,customer - where ss_customer_sk = c_customer_sk - and cnt between 15 and 20 - order by c_last_name,c_first_name,c_salutation,c_preferred_cust_flag desc, ss_ticket_number + , c_first_name + , c_salutation + , c_preferred_cust_flag + , ss_ticket_number + , cnt +from (select ss_ticket_number + , ss_customer_sk + , count(*) cnt + from store_sales, + date_dim, + store, + household_demographics + where store_sales.ss_sold_date_sk = date_dim.d_date_sk + and store_sales.ss_store_sk = store.s_store_sk + and store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk + and (date_dim.d_dom between 1 and 3 or date_dim.d_dom between 25 and 28) + and (household_demographics.hd_buy_potential = '>10000' or + household_demographics.hd_buy_potential = 'Unknown') + and household_demographics.hd_vehicle_count > 0 + and (case + when household_demographics.hd_vehicle_count > 0 + then household_demographics.hd_dep_count / household_demographics.hd_vehicle_count + else null + end) > 1.2 + and date_dim.d_year in (1999, 1999 + 1, 1999 + 2) + and store.s_county in ('Williamson County', 'Williamson County', 'Williamson County', 'Williamson County', + 'Williamson County', 'Williamson County', 'Williamson County', 'Williamson County') + group by ss_ticket_number, ss_customer_sk) dn, + customer +where ss_customer_sk = c_customer_sk + and cnt between 15 and 20 +order by c_last_name, c_first_name, c_salutation, c_preferred_cust_flag desc, ss_ticket_number diff --git a/src/main/resources/tpcds/query35.sql b/src/main/resources/tpcds/query35.sql index cc221b14ff..5b53fb57ce 100644 --- a/src/main/resources/tpcds/query35.sql +++ b/src/main/resources/tpcds/query35.sql @@ -1,55 +1,56 @@ -select - ca_state, - cd_gender, - cd_marital_status, - cd_dep_count, - count(*) cnt1, - min(cd_dep_count), - max(cd_dep_count), - avg(cd_dep_count), - cd_dep_employed_count, - count(*) cnt2, - min(cd_dep_employed_count), - max(cd_dep_employed_count), - avg(cd_dep_employed_count), - cd_dep_college_count, - count(*) cnt3, - min(cd_dep_college_count), - max(cd_dep_college_count), - avg(cd_dep_college_count) - from - customer c,customer_address ca,customer_demographics - where - c.c_current_addr_sk = ca.ca_address_sk and - cd_demo_sk = c.c_current_cdemo_sk and - exists (select * - from store_sales,date_dim - where c.c_customer_sk = ss_customer_sk and - ss_sold_date_sk = d_date_sk and - d_year = 2002 and - d_qoy < 4) and - (exists (select * - from web_sales,date_dim - where c.c_customer_sk = ws_bill_customer_sk and - ws_sold_date_sk = d_date_sk and - d_year = 2002 and - d_qoy < 4) or - exists (select * - from catalog_sales,date_dim - where c.c_customer_sk = cs_ship_customer_sk and - cs_sold_date_sk = d_date_sk and - d_year = 2002 and - d_qoy < 4)) - group by ca_state, - cd_gender, - cd_marital_status, - cd_dep_count, - cd_dep_employed_count, - cd_dep_college_count - order by ca_state, - cd_gender, - cd_marital_status, - cd_dep_count, - cd_dep_employed_count, - cd_dep_college_count - limit 100 +select ca_state, + cd_gender, + cd_marital_status, + cd_dep_count, + count(*) cnt1, + min(cd_dep_count), + max(cd_dep_count), + avg(cd_dep_count), + cd_dep_employed_count, + count(*) cnt2, + min(cd_dep_employed_count), + max(cd_dep_employed_count), + avg(cd_dep_employed_count), + cd_dep_college_count, + count(*) cnt3, + min(cd_dep_college_count), + max(cd_dep_college_count), + avg(cd_dep_college_count) +from customer c, + customer_address ca, + customer_demographics +where c.c_current_addr_sk = ca.ca_address_sk + and cd_demo_sk = c.c_current_cdemo_sk + and exists(select * + from store_sales, + date_dim + where c.c_customer_sk = ss_customer_sk + and ss_sold_date_sk = d_date_sk + and d_year = 2002 + and d_qoy < 4) + and (exists(select * + from web_sales, + date_dim + where c.c_customer_sk = ws_bill_customer_sk + and ws_sold_date_sk = d_date_sk + and d_year = 2002 + and d_qoy < 4) or + exists(select * + from catalog_sales, + date_dim + where c.c_customer_sk = cs_ship_customer_sk + and cs_sold_date_sk = d_date_sk + and d_year = 2002 + and d_qoy < 4)) +group by ca_state, + cd_gender, + cd_marital_status, + cd_dep_count, + cd_dep_employed_count, + cd_dep_college_count +order by ca_state, + cd_gender, + cd_marital_status, + cd_dep_count, + cd_dep_employed_count, + cd_dep_college_count limit 100 diff --git a/src/main/resources/tpcds/query36.sql b/src/main/resources/tpcds/query36.sql index 1ec161c648..a916166013 100644 --- a/src/main/resources/tpcds/query36.sql +++ b/src/main/resources/tpcds/query36.sql @@ -1,27 +1,22 @@ -select - sum(ss_net_profit)/sum(ss_ext_sales_price) as gross_margin - ,i_category - ,i_class - ,grouping(i_category)+grouping(i_class) as lochierarchy - ,rank() over ( +select sum(ss_net_profit) / sum(ss_ext_sales_price) as gross_margin + , i_category + , i_class + , grouping(i_category) + grouping(i_class) as lochierarchy + , rank() over ( partition by grouping(i_category)+grouping(i_class), case when grouping(i_class) = 0 then i_category end order by sum(ss_net_profit)/sum(ss_ext_sales_price) asc) as rank_within_parent - from - store_sales - ,date_dim d1 - ,item - ,store - where - d1.d_year = 2001 - and d1.d_date_sk = ss_sold_date_sk - and i_item_sk = ss_item_sk - and s_store_sk = ss_store_sk - and s_state in ('TN','TN','TN','TN', - 'TN','TN','TN','TN') - group by rollup(i_category,i_class) - order by - lochierarchy desc - ,case when lochierarchy = 0 then i_category end - ,rank_within_parent - limit 100 +from store_sales + , date_dim d1 + , item + , store +where d1.d_year = 2001 + and d1.d_date_sk = ss_sold_date_sk + and i_item_sk = ss_item_sk + and s_store_sk = ss_store_sk + and s_state in ('TN', 'TN', 'TN', 'TN', + 'TN', 'TN', 'TN', 'TN') +group by rollup (i_category, i_class) +order by lochierarchy desc + , case when lochierarchy = 0 then i_category end + , rank_within_parent limit 100 diff --git a/src/main/resources/tpcds/query37.sql b/src/main/resources/tpcds/query37.sql index c37a8cec92..20beb01c62 100644 --- a/src/main/resources/tpcds/query37.sql +++ b/src/main/resources/tpcds/query37.sql @@ -1,14 +1,16 @@ -select i_item_id - ,i_item_desc - ,i_current_price - from item, inventory, date_dim, catalog_sales - where i_current_price between 68 and 68 + 30 - and inv_item_sk = i_item_sk - and d_date_sk=inv_date_sk - and d_date between cast('2000-02-01' as date) and date_add(cast('2000-02-01' as date), 60 ) - and i_manufact_id in (677,940,694,808) - and inv_quantity_on_hand between 100 and 500 - and cs_item_sk = i_item_sk - group by i_item_id,i_item_desc,i_current_price - order by i_item_id - limit 100 +select i_item_id + , i_item_desc + , i_current_price +from item, + inventory, + date_dim, + catalog_sales +where i_current_price between 68 and 68 + 30 + and inv_item_sk = i_item_sk + and d_date_sk = inv_date_sk + and d_date between cast('2000-02-01' as date) and date_add(cast('2000-02-01' as date), 60) + and i_manufact_id in (677, 940, 694, 808) + and inv_quantity_on_hand between 100 and 500 + and cs_item_sk = i_item_sk +group by i_item_id, i_item_desc, i_current_price +order by i_item_id limit 100 diff --git a/src/main/resources/tpcds/query38.sql b/src/main/resources/tpcds/query38.sql index de6da3b65a..bd0b02288c 100644 --- a/src/main/resources/tpcds/query38.sql +++ b/src/main/resources/tpcds/query38.sql @@ -1,20 +1,24 @@ -select count(*) from ( - select distinct c_last_name, c_first_name, d_date - from store_sales, date_dim, customer - where store_sales.ss_sold_date_sk = date_dim.d_date_sk - and store_sales.ss_customer_sk = customer.c_customer_sk - and d_month_seq between 1200 and 1200 + 11 - intersect - select distinct c_last_name, c_first_name, d_date - from catalog_sales, date_dim, customer - where catalog_sales.cs_sold_date_sk = date_dim.d_date_sk - and catalog_sales.cs_bill_customer_sk = customer.c_customer_sk - and d_month_seq between 1200 and 1200 + 11 - intersect - select distinct c_last_name, c_first_name, d_date - from web_sales, date_dim, customer - where web_sales.ws_sold_date_sk = date_dim.d_date_sk - and web_sales.ws_bill_customer_sk = customer.c_customer_sk - and d_month_seq between 1200 and 1200 + 11 -) hot_cust - limit 100 +select count(*) +from (select distinct c_last_name, c_first_name, d_date + from store_sales, + date_dim, + customer + where store_sales.ss_sold_date_sk = date_dim.d_date_sk + and store_sales.ss_customer_sk = customer.c_customer_sk + and d_month_seq between 1200 and 1200 + 11 + intersect + select distinct c_last_name, c_first_name, d_date + from catalog_sales, + date_dim, + customer + where catalog_sales.cs_sold_date_sk = date_dim.d_date_sk + and catalog_sales.cs_bill_customer_sk = customer.c_customer_sk + and d_month_seq between 1200 and 1200 + 11 + intersect + select distinct c_last_name, c_first_name, d_date + from web_sales, + date_dim, + customer + where web_sales.ws_sold_date_sk = date_dim.d_date_sk + and web_sales.ws_bill_customer_sk = customer.c_customer_sk + and d_month_seq between 1200 and 1200 + 11) hot_cust limit 100 diff --git a/src/main/resources/tpcds/query39.sql b/src/main/resources/tpcds/query39.sql index e6f1d525b1..31126c50bb 100644 --- a/src/main/resources/tpcds/query39.sql +++ b/src/main/resources/tpcds/query39.sql @@ -1,50 +1,86 @@ with inv as -(select w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy - ,stdev,mean, case mean when 0 then null else stdev/mean end cov - from(select w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy - ,stddev_samp(inv_quantity_on_hand) stdev,avg(inv_quantity_on_hand) mean - from inventory - ,item - ,warehouse - ,date_dim - where inv_item_sk = i_item_sk - and inv_warehouse_sk = w_warehouse_sk - and inv_date_sk = d_date_sk - and d_year =2001 - group by w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy) foo - where case mean when 0 then 0 else stdev/mean end > 1) -select inv1.w_warehouse_sk,inv1.i_item_sk,inv1.d_moy,inv1.mean, inv1.cov - ,inv2.w_warehouse_sk as w_warehouse_sk_2,inv2.i_item_sk as i_item_sk_2,inv2.d_moy as d_moy_2,inv2.mean as mean_2, inv2.cov as cov_2 -from inv inv1,inv inv2 + (select w_warehouse_name + , w_warehouse_sk + , i_item_sk + , d_moy + , stdev + , mean + , case mean when 0 then null else stdev / mean end cov + from (select w_warehouse_name + , w_warehouse_sk + , i_item_sk + , d_moy + , stddev_samp(inv_quantity_on_hand) stdev + , avg(inv_quantity_on_hand) mean + from inventory + , item + , warehouse + , date_dim + where inv_item_sk = i_item_sk + and inv_warehouse_sk = w_warehouse_sk + and inv_date_sk = d_date_sk + and d_year = 2001 + group by w_warehouse_name, w_warehouse_sk, i_item_sk, d_moy) foo + where case mean when 0 then 0 else stdev / mean end > 1) +select inv1.w_warehouse_sk + , inv1.i_item_sk + , inv1.d_moy + , inv1.mean + , inv1.cov + , inv2.w_warehouse_sk as w_warehouse_sk_2 + , inv2.i_item_sk as i_item_sk_2 + , inv2.d_moy as d_moy_2 + , inv2.mean as mean_2 + , inv2.cov as cov_2 +from inv inv1, + inv inv2 where inv1.i_item_sk = inv2.i_item_sk - and inv1.w_warehouse_sk = inv2.w_warehouse_sk - and inv1.d_moy=1 - and inv2.d_moy=1+1 -order by inv1.w_warehouse_sk,inv1.i_item_sk,inv1.d_moy,inv1.mean,inv1.cov - ,d_moy_2,mean_2, cov_2 + and inv1.w_warehouse_sk = inv2.w_warehouse_sk + and inv1.d_moy = 1 + and inv2.d_moy = 1 + 1 +order by inv1.w_warehouse_sk, inv1.i_item_sk, inv1.d_moy, inv1.mean, inv1.cov + , d_moy_2, mean_2, cov_2 ; with inv as -(select w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy - ,stdev,mean, case mean when 0 then null else stdev/mean end cov - from(select w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy - ,stddev_samp(inv_quantity_on_hand) stdev,avg(inv_quantity_on_hand) mean - from inventory - ,item - ,warehouse - ,date_dim - where inv_item_sk = i_item_sk - and inv_warehouse_sk = w_warehouse_sk - and inv_date_sk = d_date_sk - and d_year =2001 - group by w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy) foo - where case mean when 0 then 0 else stdev/mean end > 1) -select inv1.w_warehouse_sk,inv1.i_item_sk,inv1.d_moy,inv1.mean, inv1.cov - ,inv2.w_warehouse_sk as w_warehouse_sk_2,inv2.i_item_sk as i_item_sk_2,inv2.d_moy as d_moy_2,inv2.mean as mean_2, inv2.cov as cov_2 -from inv inv1,inv inv2 + (select w_warehouse_name + , w_warehouse_sk + , i_item_sk + , d_moy + , stdev + , mean + , case mean when 0 then null else stdev / mean end cov + from (select w_warehouse_name + , w_warehouse_sk + , i_item_sk + , d_moy + , stddev_samp(inv_quantity_on_hand) stdev + , avg(inv_quantity_on_hand) mean + from inventory + , item + , warehouse + , date_dim + where inv_item_sk = i_item_sk + and inv_warehouse_sk = w_warehouse_sk + and inv_date_sk = d_date_sk + and d_year = 2001 + group by w_warehouse_name, w_warehouse_sk, i_item_sk, d_moy) foo + where case mean when 0 then 0 else stdev / mean end > 1) +select inv1.w_warehouse_sk + , inv1.i_item_sk + , inv1.d_moy + , inv1.mean + , inv1.cov + , inv2.w_warehouse_sk as w_warehouse_sk_2 + , inv2.i_item_sk as i_item_sk_2 + , inv2.d_moy as d_moy_2 + , inv2.mean as mean_2 + , inv2.cov as cov_2 +from inv inv1, + inv inv2 where inv1.i_item_sk = inv2.i_item_sk - and inv1.w_warehouse_sk = inv2.w_warehouse_sk - and inv1.d_moy=1 - and inv2.d_moy=1+1 + and inv1.w_warehouse_sk = inv2.w_warehouse_sk + and inv1.d_moy = 1 + and inv2.d_moy = 1 + 1 and inv1.cov > 1.5 -order by inv1.w_warehouse_sk,inv1.i_item_sk,inv1.d_moy,inv1.mean,inv1.cov - ,d_moy_2,mean_2, cov_2 +order by inv1.w_warehouse_sk, inv1.i_item_sk, inv1.d_moy, inv1.mean, inv1.cov + , d_moy_2, mean_2, cov_2 diff --git a/src/main/resources/tpcds/query40.sql b/src/main/resources/tpcds/query40.sql index 53a4e3e545..7561472287 100644 --- a/src/main/resources/tpcds/query40.sql +++ b/src/main/resources/tpcds/query40.sql @@ -1,25 +1,25 @@ -select - w_state - ,i_item_id - ,sum(case when (cast(d_date as date) < cast ('2000-03-11' as date)) - then cs_sales_price - coalesce(cr_refunded_cash,0) else 0 end) as sales_before - ,sum(case when (cast(d_date as date) >= cast ('2000-03-11' as date)) - then cs_sales_price - coalesce(cr_refunded_cash,0) else 0 end) as sales_after - from - catalog_sales left outer join catalog_returns on - (cs_order_number = cr_order_number +select w_state + , i_item_id + , sum(case + when (cast(d_date as date) < cast('2000-03-11' as date)) + then cs_sales_price - coalesce(cr_refunded_cash, 0) + else 0 end) as sales_before + , sum(case + when (cast(d_date as date) >= cast('2000-03-11' as date)) + then cs_sales_price - coalesce(cr_refunded_cash, 0) + else 0 end) as sales_after +from catalog_sales + left outer join catalog_returns on + (cs_order_number = cr_order_number and cs_item_sk = cr_item_sk) - ,warehouse - ,item - ,date_dim - where - i_current_price between 0.99 and 1.49 - and i_item_sk = cs_item_sk - and cs_warehouse_sk = w_warehouse_sk - and cs_sold_date_sk = d_date_sk - and d_date between date_sub(cast ('2000-03-11' as date), 30 ) - and date_add(cast ('2000-03-11' as date), 30 ) - group by - w_state,i_item_id - order by w_state,i_item_id - limit 100 + , warehouse + , item + , date_dim +where i_current_price between 0.99 and 1.49 + and i_item_sk = cs_item_sk + and cs_warehouse_sk = w_warehouse_sk + and cs_sold_date_sk = d_date_sk + and d_date between date_sub(cast('2000-03-11' as date), 30) + and date_add(cast('2000-03-11' as date), 30) +group by w_state, i_item_id +order by w_state, i_item_id limit 100 diff --git a/src/main/resources/tpcds/query41.sql b/src/main/resources/tpcds/query41.sql index dca19eafaa..81839a5075 100644 --- a/src/main/resources/tpcds/query41.sql +++ b/src/main/resources/tpcds/query41.sql @@ -1,49 +1,48 @@ -select distinct(i_product_name) - from item i1 - where i_manufact_id between 738 and 738+40 - and (select count(*) as item_cnt - from item - where (i_manufact = i1.i_manufact and - ((i_category = 'Women' and - (i_color = 'powder' or i_color = 'khaki') and - (i_units = 'Ounce' or i_units = 'Oz') and - (i_size = 'medium' or i_size = 'extra large') - ) or - (i_category = 'Women' and - (i_color = 'brown' or i_color = 'honeydew') and - (i_units = 'Bunch' or i_units = 'Ton') and - (i_size = 'N/A' or i_size = 'small') - ) or - (i_category = 'Men' and - (i_color = 'floral' or i_color = 'deep') and - (i_units = 'N/A' or i_units = 'Dozen') and - (i_size = 'petite' or i_size = 'large') - ) or - (i_category = 'Men' and - (i_color = 'light' or i_color = 'cornflower') and - (i_units = 'Box' or i_units = 'Pound') and - (i_size = 'medium' or i_size = 'extra large') - ))) or - (i_manufact = i1.i_manufact and - ((i_category = 'Women' and - (i_color = 'midnight' or i_color = 'snow') and - (i_units = 'Pallet' or i_units = 'Gross') and - (i_size = 'medium' or i_size = 'extra large') - ) or - (i_category = 'Women' and - (i_color = 'cyan' or i_color = 'papaya') and - (i_units = 'Cup' or i_units = 'Dram') and - (i_size = 'N/A' or i_size = 'small') - ) or - (i_category = 'Men' and - (i_color = 'orange' or i_color = 'frosted') and - (i_units = 'Each' or i_units = 'Tbl') and - (i_size = 'petite' or i_size = 'large') - ) or - (i_category = 'Men' and - (i_color = 'forest' or i_color = 'ghost') and - (i_units = 'Lb' or i_units = 'Bundle') and - (i_size = 'medium' or i_size = 'extra large') - )))) > 0 - order by i_product_name - limit 100 +select distinct(i_product_name) +from item i1 +where i_manufact_id between 738 and 738 + 40 + and (select count(*) as item_cnt + from item + where (i_manufact = i1.i_manufact and + ((i_category = 'Women' and + (i_color = 'powder' or i_color = 'khaki') and + (i_units = 'Ounce' or i_units = 'Oz') and + (i_size = 'medium' or i_size = 'extra large') + ) or + (i_category = 'Women' and + (i_color = 'brown' or i_color = 'honeydew') and + (i_units = 'Bunch' or i_units = 'Ton') and + (i_size = 'N/A' or i_size = 'small') + ) or + (i_category = 'Men' and + (i_color = 'floral' or i_color = 'deep') and + (i_units = 'N/A' or i_units = 'Dozen') and + (i_size = 'petite' or i_size = 'large') + ) or + (i_category = 'Men' and + (i_color = 'light' or i_color = 'cornflower') and + (i_units = 'Box' or i_units = 'Pound') and + (i_size = 'medium' or i_size = 'extra large') + ))) + or (i_manufact = i1.i_manufact and + ((i_category = 'Women' and + (i_color = 'midnight' or i_color = 'snow') and + (i_units = 'Pallet' or i_units = 'Gross') and + (i_size = 'medium' or i_size = 'extra large') + ) or + (i_category = 'Women' and + (i_color = 'cyan' or i_color = 'papaya') and + (i_units = 'Cup' or i_units = 'Dram') and + (i_size = 'N/A' or i_size = 'small') + ) or + (i_category = 'Men' and + (i_color = 'orange' or i_color = 'frosted') and + (i_units = 'Each' or i_units = 'Tbl') and + (i_size = 'petite' or i_size = 'large') + ) or + (i_category = 'Men' and + (i_color = 'forest' or i_color = 'ghost') and + (i_units = 'Lb' or i_units = 'Bundle') and + (i_size = 'medium' or i_size = 'extra large') + )))) > 0 +order by i_product_name limit 100 diff --git a/src/main/resources/tpcds/query42.sql b/src/main/resources/tpcds/query42.sql index f95f132e26..6bf165415e 100644 --- a/src/main/resources/tpcds/query42.sql +++ b/src/main/resources/tpcds/query42.sql @@ -1,19 +1,18 @@ -select dt.d_year - ,item.i_category_id - ,item.i_category - ,sum(ss_ext_sales_price) - from date_dim dt - ,store_sales - ,item - where dt.d_date_sk = store_sales.ss_sold_date_sk - and store_sales.ss_item_sk = item.i_item_sk - and item.i_manager_id = 1 - and dt.d_moy=11 - and dt.d_year=2000 - group by dt.d_year - ,item.i_category_id - ,item.i_category - order by sum(ss_ext_sales_price) desc,dt.d_year - ,item.i_category_id - ,item.i_category - limit 100 +select dt.d_year + , item.i_category_id + , item.i_category + , sum(ss_ext_sales_price) +from date_dim dt + , store_sales + , item +where dt.d_date_sk = store_sales.ss_sold_date_sk + and store_sales.ss_item_sk = item.i_item_sk + and item.i_manager_id = 1 + and dt.d_moy = 11 + and dt.d_year = 2000 +group by dt.d_year + , item.i_category_id + , item.i_category +order by sum(ss_ext_sales_price) desc, dt.d_year + , item.i_category_id + , item.i_category limit 100 diff --git a/src/main/resources/tpcds/query43.sql b/src/main/resources/tpcds/query43.sql index 2be9e4a859..870555b5e9 100644 --- a/src/main/resources/tpcds/query43.sql +++ b/src/main/resources/tpcds/query43.sql @@ -1,16 +1,18 @@ -select s_store_name, s_store_id, - sum(case when (d_day_name='Sunday') then ss_sales_price else null end) sun_sales, - sum(case when (d_day_name='Monday') then ss_sales_price else null end) mon_sales, - sum(case when (d_day_name='Tuesday') then ss_sales_price else null end) tue_sales, - sum(case when (d_day_name='Wednesday') then ss_sales_price else null end) wed_sales, - sum(case when (d_day_name='Thursday') then ss_sales_price else null end) thu_sales, - sum(case when (d_day_name='Friday') then ss_sales_price else null end) fri_sales, - sum(case when (d_day_name='Saturday') then ss_sales_price else null end) sat_sales - from date_dim, store_sales, store - where d_date_sk = ss_sold_date_sk and - s_store_sk = ss_store_sk and - s_gmt_offset = -5 and - d_year = 2000 - group by s_store_name, s_store_id - order by s_store_name, s_store_id,sun_sales,mon_sales,tue_sales,wed_sales,thu_sales,fri_sales,sat_sales - limit 100 +select s_store_name, + s_store_id, + sum(case when (d_day_name = 'Sunday') then ss_sales_price else null end) sun_sales, + sum(case when (d_day_name = 'Monday') then ss_sales_price else null end) mon_sales, + sum(case when (d_day_name = 'Tuesday') then ss_sales_price else null end) tue_sales, + sum(case when (d_day_name = 'Wednesday') then ss_sales_price else null end) wed_sales, + sum(case when (d_day_name = 'Thursday') then ss_sales_price else null end) thu_sales, + sum(case when (d_day_name = 'Friday') then ss_sales_price else null end) fri_sales, + sum(case when (d_day_name = 'Saturday') then ss_sales_price else null end) sat_sales +from date_dim, + store_sales, + store +where d_date_sk = ss_sold_date_sk + and s_store_sk = ss_store_sk + and s_gmt_offset = -5 + and d_year = 2000 +group by s_store_name, s_store_id +order by s_store_name, s_store_id, sun_sales, mon_sales, tue_sales, wed_sales, thu_sales, fri_sales, sat_sales limit 100 diff --git a/src/main/resources/tpcds/query44.sql b/src/main/resources/tpcds/query44.sql index 294e4bc584..21ebe5700a 100644 --- a/src/main/resources/tpcds/query44.sql +++ b/src/main/resources/tpcds/query44.sql @@ -1,32 +1,31 @@ -select asceding.rnk, i1.i_product_name best_performing, i2.i_product_name worst_performing -from(select * - from (select item_sk,rank() over (order by rank_col asc) rnk - from (select ss_item_sk item_sk,avg(ss_net_profit) rank_col - from store_sales ss1 - where ss_store_sk = 4 - group by ss_item_sk - having avg(ss_net_profit) > 0.9*(select avg(ss_net_profit) rank_col - from store_sales - where ss_store_sk = 4 - and ss_addr_sk is null - group by ss_store_sk))V1)V11 - where rnk < 11) asceding, - (select * - from (select item_sk,rank() over (order by rank_col desc) rnk - from (select ss_item_sk item_sk,avg(ss_net_profit) rank_col - from store_sales ss1 - where ss_store_sk = 4 - group by ss_item_sk - having avg(ss_net_profit) > 0.9*(select avg(ss_net_profit) rank_col - from store_sales - where ss_store_sk = 4 - and ss_addr_sk is null - group by ss_store_sk))V2)V21 - where rnk < 11) descending, -item i1, -item i2 -where asceding.rnk = descending.rnk - and i1.i_item_sk=asceding.item_sk - and i2.i_item_sk=descending.item_sk -order by asceding.rnk - limit 100 +select asceding.rnk, i1.i_product_name best_performing, i2.i_product_name worst_performing +from (select * + from (select item_sk, rank() over (order by rank_col asc) rnk + from (select ss_item_sk item_sk, avg(ss_net_profit) rank_col + from store_sales ss1 + where ss_store_sk = 4 + group by ss_item_sk + having avg(ss_net_profit) > 0.9 * (select avg(ss_net_profit) rank_col + from store_sales + where ss_store_sk = 4 + and ss_addr_sk is null + group by ss_store_sk)) V1) V11 + where rnk < 11) asceding, + (select * + from (select item_sk, rank() over (order by rank_col desc) rnk + from (select ss_item_sk item_sk, avg(ss_net_profit) rank_col + from store_sales ss1 + where ss_store_sk = 4 + group by ss_item_sk + having avg(ss_net_profit) > 0.9 * (select avg(ss_net_profit) rank_col + from store_sales + where ss_store_sk = 4 + and ss_addr_sk is null + group by ss_store_sk)) V2) V21 + where rnk < 11) descending, + item i1, + item i2 +where asceding.rnk = descending.rnk + and i1.i_item_sk = asceding.item_sk + and i2.i_item_sk = descending.item_sk +order by asceding.rnk limit 100 diff --git a/src/main/resources/tpcds/query45.sql b/src/main/resources/tpcds/query45.sql index 29d3da4ffc..f7075b29e6 100644 --- a/src/main/resources/tpcds/query45.sql +++ b/src/main/resources/tpcds/query45.sql @@ -1,17 +1,20 @@ -select ca_zip, ca_city, sum(ws_sales_price) - from web_sales, customer, customer_address, date_dim, item - where ws_bill_customer_sk = c_customer_sk - and c_current_addr_sk = ca_address_sk - and ws_item_sk = i_item_sk - and ( substr(ca_zip,1,5) in ('85669', '86197','88274','83405','86475', '85392', '85460', '80348', '81792') - or - i_item_id in (select i_item_id - from item - where i_item_sk in (2, 3, 5, 7, 11, 13, 17, 19, 23, 29) - ) - ) - and ws_sold_date_sk = d_date_sk - and d_qoy = 2 and d_year = 2001 - group by ca_zip, ca_city - order by ca_zip, ca_city - limit 100 +select ca_zip, ca_city, sum(ws_sales_price) +from web_sales, + customer, + customer_address, + date_dim, + item +where ws_bill_customer_sk = c_customer_sk + and c_current_addr_sk = ca_address_sk + and ws_item_sk = i_item_sk + and (substr(ca_zip, 1, 5) in ('85669', '86197', '88274', '83405', '86475', '85392', '85460', '80348', '81792') + or + i_item_id in (select i_item_id + from item + where i_item_sk in (2, 3, 5, 7, 11, 13, 17, 19, 23, 29)) + ) + and ws_sold_date_sk = d_date_sk + and d_qoy = 2 + and d_year = 2001 +group by ca_zip, ca_city +order by ca_zip, ca_city limit 100 diff --git a/src/main/resources/tpcds/query46.sql b/src/main/resources/tpcds/query46.sql index 244619d80b..84393ba71c 100644 --- a/src/main/resources/tpcds/query46.sql +++ b/src/main/resources/tpcds/query46.sql @@ -1,32 +1,37 @@ -select c_last_name - ,c_first_name - ,ca_city - ,bought_city - ,ss_ticket_number - ,amt,profit - from - (select ss_ticket_number - ,ss_customer_sk - ,ca_city bought_city - ,sum(ss_coupon_amt) amt - ,sum(ss_net_profit) profit - from store_sales,date_dim,store,household_demographics,customer_address - where store_sales.ss_sold_date_sk = date_dim.d_date_sk - and store_sales.ss_store_sk = store.s_store_sk - and store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk - and store_sales.ss_addr_sk = customer_address.ca_address_sk - and (household_demographics.hd_dep_count = 4 or - household_demographics.hd_vehicle_count= 3) - and date_dim.d_dow in (6,0) - and date_dim.d_year in (1999,1999+1,1999+2) - and store.s_city in ('Fairview','Midway','Fairview','Fairview','Fairview') - group by ss_ticket_number,ss_customer_sk,ss_addr_sk,ca_city) dn,customer,customer_address current_addr - where ss_customer_sk = c_customer_sk - and customer.c_current_addr_sk = current_addr.ca_address_sk - and current_addr.ca_city <> bought_city - order by c_last_name - ,c_first_name - ,ca_city - ,bought_city - ,ss_ticket_number - limit 100 +select c_last_name + , c_first_name + , ca_city + , bought_city + , ss_ticket_number + , amt + , profit +from (select ss_ticket_number + , ss_customer_sk + , ca_city bought_city + , sum(ss_coupon_amt) amt + , sum(ss_net_profit) profit + from store_sales, + date_dim, + store, + household_demographics, + customer_address + where store_sales.ss_sold_date_sk = date_dim.d_date_sk + and store_sales.ss_store_sk = store.s_store_sk + and store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk + and store_sales.ss_addr_sk = customer_address.ca_address_sk + and (household_demographics.hd_dep_count = 4 or + household_demographics.hd_vehicle_count = 3) + and date_dim.d_dow in (6, 0) + and date_dim.d_year in (1999, 1999 + 1, 1999 + 2) + and store.s_city in ('Fairview', 'Midway', 'Fairview', 'Fairview', 'Fairview') + group by ss_ticket_number, ss_customer_sk, ss_addr_sk, ca_city) dn, + customer, + customer_address current_addr +where ss_customer_sk = c_customer_sk + and customer.c_current_addr_sk = current_addr.ca_address_sk + and current_addr.ca_city <> bought_city +order by c_last_name + , c_first_name + , ca_city + , bought_city + , ss_ticket_number limit 100 diff --git a/src/main/resources/tpcds/query47.sql b/src/main/resources/tpcds/query47.sql index 811107396b..146e1173ff 100644 --- a/src/main/resources/tpcds/query47.sql +++ b/src/main/resources/tpcds/query47.sql @@ -1,48 +1,56 @@ -with v1 as( - select i_category, i_brand, - s_store_name, s_company_name, - d_year, d_moy, - sum(ss_sales_price) sum_sales, - avg(sum(ss_sales_price)) over - (partition by i_category, i_brand, +with v1 as (select i_category, + i_brand, + s_store_name, + s_company_name, + d_year, + d_moy, + sum(ss_sales_price) sum_sales, + avg(sum(ss_sales_price)) over (partition by i_category, i_brand, s_store_name, s_company_name, d_year) - avg_monthly_sales, - rank() over - (partition by i_category, i_brand, + avg_monthly_sales, rank() over (partition by i_category, i_brand, s_store_name, s_company_name order by d_year, d_moy) rn - from item, store_sales, date_dim, store - where ss_item_sk = i_item_sk and - ss_sold_date_sk = d_date_sk and - ss_store_sk = s_store_sk and - ( - d_year = 1999 or - ( d_year = 1999-1 and d_moy =12) or - ( d_year = 1999+1 and d_moy =1) - ) - group by i_category, i_brand, - s_store_name, s_company_name, - d_year, d_moy), - v2 as( - select v1.i_category, v1.i_brand, v1.s_store_name, v1.s_company_name - ,v1.d_year, v1.d_moy - ,v1.avg_monthly_sales - ,v1.sum_sales, v1_lag.sum_sales psum, v1_lead.sum_sales nsum - from v1, v1 v1_lag, v1 v1_lead - where v1.i_category = v1_lag.i_category and - v1.i_category = v1_lead.i_category and - v1.i_brand = v1_lag.i_brand and - v1.i_brand = v1_lead.i_brand and - v1.s_store_name = v1_lag.s_store_name and - v1.s_store_name = v1_lead.s_store_name and - v1.s_company_name = v1_lag.s_company_name and - v1.s_company_name = v1_lead.s_company_name and - v1.rn = v1_lag.rn + 1 and - v1.rn = v1_lead.rn - 1) - select * - from v2 - where d_year = 1999 and - avg_monthly_sales > 0 and - case when avg_monthly_sales > 0 then abs(sum_sales - avg_monthly_sales) / avg_monthly_sales else null end > 0.1 - order by sum_sales - avg_monthly_sales, 3 - limit 100 + from item, + store_sales, + date_dim, + store + where ss_item_sk = i_item_sk + and ss_sold_date_sk = d_date_sk + and ss_store_sk = s_store_sk + and ( + d_year = 1999 or + (d_year = 1999 - 1 and d_moy = 12) or + (d_year = 1999 + 1 and d_moy = 1) + ) + group by i_category, i_brand, + s_store_name, s_company_name, + d_year, d_moy), + v2 as (select v1.i_category + , v1.i_brand + , v1.s_store_name + , v1.s_company_name + , v1.d_year + , v1.d_moy + , v1.avg_monthly_sales + , v1.sum_sales + , v1_lag.sum_sales psum + , v1_lead.sum_sales nsum + from v1, + v1 v1_lag, + v1 v1_lead + where v1.i_category = v1_lag.i_category + and v1.i_category = v1_lead.i_category + and v1.i_brand = v1_lag.i_brand + and v1.i_brand = v1_lead.i_brand + and v1.s_store_name = v1_lag.s_store_name + and v1.s_store_name = v1_lead.s_store_name + and v1.s_company_name = v1_lag.s_company_name + and v1.s_company_name = v1_lead.s_company_name + and v1.rn = v1_lag.rn + 1 + and v1.rn = v1_lead.rn - 1) +select * +from v2 +where d_year = 1999 + and avg_monthly_sales > 0 + and case when avg_monthly_sales > 0 then abs(sum_sales - avg_monthly_sales) / avg_monthly_sales else null end > 0.1 +order by sum_sales - avg_monthly_sales, 3 limit 100 diff --git a/src/main/resources/tpcds/query48.sql b/src/main/resources/tpcds/query48.sql index 91f5015515..5adfb056cf 100644 --- a/src/main/resources/tpcds/query48.sql +++ b/src/main/resources/tpcds/query48.sql @@ -1,64 +1,67 @@ -select sum (ss_quantity) - from store_sales, store, customer_demographics, customer_address, date_dim - where s_store_sk = ss_store_sk - and ss_sold_date_sk = d_date_sk and d_year = 2000 - and - ( - ( - cd_demo_sk = ss_cdemo_sk - and - cd_marital_status = 'M' - and - cd_education_status = '4 yr Degree' - and - ss_sales_price between 100.00 and 150.00 - ) - or - ( - cd_demo_sk = ss_cdemo_sk - and - cd_marital_status = 'D' - and - cd_education_status = '2 yr Degree' - and - ss_sales_price between 50.00 and 100.00 - ) - or - ( - cd_demo_sk = ss_cdemo_sk - and - cd_marital_status = 'S' - and - cd_education_status = 'College' - and - ss_sales_price between 150.00 and 200.00 - ) - ) - and - ( - ( - ss_addr_sk = ca_address_sk - and - ca_country = 'United States' - and - ca_state in ('CO', 'OH', 'TX') - and ss_net_profit between 0 and 2000 - ) - or - (ss_addr_sk = ca_address_sk - and - ca_country = 'United States' - and - ca_state in ('OR', 'MN', 'KY') - and ss_net_profit between 150 and 3000 - ) - or - (ss_addr_sk = ca_address_sk - and - ca_country = 'United States' - and - ca_state in ('VA', 'CA', 'MS') - and ss_net_profit between 50 and 25000 - ) - ) +select sum(ss_quantity) +from store_sales, + store, + customer_demographics, + customer_address, + date_dim +where s_store_sk = ss_store_sk + and ss_sold_date_sk = d_date_sk + and d_year = 2000 + and ( + ( + cd_demo_sk = ss_cdemo_sk + and + cd_marital_status = 'M' + and + cd_education_status = '4 yr Degree' + and + ss_sales_price between 100.00 and 150.00 + ) + or + ( + cd_demo_sk = ss_cdemo_sk + and + cd_marital_status = 'D' + and + cd_education_status = '2 yr Degree' + and + ss_sales_price between 50.00 and 100.00 + ) + or + ( + cd_demo_sk = ss_cdemo_sk + and + cd_marital_status = 'S' + and + cd_education_status = 'College' + and + ss_sales_price between 150.00 and 200.00 + ) + ) + and ( + ( + ss_addr_sk = ca_address_sk + and + ca_country = 'United States' + and + ca_state in ('CO', 'OH', 'TX') + and ss_net_profit between 0 and 2000 + ) + or + (ss_addr_sk = ca_address_sk + and + ca_country = 'United States' + and + ca_state in ('OR', 'MN', 'KY') + and ss_net_profit between 150 and 3000 + ) + or + (ss_addr_sk = ca_address_sk + and + ca_country = 'United States' + and + ca_state in ('VA', 'CA', 'MS') + and ss_net_profit between 50 and 25000 + ) + ) diff --git a/src/main/resources/tpcds/query49.sql b/src/main/resources/tpcds/query49.sql index 63f71cab7f..3dc481f2ad 100644 --- a/src/main/resources/tpcds/query49.sql +++ b/src/main/resources/tpcds/query49.sql @@ -1,124 +1,102 @@ -select - 'web' as channel - ,web.item - ,web.return_ratio - ,web.return_rank - ,web.currency_rank - from ( - select - item - ,return_ratio - ,currency_ratio - ,rank() over (order by return_ratio) as return_rank +select 'web' as channel + , web.item + , web.return_ratio + , web.return_rank + , web.currency_rank +from (select item + , return_ratio + , currency_ratio + , rank() over (order by return_ratio) as return_rank ,rank() over (order by currency_ratio) as currency_rank - from - ( select ws.ws_item_sk as item - ,(cast(sum(coalesce(wr.wr_return_quantity,0)) as decimal(15,4))/ - cast(sum(coalesce(ws.ws_quantity,0)) as decimal(15,4) )) as return_ratio - ,(cast(sum(coalesce(wr.wr_return_amt,0)) as decimal(15,4))/ - cast(sum(coalesce(ws.ws_net_paid,0)) as decimal(15,4) )) as currency_ratio - from - web_sales ws left outer join web_returns wr - on (ws.ws_order_number = wr.wr_order_number and - ws.ws_item_sk = wr.wr_item_sk) - ,date_dim - where - wr.wr_return_amt > 10000 - and ws.ws_net_profit > 1 - and ws.ws_net_paid > 0 - and ws.ws_quantity > 0 - and ws_sold_date_sk = d_date_sk - and d_year = 2001 - and d_moy = 12 - group by ws.ws_item_sk - ) in_web - ) web - where - ( - web.return_rank <= 10 - or - web.currency_rank <= 10 - ) - union - select - 'catalog' as channel - ,catalog.item - ,catalog.return_ratio - ,catalog.return_rank - ,catalog.currency_rank - from ( - select - item - ,return_ratio - ,currency_ratio - ,rank() over (order by return_ratio) as return_rank + from (select ws.ws_item_sk as item + , (cast(sum(coalesce(wr.wr_return_quantity, 0)) as decimal(15, 4)) / + cast(sum(coalesce(ws.ws_quantity, 0)) as decimal(15, 4))) as return_ratio + , (cast(sum(coalesce(wr.wr_return_amt, 0)) as decimal(15, 4)) / + cast(sum(coalesce(ws.ws_net_paid, 0)) as decimal(15, 4))) as currency_ratio + from web_sales ws + left outer join web_returns wr + on (ws.ws_order_number = wr.wr_order_number and + ws.ws_item_sk = wr.wr_item_sk) + , date_dim + where wr.wr_return_amt > 10000 + and ws.ws_net_profit > 1 + and ws.ws_net_paid > 0 + and ws.ws_quantity > 0 + and ws_sold_date_sk = d_date_sk + and d_year = 2001 + and d_moy = 12 + group by ws.ws_item_sk) in_web) web +where ( + web.return_rank <= 10 + or + web.currency_rank <= 10 + ) +union +select 'catalog' as channel + , catalog.item + , catalog.return_ratio + , catalog.return_rank + , catalog.currency_rank +from (select item + , return_ratio + , currency_ratio + , rank() over (order by return_ratio) as return_rank ,rank() over (order by currency_ratio) as currency_rank - from - ( select - cs.cs_item_sk as item - ,(cast(sum(coalesce(cr.cr_return_quantity,0)) as decimal(15,4))/ - cast(sum(coalesce(cs.cs_quantity,0)) as decimal(15,4) )) as return_ratio - ,(cast(sum(coalesce(cr.cr_return_amount,0)) as decimal(15,4))/ - cast(sum(coalesce(cs.cs_net_paid,0)) as decimal(15,4) )) as currency_ratio - from - catalog_sales cs left outer join catalog_returns cr - on (cs.cs_order_number = cr.cr_order_number and - cs.cs_item_sk = cr.cr_item_sk) - ,date_dim - where - cr.cr_return_amount > 10000 - and cs.cs_net_profit > 1 - and cs.cs_net_paid > 0 - and cs.cs_quantity > 0 - and cs_sold_date_sk = d_date_sk - and d_year = 2001 - and d_moy = 12 - group by cs.cs_item_sk - ) in_cat - ) catalog - where - ( - catalog.return_rank <= 10 - or - catalog.currency_rank <=10 - ) - union - select - 'store' as channel - ,store.item - ,store.return_ratio - ,store.return_rank - ,store.currency_rank - from ( - select - item - ,return_ratio - ,currency_ratio - ,rank() over (order by return_ratio) as return_rank + from (select cs.cs_item_sk as item + , (cast(sum(coalesce(cr.cr_return_quantity, 0)) as decimal(15, 4)) / + cast(sum(coalesce(cs.cs_quantity, 0)) as decimal(15, 4))) as return_ratio + , (cast(sum(coalesce(cr.cr_return_amount, 0)) as decimal(15, 4)) / + cast(sum(coalesce(cs.cs_net_paid, 0)) as decimal(15, 4))) as currency_ratio + from catalog_sales cs + left outer join catalog_returns cr + on (cs.cs_order_number = cr.cr_order_number and + cs.cs_item_sk = cr.cr_item_sk) + , date_dim + where cr.cr_return_amount > 10000 + and cs.cs_net_profit > 1 + and cs.cs_net_paid > 0 + and cs.cs_quantity > 0 + and cs_sold_date_sk = d_date_sk + and d_year = 2001 + and d_moy = 12 + group by cs.cs_item_sk) in_cat) catalog +where + ( + catalog.return_rank <= 10 + or + catalog.currency_rank <=10 + ) +union +select 'store' as channel + , store.item + , store.return_ratio + , store.return_rank + , store.currency_rank +from (select item + , return_ratio + , currency_ratio + , rank() over (order by return_ratio) as return_rank ,rank() over (order by currency_ratio) as currency_rank - from - ( select sts.ss_item_sk as item - ,(cast(sum(coalesce(sr.sr_return_quantity,0)) as decimal(15,4))/cast(sum(coalesce(sts.ss_quantity,0)) as decimal(15,4) )) as return_ratio - ,(cast(sum(coalesce(sr.sr_return_amt,0)) as decimal(15,4))/cast(sum(coalesce(sts.ss_net_paid,0)) as decimal(15,4) )) as currency_ratio - from - store_sales sts left outer join store_returns sr - on (sts.ss_ticket_number = sr.sr_ticket_number and sts.ss_item_sk = sr.sr_item_sk) - ,date_dim - where - sr.sr_return_amt > 10000 - and sts.ss_net_profit > 1 - and sts.ss_net_paid > 0 - and sts.ss_quantity > 0 - and ss_sold_date_sk = d_date_sk - and d_year = 2001 - and d_moy = 12 - group by sts.ss_item_sk - ) in_store - ) store - where ( - store.return_rank <= 10 - or - store.currency_rank <= 10 - ) - order by 1,4,5 - limit 100 + from (select sts.ss_item_sk as item + , (cast(sum(coalesce(sr.sr_return_quantity, 0)) as decimal(15, 4)) / + cast(sum(coalesce(sts.ss_quantity, 0)) as decimal(15, 4))) as return_ratio + , (cast(sum(coalesce(sr.sr_return_amt, 0)) as decimal(15, 4)) / + cast(sum(coalesce(sts.ss_net_paid, 0)) as decimal(15, 4))) as currency_ratio + from store_sales sts + left outer join store_returns sr + on (sts.ss_ticket_number = sr.sr_ticket_number and sts.ss_item_sk = sr.sr_item_sk) + , date_dim + where sr.sr_return_amt > 10000 + and sts.ss_net_profit > 1 + and sts.ss_net_paid > 0 + and sts.ss_quantity > 0 + and ss_sold_date_sk = d_date_sk + and d_year = 2001 + and d_moy = 12 + group by sts.ss_item_sk) in_store) store +where ( + store.return_rank <= 10 + or + store.currency_rank <= 10 + ) +order by 1, 4, 5 limit 100 diff --git a/src/main/resources/tpcds/query50.sql b/src/main/resources/tpcds/query50.sql index 4e34de0538..484311dc0d 100644 --- a/src/main/resources/tpcds/query50.sql +++ b/src/main/resources/tpcds/query50.sql @@ -1,56 +1,57 @@ -select - s_store_name - ,s_company_id - ,s_street_number - ,s_street_name - ,s_street_type - ,s_suite_number - ,s_city - ,s_county - ,s_state - ,s_zip - ,sum(case when (sr_returned_date_sk - ss_sold_date_sk <= 30 ) then 1 else 0 end) as "30_days" - ,sum(case when (sr_returned_date_sk - ss_sold_date_sk > 30) and - (sr_returned_date_sk - ss_sold_date_sk <= 60) then 1 else 0 end ) as "31_60_days" - ,sum(case when (sr_returned_date_sk - ss_sold_date_sk > 60) and - (sr_returned_date_sk - ss_sold_date_sk <= 90) then 1 else 0 end) as "61_90_days" - ,sum(case when (sr_returned_date_sk - ss_sold_date_sk > 90) and - (sr_returned_date_sk - ss_sold_date_sk <= 120) then 1 else 0 end) as "91_120_days" - ,sum(case when (sr_returned_date_sk - ss_sold_date_sk > 120) then 1 else 0 end) as above120_days -from - store_sales - ,store_returns - ,store - ,date_dim d1 - ,date_dim d2 -where - d2.d_year = 2001 -and d2.d_moy = 8 -and ss_ticket_number = sr_ticket_number -and ss_item_sk = sr_item_sk -and ss_sold_date_sk = d1.d_date_sk -and sr_returned_date_sk = d2.d_date_sk -and ss_customer_sk = sr_customer_sk -and ss_store_sk = s_store_sk -group by - s_store_name - ,s_company_id - ,s_street_number - ,s_street_name - ,s_street_type - ,s_suite_number - ,s_city - ,s_county - ,s_state - ,s_zip +select s_store_name + , s_company_id + , s_street_number + , s_street_name + , s_street_type + , s_suite_number + , s_city + , s_county + , s_state + , s_zip + , sum(case when (sr_returned_date_sk - ss_sold_date_sk <= 30) then 1 else 0 end) as "30_days" + , sum(case + when (sr_returned_date_sk - ss_sold_date_sk > 30) and + (sr_returned_date_sk - ss_sold_date_sk <= 60) then 1 + else 0 end) as "31_60_days" + , sum(case + when (sr_returned_date_sk - ss_sold_date_sk > 60) and + (sr_returned_date_sk - ss_sold_date_sk <= 90) then 1 + else 0 end) as "61_90_days" + , sum(case + when (sr_returned_date_sk - ss_sold_date_sk > 90) and + (sr_returned_date_sk - ss_sold_date_sk <= 120) then 1 + else 0 end) as "91_120_days" + , sum(case when (sr_returned_date_sk - ss_sold_date_sk > 120) then 1 else 0 end) as above120_days +from store_sales + , store_returns + , store + , date_dim d1 + , date_dim d2 +where d2.d_year = 2001 + and d2.d_moy = 8 + and ss_ticket_number = sr_ticket_number + and ss_item_sk = sr_item_sk + and ss_sold_date_sk = d1.d_date_sk + and sr_returned_date_sk = d2.d_date_sk + and ss_customer_sk = sr_customer_sk + and ss_store_sk = s_store_sk +group by s_store_name + , s_company_id + , s_street_number + , s_street_name + , s_street_type + , s_suite_number + , s_city + , s_county + , s_state + , s_zip order by s_store_name - ,s_company_id - ,s_street_number - ,s_street_name - ,s_street_type - ,s_suite_number - ,s_city - ,s_county - ,s_state - ,s_zip - limit 100 + , s_company_id + , s_street_number + , s_street_name + , s_street_type + , s_suite_number + , s_city + , s_county + , s_state + , s_zip limit 100 diff --git a/src/main/resources/tpcds/query51.sql b/src/main/resources/tpcds/query51.sql index 865c23e9b9..9508d473ca 100644 --- a/src/main/resources/tpcds/query51.sql +++ b/src/main/resources/tpcds/query51.sql @@ -1,42 +1,40 @@ -WITH web_v1 as ( -select - ws_item_sk item_sk, d_date, - sum(sum(ws_sales_price)) - over (partition by ws_item_sk order by d_date rows between unbounded preceding and current row) cume_sales -from web_sales - ,date_dim -where ws_sold_date_sk=d_date_sk - and d_month_seq between 1200 and 1200+11 - and ws_item_sk is not NULL -group by ws_item_sk, d_date), -store_v1 as ( -select - ss_item_sk item_sk, d_date, - sum(sum(ss_sales_price)) - over (partition by ss_item_sk order by d_date rows between unbounded preceding and current row) cume_sales -from store_sales - ,date_dim -where ss_sold_date_sk=d_date_sk - and d_month_seq between 1200 and 1200+11 - and ss_item_sk is not NULL -group by ss_item_sk, d_date) - select * +WITH web_v1 as (select ws_item_sk item_sk, + d_date, + sum(sum(ws_sales_price)) + over (partition by ws_item_sk order by d_date rows between unbounded preceding and current row) cume_sales + from web_sales + , date_dim + where ws_sold_date_sk = d_date_sk + and d_month_seq between 1200 and 1200 + 11 + and ws_item_sk is not NULL + group by ws_item_sk, d_date), + store_v1 as (select ss_item_sk item_sk, + d_date, + sum(sum(ss_sales_price)) + over (partition by ss_item_sk order by d_date rows between unbounded preceding and current row) cume_sales + from store_sales + , date_dim + where ss_sold_date_sk = d_date_sk + and d_month_seq between 1200 and 1200 + 11 + and ss_item_sk is not NULL + group by ss_item_sk, d_date) +select * from (select item_sk - ,d_date - ,web_sales - ,store_sales - ,max(web_sales) - over (partition by item_sk order by d_date rows between unbounded preceding and current row) web_cumulative + , d_date + , web_sales + , store_sales + , max(web_sales) + over + (partition by item_sk order by d_date rows between unbounded preceding and current row) web_cumulative ,max(store_sales) - over (partition by item_sk order by d_date rows between unbounded preceding and current row) store_cumulative - from (select case when web.item_sk is not null then web.item_sk else store.item_sk end item_sk - ,case when web.d_date is not null then web.d_date else store.d_date end d_date - ,web.cume_sales web_sales - ,store.cume_sales store_sales - from web_v1 web full outer join store_v1 store on (web.item_sk = store.item_sk - and web.d_date = store.d_date) - )x )y + over (partition by item_sk order by d_date rows between unbounded preceding and current row) store_cumulative + from (select case when web.item_sk is not null then web.item_sk else store.item_sk end item_sk + , case when web.d_date is not null then web.d_date else store.d_date end d_date + , web.cume_sales web_sales + , store.cume_sales store_sales + from web_v1 web + full outer join store_v1 store on (web.item_sk = store.item_sk + and web.d_date = store.d_date)) x) y where web_cumulative > store_cumulative order by item_sk - ,d_date - limit 100 + , d_date limit 100 diff --git a/src/main/resources/tpcds/query52.sql b/src/main/resources/tpcds/query52.sql index 9083f16316..319967f323 100644 --- a/src/main/resources/tpcds/query52.sql +++ b/src/main/resources/tpcds/query52.sql @@ -1,19 +1,18 @@ -select dt.d_year - ,item.i_brand_id brand_id - ,item.i_brand brand - ,sum(ss_ext_sales_price) ext_price - from date_dim dt - ,store_sales - ,item - where dt.d_date_sk = store_sales.ss_sold_date_sk - and store_sales.ss_item_sk = item.i_item_sk - and item.i_manager_id = 1 - and dt.d_moy=11 - and dt.d_year=2000 - group by dt.d_year - ,item.i_brand - ,item.i_brand_id - order by dt.d_year - ,ext_price desc - ,brand_id - limit 100 +select dt.d_year + , item.i_brand_id brand_id + , item.i_brand brand + , sum(ss_ext_sales_price) ext_price +from date_dim dt + , store_sales + , item +where dt.d_date_sk = store_sales.ss_sold_date_sk + and store_sales.ss_item_sk = item.i_item_sk + and item.i_manager_id = 1 + and dt.d_moy = 11 + and dt.d_year = 2000 +group by dt.d_year + , item.i_brand + , item.i_brand_id +order by dt.d_year + , ext_price desc + , brand_id limit 100 diff --git a/src/main/resources/tpcds/query53.sql b/src/main/resources/tpcds/query53.sql index b06146fada..188294a956 100644 --- a/src/main/resources/tpcds/query53.sql +++ b/src/main/resources/tpcds/query53.sql @@ -1,25 +1,30 @@ -select * from -(select i_manufact_id, -sum(ss_sales_price) sum_sales, -avg(sum(ss_sales_price)) over (partition by i_manufact_id) avg_quarterly_sales -from item, store_sales, date_dim, store -where ss_item_sk = i_item_sk and -ss_sold_date_sk = d_date_sk and -ss_store_sk = s_store_sk and -d_month_seq in (1200,1200+1,1200+2,1200+3,1200+4,1200+5,1200+6,1200+7,1200+8,1200+9,1200+10,1200+11) and -((i_category in ('Books','Children','Electronics') and -i_class in ('personal','portable','reference','self-help') and -i_brand in ('scholaramalgamalg #14','scholaramalgamalg #7', - 'exportiunivamalg #9','scholaramalgamalg #9')) -or(i_category in ('Women','Music','Men') and -i_class in ('accessories','classical','fragrances','pants') and -i_brand in ('amalgimporto #1','edu packscholar #1','exportiimporto #1', - 'importoamalg #1'))) -group by i_manufact_id, d_qoy ) tmp1 -where case when avg_quarterly_sales > 0 - then abs (sum_sales - avg_quarterly_sales)/ avg_quarterly_sales - else null end > 0.1 +select * +from (select i_manufact_id, + sum(ss_sales_price) sum_sales, + avg(sum(ss_sales_price)) over (partition by i_manufact_id) avg_quarterly_sales + from item, + store_sales, + date_dim, + store + where ss_item_sk = i_item_sk + and ss_sold_date_sk = d_date_sk + and ss_store_sk = s_store_sk + and d_month_seq in + (1200, 1200 + 1, 1200 + 2, 1200 + 3, 1200 + 4, 1200 + 5, 1200 + 6, 1200 + 7, 1200 + 8, 1200 + 9, 1200 + 10, + 1200 + 11) + and ((i_category in ('Books', 'Children', 'Electronics') and + i_class in ('personal', 'portable', 'reference', 'self-help') and + i_brand in ('scholaramalgamalg #14', 'scholaramalgamalg #7', + 'exportiunivamalg #9', 'scholaramalgamalg #9')) + or (i_category in ('Women', 'Music', 'Men') and + i_class in ('accessories', 'classical', 'fragrances', 'pants') and + i_brand in ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', + 'importoamalg #1'))) + group by i_manufact_id, d_qoy) tmp1 +where case + when avg_quarterly_sales > 0 + then abs(sum_sales - avg_quarterly_sales) / avg_quarterly_sales + else null end > 0.1 order by avg_quarterly_sales, - sum_sales, - i_manufact_id - limit 100 + sum_sales, + i_manufact_id limit 100 diff --git a/src/main/resources/tpcds/query54.sql b/src/main/resources/tpcds/query54.sql index f9b363d066..eeeb3594fe 100644 --- a/src/main/resources/tpcds/query54.sql +++ b/src/main/resources/tpcds/query54.sql @@ -1,53 +1,49 @@ -with my_customers as ( - select distinct c_customer_sk - , c_current_addr_sk - from - ( select cs_sold_date_sk sold_date_sk, - cs_bill_customer_sk customer_sk, - cs_item_sk item_sk - from catalog_sales - union all - select ws_sold_date_sk sold_date_sk, - ws_bill_customer_sk customer_sk, - ws_item_sk item_sk - from web_sales - ) cs_or_ws_sales, - item, - date_dim, - customer - where sold_date_sk = d_date_sk - and item_sk = i_item_sk - and i_category = 'Women' - and i_class = 'maternity' - and c_customer_sk = cs_or_ws_sales.customer_sk - and d_moy = 12 - and d_year = 1998 - ) - , my_revenue as ( - select c_customer_sk, - sum(ss_ext_sales_price) as revenue - from my_customers, - store_sales, - customer_address, - store, - date_dim - where c_current_addr_sk = ca_address_sk - and ca_county = s_county - and ca_state = s_state - and ss_sold_date_sk = d_date_sk - and c_customer_sk = ss_customer_sk - and d_month_seq between (select distinct d_month_seq+1 - from date_dim where d_year = 1998 and d_moy = 12) - and (select distinct d_month_seq+3 - from date_dim where d_year = 1998 and d_moy = 12) - group by c_customer_sk - ) - , segments as - (select cast((revenue/50) as int) as segment - from my_revenue - ) - select segment, count(*) as num_customers, segment*50 as segment_base - from segments - group by segment - order by segment, num_customers - limit 100 +with my_customers as (select distinct c_customer_sk + , c_current_addr_sk + from (select cs_sold_date_sk sold_date_sk, + cs_bill_customer_sk customer_sk, + cs_item_sk item_sk + from catalog_sales + union all + select ws_sold_date_sk sold_date_sk, + ws_bill_customer_sk customer_sk, + ws_item_sk item_sk + from web_sales) cs_or_ws_sales, + item, + date_dim, + customer + where sold_date_sk = d_date_sk + and item_sk = i_item_sk + and i_category = 'Women' + and i_class = 'maternity' + and c_customer_sk = cs_or_ws_sales.customer_sk + and d_moy = 12 + and d_year = 1998) + , my_revenue as (select c_customer_sk, + sum(ss_ext_sales_price) as revenue + from my_customers, + store_sales, + customer_address, + store, + date_dim + where c_current_addr_sk = ca_address_sk + and ca_county = s_county + and ca_state = s_state + and ss_sold_date_sk = d_date_sk + and c_customer_sk = ss_customer_sk + and d_month_seq between (select distinct d_month_seq + 1 + from date_dim + where d_year = 1998 + and d_moy = 12) + and (select distinct d_month_seq + 3 + from date_dim + where d_year = 1998 + and d_moy = 12) + group by c_customer_sk) + , segments as + (select cast((revenue / 50) as int) as segment + from my_revenue) +select segment, count(*) as num_customers, segment * 50 as segment_base +from segments +group by segment +order by segment, num_customers limit 100 diff --git a/src/main/resources/tpcds/query55.sql b/src/main/resources/tpcds/query55.sql index 74018ae3db..e55a37e056 100644 --- a/src/main/resources/tpcds/query55.sql +++ b/src/main/resources/tpcds/query55.sql @@ -1,11 +1,13 @@ -select i_brand_id brand_id, i_brand brand, - sum(ss_ext_sales_price) ext_price - from date_dim, store_sales, item - where d_date_sk = ss_sold_date_sk - and ss_item_sk = i_item_sk - and i_manager_id=28 - and d_moy=11 - and d_year=1999 - group by i_brand, i_brand_id - order by ext_price desc, i_brand_id - limit 100 +select i_brand_id brand_id, + i_brand brand, + sum(ss_ext_sales_price) ext_price +from date_dim, + store_sales, + item +where d_date_sk = ss_sold_date_sk + and ss_item_sk = i_item_sk + and i_manager_id = 28 + and d_moy = 11 + and d_year = 1999 +group by i_brand, i_brand_id +order by ext_price desc, i_brand_id limit 100 diff --git a/src/main/resources/tpcds/query56.sql b/src/main/resources/tpcds/query56.sql index 43ce093072..167e8fc7ee 100644 --- a/src/main/resources/tpcds/query56.sql +++ b/src/main/resources/tpcds/query56.sql @@ -1,65 +1,56 @@ -with ss as ( - select i_item_id,sum(ss_ext_sales_price) total_sales - from - store_sales, - date_dim, - customer_address, - item - where i_item_id in (select - i_item_id -from item -where i_color in ('slate','blanched','burnished')) - and ss_item_sk = i_item_sk - and ss_sold_date_sk = d_date_sk - and d_year = 2001 - and d_moy = 2 - and ss_addr_sk = ca_address_sk - and ca_gmt_offset = -5 - group by i_item_id), - cs as ( - select i_item_id,sum(cs_ext_sales_price) total_sales - from - catalog_sales, - date_dim, - customer_address, - item - where - i_item_id in (select - i_item_id -from item -where i_color in ('slate','blanched','burnished')) - and cs_item_sk = i_item_sk - and cs_sold_date_sk = d_date_sk - and d_year = 2001 - and d_moy = 2 - and cs_bill_addr_sk = ca_address_sk - and ca_gmt_offset = -5 - group by i_item_id), - ws as ( - select i_item_id,sum(ws_ext_sales_price) total_sales - from - web_sales, - date_dim, - customer_address, - item - where - i_item_id in (select - i_item_id -from item -where i_color in ('slate','blanched','burnished')) - and ws_item_sk = i_item_sk - and ws_sold_date_sk = d_date_sk - and d_year = 2001 - and d_moy = 2 - and ws_bill_addr_sk = ca_address_sk - and ca_gmt_offset = -5 - group by i_item_id) - select i_item_id ,sum(total_sales) total_sales - from (select * from ss - union all - select * from cs - union all - select * from ws) tmp1 - group by i_item_id - order by total_sales - limit 100 +with ss as (select i_item_id, sum(ss_ext_sales_price) total_sales + from store_sales, + date_dim, + customer_address, + item + where i_item_id in (select i_item_id + from item + where i_color in ('slate', 'blanched', 'burnished')) + and ss_item_sk = i_item_sk + and ss_sold_date_sk = d_date_sk + and d_year = 2001 + and d_moy = 2 + and ss_addr_sk = ca_address_sk + and ca_gmt_offset = -5 + group by i_item_id), + cs as (select i_item_id, sum(cs_ext_sales_price) total_sales + from catalog_sales, + date_dim, + customer_address, + item + where i_item_id in (select i_item_id + from item + where i_color in ('slate', 'blanched', 'burnished')) + and cs_item_sk = i_item_sk + and cs_sold_date_sk = d_date_sk + and d_year = 2001 + and d_moy = 2 + and cs_bill_addr_sk = ca_address_sk + and ca_gmt_offset = -5 + group by i_item_id), + ws as (select i_item_id, sum(ws_ext_sales_price) total_sales + from web_sales, + date_dim, + customer_address, + item + where i_item_id in (select i_item_id + from item + where i_color in ('slate', 'blanched', 'burnished')) + and ws_item_sk = i_item_sk + and ws_sold_date_sk = d_date_sk + and d_year = 2001 + and d_moy = 2 + and ws_bill_addr_sk = ca_address_sk + and ca_gmt_offset = -5 + group by i_item_id) +select i_item_id, sum(total_sales) total_sales +from (select * + from ss + union all + select * + from cs + union all + select * + from ws) tmp1 +group by i_item_id +order by total_sales limit 100 diff --git a/src/main/resources/tpcds/query57.sql b/src/main/resources/tpcds/query57.sql index 9cb2f7601e..176ba71461 100644 --- a/src/main/resources/tpcds/query57.sql +++ b/src/main/resources/tpcds/query57.sql @@ -1,45 +1,51 @@ -with v1 as( - select i_category, i_brand, - cc_name, - d_year, d_moy, - sum(cs_sales_price) sum_sales, - avg(sum(cs_sales_price)) over - (partition by i_category, i_brand, +with v1 as (select i_category, + i_brand, + cc_name, + d_year, + d_moy, + sum(cs_sales_price) sum_sales, + avg(sum(cs_sales_price)) over (partition by i_category, i_brand, cc_name, d_year) - avg_monthly_sales, - rank() over - (partition by i_category, i_brand, + avg_monthly_sales, rank() over (partition by i_category, i_brand, cc_name order by d_year, d_moy) rn - from item, catalog_sales, date_dim, call_center - where cs_item_sk = i_item_sk and - cs_sold_date_sk = d_date_sk and - cc_call_center_sk= cs_call_center_sk and - ( - d_year = 1999 or - ( d_year = 1999-1 and d_moy =12) or - ( d_year = 1999+1 and d_moy =1) - ) - group by i_category, i_brand, - cc_name , d_year, d_moy), - v2 as( - select v1.i_category, v1.i_brand, v1.cc_name - ,v1.d_year, v1.d_moy - ,v1.avg_monthly_sales - ,v1.sum_sales, v1_lag.sum_sales psum, v1_lead.sum_sales nsum - from v1, v1 v1_lag, v1 v1_lead - where v1.i_category = v1_lag.i_category and - v1.i_category = v1_lead.i_category and - v1.i_brand = v1_lag.i_brand and - v1.i_brand = v1_lead.i_brand and - v1. cc_name = v1_lag. cc_name and - v1. cc_name = v1_lead. cc_name and - v1.rn = v1_lag.rn + 1 and - v1.rn = v1_lead.rn - 1) - select * - from v2 - where d_year = 1999 and - avg_monthly_sales > 0 and - case when avg_monthly_sales > 0 then abs(sum_sales - avg_monthly_sales) / avg_monthly_sales else null end > 0.1 - order by sum_sales - avg_monthly_sales, 3 - limit 100 + from item, + catalog_sales, + date_dim, + call_center + where cs_item_sk = i_item_sk + and cs_sold_date_sk = d_date_sk + and cc_call_center_sk = cs_call_center_sk + and ( + d_year = 1999 or + (d_year = 1999 - 1 and d_moy = 12) or + (d_year = 1999 + 1 and d_moy = 1) + ) + group by i_category, i_brand, + cc_name, d_year, d_moy), + v2 as (select v1.i_category + , v1.i_brand + , v1.cc_name + , v1.d_year + , v1.d_moy + , v1.avg_monthly_sales + , v1.sum_sales + , v1_lag.sum_sales psum + , v1_lead.sum_sales nsum + from v1, + v1 v1_lag, + v1 v1_lead + where v1.i_category = v1_lag.i_category + and v1.i_category = v1_lead.i_category + and v1.i_brand = v1_lag.i_brand + and v1.i_brand = v1_lead.i_brand + and v1.cc_name = v1_lag.cc_name + and v1.cc_name = v1_lead.cc_name + and v1.rn = v1_lag.rn + 1 + and v1.rn = v1_lead.rn - 1) +select * +from v2 +where d_year = 1999 + and avg_monthly_sales > 0 + and case when avg_monthly_sales > 0 then abs(sum_sales - avg_monthly_sales) / avg_monthly_sales else null end > 0.1 +order by sum_sales - avg_monthly_sales, 3 limit 100 diff --git a/src/main/resources/tpcds/query58.sql b/src/main/resources/tpcds/query58.sql index 05fe511390..0851b2b01c 100644 --- a/src/main/resources/tpcds/query58.sql +++ b/src/main/resources/tpcds/query58.sql @@ -1,62 +1,63 @@ with ss_items as - (select i_item_id item_id - ,sum(ss_ext_sales_price) ss_item_rev - from store_sales - ,item - ,date_dim - where ss_item_sk = i_item_sk - and d_date in (select d_date - from date_dim - where d_week_seq = (select d_week_seq - from date_dim - where d_date = '2000-01-03')) - and ss_sold_date_sk = d_date_sk - group by i_item_id), - cs_items as - (select i_item_id item_id - ,sum(cs_ext_sales_price) cs_item_rev - from catalog_sales - ,item - ,date_dim - where cs_item_sk = i_item_sk - and d_date in (select d_date - from date_dim - where d_week_seq = (select d_week_seq - from date_dim - where d_date = '2000-01-03')) - and cs_sold_date_sk = d_date_sk - group by i_item_id), - ws_items as - (select i_item_id item_id - ,sum(ws_ext_sales_price) ws_item_rev - from web_sales - ,item - ,date_dim - where ws_item_sk = i_item_sk - and d_date in (select d_date - from date_dim - where d_week_seq =(select d_week_seq - from date_dim - where d_date = '2000-01-03')) - and ws_sold_date_sk = d_date_sk - group by i_item_id) - select ss_items.item_id - ,ss_item_rev - ,ss_item_rev/((ss_item_rev+cs_item_rev+ws_item_rev)/3) * 100 ss_dev - ,cs_item_rev - ,cs_item_rev/((ss_item_rev+cs_item_rev+ws_item_rev)/3) * 100 cs_dev - ,ws_item_rev - ,ws_item_rev/((ss_item_rev+cs_item_rev+ws_item_rev)/3) * 100 ws_dev - ,(ss_item_rev+cs_item_rev+ws_item_rev)/3 average - from ss_items,cs_items,ws_items - where ss_items.item_id=cs_items.item_id - and ss_items.item_id=ws_items.item_id - and ss_item_rev between 0.9 * cs_item_rev and 1.1 * cs_item_rev - and ss_item_rev between 0.9 * ws_item_rev and 1.1 * ws_item_rev - and cs_item_rev between 0.9 * ss_item_rev and 1.1 * ss_item_rev - and cs_item_rev between 0.9 * ws_item_rev and 1.1 * ws_item_rev - and ws_item_rev between 0.9 * ss_item_rev and 1.1 * ss_item_rev - and ws_item_rev between 0.9 * cs_item_rev and 1.1 * cs_item_rev - order by item_id - ,ss_item_rev - limit 100 + (select i_item_id item_id + , sum(ss_ext_sales_price) ss_item_rev + from store_sales + , item + , date_dim + where ss_item_sk = i_item_sk + and d_date in (select d_date + from date_dim + where d_week_seq = (select d_week_seq + from date_dim + where d_date = '2000-01-03')) + and ss_sold_date_sk = d_date_sk + group by i_item_id), + cs_items as + (select i_item_id item_id + , sum(cs_ext_sales_price) cs_item_rev + from catalog_sales + , item + , date_dim + where cs_item_sk = i_item_sk + and d_date in (select d_date + from date_dim + where d_week_seq = (select d_week_seq + from date_dim + where d_date = '2000-01-03')) + and cs_sold_date_sk = d_date_sk + group by i_item_id), + ws_items as + (select i_item_id item_id + , sum(ws_ext_sales_price) ws_item_rev + from web_sales + , item + , date_dim + where ws_item_sk = i_item_sk + and d_date in (select d_date + from date_dim + where d_week_seq = (select d_week_seq + from date_dim + where d_date = '2000-01-03')) + and ws_sold_date_sk = d_date_sk + group by i_item_id) +select ss_items.item_id + , ss_item_rev + , ss_item_rev / ((ss_item_rev + cs_item_rev + ws_item_rev) / 3) * 100 ss_dev + , cs_item_rev + , cs_item_rev / ((ss_item_rev + cs_item_rev + ws_item_rev) / 3) * 100 cs_dev + , ws_item_rev + , ws_item_rev / ((ss_item_rev + cs_item_rev + ws_item_rev) / 3) * 100 ws_dev + , (ss_item_rev + cs_item_rev + ws_item_rev) / 3 average +from ss_items, + cs_items, + ws_items +where ss_items.item_id = cs_items.item_id + and ss_items.item_id = ws_items.item_id + and ss_item_rev between 0.9 * cs_item_rev and 1.1 * cs_item_rev + and ss_item_rev between 0.9 * ws_item_rev and 1.1 * ws_item_rev + and cs_item_rev between 0.9 * ss_item_rev and 1.1 * ss_item_rev + and cs_item_rev between 0.9 * ws_item_rev and 1.1 * ws_item_rev + and ws_item_rev between 0.9 * ss_item_rev and 1.1 * ss_item_rev + and ws_item_rev between 0.9 * cs_item_rev and 1.1 * cs_item_rev +order by item_id + , ss_item_rev limit 100 diff --git a/src/main/resources/tpcds/query59.sql b/src/main/resources/tpcds/query59.sql index 474d0ad3cb..6d42e5470a 100644 --- a/src/main/resources/tpcds/query59.sql +++ b/src/main/resources/tpcds/query59.sql @@ -1,41 +1,59 @@ with wss as - (select d_week_seq, - ss_store_sk, - sum(case when (d_day_name='Sunday') then ss_sales_price else null end) sun_sales, - sum(case when (d_day_name='Monday') then ss_sales_price else null end) mon_sales, - sum(case when (d_day_name='Tuesday') then ss_sales_price else null end) tue_sales, - sum(case when (d_day_name='Wednesday') then ss_sales_price else null end) wed_sales, - sum(case when (d_day_name='Thursday') then ss_sales_price else null end) thu_sales, - sum(case when (d_day_name='Friday') then ss_sales_price else null end) fri_sales, - sum(case when (d_day_name='Saturday') then ss_sales_price else null end) sat_sales - from store_sales,date_dim - where d_date_sk = ss_sold_date_sk - group by d_week_seq,ss_store_sk - ) - select s_store_name1,s_store_id1,d_week_seq1 - ,sun_sales1/sun_sales2,mon_sales1/mon_sales2 - ,tue_sales1/tue_sales2,wed_sales1/wed_sales2,thu_sales1/thu_sales2 - ,fri_sales1/fri_sales2,sat_sales1/sat_sales2 - from - (select s_store_name s_store_name1,wss.d_week_seq d_week_seq1 - ,s_store_id s_store_id1,sun_sales sun_sales1 - ,mon_sales mon_sales1,tue_sales tue_sales1 - ,wed_sales wed_sales1,thu_sales thu_sales1 - ,fri_sales fri_sales1,sat_sales sat_sales1 - from wss,store,date_dim d - where d.d_week_seq = wss.d_week_seq and - ss_store_sk = s_store_sk and - d_month_seq between 1212 and 1212 + 11) y, - (select s_store_name s_store_name2,wss.d_week_seq d_week_seq2 - ,s_store_id s_store_id2,sun_sales sun_sales2 - ,mon_sales mon_sales2,tue_sales tue_sales2 - ,wed_sales wed_sales2,thu_sales thu_sales2 - ,fri_sales fri_sales2,sat_sales sat_sales2 - from wss,store,date_dim d - where d.d_week_seq = wss.d_week_seq and - ss_store_sk = s_store_sk and - d_month_seq between 1212+ 12 and 1212 + 23) x - where s_store_id1=s_store_id2 - and d_week_seq1=d_week_seq2-52 - order by s_store_name1,s_store_id1,d_week_seq1 - limit 100 + (select d_week_seq, + ss_store_sk, + sum(case when (d_day_name = 'Sunday') then ss_sales_price else null end) sun_sales, + sum(case when (d_day_name = 'Monday') then ss_sales_price else null end) mon_sales, + sum(case when (d_day_name = 'Tuesday') then ss_sales_price else null end) tue_sales, + sum(case when (d_day_name = 'Wednesday') then ss_sales_price else null end) wed_sales, + sum(case when (d_day_name = 'Thursday') then ss_sales_price else null end) thu_sales, + sum(case when (d_day_name = 'Friday') then ss_sales_price else null end) fri_sales, + sum(case when (d_day_name = 'Saturday') then ss_sales_price else null end) sat_sales + from store_sales, + date_dim + where d_date_sk = ss_sold_date_sk + group by d_week_seq, ss_store_sk) +select s_store_name1 + , s_store_id1 + , d_week_seq1 + , sun_sales1 / sun_sales2 + , mon_sales1 / mon_sales2 + , tue_sales1 / tue_sales2 + , wed_sales1 / wed_sales2 + , thu_sales1 / thu_sales2 + , fri_sales1 / fri_sales2 + , sat_sales1 / sat_sales2 +from (select s_store_name s_store_name1 + , wss.d_week_seq d_week_seq1 + , s_store_id s_store_id1 + , sun_sales sun_sales1 + , mon_sales mon_sales1 + , tue_sales tue_sales1 + , wed_sales wed_sales1 + , thu_sales thu_sales1 + , fri_sales fri_sales1 + , sat_sales sat_sales1 + from wss, + store, + date_dim d + where d.d_week_seq = wss.d_week_seq + and ss_store_sk = s_store_sk + and d_month_seq between 1212 and 1212 + 11) y, + (select s_store_name s_store_name2 + , wss.d_week_seq d_week_seq2 + , s_store_id s_store_id2 + , sun_sales sun_sales2 + , mon_sales mon_sales2 + , tue_sales tue_sales2 + , wed_sales wed_sales2 + , thu_sales thu_sales2 + , fri_sales fri_sales2 + , sat_sales sat_sales2 + from wss, + store, + date_dim d + where d.d_week_seq = wss.d_week_seq + and ss_store_sk = s_store_sk + and d_month_seq between 1212 + 12 and 1212 + 23) x +where s_store_id1 = s_store_id2 + and d_week_seq1 = d_week_seq2 - 52 +order by s_store_name1, s_store_id1, d_week_seq1 limit 100 diff --git a/src/main/resources/tpcds/query60.sql b/src/main/resources/tpcds/query60.sql index 037217fb8b..8bdd709d07 100644 --- a/src/main/resources/tpcds/query60.sql +++ b/src/main/resources/tpcds/query60.sql @@ -1,75 +1,61 @@ -with ss as ( - select - i_item_id,sum(ss_ext_sales_price) total_sales - from - store_sales, - date_dim, - customer_address, - item - where - i_item_id in (select - i_item_id -from - item -where i_category in ('Music')) - and ss_item_sk = i_item_sk - and ss_sold_date_sk = d_date_sk - and d_year = 1998 - and d_moy = 9 - and ss_addr_sk = ca_address_sk - and ca_gmt_offset = -5 - group by i_item_id), - cs as ( - select - i_item_id,sum(cs_ext_sales_price) total_sales - from - catalog_sales, - date_dim, - customer_address, - item - where - i_item_id in (select - i_item_id -from - item -where i_category in ('Music')) - and cs_item_sk = i_item_sk - and cs_sold_date_sk = d_date_sk - and d_year = 1998 - and d_moy = 9 - and cs_bill_addr_sk = ca_address_sk - and ca_gmt_offset = -5 - group by i_item_id), - ws as ( - select - i_item_id,sum(ws_ext_sales_price) total_sales - from - web_sales, - date_dim, - customer_address, - item - where - i_item_id in (select - i_item_id -from - item -where i_category in ('Music')) - and ws_item_sk = i_item_sk - and ws_sold_date_sk = d_date_sk - and d_year = 1998 - and d_moy = 9 - and ws_bill_addr_sk = ca_address_sk - and ca_gmt_offset = -5 - group by i_item_id) - select - i_item_id -,sum(total_sales) total_sales - from (select * from ss - union all - select * from cs - union all - select * from ws) tmp1 - group by i_item_id - order by i_item_id - ,total_sales - limit 100 +with ss as (select i_item_id, + sum(ss_ext_sales_price) total_sales + from store_sales, + date_dim, + customer_address, + item + where i_item_id in (select i_item_id + from item + where i_category in ('Music')) + and ss_item_sk = i_item_sk + and ss_sold_date_sk = d_date_sk + and d_year = 1998 + and d_moy = 9 + and ss_addr_sk = ca_address_sk + and ca_gmt_offset = -5 + group by i_item_id), + cs as (select i_item_id, + sum(cs_ext_sales_price) total_sales + from catalog_sales, + date_dim, + customer_address, + item + where i_item_id in (select i_item_id + from item + where i_category in ('Music')) + and cs_item_sk = i_item_sk + and cs_sold_date_sk = d_date_sk + and d_year = 1998 + and d_moy = 9 + and cs_bill_addr_sk = ca_address_sk + and ca_gmt_offset = -5 + group by i_item_id), + ws as (select i_item_id, + sum(ws_ext_sales_price) total_sales + from web_sales, + date_dim, + customer_address, + item + where i_item_id in (select i_item_id + from item + where i_category in ('Music')) + and ws_item_sk = i_item_sk + and ws_sold_date_sk = d_date_sk + and d_year = 1998 + and d_moy = 9 + and ws_bill_addr_sk = ca_address_sk + and ca_gmt_offset = -5 + group by i_item_id) +select i_item_id + , sum(total_sales) total_sales +from (select * + from ss + union all + select * + from cs + union all + select * + from ws) tmp1 +group by i_item_id +order by i_item_id + , total_sales limit 100 diff --git a/src/main/resources/tpcds/query61.sql b/src/main/resources/tpcds/query61.sql index 51cdd177c2..70426d3b95 100644 --- a/src/main/resources/tpcds/query61.sql +++ b/src/main/resources/tpcds/query61.sql @@ -1,41 +1,39 @@ -select promotions,total,cast(promotions as decimal(15,4))/cast(total as decimal(15,4))*100 -from - (select sum(ss_ext_sales_price) promotions - from store_sales - ,store - ,promotion - ,date_dim - ,customer - ,customer_address - ,item - where ss_sold_date_sk = d_date_sk - and ss_store_sk = s_store_sk - and ss_promo_sk = p_promo_sk - and ss_customer_sk= c_customer_sk - and ca_address_sk = c_current_addr_sk - and ss_item_sk = i_item_sk - and ca_gmt_offset = -5 - and i_category = 'Jewelry' - and (p_channel_dmail = 'Y' or p_channel_email = 'Y' or p_channel_tv = 'Y') - and s_gmt_offset = -5 - and d_year = 1998 - and d_moy = 11) promotional_sales, - (select sum(ss_ext_sales_price) total - from store_sales - ,store - ,date_dim - ,customer - ,customer_address - ,item - where ss_sold_date_sk = d_date_sk - and ss_store_sk = s_store_sk - and ss_customer_sk= c_customer_sk - and ca_address_sk = c_current_addr_sk - and ss_item_sk = i_item_sk - and ca_gmt_offset = -5 - and i_category = 'Jewelry' - and s_gmt_offset = -5 - and d_year = 1998 - and d_moy = 11) all_sales -order by promotions, total - limit 100 +select promotions, total, cast(promotions as decimal(15, 4)) / cast(total as decimal(15, 4)) * 100 +from (select sum(ss_ext_sales_price) promotions + from store_sales + , store + , promotion + , date_dim + , customer + , customer_address + , item + where ss_sold_date_sk = d_date_sk + and ss_store_sk = s_store_sk + and ss_promo_sk = p_promo_sk + and ss_customer_sk = c_customer_sk + and ca_address_sk = c_current_addr_sk + and ss_item_sk = i_item_sk + and ca_gmt_offset = -5 + and i_category = 'Jewelry' + and (p_channel_dmail = 'Y' or p_channel_email = 'Y' or p_channel_tv = 'Y') + and s_gmt_offset = -5 + and d_year = 1998 + and d_moy = 11) promotional_sales, + (select sum(ss_ext_sales_price) total + from store_sales + , store + , date_dim + , customer + , customer_address + , item + where ss_sold_date_sk = d_date_sk + and ss_store_sk = s_store_sk + and ss_customer_sk = c_customer_sk + and ca_address_sk = c_current_addr_sk + and ss_item_sk = i_item_sk + and ca_gmt_offset = -5 + and i_category = 'Jewelry' + and s_gmt_offset = -5 + and d_year = 1998 + and d_moy = 11) all_sales +order by promotions, total limit 100 diff --git a/src/main/resources/tpcds/query62.sql b/src/main/resources/tpcds/query62.sql index 63d59deaed..ffc9d4694c 100644 --- a/src/main/resources/tpcds/query62.sql +++ b/src/main/resources/tpcds/query62.sql @@ -1,32 +1,33 @@ -select - substr(w_warehouse_name,1,20) - ,sm_type - ,web_name - ,sum(case when (ws_ship_date_sk - ws_sold_date_sk <= 30 ) then 1 else 0 end) as "30_days " - ,sum(case when (ws_ship_date_sk - ws_sold_date_sk > 30) and - (ws_ship_date_sk - ws_sold_date_sk <= 60) then 1 else 0 end ) as "31_60_days " - ,sum(case when (ws_ship_date_sk - ws_sold_date_sk > 60) and - (ws_ship_date_sk - ws_sold_date_sk <= 90) then 1 else 0 end) as "61_90_days " - ,sum(case when (ws_ship_date_sk - ws_sold_date_sk > 90) and - (ws_ship_date_sk - ws_sold_date_sk <= 120) then 1 else 0 end) as "91_120_days" - ,sum(case when (ws_ship_date_sk - ws_sold_date_sk > 120) then 1 else 0 end) as above120_days -from - web_sales - ,warehouse - ,ship_mode - ,web_site - ,date_dim -where - d_month_seq between 1200 and 1200 + 11 -and ws_ship_date_sk = d_date_sk -and ws_warehouse_sk = w_warehouse_sk -and ws_ship_mode_sk = sm_ship_mode_sk -and ws_web_site_sk = web_site_sk -group by - substr(w_warehouse_name,1,20) - ,sm_type - ,web_name -order by substr(w_warehouse_name,1,20) - ,sm_type - ,web_name - limit 100 +select substr(w_warehouse_name, 1, 20) + , sm_type + , web_name + , sum(case when (ws_ship_date_sk - ws_sold_date_sk <= 30) then 1 else 0 end) as "30_days " + , sum(case + when (ws_ship_date_sk - ws_sold_date_sk > 30) and + (ws_ship_date_sk - ws_sold_date_sk <= 60) then 1 + else 0 end) as "31_60_days " + , sum(case + when (ws_ship_date_sk - ws_sold_date_sk > 60) and + (ws_ship_date_sk - ws_sold_date_sk <= 90) then 1 + else 0 end) as "61_90_days " + , sum(case + when (ws_ship_date_sk - ws_sold_date_sk > 90) and + (ws_ship_date_sk - ws_sold_date_sk <= 120) then 1 + else 0 end) as "91_120_days" + , sum(case when (ws_ship_date_sk - ws_sold_date_sk > 120) then 1 else 0 end) as above120_days +from web_sales + , warehouse + , ship_mode + , web_site + , date_dim +where d_month_seq between 1200 and 1200 + 11 + and ws_ship_date_sk = d_date_sk + and ws_warehouse_sk = w_warehouse_sk + and ws_ship_mode_sk = sm_ship_mode_sk + and ws_web_site_sk = web_site_sk +group by substr(w_warehouse_name, 1, 20) + , sm_type + , web_name +order by substr(w_warehouse_name, 1, 20) + , sm_type + , web_name limit 100 diff --git a/src/main/resources/tpcds/query63.sql b/src/main/resources/tpcds/query63.sql index 7a5b0bdee7..aa214c1266 100644 --- a/src/main/resources/tpcds/query63.sql +++ b/src/main/resources/tpcds/query63.sql @@ -1,26 +1,27 @@ -select * +select * from (select i_manager_id - ,sum(ss_sales_price) sum_sales - ,avg(sum(ss_sales_price)) over (partition by i_manager_id) avg_monthly_sales + , sum(ss_sales_price) sum_sales + , avg(sum(ss_sales_price)) over (partition by i_manager_id) avg_monthly_sales from item - ,store_sales - ,date_dim - ,store + , store_sales + , date_dim + , store where ss_item_sk = i_item_sk and ss_sold_date_sk = d_date_sk and ss_store_sk = s_store_sk - and d_month_seq in (1200,1200+1,1200+2,1200+3,1200+4,1200+5,1200+6,1200+7,1200+8,1200+9,1200+10,1200+11) - and (( i_category in ('Books','Children','Electronics') - and i_class in ('personal','portable','reference','self-help') - and i_brand in ('scholaramalgamalg #14','scholaramalgamalg #7', - 'exportiunivamalg #9','scholaramalgamalg #9')) - or( i_category in ('Women','Music','Men') - and i_class in ('accessories','classical','fragrances','pants') - and i_brand in ('amalgimporto #1','edu packscholar #1','exportiimporto #1', - 'importoamalg #1'))) -group by i_manager_id, d_moy) tmp1 -where case when avg_monthly_sales > 0 then abs (sum_sales - avg_monthly_sales) / avg_monthly_sales else null end > 0.1 + and d_month_seq in + (1200, 1200 + 1, 1200 + 2, 1200 + 3, 1200 + 4, 1200 + 5, 1200 + 6, 1200 + 7, 1200 + 8, 1200 + 9, 1200 + 10, + 1200 + 11) + and ((i_category in ('Books', 'Children', 'Electronics') + and i_class in ('personal', 'portable', 'reference', 'self-help') + and i_brand in ('scholaramalgamalg #14', 'scholaramalgamalg #7', + 'exportiunivamalg #9', 'scholaramalgamalg #9')) + or (i_category in ('Women', 'Music', 'Men') + and i_class in ('accessories', 'classical', 'fragrances', 'pants') + and i_brand in ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', + 'importoamalg #1'))) + group by i_manager_id, d_moy) tmp1 +where case when avg_monthly_sales > 0 then abs(sum_sales - avg_monthly_sales) / avg_monthly_sales else null end > 0.1 order by i_manager_id - ,avg_monthly_sales - ,sum_sales - limit 100 + , avg_monthly_sales + , sum_sales limit 100 diff --git a/src/main/resources/tpcds/query64.sql b/src/main/resources/tpcds/query64.sql index 3ab66c6fb1..e0a3bdc797 100644 --- a/src/main/resources/tpcds/query64.sql +++ b/src/main/resources/tpcds/query64.sql @@ -1,116 +1,117 @@ with cs_ui as - (select cs_item_sk - ,sum(cs_ext_list_price) as sale,sum(cr_refunded_cash+cr_reversed_charge+cr_store_credit) as refund - from catalog_sales - ,catalog_returns - where cs_item_sk = cr_item_sk - and cs_order_number = cr_order_number - group by cs_item_sk - having sum(cs_ext_list_price)>2*sum(cr_refunded_cash+cr_reversed_charge+cr_store_credit)), -cross_sales as - (select i_product_name product_name - ,i_item_sk item_sk - ,s_store_name store_name - ,s_zip store_zip - ,ad1.ca_street_number b_street_number - ,ad1.ca_street_name b_street_name - ,ad1.ca_city b_city - ,ad1.ca_zip b_zip - ,ad2.ca_street_number c_street_number - ,ad2.ca_street_name c_street_name - ,ad2.ca_city c_city - ,ad2.ca_zip c_zip - ,d1.d_year as syear - ,d2.d_year as fsyear - ,d3.d_year s2year - ,count(*) cnt - ,sum(ss_wholesale_cost) s1 - ,sum(ss_list_price) s2 - ,sum(ss_coupon_amt) s3 - FROM store_sales - ,store_returns - ,cs_ui - ,date_dim d1 - ,date_dim d2 - ,date_dim d3 - ,store - ,customer - ,customer_demographics cd1 - ,customer_demographics cd2 - ,promotion - ,household_demographics hd1 - ,household_demographics hd2 - ,customer_address ad1 - ,customer_address ad2 - ,income_band ib1 - ,income_band ib2 - ,item - WHERE ss_store_sk = s_store_sk AND - ss_sold_date_sk = d1.d_date_sk AND - ss_customer_sk = c_customer_sk AND - ss_cdemo_sk= cd1.cd_demo_sk AND - ss_hdemo_sk = hd1.hd_demo_sk AND - ss_addr_sk = ad1.ca_address_sk and - ss_item_sk = i_item_sk and - ss_item_sk = sr_item_sk and - ss_ticket_number = sr_ticket_number and - ss_item_sk = cs_ui.cs_item_sk and - c_current_cdemo_sk = cd2.cd_demo_sk AND - c_current_hdemo_sk = hd2.hd_demo_sk AND - c_current_addr_sk = ad2.ca_address_sk and - c_first_sales_date_sk = d2.d_date_sk and - c_first_shipto_date_sk = d3.d_date_sk and - ss_promo_sk = p_promo_sk and - hd1.hd_income_band_sk = ib1.ib_income_band_sk and - hd2.hd_income_band_sk = ib2.ib_income_band_sk and - cd1.cd_marital_status <> cd2.cd_marital_status and - i_color in ('purple','burlywood','indian','spring','floral','medium') and - i_current_price between 64 and 64 + 10 and - i_current_price between 64 + 1 and 64 + 15 -group by i_product_name - ,i_item_sk - ,s_store_name - ,s_zip - ,ad1.ca_street_number - ,ad1.ca_street_name - ,ad1.ca_city - ,ad1.ca_zip - ,ad2.ca_street_number - ,ad2.ca_street_name - ,ad2.ca_city - ,ad2.ca_zip - ,d1.d_year - ,d2.d_year - ,d3.d_year -) + (select cs_item_sk + , sum(cs_ext_list_price) as sale + , sum(cr_refunded_cash + cr_reversed_charge + cr_store_credit) as refund + from catalog_sales + , catalog_returns + where cs_item_sk = cr_item_sk + and cs_order_number = cr_order_number + group by cs_item_sk + having sum(cs_ext_list_price) > 2 * sum(cr_refunded_cash + cr_reversed_charge + cr_store_credit)), + cross_sales as + (select i_product_name product_name + , i_item_sk item_sk + , s_store_name store_name + , s_zip store_zip + , ad1.ca_street_number b_street_number + , ad1.ca_street_name b_street_name + , ad1.ca_city b_city + , ad1.ca_zip b_zip + , ad2.ca_street_number c_street_number + , ad2.ca_street_name c_street_name + , ad2.ca_city c_city + , ad2.ca_zip c_zip + , d1.d_year as syear + , d2.d_year as fsyear + , d3.d_year s2year + , count(*) cnt + , sum(ss_wholesale_cost) s1 + , sum(ss_list_price) s2 + , sum(ss_coupon_amt) s3 + FROM store_sales + , store_returns + , cs_ui + , date_dim d1 + , date_dim d2 + , date_dim d3 + , store + , customer + , customer_demographics cd1 + , customer_demographics cd2 + , promotion + , household_demographics hd1 + , household_demographics hd2 + , customer_address ad1 + , customer_address ad2 + , income_band ib1 + , income_band ib2 + , item + WHERE ss_store_sk = s_store_sk + AND ss_sold_date_sk = d1.d_date_sk + AND ss_customer_sk = c_customer_sk + AND ss_cdemo_sk = cd1.cd_demo_sk + AND ss_hdemo_sk = hd1.hd_demo_sk + AND ss_addr_sk = ad1.ca_address_sk + and ss_item_sk = i_item_sk + and ss_item_sk = sr_item_sk + and ss_ticket_number = sr_ticket_number + and ss_item_sk = cs_ui.cs_item_sk + and c_current_cdemo_sk = cd2.cd_demo_sk + AND c_current_hdemo_sk = hd2.hd_demo_sk + AND c_current_addr_sk = ad2.ca_address_sk + and c_first_sales_date_sk = d2.d_date_sk + and c_first_shipto_date_sk = d3.d_date_sk + and ss_promo_sk = p_promo_sk + and hd1.hd_income_band_sk = ib1.ib_income_band_sk + and hd2.hd_income_band_sk = ib2.ib_income_band_sk + and cd1.cd_marital_status <> cd2.cd_marital_status + and i_color in ('purple', 'burlywood', 'indian', 'spring', 'floral', 'medium') + and i_current_price between 64 and 64 + 10 + and i_current_price between 64 + 1 and 64 + 15 + group by i_product_name + , i_item_sk + , s_store_name + , s_zip + , ad1.ca_street_number + , ad1.ca_street_name + , ad1.ca_city + , ad1.ca_zip + , ad2.ca_street_number + , ad2.ca_street_name + , ad2.ca_city + , ad2.ca_zip + , d1.d_year + , d2.d_year + , d3.d_year) select cs1.product_name - ,cs1.store_name - ,cs1.store_zip - ,cs1.b_street_number - ,cs1.b_street_name - ,cs1.b_city - ,cs1.b_zip - ,cs1.c_street_number - ,cs1.c_street_name - ,cs1.c_city - ,cs1.c_zip - ,cs1.syear - ,cs1.cnt - ,cs1.s1 as s11 - ,cs1.s2 as s21 - ,cs1.s3 as s31 - ,cs2.s1 as s12 - ,cs2.s2 as s22 - ,cs2.s3 as s32 - ,cs2.syear as syear_2 - ,cs2.cnt as cnt_2 -from cross_sales cs1,cross_sales cs2 -where cs1.item_sk=cs2.item_sk and - cs1.syear = 1999 and - cs2.syear = 1999 + 1 and - cs2.cnt <= cs1.cnt and - cs1.store_name = cs2.store_name and - cs1.store_zip = cs2.store_zip + , cs1.store_name + , cs1.store_zip + , cs1.b_street_number + , cs1.b_street_name + , cs1.b_city + , cs1.b_zip + , cs1.c_street_number + , cs1.c_street_name + , cs1.c_city + , cs1.c_zip + , cs1.syear + , cs1.cnt + , cs1.s1 as s11 + , cs1.s2 as s21 + , cs1.s3 as s31 + , cs2.s1 as s12 + , cs2.s2 as s22 + , cs2.s3 as s32 + , cs2.syear as syear_2 + , cs2.cnt as cnt_2 +from cross_sales cs1, + cross_sales cs2 +where cs1.item_sk = cs2.item_sk + and cs1.syear = 1999 + and cs2.syear = 1999 + 1 + and cs2.cnt <= cs1.cnt + and cs1.store_name = cs2.store_name + and cs1.store_zip = cs2.store_zip order by cs1.product_name - ,cs1.store_name - ,cnt_2 + , cs1.store_name + , cnt_2 diff --git a/src/main/resources/tpcds/query65.sql b/src/main/resources/tpcds/query65.sql index 2ad70b5941..a8496412d0 100644 --- a/src/main/resources/tpcds/query65.sql +++ b/src/main/resources/tpcds/query65.sql @@ -1,26 +1,29 @@ -select - s_store_name, - i_item_desc, - sc.revenue, - i_current_price, - i_wholesale_cost, - i_brand - from store, item, +select s_store_name, + i_item_desc, + sc.revenue, + i_current_price, + i_wholesale_cost, + i_brand +from store, + item, (select ss_store_sk, avg(revenue) as ave - from - (select ss_store_sk, ss_item_sk, - sum(ss_sales_price) as revenue - from store_sales, date_dim - where ss_sold_date_sk = d_date_sk and d_month_seq between 1176 and 1176+11 - group by ss_store_sk, ss_item_sk) sa - group by ss_store_sk) sb, - (select ss_store_sk, ss_item_sk, sum(ss_sales_price) as revenue - from store_sales, date_dim - where ss_sold_date_sk = d_date_sk and d_month_seq between 1176 and 1176+11 - group by ss_store_sk, ss_item_sk) sc - where sb.ss_store_sk = sc.ss_store_sk and - sc.revenue <= 0.1 * sb.ave and - s_store_sk = sc.ss_store_sk and - i_item_sk = sc.ss_item_sk - order by s_store_name, i_item_desc - limit 100 + from (select ss_store_sk, + ss_item_sk, + sum(ss_sales_price) as revenue + from store_sales, + date_dim + where ss_sold_date_sk = d_date_sk + and d_month_seq between 1176 and 1176 + 11 + group by ss_store_sk, ss_item_sk) sa + group by ss_store_sk) sb, + (select ss_store_sk, ss_item_sk, sum(ss_sales_price) as revenue + from store_sales, + date_dim + where ss_sold_date_sk = d_date_sk + and d_month_seq between 1176 and 1176 + 11 + group by ss_store_sk, ss_item_sk) sc +where sb.ss_store_sk = sc.ss_store_sk + and sc.revenue <= 0.1 * sb.ave + and s_store_sk = sc.ss_store_sk + and i_item_sk = sc.ss_item_sk +order by s_store_name, i_item_desc limit 100 diff --git a/src/main/resources/tpcds/query66.sql b/src/main/resources/tpcds/query66.sql index fff9c1db43..a8027ea20c 100644 --- a/src/main/resources/tpcds/query66.sql +++ b/src/main/resources/tpcds/query66.sql @@ -1,217 +1,216 @@ -select - w_warehouse_name - ,w_warehouse_sq_ft - ,w_city - ,w_county - ,w_state - ,w_country - ,ship_carriers - ,year - ,sum(jan_sales) as jan_sales - ,sum(feb_sales) as feb_sales - ,sum(mar_sales) as mar_sales - ,sum(apr_sales) as apr_sales - ,sum(may_sales) as may_sales - ,sum(jun_sales) as jun_sales - ,sum(jul_sales) as jul_sales - ,sum(aug_sales) as aug_sales - ,sum(sep_sales) as sep_sales - ,sum(oct_sales) as oct_sales - ,sum(nov_sales) as nov_sales - ,sum(dec_sales) as dec_sales - ,sum(jan_sales/w_warehouse_sq_ft) as jan_sales_per_sq_foot - ,sum(feb_sales/w_warehouse_sq_ft) as feb_sales_per_sq_foot - ,sum(mar_sales/w_warehouse_sq_ft) as mar_sales_per_sq_foot - ,sum(apr_sales/w_warehouse_sq_ft) as apr_sales_per_sq_foot - ,sum(may_sales/w_warehouse_sq_ft) as may_sales_per_sq_foot - ,sum(jun_sales/w_warehouse_sq_ft) as jun_sales_per_sq_foot - ,sum(jul_sales/w_warehouse_sq_ft) as jul_sales_per_sq_foot - ,sum(aug_sales/w_warehouse_sq_ft) as aug_sales_per_sq_foot - ,sum(sep_sales/w_warehouse_sq_ft) as sep_sales_per_sq_foot - ,sum(oct_sales/w_warehouse_sq_ft) as oct_sales_per_sq_foot - ,sum(nov_sales/w_warehouse_sq_ft) as nov_sales_per_sq_foot - ,sum(dec_sales/w_warehouse_sq_ft) as dec_sales_per_sq_foot - ,sum(jan_net) as jan_net - ,sum(feb_net) as feb_net - ,sum(mar_net) as mar_net - ,sum(apr_net) as apr_net - ,sum(may_net) as may_net - ,sum(jun_net) as jun_net - ,sum(jul_net) as jul_net - ,sum(aug_net) as aug_net - ,sum(sep_net) as sep_net - ,sum(oct_net) as oct_net - ,sum(nov_net) as nov_net - ,sum(dec_net) as dec_net - from ( - select - w_warehouse_name - ,w_warehouse_sq_ft - ,w_city - ,w_county - ,w_state - ,w_country - ,concat('DHL' , ',' , 'BARIAN') as ship_carriers - ,d_year as year - ,sum(case when d_moy = 1 - then ws_ext_sales_price* ws_quantity else 0 end) as jan_sales - ,sum(case when d_moy = 2 - then ws_ext_sales_price* ws_quantity else 0 end) as feb_sales - ,sum(case when d_moy = 3 - then ws_ext_sales_price* ws_quantity else 0 end) as mar_sales - ,sum(case when d_moy = 4 - then ws_ext_sales_price* ws_quantity else 0 end) as apr_sales - ,sum(case when d_moy = 5 - then ws_ext_sales_price* ws_quantity else 0 end) as may_sales - ,sum(case when d_moy = 6 - then ws_ext_sales_price* ws_quantity else 0 end) as jun_sales - ,sum(case when d_moy = 7 - then ws_ext_sales_price* ws_quantity else 0 end) as jul_sales - ,sum(case when d_moy = 8 - then ws_ext_sales_price* ws_quantity else 0 end) as aug_sales - ,sum(case when d_moy = 9 - then ws_ext_sales_price* ws_quantity else 0 end) as sep_sales - ,sum(case when d_moy = 10 - then ws_ext_sales_price* ws_quantity else 0 end) as oct_sales - ,sum(case when d_moy = 11 - then ws_ext_sales_price* ws_quantity else 0 end) as nov_sales - ,sum(case when d_moy = 12 - then ws_ext_sales_price* ws_quantity else 0 end) as dec_sales - ,sum(case when d_moy = 1 - then ws_net_paid * ws_quantity else 0 end) as jan_net - ,sum(case when d_moy = 2 - then ws_net_paid * ws_quantity else 0 end) as feb_net - ,sum(case when d_moy = 3 - then ws_net_paid * ws_quantity else 0 end) as mar_net - ,sum(case when d_moy = 4 - then ws_net_paid * ws_quantity else 0 end) as apr_net - ,sum(case when d_moy = 5 - then ws_net_paid * ws_quantity else 0 end) as may_net - ,sum(case when d_moy = 6 - then ws_net_paid * ws_quantity else 0 end) as jun_net - ,sum(case when d_moy = 7 - then ws_net_paid * ws_quantity else 0 end) as jul_net - ,sum(case when d_moy = 8 - then ws_net_paid * ws_quantity else 0 end) as aug_net - ,sum(case when d_moy = 9 - then ws_net_paid * ws_quantity else 0 end) as sep_net - ,sum(case when d_moy = 10 - then ws_net_paid * ws_quantity else 0 end) as oct_net - ,sum(case when d_moy = 11 - then ws_net_paid * ws_quantity else 0 end) as nov_net - ,sum(case when d_moy = 12 - then ws_net_paid * ws_quantity else 0 end) as dec_net - from - web_sales - ,warehouse - ,date_dim - ,time_dim - ,ship_mode - where - ws_warehouse_sk = w_warehouse_sk - and ws_sold_date_sk = d_date_sk - and ws_sold_time_sk = t_time_sk - and ws_ship_mode_sk = sm_ship_mode_sk - and d_year = 2001 - and t_time between 30838 and 30838+28800 - and sm_carrier in ('DHL','BARIAN') - group by - w_warehouse_name - ,w_warehouse_sq_ft - ,w_city - ,w_county - ,w_state - ,w_country - ,d_year - union all - select - w_warehouse_name - ,w_warehouse_sq_ft - ,w_city - ,w_county - ,w_state - ,w_country - ,concat('DHL' , ',' , 'BARIAN') as ship_carriers - ,d_year as year - ,sum(case when d_moy = 1 - then cs_sales_price* cs_quantity else 0 end) as jan_sales - ,sum(case when d_moy = 2 - then cs_sales_price* cs_quantity else 0 end) as feb_sales - ,sum(case when d_moy = 3 - then cs_sales_price* cs_quantity else 0 end) as mar_sales - ,sum(case when d_moy = 4 - then cs_sales_price* cs_quantity else 0 end) as apr_sales - ,sum(case when d_moy = 5 - then cs_sales_price* cs_quantity else 0 end) as may_sales - ,sum(case when d_moy = 6 - then cs_sales_price* cs_quantity else 0 end) as jun_sales - ,sum(case when d_moy = 7 - then cs_sales_price* cs_quantity else 0 end) as jul_sales - ,sum(case when d_moy = 8 - then cs_sales_price* cs_quantity else 0 end) as aug_sales - ,sum(case when d_moy = 9 - then cs_sales_price* cs_quantity else 0 end) as sep_sales - ,sum(case when d_moy = 10 - then cs_sales_price* cs_quantity else 0 end) as oct_sales - ,sum(case when d_moy = 11 - then cs_sales_price* cs_quantity else 0 end) as nov_sales - ,sum(case when d_moy = 12 - then cs_sales_price* cs_quantity else 0 end) as dec_sales - ,sum(case when d_moy = 1 - then cs_net_paid_inc_tax * cs_quantity else 0 end) as jan_net - ,sum(case when d_moy = 2 - then cs_net_paid_inc_tax * cs_quantity else 0 end) as feb_net - ,sum(case when d_moy = 3 - then cs_net_paid_inc_tax * cs_quantity else 0 end) as mar_net - ,sum(case when d_moy = 4 - then cs_net_paid_inc_tax * cs_quantity else 0 end) as apr_net - ,sum(case when d_moy = 5 - then cs_net_paid_inc_tax * cs_quantity else 0 end) as may_net - ,sum(case when d_moy = 6 - then cs_net_paid_inc_tax * cs_quantity else 0 end) as jun_net - ,sum(case when d_moy = 7 - then cs_net_paid_inc_tax * cs_quantity else 0 end) as jul_net - ,sum(case when d_moy = 8 - then cs_net_paid_inc_tax * cs_quantity else 0 end) as aug_net - ,sum(case when d_moy = 9 - then cs_net_paid_inc_tax * cs_quantity else 0 end) as sep_net - ,sum(case when d_moy = 10 - then cs_net_paid_inc_tax * cs_quantity else 0 end) as oct_net - ,sum(case when d_moy = 11 - then cs_net_paid_inc_tax * cs_quantity else 0 end) as nov_net - ,sum(case when d_moy = 12 - then cs_net_paid_inc_tax * cs_quantity else 0 end) as dec_net - from - catalog_sales - ,warehouse - ,date_dim - ,time_dim - ,ship_mode - where - cs_warehouse_sk = w_warehouse_sk - and cs_sold_date_sk = d_date_sk - and cs_sold_time_sk = t_time_sk - and cs_ship_mode_sk = sm_ship_mode_sk - and d_year = 2001 - and t_time between 30838 AND 30838+28800 - and sm_carrier in ('DHL','BARIAN') - group by - w_warehouse_name - ,w_warehouse_sq_ft - ,w_city - ,w_county - ,w_state - ,w_country - ,d_year - ) x - group by - w_warehouse_name - ,w_warehouse_sq_ft - ,w_city - ,w_county - ,w_state - ,w_country - ,ship_carriers - ,year - order by w_warehouse_name - limit 100 +select w_warehouse_name + , w_warehouse_sq_ft + , w_city + , w_county + , w_state + , w_country + , ship_carriers + , year + , sum (jan_sales) as jan_sales + , sum (feb_sales) as feb_sales + , sum (mar_sales) as mar_sales + , sum (apr_sales) as apr_sales + , sum (may_sales) as may_sales + , sum (jun_sales) as jun_sales + , sum (jul_sales) as jul_sales + , sum (aug_sales) as aug_sales + , sum (sep_sales) as sep_sales + , sum (oct_sales) as oct_sales + , sum (nov_sales) as nov_sales + , sum (dec_sales) as dec_sales + , sum (jan_sales/w_warehouse_sq_ft) as jan_sales_per_sq_foot + , sum (feb_sales/w_warehouse_sq_ft) as feb_sales_per_sq_foot + , sum (mar_sales/w_warehouse_sq_ft) as mar_sales_per_sq_foot + , sum (apr_sales/w_warehouse_sq_ft) as apr_sales_per_sq_foot + , sum (may_sales/w_warehouse_sq_ft) as may_sales_per_sq_foot + , sum (jun_sales/w_warehouse_sq_ft) as jun_sales_per_sq_foot + , sum (jul_sales/w_warehouse_sq_ft) as jul_sales_per_sq_foot + , sum (aug_sales/w_warehouse_sq_ft) as aug_sales_per_sq_foot + , sum (sep_sales/w_warehouse_sq_ft) as sep_sales_per_sq_foot + , sum (oct_sales/w_warehouse_sq_ft) as oct_sales_per_sq_foot + , sum (nov_sales/w_warehouse_sq_ft) as nov_sales_per_sq_foot + , sum (dec_sales/w_warehouse_sq_ft) as dec_sales_per_sq_foot + , sum (jan_net) as jan_net + , sum (feb_net) as feb_net + , sum (mar_net) as mar_net + , sum (apr_net) as apr_net + , sum (may_net) as may_net + , sum (jun_net) as jun_net + , sum (jul_net) as jul_net + , sum (aug_net) as aug_net + , sum (sep_net) as sep_net + , sum (oct_net) as oct_net + , sum (nov_net) as nov_net + , sum (dec_net) as dec_net +from ( + select + w_warehouse_name + , w_warehouse_sq_ft + , w_city + , w_county + , w_state + , w_country + , concat('DHL', ',', 'BARIAN') as ship_carriers + , d_year as year + , sum (case when d_moy = 1 + then ws_ext_sales_price* ws_quantity else 0 end) as jan_sales + , sum (case when d_moy = 2 + then ws_ext_sales_price* ws_quantity else 0 end) as feb_sales + , sum (case when d_moy = 3 + then ws_ext_sales_price* ws_quantity else 0 end) as mar_sales + , sum (case when d_moy = 4 + then ws_ext_sales_price* ws_quantity else 0 end) as apr_sales + , sum (case when d_moy = 5 + then ws_ext_sales_price* ws_quantity else 0 end) as may_sales + , sum (case when d_moy = 6 + then ws_ext_sales_price* ws_quantity else 0 end) as jun_sales + , sum (case when d_moy = 7 + then ws_ext_sales_price* ws_quantity else 0 end) as jul_sales + , sum (case when d_moy = 8 + then ws_ext_sales_price* ws_quantity else 0 end) as aug_sales + , sum (case when d_moy = 9 + then ws_ext_sales_price* ws_quantity else 0 end) as sep_sales + , sum (case when d_moy = 10 + then ws_ext_sales_price* ws_quantity else 0 end) as oct_sales + , sum (case when d_moy = 11 + then ws_ext_sales_price* ws_quantity else 0 end) as nov_sales + , sum (case when d_moy = 12 + then ws_ext_sales_price* ws_quantity else 0 end) as dec_sales + , sum (case when d_moy = 1 + then ws_net_paid * ws_quantity else 0 end) as jan_net + , sum (case when d_moy = 2 + then ws_net_paid * ws_quantity else 0 end) as feb_net + , sum (case when d_moy = 3 + then ws_net_paid * ws_quantity else 0 end) as mar_net + , sum (case when d_moy = 4 + then ws_net_paid * ws_quantity else 0 end) as apr_net + , sum (case when d_moy = 5 + then ws_net_paid * ws_quantity else 0 end) as may_net + , sum (case when d_moy = 6 + then ws_net_paid * ws_quantity else 0 end) as jun_net + , sum (case when d_moy = 7 + then ws_net_paid * ws_quantity else 0 end) as jul_net + , sum (case when d_moy = 8 + then ws_net_paid * ws_quantity else 0 end) as aug_net + , sum (case when d_moy = 9 + then ws_net_paid * ws_quantity else 0 end) as sep_net + , sum (case when d_moy = 10 + then ws_net_paid * ws_quantity else 0 end) as oct_net + , sum (case when d_moy = 11 + then ws_net_paid * ws_quantity else 0 end) as nov_net + , sum (case when d_moy = 12 + then ws_net_paid * ws_quantity else 0 end) as dec_net + from + web_sales + , warehouse + , date_dim + , time_dim + , ship_mode + where + ws_warehouse_sk = w_warehouse_sk + and ws_sold_date_sk = d_date_sk + and ws_sold_time_sk = t_time_sk + and ws_ship_mode_sk = sm_ship_mode_sk + and d_year = 2001 + and t_time between 30838 and 30838+28800 + and sm_carrier in ('DHL', 'BARIAN') + group by + w_warehouse_name + , w_warehouse_sq_ft + , w_city + , w_county + , w_state + , w_country + , d_year + union all + select + w_warehouse_name + , w_warehouse_sq_ft + , w_city + , w_county + , w_state + , w_country + , concat('DHL', ',', 'BARIAN') as ship_carriers + , d_year as year + , sum (case when d_moy = 1 + then cs_sales_price* cs_quantity else 0 end) as jan_sales + , sum (case when d_moy = 2 + then cs_sales_price* cs_quantity else 0 end) as feb_sales + , sum (case when d_moy = 3 + then cs_sales_price* cs_quantity else 0 end) as mar_sales + , sum (case when d_moy = 4 + then cs_sales_price* cs_quantity else 0 end) as apr_sales + , sum (case when d_moy = 5 + then cs_sales_price* cs_quantity else 0 end) as may_sales + , sum (case when d_moy = 6 + then cs_sales_price* cs_quantity else 0 end) as jun_sales + , sum (case when d_moy = 7 + then cs_sales_price* cs_quantity else 0 end) as jul_sales + , sum (case when d_moy = 8 + then cs_sales_price* cs_quantity else 0 end) as aug_sales + , sum (case when d_moy = 9 + then cs_sales_price* cs_quantity else 0 end) as sep_sales + , sum (case when d_moy = 10 + then cs_sales_price* cs_quantity else 0 end) as oct_sales + , sum (case when d_moy = 11 + then cs_sales_price* cs_quantity else 0 end) as nov_sales + , sum (case when d_moy = 12 + then cs_sales_price* cs_quantity else 0 end) as dec_sales + , sum (case when d_moy = 1 + then cs_net_paid_inc_tax * cs_quantity else 0 end) as jan_net + , sum (case when d_moy = 2 + then cs_net_paid_inc_tax * cs_quantity else 0 end) as feb_net + , sum (case when d_moy = 3 + then cs_net_paid_inc_tax * cs_quantity else 0 end) as mar_net + , sum (case when d_moy = 4 + then cs_net_paid_inc_tax * cs_quantity else 0 end) as apr_net + , sum (case when d_moy = 5 + then cs_net_paid_inc_tax * cs_quantity else 0 end) as may_net + , sum (case when d_moy = 6 + then cs_net_paid_inc_tax * cs_quantity else 0 end) as jun_net + , sum (case when d_moy = 7 + then cs_net_paid_inc_tax * cs_quantity else 0 end) as jul_net + , sum (case when d_moy = 8 + then cs_net_paid_inc_tax * cs_quantity else 0 end) as aug_net + , sum (case when d_moy = 9 + then cs_net_paid_inc_tax * cs_quantity else 0 end) as sep_net + , sum (case when d_moy = 10 + then cs_net_paid_inc_tax * cs_quantity else 0 end) as oct_net + , sum (case when d_moy = 11 + then cs_net_paid_inc_tax * cs_quantity else 0 end) as nov_net + , sum (case when d_moy = 12 + then cs_net_paid_inc_tax * cs_quantity else 0 end) as dec_net + from + catalog_sales + , warehouse + , date_dim + , time_dim + , ship_mode + where + cs_warehouse_sk = w_warehouse_sk + and cs_sold_date_sk = d_date_sk + and cs_sold_time_sk = t_time_sk + and cs_ship_mode_sk = sm_ship_mode_sk + and d_year = 2001 + and t_time between 30838 AND 30838+28800 + and sm_carrier in ('DHL', 'BARIAN') + group by + w_warehouse_name + , w_warehouse_sq_ft + , w_city + , w_county + , w_state + , w_country + , d_year + ) x +group by + w_warehouse_name + , w_warehouse_sq_ft + , w_city + , w_county + , w_state + , w_country + , ship_carriers + , year +order by w_warehouse_name + limit 100 diff --git a/src/main/resources/tpcds/query67.sql b/src/main/resources/tpcds/query67.sql index 17af92b4f5..a0df8051c8 100644 --- a/src/main/resources/tpcds/query67.sql +++ b/src/main/resources/tpcds/query67.sql @@ -1,41 +1,40 @@ -select * +select * from (select i_category - ,i_class - ,i_brand - ,i_product_name - ,d_year - ,d_qoy - ,d_moy - ,s_store_id - ,sumsales - ,rank() over (partition by i_category order by sumsales desc) rk + , i_class + , i_brand + , i_product_name + , d_year + , d_qoy + , d_moy + , s_store_id + , sumsales + , rank() over (partition by i_category order by sumsales desc) rk from (select i_category - ,i_class - ,i_brand - ,i_product_name - ,d_year - ,d_qoy - ,d_moy - ,s_store_id - ,sum(coalesce(ss_sales_price*ss_quantity,0)) sumsales + , i_class + , i_brand + , i_product_name + , d_year + , d_qoy + , d_moy + , s_store_id + , sum(coalesce(ss_sales_price * ss_quantity, 0)) sumsales from store_sales - ,date_dim - ,store - ,item - where ss_sold_date_sk=d_date_sk - and ss_item_sk=i_item_sk - and ss_store_sk = s_store_sk - and d_month_seq between 1200 and 1200+11 - group by rollup(i_category, i_class, i_brand, i_product_name, d_year, d_qoy, d_moy,s_store_id))dw1) dw2 + , date_dim + , store + , item + where ss_sold_date_sk = d_date_sk + and ss_item_sk = i_item_sk + and ss_store_sk = s_store_sk + and d_month_seq between 1200 and 1200 + 11 + group by rollup (i_category, i_class, i_brand, i_product_name, d_year, d_qoy, d_moy, s_store_id)) dw1) dw2 where rk <= 100 order by i_category - ,i_class - ,i_brand - ,i_product_name - ,d_year - ,d_qoy - ,d_moy - ,s_store_id - ,sumsales - ,rk - limit 100 + , i_class + , i_brand + , i_product_name + , d_year + , d_qoy + , d_moy + , s_store_id + , sumsales + , rk limit 100 diff --git a/src/main/resources/tpcds/query68.sql b/src/main/resources/tpcds/query68.sql index dccc63cd64..6395ca8248 100644 --- a/src/main/resources/tpcds/query68.sql +++ b/src/main/resources/tpcds/query68.sql @@ -1,39 +1,38 @@ -select c_last_name - ,c_first_name - ,ca_city - ,bought_city - ,ss_ticket_number - ,extended_price - ,extended_tax - ,list_price - from (select ss_ticket_number - ,ss_customer_sk - ,ca_city bought_city - ,sum(ss_ext_sales_price) extended_price - ,sum(ss_ext_list_price) list_price - ,sum(ss_ext_tax) extended_tax - from store_sales - ,date_dim - ,store - ,household_demographics - ,customer_address - where store_sales.ss_sold_date_sk = date_dim.d_date_sk - and store_sales.ss_store_sk = store.s_store_sk +select c_last_name + , c_first_name + , ca_city + , bought_city + , ss_ticket_number + , extended_price + , extended_tax + , list_price +from (select ss_ticket_number + , ss_customer_sk + , ca_city bought_city + , sum(ss_ext_sales_price) extended_price + , sum(ss_ext_list_price) list_price + , sum(ss_ext_tax) extended_tax + from store_sales + , date_dim + , store + , household_demographics + , customer_address + where store_sales.ss_sold_date_sk = date_dim.d_date_sk + and store_sales.ss_store_sk = store.s_store_sk and store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk and store_sales.ss_addr_sk = customer_address.ca_address_sk - and date_dim.d_dom between 1 and 2 + and date_dim.d_dom between 1 and 2 and (household_demographics.hd_dep_count = 4 or - household_demographics.hd_vehicle_count= 3) - and date_dim.d_year in (1999,1999+1,1999+2) - and store.s_city in ('Fairview','Midway') - group by ss_ticket_number - ,ss_customer_sk - ,ss_addr_sk,ca_city) dn - ,customer - ,customer_address current_addr - where ss_customer_sk = c_customer_sk - and customer.c_current_addr_sk = current_addr.ca_address_sk - and current_addr.ca_city <> bought_city - order by c_last_name - ,ss_ticket_number - limit 100 + household_demographics.hd_vehicle_count = 3) + and date_dim.d_year in (1999, 1999 + 1, 1999 + 2) + and store.s_city in ('Fairview', 'Midway') + group by ss_ticket_number + , ss_customer_sk + , ss_addr_sk, ca_city) dn + , customer + , customer_address current_addr +where ss_customer_sk = c_customer_sk + and customer.c_current_addr_sk = current_addr.ca_address_sk + and current_addr.ca_city <> bought_city +order by c_last_name + , ss_ticket_number limit 100 diff --git a/src/main/resources/tpcds/query69.sql b/src/main/resources/tpcds/query69.sql index 2efec64112..d04a407227 100644 --- a/src/main/resources/tpcds/query69.sql +++ b/src/main/resources/tpcds/query69.sql @@ -1,44 +1,45 @@ -select - cd_gender, - cd_marital_status, - cd_education_status, - count(*) cnt1, - cd_purchase_estimate, - count(*) cnt2, - cd_credit_rating, - count(*) cnt3 - from - customer c,customer_address ca,customer_demographics - where - c.c_current_addr_sk = ca.ca_address_sk and - ca_state in ('KY','GA','NM') and - cd_demo_sk = c.c_current_cdemo_sk and - exists (select * - from store_sales,date_dim - where c.c_customer_sk = ss_customer_sk and - ss_sold_date_sk = d_date_sk and - d_year = 2001 and - d_moy between 4 and 4+2) and - (not exists (select * - from web_sales,date_dim - where c.c_customer_sk = ws_bill_customer_sk and - ws_sold_date_sk = d_date_sk and - d_year = 2001 and - d_moy between 4 and 4+2) and - not exists (select * - from catalog_sales,date_dim - where c.c_customer_sk = cs_ship_customer_sk and - cs_sold_date_sk = d_date_sk and - d_year = 2001 and - d_moy between 4 and 4+2)) - group by cd_gender, - cd_marital_status, - cd_education_status, - cd_purchase_estimate, - cd_credit_rating - order by cd_gender, - cd_marital_status, - cd_education_status, - cd_purchase_estimate, - cd_credit_rating - limit 100 +select cd_gender, + cd_marital_status, + cd_education_status, + count(*) cnt1, + cd_purchase_estimate, + count(*) cnt2, + cd_credit_rating, + count(*) cnt3 +from customer c, + customer_address ca, + customer_demographics +where c.c_current_addr_sk = ca.ca_address_sk + and ca_state in ('KY', 'GA', 'NM') + and cd_demo_sk = c.c_current_cdemo_sk + and exists(select * + from store_sales, + date_dim + where c.c_customer_sk = ss_customer_sk + and ss_sold_date_sk = d_date_sk + and d_year = 2001 + and d_moy between 4 and 4 + 2) + and (not exists(select * + from web_sales, + date_dim + where c.c_customer_sk = ws_bill_customer_sk + and ws_sold_date_sk = d_date_sk + and d_year = 2001 + and d_moy between 4 and 4 + 2) and + not exists(select * + from catalog_sales, + date_dim + where c.c_customer_sk = cs_ship_customer_sk + and cs_sold_date_sk = d_date_sk + and d_year = 2001 + and d_moy between 4 and 4 + 2)) +group by cd_gender, + cd_marital_status, + cd_education_status, + cd_purchase_estimate, + cd_credit_rating +order by cd_gender, + cd_marital_status, + cd_education_status, + cd_purchase_estimate, + cd_credit_rating limit 100 diff --git a/src/main/resources/tpcds/query70.sql b/src/main/resources/tpcds/query70.sql index c2ad44b282..ce3fbe2e9b 100644 --- a/src/main/resources/tpcds/query70.sql +++ b/src/main/resources/tpcds/query70.sql @@ -1,35 +1,30 @@ -select - sum(ss_net_profit) as total_sum - ,s_state - ,s_county - ,grouping(s_state)+grouping(s_county) as lochierarchy - ,rank() over ( +select sum(ss_net_profit) as total_sum + , s_state + , s_county + , grouping(s_state) + grouping(s_county) as lochierarchy + , rank() over ( partition by grouping(s_state)+grouping(s_county), case when grouping(s_county) = 0 then s_state end order by sum(ss_net_profit) desc) as rank_within_parent - from - store_sales - ,date_dim d1 - ,store - where - d1.d_month_seq between 1200 and 1200+11 - and d1.d_date_sk = ss_sold_date_sk - and s_store_sk = ss_store_sk - and s_state in - ( select s_state - from (select s_state as s_state, - rank() over ( partition by s_state order by sum(ss_net_profit) desc) as ranking - from store_sales, store, date_dim - where d_month_seq between 1200 and 1200+11 - and d_date_sk = ss_sold_date_sk - and s_store_sk = ss_store_sk - group by s_state - ) tmp1 - where ranking <= 5 - ) - group by rollup(s_state,s_county) - order by - lochierarchy desc - ,case when lochierarchy = 0 then s_state end - ,rank_within_parent - limit 100 +from store_sales + , date_dim d1 + , store +where d1.d_month_seq between 1200 and 1200 + 11 + and d1.d_date_sk = ss_sold_date_sk + and s_store_sk = ss_store_sk + and s_state in + (select s_state + from (select s_state as s_state, + rank() over ( partition by s_state order by sum(ss_net_profit) desc) as ranking + from store_sales, + store, + date_dim + where d_month_seq between 1200 and 1200 + 11 + and d_date_sk = ss_sold_date_sk + and s_store_sk = ss_store_sk + group by s_state) tmp1 + where ranking <= 5) +group by rollup (s_state, s_county) +order by lochierarchy desc + , case when lochierarchy = 0 then s_state end + , rank_within_parent limit 100 diff --git a/src/main/resources/tpcds/query71.sql b/src/main/resources/tpcds/query71.sql index 8c0d727aef..e6813ddbd0 100644 --- a/src/main/resources/tpcds/query71.sql +++ b/src/main/resources/tpcds/query71.sql @@ -1,37 +1,43 @@ -select i_brand_id brand_id, i_brand brand,t_hour,t_minute, - sum(ext_price) ext_price - from item, (select ws_ext_sales_price as ext_price, - ws_sold_date_sk as sold_date_sk, - ws_item_sk as sold_item_sk, - ws_sold_time_sk as time_sk - from web_sales,date_dim - where d_date_sk = ws_sold_date_sk - and d_moy=11 - and d_year=1999 - union all - select cs_ext_sales_price as ext_price, - cs_sold_date_sk as sold_date_sk, - cs_item_sk as sold_item_sk, - cs_sold_time_sk as time_sk - from catalog_sales,date_dim - where d_date_sk = cs_sold_date_sk - and d_moy=11 - and d_year=1999 - union all - select ss_ext_sales_price as ext_price, - ss_sold_date_sk as sold_date_sk, - ss_item_sk as sold_item_sk, - ss_sold_time_sk as time_sk - from store_sales,date_dim - where d_date_sk = ss_sold_date_sk - and d_moy=11 - and d_year=1999 - ) tmp,time_dim - where - sold_item_sk = i_item_sk - and i_manager_id=1 - and time_sk = t_time_sk - and (t_meal_time = 'breakfast' or t_meal_time = 'dinner') - group by i_brand, i_brand_id,t_hour,t_minute - order by ext_price desc, i_brand_id +select i_brand_id brand_id, + i_brand brand, + t_hour, + t_minute, + sum(ext_price) ext_price +from item, + (select ws_ext_sales_price as ext_price, + ws_sold_date_sk as sold_date_sk, + ws_item_sk as sold_item_sk, + ws_sold_time_sk as time_sk + from web_sales, + date_dim + where d_date_sk = ws_sold_date_sk + and d_moy = 11 + and d_year = 1999 + union all + select cs_ext_sales_price as ext_price, + cs_sold_date_sk as sold_date_sk, + cs_item_sk as sold_item_sk, + cs_sold_time_sk as time_sk + from catalog_sales, + date_dim + where d_date_sk = cs_sold_date_sk + and d_moy = 11 + and d_year = 1999 + union all + select ss_ext_sales_price as ext_price, + ss_sold_date_sk as sold_date_sk, + ss_item_sk as sold_item_sk, + ss_sold_time_sk as time_sk + from store_sales, + date_dim + where d_date_sk = ss_sold_date_sk + and d_moy = 11 + and d_year = 1999) tmp, + time_dim +where sold_item_sk = i_item_sk + and i_manager_id = 1 + and time_sk = t_time_sk + and (t_meal_time = 'breakfast' or t_meal_time = 'dinner') +group by i_brand, i_brand_id, t_hour, t_minute +order by ext_price desc, i_brand_id diff --git a/src/main/resources/tpcds/query72.sql b/src/main/resources/tpcds/query72.sql index 067cd95ec8..54a4fefd5b 100644 --- a/src/main/resources/tpcds/query72.sql +++ b/src/main/resources/tpcds/query72.sql @@ -1,26 +1,25 @@ -select i_item_desc - ,w_warehouse_name - ,d1.d_week_seq - ,sum(case when p_promo_sk is null then 1 else 0 end) no_promo - ,sum(case when p_promo_sk is not null then 1 else 0 end) promo - ,count(*) total_cnt +select i_item_desc + , w_warehouse_name + , d1.d_week_seq + , sum(case when p_promo_sk is null then 1 else 0 end) no_promo + , sum(case when p_promo_sk is not null then 1 else 0 end) promo + , count(*) total_cnt from catalog_sales -join inventory on (cs_item_sk = inv_item_sk) -join warehouse on (w_warehouse_sk=inv_warehouse_sk) -join item on (i_item_sk = cs_item_sk) -join customer_demographics on (cs_bill_cdemo_sk = cd_demo_sk) -join household_demographics on (cs_bill_hdemo_sk = hd_demo_sk) -join date_dim d1 on (cs_sold_date_sk = d1.d_date_sk) -join date_dim d2 on (inv_date_sk = d2.d_date_sk) -join date_dim d3 on (cs_ship_date_sk = d3.d_date_sk) -left outer join promotion on (cs_promo_sk=p_promo_sk) -left outer join catalog_returns on (cr_item_sk = cs_item_sk and cr_order_number = cs_order_number) + join inventory on (cs_item_sk = inv_item_sk) + join warehouse on (w_warehouse_sk = inv_warehouse_sk) + join item on (i_item_sk = cs_item_sk) + join customer_demographics on (cs_bill_cdemo_sk = cd_demo_sk) + join household_demographics on (cs_bill_hdemo_sk = hd_demo_sk) + join date_dim d1 on (cs_sold_date_sk = d1.d_date_sk) + join date_dim d2 on (inv_date_sk = d2.d_date_sk) + join date_dim d3 on (cs_ship_date_sk = d3.d_date_sk) + left outer join promotion on (cs_promo_sk = p_promo_sk) + left outer join catalog_returns on (cr_item_sk = cs_item_sk and cr_order_number = cs_order_number) where d1.d_week_seq = d2.d_week_seq - and inv_quantity_on_hand < cs_quantity - and d3.d_date > date_add(cast(d1.d_date as date),5) + and inv_quantity_on_hand < cs_quantity + and d3.d_date > date_add(cast(d1.d_date as date), 5) and hd_buy_potential = '>10000' and d1.d_year = 1999 and cd_marital_status = 'D' -group by i_item_desc,w_warehouse_name,d1.d_week_seq -order by total_cnt desc, i_item_desc, w_warehouse_name, d_week_seq - limit 100 +group by i_item_desc, w_warehouse_name, d1.d_week_seq +order by total_cnt desc, i_item_desc, w_warehouse_name, d_week_seq limit 100 diff --git a/src/main/resources/tpcds/query73.sql b/src/main/resources/tpcds/query73.sql index 21b70271ab..d0f80bef3f 100644 --- a/src/main/resources/tpcds/query73.sql +++ b/src/main/resources/tpcds/query73.sql @@ -1,25 +1,31 @@ select c_last_name - ,c_first_name - ,c_salutation - ,c_preferred_cust_flag - ,ss_ticket_number - ,cnt from - (select ss_ticket_number - ,ss_customer_sk - ,count(*) cnt - from store_sales,date_dim,store,household_demographics - where store_sales.ss_sold_date_sk = date_dim.d_date_sk - and store_sales.ss_store_sk = store.s_store_sk - and store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk - and date_dim.d_dom between 1 and 2 - and (household_demographics.hd_buy_potential = '>10000' or - household_demographics.hd_buy_potential = 'Unknown') - and household_demographics.hd_vehicle_count > 0 - and case when household_demographics.hd_vehicle_count > 0 then - household_demographics.hd_dep_count/ household_demographics.hd_vehicle_count else null end > 1 - and date_dim.d_year in (1999,1999+1,1999+2) - and store.s_county in ('Williamson County','Franklin Parish','Bronx County','Orange County') - group by ss_ticket_number,ss_customer_sk) dj,customer - where ss_customer_sk = c_customer_sk - and cnt between 1 and 5 - order by cnt desc, c_last_name asc + , c_first_name + , c_salutation + , c_preferred_cust_flag + , ss_ticket_number + , cnt +from (select ss_ticket_number + , ss_customer_sk + , count(*) cnt + from store_sales, + date_dim, + store, + household_demographics + where store_sales.ss_sold_date_sk = date_dim.d_date_sk + and store_sales.ss_store_sk = store.s_store_sk + and store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk + and date_dim.d_dom between 1 and 2 + and (household_demographics.hd_buy_potential = '>10000' or + household_demographics.hd_buy_potential = 'Unknown') + and household_demographics.hd_vehicle_count > 0 + and case + when household_demographics.hd_vehicle_count > 0 then + household_demographics.hd_dep_count / household_demographics.hd_vehicle_count + else null end > 1 + and date_dim.d_year in (1999, 1999 + 1, 1999 + 2) + and store.s_county in ('Williamson County', 'Franklin Parish', 'Bronx County', 'Orange County') + group by ss_ticket_number, ss_customer_sk) dj, + customer +where ss_customer_sk = c_customer_sk + and cnt between 1 and 5 +order by cnt desc, c_last_name asc diff --git a/src/main/resources/tpcds/query74.sql b/src/main/resources/tpcds/query74.sql index ca30d76109..e4f8463558 100644 --- a/src/main/resources/tpcds/query74.sql +++ b/src/main/resources/tpcds/query74.sql @@ -1,58 +1,60 @@ -with year_total as ( - select c_customer_id customer_id - ,c_first_name customer_first_name - ,c_last_name customer_last_name - ,d_year as year - ,sum(ss_net_paid) year_total - ,'s' sale_type - from customer - ,store_sales - ,date_dim - where c_customer_sk = ss_customer_sk - and ss_sold_date_sk = d_date_sk - and d_year in (2001,2001+1) - group by c_customer_id - ,c_first_name - ,c_last_name - ,d_year - union all - select c_customer_id customer_id - ,c_first_name customer_first_name - ,c_last_name customer_last_name - ,d_year as year +with year_total as (select c_customer_id customer_id + , c_first_name customer_first_name + , c_last_name customer_last_name + , d_year + as year + , sum (ss_net_paid) year_total + , 's' sale_type +from customer + , store_sales + , date_dim +where c_customer_sk = ss_customer_sk + and ss_sold_date_sk = d_date_sk + and d_year in (2001 + , 2001+1) +group by c_customer_id + , c_first_name + , c_last_name + , d_year +union all +select c_customer_id customer_id + , c_first_name customer_first_name + , c_last_name customer_last_name + , d_year as year ,sum(ws_net_paid) year_total ,'w' sale_type - from customer - ,web_sales - ,date_dim - where c_customer_sk = ws_bill_customer_sk - and ws_sold_date_sk = d_date_sk - and d_year in (2001,2001+1) - group by c_customer_id - ,c_first_name - ,c_last_name - ,d_year - ) - select - t_s_secyear.customer_id, t_s_secyear.customer_first_name, t_s_secyear.customer_last_name - from year_total t_s_firstyear - ,year_total t_s_secyear - ,year_total t_w_firstyear - ,year_total t_w_secyear - where t_s_secyear.customer_id = t_s_firstyear.customer_id - and t_s_firstyear.customer_id = t_w_secyear.customer_id - and t_s_firstyear.customer_id = t_w_firstyear.customer_id - and t_s_firstyear.sale_type = 's' - and t_w_firstyear.sale_type = 'w' - and t_s_secyear.sale_type = 's' - and t_w_secyear.sale_type = 'w' - and t_s_firstyear.year = 2001 - and t_s_secyear.year = 2001+1 - and t_w_firstyear.year = 2001 - and t_w_secyear.year = 2001+1 - and t_s_firstyear.year_total > 0 - and t_w_firstyear.year_total > 0 - and case when t_w_firstyear.year_total > 0 then t_w_secyear.year_total / t_w_firstyear.year_total else null end - > case when t_s_firstyear.year_total > 0 then t_s_secyear.year_total / t_s_firstyear.year_total else null end - order by 1,1,1 - limit 100 +from customer + , web_sales + , date_dim +where c_customer_sk = ws_bill_customer_sk + and ws_sold_date_sk = d_date_sk + and d_year in (2001 + , 2001+1) +group by c_customer_id + , c_first_name + , c_last_name + , d_year + ) +select t_s_secyear.customer_id, + t_s_secyear.customer_first_name, + t_s_secyear.customer_last_name +from year_total t_s_firstyear + , year_total t_s_secyear + , year_total t_w_firstyear + , year_total t_w_secyear +where t_s_secyear.customer_id = t_s_firstyear.customer_id + and t_s_firstyear.customer_id = t_w_secyear.customer_id + and t_s_firstyear.customer_id = t_w_firstyear.customer_id + and t_s_firstyear.sale_type = 's' + and t_w_firstyear.sale_type = 'w' + and t_s_secyear.sale_type = 's' + and t_w_secyear.sale_type = 'w' + and t_s_firstyear.year = 2001 + and t_s_secyear.year = 2001 + 1 + and t_w_firstyear.year = 2001 + and t_w_secyear.year = 2001 + 1 + and t_s_firstyear.year_total > 0 + and t_w_firstyear.year_total > 0 + and case when t_w_firstyear.year_total > 0 then t_w_secyear.year_total / t_w_firstyear.year_total else null end + > case when t_s_firstyear.year_total > 0 then t_s_secyear.year_total / t_s_firstyear.year_total else null end +order by 1, 1, 1 limit 100 diff --git a/src/main/resources/tpcds/query75.sql b/src/main/resources/tpcds/query75.sql index d7dc80b447..f9032504ec 100644 --- a/src/main/resources/tpcds/query75.sql +++ b/src/main/resources/tpcds/query75.sql @@ -1,52 +1,54 @@ -WITH all_sales AS ( - SELECT d_year - ,i_brand_id - ,i_class_id - ,i_category_id - ,i_manufact_id - ,SUM(sales_cnt) AS sales_cnt - ,SUM(sales_amt) AS sales_amt - FROM (SELECT d_year - ,i_brand_id - ,i_class_id - ,i_category_id - ,i_manufact_id - ,cs_quantity - COALESCE(cr_return_quantity,0) AS sales_cnt - ,cs_ext_sales_price - COALESCE(cr_return_amount,0.0) AS sales_amt - FROM catalog_sales JOIN item ON i_item_sk=cs_item_sk - JOIN date_dim ON d_date_sk=cs_sold_date_sk - LEFT JOIN catalog_returns ON (cs_order_number=cr_order_number - AND cs_item_sk=cr_item_sk) - WHERE i_category='Books' - UNION - SELECT d_year - ,i_brand_id - ,i_class_id - ,i_category_id - ,i_manufact_id - ,ss_quantity - COALESCE(sr_return_quantity,0) AS sales_cnt - ,ss_ext_sales_price - COALESCE(sr_return_amt,0.0) AS sales_amt - FROM store_sales JOIN item ON i_item_sk=ss_item_sk - JOIN date_dim ON d_date_sk=ss_sold_date_sk - LEFT JOIN store_returns ON (ss_ticket_number=sr_ticket_number - AND ss_item_sk=sr_item_sk) - WHERE i_category='Books' - UNION - SELECT d_year - ,i_brand_id - ,i_class_id - ,i_category_id - ,i_manufact_id - ,ws_quantity - COALESCE(wr_return_quantity,0) AS sales_cnt - ,ws_ext_sales_price - COALESCE(wr_return_amt,0.0) AS sales_amt - FROM web_sales JOIN item ON i_item_sk=ws_item_sk - JOIN date_dim ON d_date_sk=ws_sold_date_sk - LEFT JOIN web_returns ON (ws_order_number=wr_order_number - AND ws_item_sk=wr_item_sk) - WHERE i_category='Books') sales_detail - GROUP BY d_year, i_brand_id, i_class_id, i_category_id, i_manufact_id) - SELECT prev_yr.d_year AS prev_year - ,curr_yr.d_year AS year +WITH all_sales AS (SELECT d_year + , i_brand_id + , i_class_id + , i_category_id + , i_manufact_id + , SUM(sales_cnt) AS sales_cnt + , SUM(sales_amt) AS sales_amt + FROM (SELECT d_year + , i_brand_id + , i_class_id + , i_category_id + , i_manufact_id + , cs_quantity - COALESCE(cr_return_quantity, 0) AS sales_cnt + , cs_ext_sales_price - COALESCE(cr_return_amount, 0.0) AS sales_amt + FROM catalog_sales + JOIN item ON i_item_sk = cs_item_sk + JOIN date_dim ON d_date_sk = cs_sold_date_sk + LEFT JOIN catalog_returns ON (cs_order_number = cr_order_number + AND cs_item_sk = cr_item_sk) + WHERE i_category = 'Books' + UNION + SELECT d_year + , i_brand_id + , i_class_id + , i_category_id + , i_manufact_id + , ss_quantity - COALESCE(sr_return_quantity, 0) AS sales_cnt + , ss_ext_sales_price - COALESCE(sr_return_amt, 0.0) AS sales_amt + FROM store_sales + JOIN item ON i_item_sk = ss_item_sk + JOIN date_dim ON d_date_sk = ss_sold_date_sk + LEFT JOIN store_returns ON (ss_ticket_number = sr_ticket_number + AND ss_item_sk = sr_item_sk) + WHERE i_category = 'Books' + UNION + SELECT d_year + , i_brand_id + , i_class_id + , i_category_id + , i_manufact_id + , ws_quantity - COALESCE(wr_return_quantity, 0) AS sales_cnt + , ws_ext_sales_price - COALESCE(wr_return_amt, 0.0) AS sales_amt + FROM web_sales + JOIN item ON i_item_sk = ws_item_sk + JOIN date_dim ON d_date_sk = ws_sold_date_sk + LEFT JOIN web_returns ON (ws_order_number = wr_order_number + AND ws_item_sk = wr_item_sk) + WHERE i_category = 'Books') sales_detail + GROUP BY d_year, i_brand_id, i_class_id, i_category_id, i_manufact_id) +SELECT prev_yr.d_year AS prev_year + , curr_yr.d_year AS year ,curr_yr.i_brand_id ,curr_yr.i_class_id ,curr_yr.i_category_id @@ -55,13 +57,16 @@ WITH all_sales AS ( ,curr_yr.sales_cnt AS curr_yr_cnt ,curr_yr.sales_cnt-prev_yr.sales_cnt AS sales_cnt_diff ,curr_yr.sales_amt-prev_yr.sales_amt AS sales_amt_diff - FROM all_sales curr_yr, all_sales prev_yr - WHERE curr_yr.i_brand_id=prev_yr.i_brand_id - AND curr_yr.i_class_id=prev_yr.i_class_id - AND curr_yr.i_category_id=prev_yr.i_category_id - AND curr_yr.i_manufact_id=prev_yr.i_manufact_id - AND curr_yr.d_year=2002 - AND prev_yr.d_year=2002-1 - AND CAST(curr_yr.sales_cnt AS DECIMAL(17,2))/CAST(prev_yr.sales_cnt AS DECIMAL(17,2))<0.9 - ORDER BY sales_cnt_diff - limit 100 +FROM all_sales curr_yr, all_sales prev_yr +WHERE curr_yr.i_brand_id=prev_yr.i_brand_id + AND curr_yr.i_class_id=prev_yr.i_class_id + AND curr_yr.i_category_id=prev_yr.i_category_id + AND curr_yr.i_manufact_id=prev_yr.i_manufact_id + AND curr_yr.d_year=2002 + AND prev_yr.d_year=2002-1 + AND CAST (curr_yr.sales_cnt AS DECIMAL (17 + , 2))/ CAST (prev_yr.sales_cnt AS DECIMAL (17 + , 2)) + <0.9 +ORDER BY sales_cnt_diff + limit 100 diff --git a/src/main/resources/tpcds/query76.sql b/src/main/resources/tpcds/query76.sql index 391e2cd577..1677c5f167 100644 --- a/src/main/resources/tpcds/query76.sql +++ b/src/main/resources/tpcds/query76.sql @@ -1,21 +1,36 @@ -select channel, col_name, d_year, d_qoy, i_category, COUNT(*) sales_cnt, SUM(ext_sales_price) sales_amt FROM ( - SELECT 'store' as channel, 'ss_store_sk' col_name, d_year, d_qoy, i_category, ss_ext_sales_price ext_sales_price - FROM store_sales, item, date_dim - WHERE ss_store_sk IS NULL - AND ss_sold_date_sk=d_date_sk - AND ss_item_sk=i_item_sk - UNION ALL - SELECT 'web' as channel, 'ws_ship_customer_sk' col_name, d_year, d_qoy, i_category, ws_ext_sales_price ext_sales_price - FROM web_sales, item, date_dim - WHERE ws_ship_customer_sk IS NULL - AND ws_sold_date_sk=d_date_sk - AND ws_item_sk=i_item_sk - UNION ALL - SELECT 'catalog' as channel, 'cs_ship_addr_sk' col_name, d_year, d_qoy, i_category, cs_ext_sales_price ext_sales_price - FROM catalog_sales, item, date_dim - WHERE cs_ship_addr_sk IS NULL - AND cs_sold_date_sk=d_date_sk - AND cs_item_sk=i_item_sk) foo +select channel, col_name, d_year, d_qoy, i_category, COUNT(*) sales_cnt, SUM(ext_sales_price) sales_amt +FROM (SELECT 'store' as channel, 'ss_store_sk' col_name, d_year, d_qoy, i_category, ss_ext_sales_price ext_sales_price + FROM store_sales, + item, + date_dim + WHERE ss_store_sk IS NULL + AND ss_sold_date_sk = d_date_sk + AND ss_item_sk = i_item_sk + UNION ALL + SELECT 'web' as channel, + 'ws_ship_customer_sk' col_name, + d_year, + d_qoy, + i_category, + ws_ext_sales_price ext_sales_price + FROM web_sales, + item, + date_dim + WHERE ws_ship_customer_sk IS NULL + AND ws_sold_date_sk = d_date_sk + AND ws_item_sk = i_item_sk + UNION ALL + SELECT 'catalog' as channel, + 'cs_ship_addr_sk' col_name, + d_year, + d_qoy, + i_category, + cs_ext_sales_price ext_sales_price + FROM catalog_sales, + item, + date_dim + WHERE cs_ship_addr_sk IS NULL + AND cs_sold_date_sk = d_date_sk + AND cs_item_sk = i_item_sk) foo GROUP BY channel, col_name, d_year, d_qoy, i_category -ORDER BY channel, col_name, d_year, d_qoy, i_category - limit 100 +ORDER BY channel, col_name, d_year, d_qoy, i_category limit 100 diff --git a/src/main/resources/tpcds/query77.sql b/src/main/resources/tpcds/query77.sql index 3007c01d4e..b60e70b342 100644 --- a/src/main/resources/tpcds/query77.sql +++ b/src/main/resources/tpcds/query77.sql @@ -1,105 +1,102 @@ with ss as - (select s_store_sk, - sum(ss_ext_sales_price) as sales, - sum(ss_net_profit) as profit - from store_sales, - date_dim, - store - where ss_sold_date_sk = d_date_sk - and d_date between cast('2000-08-23' as date) - and date_add(cast('2000-08-23' as date), 30 ) - and ss_store_sk = s_store_sk - group by s_store_sk) - , - sr as - (select s_store_sk, - sum(sr_return_amt) as returns, - sum(sr_net_loss) as profit_loss - from store_returns, - date_dim, - store - where sr_returned_date_sk = d_date_sk - and d_date between cast('2000-08-23' as date) - and date_add(cast('2000-08-23' as date), 30 ) - and sr_store_sk = s_store_sk - group by s_store_sk), - cs as - (select cs_call_center_sk, - sum(cs_ext_sales_price) as sales, - sum(cs_net_profit) as profit - from catalog_sales, - date_dim - where cs_sold_date_sk = d_date_sk - and d_date between cast('2000-08-23' as date) - and date_add(cast('2000-08-23' as date), 30 ) - group by cs_call_center_sk - ), - cr as - (select cr_call_center_sk, - sum(cr_return_amount) as returns, - sum(cr_net_loss) as profit_loss - from catalog_returns, - date_dim - where cr_returned_date_sk = d_date_sk - and d_date between cast('2000-08-23' as date) - and date_add(cast('2000-08-23' as date), 30 ) - group by cr_call_center_sk - ), - ws as - ( select wp_web_page_sk, - sum(ws_ext_sales_price) as sales, - sum(ws_net_profit) as profit - from web_sales, - date_dim, - web_page - where ws_sold_date_sk = d_date_sk - and d_date between cast('2000-08-23' as date) - and date_add(cast('2000-08-23' as date), 30 ) - and ws_web_page_sk = wp_web_page_sk - group by wp_web_page_sk), - wr as - (select wp_web_page_sk, - sum(wr_return_amt) as returns, - sum(wr_net_loss) as profit_loss - from web_returns, - date_dim, - web_page - where wr_returned_date_sk = d_date_sk - and d_date between cast('2000-08-23' as date) - and date_add(cast('2000-08-23' as date), 30 ) - and wr_web_page_sk = wp_web_page_sk - group by wp_web_page_sk) - select channel - , id - , sum(sales) as sales - , sum(returns) as returns - , sum(profit) as profit - from - (select 'store channel' as channel - , ss.s_store_sk as id - , sales - , coalesce(returns, 0) as returns - , (profit - coalesce(profit_loss,0)) as profit - from ss left join sr - on ss.s_store_sk = sr.s_store_sk - union all - select 'catalog channel' as channel - , cs_call_center_sk as id - , sales - , returns - , (profit - profit_loss) as profit - from cs - , cr - union all - select 'web channel' as channel - , ws.wp_web_page_sk as id - , sales - , coalesce(returns, 0) returns - , (profit - coalesce(profit_loss,0)) as profit - from ws left join wr - on ws.wp_web_page_sk = wr.wp_web_page_sk - ) x - group by rollup (channel, id) - order by channel - ,id - limit 100 + (select s_store_sk, + sum(ss_ext_sales_price) as sales, + sum(ss_net_profit) as profit + from store_sales, + date_dim, + store + where ss_sold_date_sk = d_date_sk + and d_date between cast('2000-08-23' as date) + and date_add(cast('2000-08-23' as date), 30) + and ss_store_sk = s_store_sk + group by s_store_sk) + , + sr as + (select s_store_sk, + sum(sr_return_amt) as returns, + sum(sr_net_loss) as profit_loss + from store_returns, + date_dim, + store + where sr_returned_date_sk = d_date_sk + and d_date between cast('2000-08-23' as date) + and date_add(cast('2000-08-23' as date), 30) + and sr_store_sk = s_store_sk + group by s_store_sk), + cs as + (select cs_call_center_sk, + sum(cs_ext_sales_price) as sales, + sum(cs_net_profit) as profit + from catalog_sales, + date_dim + where cs_sold_date_sk = d_date_sk + and d_date between cast('2000-08-23' as date) + and date_add(cast('2000-08-23' as date), 30) + group by cs_call_center_sk), + cr as + (select cr_call_center_sk, + sum(cr_return_amount) as returns, + sum(cr_net_loss) as profit_loss + from catalog_returns, + date_dim + where cr_returned_date_sk = d_date_sk + and d_date between cast('2000-08-23' as date) + and date_add(cast('2000-08-23' as date), 30) + group by cr_call_center_sk), + ws as + (select wp_web_page_sk, + sum(ws_ext_sales_price) as sales, + sum(ws_net_profit) as profit + from web_sales, + date_dim, + web_page + where ws_sold_date_sk = d_date_sk + and d_date between cast('2000-08-23' as date) + and date_add(cast('2000-08-23' as date), 30) + and ws_web_page_sk = wp_web_page_sk + group by wp_web_page_sk), + wr as + (select wp_web_page_sk, + sum(wr_return_amt) as returns, + sum(wr_net_loss) as profit_loss + from web_returns, + date_dim, + web_page + where wr_returned_date_sk = d_date_sk + and d_date between cast('2000-08-23' as date) + and date_add(cast('2000-08-23' as date), 30) + and wr_web_page_sk = wp_web_page_sk + group by wp_web_page_sk) +select channel + , id + , sum(sales) as sales + , sum(returns) as returns + , sum(profit) as profit +from (select 'store channel' as channel + , ss.s_store_sk as id + , sales + , coalesce(returns, 0) as returns + , (profit - coalesce(profit_loss, 0)) as profit + from ss + left join sr + on ss.s_store_sk = sr.s_store_sk + union all + select 'catalog channel' as channel + , cs_call_center_sk as id + , sales + , returns + , (profit - profit_loss) as profit + from cs + , cr + union all + select 'web channel' as channel + , ws.wp_web_page_sk as id + , sales + , coalesce(returns, 0) returns + , (profit - coalesce(profit_loss, 0)) as profit + from ws + left join wr + on ws.wp_web_page_sk = wr.wp_web_page_sk) x +group by rollup (channel, id) +order by channel + , id limit 100 diff --git a/src/main/resources/tpcds/query78.sql b/src/main/resources/tpcds/query78.sql index 052bab4a72..de1fdfef15 100644 --- a/src/main/resources/tpcds/query78.sql +++ b/src/main/resources/tpcds/query78.sql @@ -1,55 +1,57 @@ with ws as - (select d_year AS ws_sold_year, ws_item_sk, - ws_bill_customer_sk ws_customer_sk, - sum(ws_quantity) ws_qty, - sum(ws_wholesale_cost) ws_wc, - sum(ws_sales_price) ws_sp - from web_sales - left join web_returns on wr_order_number=ws_order_number and ws_item_sk=wr_item_sk - join date_dim on ws_sold_date_sk = d_date_sk - where wr_order_number is null - group by d_year, ws_item_sk, ws_bill_customer_sk - ), -cs as - (select d_year AS cs_sold_year, cs_item_sk, - cs_bill_customer_sk cs_customer_sk, - sum(cs_quantity) cs_qty, - sum(cs_wholesale_cost) cs_wc, - sum(cs_sales_price) cs_sp - from catalog_sales - left join catalog_returns on cr_order_number=cs_order_number and cs_item_sk=cr_item_sk - join date_dim on cs_sold_date_sk = d_date_sk - where cr_order_number is null - group by d_year, cs_item_sk, cs_bill_customer_sk - ), -ss as - (select d_year AS ss_sold_year, ss_item_sk, - ss_customer_sk, - sum(ss_quantity) ss_qty, - sum(ss_wholesale_cost) ss_wc, - sum(ss_sales_price) ss_sp - from store_sales - left join store_returns on sr_ticket_number=ss_ticket_number and ss_item_sk=sr_item_sk - join date_dim on ss_sold_date_sk = d_date_sk - where sr_ticket_number is null - group by d_year, ss_item_sk, ss_customer_sk - ) - select -ss_sold_year, ss_item_sk, ss_customer_sk, -round(ss_qty/(coalesce(ws_qty,0)+coalesce(cs_qty,0)),2) ratio, -ss_qty store_qty, ss_wc store_wholesale_cost, ss_sp store_sales_price, -coalesce(ws_qty,0)+coalesce(cs_qty,0) other_chan_qty, -coalesce(ws_wc,0)+coalesce(cs_wc,0) other_chan_wholesale_cost, -coalesce(ws_sp,0)+coalesce(cs_sp,0) other_chan_sales_price + (select d_year AS ws_sold_year, + ws_item_sk, + ws_bill_customer_sk ws_customer_sk, + sum(ws_quantity) ws_qty, + sum(ws_wholesale_cost) ws_wc, + sum(ws_sales_price) ws_sp + from web_sales + left join web_returns on wr_order_number = ws_order_number and ws_item_sk = wr_item_sk + join date_dim on ws_sold_date_sk = d_date_sk + where wr_order_number is null + group by d_year, ws_item_sk, ws_bill_customer_sk), + cs as + (select d_year AS cs_sold_year, + cs_item_sk, + cs_bill_customer_sk cs_customer_sk, + sum(cs_quantity) cs_qty, + sum(cs_wholesale_cost) cs_wc, + sum(cs_sales_price) cs_sp + from catalog_sales + left join catalog_returns on cr_order_number = cs_order_number and cs_item_sk = cr_item_sk + join date_dim on cs_sold_date_sk = d_date_sk + where cr_order_number is null + group by d_year, cs_item_sk, cs_bill_customer_sk), + ss as + (select d_year AS ss_sold_year, + ss_item_sk, + ss_customer_sk, + sum(ss_quantity) ss_qty, + sum(ss_wholesale_cost) ss_wc, + sum(ss_sales_price) ss_sp + from store_sales + left join store_returns on sr_ticket_number = ss_ticket_number and ss_item_sk = sr_item_sk + join date_dim on ss_sold_date_sk = d_date_sk + where sr_ticket_number is null + group by d_year, ss_item_sk, ss_customer_sk) +select ss_sold_year, + ss_item_sk, + ss_customer_sk, + round(ss_qty / (coalesce(ws_qty, 0) + coalesce(cs_qty, 0)), 2) ratio, + ss_qty store_qty, + ss_wc store_wholesale_cost, + ss_sp store_sales_price, + coalesce(ws_qty, 0) + coalesce(cs_qty, 0) other_chan_qty, + coalesce(ws_wc, 0) + coalesce(cs_wc, 0) other_chan_wholesale_cost, + coalesce(ws_sp, 0) + coalesce(cs_sp, 0) other_chan_sales_price from ss -left join ws on (ws_sold_year=ss_sold_year and ws_item_sk=ss_item_sk and ws_customer_sk=ss_customer_sk) -left join cs on (cs_sold_year=ss_sold_year and cs_item_sk=ss_item_sk and cs_customer_sk=ss_customer_sk) -where (coalesce(ws_qty,0)>0 or coalesce(cs_qty, 0)>0) and ss_sold_year=2000 -order by - ss_sold_year, ss_item_sk, ss_customer_sk, - ss_qty desc, ss_wc desc, ss_sp desc, - other_chan_qty, - other_chan_wholesale_cost, - other_chan_sales_price, - round(ss_qty/(coalesce(ws_qty+cs_qty,1)),2) - limit 100 + left join ws on (ws_sold_year = ss_sold_year and ws_item_sk = ss_item_sk and ws_customer_sk = ss_customer_sk) + left join cs on (cs_sold_year = ss_sold_year and cs_item_sk = ss_item_sk and cs_customer_sk = ss_customer_sk) +where (coalesce(ws_qty, 0) > 0 or coalesce(cs_qty, 0) > 0) + and ss_sold_year = 2000 +order by ss_sold_year, ss_item_sk, ss_customer_sk, + ss_qty desc, ss_wc desc, ss_sp desc, + other_chan_qty, + other_chan_wholesale_cost, + other_chan_sales_price, + round(ss_qty / (coalesce(ws_qty + cs_qty, 1)), 2) limit 100 diff --git a/src/main/resources/tpcds/query79.sql b/src/main/resources/tpcds/query79.sql index 208beb9ef9..b265687c55 100644 --- a/src/main/resources/tpcds/query79.sql +++ b/src/main/resources/tpcds/query79.sql @@ -1,20 +1,26 @@ -select - c_last_name,c_first_name,substr(s_city,1,30),ss_ticket_number,amt,profit - from - (select ss_ticket_number - ,ss_customer_sk - ,store.s_city - ,sum(ss_coupon_amt) amt - ,sum(ss_net_profit) profit - from store_sales,date_dim,store,household_demographics - where store_sales.ss_sold_date_sk = date_dim.d_date_sk - and store_sales.ss_store_sk = store.s_store_sk - and store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk - and (household_demographics.hd_dep_count = 6 or household_demographics.hd_vehicle_count > 2) - and date_dim.d_dow = 1 - and date_dim.d_year in (1999,1999+1,1999+2) - and store.s_number_employees between 200 and 295 - group by ss_ticket_number,ss_customer_sk,ss_addr_sk,store.s_city) ms,customer - where ss_customer_sk = c_customer_sk - order by c_last_name,c_first_name,substr(s_city,1,30), profit - limit 100 +select c_last_name, + c_first_name, + substr(s_city, 1, 30), + ss_ticket_number, + amt, + profit +from (select ss_ticket_number + , ss_customer_sk + , store.s_city + , sum(ss_coupon_amt) amt + , sum(ss_net_profit) profit + from store_sales, + date_dim, + store, + household_demographics + where store_sales.ss_sold_date_sk = date_dim.d_date_sk + and store_sales.ss_store_sk = store.s_store_sk + and store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk + and (household_demographics.hd_dep_count = 6 or household_demographics.hd_vehicle_count > 2) + and date_dim.d_dow = 1 + and date_dim.d_year in (1999, 1999 + 1, 1999 + 2) + and store.s_number_employees between 200 and 295 + group by ss_ticket_number, ss_customer_sk, ss_addr_sk, store.s_city) ms, + customer +where ss_customer_sk = c_customer_sk +order by c_last_name, c_first_name, substr(s_city, 1, 30), profit limit 100 diff --git a/src/main/resources/tpcds/query80.sql b/src/main/resources/tpcds/query80.sql index aca45200d6..7836b6e398 100644 --- a/src/main/resources/tpcds/query80.sql +++ b/src/main/resources/tpcds/query80.sql @@ -1,93 +1,93 @@ with ssr as - (select s_store_id as store_id, - sum(ss_ext_sales_price) as sales, - sum(coalesce(sr_return_amt, 0)) as returns, - sum(ss_net_profit - coalesce(sr_net_loss, 0)) as profit - from store_sales left outer join store_returns on - (ss_item_sk = sr_item_sk and ss_ticket_number = sr_ticket_number), - date_dim, - store, - item, - promotion - where ss_sold_date_sk = d_date_sk - and d_date between cast('2000-08-23' as date) - and date_add(cast('2000-08-23' as date), 30 ) - and ss_store_sk = s_store_sk - and ss_item_sk = i_item_sk - and i_current_price > 50 - and ss_promo_sk = p_promo_sk - and p_channel_tv = 'N' - group by s_store_id) - , - csr as - (select cp_catalog_page_id as catalog_page_id, - sum(cs_ext_sales_price) as sales, - sum(coalesce(cr_return_amount, 0)) as returns, - sum(cs_net_profit - coalesce(cr_net_loss, 0)) as profit - from catalog_sales left outer join catalog_returns on - (cs_item_sk = cr_item_sk and cs_order_number = cr_order_number), - date_dim, - catalog_page, - item, - promotion - where cs_sold_date_sk = d_date_sk - and d_date between cast('2000-08-23' as date) - and date_add(cast('2000-08-23' as date), 30 ) - and cs_catalog_page_sk = cp_catalog_page_sk - and cs_item_sk = i_item_sk - and i_current_price > 50 - and cs_promo_sk = p_promo_sk - and p_channel_tv = 'N' -group by cp_catalog_page_id) - , - wsr as - (select web_site_id, - sum(ws_ext_sales_price) as sales, - sum(coalesce(wr_return_amt, 0)) as returns, - sum(ws_net_profit - coalesce(wr_net_loss, 0)) as profit - from web_sales left outer join web_returns on - (ws_item_sk = wr_item_sk and ws_order_number = wr_order_number), - date_dim, - web_site, - item, - promotion - where ws_sold_date_sk = d_date_sk - and d_date between cast('2000-08-23' as date) - and date_add(cast('2000-08-23' as date), 30 ) - and ws_web_site_sk = web_site_sk - and ws_item_sk = i_item_sk - and i_current_price > 50 - and ws_promo_sk = p_promo_sk - and p_channel_tv = 'N' -group by web_site_id) - select channel - , id - , sum(sales) as sales - , sum(returns) as returns - , sum(profit) as profit - from - (select 'store channel' as channel - , concat( 'store' , store_id ) as id - , sales - , returns - , profit - from ssr - union all - select 'catalog channel' as channel - , concat( 'catalog_page' , catalog_page_id ) as id - , sales - , returns - , profit - from csr - union all - select 'web channel' as channel - , concat( 'web_site' , web_site_id ) as id - , sales - , returns - , profit - from wsr - ) x - group by rollup (channel, id) - order by channel - ,id - limit 100 + (select s_store_id as store_id, + sum(ss_ext_sales_price) as sales, + sum(coalesce(sr_return_amt, 0)) as returns, + sum(ss_net_profit - coalesce(sr_net_loss, 0)) as profit + from store_sales + left outer join store_returns on + (ss_item_sk = sr_item_sk and ss_ticket_number = sr_ticket_number), + date_dim, + store, + item, + promotion + where ss_sold_date_sk = d_date_sk + and d_date between cast('2000-08-23' as date) + and date_add(cast('2000-08-23' as date), 30) + and ss_store_sk = s_store_sk + and ss_item_sk = i_item_sk + and i_current_price > 50 + and ss_promo_sk = p_promo_sk + and p_channel_tv = 'N' + group by s_store_id) + , + csr as + (select cp_catalog_page_id as catalog_page_id, + sum(cs_ext_sales_price) as sales, + sum(coalesce(cr_return_amount, 0)) as returns, + sum(cs_net_profit - coalesce(cr_net_loss, 0)) as profit + from catalog_sales + left outer join catalog_returns on + (cs_item_sk = cr_item_sk and cs_order_number = cr_order_number), + date_dim, + catalog_page, + item, + promotion + where cs_sold_date_sk = d_date_sk + and d_date between cast('2000-08-23' as date) + and date_add(cast('2000-08-23' as date), 30) + and cs_catalog_page_sk = cp_catalog_page_sk + and cs_item_sk = i_item_sk + and i_current_price > 50 + and cs_promo_sk = p_promo_sk + and p_channel_tv = 'N' + group by cp_catalog_page_id) + , + wsr as + (select web_site_id, + sum(ws_ext_sales_price) as sales, + sum(coalesce(wr_return_amt, 0)) as returns, + sum(ws_net_profit - coalesce(wr_net_loss, 0)) as profit + from web_sales + left outer join web_returns on + (ws_item_sk = wr_item_sk and ws_order_number = wr_order_number), + date_dim, + web_site, + item, + promotion + where ws_sold_date_sk = d_date_sk + and d_date between cast('2000-08-23' as date) + and date_add(cast('2000-08-23' as date), 30) + and ws_web_site_sk = web_site_sk + and ws_item_sk = i_item_sk + and i_current_price > 50 + and ws_promo_sk = p_promo_sk + and p_channel_tv = 'N' + group by web_site_id) +select channel + , id + , sum(sales) as sales + , sum(returns) as returns + , sum(profit) as profit +from (select 'store channel' as channel + , concat('store', store_id) as id + , sales + , returns + , profit + from ssr + union all + select 'catalog channel' as channel + , concat('catalog_page', catalog_page_id) as id + , sales + , returns + , profit + from csr + union all + select 'web channel' as channel + , concat('web_site', web_site_id) as id + , sales + , returns + , profit + from wsr) x +group by rollup (channel, id) +order by channel + , id limit 100 diff --git a/src/main/resources/tpcds/query81.sql b/src/main/resources/tpcds/query81.sql index 2a4278dd69..236c184491 100644 --- a/src/main/resources/tpcds/query81.sql +++ b/src/main/resources/tpcds/query81.sql @@ -1,28 +1,41 @@ with customer_total_return as - (select cr_returning_customer_sk as ctr_customer_sk - ,ca_state as ctr_state, - sum(cr_return_amt_inc_tax) as ctr_total_return - from catalog_returns - ,date_dim - ,customer_address - where cr_returned_date_sk = d_date_sk - and d_year =2000 - and cr_returning_addr_sk = ca_address_sk - group by cr_returning_customer_sk - ,ca_state ) - select c_customer_id,c_salutation,c_first_name,c_last_name,ca_street_number,ca_street_name - ,ca_street_type,ca_suite_number,ca_city,ca_county,ca_state,ca_zip,ca_country,ca_gmt_offset - ,ca_location_type,ctr_total_return - from customer_total_return ctr1 - ,customer_address - ,customer - where ctr1.ctr_total_return > (select avg(ctr_total_return)*1.2 - from customer_total_return ctr2 - where ctr1.ctr_state = ctr2.ctr_state) - and ca_address_sk = c_current_addr_sk - and ca_state = 'GA' - and ctr1.ctr_customer_sk = c_customer_sk - order by c_customer_id,c_salutation,c_first_name,c_last_name,ca_street_number,ca_street_name - ,ca_street_type,ca_suite_number,ca_city,ca_county,ca_state,ca_zip,ca_country,ca_gmt_offset - ,ca_location_type,ctr_total_return - limit 100 + (select cr_returning_customer_sk as ctr_customer_sk + , + ca_state as ctr_state, + sum(cr_return_amt_inc_tax) as ctr_total_return + from catalog_returns + , date_dim + , customer_address + where cr_returned_date_sk = d_date_sk + and d_year = 2000 + and cr_returning_addr_sk = ca_address_sk + group by cr_returning_customer_sk + , ca_state) +select c_customer_id + , c_salutation + , c_first_name + , c_last_name + , ca_street_number + , ca_street_name + , ca_street_type + , ca_suite_number + , ca_city + , ca_county + , ca_state + , ca_zip + , ca_country + , ca_gmt_offset + , ca_location_type + , ctr_total_return +from customer_total_return ctr1 + , customer_address + , customer +where ctr1.ctr_total_return > (select avg(ctr_total_return) * 1.2 + from customer_total_return ctr2 + where ctr1.ctr_state = ctr2.ctr_state) + and ca_address_sk = c_current_addr_sk + and ca_state = 'GA' + and ctr1.ctr_customer_sk = c_customer_sk +order by c_customer_id, c_salutation, c_first_name, c_last_name, ca_street_number, ca_street_name + , ca_street_type, ca_suite_number, ca_city, ca_county, ca_state, ca_zip, ca_country, ca_gmt_offset + , ca_location_type, ctr_total_return limit 100 diff --git a/src/main/resources/tpcds/query82.sql b/src/main/resources/tpcds/query82.sql index c9168efb82..abca796716 100644 --- a/src/main/resources/tpcds/query82.sql +++ b/src/main/resources/tpcds/query82.sql @@ -1,14 +1,16 @@ -select i_item_id - ,i_item_desc - ,i_current_price - from item, inventory, date_dim, store_sales - where i_current_price between 62 and 62+30 - and inv_item_sk = i_item_sk - and d_date_sk=inv_date_sk - and d_date between cast('2000-05-25' as date) and date_add(cast('2000-05-25' as date), 60 ) - and i_manufact_id in (129,270,821,423) - and inv_quantity_on_hand between 100 and 500 - and ss_item_sk = i_item_sk - group by i_item_id,i_item_desc,i_current_price - order by i_item_id - limit 100 +select i_item_id + , i_item_desc + , i_current_price +from item, + inventory, + date_dim, + store_sales +where i_current_price between 62 and 62 + 30 + and inv_item_sk = i_item_sk + and d_date_sk = inv_date_sk + and d_date between cast('2000-05-25' as date) and date_add(cast('2000-05-25' as date), 60) + and i_manufact_id in (129, 270, 821, 423) + and inv_quantity_on_hand between 100 and 500 + and ss_item_sk = i_item_sk +group by i_item_id, i_item_desc, i_current_price +order by i_item_id limit 100 diff --git a/src/main/resources/tpcds/query83.sql b/src/main/resources/tpcds/query83.sql index c0e036914c..94702897de 100644 --- a/src/main/resources/tpcds/query83.sql +++ b/src/main/resources/tpcds/query83.sql @@ -1,64 +1,63 @@ with sr_items as - (select i_item_id item_id, - sum(sr_return_quantity) sr_item_qty - from store_returns, - item, - date_dim - where sr_item_sk = i_item_sk - and d_date in - (select d_date - from date_dim - where d_week_seq in - (select d_week_seq - from date_dim - where d_date in ('2000-06-30','2000-09-27','2000-11-17'))) - and sr_returned_date_sk = d_date_sk - group by i_item_id), - cr_items as - (select i_item_id item_id, - sum(cr_return_quantity) cr_item_qty - from catalog_returns, - item, - date_dim - where cr_item_sk = i_item_sk - and d_date in - (select d_date - from date_dim - where d_week_seq in - (select d_week_seq - from date_dim - where d_date in ('2000-06-30','2000-09-27','2000-11-17'))) - and cr_returned_date_sk = d_date_sk - group by i_item_id), - wr_items as - (select i_item_id item_id, - sum(wr_return_quantity) wr_item_qty - from web_returns, - item, - date_dim - where wr_item_sk = i_item_sk - and d_date in - (select d_date - from date_dim - where d_week_seq in - (select d_week_seq - from date_dim - where d_date in ('2000-06-30','2000-09-27','2000-11-17'))) - and wr_returned_date_sk = d_date_sk - group by i_item_id) - select sr_items.item_id - ,sr_item_qty - ,sr_item_qty/(sr_item_qty+cr_item_qty+wr_item_qty)/3.0 * 100 sr_dev - ,cr_item_qty - ,cr_item_qty/(sr_item_qty+cr_item_qty+wr_item_qty)/3.0 * 100 cr_dev - ,wr_item_qty - ,wr_item_qty/(sr_item_qty+cr_item_qty+wr_item_qty)/3.0 * 100 wr_dev - ,(sr_item_qty+cr_item_qty+wr_item_qty)/3.0 average - from sr_items - ,cr_items - ,wr_items - where sr_items.item_id=cr_items.item_id - and sr_items.item_id=wr_items.item_id - order by sr_items.item_id - ,sr_item_qty - limit 100 + (select i_item_id item_id, + sum(sr_return_quantity) sr_item_qty + from store_returns, + item, + date_dim + where sr_item_sk = i_item_sk + and d_date in + (select d_date + from date_dim + where d_week_seq in + (select d_week_seq + from date_dim + where d_date in ('2000-06-30', '2000-09-27', '2000-11-17'))) + and sr_returned_date_sk = d_date_sk + group by i_item_id), + cr_items as + (select i_item_id item_id, + sum(cr_return_quantity) cr_item_qty + from catalog_returns, + item, + date_dim + where cr_item_sk = i_item_sk + and d_date in + (select d_date + from date_dim + where d_week_seq in + (select d_week_seq + from date_dim + where d_date in ('2000-06-30', '2000-09-27', '2000-11-17'))) + and cr_returned_date_sk = d_date_sk + group by i_item_id), + wr_items as + (select i_item_id item_id, + sum(wr_return_quantity) wr_item_qty + from web_returns, + item, + date_dim + where wr_item_sk = i_item_sk + and d_date in + (select d_date + from date_dim + where d_week_seq in + (select d_week_seq + from date_dim + where d_date in ('2000-06-30', '2000-09-27', '2000-11-17'))) + and wr_returned_date_sk = d_date_sk + group by i_item_id) +select sr_items.item_id + , sr_item_qty + , sr_item_qty / (sr_item_qty + cr_item_qty + wr_item_qty) / 3.0 * 100 sr_dev + , cr_item_qty + , cr_item_qty / (sr_item_qty + cr_item_qty + wr_item_qty) / 3.0 * 100 cr_dev + , wr_item_qty + , wr_item_qty / (sr_item_qty + cr_item_qty + wr_item_qty) / 3.0 * 100 wr_dev + , (sr_item_qty + cr_item_qty + wr_item_qty) / 3.0 average +from sr_items + , cr_items + , wr_items +where sr_items.item_id = cr_items.item_id + and sr_items.item_id = wr_items.item_id +order by sr_items.item_id + , sr_item_qty limit 100 diff --git a/src/main/resources/tpcds/query84.sql b/src/main/resources/tpcds/query84.sql index c331868034..c29b8b39e9 100644 --- a/src/main/resources/tpcds/query84.sql +++ b/src/main/resources/tpcds/query84.sql @@ -1,18 +1,17 @@ -select c_customer_id as customer_id - ,concat(c_last_name , ', ' , coalesce(c_first_name,'')) as customername - from customer - ,customer_address - ,customer_demographics - ,household_demographics - ,income_band - ,store_returns - where ca_city = 'Edgewood' - and c_current_addr_sk = ca_address_sk - and ib_lower_bound >= 38128 - and ib_upper_bound <= 38128 + 50000 - and ib_income_band_sk = hd_income_band_sk - and cd_demo_sk = c_current_cdemo_sk - and hd_demo_sk = c_current_hdemo_sk - and sr_cdemo_sk = cd_demo_sk - order by c_customer_id - limit 100 +select c_customer_id as customer_id + , concat(c_last_name, ', ', coalesce(c_first_name, '')) as customername +from customer + , customer_address + , customer_demographics + , household_demographics + , income_band + , store_returns +where ca_city = 'Edgewood' + and c_current_addr_sk = ca_address_sk + and ib_lower_bound >= 38128 + and ib_upper_bound <= 38128 + 50000 + and ib_income_band_sk = hd_income_band_sk + and cd_demo_sk = c_current_cdemo_sk + and hd_demo_sk = c_current_hdemo_sk + and sr_cdemo_sk = cd_demo_sk +order by c_customer_id limit 100 diff --git a/src/main/resources/tpcds/query85.sql b/src/main/resources/tpcds/query85.sql index ec2e7feb1e..f54afd0183 100644 --- a/src/main/resources/tpcds/query85.sql +++ b/src/main/resources/tpcds/query85.sql @@ -1,81 +1,85 @@ -select substr(r_reason_desc,1,20) - ,avg(ws_quantity) - ,avg(wr_refunded_cash) - ,avg(wr_fee) - from web_sales, web_returns, web_page, customer_demographics cd1, - customer_demographics cd2, customer_address, date_dim, reason - where ws_web_page_sk = wp_web_page_sk - and ws_item_sk = wr_item_sk - and ws_order_number = wr_order_number - and ws_sold_date_sk = d_date_sk and d_year = 2000 - and cd1.cd_demo_sk = wr_refunded_cdemo_sk - and cd2.cd_demo_sk = wr_returning_cdemo_sk - and ca_address_sk = wr_refunded_addr_sk - and r_reason_sk = wr_reason_sk - and - ( - ( - cd1.cd_marital_status = 'M' - and - cd1.cd_marital_status = cd2.cd_marital_status - and - cd1.cd_education_status = 'Advanced Degree' - and - cd1.cd_education_status = cd2.cd_education_status - and - ws_sales_price between 100.00 and 150.00 +select substr(r_reason_desc, 1, 20) + , avg(ws_quantity) + , avg(wr_refunded_cash) + , avg(wr_fee) +from web_sales, + web_returns, + web_page, + customer_demographics cd1, + customer_demographics cd2, + customer_address, + date_dim, + reason +where ws_web_page_sk = wp_web_page_sk + and ws_item_sk = wr_item_sk + and ws_order_number = wr_order_number + and ws_sold_date_sk = d_date_sk + and d_year = 2000 + and cd1.cd_demo_sk = wr_refunded_cdemo_sk + and cd2.cd_demo_sk = wr_returning_cdemo_sk + and ca_address_sk = wr_refunded_addr_sk + and r_reason_sk = wr_reason_sk + and ( + ( + cd1.cd_marital_status = 'M' + and + cd1.cd_marital_status = cd2.cd_marital_status + and + cd1.cd_education_status = 'Advanced Degree' + and + cd1.cd_education_status = cd2.cd_education_status + and + ws_sales_price between 100.00 and 150.00 + ) + or + ( + cd1.cd_marital_status = 'S' + and + cd1.cd_marital_status = cd2.cd_marital_status + and + cd1.cd_education_status = 'College' + and + cd1.cd_education_status = cd2.cd_education_status + and + ws_sales_price between 50.00 and 100.00 + ) + or + ( + cd1.cd_marital_status = 'W' + and + cd1.cd_marital_status = cd2.cd_marital_status + and + cd1.cd_education_status = '2 yr Degree' + and + cd1.cd_education_status = cd2.cd_education_status + and + ws_sales_price between 150.00 and 200.00 + ) ) - or - ( - cd1.cd_marital_status = 'S' - and - cd1.cd_marital_status = cd2.cd_marital_status - and - cd1.cd_education_status = 'College' - and - cd1.cd_education_status = cd2.cd_education_status - and - ws_sales_price between 50.00 and 100.00 + and ( + ( + ca_country = 'United States' + and + ca_state in ('IN', 'OH', 'NJ') + and ws_net_profit between 100 and 200 + ) + or + ( + ca_country = 'United States' + and + ca_state in ('WI', 'CT', 'KY') + and ws_net_profit between 150 and 300 + ) + or + ( + ca_country = 'United States' + and + ca_state in ('LA', 'IA', 'AR') + and ws_net_profit between 50 and 250 + ) ) - or - ( - cd1.cd_marital_status = 'W' - and - cd1.cd_marital_status = cd2.cd_marital_status - and - cd1.cd_education_status = '2 yr Degree' - and - cd1.cd_education_status = cd2.cd_education_status - and - ws_sales_price between 150.00 and 200.00 - ) - ) - and - ( - ( - ca_country = 'United States' - and - ca_state in ('IN', 'OH', 'NJ') - and ws_net_profit between 100 and 200 - ) - or - ( - ca_country = 'United States' - and - ca_state in ('WI', 'CT', 'KY') - and ws_net_profit between 150 and 300 - ) - or - ( - ca_country = 'United States' - and - ca_state in ('LA', 'IA', 'AR') - and ws_net_profit between 50 and 250 - ) - ) group by r_reason_desc -order by substr(r_reason_desc,1,20) - ,avg(ws_quantity) - ,avg(wr_refunded_cash) - ,avg(wr_fee) - limit 100 +order by substr(r_reason_desc, 1, 20) + , avg(ws_quantity) + , avg(wr_refunded_cash) + , avg(wr_fee) limit 100 diff --git a/src/main/resources/tpcds/query86.sql b/src/main/resources/tpcds/query86.sql index 2745b99f3e..add2be0a82 100644 --- a/src/main/resources/tpcds/query86.sql +++ b/src/main/resources/tpcds/query86.sql @@ -1,23 +1,18 @@ -select - sum(ws_net_paid) as total_sum - ,i_category - ,i_class - ,grouping(i_category)+grouping(i_class) as lochierarchy - ,rank() over ( +select sum(ws_net_paid) as total_sum + , i_category + , i_class + , grouping(i_category) + grouping(i_class) as lochierarchy + , rank() over ( partition by grouping(i_category)+grouping(i_class), case when grouping(i_class) = 0 then i_category end order by sum(ws_net_paid) desc) as rank_within_parent - from - web_sales - ,date_dim d1 - ,item - where - d1.d_month_seq between 1200 and 1200+11 - and d1.d_date_sk = ws_sold_date_sk - and i_item_sk = ws_item_sk - group by rollup(i_category,i_class) - order by - lochierarchy desc, - case when lochierarchy = 0 then i_category end, - rank_within_parent - limit 100 +from web_sales + , date_dim d1 + , item +where d1.d_month_seq between 1200 and 1200 + 11 + and d1.d_date_sk = ws_sold_date_sk + and i_item_sk = ws_item_sk +group by rollup (i_category, i_class) +order by lochierarchy desc, + case when lochierarchy = 0 then i_category end, + rank_within_parent limit 100 diff --git a/src/main/resources/tpcds/query87.sql b/src/main/resources/tpcds/query87.sql index 197e374891..b1f28466dd 100644 --- a/src/main/resources/tpcds/query87.sql +++ b/src/main/resources/tpcds/query87.sql @@ -1,20 +1,25 @@ select count(*) from ((select distinct c_last_name, c_first_name, d_date - from store_sales, date_dim, customer + from store_sales, + date_dim, + customer where store_sales.ss_sold_date_sk = date_dim.d_date_sk and store_sales.ss_customer_sk = customer.c_customer_sk - and d_month_seq between 1200 and 1200+11) - except + and d_month_seq between 1200 and 1200 + 11) + except (select distinct c_last_name, c_first_name, d_date - from catalog_sales, date_dim, customer + from catalog_sales, + date_dim, + customer where catalog_sales.cs_sold_date_sk = date_dim.d_date_sk and catalog_sales.cs_bill_customer_sk = customer.c_customer_sk - and d_month_seq between 1200 and 1200+11) - except + and d_month_seq between 1200 and 1200 + 11) + except (select distinct c_last_name, c_first_name, d_date - from web_sales, date_dim, customer + from web_sales, + date_dim, + customer where web_sales.ws_sold_date_sk = date_dim.d_date_sk and web_sales.ws_bill_customer_sk = customer.c_customer_sk - and d_month_seq between 1200 and 1200+11) -) cool_cust + and d_month_seq between 1200 and 1200 + 11)) cool_cust diff --git a/src/main/resources/tpcds/query88.sql b/src/main/resources/tpcds/query88.sql index 84a6a12912..8058f09a1d 100644 --- a/src/main/resources/tpcds/query88.sql +++ b/src/main/resources/tpcds/query88.sql @@ -1,90 +1,113 @@ -select * -from - (select count(*) h8_30_to_9 - from store_sales, household_demographics , time_dim, store - where ss_sold_time_sk = time_dim.t_time_sk - and ss_hdemo_sk = household_demographics.hd_demo_sk - and ss_store_sk = s_store_sk - and time_dim.t_hour = 8 - and time_dim.t_minute >= 30 - and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or - (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or - (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count<=0+2)) - and store.s_store_name = 'ese') s1, - (select count(*) h9_to_9_30 - from store_sales, household_demographics , time_dim, store - where ss_sold_time_sk = time_dim.t_time_sk - and ss_hdemo_sk = household_demographics.hd_demo_sk - and ss_store_sk = s_store_sk - and time_dim.t_hour = 9 - and time_dim.t_minute < 30 - and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or - (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or - (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count<=0+2)) - and store.s_store_name = 'ese') s2, - (select count(*) h9_30_to_10 - from store_sales, household_demographics , time_dim, store - where ss_sold_time_sk = time_dim.t_time_sk - and ss_hdemo_sk = household_demographics.hd_demo_sk - and ss_store_sk = s_store_sk - and time_dim.t_hour = 9 - and time_dim.t_minute >= 30 - and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or - (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or - (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count<=0+2)) - and store.s_store_name = 'ese') s3, - (select count(*) h10_to_10_30 - from store_sales, household_demographics , time_dim, store - where ss_sold_time_sk = time_dim.t_time_sk - and ss_hdemo_sk = household_demographics.hd_demo_sk - and ss_store_sk = s_store_sk - and time_dim.t_hour = 10 - and time_dim.t_minute < 30 - and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or - (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or - (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count<=0+2)) - and store.s_store_name = 'ese') s4, - (select count(*) h10_30_to_11 - from store_sales, household_demographics , time_dim, store - where ss_sold_time_sk = time_dim.t_time_sk - and ss_hdemo_sk = household_demographics.hd_demo_sk - and ss_store_sk = s_store_sk - and time_dim.t_hour = 10 - and time_dim.t_minute >= 30 - and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or - (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or - (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count<=0+2)) - and store.s_store_name = 'ese') s5, - (select count(*) h11_to_11_30 - from store_sales, household_demographics , time_dim, store - where ss_sold_time_sk = time_dim.t_time_sk - and ss_hdemo_sk = household_demographics.hd_demo_sk - and ss_store_sk = s_store_sk - and time_dim.t_hour = 11 - and time_dim.t_minute < 30 - and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or - (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or - (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count<=0+2)) - and store.s_store_name = 'ese') s6, - (select count(*) h11_30_to_12 - from store_sales, household_demographics , time_dim, store - where ss_sold_time_sk = time_dim.t_time_sk - and ss_hdemo_sk = household_demographics.hd_demo_sk - and ss_store_sk = s_store_sk - and time_dim.t_hour = 11 - and time_dim.t_minute >= 30 - and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or - (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or - (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count<=0+2)) - and store.s_store_name = 'ese') s7, - (select count(*) h12_to_12_30 - from store_sales, household_demographics , time_dim, store - where ss_sold_time_sk = time_dim.t_time_sk - and ss_hdemo_sk = household_demographics.hd_demo_sk - and ss_store_sk = s_store_sk - and time_dim.t_hour = 12 - and time_dim.t_minute < 30 - and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count<=4+2) or - (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count<=2+2) or - (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count<=0+2)) - and store.s_store_name = 'ese') s8 +select * +from (select count(*) h8_30_to_9 + from store_sales, + household_demographics, + time_dim, + store + where ss_sold_time_sk = time_dim.t_time_sk + and ss_hdemo_sk = household_demographics.hd_demo_sk + and ss_store_sk = s_store_sk + and time_dim.t_hour = 8 + and time_dim.t_minute >= 30 + and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count <= 4 + 2) or + (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count <= 2 + 2) or + (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count <= 0 + 2)) + and store.s_store_name = 'ese') s1, + (select count(*) h9_to_9_30 + from store_sales, + household_demographics, + time_dim, + store + where ss_sold_time_sk = time_dim.t_time_sk + and ss_hdemo_sk = household_demographics.hd_demo_sk + and ss_store_sk = s_store_sk + and time_dim.t_hour = 9 + and time_dim.t_minute < 30 + and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count <= 4 + 2) or + (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count <= 2 + 2) or + (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count <= 0 + 2)) + and store.s_store_name = 'ese') s2, + (select count(*) h9_30_to_10 + from store_sales, + household_demographics, + time_dim, + store + where ss_sold_time_sk = time_dim.t_time_sk + and ss_hdemo_sk = household_demographics.hd_demo_sk + and ss_store_sk = s_store_sk + and time_dim.t_hour = 9 + and time_dim.t_minute >= 30 + and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count <= 4 + 2) or + (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count <= 2 + 2) or + (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count <= 0 + 2)) + and store.s_store_name = 'ese') s3, + (select count(*) h10_to_10_30 + from store_sales, + household_demographics, + time_dim, + store + where ss_sold_time_sk = time_dim.t_time_sk + and ss_hdemo_sk = household_demographics.hd_demo_sk + and ss_store_sk = s_store_sk + and time_dim.t_hour = 10 + and time_dim.t_minute < 30 + and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count <= 4 + 2) or + (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count <= 2 + 2) or + (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count <= 0 + 2)) + and store.s_store_name = 'ese') s4, + (select count(*) h10_30_to_11 + from store_sales, + household_demographics, + time_dim, + store + where ss_sold_time_sk = time_dim.t_time_sk + and ss_hdemo_sk = household_demographics.hd_demo_sk + and ss_store_sk = s_store_sk + and time_dim.t_hour = 10 + and time_dim.t_minute >= 30 + and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count <= 4 + 2) or + (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count <= 2 + 2) or + (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count <= 0 + 2)) + and store.s_store_name = 'ese') s5, + (select count(*) h11_to_11_30 + from store_sales, + household_demographics, + time_dim, + store + where ss_sold_time_sk = time_dim.t_time_sk + and ss_hdemo_sk = household_demographics.hd_demo_sk + and ss_store_sk = s_store_sk + and time_dim.t_hour = 11 + and time_dim.t_minute < 30 + and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count <= 4 + 2) or + (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count <= 2 + 2) or + (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count <= 0 + 2)) + and store.s_store_name = 'ese') s6, + (select count(*) h11_30_to_12 + from store_sales, + household_demographics, + time_dim, + store + where ss_sold_time_sk = time_dim.t_time_sk + and ss_hdemo_sk = household_demographics.hd_demo_sk + and ss_store_sk = s_store_sk + and time_dim.t_hour = 11 + and time_dim.t_minute >= 30 + and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count <= 4 + 2) or + (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count <= 2 + 2) or + (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count <= 0 + 2)) + and store.s_store_name = 'ese') s7, + (select count(*) h12_to_12_30 + from store_sales, + household_demographics, + time_dim, + store + where ss_sold_time_sk = time_dim.t_time_sk + and ss_hdemo_sk = household_demographics.hd_demo_sk + and ss_store_sk = s_store_sk + and time_dim.t_hour = 12 + and time_dim.t_minute < 30 + and ((household_demographics.hd_dep_count = 4 and household_demographics.hd_vehicle_count <= 4 + 2) or + (household_demographics.hd_dep_count = 2 and household_demographics.hd_vehicle_count <= 2 + 2) or + (household_demographics.hd_dep_count = 0 and household_demographics.hd_vehicle_count <= 0 + 2)) + and store.s_store_name = 'ese') s8 diff --git a/src/main/resources/tpcds/query89.sql b/src/main/resources/tpcds/query89.sql index 94718dce0b..57cf4d6541 100644 --- a/src/main/resources/tpcds/query89.sql +++ b/src/main/resources/tpcds/query89.sql @@ -1,25 +1,29 @@ -select * -from( -select i_category, i_class, i_brand, - s_store_name, s_company_name, - d_moy, - sum(ss_sales_price) sum_sales, - avg(sum(ss_sales_price)) over - (partition by i_category, i_brand, s_store_name, s_company_name) +select * +from (select i_category, + i_class, + i_brand, + s_store_name, + s_company_name, + d_moy, + sum(ss_sales_price) sum_sales, + avg(sum(ss_sales_price)) over (partition by i_category, i_brand, s_store_name, s_company_name) avg_monthly_sales -from item, store_sales, date_dim, store -where ss_item_sk = i_item_sk and - ss_sold_date_sk = d_date_sk and - ss_store_sk = s_store_sk and - d_year in (1999) and - ((i_category in ('Books','Electronics','Sports') and - i_class in ('computers','stereo','football') - ) - or (i_category in ('Men','Jewelry','Women') and - i_class in ('shirts','birdal','dresses') - )) -group by i_category, i_class, i_brand, - s_store_name, s_company_name, d_moy) tmp1 -where case when (avg_monthly_sales <> 0) then (abs(sum_sales - avg_monthly_sales) / avg_monthly_sales) else null end > 0.1 -order by sum_sales - avg_monthly_sales, s_store_name - limit 100 + from item, + store_sales, + date_dim, + store + where ss_item_sk = i_item_sk + and ss_sold_date_sk = d_date_sk + and ss_store_sk = s_store_sk + and d_year in (1999) + and ((i_category in ('Books', 'Electronics', 'Sports') and + i_class in ('computers', 'stereo', 'football') + ) + or (i_category in ('Men', 'Jewelry', 'Women') and + i_class in ('shirts', 'birdal', 'dresses') + )) + group by i_category, i_class, i_brand, + s_store_name, s_company_name, d_moy) tmp1 +where case when (avg_monthly_sales <> 0) then (abs(sum_sales - avg_monthly_sales) / avg_monthly_sales) else null end > + 0.1 +order by sum_sales - avg_monthly_sales, s_store_name limit 100 diff --git a/src/main/resources/tpcds/query90.sql b/src/main/resources/tpcds/query90.sql index e177b7b38d..3b93a81ab9 100644 --- a/src/main/resources/tpcds/query90.sql +++ b/src/main/resources/tpcds/query90.sql @@ -1,19 +1,24 @@ -select cast(amc as decimal(15,4))/cast(pmc as decimal(15,4)) am_pm_ratio - from ( select count(*) amc - from web_sales, household_demographics , time_dim, web_page - where ws_sold_time_sk = time_dim.t_time_sk - and ws_ship_hdemo_sk = household_demographics.hd_demo_sk - and ws_web_page_sk = web_page.wp_web_page_sk - and time_dim.t_hour between 8 and 8+1 - and household_demographics.hd_dep_count = 6 - and web_page.wp_char_count between 5000 and 5200) at1, - ( select count(*) pmc - from web_sales, household_demographics , time_dim, web_page - where ws_sold_time_sk = time_dim.t_time_sk - and ws_ship_hdemo_sk = household_demographics.hd_demo_sk - and ws_web_page_sk = web_page.wp_web_page_sk - and time_dim.t_hour between 19 and 19+1 - and household_demographics.hd_dep_count = 6 - and web_page.wp_char_count between 5000 and 5200) pt - order by am_pm_ratio - limit 100 +select cast(amc as decimal(15, 4)) / cast(pmc as decimal(15, 4)) am_pm_ratio +from (select count(*) amc + from web_sales, + household_demographics, + time_dim, + web_page + where ws_sold_time_sk = time_dim.t_time_sk + and ws_ship_hdemo_sk = household_demographics.hd_demo_sk + and ws_web_page_sk = web_page.wp_web_page_sk + and time_dim.t_hour between 8 and 8 + 1 + and household_demographics.hd_dep_count = 6 + and web_page.wp_char_count between 5000 and 5200) at1, + (select count(*) pmc + from web_sales, + household_demographics, + time_dim, + web_page + where ws_sold_time_sk = time_dim.t_time_sk + and ws_ship_hdemo_sk = household_demographics.hd_demo_sk + and ws_web_page_sk = web_page.wp_web_page_sk + and time_dim.t_hour between 19 and 19 + 1 + and household_demographics.hd_dep_count = 6 + and web_page.wp_char_count between 5000 and 5200) pt +order by am_pm_ratio limit 100 diff --git a/src/main/resources/tpcds/query91.sql b/src/main/resources/tpcds/query91.sql index ed67b9e6b3..e32b65cc11 100644 --- a/src/main/resources/tpcds/query91.sql +++ b/src/main/resources/tpcds/query91.sql @@ -1,28 +1,25 @@ -select - cc_call_center_id Call_Center, - cc_name Call_Center_Name, - cc_manager Manager, - sum(cr_net_loss) Returns_Loss -from - call_center, - catalog_returns, - date_dim, - customer, - customer_address, - customer_demographics, - household_demographics -where - cr_call_center_sk = cc_call_center_sk -and cr_returned_date_sk = d_date_sk -and cr_returning_customer_sk= c_customer_sk -and cd_demo_sk = c_current_cdemo_sk -and hd_demo_sk = c_current_hdemo_sk -and ca_address_sk = c_current_addr_sk -and d_year = 1998 -and d_moy = 11 -and ( (cd_marital_status = 'M' and cd_education_status = 'Unknown') - or(cd_marital_status = 'W' and cd_education_status = 'Advanced Degree')) -and hd_buy_potential like 'Unknown%' -and ca_gmt_offset = -7 -group by cc_call_center_id,cc_name,cc_manager,cd_marital_status,cd_education_status +select cc_call_center_id Call_Center, + cc_name Call_Center_Name, + cc_manager Manager, + sum(cr_net_loss) Returns_Loss +from call_center, + catalog_returns, + date_dim, + customer, + customer_address, + customer_demographics, + household_demographics +where cr_call_center_sk = cc_call_center_sk + and cr_returned_date_sk = d_date_sk + and cr_returning_customer_sk = c_customer_sk + and cd_demo_sk = c_current_cdemo_sk + and hd_demo_sk = c_current_hdemo_sk + and ca_address_sk = c_current_addr_sk + and d_year = 1998 + and d_moy = 11 + and ((cd_marital_status = 'M' and cd_education_status = 'Unknown') + or (cd_marital_status = 'W' and cd_education_status = 'Advanced Degree')) + and hd_buy_potential like 'Unknown%' + and ca_gmt_offset = -7 +group by cc_call_center_id, cc_name, cc_manager, cd_marital_status, cd_education_status order by sum(cr_net_loss) desc diff --git a/src/main/resources/tpcds/query92.sql b/src/main/resources/tpcds/query92.sql index e80a8e17d5..d6e13e262b 100644 --- a/src/main/resources/tpcds/query92.sql +++ b/src/main/resources/tpcds/query92.sql @@ -1,27 +1,18 @@ -select - sum(ws_ext_discount_amt) as Excess_Discount_Amount -from - web_sales - ,item - ,date_dim -where -i_manufact_id = 350 -and i_item_sk = ws_item_sk -and d_date between '2000-01-27' and - date_add(cast('2000-01-27' as date), 90 ) -and d_date_sk = ws_sold_date_sk -and ws_ext_discount_amt - > ( - SELECT - 1.3 * avg(ws_ext_discount_amt) - FROM - web_sales - ,date_dim - WHERE - ws_item_sk = i_item_sk - and d_date between '2000-01-27' and - date_add(cast('2000-01-27' as date), 90 ) - and d_date_sk = ws_sold_date_sk - ) -order by sum(ws_ext_discount_amt) - limit 100 +select sum(ws_ext_discount_amt) as Excess_Discount_Amount +from web_sales + , item + , date_dim +where i_manufact_id = 350 + and i_item_sk = ws_item_sk + and d_date between '2000-01-27' and + date_add(cast('2000-01-27' as date), 90) + and d_date_sk = ws_sold_date_sk + and ws_ext_discount_amt + > (SELECT 1.3 * avg(ws_ext_discount_amt) + FROM web_sales + , date_dim + WHERE ws_item_sk = i_item_sk + and d_date between '2000-01-27' and + date_add(cast('2000-01-27' as date), 90) + and d_date_sk = ws_sold_date_sk) +order by sum(ws_ext_discount_amt) limit 100 diff --git a/src/main/resources/tpcds/query93.sql b/src/main/resources/tpcds/query93.sql index 97ef85ef70..80dbdf1880 100644 --- a/src/main/resources/tpcds/query93.sql +++ b/src/main/resources/tpcds/query93.sql @@ -1,15 +1,16 @@ -select ss_customer_sk - ,sum(act_sales) sumsales - from (select ss_item_sk - ,ss_ticket_number - ,ss_customer_sk - ,case when sr_return_quantity is not null then (ss_quantity-sr_return_quantity)*ss_sales_price - else (ss_quantity*ss_sales_price) end act_sales - from store_sales left outer join store_returns on (sr_item_sk = ss_item_sk - and sr_ticket_number = ss_ticket_number) - ,reason - where sr_reason_sk = r_reason_sk - and r_reason_desc = 'reason 28') t - group by ss_customer_sk - order by sumsales, ss_customer_sk - limit 100 +select ss_customer_sk + , sum(act_sales) sumsales +from (select ss_item_sk + , ss_ticket_number + , ss_customer_sk + , case + when sr_return_quantity is not null then (ss_quantity - sr_return_quantity) * ss_sales_price + else (ss_quantity * ss_sales_price) end act_sales + from store_sales + left outer join store_returns on (sr_item_sk = ss_item_sk + and sr_ticket_number = ss_ticket_number) + , reason + where sr_reason_sk = r_reason_sk + and r_reason_desc = 'reason 28') t +group by ss_customer_sk +order by sumsales, ss_customer_sk limit 100 diff --git a/src/main/resources/tpcds/query94.sql b/src/main/resources/tpcds/query94.sql index 8c0b958e29..97cd3543d1 100644 --- a/src/main/resources/tpcds/query94.sql +++ b/src/main/resources/tpcds/query94.sql @@ -1,26 +1,22 @@ -select - count(distinct ws_order_number) as order_count - ,sum(ws_ext_ship_cost) as total_shipping_cost - ,sum(ws_net_profit) as total_net_profit -from - web_sales ws1 - ,date_dim - ,customer_address - ,web_site -where - d_date between cast('1999-2-01' as date) and - date_add(cast('1999-2-01' as date), 60 ) -and ws1.ws_ship_date_sk = d_date_sk -and ws1.ws_ship_addr_sk = ca_address_sk -and ca_state = 'IL' -and ws1.ws_web_site_sk = web_site_sk -and web_company_name = 'pri' -and exists (select * - from web_sales ws2 - where ws1.ws_order_number = ws2.ws_order_number - and ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk) -and not exists(select * - from web_returns wr1 - where ws1.ws_order_number = wr1.wr_order_number) -order by count(distinct ws_order_number) - limit 100 +select count(distinct ws_order_number) as order_count + , sum(ws_ext_ship_cost) as total_shipping_cost + , sum(ws_net_profit) as total_net_profit +from web_sales ws1 + , date_dim + , customer_address + , web_site +where d_date between cast('1999-2-01' as date) and + date_add(cast('1999-2-01' as date), 60) + and ws1.ws_ship_date_sk = d_date_sk + and ws1.ws_ship_addr_sk = ca_address_sk + and ca_state = 'IL' + and ws1.ws_web_site_sk = web_site_sk + and web_company_name = 'pri' + and exists(select * + from web_sales ws2 + where ws1.ws_order_number = ws2.ws_order_number + and ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk) + and not exists(select * + from web_returns wr1 + where ws1.ws_order_number = wr1.wr_order_number) +order by count(distinct ws_order_number) limit 100 diff --git a/src/main/resources/tpcds/query95.sql b/src/main/resources/tpcds/query95.sql index db332740d8..0b87914606 100644 --- a/src/main/resources/tpcds/query95.sql +++ b/src/main/resources/tpcds/query95.sql @@ -1,29 +1,27 @@ with ws_wh as -(select ws1.ws_order_number,ws1.ws_warehouse_sk wh1,ws2.ws_warehouse_sk wh2 - from web_sales ws1,web_sales ws2 - where ws1.ws_order_number = ws2.ws_order_number - and ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk) - select - count(distinct ws_order_number) as order_count - ,sum(ws_ext_ship_cost) as total_shipping_cost - ,sum(ws_net_profit) as total_net_profit -from - web_sales ws1 - ,date_dim - ,customer_address - ,web_site -where - d_date between '1999-2-01' and - date_add(cast('1999-2-01' as date), 60 ) -and ws1.ws_ship_date_sk = d_date_sk -and ws1.ws_ship_addr_sk = ca_address_sk -and ca_state = 'IL' -and ws1.ws_web_site_sk = web_site_sk -and web_company_name = 'pri' -and ws1.ws_order_number in (select ws_order_number - from ws_wh) -and ws1.ws_order_number in (select wr_order_number - from web_returns,ws_wh - where wr_order_number = ws_wh.ws_order_number) -order by count(distinct ws_order_number) - limit 100 + (select ws1.ws_order_number, ws1.ws_warehouse_sk wh1, ws2.ws_warehouse_sk wh2 + from web_sales ws1, + web_sales ws2 + where ws1.ws_order_number = ws2.ws_order_number + and ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk) +select count(distinct ws_order_number) as order_count + , sum(ws_ext_ship_cost) as total_shipping_cost + , sum(ws_net_profit) as total_net_profit +from web_sales ws1 + , date_dim + , customer_address + , web_site +where d_date between '1999-2-01' and + date_add(cast('1999-2-01' as date), 60) + and ws1.ws_ship_date_sk = d_date_sk + and ws1.ws_ship_addr_sk = ca_address_sk + and ca_state = 'IL' + and ws1.ws_web_site_sk = web_site_sk + and web_company_name = 'pri' + and ws1.ws_order_number in (select ws_order_number + from ws_wh) + and ws1.ws_order_number in (select wr_order_number + from web_returns, + ws_wh + where wr_order_number = ws_wh.ws_order_number) +order by count(distinct ws_order_number) limit 100 diff --git a/src/main/resources/tpcds/query96.sql b/src/main/resources/tpcds/query96.sql index f5b709f54c..dc795e8a29 100644 --- a/src/main/resources/tpcds/query96.sql +++ b/src/main/resources/tpcds/query96.sql @@ -1,13 +1,13 @@ -select count(*) +select count(*) from store_sales - ,household_demographics - ,time_dim, store -where ss_sold_time_sk = time_dim.t_time_sk - and ss_hdemo_sk = household_demographics.hd_demo_sk - and ss_store_sk = s_store_sk - and time_dim.t_hour = 20 - and time_dim.t_minute >= 30 - and household_demographics.hd_dep_count = 7 - and store.s_store_name = 'ese' -order by count(*) - limit 100 + , household_demographics + , time_dim + , store +where ss_sold_time_sk = time_dim.t_time_sk + and ss_hdemo_sk = household_demographics.hd_demo_sk + and ss_store_sk = s_store_sk + and time_dim.t_hour = 20 + and time_dim.t_minute >= 30 + and household_demographics.hd_dep_count = 7 + and store.s_store_name = 'ese' +order by count(*) limit 100 diff --git a/src/main/resources/tpcds/query97.sql b/src/main/resources/tpcds/query97.sql index 7a006b9ccb..0aa2dad737 100644 --- a/src/main/resources/tpcds/query97.sql +++ b/src/main/resources/tpcds/query97.sql @@ -1,22 +1,22 @@ -with ssci as ( -select ss_customer_sk customer_sk - ,ss_item_sk item_sk -from store_sales,date_dim -where ss_sold_date_sk = d_date_sk - and d_month_seq between 1200 and 1200 + 11 -group by ss_customer_sk - ,ss_item_sk), -csci as( - select cs_bill_customer_sk customer_sk - ,cs_item_sk item_sk -from catalog_sales,date_dim -where cs_sold_date_sk = d_date_sk - and d_month_seq between 1200 and 1200 + 11 -group by cs_bill_customer_sk - ,cs_item_sk) - select sum(case when ssci.customer_sk is not null and csci.customer_sk is null then 1 else 0 end) store_only - ,sum(case when ssci.customer_sk is null and csci.customer_sk is not null then 1 else 0 end) catalog_only - ,sum(case when ssci.customer_sk is not null and csci.customer_sk is not null then 1 else 0 end) store_and_catalog -from ssci full outer join csci on (ssci.customer_sk=csci.customer_sk - and ssci.item_sk = csci.item_sk) - limit 100 +with ssci as (select ss_customer_sk customer_sk + , ss_item_sk item_sk + from store_sales, + date_dim + where ss_sold_date_sk = d_date_sk + and d_month_seq between 1200 and 1200 + 11 + group by ss_customer_sk + , ss_item_sk), + csci as (select cs_bill_customer_sk customer_sk + , cs_item_sk item_sk + from catalog_sales, + date_dim + where cs_sold_date_sk = d_date_sk + and d_month_seq between 1200 and 1200 + 11 + group by cs_bill_customer_sk + , cs_item_sk) +select sum(case when ssci.customer_sk is not null and csci.customer_sk is null then 1 else 0 end) store_only + , sum(case when ssci.customer_sk is null and csci.customer_sk is not null then 1 else 0 end) catalog_only + , sum(case when ssci.customer_sk is not null and csci.customer_sk is not null then 1 else 0 end) store_and_catalog +from ssci + full outer join csci on (ssci.customer_sk = csci.customer_sk + and ssci.item_sk = csci.item_sk) limit 100 diff --git a/src/main/resources/tpcds/query98.sql b/src/main/resources/tpcds/query98.sql index 2321ae8fc1..0d27ca822d 100644 --- a/src/main/resources/tpcds/query98.sql +++ b/src/main/resources/tpcds/query98.sql @@ -1,30 +1,25 @@ select i_item_id - ,i_item_desc - ,i_category - ,i_class - ,i_current_price - ,sum(ss_ext_sales_price) as itemrevenue - ,sum(ss_ext_sales_price)*100/sum(sum(ss_ext_sales_price)) over - (partition by i_class) as revenueratio -from - store_sales - ,item - ,date_dim -where - ss_item_sk = i_item_sk - and i_category in ('Sports', 'Books', 'Home') - and ss_sold_date_sk = d_date_sk - and d_date between cast('1999-02-22' as date) - and date_add(cast('1999-02-22' as date), 30 ) -group by - i_item_id - ,i_item_desc - ,i_category - ,i_class - ,i_current_price -order by - i_category - ,i_class - ,i_item_id - ,i_item_desc - ,revenueratio + , i_item_desc + , i_category + , i_class + , i_current_price + , sum(ss_ext_sales_price) as itemrevenue + , sum(ss_ext_sales_price) * 100 / sum(sum(ss_ext_sales_price)) over (partition by i_class) as revenueratio +from store_sales + , item + , date_dim +where ss_item_sk = i_item_sk + and i_category in ('Sports', 'Books', 'Home') + and ss_sold_date_sk = d_date_sk + and d_date between cast('1999-02-22' as date) + and date_add(cast('1999-02-22' as date), 30) +group by i_item_id + , i_item_desc + , i_category + , i_class + , i_current_price +order by i_category + , i_class + , i_item_id + , i_item_desc + , revenueratio diff --git a/src/main/resources/tpcds/query99.sql b/src/main/resources/tpcds/query99.sql index 61cf1b9524..f1bc751bb9 100644 --- a/src/main/resources/tpcds/query99.sql +++ b/src/main/resources/tpcds/query99.sql @@ -1,32 +1,33 @@ -select - substr(w_warehouse_name,1,20) - ,sm_type - ,cc_name - ,sum(case when (cs_ship_date_sk - cs_sold_date_sk <= 30 ) then 1 else 0 end) as "30_days" - ,sum(case when (cs_ship_date_sk - cs_sold_date_sk > 30) and - (cs_ship_date_sk - cs_sold_date_sk <= 60) then 1 else 0 end ) as "31_60_days" - ,sum(case when (cs_ship_date_sk - cs_sold_date_sk > 60) and - (cs_ship_date_sk - cs_sold_date_sk <= 90) then 1 else 0 end) as "61_90_days" - ,sum(case when (cs_ship_date_sk - cs_sold_date_sk > 90) and - (cs_ship_date_sk - cs_sold_date_sk <= 120) then 1 else 0 end) as "91_120_days" - ,sum(case when (cs_ship_date_sk - cs_sold_date_sk > 120) then 1 else 0 end) as above120_days -from - catalog_sales - ,warehouse - ,ship_mode - ,call_center - ,date_dim -where - d_month_seq between 1200 and 1200 + 11 -and cs_ship_date_sk = d_date_sk -and cs_warehouse_sk = w_warehouse_sk -and cs_ship_mode_sk = sm_ship_mode_sk -and cs_call_center_sk = cc_call_center_sk -group by - substr(w_warehouse_name,1,20) - ,sm_type - ,cc_name -order by substr(w_warehouse_name,1,20) - ,sm_type - ,cc_name - limit 100 +select substr(w_warehouse_name, 1, 20) + , sm_type + , cc_name + , sum(case when (cs_ship_date_sk - cs_sold_date_sk <= 30) then 1 else 0 end) as "30_days" + , sum(case + when (cs_ship_date_sk - cs_sold_date_sk > 30) and + (cs_ship_date_sk - cs_sold_date_sk <= 60) then 1 + else 0 end) as "31_60_days" + , sum(case + when (cs_ship_date_sk - cs_sold_date_sk > 60) and + (cs_ship_date_sk - cs_sold_date_sk <= 90) then 1 + else 0 end) as "61_90_days" + , sum(case + when (cs_ship_date_sk - cs_sold_date_sk > 90) and + (cs_ship_date_sk - cs_sold_date_sk <= 120) then 1 + else 0 end) as "91_120_days" + , sum(case when (cs_ship_date_sk - cs_sold_date_sk > 120) then 1 else 0 end) as above120_days +from catalog_sales + , warehouse + , ship_mode + , call_center + , date_dim +where d_month_seq between 1200 and 1200 + 11 + and cs_ship_date_sk = d_date_sk + and cs_warehouse_sk = w_warehouse_sk + and cs_ship_mode_sk = sm_ship_mode_sk + and cs_call_center_sk = cc_call_center_sk +group by substr(w_warehouse_name, 1, 20) + , sm_type + , cc_name +order by substr(w_warehouse_name, 1, 20) + , sm_type + , cc_name limit 100 diff --git a/src/main/resources/tpch/create_tables.sql b/src/main/resources/tpch/create_tables.sql index d30b1f8e82..451b93e6e7 100644 --- a/src/main/resources/tpch/create_tables.sql +++ b/src/main/resources/tpch/create_tables.sql @@ -1,92 +1,100 @@ -create table nation ( - N_NATIONKEY INT, - N_NAME STRING, - N_REGIONKEY INT, - N_COMMENT STRING, - primary key(N_NATIONKEY) +create table nation +( + N_NATIONKEY INT, + N_NAME STRING, + N_REGIONKEY INT, + N_COMMENT STRING, + primary key (N_NATIONKEY) ); -create table lineitem ( - L_ORDERKEY INT, - L_PARTKEY INT, - L_SUPPKEY INT, - L_LINENUMBER INT, - L_QUANTITY DOUBLE, - L_EXTENDEDPRICE DOUBLE, - L_DISCOUNT DOUBLE, - L_TAX DOUBLE, - L_RETURNFLAG STRING, - L_LINESTATUS STRING, - L_SHIPDATE STRING, - L_COMMITDATE STRING, - L_RECEIPTDATE STRING, - L_SHIPINSTRUCT STRING, - L_SHIPMODE STRING, - L_COMMENT STRING, - primary key(L_ORDERKEY, L_PARTKEY, L_SUPPKEY, L_LINENUMBER) +create table lineitem +( + L_ORDERKEY INT, + L_PARTKEY INT, + L_SUPPKEY INT, + L_LINENUMBER INT, + L_QUANTITY DOUBLE, + L_EXTENDEDPRICE DOUBLE, + L_DISCOUNT DOUBLE, + L_TAX DOUBLE, + L_RETURNFLAG STRING, + L_LINESTATUS STRING, + L_SHIPDATE STRING, + L_COMMITDATE STRING, + L_RECEIPTDATE STRING, + L_SHIPINSTRUCT STRING, + L_SHIPMODE STRING, + L_COMMENT STRING, + primary key (L_ORDERKEY, L_PARTKEY, L_SUPPKEY, L_LINENUMBER) ); -create table orders ( - O_ORDERKEY INT, - O_CUSTKEY INT, - O_ORDERSTATUS STRING, - O_TOTALPRICE DOUBLE, - O_ORDERDATE STRING, - O_ORDERPRIORITY STRING, - O_CLERK STRING, - O_SHIPPRIORITY INT, - O_COMMENT STRING, - primary key(O_ORDERKEY) +create table orders +( + O_ORDERKEY INT, + O_CUSTKEY INT, + O_ORDERSTATUS STRING, + O_TOTALPRICE DOUBLE, + O_ORDERDATE STRING, + O_ORDERPRIORITY STRING, + O_CLERK STRING, + O_SHIPPRIORITY INT, + O_COMMENT STRING, + primary key (O_ORDERKEY) ); -create table supplier( - S_SUPPKEY INT, - S_NAME STRING, - S_ADDRESS STRING, - S_NATIONKEY INT, - S_PHONE STRING, - S_ACCTBAL DOUBLE, - S_COMMENT STRING, - primary key(S_SUPPKEY) +create table supplier +( + S_SUPPKEY INT, + S_NAME STRING, + S_ADDRESS STRING, + S_NATIONKEY INT, + S_PHONE STRING, + S_ACCTBAL DOUBLE, + S_COMMENT STRING, + primary key (S_SUPPKEY) ); -create table partsupp ( - PS_PARTKEY INT, - PS_SUPPKEY INT, - PS_AVAILQTY INT, - PS_SUPPLYCOST DOUBLE, - PS_COMMENT STRING, - primary key(PS_PARTKEY,PS_SUPPKEY) +create table partsupp +( + PS_PARTKEY INT, + PS_SUPPKEY INT, + PS_AVAILQTY INT, + PS_SUPPLYCOST DOUBLE, + PS_COMMENT STRING, + primary key (PS_PARTKEY, PS_SUPPKEY) ); -create table customer ( - C_CUSTKEY INT, - C_NAME STRING, - C_ADDRESS STRING, - C_NATIONKEY INT, - C_PHONE STRING, - C_ACCTBAL DOUBLE, - C_MKTSEGMENT STRING, - C_COMMENT STRING, - primary key(C_CUSTKEY) +create table customer +( + C_CUSTKEY INT, + C_NAME STRING, + C_ADDRESS STRING, + C_NATIONKEY INT, + C_PHONE STRING, + C_ACCTBAL DOUBLE, + C_MKTSEGMENT STRING, + C_COMMENT STRING, + primary key (C_CUSTKEY) ); -create table part ( - P_PARTKEY INT, - P_NAME STRING, - P_MFGR STRING, - P_BRAND STRING, - P_TYPE STRING, - P_SIZE INT, - P_CONTAINER STRING, - P_RETAILPRICE DOUBLE, - P_COMMENT STRING, - primary key(P_PARTKEY) +create table part +( + P_PARTKEY INT, + P_NAME STRING, + P_MFGR STRING, + P_BRAND STRING, + P_TYPE STRING, + P_SIZE INT, + P_CONTAINER STRING, + P_RETAILPRICE DOUBLE, + P_COMMENT STRING, + primary key (P_PARTKEY) ); -create table region ( - R_REGIONKEY INT, - R_NAME STRING, - R_COMMENT STRING, - primary key(R_REGIONKEY) +create table region +( + R_REGIONKEY INT, + R_NAME STRING, + R_COMMENT STRING, + primary key (R_REGIONKEY) ); diff --git a/src/main/resources/tpch/insert_lineitem_200.sql b/src/main/resources/tpch/insert_lineitem_200.sql index d9a1a0871e..b5805ffdc1 100644 --- a/src/main/resources/tpch/insert_lineitem_200.sql +++ b/src/main/resources/tpch/insert_lineitem_200.sql @@ -1 +1,403 @@ -insert into lineitem VALUES (1,15519,785,1,17,24386.67,0.04,0.02,'N','O','1996-03-13','1996-02-12','1996-03-22','DELIVER IN PERSON','TRUCK','egular courts above the'),(1,6731,732,2,36,58958.28,0.09,0.06,'N','O','1996-04-12','1996-02-28','1996-04-20','TAKE BACK RETURN','MAIL','ly final dependencies: slyly bold '),(1,6370,371,3,8,10210.96,0.10,0.02,'N','O','1996-01-29','1996-03-05','1996-01-31','TAKE BACK RETURN','REG AIR','riously. regular, express dep'),(1,214,465,4,28,31197.88,0.09,0.06,'N','O','1996-04-21','1996-03-30','1996-05-16','NONE','AIR','lites. fluffily even de'),(1,2403,160,5,24,31329.60,0.10,0.04,'N','O','1996-03-30','1996-03-14','1996-04-01','NONE','FOB',' pending foxes. slyly re'),(1,1564,67,6,32,46897.92,0.07,0.02,'N','O','1996-01-30','1996-02-07','1996-02-03','DELIVER IN PERSON','MAIL','arefully slyly ex'),(2,10617,138,1,38,58049.18,0.00,0.05,'N','O','1997-01-28','1997-01-14','1997-02-02','TAKE BACK RETURN','RAIL','ven requests. deposits breach a'),(3,430,181,1,45,59869.35,0.06,0.00,'R','F','1994-02-02','1994-01-04','1994-02-23','NONE','AIR','ongside of the furiously brave acco'),(3,1904,658,2,49,88489.10,0.10,0.00,'R','F','1993-11-09','1993-12-20','1993-11-24','TAKE BACK RETURN','RAIL',' unusual accounts. eve'),(3,12845,370,3,27,47461.68,0.06,0.07,'A','F','1994-01-16','1993-11-22','1994-01-23','DELIVER IN PERSON','SHIP','nal foxes wake. '),(3,2938,191,4,2,3681.86,0.01,0.06,'A','F','1993-12-04','1994-01-07','1994-01-01','NONE','TRUCK','y. fluffily pending d'),(3,18310,115,5,28,34392.68,0.04,0.00,'R','F','1993-12-14','1994-01-10','1994-01-01','TAKE BACK RETURN','FOB','ages nag slyly pending'),(3,6215,984,6,26,29151.46,0.10,0.02,'A','F','1993-10-29','1993-12-18','1993-11-04','TAKE BACK RETURN','RAIL','ges sleep after the caref'),(4,8804,579,1,30,51384.00,0.03,0.08,'N','O','1996-01-10','1995-12-14','1996-01-18','DELIVER IN PERSON','REG AIR','- quickly regular packages sleep. idly'),(5,10857,858,1,15,26517.75,0.02,0.04,'R','F','1994-10-31','1994-08-31','1994-11-20','NONE','AIR','ts wake furiously '),(5,12393,394,2,26,33940.14,0.07,0.08,'R','F','1994-10-16','1994-09-25','1994-10-19','NONE','FOB','sts use slyly quickly special instruc'),(5,3754,8,3,50,82887.50,0.08,0.03,'A','F','1994-08-08','1994-10-13','1994-08-26','DELIVER IN PERSON','AIR','eodolites. fluffily unusual'),(6,13964,228,1,37,69484.52,0.08,0.03,'A','F','1992-04-27','1992-05-15','1992-05-02','TAKE BACK RETURN','TRUCK','p furiously special foxes'),(7,18206,11,1,12,13490.40,0.07,0.03,'N','O','1996-05-07','1996-03-13','1996-06-03','TAKE BACK RETURN','FOB','ss pinto beans wake against th'),(7,14525,790,2,9,12955.68,0.08,0.08,'N','O','1996-02-01','1996-03-02','1996-02-19','TAKE BACK RETURN','SHIP','es. instructions'),(7,9478,997,3,46,63823.62,0.10,0.07,'N','O','1996-01-15','1996-03-27','1996-02-03','COLLECT COD','MAIL',' unusual reques'),(7,16308,309,4,28,34280.40,0.03,0.04,'N','O','1996-03-21','1996-04-08','1996-04-20','NONE','FOB','. slyly special requests haggl'),(7,15190,986,5,38,41997.22,0.08,0.01,'N','O','1996-02-11','1996-02-24','1996-02-18','DELIVER IN PERSON','TRUCK','ns haggle carefully ironic deposits. bl'),(7,7926,184,6,35,64187.20,0.06,0.03,'N','O','1996-01-16','1996-02-23','1996-01-22','TAKE BACK RETURN','FOB','jole. excuses wake carefully alongside of '),(7,15724,255,7,5,8198.60,0.04,0.02,'N','O','1996-02-10','1996-03-26','1996-02-13','NONE','FOB','ithely regula'),(32,8271,788,1,28,33019.56,0.05,0.08,'N','O','1995-10-23','1995-08-27','1995-10-26','TAKE BACK RETURN','TRUCK','sleep quickly. req'),(32,19793,63,2,32,54809.28,0.02,0.00,'N','O','1995-08-14','1995-10-07','1995-08-27','COLLECT COD','AIR','lithely regular deposits. fluffily '),(32,4417,672,3,2,2642.82,0.09,0.02,'N','O','1995-08-07','1995-10-07','1995-08-23','DELIVER IN PERSON','AIR',' express accounts wake according to the'),(32,275,776,4,4,4701.08,0.09,0.03,'N','O','1995-08-04','1995-10-01','1995-09-03','NONE','REG AIR','e slyly final pac'),(32,8582,841,5,44,65585.52,0.05,0.06,'N','O','1995-08-28','1995-08-20','1995-09-14','DELIVER IN PERSON','AIR','symptotes nag according to the ironic depo'),(32,1162,414,6,6,6378.96,0.04,0.03,'N','O','1995-07-21','1995-09-23','1995-07-25','COLLECT COD','RAIL',' gifts cajole carefully.'),(33,6134,903,1,31,32244.03,0.09,0.04,'A','F','1993-10-29','1993-12-19','1993-11-08','COLLECT COD','TRUCK','ng to the furiously ironic package'),(33,6052,565,2,32,30657.60,0.02,0.05,'A','F','1993-12-09','1994-01-04','1993-12-28','COLLECT COD','MAIL','gular theodolites'),(33,13747,11,3,5,8303.70,0.05,0.03,'A','F','1993-12-09','1993-12-25','1993-12-23','TAKE BACK RETURN','AIR','. stealthily bold exc'),(33,3392,393,4,41,53110.99,0.09,0.00,'R','F','1993-11-09','1994-01-24','1993-11-11','TAKE BACK RETURN','MAIL','unusual packages doubt caref'),(34,8837,96,1,13,22695.79,0.00,0.07,'N','O','1998-10-23','1998-09-14','1998-11-06','NONE','REG AIR','nic accounts. deposits are alon'),(34,8942,201,2,22,40720.68,0.08,0.06,'N','O','1998-10-09','1998-10-16','1998-10-12','NONE','FOB','thely slyly p'),(34,16955,488,3,6,11231.70,0.02,0.06,'N','O','1998-10-30','1998-09-20','1998-11-05','NONE','FOB','ar foxes sleep '),(35,45,296,1,24,22680.96,0.02,0.00,'N','O','1996-02-21','1996-01-03','1996-03-18','TAKE BACK RETURN','FOB',', regular tithe'),(35,16194,461,2,34,37746.46,0.06,0.08,'N','O','1996-01-22','1996-01-06','1996-01-27','DELIVER IN PERSON','RAIL','s are carefully against the f'),(35,12090,877,3,7,7014.63,0.06,0.04,'N','O','1996-01-19','1995-12-22','1996-01-29','NONE','MAIL',' the carefully regular '),(35,8518,777,4,25,35662.75,0.06,0.05,'N','O','1995-11-26','1995-12-25','1995-12-21','DELIVER IN PERSON','SHIP',' quickly unti'),(35,11992,515,5,34,64735.66,0.08,0.06,'N','O','1995-11-08','1996-01-15','1995-11-26','COLLECT COD','MAIL','. silent, unusual deposits boost'),(35,3077,331,6,28,27441.96,0.03,0.02,'N','O','1996-02-01','1995-12-24','1996-02-28','COLLECT COD','RAIL','ly alongside of '),(36,11977,978,1,42,79336.74,0.09,0.00,'N','O','1996-02-03','1996-01-21','1996-02-23','COLLECT COD','SHIP',' careful courts. special '),(37,2263,516,1,40,46610.40,0.09,0.03,'A','F','1992-07-21','1992-08-01','1992-08-15','NONE','REG AIR','luffily regular requests. slyly final acco'),(37,12679,204,2,39,62075.13,0.05,0.02,'A','F','1992-07-02','1992-08-18','1992-07-28','TAKE BACK RETURN','RAIL','the final requests. ca'),(37,1291,543,3,43,51268.47,0.05,0.08,'A','F','1992-07-10','1992-07-06','1992-08-02','DELIVER IN PERSON','TRUCK','iously ste'),(38,17584,119,1,44,66069.52,0.04,0.02,'N','O','1996-09-29','1996-11-17','1996-09-30','COLLECT COD','MAIL','s. blithely unusual theodolites am'),(39,232,983,1,44,49818.12,0.09,0.06,'N','O','1996-11-14','1996-12-15','1996-12-12','COLLECT COD','RAIL','eodolites. careful'),(39,18659,464,2,26,41018.90,0.08,0.04,'N','O','1996-11-04','1996-10-20','1996-11-20','NONE','FOB','ckages across the slyly silent'),(39,6784,553,3,46,77775.88,0.06,0.08,'N','O','1996-09-26','1996-12-19','1996-10-26','DELIVER IN PERSON','AIR','he carefully e'),(39,2059,312,4,32,30753.60,0.07,0.05,'N','O','1996-10-02','1996-12-19','1996-10-14','COLLECT COD','MAIL','heodolites sleep silently pending foxes. ac'),(39,5452,963,5,43,58370.35,0.01,0.01,'N','O','1996-10-17','1996-11-14','1996-10-26','COLLECT COD','MAIL','yly regular i'),(39,9437,697,6,40,53857.20,0.06,0.05,'N','O','1996-12-08','1996-10-22','1997-01-01','COLLECT COD','AIR','quickly ironic fox'),(64,8596,597,1,21,31596.39,0.05,0.02,'R','F','1994-09-30','1994-09-18','1994-10-26','DELIVER IN PERSON','REG AIR','ch slyly final, thin platelets.'),(65,5970,481,1,26,48775.22,0.03,0.03,'A','F','1995-04-20','1995-04-25','1995-05-13','NONE','TRUCK','pending deposits nag even packages. ca'),(65,7382,897,2,22,28366.36,0.00,0.05,'N','O','1995-07-17','1995-06-04','1995-07-19','COLLECT COD','FOB',' ideas. special, r'),(65,139,390,3,21,21821.73,0.09,0.07,'N','O','1995-07-06','1995-05-14','1995-07-31','DELIVER IN PERSON','RAIL','bove the even packages. accounts nag carefu'),(66,11512,774,1,31,44128.81,0.00,0.08,'R','F','1994-02-19','1994-03-11','1994-02-20','TAKE BACK RETURN','RAIL','ut the unusual accounts sleep at the bo'),(66,17349,350,2,41,51919.94,0.04,0.07,'A','F','1994-02-21','1994-03-01','1994-03-18','COLLECT COD','AIR',' regular de'),(67,2164,921,1,4,4264.64,0.09,0.04,'N','O','1997-04-17','1997-01-31','1997-04-20','NONE','SHIP',' cajole thinly expres'),(67,2020,525,2,12,11064.24,0.09,0.05,'N','O','1997-01-27','1997-02-21','1997-02-22','NONE','REG AIR',' even packages cajole'),(67,17360,628,3,5,6386.80,0.03,0.07,'N','O','1997-02-20','1997-02-12','1997-02-21','DELIVER IN PERSON','TRUCK','y unusual packages thrash pinto '),(67,8752,753,4,44,73073.00,0.08,0.06,'N','O','1997-03-18','1997-01-29','1997-04-13','DELIVER IN PERSON','RAIL','se quickly above the even, express reques'),(67,4062,825,5,23,22219.38,0.05,0.07,'N','O','1997-04-19','1997-02-14','1997-05-06','DELIVER IN PERSON','REG AIR','ly regular deposit'),(67,17831,99,6,29,50716.07,0.02,0.05,'N','O','1997-01-25','1997-01-27','1997-01-27','DELIVER IN PERSON','FOB','ultipliers '),(68,707,958,1,3,4823.10,0.05,0.02,'N','O','1998-07-04','1998-06-05','1998-07-21','NONE','RAIL','fully special instructions cajole. furious'),(68,17518,320,2,46,66033.46,0.02,0.05,'N','O','1998-06-26','1998-06-07','1998-07-05','NONE','MAIL',' requests are unusual, regular pinto '),(68,3498,752,3,46,64468.54,0.04,0.05,'N','O','1998-08-13','1998-07-08','1998-08-29','NONE','RAIL','egular dependencies affix ironically along '),(68,9473,251,4,20,27649.40,0.07,0.01,'N','O','1998-06-27','1998-05-23','1998-07-02','NONE','REG AIR',' excuses integrate fluffily '),(68,8276,535,5,27,31975.29,0.03,0.06,'N','O','1998-06-19','1998-06-25','1998-06-29','DELIVER IN PERSON','SHIP','ccounts. deposits use. furiously'),(68,10257,518,6,30,35017.50,0.05,0.06,'N','O','1998-08-11','1998-07-11','1998-08-14','NONE','RAIL','oxes are slyly blithely fin'),(68,13925,189,7,41,75395.72,0.09,0.08,'N','O','1998-06-24','1998-06-27','1998-07-06','NONE','SHIP','eposits nag special ideas. furiousl'),(69,11521,783,1,48,68760.96,0.01,0.07,'A','F','1994-08-17','1994-08-11','1994-09-08','NONE','TRUCK','regular epitaphs. carefully even ideas hag'),(69,10418,939,2,32,42509.12,0.08,0.06,'A','F','1994-08-24','1994-08-17','1994-08-31','NONE','REG AIR','s sleep carefully bold, '),(69,13727,517,3,17,27892.24,0.09,0.00,'A','F','1994-07-02','1994-07-07','1994-07-03','TAKE BACK RETURN','AIR','final, pending instr'),(69,3751,258,4,3,4964.25,0.09,0.04,'R','F','1994-06-06','1994-07-27','1994-06-15','NONE','MAIL',' blithely final d'),(69,9207,726,5,42,46880.40,0.07,0.04,'R','F','1994-07-31','1994-07-26','1994-08-28','DELIVER IN PERSON','REG AIR','tect regular, speci'),(69,1851,103,6,23,40315.55,0.05,0.00,'A','F','1994-10-03','1994-08-06','1994-10-24','NONE','SHIP','nding accounts ca'),(70,6413,926,1,8,10555.28,0.03,0.08,'R','F','1994-01-12','1994-02-27','1994-01-14','TAKE BACK RETURN','FOB','ggle. carefully pending dependenc'),(70,19616,155,2,13,19962.93,0.06,0.06,'A','F','1994-03-03','1994-02-13','1994-03-26','COLLECT COD','AIR','lyly special packag'),(70,17981,783,3,1,1898.98,0.03,0.05,'R','F','1994-01-26','1994-03-05','1994-01-28','TAKE BACK RETURN','RAIL','quickly. fluffily unusual theodolites c'),(70,4574,83,4,11,16264.27,0.01,0.05,'A','F','1994-03-17','1994-03-17','1994-03-27','NONE','MAIL','alongside of the deposits. fur'),(70,3714,221,5,37,59855.27,0.09,0.04,'R','F','1994-02-13','1994-03-16','1994-02-21','COLLECT COD','MAIL','n accounts are. q'),(70,5566,332,6,19,27959.64,0.06,0.03,'A','F','1994-01-26','1994-02-17','1994-02-06','TAKE BACK RETURN','SHIP',' packages wake pending accounts.'),(71,6194,195,1,25,27504.75,0.09,0.07,'N','O','1998-04-10','1998-04-22','1998-04-11','COLLECT COD','FOB','ckly. slyly'),(71,6592,361,2,3,4495.77,0.09,0.07,'N','O','1998-05-23','1998-04-03','1998-06-02','COLLECT COD','SHIP','y. pinto beans haggle after the'),(71,3444,204,3,45,60634.80,0.00,0.07,'N','O','1998-02-23','1998-03-20','1998-03-24','DELIVER IN PERSON','SHIP',' ironic packages believe blithely a'),(71,9665,925,4,33,51963.78,0.00,0.01,'N','O','1998-04-12','1998-03-20','1998-04-15','NONE','FOB',' serve quickly fluffily bold deposi'),(71,10326,587,5,39,48216.48,0.08,0.06,'N','O','1998-01-29','1998-04-07','1998-02-18','DELIVER IN PERSON','RAIL','l accounts sleep across the pack'),(71,19564,103,6,34,50441.04,0.04,0.01,'N','O','1998-03-05','1998-04-22','1998-03-30','DELIVER IN PERSON','TRUCK','s cajole. '),(96,12308,95,1,23,28066.90,0.10,0.06,'A','F','1994-07-19','1994-06-29','1994-07-25','DELIVER IN PERSON','TRUCK','ep-- carefully reg'),(96,13539,540,2,30,43575.90,0.01,0.06,'R','F','1994-06-03','1994-05-29','1994-06-22','DELIVER IN PERSON','TRUCK','e quickly even ideas. furiou'),(97,11948,210,1,13,24179.22,0.00,0.02,'R','F','1993-04-01','1993-04-04','1993-04-08','NONE','TRUCK','ayers cajole against the furiously'),(97,4957,212,2,37,68892.15,0.02,0.06,'A','F','1993-04-13','1993-03-30','1993-04-14','DELIVER IN PERSON','SHIP','ic requests boost carefully quic'),(97,7770,542,3,19,31877.63,0.06,0.08,'R','F','1993-05-14','1993-03-05','1993-05-25','TAKE BACK RETURN','RAIL','gifts. furiously ironic packages cajole. '),(98,4022,23,1,28,25928.56,0.06,0.07,'A','F','1994-12-24','1994-10-25','1995-01-16','COLLECT COD','REG AIR',' pending, regular accounts s'),(98,10975,756,2,1,1885.97,0.00,0.00,'A','F','1994-12-01','1994-12-12','1994-12-15','DELIVER IN PERSON','TRUCK','. unusual instructions against'),(98,4471,472,3,14,19256.58,0.05,0.02,'A','F','1994-12-30','1994-11-22','1995-01-27','COLLECT COD','AIR',' cajole furiously. blithely ironic ideas '),(98,16718,719,4,10,16347.10,0.03,0.03,'A','F','1994-10-23','1994-11-08','1994-11-09','COLLECT COD','RAIL',' carefully. quickly ironic ideas'),(99,8712,487,1,10,16207.10,0.02,0.01,'A','F','1994-05-18','1994-06-03','1994-05-23','COLLECT COD','RAIL','kages. requ'),(99,12377,378,2,5,6446.85,0.02,0.07,'R','F','1994-05-06','1994-05-28','1994-05-20','TAKE BACK RETURN','RAIL','ests cajole fluffily waters. blithe'),(99,13409,199,3,42,55540.80,0.02,0.02,'A','F','1994-04-19','1994-05-18','1994-04-20','NONE','RAIL','kages are fluffily furiously ir'),(99,10834,95,4,36,62813.88,0.09,0.02,'A','F','1994-07-04','1994-04-17','1994-07-30','DELIVER IN PERSON','AIR','slyly. slyly e'),(100,6203,204,1,28,31057.60,0.04,0.05,'N','O','1998-05-08','1998-05-13','1998-06-07','COLLECT COD','TRUCK','sts haggle. slowl'),(100,11598,860,2,22,33210.98,0.00,0.07,'N','O','1998-06-24','1998-04-12','1998-06-29','DELIVER IN PERSON','SHIP','nto beans alongside of the fi'),(100,4615,870,3,46,69902.06,0.03,0.04,'N','O','1998-05-02','1998-04-10','1998-05-22','TAKE BACK RETURN','SHIP','ular accounts. even'),(100,3803,310,4,14,23895.20,0.06,0.03,'N','O','1998-05-22','1998-05-01','1998-06-03','COLLECT COD','MAIL','y. furiously ironic ideas gr'),(100,5344,110,5,37,46225.58,0.05,0.00,'N','O','1998-03-06','1998-04-16','1998-03-31','TAKE BACK RETURN','TRUCK','nd the quickly s'),(101,11829,613,1,49,85300.18,0.10,0.00,'N','O','1996-06-21','1996-05-27','1996-06-29','DELIVER IN PERSON','REG AIR','ts-- final packages sleep furiousl'),(101,16334,133,2,36,45011.88,0.00,0.01,'N','O','1996-05-19','1996-05-01','1996-06-04','DELIVER IN PERSON','AIR','tes. blithely pending dolphins x-ray f'),(101,13842,632,3,12,21070.08,0.06,0.02,'N','O','1996-03-29','1996-04-20','1996-04-12','COLLECT COD','MAIL','. quickly regular'),(102,8892,409,1,37,66632.93,0.06,0.00,'N','O','1997-07-24','1997-08-02','1997-08-07','TAKE BACK RETURN','SHIP','ully across the ideas. final deposit'),(102,16924,723,2,34,62591.28,0.03,0.08,'N','O','1997-08-09','1997-07-28','1997-08-26','TAKE BACK RETURN','SHIP','eposits cajole across'),(102,18233,502,3,25,28780.75,0.01,0.01,'N','O','1997-07-31','1997-07-24','1997-08-17','NONE','RAIL','bits. ironic accoun'),(102,6116,885,4,15,15331.65,0.07,0.07,'N','O','1997-06-02','1997-07-13','1997-06-04','DELIVER IN PERSON','SHIP','final packages. carefully even excu'),(103,19466,274,1,6,8312.76,0.03,0.05,'N','O','1996-10-11','1996-07-25','1996-10-28','NONE','FOB','cajole. carefully ex'),(103,1043,295,2,37,34929.48,0.02,0.07,'N','O','1996-09-17','1996-07-27','1996-09-20','TAKE BACK RETURN','MAIL','ies. quickly ironic requests use blithely'),(103,2844,845,3,23,40177.32,0.01,0.04,'N','O','1996-09-11','1996-09-18','1996-09-26','NONE','FOB','ironic accou'),(103,2903,408,4,32,57788.80,0.01,0.07,'N','O','1996-07-30','1996-08-06','1996-08-04','NONE','RAIL','kages doze. special, regular deposit'),(128,10683,944,1,38,60559.84,0.06,0.01,'A','F','1992-09-01','1992-08-27','1992-10-01','TAKE BACK RETURN','FOB',' cajole careful'),(129,287,538,1,46,54614.88,0.08,0.02,'R','F','1993-02-15','1993-01-24','1993-03-05','COLLECT COD','TRUCK','uietly bold theodolites. fluffil'),(129,18517,518,2,36,51678.36,0.01,0.02,'A','F','1992-11-25','1992-12-25','1992-12-09','TAKE BACK RETURN','REG AIR','packages are care'),(129,3945,199,3,33,61015.02,0.04,0.06,'A','F','1993-01-08','1993-02-14','1993-01-29','COLLECT COD','SHIP','sts nag bravely. fluffily'),(129,13514,41,4,34,48535.34,0.00,0.01,'R','F','1993-01-29','1993-02-14','1993-02-10','COLLECT COD','MAIL','quests. express ideas'),(129,3138,898,5,24,24987.12,0.06,0.00,'A','F','1992-12-07','1993-01-02','1992-12-11','TAKE BACK RETURN','FOB','uests. foxes cajole slyly after the ca'),(129,7705,477,6,22,35479.40,0.06,0.01,'R','F','1993-02-15','1993-01-31','1993-02-24','COLLECT COD','SHIP','e. fluffily regular '),(129,16857,390,7,1,1773.85,0.05,0.04,'R','F','1993-01-26','1993-01-08','1993-02-24','DELIVER IN PERSON','FOB','e carefully blithely bold dolp'),(130,12882,883,1,14,25128.32,0.08,0.05,'A','F','1992-08-15','1992-07-25','1992-09-13','COLLECT COD','RAIL',' requests. final instruction'),(130,174,425,2,48,51560.16,0.03,0.02,'R','F','1992-07-01','1992-07-12','1992-07-24','NONE','AIR','lithely alongside of the regu'),(130,1186,187,3,18,19569.24,0.04,0.08,'A','F','1992-07-04','1992-06-14','1992-07-29','DELIVER IN PERSON','MAIL',' slyly ironic decoys abou'),(130,11564,348,4,13,19182.28,0.09,0.02,'R','F','1992-06-26','1992-07-29','1992-07-05','NONE','FOB',' pending dolphins sleep furious'),(130,6913,426,5,31,56417.21,0.06,0.05,'R','F','1992-09-01','1992-07-18','1992-09-02','TAKE BACK RETURN','RAIL','thily about the ruth'),(131,16751,18,1,45,75048.75,0.10,0.02,'R','F','1994-09-14','1994-09-02','1994-10-04','NONE','FOB','ironic, bold accounts. careful'),(131,4426,935,2,50,66521.00,0.02,0.04,'A','F','1994-09-17','1994-08-10','1994-09-21','NONE','SHIP','ending requests. final, ironic pearls slee'),(131,18903,172,3,4,7287.60,0.04,0.03,'A','F','1994-09-20','1994-08-30','1994-09-23','COLLECT COD','REG AIR',' are carefully slyly i'),(132,14045,310,1,18,17262.72,0.00,0.08,'R','F','1993-07-10','1993-08-05','1993-07-13','NONE','TRUCK','ges. platelets wake furio'),(132,11906,907,2,43,78169.70,0.01,0.08,'R','F','1993-09-01','1993-08-16','1993-09-22','NONE','TRUCK','y pending theodolites'),(132,11442,443,3,32,43310.08,0.04,0.04,'A','F','1993-07-12','1993-08-05','1993-08-05','COLLECT COD','TRUCK','d instructions hagg'),(132,2809,566,4,23,39371.40,0.10,0.00,'A','F','1993-06-16','1993-08-27','1993-06-23','DELIVER IN PERSON','AIR','refully blithely bold acco'),(133,10344,605,1,27,33867.18,0.00,0.02,'N','O','1997-12-21','1998-02-23','1997-12-27','TAKE BACK RETURN','MAIL','yly even gifts after the sl'),(133,17628,430,2,12,18547.44,0.02,0.06,'N','O','1997-12-02','1998-01-15','1997-12-29','DELIVER IN PERSON','REG AIR','ts cajole fluffily quickly i'),(133,11735,519,3,29,47755.17,0.09,0.08,'N','O','1998-02-28','1998-01-30','1998-03-09','DELIVER IN PERSON','RAIL',' the carefully regular theodoli'),(133,8986,761,4,11,20844.78,0.06,0.01,'N','O','1998-03-21','1998-01-15','1998-04-04','DELIVER IN PERSON','REG AIR','e quickly across the dolphins'),(134,65,66,1,21,20266.26,0.00,0.03,'A','F','1992-07-17','1992-07-08','1992-07-26','COLLECT COD','SHIP','s. quickly regular'),(134,16465,998,2,35,48351.10,0.06,0.07,'A','F','1992-08-23','1992-06-01','1992-08-24','NONE','MAIL','ajole furiously. instructio'),(134,18826,363,3,26,45365.32,0.09,0.06,'A','F','1992-06-20','1992-07-12','1992-07-16','NONE','RAIL',' among the pending depos'),(134,14401,402,4,47,61823.80,0.05,0.00,'A','F','1992-08-16','1992-07-06','1992-08-28','NONE','REG AIR','s! carefully unusual requests boost careful'),(134,3518,519,5,12,17058.12,0.05,0.02,'A','F','1992-07-03','1992-06-01','1992-07-11','COLLECT COD','TRUCK','nts are quic'),(134,13311,575,6,12,14691.72,0.00,0.00,'A','F','1992-08-08','1992-07-07','1992-08-20','TAKE BACK RETURN','FOB','lyly regular pac'),(135,10821,822,1,47,81395.54,0.06,0.08,'N','O','1996-02-18','1996-01-01','1996-02-25','COLLECT COD','RAIL','ctions wake slyly abo'),(135,19835,643,2,21,36851.43,0.00,0.07,'N','O','1996-02-11','1996-01-12','1996-02-13','DELIVER IN PERSON','SHIP',' deposits believe. furiously regular p'),(135,15751,547,3,33,55002.75,0.02,0.00,'N','O','1996-01-03','1995-11-21','1996-02-01','TAKE BACK RETURN','MAIL','ptotes boost slowly care'),(135,6701,958,4,34,54661.80,0.02,0.03,'N','O','1996-01-12','1996-01-19','1996-02-05','NONE','TRUCK','counts doze against the blithely ironi'),(135,13625,152,5,20,30772.40,0.01,0.04,'N','O','1996-01-25','1995-11-20','1996-02-09','NONE','MAIL','theodolites. quickly p'),(135,11500,284,6,13,18349.50,0.04,0.02,'N','O','1995-11-12','1995-12-22','1995-11-17','NONE','FOB','nal ideas. final instr'),(160,1479,982,1,36,49696.92,0.07,0.01,'N','O','1997-03-11','1997-03-11','1997-03-20','COLLECT COD','MAIL','old, ironic deposits are quickly abov'),(160,8639,898,2,22,34047.86,0.00,0.04,'N','O','1997-02-18','1997-03-05','1997-03-05','COLLECT COD','RAIL','ncies about the request'),(160,2008,513,3,34,30940.00,0.01,0.05,'N','O','1997-01-31','1997-03-13','1997-02-14','NONE','FOB','st sleep even gifts. dependencies along'),(161,10281,62,1,19,22634.32,0.01,0.01,'A','F','1994-12-13','1994-11-19','1994-12-26','DELIVER IN PERSON','TRUCK',', regular sheaves sleep along'),(162,18929,466,1,2,3695.84,0.02,0.01,'N','O','1995-09-02','1995-06-17','1995-09-08','COLLECT COD','FOB','es! final somas integrate'),(163,16755,554,1,43,71885.25,0.01,0.00,'N','O','1997-09-19','1997-11-19','1997-10-03','COLLECT COD','REG AIR','al, bold dependencies wake. iron'),(163,12071,72,2,13,12779.91,0.01,0.04,'N','O','1997-11-11','1997-10-18','1997-12-07','DELIVER IN PERSON','TRUCK','inal requests. even pinto beans hag'),(163,3682,936,3,27,42813.36,0.04,0.08,'N','O','1997-12-26','1997-11-28','1998-01-05','COLLECT COD','REG AIR','ously express dependen'),(163,19265,535,4,5,5921.30,0.02,0.00,'N','O','1997-11-17','1997-10-09','1997-12-05','DELIVER IN PERSON','TRUCK',' must belie'),(163,12609,872,5,12,18259.20,0.10,0.00,'N','O','1997-12-18','1997-10-26','1997-12-22','COLLECT COD','TRUCK','ly blithe accounts cajole '),(163,19083,622,6,20,20041.60,0.00,0.07,'N','O','1997-09-27','1997-11-15','1997-10-07','TAKE BACK RETURN','FOB','tructions integrate b'),(164,9131,391,1,26,27043.38,0.09,0.04,'A','F','1993-01-04','1992-11-21','1993-01-07','NONE','RAIL','s. blithely special courts are blithel'),(164,1849,352,2,24,42020.16,0.05,0.05,'R','F','1992-12-22','1992-11-27','1993-01-06','NONE','AIR','side of the slyly unusual theodolites. f'),(164,12551,338,3,38,55614.90,0.03,0.06,'R','F','1992-12-04','1992-11-23','1993-01-02','TAKE BACK RETURN','AIR','counts cajole fluffily regular packages. b'),(164,1753,5,4,32,52952.00,0.05,0.01,'R','F','1992-12-21','1992-12-23','1992-12-28','COLLECT COD','RAIL','ts wake again'),(164,14751,280,5,43,71627.25,0.06,0.01,'R','F','1992-11-26','1993-01-03','1992-12-08','COLLECT COD','RAIL','y carefully regular dep'),(164,10890,891,6,27,48624.03,0.10,0.04,'R','F','1992-12-23','1993-01-16','1993-01-10','DELIVER IN PERSON','AIR','ayers wake carefully a'),(164,304,555,7,23,27698.90,0.09,0.04,'A','F','1992-11-03','1992-12-02','1992-11-12','NONE','REG AIR','ress packages haggle ideas. blithely spec'),(165,3318,825,1,3,3663.93,0.01,0.08,'R','F','1993-03-29','1993-03-06','1993-04-12','DELIVER IN PERSON','REG AIR','riously requests. depos'),(165,16163,962,2,43,46403.88,0.08,0.05,'R','F','1993-02-27','1993-04-19','1993-03-03','DELIVER IN PERSON','TRUCK','jole slyly according '),(165,5852,618,3,15,26367.75,0.00,0.05,'R','F','1993-04-10','1993-03-29','1993-05-01','COLLECT COD','SHIP',' bold packages mainta'),(165,13919,446,4,49,89812.59,0.07,0.06,'A','F','1993-02-20','1993-04-02','1993-03-10','COLLECT COD','REG AIR','uses sleep slyly ruthlessly regular a'),(165,15509,775,5,27,38461.50,0.01,0.04,'R','F','1993-04-27','1993-03-04','1993-05-13','NONE','MAIL','around the ironic, even orb'),(166,6489,2,1,37,51632.76,0.09,0.03,'N','O','1995-11-16','1995-10-17','1995-12-13','NONE','MAIL','lar frays wake blithely a'),(166,16637,638,2,13,20197.19,0.09,0.05,'N','O','1995-11-09','1995-11-18','1995-11-14','COLLECT COD','SHIP','fully above the blithely fina'),(166,9966,226,3,41,76914.36,0.07,0.03,'N','O','1995-11-13','1995-11-07','1995-12-08','COLLECT COD','FOB','hily along the blithely pending fo'),(166,4503,758,4,8,11260.00,0.05,0.02,'N','O','1995-12-30','1995-11-29','1996-01-29','DELIVER IN PERSON','RAIL','e carefully bold '),(167,10118,119,1,28,28787.08,0.06,0.01,'R','F','1993-02-19','1993-02-16','1993-03-03','DELIVER IN PERSON','TRUCK','sly during the u'),(167,17156,424,2,27,28975.05,0.09,0.00,'R','F','1993-05-01','1993-03-31','1993-05-31','TAKE BACK RETURN','FOB','eans affix furiously-- packages'),(192,9702,221,1,23,37069.10,0.00,0.00,'N','O','1998-02-05','1998-02-06','1998-03-07','TAKE BACK RETURN','AIR','ly pending theodolites haggle quickly fluf'),(192,16137,936,2,20,21062.60,0.07,0.01,'N','O','1998-03-13','1998-02-02','1998-03-31','TAKE BACK RETURN','REG AIR','tes. carefu'),(192,11026,549,3,15,14055.30,0.09,0.01,'N','O','1998-01-30','1998-02-10','1998-02-23','TAKE BACK RETURN','TRUCK','he ironic requests haggle about'),(192,19640,448,4,2,3119.28,0.06,0.02,'N','O','1998-03-06','1998-02-03','1998-03-24','COLLECT COD','SHIP','s. dependencies nag furiously alongside'),(192,8292,809,5,25,30007.25,0.02,0.03,'N','O','1998-02-15','1998-01-11','1998-03-17','COLLECT COD','TRUCK','. carefully regular'),(192,14101,366,6,45,45679.50,0.00,0.05,'N','O','1998-03-11','1998-01-09','1998-04-03','NONE','MAIL','equests. ideas sleep idea'),(193,9264,524,1,9,10559.34,0.06,0.06,'A','F','1993-09-17','1993-10-08','1993-09-30','COLLECT COD','TRUCK','against the fluffily regular d'),(193,15396,192,2,15,19670.85,0.02,0.07,'R','F','1993-11-22','1993-10-09','1993-12-05','TAKE BACK RETURN','SHIP','ffily. regular packages d'),(193,9388,648,3,23,29839.74,0.06,0.05,'A','F','1993-08-21','1993-10-11','1993-09-02','DELIVER IN PERSON','TRUCK','ly even accounts wake blithely bold'),(194,260,511,1,17,19724.42,0.05,0.04,'R','F','1992-05-24','1992-05-22','1992-05-30','COLLECT COD','AIR',' regular deposi'),(194,18353,622,2,1,1271.35,0.04,0.06,'R','F','1992-04-30','1992-05-18','1992-05-23','NONE','REG AIR',' regular theodolites. regular, iron'),(194,6600,369,3,13,19585.80,0.08,0.08,'A','F','1992-05-07','1992-06-18','1992-05-10','NONE','AIR','about the blit'),(194,14515,516,4,36,51462.36,0.00,0.05,'R','F','1992-05-21','1992-05-18','1992-05-27','TAKE BACK RETURN','RAIL','pecial packages wake after the slyly r'),(194,5618,129,5,8,12188.88,0.04,0.00,'R','F','1992-07-06','1992-06-25','1992-07-11','COLLECT COD','FOB','uriously unusual excuses'),(194,14899,164,6,16,29022.24,0.06,0.03,'A','F','1992-05-14','1992-06-14','1992-05-21','TAKE BACK RETURN','TRUCK','y regular requests. furious') \ No newline at end of file +insert into lineitem +VALUES (1, 15519, 785, 1, 17, 24386.67, 0.04, 0.02, 'N', 'O', '1996-03-13', '1996-02-12', '1996-03-22', + 'DELIVER IN PERSON', 'TRUCK', 'egular courts above the'), + (1, 6731, 732, 2, 36, 58958.28, 0.09, 0.06, 'N', 'O', '1996-04-12', '1996-02-28', '1996-04-20', + 'TAKE BACK RETURN', 'MAIL', 'ly final dependencies: slyly bold '), + (1, 6370, 371, 3, 8, 10210.96, 0.10, 0.02, 'N', 'O', '1996-01-29', '1996-03-05', '1996-01-31', + 'TAKE BACK RETURN', 'REG AIR', 'riously. regular, express dep'), + (1, 214, 465, 4, 28, 31197.88, 0.09, 0.06, 'N', 'O', '1996-04-21', '1996-03-30', '1996-05-16', 'NONE', 'AIR', + 'lites. fluffily even de'), + (1, 2403, 160, 5, 24, 31329.60, 0.10, 0.04, 'N', 'O', '1996-03-30', '1996-03-14', '1996-04-01', 'NONE', 'FOB', + ' pending foxes. slyly re'), + (1, 1564, 67, 6, 32, 46897.92, 0.07, 0.02, 'N', 'O', '1996-01-30', '1996-02-07', '1996-02-03', + 'DELIVER IN PERSON', 'MAIL', 'arefully slyly ex'), + (2, 10617, 138, 1, 38, 58049.18, 0.00, 0.05, 'N', 'O', '1997-01-28', '1997-01-14', '1997-02-02', + 'TAKE BACK RETURN', 'RAIL', 'ven requests. deposits breach a'), + (3, 430, 181, 1, 45, 59869.35, 0.06, 0.00, 'R', 'F', '1994-02-02', '1994-01-04', '1994-02-23', 'NONE', 'AIR', + 'ongside of the furiously brave acco'), + (3, 1904, 658, 2, 49, 88489.10, 0.10, 0.00, 'R', 'F', '1993-11-09', '1993-12-20', '1993-11-24', + 'TAKE BACK RETURN', 'RAIL', ' unusual accounts. eve'), + (3, 12845, 370, 3, 27, 47461.68, 0.06, 0.07, 'A', 'F', '1994-01-16', '1993-11-22', '1994-01-23', + 'DELIVER IN PERSON', 'SHIP', 'nal foxes wake. '), + (3, 2938, 191, 4, 2, 3681.86, 0.01, 0.06, 'A', 'F', '1993-12-04', '1994-01-07', '1994-01-01', 'NONE', 'TRUCK', + 'y. fluffily pending d'), + (3, 18310, 115, 5, 28, 34392.68, 0.04, 0.00, 'R', 'F', '1993-12-14', '1994-01-10', '1994-01-01', + 'TAKE BACK RETURN', 'FOB', 'ages nag slyly pending'), + (3, 6215, 984, 6, 26, 29151.46, 0.10, 0.02, 'A', 'F', '1993-10-29', '1993-12-18', '1993-11-04', + 'TAKE BACK RETURN', 'RAIL', 'ges sleep after the caref'), + (4, 8804, 579, 1, 30, 51384.00, 0.03, 0.08, 'N', 'O', '1996-01-10', '1995-12-14', '1996-01-18', + 'DELIVER IN PERSON', 'REG AIR', '- quickly regular packages sleep. idly'), + (5, 10857, 858, 1, 15, 26517.75, 0.02, 0.04, 'R', 'F', '1994-10-31', '1994-08-31', '1994-11-20', 'NONE', 'AIR', + 'ts wake furiously '), + (5, 12393, 394, 2, 26, 33940.14, 0.07, 0.08, 'R', 'F', '1994-10-16', '1994-09-25', '1994-10-19', 'NONE', 'FOB', + 'sts use slyly quickly special instruc'), + (5, 3754, 8, 3, 50, 82887.50, 0.08, 0.03, 'A', 'F', '1994-08-08', '1994-10-13', '1994-08-26', + 'DELIVER IN PERSON', 'AIR', 'eodolites. fluffily unusual'), + (6, 13964, 228, 1, 37, 69484.52, 0.08, 0.03, 'A', 'F', '1992-04-27', '1992-05-15', '1992-05-02', + 'TAKE BACK RETURN', 'TRUCK', 'p furiously special foxes'), + (7, 18206, 11, 1, 12, 13490.40, 0.07, 0.03, 'N', 'O', '1996-05-07', '1996-03-13', '1996-06-03', + 'TAKE BACK RETURN', 'FOB', 'ss pinto beans wake against th'), + (7, 14525, 790, 2, 9, 12955.68, 0.08, 0.08, 'N', 'O', '1996-02-01', '1996-03-02', '1996-02-19', + 'TAKE BACK RETURN', 'SHIP', 'es. instructions'), + (7, 9478, 997, 3, 46, 63823.62, 0.10, 0.07, 'N', 'O', '1996-01-15', '1996-03-27', '1996-02-03', 'COLLECT COD', + 'MAIL', ' unusual reques'), + (7, 16308, 309, 4, 28, 34280.40, 0.03, 0.04, 'N', 'O', '1996-03-21', '1996-04-08', '1996-04-20', 'NONE', 'FOB', + '. slyly special requests haggl'), + (7, 15190, 986, 5, 38, 41997.22, 0.08, 0.01, 'N', 'O', '1996-02-11', '1996-02-24', '1996-02-18', + 'DELIVER IN PERSON', 'TRUCK', 'ns haggle carefully ironic deposits. bl'), + (7, 7926, 184, 6, 35, 64187.20, 0.06, 0.03, 'N', 'O', '1996-01-16', '1996-02-23', '1996-01-22', + 'TAKE BACK RETURN', 'FOB', 'jole. excuses wake carefully alongside of '), + (7, 15724, 255, 7, 5, 8198.60, 0.04, 0.02, 'N', 'O', '1996-02-10', '1996-03-26', '1996-02-13', 'NONE', 'FOB', + 'ithely regula'), + (32, 8271, 788, 1, 28, 33019.56, 0.05, 0.08, 'N', 'O', '1995-10-23', '1995-08-27', '1995-10-26', + 'TAKE BACK RETURN', 'TRUCK', 'sleep quickly. req'), + (32, 19793, 63, 2, 32, 54809.28, 0.02, 0.00, 'N', 'O', '1995-08-14', '1995-10-07', '1995-08-27', 'COLLECT COD', + 'AIR', 'lithely regular deposits. fluffily '), + (32, 4417, 672, 3, 2, 2642.82, 0.09, 0.02, 'N', 'O', '1995-08-07', '1995-10-07', '1995-08-23', + 'DELIVER IN PERSON', 'AIR', ' express accounts wake according to the'), + (32, 275, 776, 4, 4, 4701.08, 0.09, 0.03, 'N', 'O', '1995-08-04', '1995-10-01', '1995-09-03', 'NONE', 'REG AIR', + 'e slyly final pac'), + (32, 8582, 841, 5, 44, 65585.52, 0.05, 0.06, 'N', 'O', '1995-08-28', '1995-08-20', '1995-09-14', + 'DELIVER IN PERSON', 'AIR', 'symptotes nag according to the ironic depo'), + (32, 1162, 414, 6, 6, 6378.96, 0.04, 0.03, 'N', 'O', '1995-07-21', '1995-09-23', '1995-07-25', 'COLLECT COD', + 'RAIL', ' gifts cajole carefully.'), + (33, 6134, 903, 1, 31, 32244.03, 0.09, 0.04, 'A', 'F', '1993-10-29', '1993-12-19', '1993-11-08', 'COLLECT COD', + 'TRUCK', 'ng to the furiously ironic package'), + (33, 6052, 565, 2, 32, 30657.60, 0.02, 0.05, 'A', 'F', '1993-12-09', '1994-01-04', '1993-12-28', 'COLLECT COD', + 'MAIL', 'gular theodolites'), + (33, 13747, 11, 3, 5, 8303.70, 0.05, 0.03, 'A', 'F', '1993-12-09', '1993-12-25', '1993-12-23', + 'TAKE BACK RETURN', 'AIR', '. stealthily bold exc'), + (33, 3392, 393, 4, 41, 53110.99, 0.09, 0.00, 'R', 'F', '1993-11-09', '1994-01-24', '1993-11-11', + 'TAKE BACK RETURN', 'MAIL', 'unusual packages doubt caref'), + (34, 8837, 96, 1, 13, 22695.79, 0.00, 0.07, 'N', 'O', '1998-10-23', '1998-09-14', '1998-11-06', 'NONE', + 'REG AIR', 'nic accounts. deposits are alon'), + (34, 8942, 201, 2, 22, 40720.68, 0.08, 0.06, 'N', 'O', '1998-10-09', '1998-10-16', '1998-10-12', 'NONE', 'FOB', + 'thely slyly p'), + (34, 16955, 488, 3, 6, 11231.70, 0.02, 0.06, 'N', 'O', '1998-10-30', '1998-09-20', '1998-11-05', 'NONE', 'FOB', + 'ar foxes sleep '), + (35, 45, 296, 1, 24, 22680.96, 0.02, 0.00, 'N', 'O', '1996-02-21', '1996-01-03', '1996-03-18', + 'TAKE BACK RETURN', 'FOB', ', regular tithe'), + (35, 16194, 461, 2, 34, 37746.46, 0.06, 0.08, 'N', 'O', '1996-01-22', '1996-01-06', '1996-01-27', + 'DELIVER IN PERSON', 'RAIL', 's are carefully against the f'), + (35, 12090, 877, 3, 7, 7014.63, 0.06, 0.04, 'N', 'O', '1996-01-19', '1995-12-22', '1996-01-29', 'NONE', 'MAIL', + ' the carefully regular '), + (35, 8518, 777, 4, 25, 35662.75, 0.06, 0.05, 'N', 'O', '1995-11-26', '1995-12-25', '1995-12-21', + 'DELIVER IN PERSON', 'SHIP', ' quickly unti'), + (35, 11992, 515, 5, 34, 64735.66, 0.08, 0.06, 'N', 'O', '1995-11-08', '1996-01-15', '1995-11-26', 'COLLECT COD', + 'MAIL', '. silent, unusual deposits boost'), + (35, 3077, 331, 6, 28, 27441.96, 0.03, 0.02, 'N', 'O', '1996-02-01', '1995-12-24', '1996-02-28', 'COLLECT COD', + 'RAIL', 'ly alongside of '), + (36, 11977, 978, 1, 42, 79336.74, 0.09, 0.00, 'N', 'O', '1996-02-03', '1996-01-21', '1996-02-23', 'COLLECT COD', + 'SHIP', ' careful courts. special '), + (37, 2263, 516, 1, 40, 46610.40, 0.09, 0.03, 'A', 'F', '1992-07-21', '1992-08-01', '1992-08-15', 'NONE', + 'REG AIR', 'luffily regular requests. slyly final acco'), + (37, 12679, 204, 2, 39, 62075.13, 0.05, 0.02, 'A', 'F', '1992-07-02', '1992-08-18', '1992-07-28', + 'TAKE BACK RETURN', 'RAIL', 'the final requests. ca'), + (37, 1291, 543, 3, 43, 51268.47, 0.05, 0.08, 'A', 'F', '1992-07-10', '1992-07-06', '1992-08-02', + 'DELIVER IN PERSON', 'TRUCK', 'iously ste'), + (38, 17584, 119, 1, 44, 66069.52, 0.04, 0.02, 'N', 'O', '1996-09-29', '1996-11-17', '1996-09-30', 'COLLECT COD', + 'MAIL', 's. blithely unusual theodolites am'), + (39, 232, 983, 1, 44, 49818.12, 0.09, 0.06, 'N', 'O', '1996-11-14', '1996-12-15', '1996-12-12', 'COLLECT COD', + 'RAIL', 'eodolites. careful'), + (39, 18659, 464, 2, 26, 41018.90, 0.08, 0.04, 'N', 'O', '1996-11-04', '1996-10-20', '1996-11-20', 'NONE', 'FOB', + 'ckages across the slyly silent'), + (39, 6784, 553, 3, 46, 77775.88, 0.06, 0.08, 'N', 'O', '1996-09-26', '1996-12-19', '1996-10-26', + 'DELIVER IN PERSON', 'AIR', 'he carefully e'), + (39, 2059, 312, 4, 32, 30753.60, 0.07, 0.05, 'N', 'O', '1996-10-02', '1996-12-19', '1996-10-14', 'COLLECT COD', + 'MAIL', 'heodolites sleep silently pending foxes. ac'), + (39, 5452, 963, 5, 43, 58370.35, 0.01, 0.01, 'N', 'O', '1996-10-17', '1996-11-14', '1996-10-26', 'COLLECT COD', + 'MAIL', 'yly regular i'), + (39, 9437, 697, 6, 40, 53857.20, 0.06, 0.05, 'N', 'O', '1996-12-08', '1996-10-22', '1997-01-01', 'COLLECT COD', + 'AIR', 'quickly ironic fox'), + (64, 8596, 597, 1, 21, 31596.39, 0.05, 0.02, 'R', 'F', '1994-09-30', '1994-09-18', '1994-10-26', + 'DELIVER IN PERSON', 'REG AIR', 'ch slyly final, thin platelets.'), + (65, 5970, 481, 1, 26, 48775.22, 0.03, 0.03, 'A', 'F', '1995-04-20', '1995-04-25', '1995-05-13', 'NONE', 'TRUCK', + 'pending deposits nag even packages. ca'), + (65, 7382, 897, 2, 22, 28366.36, 0.00, 0.05, 'N', 'O', '1995-07-17', '1995-06-04', '1995-07-19', 'COLLECT COD', + 'FOB', ' ideas. special, r'), + (65, 139, 390, 3, 21, 21821.73, 0.09, 0.07, 'N', 'O', '1995-07-06', '1995-05-14', '1995-07-31', + 'DELIVER IN PERSON', 'RAIL', 'bove the even packages. accounts nag carefu'), + (66, 11512, 774, 1, 31, 44128.81, 0.00, 0.08, 'R', 'F', '1994-02-19', '1994-03-11', '1994-02-20', + 'TAKE BACK RETURN', 'RAIL', 'ut the unusual accounts sleep at the bo'), + (66, 17349, 350, 2, 41, 51919.94, 0.04, 0.07, 'A', 'F', '1994-02-21', '1994-03-01', '1994-03-18', 'COLLECT COD', + 'AIR', ' regular de'), + (67, 2164, 921, 1, 4, 4264.64, 0.09, 0.04, 'N', 'O', '1997-04-17', '1997-01-31', '1997-04-20', 'NONE', 'SHIP', + ' cajole thinly expres'), + (67, 2020, 525, 2, 12, 11064.24, 0.09, 0.05, 'N', 'O', '1997-01-27', '1997-02-21', '1997-02-22', 'NONE', + 'REG AIR', ' even packages cajole'), + (67, 17360, 628, 3, 5, 6386.80, 0.03, 0.07, 'N', 'O', '1997-02-20', '1997-02-12', '1997-02-21', + 'DELIVER IN PERSON', 'TRUCK', 'y unusual packages thrash pinto '), + (67, 8752, 753, 4, 44, 73073.00, 0.08, 0.06, 'N', 'O', '1997-03-18', '1997-01-29', '1997-04-13', + 'DELIVER IN PERSON', 'RAIL', 'se quickly above the even, express reques'), + (67, 4062, 825, 5, 23, 22219.38, 0.05, 0.07, 'N', 'O', '1997-04-19', '1997-02-14', '1997-05-06', + 'DELIVER IN PERSON', 'REG AIR', 'ly regular deposit'), + (67, 17831, 99, 6, 29, 50716.07, 0.02, 0.05, 'N', 'O', '1997-01-25', '1997-01-27', '1997-01-27', + 'DELIVER IN PERSON', 'FOB', 'ultipliers '), + (68, 707, 958, 1, 3, 4823.10, 0.05, 0.02, 'N', 'O', '1998-07-04', '1998-06-05', '1998-07-21', 'NONE', 'RAIL', + 'fully special instructions cajole. furious'), + (68, 17518, 320, 2, 46, 66033.46, 0.02, 0.05, 'N', 'O', '1998-06-26', '1998-06-07', '1998-07-05', 'NONE', 'MAIL', + ' requests are unusual, regular pinto '), + (68, 3498, 752, 3, 46, 64468.54, 0.04, 0.05, 'N', 'O', '1998-08-13', '1998-07-08', '1998-08-29', 'NONE', 'RAIL', + 'egular dependencies affix ironically along '), + (68, 9473, 251, 4, 20, 27649.40, 0.07, 0.01, 'N', 'O', '1998-06-27', '1998-05-23', '1998-07-02', 'NONE', + 'REG AIR', ' excuses integrate fluffily '), + (68, 8276, 535, 5, 27, 31975.29, 0.03, 0.06, 'N', 'O', '1998-06-19', '1998-06-25', '1998-06-29', + 'DELIVER IN PERSON', 'SHIP', 'ccounts. deposits use. furiously'), + (68, 10257, 518, 6, 30, 35017.50, 0.05, 0.06, 'N', 'O', '1998-08-11', '1998-07-11', '1998-08-14', 'NONE', 'RAIL', + 'oxes are slyly blithely fin'), + (68, 13925, 189, 7, 41, 75395.72, 0.09, 0.08, 'N', 'O', '1998-06-24', '1998-06-27', '1998-07-06', 'NONE', 'SHIP', + 'eposits nag special ideas. furiousl'), + (69, 11521, 783, 1, 48, 68760.96, 0.01, 0.07, 'A', 'F', '1994-08-17', '1994-08-11', '1994-09-08', 'NONE', + 'TRUCK', 'regular epitaphs. carefully even ideas hag'), + (69, 10418, 939, 2, 32, 42509.12, 0.08, 0.06, 'A', 'F', '1994-08-24', '1994-08-17', '1994-08-31', 'NONE', + 'REG AIR', 's sleep carefully bold, '), + (69, 13727, 517, 3, 17, 27892.24, 0.09, 0.00, 'A', 'F', '1994-07-02', '1994-07-07', '1994-07-03', + 'TAKE BACK RETURN', 'AIR', 'final, pending instr'), + (69, 3751, 258, 4, 3, 4964.25, 0.09, 0.04, 'R', 'F', '1994-06-06', '1994-07-27', '1994-06-15', 'NONE', 'MAIL', + ' blithely final d'), + (69, 9207, 726, 5, 42, 46880.40, 0.07, 0.04, 'R', 'F', '1994-07-31', '1994-07-26', '1994-08-28', + 'DELIVER IN PERSON', 'REG AIR', 'tect regular, speci'), + (69, 1851, 103, 6, 23, 40315.55, 0.05, 0.00, 'A', 'F', '1994-10-03', '1994-08-06', '1994-10-24', 'NONE', 'SHIP', + 'nding accounts ca'), + (70, 6413, 926, 1, 8, 10555.28, 0.03, 0.08, 'R', 'F', '1994-01-12', '1994-02-27', '1994-01-14', + 'TAKE BACK RETURN', 'FOB', 'ggle. carefully pending dependenc'), + (70, 19616, 155, 2, 13, 19962.93, 0.06, 0.06, 'A', 'F', '1994-03-03', '1994-02-13', '1994-03-26', 'COLLECT COD', + 'AIR', 'lyly special packag'), + (70, 17981, 783, 3, 1, 1898.98, 0.03, 0.05, 'R', 'F', '1994-01-26', '1994-03-05', '1994-01-28', + 'TAKE BACK RETURN', 'RAIL', 'quickly. fluffily unusual theodolites c'), + (70, 4574, 83, 4, 11, 16264.27, 0.01, 0.05, 'A', 'F', '1994-03-17', '1994-03-17', '1994-03-27', 'NONE', 'MAIL', + 'alongside of the deposits. fur'), + (70, 3714, 221, 5, 37, 59855.27, 0.09, 0.04, 'R', 'F', '1994-02-13', '1994-03-16', '1994-02-21', 'COLLECT COD', + 'MAIL', 'n accounts are. q'), + (70, 5566, 332, 6, 19, 27959.64, 0.06, 0.03, 'A', 'F', '1994-01-26', '1994-02-17', '1994-02-06', + 'TAKE BACK RETURN', 'SHIP', ' packages wake pending accounts.'), + (71, 6194, 195, 1, 25, 27504.75, 0.09, 0.07, 'N', 'O', '1998-04-10', '1998-04-22', '1998-04-11', 'COLLECT COD', + 'FOB', 'ckly. slyly'), + (71, 6592, 361, 2, 3, 4495.77, 0.09, 0.07, 'N', 'O', '1998-05-23', '1998-04-03', '1998-06-02', 'COLLECT COD', + 'SHIP', 'y. pinto beans haggle after the'), + (71, 3444, 204, 3, 45, 60634.80, 0.00, 0.07, 'N', 'O', '1998-02-23', '1998-03-20', '1998-03-24', + 'DELIVER IN PERSON', 'SHIP', ' ironic packages believe blithely a'), + (71, 9665, 925, 4, 33, 51963.78, 0.00, 0.01, 'N', 'O', '1998-04-12', '1998-03-20', '1998-04-15', 'NONE', 'FOB', + ' serve quickly fluffily bold deposi'), + (71, 10326, 587, 5, 39, 48216.48, 0.08, 0.06, 'N', 'O', '1998-01-29', '1998-04-07', '1998-02-18', + 'DELIVER IN PERSON', 'RAIL', 'l accounts sleep across the pack'), + (71, 19564, 103, 6, 34, 50441.04, 0.04, 0.01, 'N', 'O', '1998-03-05', '1998-04-22', '1998-03-30', + 'DELIVER IN PERSON', 'TRUCK', 's cajole. '), + (96, 12308, 95, 1, 23, 28066.90, 0.10, 0.06, 'A', 'F', '1994-07-19', '1994-06-29', '1994-07-25', + 'DELIVER IN PERSON', 'TRUCK', 'ep-- carefully reg'), + (96, 13539, 540, 2, 30, 43575.90, 0.01, 0.06, 'R', 'F', '1994-06-03', '1994-05-29', '1994-06-22', + 'DELIVER IN PERSON', 'TRUCK', 'e quickly even ideas. furiou'), + (97, 11948, 210, 1, 13, 24179.22, 0.00, 0.02, 'R', 'F', '1993-04-01', '1993-04-04', '1993-04-08', 'NONE', + 'TRUCK', 'ayers cajole against the furiously'), + (97, 4957, 212, 2, 37, 68892.15, 0.02, 0.06, 'A', 'F', '1993-04-13', '1993-03-30', '1993-04-14', + 'DELIVER IN PERSON', 'SHIP', 'ic requests boost carefully quic'), + (97, 7770, 542, 3, 19, 31877.63, 0.06, 0.08, 'R', 'F', '1993-05-14', '1993-03-05', '1993-05-25', + 'TAKE BACK RETURN', 'RAIL', 'gifts. furiously ironic packages cajole. '), + (98, 4022, 23, 1, 28, 25928.56, 0.06, 0.07, 'A', 'F', '1994-12-24', '1994-10-25', '1995-01-16', 'COLLECT COD', + 'REG AIR', ' pending, regular accounts s'), + (98, 10975, 756, 2, 1, 1885.97, 0.00, 0.00, 'A', 'F', '1994-12-01', '1994-12-12', '1994-12-15', + 'DELIVER IN PERSON', 'TRUCK', '. unusual instructions against'), + (98, 4471, 472, 3, 14, 19256.58, 0.05, 0.02, 'A', 'F', '1994-12-30', '1994-11-22', '1995-01-27', 'COLLECT COD', + 'AIR', ' cajole furiously. blithely ironic ideas '), + (98, 16718, 719, 4, 10, 16347.10, 0.03, 0.03, 'A', 'F', '1994-10-23', '1994-11-08', '1994-11-09', 'COLLECT COD', + 'RAIL', ' carefully. quickly ironic ideas'), + (99, 8712, 487, 1, 10, 16207.10, 0.02, 0.01, 'A', 'F', '1994-05-18', '1994-06-03', '1994-05-23', 'COLLECT COD', + 'RAIL', 'kages. requ'), + (99, 12377, 378, 2, 5, 6446.85, 0.02, 0.07, 'R', 'F', '1994-05-06', '1994-05-28', '1994-05-20', + 'TAKE BACK RETURN', 'RAIL', 'ests cajole fluffily waters. blithe'), + (99, 13409, 199, 3, 42, 55540.80, 0.02, 0.02, 'A', 'F', '1994-04-19', '1994-05-18', '1994-04-20', 'NONE', 'RAIL', + 'kages are fluffily furiously ir'), + (99, 10834, 95, 4, 36, 62813.88, 0.09, 0.02, 'A', 'F', '1994-07-04', '1994-04-17', '1994-07-30', + 'DELIVER IN PERSON', 'AIR', 'slyly. slyly e'), + (100, 6203, 204, 1, 28, 31057.60, 0.04, 0.05, 'N', 'O', '1998-05-08', '1998-05-13', '1998-06-07', 'COLLECT COD', + 'TRUCK', 'sts haggle. slowl'), + (100, 11598, 860, 2, 22, 33210.98, 0.00, 0.07, 'N', 'O', '1998-06-24', '1998-04-12', '1998-06-29', + 'DELIVER IN PERSON', 'SHIP', 'nto beans alongside of the fi'), + (100, 4615, 870, 3, 46, 69902.06, 0.03, 0.04, 'N', 'O', '1998-05-02', '1998-04-10', '1998-05-22', + 'TAKE BACK RETURN', 'SHIP', 'ular accounts. even'), + (100, 3803, 310, 4, 14, 23895.20, 0.06, 0.03, 'N', 'O', '1998-05-22', '1998-05-01', '1998-06-03', 'COLLECT COD', + 'MAIL', 'y. furiously ironic ideas gr'), + (100, 5344, 110, 5, 37, 46225.58, 0.05, 0.00, 'N', 'O', '1998-03-06', '1998-04-16', '1998-03-31', + 'TAKE BACK RETURN', 'TRUCK', 'nd the quickly s'), + (101, 11829, 613, 1, 49, 85300.18, 0.10, 0.00, 'N', 'O', '1996-06-21', '1996-05-27', '1996-06-29', + 'DELIVER IN PERSON', 'REG AIR', 'ts-- final packages sleep furiousl'), + (101, 16334, 133, 2, 36, 45011.88, 0.00, 0.01, 'N', 'O', '1996-05-19', '1996-05-01', '1996-06-04', + 'DELIVER IN PERSON', 'AIR', 'tes. blithely pending dolphins x-ray f'), + (101, 13842, 632, 3, 12, 21070.08, 0.06, 0.02, 'N', 'O', '1996-03-29', '1996-04-20', '1996-04-12', 'COLLECT COD', + 'MAIL', '. quickly regular'), + (102, 8892, 409, 1, 37, 66632.93, 0.06, 0.00, 'N', 'O', '1997-07-24', '1997-08-02', '1997-08-07', + 'TAKE BACK RETURN', 'SHIP', 'ully across the ideas. final deposit'), + (102, 16924, 723, 2, 34, 62591.28, 0.03, 0.08, 'N', 'O', '1997-08-09', '1997-07-28', '1997-08-26', + 'TAKE BACK RETURN', 'SHIP', 'eposits cajole across'), + (102, 18233, 502, 3, 25, 28780.75, 0.01, 0.01, 'N', 'O', '1997-07-31', '1997-07-24', '1997-08-17', 'NONE', + 'RAIL', 'bits. ironic accoun'), + (102, 6116, 885, 4, 15, 15331.65, 0.07, 0.07, 'N', 'O', '1997-06-02', '1997-07-13', '1997-06-04', + 'DELIVER IN PERSON', 'SHIP', 'final packages. carefully even excu'), + (103, 19466, 274, 1, 6, 8312.76, 0.03, 0.05, 'N', 'O', '1996-10-11', '1996-07-25', '1996-10-28', 'NONE', 'FOB', + 'cajole. carefully ex'), + (103, 1043, 295, 2, 37, 34929.48, 0.02, 0.07, 'N', 'O', '1996-09-17', '1996-07-27', '1996-09-20', + 'TAKE BACK RETURN', 'MAIL', 'ies. quickly ironic requests use blithely'), + (103, 2844, 845, 3, 23, 40177.32, 0.01, 0.04, 'N', 'O', '1996-09-11', '1996-09-18', '1996-09-26', 'NONE', 'FOB', + 'ironic accou'), + (103, 2903, 408, 4, 32, 57788.80, 0.01, 0.07, 'N', 'O', '1996-07-30', '1996-08-06', '1996-08-04', 'NONE', 'RAIL', + 'kages doze. special, regular deposit'), + (128, 10683, 944, 1, 38, 60559.84, 0.06, 0.01, 'A', 'F', '1992-09-01', '1992-08-27', '1992-10-01', + 'TAKE BACK RETURN', 'FOB', ' cajole careful'), + (129, 287, 538, 1, 46, 54614.88, 0.08, 0.02, 'R', 'F', '1993-02-15', '1993-01-24', '1993-03-05', 'COLLECT COD', + 'TRUCK', 'uietly bold theodolites. fluffil'), + (129, 18517, 518, 2, 36, 51678.36, 0.01, 0.02, 'A', 'F', '1992-11-25', '1992-12-25', '1992-12-09', + 'TAKE BACK RETURN', 'REG AIR', 'packages are care'), + (129, 3945, 199, 3, 33, 61015.02, 0.04, 0.06, 'A', 'F', '1993-01-08', '1993-02-14', '1993-01-29', 'COLLECT COD', + 'SHIP', 'sts nag bravely. fluffily'), + (129, 13514, 41, 4, 34, 48535.34, 0.00, 0.01, 'R', 'F', '1993-01-29', '1993-02-14', '1993-02-10', 'COLLECT COD', + 'MAIL', 'quests. express ideas'), + (129, 3138, 898, 5, 24, 24987.12, 0.06, 0.00, 'A', 'F', '1992-12-07', '1993-01-02', '1992-12-11', + 'TAKE BACK RETURN', 'FOB', 'uests. foxes cajole slyly after the ca'), + (129, 7705, 477, 6, 22, 35479.40, 0.06, 0.01, 'R', 'F', '1993-02-15', '1993-01-31', '1993-02-24', 'COLLECT COD', + 'SHIP', 'e. fluffily regular '), + (129, 16857, 390, 7, 1, 1773.85, 0.05, 0.04, 'R', 'F', '1993-01-26', '1993-01-08', '1993-02-24', + 'DELIVER IN PERSON', 'FOB', 'e carefully blithely bold dolp'), + (130, 12882, 883, 1, 14, 25128.32, 0.08, 0.05, 'A', 'F', '1992-08-15', '1992-07-25', '1992-09-13', 'COLLECT COD', + 'RAIL', ' requests. final instruction'), + (130, 174, 425, 2, 48, 51560.16, 0.03, 0.02, 'R', 'F', '1992-07-01', '1992-07-12', '1992-07-24', 'NONE', 'AIR', + 'lithely alongside of the regu'), + (130, 1186, 187, 3, 18, 19569.24, 0.04, 0.08, 'A', 'F', '1992-07-04', '1992-06-14', '1992-07-29', + 'DELIVER IN PERSON', 'MAIL', ' slyly ironic decoys abou'), + (130, 11564, 348, 4, 13, 19182.28, 0.09, 0.02, 'R', 'F', '1992-06-26', '1992-07-29', '1992-07-05', 'NONE', 'FOB', + ' pending dolphins sleep furious'), + (130, 6913, 426, 5, 31, 56417.21, 0.06, 0.05, 'R', 'F', '1992-09-01', '1992-07-18', '1992-09-02', + 'TAKE BACK RETURN', 'RAIL', 'thily about the ruth'), + (131, 16751, 18, 1, 45, 75048.75, 0.10, 0.02, 'R', 'F', '1994-09-14', '1994-09-02', '1994-10-04', 'NONE', 'FOB', + 'ironic, bold accounts. careful'), + (131, 4426, 935, 2, 50, 66521.00, 0.02, 0.04, 'A', 'F', '1994-09-17', '1994-08-10', '1994-09-21', 'NONE', 'SHIP', + 'ending requests. final, ironic pearls slee'), + (131, 18903, 172, 3, 4, 7287.60, 0.04, 0.03, 'A', 'F', '1994-09-20', '1994-08-30', '1994-09-23', 'COLLECT COD', + 'REG AIR', ' are carefully slyly i'), + (132, 14045, 310, 1, 18, 17262.72, 0.00, 0.08, 'R', 'F', '1993-07-10', '1993-08-05', '1993-07-13', 'NONE', + 'TRUCK', 'ges. platelets wake furio'), + (132, 11906, 907, 2, 43, 78169.70, 0.01, 0.08, 'R', 'F', '1993-09-01', '1993-08-16', '1993-09-22', 'NONE', + 'TRUCK', 'y pending theodolites'), + (132, 11442, 443, 3, 32, 43310.08, 0.04, 0.04, 'A', 'F', '1993-07-12', '1993-08-05', '1993-08-05', 'COLLECT COD', + 'TRUCK', 'd instructions hagg'), + (132, 2809, 566, 4, 23, 39371.40, 0.10, 0.00, 'A', 'F', '1993-06-16', '1993-08-27', '1993-06-23', + 'DELIVER IN PERSON', 'AIR', 'refully blithely bold acco'), + (133, 10344, 605, 1, 27, 33867.18, 0.00, 0.02, 'N', 'O', '1997-12-21', '1998-02-23', '1997-12-27', + 'TAKE BACK RETURN', 'MAIL', 'yly even gifts after the sl'), + (133, 17628, 430, 2, 12, 18547.44, 0.02, 0.06, 'N', 'O', '1997-12-02', '1998-01-15', '1997-12-29', + 'DELIVER IN PERSON', 'REG AIR', 'ts cajole fluffily quickly i'), + (133, 11735, 519, 3, 29, 47755.17, 0.09, 0.08, 'N', 'O', '1998-02-28', '1998-01-30', '1998-03-09', + 'DELIVER IN PERSON', 'RAIL', ' the carefully regular theodoli'), + (133, 8986, 761, 4, 11, 20844.78, 0.06, 0.01, 'N', 'O', '1998-03-21', '1998-01-15', '1998-04-04', + 'DELIVER IN PERSON', 'REG AIR', 'e quickly across the dolphins'), + (134, 65, 66, 1, 21, 20266.26, 0.00, 0.03, 'A', 'F', '1992-07-17', '1992-07-08', '1992-07-26', 'COLLECT COD', + 'SHIP', 's. quickly regular'), + (134, 16465, 998, 2, 35, 48351.10, 0.06, 0.07, 'A', 'F', '1992-08-23', '1992-06-01', '1992-08-24', 'NONE', + 'MAIL', 'ajole furiously. instructio'), + (134, 18826, 363, 3, 26, 45365.32, 0.09, 0.06, 'A', 'F', '1992-06-20', '1992-07-12', '1992-07-16', 'NONE', + 'RAIL', ' among the pending depos'), + (134, 14401, 402, 4, 47, 61823.80, 0.05, 0.00, 'A', 'F', '1992-08-16', '1992-07-06', '1992-08-28', 'NONE', + 'REG AIR', 's! carefully unusual requests boost careful'), + (134, 3518, 519, 5, 12, 17058.12, 0.05, 0.02, 'A', 'F', '1992-07-03', '1992-06-01', '1992-07-11', 'COLLECT COD', + 'TRUCK', 'nts are quic'), + (134, 13311, 575, 6, 12, 14691.72, 0.00, 0.00, 'A', 'F', '1992-08-08', '1992-07-07', '1992-08-20', + 'TAKE BACK RETURN', 'FOB', 'lyly regular pac'), + (135, 10821, 822, 1, 47, 81395.54, 0.06, 0.08, 'N', 'O', '1996-02-18', '1996-01-01', '1996-02-25', 'COLLECT COD', + 'RAIL', 'ctions wake slyly abo'), + (135, 19835, 643, 2, 21, 36851.43, 0.00, 0.07, 'N', 'O', '1996-02-11', '1996-01-12', '1996-02-13', + 'DELIVER IN PERSON', 'SHIP', ' deposits believe. furiously regular p'), + (135, 15751, 547, 3, 33, 55002.75, 0.02, 0.00, 'N', 'O', '1996-01-03', '1995-11-21', '1996-02-01', + 'TAKE BACK RETURN', 'MAIL', 'ptotes boost slowly care'), + (135, 6701, 958, 4, 34, 54661.80, 0.02, 0.03, 'N', 'O', '1996-01-12', '1996-01-19', '1996-02-05', 'NONE', + 'TRUCK', 'counts doze against the blithely ironi'), + (135, 13625, 152, 5, 20, 30772.40, 0.01, 0.04, 'N', 'O', '1996-01-25', '1995-11-20', '1996-02-09', 'NONE', + 'MAIL', 'theodolites. quickly p'), + (135, 11500, 284, 6, 13, 18349.50, 0.04, 0.02, 'N', 'O', '1995-11-12', '1995-12-22', '1995-11-17', 'NONE', 'FOB', + 'nal ideas. final instr'), + (160, 1479, 982, 1, 36, 49696.92, 0.07, 0.01, 'N', 'O', '1997-03-11', '1997-03-11', '1997-03-20', 'COLLECT COD', + 'MAIL', 'old, ironic deposits are quickly abov'), + (160, 8639, 898, 2, 22, 34047.86, 0.00, 0.04, 'N', 'O', '1997-02-18', '1997-03-05', '1997-03-05', 'COLLECT COD', + 'RAIL', 'ncies about the request'), + (160, 2008, 513, 3, 34, 30940.00, 0.01, 0.05, 'N', 'O', '1997-01-31', '1997-03-13', '1997-02-14', 'NONE', 'FOB', + 'st sleep even gifts. dependencies along'), + (161, 10281, 62, 1, 19, 22634.32, 0.01, 0.01, 'A', 'F', '1994-12-13', '1994-11-19', '1994-12-26', + 'DELIVER IN PERSON', 'TRUCK', ', regular sheaves sleep along'), + (162, 18929, 466, 1, 2, 3695.84, 0.02, 0.01, 'N', 'O', '1995-09-02', '1995-06-17', '1995-09-08', 'COLLECT COD', + 'FOB', 'es! final somas integrate'), + (163, 16755, 554, 1, 43, 71885.25, 0.01, 0.00, 'N', 'O', '1997-09-19', '1997-11-19', '1997-10-03', 'COLLECT COD', + 'REG AIR', 'al, bold dependencies wake. iron'), + (163, 12071, 72, 2, 13, 12779.91, 0.01, 0.04, 'N', 'O', '1997-11-11', '1997-10-18', '1997-12-07', + 'DELIVER IN PERSON', 'TRUCK', 'inal requests. even pinto beans hag'), + (163, 3682, 936, 3, 27, 42813.36, 0.04, 0.08, 'N', 'O', '1997-12-26', '1997-11-28', '1998-01-05', 'COLLECT COD', + 'REG AIR', 'ously express dependen'), + (163, 19265, 535, 4, 5, 5921.30, 0.02, 0.00, 'N', 'O', '1997-11-17', '1997-10-09', '1997-12-05', + 'DELIVER IN PERSON', 'TRUCK', ' must belie'), + (163, 12609, 872, 5, 12, 18259.20, 0.10, 0.00, 'N', 'O', '1997-12-18', '1997-10-26', '1997-12-22', 'COLLECT COD', + 'TRUCK', 'ly blithe accounts cajole '), + (163, 19083, 622, 6, 20, 20041.60, 0.00, 0.07, 'N', 'O', '1997-09-27', '1997-11-15', '1997-10-07', + 'TAKE BACK RETURN', 'FOB', 'tructions integrate b'), + (164, 9131, 391, 1, 26, 27043.38, 0.09, 0.04, 'A', 'F', '1993-01-04', '1992-11-21', '1993-01-07', 'NONE', 'RAIL', + 's. blithely special courts are blithel'), + (164, 1849, 352, 2, 24, 42020.16, 0.05, 0.05, 'R', 'F', '1992-12-22', '1992-11-27', '1993-01-06', 'NONE', 'AIR', + 'side of the slyly unusual theodolites. f'), + (164, 12551, 338, 3, 38, 55614.90, 0.03, 0.06, 'R', 'F', '1992-12-04', '1992-11-23', '1993-01-02', + 'TAKE BACK RETURN', 'AIR', 'counts cajole fluffily regular packages. b'), + (164, 1753, 5, 4, 32, 52952.00, 0.05, 0.01, 'R', 'F', '1992-12-21', '1992-12-23', '1992-12-28', 'COLLECT COD', + 'RAIL', 'ts wake again'), + (164, 14751, 280, 5, 43, 71627.25, 0.06, 0.01, 'R', 'F', '1992-11-26', '1993-01-03', '1992-12-08', 'COLLECT COD', + 'RAIL', 'y carefully regular dep'), + (164, 10890, 891, 6, 27, 48624.03, 0.10, 0.04, 'R', 'F', '1992-12-23', '1993-01-16', '1993-01-10', + 'DELIVER IN PERSON', 'AIR', 'ayers wake carefully a'), + (164, 304, 555, 7, 23, 27698.90, 0.09, 0.04, 'A', 'F', '1992-11-03', '1992-12-02', '1992-11-12', 'NONE', + 'REG AIR', 'ress packages haggle ideas. blithely spec'), + (165, 3318, 825, 1, 3, 3663.93, 0.01, 0.08, 'R', 'F', '1993-03-29', '1993-03-06', '1993-04-12', + 'DELIVER IN PERSON', 'REG AIR', 'riously requests. depos'), + (165, 16163, 962, 2, 43, 46403.88, 0.08, 0.05, 'R', 'F', '1993-02-27', '1993-04-19', '1993-03-03', + 'DELIVER IN PERSON', 'TRUCK', 'jole slyly according '), + (165, 5852, 618, 3, 15, 26367.75, 0.00, 0.05, 'R', 'F', '1993-04-10', '1993-03-29', '1993-05-01', 'COLLECT COD', + 'SHIP', ' bold packages mainta'), + (165, 13919, 446, 4, 49, 89812.59, 0.07, 0.06, 'A', 'F', '1993-02-20', '1993-04-02', '1993-03-10', 'COLLECT COD', + 'REG AIR', 'uses sleep slyly ruthlessly regular a'), + (165, 15509, 775, 5, 27, 38461.50, 0.01, 0.04, 'R', 'F', '1993-04-27', '1993-03-04', '1993-05-13', 'NONE', + 'MAIL', 'around the ironic, even orb'), + (166, 6489, 2, 1, 37, 51632.76, 0.09, 0.03, 'N', 'O', '1995-11-16', '1995-10-17', '1995-12-13', 'NONE', 'MAIL', + 'lar frays wake blithely a'), + (166, 16637, 638, 2, 13, 20197.19, 0.09, 0.05, 'N', 'O', '1995-11-09', '1995-11-18', '1995-11-14', 'COLLECT COD', + 'SHIP', 'fully above the blithely fina'), + (166, 9966, 226, 3, 41, 76914.36, 0.07, 0.03, 'N', 'O', '1995-11-13', '1995-11-07', '1995-12-08', 'COLLECT COD', + 'FOB', 'hily along the blithely pending fo'), + (166, 4503, 758, 4, 8, 11260.00, 0.05, 0.02, 'N', 'O', '1995-12-30', '1995-11-29', '1996-01-29', + 'DELIVER IN PERSON', 'RAIL', 'e carefully bold '), + (167, 10118, 119, 1, 28, 28787.08, 0.06, 0.01, 'R', 'F', '1993-02-19', '1993-02-16', '1993-03-03', + 'DELIVER IN PERSON', 'TRUCK', 'sly during the u'), + (167, 17156, 424, 2, 27, 28975.05, 0.09, 0.00, 'R', 'F', '1993-05-01', '1993-03-31', '1993-05-31', + 'TAKE BACK RETURN', 'FOB', 'eans affix furiously-- packages'), + (192, 9702, 221, 1, 23, 37069.10, 0.00, 0.00, 'N', 'O', '1998-02-05', '1998-02-06', '1998-03-07', + 'TAKE BACK RETURN', 'AIR', 'ly pending theodolites haggle quickly fluf'), + (192, 16137, 936, 2, 20, 21062.60, 0.07, 0.01, 'N', 'O', '1998-03-13', '1998-02-02', '1998-03-31', + 'TAKE BACK RETURN', 'REG AIR', 'tes. carefu'), + (192, 11026, 549, 3, 15, 14055.30, 0.09, 0.01, 'N', 'O', '1998-01-30', '1998-02-10', '1998-02-23', + 'TAKE BACK RETURN', 'TRUCK', 'he ironic requests haggle about'), + (192, 19640, 448, 4, 2, 3119.28, 0.06, 0.02, 'N', 'O', '1998-03-06', '1998-02-03', '1998-03-24', 'COLLECT COD', + 'SHIP', 's. dependencies nag furiously alongside'), + (192, 8292, 809, 5, 25, 30007.25, 0.02, 0.03, 'N', 'O', '1998-02-15', '1998-01-11', '1998-03-17', 'COLLECT COD', + 'TRUCK', '. carefully regular'), + (192, 14101, 366, 6, 45, 45679.50, 0.00, 0.05, 'N', 'O', '1998-03-11', '1998-01-09', '1998-04-03', 'NONE', + 'MAIL', 'equests. ideas sleep idea'), + (193, 9264, 524, 1, 9, 10559.34, 0.06, 0.06, 'A', 'F', '1993-09-17', '1993-10-08', '1993-09-30', 'COLLECT COD', + 'TRUCK', 'against the fluffily regular d'), + (193, 15396, 192, 2, 15, 19670.85, 0.02, 0.07, 'R', 'F', '1993-11-22', '1993-10-09', '1993-12-05', + 'TAKE BACK RETURN', 'SHIP', 'ffily. regular packages d'), + (193, 9388, 648, 3, 23, 29839.74, 0.06, 0.05, 'A', 'F', '1993-08-21', '1993-10-11', '1993-09-02', + 'DELIVER IN PERSON', 'TRUCK', 'ly even accounts wake blithely bold'), + (194, 260, 511, 1, 17, 19724.42, 0.05, 0.04, 'R', 'F', '1992-05-24', '1992-05-22', '1992-05-30', 'COLLECT COD', + 'AIR', ' regular deposi'), + (194, 18353, 622, 2, 1, 1271.35, 0.04, 0.06, 'R', 'F', '1992-04-30', '1992-05-18', '1992-05-23', 'NONE', + 'REG AIR', ' regular theodolites. regular, iron'), + (194, 6600, 369, 3, 13, 19585.80, 0.08, 0.08, 'A', 'F', '1992-05-07', '1992-06-18', '1992-05-10', 'NONE', 'AIR', + 'about the blit'), + (194, 14515, 516, 4, 36, 51462.36, 0.00, 0.05, 'R', 'F', '1992-05-21', '1992-05-18', '1992-05-27', + 'TAKE BACK RETURN', 'RAIL', 'pecial packages wake after the slyly r'), + (194, 5618, 129, 5, 8, 12188.88, 0.04, 0.00, 'R', 'F', '1992-07-06', '1992-06-25', '1992-07-11', 'COLLECT COD', + 'FOB', 'uriously unusual excuses'), + (194, 14899, 164, 6, 16, 29022.24, 0.06, 0.03, 'A', 'F', '1992-05-14', '1992-06-14', '1992-05-21', + 'TAKE BACK RETURN', 'TRUCK', 'y regular requests. furious') \ No newline at end of file diff --git a/src/main/resources/tpch/q1.sql b/src/main/resources/tpch/q1.sql index 67424c82af..ec01763867 100644 --- a/src/main/resources/tpch/q1.sql +++ b/src/main/resources/tpch/q1.sql @@ -1,22 +1,17 @@ -- database: presto; groups: tpch; tables: lineitem -SELECT - l_returnflag, - l_linestatus, - sum(l_quantity) AS sum_qty, - sum(l_extendedprice) AS sum_base_price, - sum(l_extendedprice * (1 - l_discount)) AS sum_disc_price, - sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) AS sum_charge, - avg(l_quantity) AS avg_qty, - avg(l_extendedprice) AS avg_price, - avg(l_discount) AS avg_disc, - count(*) AS count_order -FROM - lineitem -WHERE - l_shipdate <= DATE '1998-12-01' - INTERVAL '90' DAY -GROUP BY -l_returnflag, -l_linestatus -ORDER BY -l_returnflag, -l_linestatus +SELECT l_returnflag, + l_linestatus, + sum(l_quantity) AS sum_qty, + sum(l_extendedprice) AS sum_base_price, + sum(l_extendedprice * (1 - l_discount)) AS sum_disc_price, + sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) AS sum_charge, + avg(l_quantity) AS avg_qty, + avg(l_extendedprice) AS avg_price, + avg(l_discount) AS avg_disc, + count(*) AS count_order +FROM lineitem +WHERE l_shipdate <= DATE '1998-12-01' - INTERVAL '90' DAY +GROUP BY l_returnflag, + l_linestatus +ORDER BY l_returnflag, + l_linestatus diff --git a/src/main/resources/tpch/q10.sql b/src/main/resources/tpch/q10.sql index f9579f7a38..9aa9c7b536 100644 --- a/src/main/resources/tpch/q10.sql +++ b/src/main/resources/tpch/q10.sql @@ -1,33 +1,27 @@ -- database: presto; groups: tpch; tables: customer,orders,lineitem,nation -SELECT - c_custkey, - c_name, - sum(l_extendedprice * (1 - l_discount)) AS revenue, - c_acctbal, - n_name, - c_address, - c_phone, - c_comment -FROM - customer, - orders, - lineitem, - nation -WHERE - c_custkey = o_custkey +SELECT c_custkey, + c_name, + sum(l_extendedprice * (1 - l_discount)) AS revenue, + c_acctbal, + n_name, + c_address, + c_phone, + c_comment +FROM customer, + orders, + lineitem, + nation +WHERE c_custkey = o_custkey AND l_orderkey = o_orderkey AND o_orderdate >= DATE '1993-10-01' AND o_orderdate < DATE '1993-10-01' + INTERVAL '3' MONTH AND l_returnflag = 'R' AND c_nationkey = n_nationkey -GROUP BY - c_custkey, - c_name, - c_acctbal, - c_phone, - n_name, - c_address, - c_comment -ORDER BY - revenue DESC -LIMIT 20 +GROUP BY c_custkey, + c_name, + c_acctbal, + c_phone, + n_name, + c_address, + c_comment +ORDER BY revenue DESC LIMIT 20 diff --git a/src/main/resources/tpch/q11.sql b/src/main/resources/tpch/q11.sql index 8bd691e25f..266ed58aae 100644 --- a/src/main/resources/tpch/q11.sql +++ b/src/main/resources/tpch/q11.sql @@ -1,27 +1,27 @@ -SELECT - ps_partkey, - sum(ps_supplycost * ps_availqty) AS value +SELECT ps_partkey, + sum(ps_supplycost * ps_availqty) AS value FROM - partsupp, - supplier, - nation + partsupp, + supplier, + nation WHERE - ps_suppkey = s_suppkey + ps_suppkey = s_suppkey AND s_nationkey = n_nationkey AND n_name = 'GERMANY' GROUP BY - ps_partkey + ps_partkey HAVING - sum(ps_supplycost * ps_availqty) > ( - SELECT sum(ps_supplycost * ps_availqty) * 0.0001 + sum (ps_supplycost * ps_availqty) + > ( + SELECT sum (ps_supplycost * ps_availqty) * 0.0001 FROM - partsupp, - supplier, - nation + partsupp + , supplier + , nation WHERE - ps_suppkey = s_suppkey - AND s_nationkey = n_nationkey - AND n_name = 'GERMANY' - ) + ps_suppkey = s_suppkey + AND s_nationkey = n_nationkey + AND n_name = 'GERMANY' + ) ORDER BY - value DESC + value DESC diff --git a/src/main/resources/tpch/q12.sql b/src/main/resources/tpch/q12.sql index 16f477ff59..81f2da30a8 100644 --- a/src/main/resources/tpch/q12.sql +++ b/src/main/resources/tpch/q12.sql @@ -1,29 +1,24 @@ -- database: presto; groups: tpch; tables: orders,lineitem -SELECT - l_shipmode, - sum(CASE - WHEN o_orderpriority = '1-URGENT' - OR o_orderpriority = '2-HIGH' - THEN 1 - ELSE 0 - END) AS high_line_count, - sum(CASE - WHEN o_orderpriority <> '1-URGENT' - AND o_orderpriority <> '2-HIGH' - THEN 1 - ELSE 0 - END) AS low_line_count -FROM - orders, - lineitem -WHERE - o_orderkey = l_orderkey +SELECT l_shipmode, + sum(CASE + WHEN o_orderpriority = '1-URGENT' + OR o_orderpriority = '2-HIGH' + THEN 1 + ELSE 0 + END) AS high_line_count, + sum(CASE + WHEN o_orderpriority <> '1-URGENT' + AND o_orderpriority <> '2-HIGH' + THEN 1 + ELSE 0 + END) AS low_line_count +FROM orders, + lineitem +WHERE o_orderkey = l_orderkey AND l_shipmode IN ('MAIL', 'SHIP') AND l_commitdate < l_receiptdate AND l_shipdate < l_commitdate AND l_receiptdate >= DATE '1994-01-01' AND l_receiptdate < DATE '1994-01-01' + INTERVAL '1' YEAR -GROUP BY - l_shipmode -ORDER BY - l_shipmode +GROUP BY l_shipmode +ORDER BY l_shipmode diff --git a/src/main/resources/tpch/q13.sql b/src/main/resources/tpch/q13.sql index 84603c8f50..7a80fbb8b1 100644 --- a/src/main/resources/tpch/q13.sql +++ b/src/main/resources/tpch/q13.sql @@ -1,21 +1,13 @@ -- database: presto; groups: tpch; tables: customer -SELECT - c_count, - count(*) AS custdist -FROM ( - SELECT - c_custkey, - count(o_orderkey) - FROM - customer - LEFT OUTER JOIN orders ON - c_custkey = o_custkey - AND o_comment NOT LIKE '%special%requests%' - GROUP BY - c_custkey - ) AS c_orders (c_custkey, c_count) -GROUP BY - c_count -ORDER BY - custdist DESC, - c_count DESC +SELECT c_count, + count(*) AS custdist +FROM (SELECT c_custkey, + count(o_orderkey) + FROM customer + LEFT OUTER JOIN orders ON + c_custkey = o_custkey + AND o_comment NOT LIKE '%special%requests%' + GROUP BY c_custkey) AS c_orders (c_custkey, c_count) +GROUP BY c_count +ORDER BY custdist DESC, + c_count DESC diff --git a/src/main/resources/tpch/q14.sql b/src/main/resources/tpch/q14.sql index 9df5f443a8..1a25dc9415 100644 --- a/src/main/resources/tpch/q14.sql +++ b/src/main/resources/tpch/q14.sql @@ -1,13 +1,11 @@ -- database: presto; groups: tpch; tables: lineitem,part SELECT 100.00 * sum(CASE - WHEN p_type LIKE 'PROMO%' - THEN l_extendedprice * (1 - l_discount) - ELSE 0 - END) / sum(l_extendedprice * (1 - l_discount)) AS promo_revenue -FROM - lineitem, - part -WHERE - l_partkey = p_partkey + WHEN p_type LIKE 'PROMO%' + THEN l_extendedprice * (1 - l_discount) + ELSE 0 + END) / sum(l_extendedprice * (1 - l_discount)) AS promo_revenue +FROM lineitem, + part +WHERE l_partkey = p_partkey AND l_shipdate >= DATE '1995-09-01' AND l_shipdate < DATE '1995-09-01' + INTERVAL '1' MONTH diff --git a/src/main/resources/tpch/q15.sql b/src/main/resources/tpch/q15.sql index 6fd8d4f8e0..aa9cf77ba2 100644 --- a/src/main/resources/tpch/q15.sql +++ b/src/main/resources/tpch/q15.sql @@ -1,15 +1,13 @@ WITH revenue0 AS -( -SELECT l_suppkey AS supplier_no, sum(l_extendedprice * (1 - l_discount)) AS total_revenue -FROM lineitem -WHERE date_parse(l_shipdate, '%Y-%m-%d %H:%i:%s') >= DATE '1993-01-01' -AND date_parse(l_shipdate, '%Y-%m-%d %H:%i:%s') < DATE '1993-01-01' + interval '3' month -GROUP BY l_suppkey -) + (SELECT l_suppkey AS supplier_no, sum(l_extendedprice * (1 - l_discount)) AS total_revenue + FROM lineitem + WHERE date_parse(l_shipdate, '%Y-%m-%d %H:%i:%s') >= DATE '1993-01-01' + AND date_parse(l_shipdate, '%Y-%m-%d %H:%i:%s') < DATE '1993-01-01' + interval '3' month + GROUP BY l_suppkey) SELECT s_suppkey, s_name, s_address, s_phone, total_revenue -FROM supplier_rcfile_string, revenue0 +FROM supplier_rcfile_string, + revenue0 WHERE s_suppkey = supplier_no -AND total_revenue IN ( - SELECT max(total_revenue) - FROM revenue0 ) + AND total_revenue IN (SELECT max(total_revenue) + FROM revenue0) ORDER BY s_suppkey \ No newline at end of file diff --git a/src/main/resources/tpch/q16.sql b/src/main/resources/tpch/q16.sql index b0935dfe2d..177b144639 100644 --- a/src/main/resources/tpch/q16.sql +++ b/src/main/resources/tpch/q16.sql @@ -1,30 +1,21 @@ -- database: presto; groups: tpch; tables: partsupp,part,supplier -SELECT - p_brand, - p_type, - p_size, - count(DISTINCT ps_suppkey) AS supplier_cnt -FROM - partsupp, - part -WHERE - p_partkey = ps_partkey +SELECT p_brand, + p_type, + p_size, + count(DISTINCT ps_suppkey) AS supplier_cnt +FROM partsupp, + part +WHERE p_partkey = ps_partkey AND p_brand <> 'Brand#45' AND p_type NOT LIKE 'MEDIUM POLISHED%' AND p_size IN (49, 14, 23, 45, 19, 3, 36, 9) - AND ps_suppkey NOT IN ( - SELECT s_suppkey - FROM - supplier - WHERE - s_comment LIKE '%Customer%Complaints%' - ) -GROUP BY - p_brand, - p_type, - p_size -ORDER BY - supplier_cnt DESC, - p_brand, - p_type, - p_size + AND ps_suppkey NOT IN (SELECT s_suppkey + FROM supplier + WHERE s_comment LIKE '%Customer%Complaints%') +GROUP BY p_brand, + p_type, + p_size +ORDER BY supplier_cnt DESC, + p_brand, + p_type, + p_size diff --git a/src/main/resources/tpch/q17.sql b/src/main/resources/tpch/q17.sql index 8ed8cd84ac..315d5600cf 100644 --- a/src/main/resources/tpch/q17.sql +++ b/src/main/resources/tpch/q17.sql @@ -1,16 +1,10 @@ -- database: presto; groups: tpch; tables: lineitem,part SELECT sum(l_extendedprice) / 7.0 AS avg_yearly -FROM - lineitem, - part -WHERE - p_partkey = l_partkey +FROM lineitem, + part +WHERE p_partkey = l_partkey AND p_brand = 'Brand#23' AND p_container = 'MED BOX' - AND l_quantity < ( - SELECT 0.2 * avg(l_quantity) - FROM - lineitem - WHERE - l_partkey = p_partkey - ) + AND l_quantity < (SELECT 0.2 * avg(l_quantity) + FROM lineitem + WHERE l_partkey = p_partkey) diff --git a/src/main/resources/tpch/q18.sql b/src/main/resources/tpch/q18.sql index ab1d73a361..86d16636f1 100644 --- a/src/main/resources/tpch/q18.sql +++ b/src/main/resources/tpch/q18.sql @@ -1,34 +1,23 @@ -- database: presto; groups: tpch, big_query; tables: customer,orders,lineitem -SELECT - c_name, - c_custkey, - o_orderkey, - o_orderdate, - o_totalprice, - sum(l_quantity) -FROM - customer, - orders, - lineitem -WHERE - o_orderkey IN ( - SELECT l_orderkey - FROM - lineitem - GROUP BY - l_orderkey - HAVING - sum(l_quantity) > 300 - ) +SELECT c_name, + c_custkey, + o_orderkey, + o_orderdate, + o_totalprice, + sum(l_quantity) +FROM customer, + orders, + lineitem +WHERE o_orderkey IN (SELECT l_orderkey + FROM lineitem + GROUP BY l_orderkey + HAVING sum(l_quantity) > 300) AND c_custkey = o_custkey AND o_orderkey = l_orderkey -GROUP BY - c_name, - c_custkey, - o_orderkey, - o_orderdate, - o_totalprice -ORDER BY - o_totalprice DESC, - o_orderdate -LIMIT 100 +GROUP BY c_name, + c_custkey, + o_orderkey, + o_orderdate, + o_totalprice +ORDER BY o_totalprice DESC, + o_orderdate LIMIT 100 diff --git a/src/main/resources/tpch/q19.sql b/src/main/resources/tpch/q19.sql index d8a15914da..af44a30865 100644 --- a/src/main/resources/tpch/q19.sql +++ b/src/main/resources/tpch/q19.sql @@ -1,35 +1,31 @@ -- database: presto; groups: tpch; tables: lineitem,part SELECT sum(l_extendedprice * (1 - l_discount)) AS revenue -FROM - lineitem, - part -WHERE - ( - p_partkey = l_partkey - AND p_brand = 'Brand#12' - AND p_container IN ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG') - AND l_quantity >= 1 AND l_quantity <= 1 + 10 - AND p_size BETWEEN 1 AND 5 - AND l_shipmode IN ('AIR', 'AIR REG') - AND l_shipinstruct = 'DELIVER IN PERSON' - ) - OR - ( - p_partkey = l_partkey - AND p_brand = 'Brand#23' - AND p_container IN ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK') - AND l_quantity >= 10 AND l_quantity <= 10 + 10 - AND p_size BETWEEN 1 AND 10 - AND l_shipmode IN ('AIR', 'AIR REG') - AND l_shipinstruct = 'DELIVER IN PERSON' - ) - OR - ( - p_partkey = l_partkey - AND p_brand = 'Brand#34' - AND p_container IN ('LG CASE', 'LG BOX', 'LG PACK', 'LG PKG') - AND l_quantity >= 20 AND l_quantity <= 20 + 10 - AND p_size BETWEEN 1 AND 15 - AND l_shipmode IN ('AIR', 'AIR REG') - AND l_shipinstruct = 'DELIVER IN PERSON' - ) +FROM lineitem, + part +WHERE ( + p_partkey = l_partkey + AND p_brand = 'Brand#12' + AND p_container IN ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG') + AND l_quantity >= 1 AND l_quantity <= 1 + 10 + AND p_size BETWEEN 1 AND 5 + AND l_shipmode IN ('AIR', 'AIR REG') + AND l_shipinstruct = 'DELIVER IN PERSON' + ) + OR ( + p_partkey = l_partkey + AND p_brand = 'Brand#23' + AND p_container IN ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK') + AND l_quantity >= 10 AND l_quantity <= 10 + 10 + AND p_size BETWEEN 1 AND 10 + AND l_shipmode IN ('AIR', 'AIR REG') + AND l_shipinstruct = 'DELIVER IN PERSON' + ) + OR ( + p_partkey = l_partkey + AND p_brand = 'Brand#34' + AND p_container IN ('LG CASE', 'LG BOX', 'LG PACK', 'LG PKG') + AND l_quantity >= 20 AND l_quantity <= 20 + 10 + AND p_size BETWEEN 1 AND 15 + AND l_shipmode IN ('AIR', 'AIR REG') + AND l_shipinstruct = 'DELIVER IN PERSON' + ) diff --git a/src/main/resources/tpch/q2.sql b/src/main/resources/tpch/q2.sql index c87f09d937..23b33f4864 100644 --- a/src/main/resources/tpch/q2.sql +++ b/src/main/resources/tpch/q2.sql @@ -1,42 +1,35 @@ -- database: presto; groups: tpch; tables: part,supplier,partsupp,nation,region -SELECT - s_acctbal, - s_name, - n_name, - p_partkey, - p_mfgr, - s_address, - s_phone, - s_comment -FROM - part, - supplier, - partsupp, - nation, - region -WHERE - p_partkey = ps_partkey +SELECT s_acctbal, + s_name, + n_name, + p_partkey, + p_mfgr, + s_address, + s_phone, + s_comment +FROM part, + supplier, + partsupp, + nation, + region +WHERE p_partkey = ps_partkey AND s_suppkey = ps_suppkey AND p_size = 15 AND p_type LIKE '%BRASS' AND s_nationkey = n_nationkey AND n_regionkey = r_regionkey AND r_name = 'EUROPE' - AND ps_supplycost = ( - SELECT min(ps_supplycost) - FROM - partsupp, supplier, - nation, region - WHERE - p_partkey = ps_partkey - AND s_suppkey = ps_suppkey - AND s_nationkey = n_nationkey - AND n_regionkey = r_regionkey - AND r_name = 'EUROPE' - ) -ORDER BY - s_acctbal DESC, - n_name, - s_name, - p_partkey -LIMIT 100 + AND ps_supplycost = (SELECT min(ps_supplycost) + FROM partsupp, + supplier, + nation, + region + WHERE p_partkey = ps_partkey + AND s_suppkey = ps_suppkey + AND s_nationkey = n_nationkey + AND n_regionkey = r_regionkey + AND r_name = 'EUROPE') +ORDER BY s_acctbal DESC, + n_name, + s_name, + p_partkey LIMIT 100 diff --git a/src/main/resources/tpch/q20.sql b/src/main/resources/tpch/q20.sql index 255da61965..f572ea3e22 100644 --- a/src/main/resources/tpch/q20.sql +++ b/src/main/resources/tpch/q20.sql @@ -1,33 +1,23 @@ -- database: presto; groups: tpch; tables: supplier,nation,partsupp,lineitem,part -SELECT - s_name, - s_address -FROM - supplier, nation -WHERE - s_suppkey IN ( - SELECT ps_suppkey - FROM - partsupp - WHERE - ps_partkey IN ( - SELECT p_partkey - FROM - part - WHERE - p_name LIKE 'forest%' - ) - AND ps_availqty > ( - SELECT 0.5 * sum(l_quantity) - FROM - lineitem - WHERE - l_partkey = ps_partkey - AND l_suppkey = ps_suppkey - AND l_shipdate >= date('1994-01-01') - AND l_shipdate < date('1994-01-01') + interval '1' YEAR -) -) -AND s_nationkey = n_nationkey -AND n_name = 'CANADA' +SELECT s_name, + s_address +FROM supplier, + nation +WHERE s_suppkey IN (SELECT ps_suppkey + FROM partsupp + WHERE ps_partkey IN (SELECT p_partkey + FROM part + WHERE p_name LIKE 'forest%') + AND ps_availqty > (SELECT 0.5 * sum(l_quantity) + FROM lineitem + WHERE l_partkey = ps_partkey + AND l_suppkey = ps_suppkey + AND l_shipdate >= + date ('1994-01-01') + AND l_shipdate + < date ('1994-01-01') + interval '1' YEAR + ) + ) + AND s_nationkey = n_nationkey + AND n_name = 'CANADA' ORDER BY s_name diff --git a/src/main/resources/tpch/q21.sql b/src/main/resources/tpch/q21.sql index 484303d875..1e784ff8d5 100644 --- a/src/main/resources/tpch/q21.sql +++ b/src/main/resources/tpch/q21.sql @@ -1,39 +1,29 @@ -- database: presto; groups: tpch,big_query; tables: supplier,lineitem,orders,nation -SELECT - s_name, - count(*) AS numwait -FROM - supplier, - lineitem l1, - orders, - nation -WHERE - s_suppkey = l1.l_suppkey +SELECT s_name, + count(*) AS numwait +FROM supplier, + lineitem l1, + orders, + nation +WHERE s_suppkey = l1.l_suppkey AND o_orderkey = l1.l_orderkey AND o_orderstatus = 'F' AND l1.l_receiptdate > l1.l_commitdate AND exists( - SELECT * - FROM - lineitem l2 - WHERE - l2.l_orderkey = l1.l_orderkey - AND l2.l_suppkey <> l1.l_suppkey - ) + SELECT * + FROM lineitem l2 + WHERE l2.l_orderkey = l1.l_orderkey + AND l2.l_suppkey <> l1.l_suppkey + ) AND NOT exists( - SELECT * - FROM - lineitem l3 - WHERE - l3.l_orderkey = l1.l_orderkey - AND l3.l_suppkey <> l1.l_suppkey - AND l3.l_receiptdate > l3.l_commitdate - ) + SELECT * + FROM lineitem l3 + WHERE l3.l_orderkey = l1.l_orderkey + AND l3.l_suppkey <> l1.l_suppkey + AND l3.l_receiptdate > l3.l_commitdate + ) AND s_nationkey = n_nationkey AND n_name = 'SAUDI ARABIA' -GROUP BY - s_name -ORDER BY - numwait DESC, - s_name -LIMIT 100 +GROUP BY s_name +ORDER BY numwait DESC, + s_name LIMIT 100 diff --git a/src/main/resources/tpch/q22.sql b/src/main/resources/tpch/q22.sql index fd86397d13..d2300af1a6 100644 --- a/src/main/resources/tpch/q22.sql +++ b/src/main/resources/tpch/q22.sql @@ -1,35 +1,21 @@ -- database: presto; groups: tpch; tables: orders,customer -SELECT - cntrycode, - count(*) AS numcust, - sum(c_acctbal) AS totacctbal -FROM ( - SELECT - substr(c_phone, 1, 2) AS cntrycode, - c_acctbal - FROM - customer - WHERE - substr(c_phone, 1, 2) IN - ('13', '31', '23', '29', '30', '18', '17') - AND c_acctbal > ( - SELECT avg(c_acctbal) - FROM - customer - WHERE - c_acctbal > 0.00 - AND substr(c_phone, 1, 2) IN - ('13', '31', '23', '29', '30', '18', '17') - ) - AND NOT exists( - SELECT * - FROM - orders - WHERE - o_custkey = c_custkey - ) - ) AS custsale -GROUP BY - cntrycode -ORDER BY - cntrycode +SELECT cntrycode, + count(*) AS numcust, + sum(c_acctbal) AS totacctbal +FROM (SELECT substr(c_phone, 1, 2) AS cntrycode, + c_acctbal + FROM customer + WHERE substr(c_phone, 1, 2) IN + ('13', '31', '23', '29', '30', '18', '17') + AND c_acctbal > (SELECT avg(c_acctbal) + FROM customer + WHERE c_acctbal > 0.00 + AND substr(c_phone, 1, 2) IN + ('13', '31', '23', '29', '30', '18', '17')) + AND NOT exists( + SELECT * + FROM orders + WHERE o_custkey = c_custkey + )) AS custsale +GROUP BY cntrycode +ORDER BY cntrycode diff --git a/src/main/resources/tpch/q3.sql b/src/main/resources/tpch/q3.sql index 53756183ae..bde1727453 100644 --- a/src/main/resources/tpch/q3.sql +++ b/src/main/resources/tpch/q3.sql @@ -1,24 +1,18 @@ -- database: presto; groups: tpch; tables: customer,orders,lineitem -SELECT - l_orderkey, - sum(l_extendedprice * (1 - l_discount)) AS revenue, - o_orderdate, - o_shippriority -FROM - customer, - orders, - lineitem -WHERE - c_mktsegment = 'BUILDING' +SELECT l_orderkey, + sum(l_extendedprice * (1 - l_discount)) AS revenue, + o_orderdate, + o_shippriority +FROM customer, + orders, + lineitem +WHERE c_mktsegment = 'BUILDING' AND c_custkey = o_custkey AND l_orderkey = o_orderkey AND o_orderdate < DATE '1995-03-15' AND l_shipdate > DATE '1995-03-15' -GROUP BY - l_orderkey, - o_orderdate, - o_shippriority -ORDER BY - revenue DESC, - o_orderdate -LIMIT 10 +GROUP BY l_orderkey, + o_orderdate, + o_shippriority +ORDER BY revenue DESC, + o_orderdate LIMIT 10 diff --git a/src/main/resources/tpch/q4.sql b/src/main/resources/tpch/q4.sql index 7fb40265f3..a84252764a 100644 --- a/src/main/resources/tpch/q4.sql +++ b/src/main/resources/tpch/q4.sql @@ -1,19 +1,14 @@ -- database: presto; groups: tpch; tables: orders,lineitem -SELECT - o_orderpriority, - count(*) AS order_count +SELECT o_orderpriority, + count(*) AS order_count FROM orders -WHERE - o_orderdate >= DATE '1993-07-01' +WHERE o_orderdate >= DATE '1993-07-01' AND o_orderdate < DATE '1993-07-01' + INTERVAL '3' MONTH -AND EXISTS ( -SELECT * -FROM lineitem -WHERE -l_orderkey = o_orderkey -AND l_commitdate < l_receiptdate -) -GROUP BY -o_orderpriority -ORDER BY -o_orderpriority + AND EXISTS( + SELECT * + FROM lineitem + WHERE l_orderkey = o_orderkey + AND l_commitdate < l_receiptdate + ) +GROUP BY o_orderpriority +ORDER BY o_orderpriority diff --git a/src/main/resources/tpch/q5.sql b/src/main/resources/tpch/q5.sql index 58ec7efacc..7ea655d20f 100644 --- a/src/main/resources/tpch/q5.sql +++ b/src/main/resources/tpch/q5.sql @@ -1,16 +1,13 @@ -- database: presto; groups: big_query, tpch; tables: customer,orders,lineitem,supplier,nation,region -SELECT - n_name, - sum(l_extendedprice * (1 - l_discount)) AS revenue -FROM - customer, - orders, - lineitem, - supplier, - nation, - region -WHERE - c_custkey = o_custkey +SELECT n_name, + sum(l_extendedprice * (1 - l_discount)) AS revenue +FROM customer, + orders, + lineitem, + supplier, + nation, + region +WHERE c_custkey = o_custkey AND l_orderkey = o_orderkey AND l_suppkey = s_suppkey AND c_nationkey = s_nationkey @@ -19,7 +16,5 @@ WHERE AND r_name = 'ASIA' AND o_orderdate >= DATE '1994-01-01' AND o_orderdate < DATE '1994-01-01' + INTERVAL '1' YEAR -GROUP BY -n_name -ORDER BY -revenue DESC +GROUP BY n_name +ORDER BY revenue DESC diff --git a/src/main/resources/tpch/q6.sql b/src/main/resources/tpch/q6.sql index d58319e4d2..6bb71b5f54 100644 --- a/src/main/resources/tpch/q6.sql +++ b/src/main/resources/tpch/q6.sql @@ -1,9 +1,9 @@ -- database: presto; groups: tpch; tables: lineitem SELECT sum(l_extendedprice * l_discount) AS revenue -FROM - lineitem -WHERE - l_shipdate >= DATE '1994-01-01' +FROM lineitem +WHERE l_shipdate >= DATE '1994-01-01' AND l_shipdate < DATE '1994-01-01' + INTERVAL '1' YEAR -AND l_discount BETWEEN decimal '0.06' - decimal '0.01' AND decimal '0.06' + decimal '0.01' -AND l_quantity < 24 + AND l_discount BETWEEN decimal '0.06' - decimal '0.01' + AND decimal '0.06' + decimal '0.01' + AND l_quantity + < 24 diff --git a/src/main/resources/tpch/q7.sql b/src/main/resources/tpch/q7.sql index 153465c7fa..5793cefc58 100644 --- a/src/main/resources/tpch/q7.sql +++ b/src/main/resources/tpch/q7.sql @@ -1,39 +1,31 @@ -- database: presto; groups: tpch; tables: supplier,lineitem,orders,customer,nation -SELECT - supp_nation, - cust_nation, - l_year, - sum(volume) AS revenue -FROM ( - SELECT - n1.n_name AS supp_nation, - n2.n_name AS cust_nation, - extract(YEAR FROM l_shipdate) AS l_year, - l_extendedprice * (1 - l_discount) AS volume - FROM - supplier, - lineitem, - orders, - customer, - nation n1, - nation n2 - WHERE - s_suppkey = l_suppkey - AND o_orderkey = l_orderkey - AND c_custkey = o_custkey - AND s_nationkey = n1.n_nationkey - AND c_nationkey = n2.n_nationkey - AND ( - (n1.n_name = 'FRANCE' AND n2.n_name = 'GERMANY') - OR (n1.n_name = 'GERMANY' AND n2.n_name = 'FRANCE') - ) - AND l_shipdate BETWEEN DATE '1995-01-01' AND DATE '1996-12-31' - ) AS shipping -GROUP BY - supp_nation, - cust_nation, - l_year -ORDER BY - supp_nation, - cust_nation, - l_year +SELECT supp_nation, + cust_nation, + l_year, + sum(volume) AS revenue +FROM (SELECT n1.n_name AS supp_nation, + n2.n_name AS cust_nation, + extract(YEAR FROM l_shipdate) AS l_year, + l_extendedprice * (1 - l_discount) AS volume + FROM supplier, + lineitem, + orders, + customer, + nation n1, + nation n2 + WHERE s_suppkey = l_suppkey + AND o_orderkey = l_orderkey + AND c_custkey = o_custkey + AND s_nationkey = n1.n_nationkey + AND c_nationkey = n2.n_nationkey + AND ( + (n1.n_name = 'FRANCE' AND n2.n_name = 'GERMANY') + OR (n1.n_name = 'GERMANY' AND n2.n_name = 'FRANCE') + ) + AND l_shipdate BETWEEN DATE '1995-01-01' AND DATE '1996-12-31') AS shipping +GROUP BY supp_nation, + cust_nation, + l_year +ORDER BY supp_nation, + cust_nation, + l_year diff --git a/src/main/resources/tpch/q8.sql b/src/main/resources/tpch/q8.sql index a43b1cd3a3..834554e5da 100644 --- a/src/main/resources/tpch/q8.sql +++ b/src/main/resources/tpch/q8.sql @@ -1,38 +1,30 @@ -- database: presto; groups: tpch, big_query; tables: part,supplier,lineitem,orders,customer,nation -SELECT - o_year, - sum(CASE - WHEN nation = 'BRAZIL' - THEN volume - ELSE 0 - END) / sum(volume) AS mkt_share -FROM ( - SELECT - extract(YEAR FROM o_orderdate) AS o_year, - l_extendedprice * (1 - l_discount) AS volume, - n2.n_name AS nation - FROM - part, - supplier, - lineitem, - orders, - customer, - nation n1, - nation n2, - region - WHERE - p_partkey = l_partkey - AND s_suppkey = l_suppkey - AND l_orderkey = o_orderkey - AND o_custkey = c_custkey - AND c_nationkey = n1.n_nationkey - AND n1.n_regionkey = r_regionkey - AND r_name = 'AMERICA' - AND s_nationkey = n2.n_nationkey - AND o_orderdate BETWEEN DATE '1995-01-01' AND DATE '1996-12-31' - AND p_type = 'ECONOMY ANODIZED STEEL' - ) AS all_nations -GROUP BY - o_year -ORDER BY - o_year +SELECT o_year, + sum(CASE + WHEN nation = 'BRAZIL' + THEN volume + ELSE 0 + END) / sum(volume) AS mkt_share +FROM (SELECT extract(YEAR FROM o_orderdate) AS o_year, + l_extendedprice * (1 - l_discount) AS volume, + n2.n_name AS nation + FROM part, + supplier, + lineitem, + orders, + customer, + nation n1, + nation n2, + region + WHERE p_partkey = l_partkey + AND s_suppkey = l_suppkey + AND l_orderkey = o_orderkey + AND o_custkey = c_custkey + AND c_nationkey = n1.n_nationkey + AND n1.n_regionkey = r_regionkey + AND r_name = 'AMERICA' + AND s_nationkey = n2.n_nationkey + AND o_orderdate BETWEEN DATE '1995-01-01' AND DATE '1996-12-31' + AND p_type = 'ECONOMY ANODIZED STEEL') AS all_nations +GROUP BY o_year +ORDER BY o_year diff --git a/src/main/resources/tpch/q9.sql b/src/main/resources/tpch/q9.sql index 9b99ca3b79..93f0363e23 100644 --- a/src/main/resources/tpch/q9.sql +++ b/src/main/resources/tpch/q9.sql @@ -1,32 +1,24 @@ -- database: presto; groups: tpch, big_query; tables: part,supplier,lineitem,partsupp,orders,nation -SELECT - nation, - o_year, - sum(amount) AS sum_profit -FROM ( - SELECT - n_name AS nation, - extract(YEAR FROM o_orderdate) AS o_year, - l_extendedprice * (1 - l_discount) - ps_supplycost * l_quantity AS amount - FROM - part, - supplier, - lineitem, - partsupp, - orders, - nation - WHERE - s_suppkey = l_suppkey - AND ps_suppkey = l_suppkey - AND ps_partkey = l_partkey - AND p_partkey = l_partkey - AND o_orderkey = l_orderkey - AND s_nationkey = n_nationkey - AND p_name LIKE '%green%' - ) AS profit -GROUP BY - nation, - o_year -ORDER BY - nation, - o_year DESC +SELECT nation, + o_year, + sum(amount) AS sum_profit +FROM (SELECT n_name AS nation, + extract(YEAR FROM o_orderdate) AS o_year, + l_extendedprice * (1 - l_discount) - ps_supplycost * l_quantity AS amount + FROM part, + supplier, + lineitem, + partsupp, + orders, + nation + WHERE s_suppkey = l_suppkey + AND ps_suppkey = l_suppkey + AND ps_partkey = l_partkey + AND p_partkey = l_partkey + AND o_orderkey = l_orderkey + AND s_nationkey = n_nationkey + AND p_name LIKE '%green%') AS profit +GROUP BY nation, + o_year +ORDER BY nation, + o_year DESC diff --git a/src/test/java/com/alibaba/druid/DBCPTest.java b/src/test/java/com/alibaba/druid/DBCPTest.java index 749e9333d1..81f3b6c026 100644 --- a/src/test/java/com/alibaba/druid/DBCPTest.java +++ b/src/test/java/com/alibaba/druid/DBCPTest.java @@ -25,10 +25,9 @@ import com.alibaba.druid.mock.MockDriver; public class DBCPTest extends TestCase { - public void test_max() throws Exception { Class.forName("com.alibaba.druid.mock.MockDriver"); - + final BasicDataSource dataSource = new BasicDataSource(); // final DruidDataSource dataSource = new DruidDataSource(); dataSource.setInitialSize(3); @@ -43,7 +42,6 @@ public void test_max() throws Exception { Thread[] threads = new Thread[THREAD_COUNT]; for (int i = 0; i < THREAD_COUNT; ++i) { threads[i] = new Thread() { - public void run() { try { startLatch.await(); @@ -60,11 +58,11 @@ public void run() { }; threads[i].start(); } - + startLatch.countDown(); - + endLatch.await(); - + // System.out.println(dataSource.getNumIdle()); System.out.println(MockDriver.instance.getConnections().size()); System.out.println(MockDriver.instance.getConnectionCloseCount()); diff --git a/src/test/java/com/alibaba/druid/DragoonMetaInfTest.java b/src/test/java/com/alibaba/druid/DragoonMetaInfTest.java index 3cca704eff..1e237829a0 100644 --- a/src/test/java/com/alibaba/druid/DragoonMetaInfTest.java +++ b/src/test/java/com/alibaba/druid/DragoonMetaInfTest.java @@ -26,7 +26,6 @@ import junit.framework.TestCase; public class DragoonMetaInfTest extends TestCase { - public void test_0() throws Exception { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); Enumeration e = classLoader.getResources("META-INF/dragoon-filter.properties"); diff --git a/src/test/java/com/alibaba/druid/LockTest.java b/src/test/java/com/alibaba/druid/LockTest.java index 937b88e955..3ab8bcb795 100644 --- a/src/test/java/com/alibaba/druid/LockTest.java +++ b/src/test/java/com/alibaba/druid/LockTest.java @@ -21,7 +21,6 @@ import junit.framework.TestCase; public class LockTest extends TestCase { - public void test_0() throws Exception { Lock lock = new ReentrantLock(); diff --git a/src/test/java/com/alibaba/druid/TestForZY.java b/src/test/java/com/alibaba/druid/TestForZY.java index 39eb087e3d..6e8f31d68a 100644 --- a/src/test/java/com/alibaba/druid/TestForZY.java +++ b/src/test/java/com/alibaba/druid/TestForZY.java @@ -23,7 +23,7 @@ public class TestForZY { public void foo() throws Exception { Map> m = new HashMap>(); } - + public static class A { private T value; } diff --git a/src/test/java/com/alibaba/druid/TestHibernateCRUDWithTransactional.java b/src/test/java/com/alibaba/druid/TestHibernateCRUDWithTransactional.java index 4fa9d9206a..c75265cd10 100644 --- a/src/test/java/com/alibaba/druid/TestHibernateCRUDWithTransactional.java +++ b/src/test/java/com/alibaba/druid/TestHibernateCRUDWithTransactional.java @@ -8,5 +8,4 @@ */ public class TestHibernateCRUDWithTransactional extends TestCase { - } diff --git a/src/test/java/com/alibaba/druid/TestHistogram.java b/src/test/java/com/alibaba/druid/TestHistogram.java index 9c3af394fa..b8bcd1df0f 100644 --- a/src/test/java/com/alibaba/druid/TestHistogram.java +++ b/src/test/java/com/alibaba/druid/TestHistogram.java @@ -18,7 +18,6 @@ import junit.framework.TestCase; public class TestHistogram extends TestCase { - public void test_histogram() throws Exception { int val = 4; for (int i = 0; i < 10; ++i) { diff --git a/src/test/java/com/alibaba/druid/TestIdel3.java b/src/test/java/com/alibaba/druid/TestIdel3.java index 4d3e3c66fe..45beb5cdcf 100644 --- a/src/test/java/com/alibaba/druid/TestIdel3.java +++ b/src/test/java/com/alibaba/druid/TestIdel3.java @@ -28,7 +28,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class TestIdel3 extends TestCase { - public void test_idle2() throws Exception { MockDriver driver = new MockDriver(); @@ -47,7 +46,7 @@ public void test_idle2() throws Exception { dataSource.setFilters("stat"); ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, - new ObjectName("com.alibaba:type=DataSource")); + new ObjectName("com.alibaba:type=DataSource")); // 第一次创建连接 { @@ -118,14 +117,12 @@ public void test_idle2() throws Exception { } private void concurrent(final DruidDataSource dataSource, int threadCount, final int loopCount) - throws InterruptedException { - + throws InterruptedException { final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(threadCount); Thread[] threads = new Thread[threadCount]; for (int i = 0; i < threadCount; ++i) { threads[i] = new Thread("thread-" + i) { - public void run() { try { startLatch.await(); diff --git a/src/test/java/com/alibaba/druid/TestLRU.java b/src/test/java/com/alibaba/druid/TestLRU.java index 28b96b0ba9..c19df80e6f 100644 --- a/src/test/java/com/alibaba/druid/TestLRU.java +++ b/src/test/java/com/alibaba/druid/TestLRU.java @@ -20,7 +20,6 @@ import junit.framework.TestCase; public class TestLRU extends TestCase { - public void test_lru() throws Exception { LinkedHashMap cache = new LinkedHashMap(100, 0.75f, true); diff --git a/src/test/java/com/alibaba/druid/TestLockCount.java b/src/test/java/com/alibaba/druid/TestLockCount.java index f54d89be6c..f5a8a2cbda 100644 --- a/src/test/java/com/alibaba/druid/TestLockCount.java +++ b/src/test/java/com/alibaba/druid/TestLockCount.java @@ -23,7 +23,6 @@ import junit.framework.TestCase; public class TestLockCount extends TestCase { - public void test_current() throws Exception { DataSource dataSource = new DataSource(); @@ -57,14 +56,12 @@ public void test_current() throws Exception { } private void concurrent(final DataSource dataSource, int threadCount, final int loopCount) - throws InterruptedException { - + throws InterruptedException { final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(threadCount); Thread[] threads = new Thread[threadCount]; for (int i = 0; i < threadCount; ++i) { threads[i] = new Thread("thread-" + i) { - public void run() { try { startLatch.await(); @@ -90,27 +87,26 @@ public void run() { } private static class DataSource { - - private long c0; - private long c1; - private long c2; - private long c3; - private long c4; - private long c5; - private long c6; - private long c7; - private long c8; - private long c9; - private long c10; - private long c11; - private long c12; - private long c13; - private long c14; - private long c15; - private long c16; - private long c17; - private long c18; - private long c19; + private long c0; + private long c1; + private long c2; + private long c3; + private long c4; + private long c5; + private long c6; + private long c7; + private long c8; + private long c9; + private long c10; + private long c11; + private long c12; + private long c13; + private long c14; + private long c15; + private long c16; + private long c17; + private long c18; + private long c19; private final Lock lock = new ReentrantLock(); public long getCount() { diff --git a/src/test/java/com/alibaba/druid/TestOracle.java b/src/test/java/com/alibaba/druid/TestOracle.java index 1b4b8cdaf5..f245af33cd 100644 --- a/src/test/java/com/alibaba/druid/TestOracle.java +++ b/src/test/java/com/alibaba/druid/TestOracle.java @@ -25,7 +25,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class TestOracle extends TestCase { - private String jdbcUrl; private String user; private String password; diff --git a/src/test/java/com/alibaba/druid/TestOraclePing.java b/src/test/java/com/alibaba/druid/TestOraclePing.java index 8b7466b154..2a7fdc8aa7 100644 --- a/src/test/java/com/alibaba/druid/TestOraclePing.java +++ b/src/test/java/com/alibaba/druid/TestOraclePing.java @@ -24,7 +24,6 @@ import oracle.jdbc.OracleConnection; public class TestOraclePing extends TestCase { - private String jdbcUrl; private String user; private String password; diff --git a/src/test/java/com/alibaba/druid/TestReplaceLicense.java b/src/test/java/com/alibaba/druid/TestReplaceLicense.java index 675d9c0681..6026eb38b6 100644 --- a/src/test/java/com/alibaba/druid/TestReplaceLicense.java +++ b/src/test/java/com/alibaba/druid/TestReplaceLicense.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.Utils; public class TestReplaceLicense extends TestCase { - private String license; private String lineSeparator; @@ -41,7 +40,7 @@ protected void setUp() throws Exception { System.out.println(license); lineSeparator = "\n"; // (String) java.security.AccessController.doPrivileged(new - // sun.security.action.GetPropertyAction("line.separator")); + // sun.security.action.GetPropertyAction("line.separator")); } public void test_0() throws Exception { @@ -81,7 +80,6 @@ public void listJavaFile(File file) throws Exception { writer.write(newContent); writer.close(); } else { - } } } diff --git a/src/test/java/com/alibaba/druid/TestRollBack.java b/src/test/java/com/alibaba/druid/TestRollBack.java index 129dbd6605..bc4406a8a5 100644 --- a/src/test/java/com/alibaba/druid/TestRollBack.java +++ b/src/test/java/com/alibaba/druid/TestRollBack.java @@ -34,93 +34,92 @@ * limitations under the License. */ public class TestRollBack { - static ComboPooledDataSource c3p0; - static DruidDataSource druid; - static Dao dao_c3p0; - static Dao dao_druid; - + static ComboPooledDataSource c3p0; + static DruidDataSource druid; + static Dao dao_c3p0; + static Dao dao_druid; + // static String url = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // static String user = "alibaba"; // static String password = "ccbuauto"; // static String driver = "oracle.jdbc.driver.OracleDriver"; - - static String url = "jdbc:jtds:sqlserver://a.b.c.d:1433/druid_db"; - static String user = "sa"; - static String password = "hello123"; - static String driver = "net.sourceforge.jtds.jdbc.Driver"; - + + static String url = "jdbc:jtds:sqlserver://a.b.c.d:1433/druid_db"; + static String user = "sa"; + static String password = "hello123"; + static String driver = "net.sourceforge.jtds.jdbc.Driver"; + // jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // user = "alibaba"; // password = "ccbuauto"; - @BeforeClass - public static void init() throws PropertyVetoException, SQLException { - c3p0 = new ComboPooledDataSource(); - //c3p0.setDriverClass("oracle.jdbc.driver.OracleDriver"); - c3p0.setDriverClass(driver); - c3p0.setJdbcUrl(url); - c3p0.setUser(user); - c3p0.setPassword(password); + @BeforeClass + public static void init() throws PropertyVetoException, SQLException { + c3p0 = new ComboPooledDataSource(); + //c3p0.setDriverClass("oracle.jdbc.driver.OracleDriver"); + c3p0.setDriverClass(driver); + c3p0.setJdbcUrl(url); + c3p0.setUser(user); + c3p0.setPassword(password); - druid = new DruidDataSource(); - druid.setUrl(url); - druid.setUsername(user); - druid.setPassword(password); - druid.setFilters("stat,trace,encoding"); - druid.setDefaultAutoCommit(false); + druid = new DruidDataSource(); + druid.setUrl(url); + druid.setUsername(user); + druid.setPassword(password); + druid.setFilters("stat,trace,encoding"); + druid.setDefaultAutoCommit(false); - dao_c3p0 = new NutDao(c3p0); - dao_druid = new NutDao(druid); - if (!dao_c3p0.exists("msg")) { - dao_c3p0.execute(Sqls.create("create table msg(message varchar(5))")); // 字段长度5 - } - } + dao_c3p0 = new NutDao(c3p0); + dao_druid = new NutDao(druid); + if (!dao_c3p0.exists("msg")) { + dao_c3p0.execute(Sqls.create("create table msg(message varchar(5))")); // 字段长度5 + } + } - @AfterClass - public static void destroy() { - c3p0.close(); - druid.close(); - } + @AfterClass + public static void destroy() { + c3p0.close(); + druid.close(); + } - @Before - public void before() { - // 清空所有数据 - dao_c3p0.clear("msg"); - } + @Before + public void before() { + // 清空所有数据 + dao_c3p0.clear("msg"); + } - @Test - public void test_c3p0() { - try { - // 将两条插入语句包裹在一个事务内执行,第一条可以正常插入,第二条超过字段长度,会抛异常,事务会回滚 - Trans.exec(new Atom() { - @Override - public void run() { - dao_c3p0.insert("msg", Chain.make("message", "abc")); - dao_c3p0.insert("msg", Chain.make("message", "1234567")); - } - }); - } catch (Exception e) { - - } - // abc也跟着回滚了 - Assert.assertNull(dao_c3p0.fetch("msg", Cnd.where("message", "=", "abc"))); - } + @Test + public void test_c3p0() { + try { + // 将两条插入语句包裹在一个事务内执行,第一条可以正常插入,第二条超过字段长度,会抛异常,事务会回滚 + Trans.exec(new Atom() { + @Override + public void run() { + dao_c3p0.insert("msg", Chain.make("message", "abc")); + dao_c3p0.insert("msg", Chain.make("message", "1234567")); + } + }); + } catch (Exception e) { + } + // abc也跟着回滚了 + Assert.assertNull(dao_c3p0.fetch("msg", Cnd.where("message", "=", "abc"))); + } - @Test - public void test_druid() { - try { - Trans.exec(new Atom() { - @Override - public void run() { - dao_druid.insert("msg", Chain.make("message", "abc")); - dao_druid.insert("msg", Chain.make("message", "1234567")); - } - }); - } catch (Exception e) { - // e.printStackTrace(); // 把这里的异常打印出来 - } - // abc插了进去,没有回滚 - Assert.assertNotNull(dao_druid.fetch("msg", Cnd.where("message", "=", "abc"))); - } + @Test + public void test_druid() { + try { + Trans.exec(new Atom() { + @Override + public void run() { + dao_druid.insert("msg", Chain.make("message", "abc")); + dao_druid.insert("msg", Chain.make("message", "1234567")); + } + }); + } catch (Exception e) { + // e.printStackTrace(); // 把这里的异常打印出来 + } + // abc插了进去,没有回滚 + Assert.assertNotNull(dao_druid.fetch("msg", Cnd.where("message", "=", "abc"))); + } } diff --git a/src/test/java/com/alibaba/druid/TestSqlServer.java b/src/test/java/com/alibaba/druid/TestSqlServer.java index 96e997792e..8d0c49db18 100644 --- a/src/test/java/com/alibaba/druid/TestSqlServer.java +++ b/src/test/java/com/alibaba/druid/TestSqlServer.java @@ -41,9 +41,10 @@ protected void setUp() throws Exception { driverClass = "net.sourceforge.jtds.jdbc.Driver"; } - public void test_0 () throws Exception { + + public void test_0() throws Exception { Class.forName(driverClass); - + Connection conn = DriverManager.getConnection(jdbcUrl, user, password); conn.close(); } diff --git a/src/test/java/com/alibaba/druid/TestTraceFilter.java b/src/test/java/com/alibaba/druid/TestTraceFilter.java index e00c98bf80..098a245cb1 100644 --- a/src/test/java/com/alibaba/druid/TestTraceFilter.java +++ b/src/test/java/com/alibaba/druid/TestTraceFilter.java @@ -27,7 +27,6 @@ @SuppressWarnings("deprecation") public class TestTraceFilter extends TestCase { - public void test_loop() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setFilters("stat,trace"); diff --git a/src/test/java/com/alibaba/druid/TestUtil.java b/src/test/java/com/alibaba/druid/TestUtil.java index f98e157660..587429def4 100644 --- a/src/test/java/com/alibaba/druid/TestUtil.java +++ b/src/test/java/com/alibaba/druid/TestUtil.java @@ -21,7 +21,6 @@ import javax.management.ObjectName; public class TestUtil { - public static long getYoungGC() { try { MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); diff --git a/src/test/java/com/alibaba/druid/benckmark/TPCDS.java b/src/test/java/com/alibaba/druid/benckmark/TPCDS.java index 00c1e8d8a7..54ea7961c8 100644 --- a/src/test/java/com/alibaba/druid/benckmark/TPCDS.java +++ b/src/test/java/com/alibaba/druid/benckmark/TPCDS.java @@ -15,7 +15,7 @@ public class TPCDS { String path = "tpcds/query" + num + ".sql"; InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(path); String sql = Utils.read(is); - QUERIES[i-1] = sql; + QUERIES[i - 1] = sql; JdbcUtils.close(is); } { diff --git a/src/test/java/com/alibaba/druid/benckmark/TPCH.java b/src/test/java/com/alibaba/druid/benckmark/TPCH.java index f9b5c7ab0e..93ac4b4f58 100644 --- a/src/test/java/com/alibaba/druid/benckmark/TPCH.java +++ b/src/test/java/com/alibaba/druid/benckmark/TPCH.java @@ -15,7 +15,7 @@ public class TPCH { String path = "tpch/q" + i + ".sql"; InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(path); String sql = Utils.read(is); - QUERIES[i-1] = sql; + QUERIES[i - 1] = sql; JdbcUtils.close(is); } { diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/AsyncClose.java b/src/test/java/com/alibaba/druid/benckmark/pool/AsyncClose.java index 90c0b07f92..d566401657 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/AsyncClose.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/AsyncClose.java @@ -14,9 +14,9 @@ public static void main(String[] args) throws Exception { DataSource ds = createDruid(); System.out.println("init done"); - for (int i = 0; i < 10; ++i) { - perf(ds); - } + for (int i = 0; i < 10; ++i) { + perf(ds); + } System.out.println("query done"); } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java index 618b560655..8ab2ca49a6 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java @@ -32,27 +32,26 @@ import com.mchange.v2.c3p0.ComboPooledDataSource; public class Case0 extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int initialSize = 1; - private int minIdle = 3; - private int maxIdle = 8; - private int maxActive = 8; - private String validationQuery = "SELECT 1"; - private boolean testOnBorrow = false; - - private long minEvictableIdleTimeMillis = 3000; - public final int LOOP_COUNT = 5; - public final int COUNT = 1000 * 1000 * 1; + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int initialSize = 1; + private int minIdle = 3; + private int maxIdle = 8; + private int maxActive = 8; + private String validationQuery = "SELECT 1"; + private boolean testOnBorrow = false; + + private long minEvictableIdleTimeMillis = 3000; + public final int LOOP_COUNT = 5; + public final int COUNT = 1000 * 1000 * 1; protected void setUp() throws Exception { - jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; - user = "dragoon25"; - password = "dragoon25"; - driverClass = "com.alibaba.druid.mock.MockDriver"; + jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; + user = "dragoon25"; + password = "dragoon25"; + driverClass = "com.alibaba.druid.mock.MockDriver"; // jdbcUrl = "jdbc:mysql://a.b.c.d:3306/masterdb"; // user = "x"; @@ -126,7 +125,7 @@ public void f_test_2() throws Exception { } System.out.println(); } - + public void f_test_c3p0() throws Exception { ComboPooledDataSource dataSource = new ComboPooledDataSource(); // dataSource.(10); @@ -153,14 +152,14 @@ public void f_test_tomcat_jdbc() throws Exception { // dataSource.setMaxActive(50); dataSource.setMinIdle(minIdle); dataSource.setMaxActive(maxIdle); - + dataSource.setDriverClassName(driverClass); dataSource.setUrl(jdbcUrl); // dataSource.setPoolPreparedStatements(true); // dataSource.setMaxOpenPreparedStatements(100); dataSource.setUsername(user); dataSource.setPassword(password); - + for (int i = 0; i < LOOP_COUNT; ++i) { p0(dataSource, "tomcat-jdbc"); } @@ -185,6 +184,6 @@ private void p0(DataSource dataSource, String name) throws SQLException { long fullGC = TestUtil.getFullGC() - startFullGC; System.out.println(name + " millis : " + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " - + fullGC); + + fullGC); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java index 8d7eba3c06..cd19054483 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java @@ -39,28 +39,26 @@ /** * TestOnBo 类Case1.java的实现描述：TODO 类实现描述 - * + * * @author admin 2011-5-28 下午03:47:40 */ public class Case1 extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int initialSize = 10; - private int minPoolSize = 10; - private int maxPoolSize = 50; - private int maxActive = 50; - private String validationQuery = "SELECT 1"; - private int threadCount = 5; - private int loopCount = 10; - final int LOOP_COUNT = 1000 * 1 * 1 / threadCount; + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int initialSize = 10; + private int minPoolSize = 10; + private int maxPoolSize = 50; + private int maxActive = 50; + private String validationQuery = "SELECT 1"; + private int threadCount = 5; + private int loopCount = 10; + final int LOOP_COUNT = 1000 * 1 * 1 / threadCount; private static AtomicLong physicalConnStat = new AtomicLong(); public static class TestDriver extends MockDriver { - public static TestDriver instance = new TestDriver(); public boolean acceptsURL(String url) throws SQLException { @@ -201,7 +199,6 @@ public void test_tomcat_jdbc() throws Exception { } private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { - final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(threadCount); final CountDownLatch dumpLatch = new CountDownLatch(1); @@ -209,7 +206,6 @@ private void p0(final DataSource dataSource, String name, int threadCount) throw Thread[] threads = new Thread[threadCount]; for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); @@ -260,11 +256,11 @@ public void run() { long fullGC = TestUtil.getFullGC() - startFullGC; System.out.println("thread " + threadCount + " " + name + " millis : " - + NumberFormat.getInstance().format(millis) + "; YGC " + ygc + " FGC " + fullGC - + " blocked " - + NumberFormat.getInstance().format(blockedCount) // - + " waited " + NumberFormat.getInstance().format(waitedCount) + " physicalConn " - + physicalConnStat.get()); + + NumberFormat.getInstance().format(millis) + "; YGC " + ygc + " FGC " + fullGC + + " blocked " + + NumberFormat.getInstance().format(blockedCount) // + + " waited " + NumberFormat.getInstance().format(waitedCount) + " physicalConn " + + physicalConnStat.get()); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case2.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case2.java index 5a1ac6576d..c9371eb16c 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case2.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case2.java @@ -34,24 +34,23 @@ /** * TestOnBo 类Case1.java的实现描述：TODO 类实现描述 - * + * * @author admin 2011-5-28 下午03:47:40 */ public class Case2 extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int initialSize = 10; - private int minPoolSize = 10; - private int maxPoolSize = 50; - private int maxActive = 50; - private String validationQuery = "SELECT 1"; - private int threadCount = 100; - private int executeCount = 4; - final int LOOP_COUNT = (1000 * 100) / executeCount; - private boolean testOnBorrow = true; + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int initialSize = 10; + private int minPoolSize = 10; + private int maxPoolSize = 50; + private int maxActive = 50; + private String validationQuery = "SELECT 1"; + private int threadCount = 100; + private int executeCount = 4; + final int LOOP_COUNT = (1000 * 100) / executeCount; + private boolean testOnBorrow = true; protected void setUp() throws Exception { jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; @@ -131,7 +130,6 @@ public void f_test_2() throws Exception { } private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { - final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(threadCount); final AtomicLong blockedStat = new AtomicLong(); @@ -139,7 +137,6 @@ private void p0(final DataSource dataSource, String name, int threadCount) throw for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); @@ -182,7 +179,7 @@ public void run() { long fullGC = TestUtil.getFullGC() - startFullGC; System.out.println("thread " + threadCount + " " + name + " millis : " - + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC - + " blockedCount " + blockedStat.get() + " waitedCount " + waitedStat.get()); + + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC + + " blockedCount " + blockedStat.get() + " waitedCount " + waitedStat.get()); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java index 870db350a9..5c48cce658 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java @@ -35,25 +35,24 @@ import com.jolbox.bonecp.BoneCPDataSource; public class Case3 extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int initialSize = 1; - private int minIdle = 1; - private int maxIdle = 14; - private int maxActive = 14; - private int maxWait = -1; - private String validationQuery = "SELECT 1"; // "SELECT 1"; - private int threadCount = 10; - private int TEST_COUNT = 3; - final int LOOP_COUNT = 1000 * 100; - private boolean testOnBorrow = false; - private String connectionProperties = ""; // "bigStringTryClob=true;clientEncoding=GBK;defaultRowPrefetch=50;serverEncoding=ISO-8859-1"; - private String sql = "SELECT 1"; - private long timeBetweenEvictionRunsMillis = 60000; - private long minEvictableIdleTimeMillis = 60000; + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int initialSize = 1; + private int minIdle = 1; + private int maxIdle = 14; + private int maxActive = 14; + private int maxWait = -1; + private String validationQuery = "SELECT 1"; // "SELECT 1"; + private int threadCount = 10; + private int TEST_COUNT = 3; + final int LOOP_COUNT = 1000 * 100; + private boolean testOnBorrow = false; + private String connectionProperties = ""; // "bigStringTryClob=true;clientEncoding=GBK;defaultRowPrefetch=50;serverEncoding=ISO-8859-1"; + private String sql = "SELECT 1"; + private long timeBetweenEvictionRunsMillis = 60000; + private long minEvictableIdleTimeMillis = 60000; protected void setUp() throws Exception { jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; @@ -103,7 +102,6 @@ public void boneCP() throws Exception { } public void druid() throws Exception { - DruidDataSource dataSource = new DruidDataSource(); dataSource.setInitialSize(initialSize); @@ -165,7 +163,6 @@ private void p0(final DataSource dataSource, String name, int threadCount) throw final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); @@ -207,6 +204,6 @@ public void run() { Thread.sleep(1); System.out.println("thread " + threadCount + " " + name + " millis : " - + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); + + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java index 08321c620e..49297f7758 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java @@ -31,32 +31,31 @@ import com.alibaba.druid.pool.DruidDataSource; public class CaseKylin_Oracle extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int initialSize = 1; - private int minIdle = 1; - private int maxIdle = 14; - private int maxActive = 14; - private int maxWait = 60000; - private String validationQuery = null; // "SELECT 1"; - private int threadCount = 15; - private int TEST_COUNT = 3; - final int LOOP_COUNT = 1000 * 100; - private boolean testWhileIdle = true; - private boolean testOnBorrow = true; - private boolean testOnReturn = false; - - private boolean removeAbandoned = true; - private int removeAbandonedTimeout = 180; - private long timeBetweenEvictionRunsMillis = 60000; - private long minEvictableIdleTimeMillis = 1800000; - private int numTestsPerEvictionRun = 20; - private String validateQuery = null; - - private String oracleDriverClass = "com.alibaba.china.jdbc.SimpleDriver"; + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int initialSize = 1; + private int minIdle = 1; + private int maxIdle = 14; + private int maxActive = 14; + private int maxWait = 60000; + private String validationQuery = null; // "SELECT 1"; + private int threadCount = 15; + private int TEST_COUNT = 3; + final int LOOP_COUNT = 1000 * 100; + private boolean testWhileIdle = true; + private boolean testOnBorrow = true; + private boolean testOnReturn = false; + + private boolean removeAbandoned = true; + private int removeAbandonedTimeout = 180; + private long timeBetweenEvictionRunsMillis = 60000; + private long minEvictableIdleTimeMillis = 1800000; + private int numTestsPerEvictionRun = 20; + private String validateQuery = null; + + private String oracleDriverClass = "com.alibaba.china.jdbc.SimpleDriver"; protected void setUp() throws Exception { // jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; @@ -146,12 +145,10 @@ public void dbcp() throws Exception { } private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { - final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); @@ -185,6 +182,6 @@ public void run() { long fullGC = TestUtil.getFullGC() - startFullGC; System.out.println("thread " + threadCount + " " + name + " millis : " - + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); + + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java index ee7f48fdf8..465dd89bcb 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java @@ -31,29 +31,28 @@ import com.alibaba.druid.pool.DruidDataSource; public class CaseKylin_mysql extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int initialSize = 1; - private int minIdle = 1; - private int maxIdle = 20; - private int maxActive = 20; - private int maxWait = 60000; - private String validationQuery = null; // "SELECT 1"; - private int threadCount = 15; - private int TEST_COUNT = 3; - final int LOOP_COUNT = 1000 * 100; - private boolean testWhileIdle = true; - private boolean testOnBorrow = false; - private boolean testOnReturn = false; - - private boolean removeAbandoned = true; - private int removeAbandonedTimeout = 180; - private long timeBetweenEvictionRunsMillis = 60000; - private long minEvictableIdleTimeMillis = 1800000; - private int numTestsPerEvictionRun = 20; + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int initialSize = 1; + private int minIdle = 1; + private int maxIdle = 20; + private int maxActive = 20; + private int maxWait = 60000; + private String validationQuery = null; // "SELECT 1"; + private int threadCount = 15; + private int TEST_COUNT = 3; + final int LOOP_COUNT = 1000 * 100; + private boolean testWhileIdle = true; + private boolean testOnBorrow = false; + private boolean testOnReturn = false; + + private boolean removeAbandoned = true; + private int removeAbandonedTimeout = 180; + private long timeBetweenEvictionRunsMillis = 60000; + private long minEvictableIdleTimeMillis = 1800000; + private int numTestsPerEvictionRun = 20; protected void setUp() throws Exception { // jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; @@ -140,12 +139,10 @@ public void dbcp() throws Exception { } private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { - final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); @@ -179,6 +176,6 @@ public void run() { long fullGC = TestUtil.getFullGC() - startFullGC; System.out.println("thread " + threadCount + " " + name + " millis : " - + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); + + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java index f61367009f..7a648277ae 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java @@ -29,29 +29,28 @@ import com.alibaba.druid.pool.DruidDataSource; public class CaseKylin_mysql_idle_1 extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int initialSize = 1; - private int minIdle = 1; - private int maxIdle = 20; - private int maxActive = 20; - private int maxWait = 60000; - private String validationQuery = null; // "SELECT 1"; - private int threadCount = 15; - private int TEST_COUNT = 3; - final int LOOP_COUNT = 1000 * 10; - private boolean testWhileIdle = true; - private boolean testOnBorrow = false; - private boolean testOnReturn = false; - - private boolean removeAbandoned = true; - private int removeAbandonedTimeout = 180; - private long timeBetweenEvictionRunsMillis = 60000; - private long minEvictableIdleTimeMillis = 1800000; - private int numTestsPerEvictionRun = 20; + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int initialSize = 1; + private int minIdle = 1; + private int maxIdle = 20; + private int maxActive = 20; + private int maxWait = 60000; + private String validationQuery = null; // "SELECT 1"; + private int threadCount = 15; + private int TEST_COUNT = 3; + final int LOOP_COUNT = 1000 * 10; + private boolean testWhileIdle = true; + private boolean testOnBorrow = false; + private boolean testOnReturn = false; + + private boolean removeAbandoned = true; + private int removeAbandonedTimeout = 180; + private long timeBetweenEvictionRunsMillis = 60000; + private long minEvictableIdleTimeMillis = 1800000; + private int numTestsPerEvictionRun = 20; protected void setUp() throws Exception { // jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; @@ -112,12 +111,10 @@ public void druid() throws Exception { } private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { - final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); @@ -151,6 +148,6 @@ public void run() { long fullGC = TestUtil.getFullGC() - startFullGC; System.out.println("thread " + threadCount + " " + name + " millis : " - + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); + + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java index c7b8f6c815..30393f5620 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java @@ -30,29 +30,28 @@ import com.alibaba.druid.pool.DruidDataSource; public class CaseKylin_mysql_idle_2 extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int initialSize = 1; - private int minIdle = 1; - private int maxIdle = 20; - private int maxActive = 20; - private int maxWait = 60000; - private String validationQuery = null; // "SELECT 1"; - private int threadCount = 15; - private int TEST_COUNT = 3; - final int LOOP_COUNT = 10 * 1; - private boolean testWhileIdle = true; - private boolean testOnBorrow = false; - private boolean testOnReturn = false; - - private boolean removeAbandoned = true; - private int removeAbandonedTimeout = 180; - private long timeBetweenEvictionRunsMillis = 60 * 10; - private long minEvictableIdleTimeMillis = 1800 * 10; - private int numTestsPerEvictionRun = 20; + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int initialSize = 1; + private int minIdle = 1; + private int maxIdle = 20; + private int maxActive = 20; + private int maxWait = 60000; + private String validationQuery = null; // "SELECT 1"; + private int threadCount = 15; + private int TEST_COUNT = 3; + final int LOOP_COUNT = 10 * 1; + private boolean testWhileIdle = true; + private boolean testOnBorrow = false; + private boolean testOnReturn = false; + + private boolean removeAbandoned = true; + private int removeAbandonedTimeout = 180; + private long timeBetweenEvictionRunsMillis = 60 * 10; + private long minEvictableIdleTimeMillis = 1800 * 10; + private int numTestsPerEvictionRun = 20; protected void setUp() throws Exception { jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; @@ -115,12 +114,10 @@ public void druid() throws Exception { } private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { - final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); @@ -154,6 +151,6 @@ public void run() { long fullGC = TestUtil.getFullGC() - startFullGC; System.out.println("thread " + threadCount + " " + name + " millis : " - + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); + + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case_Concurrent_50.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case_Concurrent_50.java index 0a90ab17f1..7d8696167d 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case_Concurrent_50.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case_Concurrent_50.java @@ -31,23 +31,22 @@ import com.alibaba.druid.pool.DruidDataSource; public class Case_Concurrent_50 extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int initialSize = 0; - private int minIdle = 3; - private int maxIdle = 5; - private int maxActive = 10; - private String validationQuery = "SELECT 1"; - private boolean testOnBorrow = false; - - private long minEvictableIdleTimeMillis = 3000; - public final int LOOP_COUNT = 5; - public final int COUNT = 1000 * 10; - - private final int THREAD_COUNT = 50; + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int initialSize = 0; + private int minIdle = 3; + private int maxIdle = 5; + private int maxActive = 10; + private String validationQuery = "SELECT 1"; + private boolean testOnBorrow = false; + + private long minEvictableIdleTimeMillis = 3000; + public final int LOOP_COUNT = 5; + public final int COUNT = 1000 * 10; + + private final int THREAD_COUNT = 50; protected void setUp() throws Exception { jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; @@ -113,10 +112,8 @@ private void p0(final DataSource dataSource, String name) throws Exception { final CountDownLatch endLatch = new CountDownLatch(THREAD_COUNT); for (int i = 0; i < THREAD_COUNT; ++i) { Thread thread = new Thread() { - public void run() { try { - for (int i = 0; i < COUNT; ++i) { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); @@ -143,6 +140,6 @@ public void run() { long fullGC = TestUtil.getFullGC() - startFullGC; System.out.println(name + " millis : " + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " - + fullGC); + + fullGC); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java index 70c5ac5298..f35674394c 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java @@ -32,18 +32,17 @@ import com.jolbox.bonecp.BoneCPDataSource; public class Oracle_Case0 extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int initialSize = 1; - private int minPoolSize = 1; - private int maxPoolSize = 2; - private int maxActive = 2; - private String validationQuery = "SELECT 1 FROM DUAL"; - - public final int LOOP_COUNT = 5; + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int initialSize = 1; + private int minPoolSize = 1; + private int maxPoolSize = 2; + private int maxActive = 2; + private String validationQuery = "SELECT 1 FROM DUAL"; + + public final int LOOP_COUNT = 5; protected void setUp() throws Exception { jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; @@ -138,6 +137,6 @@ private void p0(DataSource dataSource, String name) throws SQLException { long fullGC = TestUtil.getFullGC() - startFullGC; System.out.println(name + " millis : " + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " - + fullGC); + + fullGC); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java index 6ed7b7769a..3ecf7155a1 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java @@ -32,19 +32,18 @@ import com.alibaba.druid.pool.DruidDataSource; public class Oracle_Case3 extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int maxIdle = 40; - private int maxActive = 50; - private int maxWait = 5000; - private String validationQuery = "SELECT 1 FROM DUAL"; - private int threadCount = 40; - private int loopCount = 5; - final int LOOP_COUNT = 1000 * 10; - private boolean testOnBorrow = true; + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int maxIdle = 40; + private int maxActive = 50; + private int maxWait = 5000; + private String validationQuery = "SELECT 1 FROM DUAL"; + private int threadCount = 40; + private int loopCount = 5; + final int LOOP_COUNT = 1000 * 10; + private boolean testOnBorrow = true; protected void setUp() throws Exception { jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; @@ -96,12 +95,10 @@ public void test_1() throws Exception { } private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { - final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); @@ -137,6 +134,6 @@ public void run() { long fullGC = TestUtil.getFullGC() - startFullGC; System.out.println("thread " + threadCount + " " + name + " millis : " - + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); + + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java index 0f2af3eb23..bb5792cd23 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java @@ -35,24 +35,23 @@ import com.alibaba.druid.util.JdbcUtils; public class Oracle_Case4 extends TestCase { - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; - private int maxIdle = 40; - private int maxActive = 50; - private int maxWait = 5000; - private String validationQuery = "SELECT 1 FROM DUAL"; - private int threadCount = 1; - private int loopCount = 5; - final int LOOP_COUNT = 1000 * 1; - private boolean testOnBorrow = false; - private boolean preparedStatementCache = true; - private int preparedStatementCacheSize = 50; - private String properties = "defaultRowPrefetch=50"; - - private String SQL; + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int maxIdle = 40; + private int maxActive = 50; + private int maxWait = 5000; + private String validationQuery = "SELECT 1 FROM DUAL"; + private int threadCount = 1; + private int loopCount = 5; + final int LOOP_COUNT = 1000 * 1; + private boolean testOnBorrow = false; + private boolean preparedStatementCache = true; + private int preparedStatementCacheSize = 50; + private String properties = "defaultRowPrefetch=50"; + + private String SQL; protected void setUp() throws Exception { // jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; @@ -111,7 +110,7 @@ public void test_dbcp() throws Exception { dataSource.setValidationQuery(validationQuery); dataSource.setTestOnBorrow(testOnBorrow); dataSource.setConnectionProperties(properties); - + // printAV_INFO(dataSource); for (int i = 0; i < loopCount; ++i) { @@ -148,7 +147,7 @@ private void printAV_INFO(DataSource dataSource) throws SQLException { protected void printTables(DruidDataSource dataSource) throws SQLException { Connection conn = dataSource.getConnection(); - ResultSet rs = conn.getMetaData().getTables(null, "ALIBABA", null, new String[] { "TABLE" }); + ResultSet rs = conn.getMetaData().getTables(null, "ALIBABA", null, new String[]{"TABLE"}); JdbcUtils.printResultSet(rs); rs.close(); @@ -156,21 +155,19 @@ protected void printTables(DruidDataSource dataSource) throws SQLException { } private void p0(final DataSource dataSource, String name, int threadCount) throws Exception { - final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); for (int i = 0; i < LOOP_COUNT; ++i) { Connection conn = dataSource.getConnection(); - + int mod = i % 500; - + String sql = SQL; // + " AND ROWNUM <= " + (mod + 1); PreparedStatement stmt = conn.prepareStatement(sql); stmt.setInt(1, 61); @@ -206,6 +203,6 @@ public void run() { long fullGC = TestUtil.getFullGC() - startFullGC; System.out.println("thread " + threadCount + " " + name + " millis : " - + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); + + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/druid/DruidCase0.java b/src/test/java/com/alibaba/druid/benckmark/pool/druid/DruidCase0.java index 357b5b69cc..5a700f213c 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/druid/DruidCase0.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/druid/DruidCase0.java @@ -22,7 +22,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidCase0 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -42,7 +41,7 @@ public void test_benchmark() throws Exception { long startMillis = System.currentTimeMillis(); benchmark(); long millis = System.currentTimeMillis() - startMillis; - + System.out.println("millis : " + millis); } } diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/model/TableOperator.java b/src/test/java/com/alibaba/druid/benckmark/pool/model/TableOperator.java index 002c207266..4d0643c2f9 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/model/TableOperator.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/model/TableOperator.java @@ -8,7 +8,6 @@ import javax.sql.DataSource; public class TableOperator { - private DataSource dataSource; public void setDataSource(DataSource dataSource) { @@ -17,12 +16,10 @@ public void setDataSource(DataSource dataSource) { private static final int COUNT = 2; - public TableOperator(){ - + public TableOperator() { } public void insert() throws Exception { - StringBuffer ddl = new StringBuffer(); ddl.append("INSERT INTO t_big ("); for (int i = 0; i < COUNT; ++i) { @@ -53,13 +50,11 @@ public void insert() throws Exception { stmt.execute(); stmt.close(); } finally { - conn.close(); } } public void dropTable() throws SQLException { - Connection conn = dataSource.getConnection(); try { Statement stmt = conn.createStatement(); diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkCase.java b/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkCase.java index cf069e1310..06ceebe5d7 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkCase.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkCase.java @@ -16,10 +16,9 @@ package com.alibaba.druid.benckmark.proxy; public abstract class BenchmarkCase { - private final String name; - public BenchmarkCase(String name){ + public BenchmarkCase(String name) { super(); this.name = name; } @@ -29,12 +28,10 @@ public String getName() { } public void setUp(SQLExecutor sqlExec) throws Exception { - } public abstract void execute(SQLExecutor sqlExec) throws Exception; public void tearDown(SQLExecutor sqlExec) throws Exception { - } } diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java b/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java index c1b5e10f7e..c70ddbd17d 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java @@ -26,12 +26,11 @@ import javax.management.ObjectName; public class BenchmarkExecutor { + private int loopCount = 1000; + private int executeCount = 10; - private int loopCount = 1000; - private int executeCount = 10; - - private final List sqlExecList = new ArrayList(); - private final List caseList = new ArrayList(); + private final List sqlExecList = new ArrayList(); + private final List caseList = new ArrayList(); public int getExecuteCount() { return executeCount; @@ -99,7 +98,7 @@ public void handleResultSummary(SQLExecutor sqlExec, BenchmarkCase benchmarkCase NumberFormat format = NumberFormat.getInstance(); System.out.println("SUM\t" + benchmarkCase.getName() + "\t" + sqlExec.getName() + "\t" + format.format(millis) - + "\tYoungGC " + youngGC + "\tFullGC " + fullGC); + + "\tYoungGC " + youngGC + "\tFullGC " + fullGC); } public void handleResult(SQLExecutor sqlExec, Result result) { @@ -109,7 +108,7 @@ public void handleResult(SQLExecutor sqlExec, Result result) { } NumberFormat format = NumberFormat.getInstance(); System.out.println(result.getName() + "\t" + sqlExec.getName() + "\t" + format.format(result.getMillis()) - + "\tYoungGC " + result.getYoungGC() + "\tFullGC " + result.getFullGC()); + + "\tYoungGC " + result.getYoungGC() + "\tFullGC " + result.getFullGC()); } private Result executeLoop(SQLExecutor sqlExec, BenchmarkCase benchmarkCase) { @@ -190,11 +189,10 @@ public long getFullGC() { } public static class Result { - - private String name; - private long millis; - private long youngGC; - private long fullGC; + private String name; + private long millis; + private long youngGC; + private long fullGC; private Throwable error; public String getName() { diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java b/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java index f661757d03..d8a3fee27b 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java @@ -20,13 +20,12 @@ import java.sql.SQLException; public class DirectSQLExecutor extends SQLExecutor { - private final String jdbcUrl; private final String user; private final String password; private final String driverClassName; - public DirectSQLExecutor(String name, String jdbcUrl, String user, String password){ + public DirectSQLExecutor(String name, String jdbcUrl, String user, String password) { super(name); this.jdbcUrl = jdbcUrl; diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java b/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java index 9855473876..b68e12ff9c 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java @@ -20,9 +20,7 @@ import com.alibaba.druid.benckmark.proxy.sqlcase.SelectNow; public class DruidBenchmarkTest extends TestCase { - public void test_druid_benchmark() throws Exception { - BenchmarkExecutor executor = new BenchmarkExecutor(); executor.getSqlExecutors().add(createExecutorDirect()); executor.getSqlExecutors().add(createExecutorDruid()); diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/SQLExecutor.java b/src/test/java/com/alibaba/druid/benckmark/proxy/SQLExecutor.java index 465f2c6d30..655b9ce990 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/SQLExecutor.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/SQLExecutor.java @@ -19,10 +19,9 @@ import java.sql.SQLException; public abstract class SQLExecutor { - private final String name; - public SQLExecutor(String name){ + public SQLExecutor(String name) { this.name = name; } diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java b/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java index 21f1e85355..79559234f7 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java @@ -20,7 +20,6 @@ import junit.framework.TestCase; public class TestAtomicPerformance extends TestCase { - public void test_0() throws Exception { AtomicInteger count = new AtomicInteger(); for (int i = 0; i < 5; ++i) { diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java index 51069ff265..c2885355de 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java @@ -25,11 +25,10 @@ import com.alibaba.druid.benckmark.proxy.SQLExecutor; public class Select1 extends BenchmarkCase { - - private String sql; + private String sql; private Connection conn; - public Select1(){ + public Select1() { super("Select1"); sql = "SELECT 1"; diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java index 9e19ac47f6..2f26703d60 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java @@ -26,21 +26,20 @@ import com.alibaba.druid.util.JdbcUtils; public class SelectEmptyTable extends BenchmarkCase { - - private String sql; + private String sql; private Connection conn; - private String tableName; + private String tableName; - private String createTableSql; - private String dropTableSql; + private String createTableSql; + private String dropTableSql; - public SelectEmptyTable(){ + public SelectEmptyTable() { super("SelectEmptyTable"); tableName = "T_" + System.currentTimeMillis(); createTableSql = "CREATE TABLE " + tableName - + "(F1 INT, F2 INT, F3 INT, F4 INT, F5 INT, F6 INT, F7 INT, F8 INT, F9 INT)"; + + "(F1 INT, F2 INT, F3 INT, F4 INT, F5 INT, F6 INT, F7 INT, F8 INT, F9 INT)"; dropTableSql = "DROP TABLE " + tableName; sql = "SELECT * FROM T_" + tableName; } diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java index 789948c501..9d94b6c74b 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java @@ -26,11 +26,10 @@ import com.alibaba.druid.benckmark.proxy.SQLExecutor; public class SelectNow extends BenchmarkCase { - - private String sql; + private String sql; private Connection conn; - public SelectNow(){ + public SelectNow() { super("SelectNow"); sql = "SELECT NOW()"; diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java index 575e44aefd..24f64cbb2b 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java @@ -25,11 +25,10 @@ import com.alibaba.druid.benckmark.proxy.SQLExecutor; public class SelectSysUser extends BenchmarkCase { - - private String sql; + private String sql; private Connection conn; - public SelectSysUser(){ + public SelectSysUser() { super("Dragoon-SelectSysUser"); sql = "SELECT * FROM sys_user s"; diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark.java index b271d894ba..e781ad6ebc 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark.java @@ -36,7 +36,6 @@ public void perf_toString() { public void perf() { long startMillis = System.currentTimeMillis(); for (int i = 0; i < 1000 * 1000; ++i) { - List stmt = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); // stmt.toString(); } diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark_2.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark_2.java index ed5b6e7760..ba511538b2 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark_2.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark_2.java @@ -38,7 +38,6 @@ public void perf() { long startMillis = System.currentTimeMillis(); for (int i = 0; i < 1000 * 1000; ++i) { - List stmt = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); // stmt.toString(); } @@ -49,7 +48,6 @@ public void perf() { public void perf_keepInsertValueClauseStrinng() { long startMillis = System.currentTimeMillis(); for (int i = 0; i < 1000 * 1000; ++i) { - SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, JdbcConstants.MYSQL); parser.config(SQLParserFeature.KeepInsertValueClauseOriginalString, true); List stmtList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java index 339bb7d5ce..93db805b98 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java @@ -25,14 +25,13 @@ import com.alibaba.druid.util.Utils; public class MySqlPerfMain { - public static void main(String[] args) throws Exception { System.out.println(System.getProperty("java.vm.name") + " " + System.getProperty("java.runtime.version")); List arguments = ManagementFactory.getRuntimeMXBean().getInputArguments(); System.out.println(arguments); - + String sql = Utils.readFromResource("benchmark/sql/ob_sql.txt"); - + for (int i = 0; i < 10; ++i) { perfMySql(sql); } diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_schemaStat.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_schemaStat.java index cb87a2c60e..75a6de9a41 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_schemaStat.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_schemaStat.java @@ -28,7 +28,6 @@ import java.util.List; public class MySqlPerfMain_schemaStat { - public static void main(String[] args) throws Exception { System.out.println(System.getProperty("java.vm.name") + " " + System.getProperty("java.runtime.version")); List arguments = ManagementFactory.getRuntimeMXBean().getInputArguments(); @@ -43,7 +42,7 @@ public static void main(String[] args) throws Exception { } sql += (" id = " + i); } - + for (int i = 0; i < 10; ++i) { perfMySql(sql); } diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_select.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_select.java index c36dc07b1b..c87b0d70b7 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_select.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_select.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class MySqlPerfMain_select { - public static void main(String[] args) throws Exception { System.out.println(System.getProperty("java.vm.name") + " " + System.getProperty("java.runtime.version")); List arguments = ManagementFactory.getRuntimeMXBean().getInputArguments(); @@ -62,7 +61,6 @@ static long perfMySql(String sql) { } static void execMySql(String sql) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_visitor.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_visitor.java index 6e7a47eef4..eea16784ef 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_visitor.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_visitor.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class MySqlPerfMain_visitor { - public static void main(String[] args) throws Exception { System.out.println(System.getProperty("java.vm.name") + " " + System.getProperty("java.runtime.version")); List arguments = ManagementFactory.getRuntimeMXBean().getInputArguments(); @@ -45,7 +44,7 @@ static long perfMySql(String sql) { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - + long startMillis = System.currentTimeMillis(); for (int i = 0; i < 1000 * 1000 * 1; ++i) { execMySql(statementList); diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java index 2724da2e4b..2cb360bdd0 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.util.Utils; public class MySqlPerfTest extends TestCase { - private String sql; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/SqlHolder.java b/src/test/java/com/alibaba/druid/benckmark/sql/SqlHolder.java index 5631359bdb..8cd98770e3 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/SqlHolder.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/SqlHolder.java @@ -38,6 +38,7 @@ public class SqlHolder { private boolean isParam; public static SQLSelectListCache selectListCache = new SQLSelectListCache(JdbcConstants.MYSQL); + static { selectListCache.add("select id as id, gmt_create as gmtCreate, gmt_modified as gmtModified, name as name, owner as owner, type as type, statement as statement, datasource as datasource, meta as meta, param_file as paramFile, sharable as sharable, data_type as dataType, status as status, config as config, project_id as projectId, plugins as plugins, field_compare as fieldCompare, field_ext as fieldExt, openx as openx from"); selectListCache.add("SELECT id, dispute_id, buyer_id, seller_id, total_fee, refund_fee, max_apply_goods_fee, apply_goods_fee, apply_carriage_fee, refund_goods_fee, refund_carriage_fee, refund_point, refund_coupon, refund_return_point, refund_cash, real_deduct_refund_point, real_refund_return_point, refund_return_commission, gmt_create, gmt_modified, attributes, attributes_cc FROM"); diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/StatementConverter.java b/src/test/java/com/alibaba/druid/benckmark/sql/StatementConverter.java index b0b8979ad8..748a0fed3f 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/StatementConverter.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/StatementConverter.java @@ -12,7 +12,6 @@ * Created by kaiwang.ckw on 15/05/2017. */ public class StatementConverter { - // remove 'for update' from 'select ... for update' public static boolean rewriteSelect(SQLSelectStatement stmt) { SQLSelectQuery q = stmt.getSelect().getQuery(); diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/Templates.java b/src/test/java/com/alibaba/druid/benckmark/sql/Templates.java index bb81f52ab8..40e1ad15b0 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/Templates.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/Templates.java @@ -12,11 +12,9 @@ * Created by kaiwang.ckw on 15/05/2017. */ public class Templates { - public static final String UNKNOWN = "UNKNOWN"; public static String parameterize(SQLStatement ast, Set physicalNames, List params) { - List parameters = null; Appendable out = new StringBuilder(); SQLASTOutputVisitor visitor = new MySqlOutputVisitor(out); diff --git a/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest.java b/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest.java index a6430f66fe..4da280c966 100644 --- a/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest.java +++ b/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest.java @@ -21,15 +21,14 @@ import com.alibaba.druid.wall.spi.OracleWallProvider; public class WallBenchmarkTest extends TestCase { + WallProvider provider = new OracleWallProvider(); - WallProvider provider = new OracleWallProvider(); - - public final static int COUNT = 1000 * 1000; + public static final int COUNT = 1000 * 1000; public void test_0() throws Exception { String sql = "SELECT t1.department_id, t2.*\n" + // - "FROM hr_info t1, TABLE(t1.people) t2\n" + // - "WHERE t2.department_id = t1.department_id;"; + "FROM hr_info t1, TABLE(t1.people) t2\n" + // + "WHERE t2.department_id = t1.department_id;"; for (int i = 0; i < 10; ++i) { provider.clearCache(); long startMillis = System.currentTimeMillis(); diff --git a/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest1.java b/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest1.java index 688d85e04a..49850b3a33 100644 --- a/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest1.java +++ b/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest1.java @@ -24,14 +24,14 @@ public class WallBenchmarkTest1 extends TestCase { static Random r = new Random(); - WallProvider provider = new MySqlWallProvider(); + WallProvider provider = new MySqlWallProvider(); - public final static int COUNT = 1000 * 1000; + public static final int COUNT = 1000 * 1000; public void test_0() throws Exception { String sql = "SELECT t1.department_id, t2.*\n" + // - "FROM hr_info t1, x2 t2\n" + // - "WHERE t2.department_id = t1.department_id"; + "FROM hr_info t1, x2 t2\n" + // + "WHERE t2.department_id = t1.department_id"; for (int i = 0; i < 10; ++i) { provider.clearCache(); long startMillis = System.currentTimeMillis(); @@ -43,26 +43,26 @@ public void test_0() throws Exception { public void perf(String sql) { for (int i = 0; i < COUNT; ++i) { - String text = genRandomSql(); + String text = genRandomSql(); provider.check(text); } } - - private String genRandomSql(){ - int result1=r.nextInt(65535); - int result2=r.nextInt(65535); - String result = Integer.toBinaryString(result1)+""+Integer.toBinaryString(result2); + + private String genRandomSql() { + int result1 = r.nextInt(65535); + int result2 = r.nextInt(65535); + String result = Integer.toBinaryString(result1) + "" + Integer.toBinaryString(result2); StringBuilder sb = new StringBuilder("select "); - for(int i=0;i stmtList = SQLUtils.parseStatements(sql, (DbType) null); + + List stmtList = SQLUtils.parseStatements(sql, (DbType) null); SQLStatement stmt = stmtList.get(0); System.out.println(stmt.toString()); } diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java index bf8d20d921..269ad7f2ab 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java @@ -30,16 +30,15 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class Bug_for_happyday517 extends PoolTestCase { - private DruidDataSource dataSource; - private MockDriver driver; + private MockDriver driver; private int originalDataSourceCount = 0; protected void setUp() throws Exception { super.setUp(); originalDataSourceCount = DruidDataSourceStatManager.getInstance().getDataSourceList().size(); - + driver = new MockDriver(); dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); @@ -73,7 +72,7 @@ public void test_for_happyday517_1() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE, - ResultSet.CLOSE_CURSORS_AT_COMMIT); + ResultSet.CLOSE_CURSORS_AT_COMMIT); MockStatement mockStmt = stmt.unwrap(MockStatement.class); @@ -107,7 +106,7 @@ public void test_for_happyday517_3() throws Exception { String sql = "select 1"; Statement stmt = conn.prepareStatement(sql, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE, - ResultSet.CLOSE_CURSORS_AT_COMMIT); + ResultSet.CLOSE_CURSORS_AT_COMMIT); MockPreparedStatement mockStmt = stmt.unwrap(MockPreparedStatement.class); @@ -141,7 +140,7 @@ public void test_for_happyday517_5() throws Exception { String sql = "select 1"; Statement stmt = conn.prepareCall(sql, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE, - ResultSet.CLOSE_CURSORS_AT_COMMIT); + ResultSet.CLOSE_CURSORS_AT_COMMIT); Statement mockStmt = stmt.unwrap(Statement.class); diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java index 9366b80570..5de8a30470 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java @@ -31,30 +31,26 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class Bug_for_happyday517_2 extends TestCase { - private DruidDataSource dataSource; - private MockDriver driver; + private MockDriver driver; + + final DataTruncation exception = new java.sql.DataTruncation(0, true, true, 0, 0); - final DataTruncation exception = new java.sql.DataTruncation(0, true, true, 0, 0); - private int originalDataSourceCount = 0; protected void setUp() throws Exception { originalDataSourceCount = DruidDataSourceStatManager.getInstance().getDataSourceList().size(); final MockPreparedStatement mockStatement = new MockPreparedStatement(null, null) { - public boolean execute() throws SQLException { throw exception; } }; driver = new MockDriver() { - public Connection connect(String url, Properties info) throws SQLException { super.connect(url, info); return new MockConnection(driver, url, info) { - public PreparedStatement prepareStatement(String sql) throws SQLException { return mockStatement; } diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java index 4af6528309..0db1850bd0 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java @@ -25,15 +25,14 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class Bug_for_happyday517_3 extends TestCase { - private DruidDataSource dataSource; - private MockDriver driver; + private MockDriver driver; private int originalDataSourceCount = 0; - + protected void setUp() throws Exception { originalDataSourceCount = DruidDataSourceStatManager.getInstance().getDataSourceList().size(); - + driver = new MockDriver(); dataSource = new DruidDataSource(); dataSource.setDriver(driver); diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java index 63a6d029cf..fbfe2f8e9e 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java @@ -20,7 +20,6 @@ import org.junit.Assert; public class Bug_for_order extends TestCase { - public void test_bug_for_xuershan() throws Exception { String sql = "select * from order"; String format = SQLUtils.formatMySql(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java index 197c9d97d6..c81174ab65 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java @@ -11,10 +11,9 @@ import com.alibaba.druid.sql.dialect.odps.visitor.OdpsOutputVisitor; public class Bug_for_qianbi extends TestCase { - public void test_for_issue() throws Exception { String sql = "insert into table lol select detail(sellerid,id) as count1,sum(sellerid) as sum1 from ctu_trade_paid_done.time('natural','1d','1h') " - + "where match(auctionTitle,\"男鞋\\n中石化&加油卡\\n中石化&充值卡\\n中石化&冲值卡\\n中石化&代冲\\n中石化&代充\\n中国石化&加油卡\\n中国石化&充值卡\\n中国石化&冲值卡\\n中国石化&代冲\\n中国石化&代充\",\"\\n\")"; + + "where match(auctionTitle,\"男鞋\\n中石化&加油卡\\n中石化&充值卡\\n中石化&冲值卡\\n中石化&代冲\\n中石化&代充\\n中国石化&加油卡\\n中国石化&充值卡\\n中国石化&冲值卡\\n中国石化&代冲\\n中国石化&代充\",\"\\n\")"; String expected = "INSERT INTO TABLE lol\n" + "SELECT detail(sellerid, id) AS count1, sum(sellerid) AS sum1\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_ruiyi.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_ruiyi.java index dd66f442ec..a3e1d1b1e5 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_ruiyi.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_ruiyi.java @@ -10,26 +10,25 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; public class Bug_for_ruiyi extends TestCase { - public void test_for_issue() throws Exception { String sql = "insert into icshall_guide(id,gmt_create,gmt_modified,subject,content,cat_id)" - + "values (8,now(),now(),\"Why my payment is deducted incorrectly?/ Why my payment is deducted twice?\"," - + "\"{\\\"id\\\":1,\\\"title\\\":\\\"Have you contacted your card issuer to double check instead of only checking online?\\\"," - + "\\\"type\\\":\\\"START\\\"," - + "\\\"currentLevel\\\":1," - + "\\\"name\\\":\\\"name1\\\"," - + "\\\"values\\\":[{\\\"id\\\":2," - + "\\\"title\\\":\\\"Yes\\\"," - + "\\\"type\\\":\\\"MIDWAY\\\"," - + "\\\"currentLevel\\\":2," - + "\\\"value\\\":1," - + "\\\"childs\\\":[{\\\"id\\\":3," - + "\\\"title\\\":\\\"If it is deducted twice, please contact the online service with the official bank statement.\\\"," - + "\\\"type\\\":\\\"END\\\"," + "\\\"currentLevel\\\":3}]}," + "{\\\"id\\\":4," - + "\\\"title\\\":\\\"No\\\"," + "\\\"type\\\":\\\"MIDWAY\\\"," + "\\\"currentLevel\\\":2," - + "\\\"value\\\":1," + "\\\"childs\\\":[{\\\"id\\\":5," - + "\\\"title\\\":\\\"Please contact your card issuer to double confirm.\\\"," - + "\\\"type\\\":\\\"END\\\"," + "\\\"currentLevel\\\":3}]}]}\",607)"; + + "values (8,now(),now(),\"Why my payment is deducted incorrectly?/ Why my payment is deducted twice?\"," + + "\"{\\\"id\\\":1,\\\"title\\\":\\\"Have you contacted your card issuer to double check instead of only checking online?\\\"," + + "\\\"type\\\":\\\"START\\\"," + + "\\\"currentLevel\\\":1," + + "\\\"name\\\":\\\"name1\\\"," + + "\\\"values\\\":[{\\\"id\\\":2," + + "\\\"title\\\":\\\"Yes\\\"," + + "\\\"type\\\":\\\"MIDWAY\\\"," + + "\\\"currentLevel\\\":2," + + "\\\"value\\\":1," + + "\\\"childs\\\":[{\\\"id\\\":3," + + "\\\"title\\\":\\\"If it is deducted twice, please contact the online service with the official bank statement.\\\"," + + "\\\"type\\\":\\\"END\\\"," + "\\\"currentLevel\\\":3}]}," + "{\\\"id\\\":4," + + "\\\"title\\\":\\\"No\\\"," + "\\\"type\\\":\\\"MIDWAY\\\"," + "\\\"currentLevel\\\":2," + + "\\\"value\\\":1," + "\\\"childs\\\":[{\\\"id\\\":5," + + "\\\"title\\\":\\\"Please contact your card issuer to double confirm.\\\"," + + "\\\"type\\\":\\\"END\\\"," + "\\\"currentLevel\\\":3}]}]}\",607)"; String expected = "INSERT INTO icshall_guide (id, gmt_create, gmt_modified, subject, content\n" + "\t, cat_id)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_wdw1206.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_wdw1206.java index 1836a6a406..ff75a763eb 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_wdw1206.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_wdw1206.java @@ -8,8 +8,7 @@ import com.alibaba.druid.util.JdbcUtils; public class Bug_for_wdw1206 extends TestCase { - - private ClassLoader ctxClassLoader; + private ClassLoader ctxClassLoader; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -25,7 +24,7 @@ protected void setUp() throws Exception { protected void tearDown() throws Exception { Thread.currentThread().setContextClassLoader(ctxClassLoader); - + JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java index 24eaa0b672..27c30a1421 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; public class Bug_for_weizhi extends TestCase { - public void test_for_issue() throws Exception { String sql = "insert into aaa values(1,2,'这是个反斜杠\\\\');"; diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java index d061afa4fa..53987b00ae 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java @@ -28,9 +28,8 @@ import com.alibaba.druid.util.JdbcUtils; public class Bug_for_xuershan extends TestCase { - private DruidDataSource dataSource; - private MockDriver driver; + private MockDriver driver; protected void setUp() throws Exception { driver = new MockDriver() { @@ -38,12 +37,12 @@ public ResultSet createResultSet(MockPreparedStatement stmt) { return null; } }; - + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xx"); dataSource.setDriver(driver); } - + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue1576.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue1576.java index 9cba06a9d2..0ea81fc370 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue1576.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue1576.java @@ -12,6 +12,7 @@ */ public class Issue1576 extends TestCase { private final DbType dbType = JdbcConstants.ORACLE; + public void test_for_issue() throws Exception { String sql = "select * from t whe id = 1"; SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue1737.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue1737.java index 4f913e1530..63ca26b3a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue1737.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue1737.java @@ -24,8 +24,8 @@ public void test_for_issue() throws Exception { parseStatement.accept(visitor); final List plist = visitor.getParameters(); sql = out.toString(); - System.out.println("src:"+sql); - System.out.println("sql:"+sql); + System.out.println("src:" + sql); + System.out.println("sql:" + sql); System.out.println(" params: " + JSON.toJSONString(plist)); assertEquals("[\"name\",[\"A\",\"B\"]]", JSON.toJSONString(plist)); diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue1912.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue1912.java index ce7c09114f..22f305b811 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue1912.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue1912.java @@ -24,7 +24,6 @@ public void test_for_issue() throws Exception { SQLASTVisitor visitor = new SQLASTVisitorAdapter() { public boolean visit(SQLIdentifierExpr x) { - String destColumn = columnMapping.get(x.getName()); if (destColumn != null) { x.setName(destColumn); diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue1935.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue1935.java index 11100f69ae..8d8441ffe5 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue1935.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue1935.java @@ -28,11 +28,10 @@ public void test_for_issue() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - //获取操作方法名称,依赖于表名称 System.out.println("涉及到的所有表 : " + visitor.getTables()); Map table_map = visitor.getTables(); - for(Map.Entry entry : table_map.entrySet()){ + for (Map.Entry entry : table_map.entrySet()) { TableStat.Name name = entry.getKey(); name.getName(); //存储表的调度次数，包括select ，update等 @@ -40,27 +39,26 @@ public void test_for_issue() throws Exception { } //获取字段名称 - System.out.println( visitor.getParameters()); + System.out.println(visitor.getParameters()); //获取列名 System.out.println("查询的列信息 : " + visitor.getColumns()); Collection cc = visitor.getColumns(); //column 存储了表名，列名，以及列是出现的位置，where，select，groupby ，order - for(TableStat.Column column : cc){ - + for (TableStat.Column column : cc) { } - System.out.println("conditions : " + visitor.getConditions() ); + System.out.println("conditions : " + visitor.getConditions()); List conditions = visitor.getConditions(); System.out.println("----------------------------"); - for(TableStat.Condition cond : conditions){ - System.out.println( "column : " + cond.getColumn()); - System.out.println( "operator : " + cond.getOperator()); - System.out.println( "values : " + cond.getValues()); + for (TableStat.Condition cond : conditions) { + System.out.println("column : " + cond.getColumn()); + System.out.println("operator : " + cond.getOperator()); + System.out.println("values : " + cond.getValues()); System.out.println("----------------------------"); } - System.out.println("group by : " + visitor.getGroupByColumns() ); - System.out.println("order by : " + visitor.getOrderByColumns() ); - System.out.println("relations ships : " + visitor.getRelationships() ); + System.out.println("group by : " + visitor.getGroupByColumns()); + System.out.println("order by : " + visitor.getOrderByColumns()); + System.out.println("relations ships : " + visitor.getRelationships()); } diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue1994.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue1994.java index fe8c3c9552..be091fed86 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue1994.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue1994.java @@ -14,7 +14,6 @@ import java.util.List; public class Issue1994 extends TestCase { - public void test_for_issue() throws Exception { String sql = "INSERT INTO MKTG_H_EXEC_RESULT_FACT\n" + "(THE_DATE, AREA_ID, SCENE_ID, MKTG_CNT, MKTG_SUC_CNT\n" + @@ -42,7 +41,7 @@ public void test_for_issue() throws Exception { "GROUP BY T1.AREA_ID, RTRIM(TO_CHAR(T2.PID))"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, stmtList.size()); + assertEquals(1, stmtList.size()); SQLStatement stmt = stmtList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue4071.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue4071.java index 1367e173b0..ec066dcd67 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue4071.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue4071.java @@ -5,6 +5,6 @@ public class Issue4071 extends TestCase { public void test_for_issue() throws Exception { - assertEquals("",new SQLSelectStatement().toString()); + assertEquals("", new SQLSelectStatement().toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue4253.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue4253.java index 3e636218f7..ff5eab7722 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue4253.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue4253.java @@ -1,4 +1,5 @@ package com.alibaba.druid.bvt.bug; + import com.alibaba.druid.DbType; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue_4094.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue_4094.java index d36922e831..1380dfaf03 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue_4094.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue_4094.java @@ -27,18 +27,17 @@ * https://github.com/alibaba/druid/issues/4094 */ public class Issue_4094 extends TestCase { - - public void test_betweent_lost(){ - // 此sql可以正常执行 - String sql ="SELECT B.CUSTOMER_ID customerId,B.CN_NAME NAME,OPENING_DATE,CLOSING_DATE,count(A.OPENING_DATE) over (partition BY B.CUSTOMER_ID ORDER BY trunc(A.OPENING_DATE,'mm') RANGE BETWEEN interval '3' month (4) preceding AND CURRENT ROW) AS createCount,count(A.CLOSING_DATE) over (partition BY B.CUSTOMER_ID ORDER BY trunc(NVL(A.CLOSING_DATE,SYSDATE),'mm') RANGE BETWEEN interval '3' month (4) preceding AND CURRENT ROW) AS cancelCount,row_number () over (partition BY B.CUSTOMER_ID ORDER BY trunc(A.OPENING_DATE) DESC) AS row_flg FROM account_info A,CUSTOMER_INFO B WHERE A.CUSTOMER_ID=B.CUSTOMER_ID"; - String format = SQLUtils.format(sql, DbType.oracle); - assertEquals("SELECT B.CUSTOMER_ID AS customerId, B.CN_NAME AS NAME, OPENING_DATE, CLOSING_DATE\n" - + "\t, count(A.OPENING_DATE) OVER (PARTITION BY B.CUSTOMER_ID ORDER BY trunc(A.OPENING_DATE, 'mm') RANGE " - + "BETWEEN INTERVAL '3' MONTH(4) PRECEDING AND CURRENT ROW) AS createCount\n" - + "\t, count(A.CLOSING_DATE) OVER (PARTITION BY B.CUSTOMER_ID ORDER BY trunc(NVL(A.CLOSING_DATE, SYSDATE)," - + " 'mm') RANGE BETWEEN INTERVAL '3' MONTH(4) PRECEDING AND CURRENT ROW) AS cancelCount\n" - + "\t, row_number() OVER (PARTITION BY B.CUSTOMER_ID ORDER BY trunc(A.OPENING_DATE) DESC) AS row_flg\n" - + "FROM account_info A, CUSTOMER_INFO B\n" - + "WHERE A.CUSTOMER_ID = B.CUSTOMER_ID", format); - } + public void test_betweent_lost() { + // 此sql可以正常执行 + String sql = "SELECT B.CUSTOMER_ID customerId,B.CN_NAME NAME,OPENING_DATE,CLOSING_DATE,count(A.OPENING_DATE) over (partition BY B.CUSTOMER_ID ORDER BY trunc(A.OPENING_DATE,'mm') RANGE BETWEEN interval '3' month (4) preceding AND CURRENT ROW) AS createCount,count(A.CLOSING_DATE) over (partition BY B.CUSTOMER_ID ORDER BY trunc(NVL(A.CLOSING_DATE,SYSDATE),'mm') RANGE BETWEEN interval '3' month (4) preceding AND CURRENT ROW) AS cancelCount,row_number () over (partition BY B.CUSTOMER_ID ORDER BY trunc(A.OPENING_DATE) DESC) AS row_flg FROM account_info A,CUSTOMER_INFO B WHERE A.CUSTOMER_ID=B.CUSTOMER_ID"; + String format = SQLUtils.format(sql, DbType.oracle); + assertEquals("SELECT B.CUSTOMER_ID AS customerId, B.CN_NAME AS NAME, OPENING_DATE, CLOSING_DATE\n" + + "\t, count(A.OPENING_DATE) OVER (PARTITION BY B.CUSTOMER_ID ORDER BY trunc(A.OPENING_DATE, 'mm') RANGE " + + "BETWEEN INTERVAL '3' MONTH(4) PRECEDING AND CURRENT ROW) AS createCount\n" + + "\t, count(A.CLOSING_DATE) OVER (PARTITION BY B.CUSTOMER_ID ORDER BY trunc(NVL(A.CLOSING_DATE, SYSDATE)," + + " 'mm') RANGE BETWEEN INTERVAL '3' MONTH(4) PRECEDING AND CURRENT ROW) AS cancelCount\n" + + "\t, row_number() OVER (PARTITION BY B.CUSTOMER_ID ORDER BY trunc(A.OPENING_DATE) DESC) AS row_flg\n" + + "FROM account_info A, CUSTOMER_INFO B\n" + + "WHERE A.CUSTOMER_ID = B.CUSTOMER_ID", format); + } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue_685.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue_685.java index d91eb9dcc0..43dd702fda 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue_685.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue_685.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; public class Issue_685 extends TestCase { - public void test_for_issue() throws Exception { OracleStatementParser parser = new OracleStatementParser("select upper(*) from aa order by now()"); SQLStatement st = parser.parseStatement(); diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java index f7a6a385de..d8c67b5847 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java @@ -11,10 +11,9 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; public class Issue_697 extends TestCase { - public void test_for_issue() throws Exception { String sql = "insert into tag_rule_detail(id, gmt_create, gmt_modified, group_id, priority, rule_condition, rule_action) values(1010102, now(), now(), 10101, 0, 'flow=''trustLogin''', 'be:login,dev:pc, env:web, type:trust_login, from:$loginfrom, result:true') ;\n" - + "insert into tag_rule_detail(id, gmt_create, gmt_modified, group_id, priority, rule_condition, rule_action) values(1010103, now(), now(), 10101, 0, 'flow=''Ctr''', 'be:login,dev:pc, env:web, type:ctr, from:$loginfrom, result:true') ;"; + + "insert into tag_rule_detail(id, gmt_create, gmt_modified, group_id, priority, rule_condition, rule_action) values(1010103, now(), now(), 10101, 0, 'flow=''Ctr''', 'be:login,dev:pc, env:web, type:ctr, from:$loginfrom, result:true') ;"; String expected = "INSERT INTO tag_rule_detail (id, gmt_create, gmt_modified, group_id, priority\n" + "\t, rule_condition, rule_action)\n" + @@ -26,7 +25,6 @@ public void test_for_issue() throws Exception { "VALUES (1010103, now(), now(), 10101, 0\n" + "\t, 'flow=''Ctr''', 'be:login,dev:pc, env:web, type:ctr, from:$loginfrom, result:true');"; - Assert.assertEquals(expected, SQLUtils.formatMySql(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue_728.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue_728.java index 0bf51120bd..2f2ad92f65 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue_728.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue_728.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.WallUtils; public class Issue_728 extends TestCase { - public void test1() throws Exception { String sql = "select * from city_list where city_id = 3-1"; diff --git a/src/test/java/com/alibaba/druid/bvt/console/DruidStatNullDataTest.java b/src/test/java/com/alibaba/druid/bvt/console/DruidStatNullDataTest.java index feca788938..b6c5d66c79 100644 --- a/src/test/java/com/alibaba/druid/bvt/console/DruidStatNullDataTest.java +++ b/src/test/java/com/alibaba/druid/bvt/console/DruidStatNullDataTest.java @@ -15,7 +15,6 @@ import com.alibaba.druid.util.JdbcUtils; public class DruidStatNullDataTest extends TestCase { - private DruidDataSource dataSource; private static String getSelfPid() { @@ -23,7 +22,7 @@ private static String getSelfPid() { return pid; } - protected void createDs() throws Exception { + protected void createDs() throws Exception { dataSource = new DruidDataSource(); dataSource.setMinIdle(1); dataSource.setUrl("jdbc:h2:mem:test;"); @@ -31,17 +30,17 @@ protected void createDs() throws Exception { dataSource.setFilters("stat"); dataSource.setRemoveAbandoned(true); dataSource.setRemoveAbandonedTimeout(600); - //do not execute any sql, just init the datasource. - dataSource.init(); - - } + //do not execute any sql, just init the datasource. + dataSource.init(); + + } - protected void dispose() throws Exception { + protected void dispose() throws Exception { JdbcUtils.close(dataSource); } - public void test_printDruidStat() throws Exception { - createDs(); + public void test_printDruidStat() throws Exception { + createDs(); String pid = getSelfPid(); String[] cmdArray = {"-sql", pid}; Option opt = Option.parseOptions(cmdArray); @@ -52,11 +51,11 @@ public void test_printDruidStat() throws Exception { return; } - cmdArray = new String[] {"-act", pid}; + cmdArray = new String[]{"-act", pid}; opt = Option.parseOptions(cmdArray); DruidStat.printDruidStat(opt); - dispose(); - } + dispose(); + } // public static void main(String[] args) { // Result result = JUnitCore.runClasses(DruidStatNullDataTest.class); @@ -65,6 +64,5 @@ public void test_printDruidStat() throws Exception { // } // } - - + } diff --git a/src/test/java/com/alibaba/druid/bvt/console/DruidStatTest.java b/src/test/java/com/alibaba/druid/bvt/console/DruidStatTest.java index cc786296e6..0dc3390f39 100644 --- a/src/test/java/com/alibaba/druid/bvt/console/DruidStatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/console/DruidStatTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.util.JdbcUtils; public class DruidStatTest extends TestCase { - private DruidDataSource dataSource; private DruidDataSource dataSource2; @@ -72,31 +71,31 @@ public void test_printDruidStat() throws Exception { return; } - cmdArray = new String[] {"-sql","-id","1", pid}; + cmdArray = new String[]{"-sql", "-id", "1", pid}; opt = Option.parseOptions(cmdArray); DruidStat.printDruidStat(opt); - cmdArray = new String[] {"-sql","-detail", "-id","1", pid}; + cmdArray = new String[]{"-sql", "-detail", "-id", "1", pid}; opt = Option.parseOptions(cmdArray); DruidStat.printDruidStat(opt); - cmdArray = new String[] {"-ds",pid}; + cmdArray = new String[]{"-ds", pid}; opt = Option.parseOptions(cmdArray); - List ids = DruidStat.getDataSourceIds(opt); - opt.setDetailPrint(true); - opt.setId( ids.get(0).intValue()); + List ids = DruidStat.getDataSourceIds(opt); + opt.setDetailPrint(true); + opt.setId(ids.get(0).intValue()); - try { + try { DruidStat.printDruidStat(opt); } catch (IOException ex) { // skip return; } - + } - public void test_printDruidStat2() throws Exception { + public void test_printDruidStat2() throws Exception { String pid = getSelfPid(); String[] cmdArray = {"-act", pid}; Option opt = Option.parseOptions(cmdArray); @@ -112,8 +111,14 @@ public void test_printDruidStat2() throws Exception { // skip return; } finally { - if (stmt != null ) try { stmt.close(); } catch (Exception e) {} - if (conn != null ) try { conn.close(); } catch (Exception e) {} + if (stmt != null) try { + stmt.close(); + } catch (Exception e) { + } + if (conn != null) try { + conn.close(); + } catch (Exception e) { + } } } diff --git a/src/test/java/com/alibaba/druid/bvt/console/OptionTest.java b/src/test/java/com/alibaba/druid/bvt/console/OptionTest.java index d22e0ad15e..d5223c6a85 100644 --- a/src/test/java/com/alibaba/druid/bvt/console/OptionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/console/OptionTest.java @@ -12,9 +12,8 @@ public class OptionTest extends TestCase { - public void test_parseOptions() throws Exception { - String[] cmdArray = {"-sql","-ds", "200"}; + String[] cmdArray = {"-sql", "-ds", "200"}; Option opt = Option.parseOptions(cmdArray); Assert.assertNotNull(opt); Assert.assertTrue(opt.printSqlData()); @@ -22,7 +21,7 @@ public void test_parseOptions() throws Exception { Assert.assertFalse(opt.printActiveConn()); Assert.assertEquals(opt.getPid(), 200); - cmdArray = new String[] {"-act", "738"}; + cmdArray = new String[]{"-act", "738"}; opt = Option.parseOptions(cmdArray); Assert.assertNotNull(opt); Assert.assertFalse(opt.printSqlData()); @@ -30,7 +29,7 @@ public void test_parseOptions() throws Exception { Assert.assertTrue(opt.printActiveConn()); Assert.assertEquals(opt.getPid(), 738); - cmdArray = new String[] {"-ds", "-detail", "1319"}; + cmdArray = new String[]{"-ds", "-detail", "1319"}; opt = Option.parseOptions(cmdArray); Assert.assertNotNull(opt); Assert.assertFalse(opt.printSqlData()); @@ -38,14 +37,14 @@ public void test_parseOptions() throws Exception { Assert.assertFalse(opt.printActiveConn()); Assert.assertTrue(opt.isDetailPrint()); Assert.assertEquals(opt.getPid(), 1319); - - cmdArray = new String[] {"-sql","-id","5","200"}; + + cmdArray = new String[]{"-sql", "-id", "5", "200"}; opt = Option.parseOptions(cmdArray); Assert.assertNotNull(opt); Assert.assertEquals(opt.getId(), 5); - Assert.assertEquals(opt.getPid(), 200); + Assert.assertEquals(opt.getPid(), 200); - cmdArray = new String[] {"-sql","-id","5","200", "3"}; + cmdArray = new String[]{"-sql", "-id", "5", "200", "3"}; opt = Option.parseOptions(cmdArray); Assert.assertNotNull(opt); Assert.assertEquals(opt.getId(), 5); @@ -53,7 +52,7 @@ public void test_parseOptions() throws Exception { Assert.assertEquals(opt.getInterval(), 3); - cmdArray = new String[] {"-ds","-id","5", "-detail", "200", "3"}; + cmdArray = new String[]{"-ds", "-id", "5", "-detail", "200", "3"}; opt = Option.parseOptions(cmdArray); Assert.assertNotNull(opt); Assert.assertEquals(opt.getId(), 5); @@ -62,7 +61,7 @@ public void test_parseOptions() throws Exception { Assert.assertEquals(opt.isDetailPrint(), true); //not enough arguments - cmdArray = new String[] {}; + cmdArray = new String[]{}; try { opt = Option.parseOptions(cmdArray); } catch (OptionParseException e) { @@ -71,7 +70,7 @@ public void test_parseOptions() throws Exception { } //need pid - cmdArray = new String[] {"-ds"}; + cmdArray = new String[]{"-ds"}; try { opt = Option.parseOptions(cmdArray); } catch (Exception e) { @@ -85,10 +84,10 @@ public void test_printHelp() throws Exception { Option.printHelp(); } - public static void main(String[] args) { - Result result = JUnitCore.runClasses(OptionTest.class); - for (Failure failure : result.getFailures()) { - System.out.println(failure.toString()); - } - } + public static void main(String[] args) { + Result result = JUnitCore.runClasses(OptionTest.class); + for (Failure failure : result.getFailures()) { + System.out.println(failure.toString()); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/ClearFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/ClearFilterTest.java index 895c72500a..86e3fd61a4 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/ClearFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/ClearFilterTest.java @@ -23,16 +23,16 @@ public void test_filters() throws Exception { dataSource.setFilters("!encoding"); Assert.assertEquals(StatFilter.class.getName(), dataSource.getFilterClassNames().get(0)); Assert.assertEquals(EncodingConvertFilter.class.getName(), dataSource.getFilterClassNames().get(1)); - + dataSource.setConnectionProperties("druid.clearFiltersEnable=false"); Assert.assertFalse(dataSource.isClearFiltersEnable()); - + dataSource.setConnectionProperties("druid.clearFiltersEnable=true"); Assert.assertTrue(dataSource.isClearFiltersEnable()); - + dataSource.setConnectionProperties("druid.clearFiltersEnable=xx"); // no change Assert.assertTrue(dataSource.isClearFiltersEnable()); - + dataSource.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest.java index a2c6cf8a1c..e786cba57d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest.java @@ -34,23 +34,20 @@ import com.alibaba.druid.util.JdbcUtils; public class EncodingConvertFilterTest extends TestCase { - private DruidDataSource dataSource; - private static String CLIENT_ENCODING = "UTF-8"; - private static String SERVER_ENCODING = "ISO-8859-1"; + private static String CLIENT_ENCODING = "UTF-8"; + private static String SERVER_ENCODING = "ISO-8859-1"; - private static String text = "中华人民共和国"; + private static String text = "中华人民共和国"; protected void setUp() throws Exception { - dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setFilters("encoding"); dataSource.setDriver(new MockDriver() { - public ResultSet createResultSet(MockPreparedStatement stmt) { return new MyResultSet(stmt); } @@ -71,9 +68,8 @@ protected void tearDown() throws Exception { } public void test_stat() throws Exception { - Assert.assertTrue(dataSource.isInited()); - + EncodingConvertFilter filter = (EncodingConvertFilter) dataSource.getProxyFilters().get(0); DruidPooledConnection conn = dataSource.getConnection(); @@ -90,13 +86,13 @@ public void test_stat() throws Exception { Assert.assertFalse(param1.equals(PARAM_VALUE)); ResultSet rs = stmt.executeQuery(); - + MyResultSet rawRs = rs.unwrap(MyResultSet.class); rawRs.setValue(filter.encode((ConnectionProxy) conn.getConnection(), text)); - + rs.next(); - Assert.assertEquals(text, rs.getString(1)); + Assert.assertEquals(text, rs.getString(1)); rs.close(); stmt.close(); @@ -106,10 +102,9 @@ public void test_stat() throws Exception { } public static class MyResultSet extends MockResultSet { - private String value; - public MyResultSet(Statement statement){ + public MyResultSet(Statement statement) { super(statement); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest2.java index 523c27aa16..ab5e9c4e45 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest2.java @@ -44,23 +44,20 @@ import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; public class EncodingConvertFilterTest2 extends TestCase { - private DruidDataSource dataSource; - private static String CLIENT_ENCODING = "UTF-8"; - private static String SERVER_ENCODING = "ISO-8859-1"; + private static String CLIENT_ENCODING = "UTF-8"; + private static String SERVER_ENCODING = "ISO-8859-1"; - private static String text = "中华人民共和国"; + private static String text = "中华人民共和国"; protected void setUp() throws Exception { - dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setFilters("encoding"); dataSource.setDriver(new MockDriver() { - public ResultSet createResultSet(MockPreparedStatement stmt) { return new MyResultSet(stmt); } @@ -81,7 +78,6 @@ protected void tearDown() throws Exception { } public void test_stat() throws Exception { - Assert.assertTrue(dataSource.isInited()); EncodingConvertFilter filter = (EncodingConvertFilter) dataSource.getProxyFilters().get(0); @@ -115,127 +111,127 @@ public void test_stat() throws Exception { Assert.assertEquals(text, rs.getString("1")); Assert.assertEquals(text, rs.getObject(1)); Assert.assertEquals(text, rs.getObject("1")); - Assert.assertEquals(text, rs.getObject(1, Collections.>emptyMap())); - Assert.assertEquals(text, rs.getObject("1", Collections.>emptyMap())); - + Assert.assertEquals(text, rs.getObject(1, Collections.>emptyMap())); + Assert.assertEquals(text, rs.getObject("1", Collections.>emptyMap())); + Assert.assertEquals(text, rs.getString(2)); Assert.assertEquals(text, rs.getString("2")); Assert.assertEquals(text, rs.getObject(2)); Assert.assertEquals(text, rs.getObject("2")); - Assert.assertEquals(text, rs.getObject(2, Collections.>emptyMap())); - Assert.assertEquals(text, rs.getObject("2", Collections.>emptyMap())); - + Assert.assertEquals(text, rs.getObject(2, Collections.>emptyMap())); + Assert.assertEquals(text, rs.getObject("2", Collections.>emptyMap())); + Assert.assertEquals(text, rs.getString(3)); Assert.assertEquals(text, rs.getString("3")); Assert.assertEquals(text, rs.getObject(3)); Assert.assertEquals(text, rs.getObject("3")); - Assert.assertEquals(text, rs.getObject(3, Collections.>emptyMap())); - Assert.assertEquals(text, rs.getObject("3", Collections.>emptyMap())); - + Assert.assertEquals(text, rs.getObject(3, Collections.>emptyMap())); + Assert.assertEquals(text, rs.getObject("3", Collections.>emptyMap())); + Assert.assertEquals(text, rs.getString(4)); Assert.assertEquals(text, rs.getString("4")); Assert.assertEquals(text, rs.getObject(4)); Assert.assertEquals(text, rs.getObject("4")); - Assert.assertEquals(text, rs.getObject(4, Collections.>emptyMap())); - Assert.assertEquals(text, rs.getObject("4", Collections.>emptyMap())); - + Assert.assertEquals(text, rs.getObject(4, Collections.>emptyMap())); + Assert.assertEquals(text, rs.getObject("4", Collections.>emptyMap())); + stmt.registerOutParameter(2, Types.VARCHAR); stmt.registerOutParameter(3, Types.CLOB); raw.getOutParameters().add(param1); raw.getOutParameters().add(param1); - - + + Assert.assertEquals(C_TEXT, stmt.getString(4)); Assert.assertEquals(C_TEXT, stmt.getString("4")); Assert.assertEquals(C_TEXT, stmt.getObject(4)); Assert.assertEquals(C_TEXT, stmt.getObject("4")); - Assert.assertEquals(C_TEXT, stmt.getObject(4, Collections.>emptyMap())); - Assert.assertEquals(C_TEXT, stmt.getObject("4", Collections.>emptyMap())); - + Assert.assertEquals(C_TEXT, stmt.getObject(4, Collections.>emptyMap())); + Assert.assertEquals(C_TEXT, stmt.getObject("4", Collections.>emptyMap())); + Assert.assertEquals(C_TEXT, stmt.getString(5)); Assert.assertEquals(C_TEXT, stmt.getString("5")); Assert.assertEquals(C_TEXT, stmt.getObject(5)); Assert.assertEquals(C_TEXT, stmt.getObject("5")); - Assert.assertEquals(C_TEXT, stmt.getObject(5, Collections.>emptyMap())); - Assert.assertEquals(C_TEXT, stmt.getObject("5", Collections.>emptyMap())); - + Assert.assertEquals(C_TEXT, stmt.getObject(5, Collections.>emptyMap())); + Assert.assertEquals(C_TEXT, stmt.getObject("5", Collections.>emptyMap())); + stmt.setObject(1, C_TEXT); Assert.assertEquals(param1, raw.getParameters().get(0)); - + stmt.setObject(2, new StringReader(C_TEXT)); Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(1))); - + stmt.setCharacterStream(3, new StringReader(C_TEXT)); Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(2))); - + stmt.setCharacterStream(4, new StringReader(C_TEXT), C_TEXT.length()); Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(3))); - + stmt.setCharacterStream(5, new StringReader(C_TEXT), (long) C_TEXT.length()); Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(4))); - + stmt.setObject(6, C_TEXT, Types.VARCHAR); Assert.assertEquals(param1, raw.getParameters().get(5)); stmt.setObject(7, new StringReader(C_TEXT), Types.VARCHAR); Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(6))); - + stmt.setObject(8, C_TEXT, Types.VARCHAR, 0); Assert.assertEquals(param1, raw.getParameters().get(7)); stmt.setObject(9, new StringReader(C_TEXT), Types.VARCHAR, 0); Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(8))); - + stmt.setObject(10, 1, Types.INTEGER); Assert.assertEquals(1, raw.getParameters().get(9)); - + stmt.setObject(11, 2, Types.INTEGER, 0); Assert.assertEquals(2, raw.getParameters().get(10)); - + stmt.setObject(12, 3); Assert.assertEquals(3, raw.getParameters().get(11)); - + stmt.setObject("13", C_TEXT, Types.VARCHAR); Assert.assertEquals(param1, raw.getParameters().get(12)); stmt.setObject("14", new StringReader(C_TEXT), Types.VARCHAR); Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(13))); - + stmt.setObject("15", C_TEXT, Types.VARCHAR, 0); Assert.assertEquals(param1, raw.getParameters().get(14)); stmt.setObject("16", new StringReader(C_TEXT), Types.VARCHAR, 0); Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(15))); - + stmt.setObject("17", 1, Types.INTEGER); Assert.assertEquals(1, raw.getParameters().get(16)); - + stmt.setObject("18", 2, Types.INTEGER, 0); Assert.assertEquals(2, raw.getParameters().get(17)); - + stmt.setObject("19", 3); Assert.assertEquals(3, raw.getParameters().get(18)); - + stmt.setCharacterStream("20", new StringReader(C_TEXT)); Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(19))); - + stmt.setCharacterStream("21", new StringReader(C_TEXT), C_TEXT.length()); Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(20))); - + stmt.setCharacterStream("22", new StringReader(C_TEXT), (long) C_TEXT.length()); Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(21))); - + stmt.setObject("23", C_TEXT); Assert.assertEquals(param1, raw.getParameters().get(22)); - + stmt.setObject("24", new StringReader(C_TEXT)); Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(23))); - + stmt.setObject("25", 1, Types.INTEGER); Assert.assertEquals(1, raw.getParameters().get(24)); - + stmt.setObject("26", 2, Types.INTEGER, 0); Assert.assertEquals(2, raw.getParameters().get(25)); - + stmt.setObject("27", 3); Assert.assertEquals(3, raw.getParameters().get(26)); - + rs.close(); stmt.close(); @@ -244,11 +240,10 @@ public void test_stat() throws Exception { } public static class MyResultSet extends MockResultSet { - - private String value; + private String value; private MockResultSetMetaData meta = new MockResultSetMetaData(); - public MyResultSet(Statement statement){ + public MyResultSet(Statement statement) { super(statement); { ColumnMetaData column = new ColumnMetaData(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java index 3d56a66947..b161838e66 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java @@ -22,7 +22,6 @@ import com.alibaba.druid.util.JdbcUtils; public class FilterChainImplTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -51,26 +50,26 @@ public void test_unwrap() throws Exception { public void test_unwrap_5() throws Exception { Assert.assertNull(new FilterChainImpl(dataSource).wrap((ConnectionProxy) dataSource.getConnection().getConnection(), - (Clob) null)); + (Clob) null)); } public void test_unwrap_6() throws Exception { Connection conn = dataSource.getConnection(); Assert.assertTrue(new FilterChainImpl(dataSource).wrap((ConnectionProxy) dataSource.getConnection().getConnection(), - new MockNClob()) instanceof NClob); + new MockNClob()) instanceof NClob); conn.close(); } public void test_unwrap_8() throws Exception { Connection conn = dataSource.getConnection(); Assert.assertTrue(new FilterChainImpl(dataSource).wrap((ConnectionProxy) dataSource.getConnection().getConnection(), - (Clob) new MockNClob()) instanceof NClob); + (Clob) new MockNClob()) instanceof NClob); conn.close(); } public void test_unwrap_7() throws Exception { Assert.assertNull(new FilterChainImpl(dataSource).wrap((ConnectionProxy) dataSource.getConnection().getConnection(), - (NClob) null)); + (NClob) null)); } public void test_unwrap_9() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest2.java index fe95f61035..04ba6f9fe1 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest2.java @@ -13,7 +13,6 @@ import com.alibaba.druid.util.JdbcUtils; public class FilterChainImplTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -21,7 +20,8 @@ protected void setUp() throws Exception { dataSource.setUrl("jdbc:mock:xxx"); dataSource.setFilters("stat,log4j,wall,encoding"); - dataSource.getProxyFilters().add(new FilterAdapter() {} ); + dataSource.getProxyFilters().add(new FilterAdapter() { + }); dataSource.setDbType("mysql"); dataSource.init(); @@ -30,622 +30,622 @@ protected void setUp() throws Exception { protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } - + public void test_getURL() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getURL(1)); - + stmt.close(); conn.close(); } - + public void test_getURL_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getURL("1")); - + stmt.close(); conn.close(); } - + public void test_getString() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getString(1)); - + stmt.close(); conn.close(); } - + public void test_getString_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getString("1")); - + stmt.close(); conn.close(); } - + public void test_getBoolean() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertFalse(stmt.getBoolean(1)); - + stmt.close(); conn.close(); } - + public void test_getBoolean_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertFalse(stmt.getBoolean("1")); - + stmt.close(); conn.close(); } - + public void test_getByte() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertEquals(0, stmt.getByte(1)); - + stmt.close(); conn.close(); } - + public void test_getByte_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertEquals(0, stmt.getByte("1")); - + stmt.close(); conn.close(); } - + public void test_getShort() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertEquals(0, stmt.getShort(1)); - + stmt.close(); conn.close(); } - + public void test_getShort_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertEquals(0, stmt.getShort("1")); - + stmt.close(); conn.close(); } - + public void test_getInt() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertEquals(0, stmt.getInt(1)); - + stmt.close(); conn.close(); } - + public void test_getInt_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertEquals(0, stmt.getInt("1")); - + stmt.close(); conn.close(); } - + public void test_getLong() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertEquals(0, stmt.getLong(1)); - + stmt.close(); conn.close(); } - + public void test_getLong_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertEquals(0, stmt.getLong("1")); - + stmt.close(); conn.close(); } - + public void test_getFloat() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertTrue(0F == stmt.getFloat(1)); - + stmt.close(); conn.close(); } - + public void test_getFloat_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertTrue(0F == stmt.getFloat("1")); - + stmt.close(); conn.close(); } - + public void test_getDouble() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertTrue(0D == stmt.getDouble(1)); - + stmt.close(); conn.close(); } - + public void test_getDouble_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertTrue(0D == stmt.getDouble("1")); - + stmt.close(); conn.close(); } - - + + public void test_getBytes() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getBytes(1)); - + stmt.close(); conn.close(); } - + public void test_getBytes_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getBytes("1")); - + stmt.close(); conn.close(); } - - + + public void test_getDate() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getDate(1)); - + stmt.close(); conn.close(); } - + public void test_getDate_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getDate("1")); - + stmt.close(); conn.close(); } - + public void test_getTime() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getTime(1)); - + stmt.close(); conn.close(); } - + public void test_getTime_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getTime("1")); - + stmt.close(); conn.close(); } - + public void test_getTimestamp() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getTimestamp(1)); - + stmt.close(); conn.close(); } - + public void test_getTimestamp_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getTimestamp("1")); - + stmt.close(); conn.close(); } - + public void test_getBigDecimal() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getBigDecimal(1)); - + stmt.close(); conn.close(); } - + public void test_getBigDecimal_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getBigDecimal("1")); - + stmt.close(); conn.close(); } - + public void test_getRef() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getRef(1)); - + stmt.close(); conn.close(); } - + public void test_getRef_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getRef("1")); - + stmt.close(); conn.close(); } - + public void test_getBlob() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getBlob(1)); - + stmt.close(); conn.close(); } - + public void test_getBlob_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getBlob("1")); - + stmt.close(); conn.close(); } - + public void test_getArray() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getArray(1)); - + stmt.close(); conn.close(); } - + public void test_getArray_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getArray("1")); - + stmt.close(); conn.close(); } - + public void test_getDate_2() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getDate(1, null)); - + stmt.close(); conn.close(); } - + public void test_getDate_3() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getDate("1", null)); - + stmt.close(); conn.close(); } - + public void test_getTime_2() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getTime(1, null)); - + stmt.close(); conn.close(); } - + public void test_getTime_3() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getTime("1", null)); - + stmt.close(); conn.close(); } - + public void test_getTimestamp_2() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getTimestamp(1, null)); - + stmt.close(); conn.close(); } - + public void test_getTimestamp_3() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getTimestamp("1", null)); - + stmt.close(); conn.close(); } - + public void test_getRowId() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getRowId(1)); - + stmt.close(); conn.close(); } - + public void test_getRowId_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getRowId("1")); - + stmt.close(); conn.close(); } - + public void test_getNClob() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getNClob(1)); - + stmt.close(); conn.close(); } - + public void test_getNClob_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getNClob("1")); - + stmt.close(); conn.close(); } - + public void test_getSQLXML() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getSQLXML(1)); - + stmt.close(); conn.close(); } - + public void test_getSQLXML_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getSQLXML("1")); - + stmt.close(); conn.close(); } - + public void test_getNString() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getNString(1)); - + stmt.close(); conn.close(); } - + public void test_getNString_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getNString("1")); - + stmt.close(); conn.close(); } - + public void test_getNCharacterStream() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getNCharacterStream(1)); - + stmt.close(); conn.close(); } - + public void test_getNCharacterStream_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getNCharacterStream("1")); - + stmt.close(); conn.close(); } - + public void test_getCharacterStream() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getCharacterStream(1)); - + stmt.close(); conn.close(); } - + public void test_getCharacterStream_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getCharacterStream("1")); - + stmt.close(); conn.close(); } - + public void test_getObject() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getObject(1)); - + stmt.close(); conn.close(); } - + public void test_getObject_1() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getObject("1")); - + stmt.close(); conn.close(); } - + public void test_getObject_2() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getObject(1, Collections.>emptyMap())); - + stmt.close(); conn.close(); } - + public void test_getObject_3() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - + Assert.assertNull(stmt.getObject("1", Collections.>emptyMap())); - + stmt.close(); conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest3.java index 9cc8a14d02..5e77a37395 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest3.java @@ -19,7 +19,6 @@ import com.alibaba.druid.util.JdbcUtils; public class FilterChainImplTest3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -27,14 +26,15 @@ protected void setUp() throws Exception { dataSource.setUrl("jdbc:mock:xxx"); dataSource.setFilters("stat,log4j,wall,encoding"); - dataSource.getProxyFilters().add(new FilterAdapter() {} ); + dataSource.getProxyFilters().add(new FilterAdapter() { + }); dataSource.setDbType("mysql"); - + dataSource.setDriver(new MockDriver() { public ResultSet executeQuery(MockStatementBase stmt, String sql) throws SQLException { return null; } - + public MockStatement createMockStatement(MockConnection conn) { return new MockStatement(conn) { public ResultSet getResultSet() throws SQLException { @@ -59,7 +59,7 @@ public void test_executeQuery() throws Exception { stmt.close(); conn.close(); } - + public void test_executeQuery_2() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareCall("select ?"); @@ -68,7 +68,7 @@ public void test_executeQuery_2() throws Exception { stmt.close(); conn.close(); } - + public void test_executeQuery_3() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); @@ -76,7 +76,7 @@ public void test_executeQuery_3() throws Exception { stmt.close(); conn.close(); } - + public void test_execute() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob.java index 9464c08ac7..c78593016a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob.java @@ -34,12 +34,11 @@ import java.util.Properties; public class FilterChainTest_Clob extends TestCase { - private DruidDataSource dataSource; - private StatementProxy statement; - private MockResultSet mockResultSet; + private StatementProxy statement; + private MockResultSet mockResultSet; - private int invokeCount = 0; + private int invokeCount = 0; protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -48,7 +47,6 @@ protected void setUp() throws Exception { statement = new StatementProxyImpl(conn, null, 1); mockResultSet = new MockResultSet(null) { - public Object getObject(int columnIndex) throws SQLException { invokeCount++; return new MockClob(); @@ -97,21 +95,21 @@ public void test_resultSet_getObject_1() throws Exception { Assert.assertTrue(clob instanceof ClobProxy); Assert.assertEquals(1, invokeCount); } - + public void test_resultSet_getObject_2() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - + Clob clob = (Clob) chain.resultSet_getObject(new ResultSetProxyImpl(statement, mockResultSet, 1, null), 1, Collections.>emptyMap()); - + Assert.assertTrue(clob instanceof ClobProxy); Assert.assertEquals(1, invokeCount); } - + public void test_resultSet_getObject_3() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - + Clob clob = (Clob) chain.resultSet_getObject(new ResultSetProxyImpl(statement, mockResultSet, 1, null), "1", Collections.>emptyMap()); - + Assert.assertTrue(clob instanceof ClobProxy); Assert.assertEquals(1, invokeCount); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob_2.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob_2.java index f013b0b24d..bf27b8fad4 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob_2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob_2.java @@ -34,17 +34,15 @@ import com.alibaba.druid.util.JdbcUtils; public class FilterChainTest_Clob_2 extends TestCase { - - private DruidDataSource dataSource; + private DruidDataSource dataSource; private CallableStatementProxy statement; - private int invokeCount = 0; + private int invokeCount = 0; protected void setUp() throws Exception { dataSource = new DruidDataSource(); MockCallableStatement mockStmt = new MockCallableStatement(null, "") { - @Override public Object getObject(int parameterIndex) throws SQLException { invokeCount++; @@ -101,7 +99,7 @@ public void test_getObject_1() throws Exception { public void test_getObject_2() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - Clob clob = (Clob) chain.callableStatement_getObject(statement, 1, Collections.> emptyMap()); + Clob clob = (Clob) chain.callableStatement_getObject(statement, 1, Collections.>emptyMap()); Assert.assertTrue(clob instanceof ClobProxy); Assert.assertEquals(1, invokeCount); @@ -110,7 +108,7 @@ public void test_getObject_2() throws Exception { public void test_getObject_3() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - Clob clob = (Clob) chain.callableStatement_getObject(statement, "1", Collections.> emptyMap()); + Clob clob = (Clob) chain.callableStatement_getObject(statement, "1", Collections.>emptyMap()); Assert.assertTrue(clob instanceof ClobProxy); Assert.assertEquals(1, invokeCount); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob.java index ef8d742698..0784f673cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob.java @@ -36,12 +36,11 @@ import com.alibaba.druid.util.JdbcUtils; public class FilterChainTest_NClob extends TestCase { - private DruidDataSource dataSource; - private StatementProxy statement; - private MockResultSet mockResultSet; + private StatementProxy statement; + private MockResultSet mockResultSet; - private int invokeCount = 0; + private int invokeCount = 0; protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -49,7 +48,6 @@ protected void setUp() throws Exception { statement = new StatementProxyImpl(conn, null, 1); mockResultSet = new MockResultSet(null) { - public Object getObject(int columnIndex) throws SQLException { invokeCount++; return new MockNClob(); @@ -98,21 +96,21 @@ public void test_resultSet_getObject_1() throws Exception { Assert.assertTrue(clob instanceof NClobProxy); Assert.assertEquals(1, invokeCount); } - + public void test_resultSet_getObject_2() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - + Clob clob = (Clob) chain.resultSet_getObject(new ResultSetProxyImpl(statement, mockResultSet, 1, null), 1, Collections.>emptyMap()); - + Assert.assertTrue(clob instanceof NClobProxy); Assert.assertEquals(1, invokeCount); } - + public void test_resultSet_getObject_3() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - + Clob clob = (Clob) chain.resultSet_getObject(new ResultSetProxyImpl(statement, mockResultSet, 1, null), "1", Collections.>emptyMap()); - + Assert.assertTrue(clob instanceof NClobProxy); Assert.assertEquals(1, invokeCount); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob_2.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob_2.java index 345e0d6e08..222da645d2 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob_2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob_2.java @@ -34,17 +34,15 @@ import com.alibaba.druid.util.JdbcUtils; public class FilterChainTest_NClob_2 extends TestCase { - - private DruidDataSource dataSource; + private DruidDataSource dataSource; private CallableStatementProxy statement; - private int invokeCount = 0; + private int invokeCount = 0; protected void setUp() throws Exception { dataSource = new DruidDataSource(); MockCallableStatement mockStmt = new MockCallableStatement(null, "") { - @Override public Object getObject(int parameterIndex) throws SQLException { invokeCount++; @@ -70,16 +68,16 @@ public void test_getClob() throws Exception { Assert.assertTrue(clob instanceof NClobProxy); Assert.assertEquals(1, invokeCount); } - + public void test_getClob_1() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - + Clob clob = chain.callableStatement_getClob(statement, "1"); - + Assert.assertTrue(clob instanceof NClobProxy); Assert.assertEquals(1, invokeCount); } - + public void test_getObject() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); @@ -89,16 +87,16 @@ public void test_getObject() throws Exception { Assert.assertTrue(clob instanceof NClobProxy); Assert.assertEquals(1, invokeCount); } - + public void test_getObject_1() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - + Clob clob = (Clob) chain.callableStatement_getObject(statement, "1"); - + Assert.assertTrue(clob instanceof NClobProxy); Assert.assertEquals(1, invokeCount); } - + public void test_getObject_2() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); @@ -107,12 +105,12 @@ public void test_getObject_2() throws Exception { Assert.assertTrue(clob instanceof NClobProxy); Assert.assertEquals(1, invokeCount); } - + public void test_getObject_3() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - + Clob clob = (Clob) chain.callableStatement_getObject(statement, "1", Collections.>emptyMap()); - + Assert.assertTrue(clob instanceof NClobProxy); Assert.assertEquals(1, invokeCount); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet.java index 984afa1cb5..d96824f341 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet.java @@ -33,19 +33,17 @@ import com.alibaba.druid.util.JdbcUtils; public class FilterChainTest_ResultSet extends TestCase { - private DruidDataSource dataSource; - private StatementProxy statement; - private MockResultSet mockResultSet; + private StatementProxy statement; + private MockResultSet mockResultSet; - private int invokeCount = 0; + private int invokeCount = 0; protected void setUp() throws Exception { dataSource = new DruidDataSource(); statement = new StatementProxyImpl(null, null, 1); mockResultSet = new MockResultSet(null) { - public Object getObject(int columnIndex) throws SQLException { invokeCount++; return new MockResultSet(null); @@ -76,21 +74,21 @@ public void test_resultSet_getObject_1() throws Exception { Assert.assertTrue(clob instanceof ResultSetProxy); Assert.assertEquals(1, invokeCount); } - + public void test_resultSet_getObject_2() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - + ResultSet clob = (ResultSet) chain.resultSet_getObject(new ResultSetProxyImpl(statement, mockResultSet, 1, null), 1, Collections.>emptyMap()); - + Assert.assertTrue(clob instanceof ResultSetProxy); Assert.assertEquals(1, invokeCount); } - + public void test_resultSet_getObject_3() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - + ResultSet clob = (ResultSet) chain.resultSet_getObject(new ResultSetProxyImpl(statement, mockResultSet, 1, null), "1", Collections.>emptyMap()); - + Assert.assertTrue(clob instanceof ResultSetProxy); Assert.assertEquals(1, invokeCount); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet_2.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet_2.java index d9066e0ad6..df6dd2ae84 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet_2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet_2.java @@ -35,17 +35,15 @@ import com.alibaba.druid.util.JdbcUtils; public class FilterChainTest_ResultSet_2 extends TestCase { - - private DruidDataSource dataSource; + private DruidDataSource dataSource; private CallableStatementProxy statement; - private int invokeCount = 0; + private int invokeCount = 0; protected void setUp() throws Exception { dataSource = new DruidDataSource(); ConnectionProxyImpl conn = new ConnectionProxyImpl(dataSource, null, new Properties(), 0); MockCallableStatement mockStmt = new MockCallableStatement(null, "") { - @Override public Object getObject(int parameterIndex) throws SQLException { invokeCount++; @@ -84,7 +82,7 @@ public void test_getObject_1() throws Exception { public void test_getObject_2() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - ResultSet clob = (ResultSet) chain.callableStatement_getObject(statement, 1, Collections.> emptyMap()); + ResultSet clob = (ResultSet) chain.callableStatement_getObject(statement, 1, Collections.>emptyMap()); Assert.assertTrue(clob instanceof ResultSetProxy); Assert.assertEquals(1, invokeCount); @@ -93,7 +91,7 @@ public void test_getObject_2() throws Exception { public void test_getObject_3() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - ResultSet clob = (ResultSet) chain.callableStatement_getObject(statement, "1", Collections.> emptyMap()); + ResultSet clob = (ResultSet) chain.callableStatement_getObject(statement, "1", Collections.>emptyMap()); Assert.assertTrue(clob instanceof ResultSetProxy); Assert.assertEquals(1, invokeCount); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterDatasourceConnectAndRecycleFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterDatasourceConnectAndRecycleFilterTest.java index 01a26a3341..138dad8543 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterDatasourceConnectAndRecycleFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterDatasourceConnectAndRecycleFilterTest.java @@ -31,9 +31,8 @@ import com.alibaba.druid.pool.DruidPooledConnection; public class FilterDatasourceConnectAndRecycleFilterTest extends TestCase { - - TestFilter filter = new TestFilter(); - List filterList = new ArrayList(); + TestFilter filter = new TestFilter(); + List filterList = new ArrayList(); private DruidDataSource dataSource = new DruidDataSource(); protected void setUp() throws Exception { @@ -41,13 +40,12 @@ protected void setUp() throws Exception { dataSource.setProxyFilters(filterList); dataSource.setUrl("jdbc:mock:"); } - + protected void tearDown() throws Exception { dataSource.close(); } public void test() throws Exception { - Assert.assertEquals(0, filter.getDataSourceConnectCount()); Assert.assertEquals(0, filter.getDataSourceRecycleCount()); Connection conn = dataSource.getConnection(); @@ -59,7 +57,6 @@ public void test() throws Exception { } public static class TestFilter extends FilterAdapter { - private AtomicLong dataSourceConnectCount = new AtomicLong(); private AtomicLong dataSourceRecycleCount = new AtomicLong(); @@ -71,7 +68,7 @@ public void dataSource_releaseConnection(FilterChain chain, DruidPooledConnectio @Override public DruidPooledConnection dataSource_getConnection(FilterChain chain, DruidDataSource dataSource, - long maxWaitMillis) throws SQLException { + long maxWaitMillis) throws SQLException { dataSourceConnectCount.incrementAndGet(); return chain.dataSource_connect(dataSource, maxWaitMillis); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterManagerTest.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterManagerTest.java index 8a9cfb5726..0f7362c1d2 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterManagerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterManagerTest.java @@ -12,18 +12,17 @@ import com.alibaba.druid.filter.FilterManager; public class FilterManagerTest extends TestCase { + static { + ClassLoader current = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(null); + + Assert.assertNotNull(FilterManager.getFilter("stat")); + } finally { + Thread.currentThread().setContextClassLoader(current); + } + } - static { - ClassLoader current = Thread.currentThread().getContextClassLoader(); - try { - Thread.currentThread().setContextClassLoader(null); - - Assert.assertNotNull(FilterManager.getFilter("stat")); - } finally { - Thread.currentThread().setContextClassLoader(current); - } - } - public void test_instance() throws Exception { new FilterManager(); } @@ -38,10 +37,10 @@ public void test_loadFilter() throws Exception { } Assert.assertNotNull(error); } - + public void test_loadFilter_2() throws Exception { Exception error = null; - + try { FilterManager.loadFilter(new ArrayList(), ErrorFilter.class.getName()); } catch (SQLException e) { @@ -49,11 +48,10 @@ public void test_loadFilter_2() throws Exception { } Assert.assertNotNull(error); } - - public static class ErrorFilter extends FilterAdapter { - public ErrorFilter(){ + public static class ErrorFilter extends FilterAdapter { + public ErrorFilter() { throw new RuntimeException(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/ReuseStatFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/ReuseStatFilterTest.java index ad35afedd8..083af04db6 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/ReuseStatFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/ReuseStatFilterTest.java @@ -7,7 +7,6 @@ import com.alibaba.druid.util.JdbcUtils; public class ReuseStatFilterTest extends TestCase { - private DruidDataSource dataSourceA; private DruidDataSource dataSourceB; @@ -17,18 +16,17 @@ protected void setUp() throws Exception { dataSourceA.setUrl("jdbc:mock:xxx_A"); dataSourceB.setUrl("jdbc:mock:xxx_B"); - + StatFilter filter = new StatFilter(); - + dataSourceA.getProxyFilters().add(filter); dataSourceB.getProxyFilters().add(filter); dataSourceA.init(); dataSourceB.init(); } - + public void test_execute() throws Exception { - } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/Slf4jFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/Slf4jFilterTest.java index 67c86685f1..e0d7b50539 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/Slf4jFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/Slf4jFilterTest.java @@ -11,7 +11,6 @@ import com.alibaba.druid.util.JdbcUtils; public class Slf4jFilterTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -28,10 +27,10 @@ protected void tearDown() throws Exception { public void test_slf4j() throws Exception { dataSource.init(); - + Slf4jLogFilter filter = dataSource.unwrap(Slf4jLogFilter.class); Assert.assertNotNull(filter); - + Connection conn = dataSource.getConnection(); conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterAfterResetTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterAfterResetTest.java index f66fd90c5c..a296fef53f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterAfterResetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterAfterResetTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterAfterResetTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -45,7 +44,6 @@ protected void tearDown() throws Exception { } public void test_stat() throws Exception { - final String sql = "SELECT 1"; Assert.assertTrue(dataSource.isInited()); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterBuildSlowParameterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterBuildSlowParameterTest.java index 504375f8d5..8e613402b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterBuildSlowParameterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterBuildSlowParameterTest.java @@ -43,7 +43,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterBuildSlowParameterTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -55,7 +54,6 @@ protected void setUp() throws Exception { dataSource.setConnectionProperties("druid.stat.slowSqlMillis=1"); MockDriver driver = new MockDriver() { - public ResultSet executeQuery(MockStatementBase stmt, String sql) throws SQLException { try { Thread.sleep(2); @@ -203,35 +201,35 @@ public void test_buildSlowSql() throws Exception { for (int i = 0; i < 10; ++i) { buf.append("中国abcdefghijklmnABCDEFGHIJKLMN1234567890!@#$%^&*("); } - + Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement(sql); - + stmt.setBinaryStream(1, new ByteInputStream(new byte[0])); stmt.setString(2, buf.toString()); stmt.setTime(3, new Time(currentMillis)); stmt.setBigDecimal(4, new BigDecimal("56789.123")); stmt.setRowId(5, new MockRowId()); - + ResultSet rs = stmt.executeQuery(); rs.close(); - + stmt.close(); - + conn.close(); - + // ////// - + JdbcSqlStat sqlStat = dataSource.getDataSourceStat().getSqlStat(sql); Assert.assertNotNull(sqlStat); - + String slowParameters = sqlStat.getLastSlowParameters(); Assert.assertNotNull(slowParameters); - + List parameters = (List) JSONUtils.parse(slowParameters); Assert.assertEquals(5, parameters.size()); - + Assert.assertEquals("", parameters.get(0)); Assert.assertEquals(buf.substring(0, 97) + "...", parameters.get(1)); Assert.assertEquals(dateText, parameters.get(2)); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterClobTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterClobTest.java index 5b4246a532..5643b3a2a5 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterClobTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterClobTest.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterClobTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -64,10 +63,10 @@ public void test_clob() throws Exception { stmt.close(); conn.close(); - + JdbcSqlStat sqlStat = dataSource.getDataSourceStat().getSqlStat(sql); Assert.assertNotNull(sqlStat); - + Assert.assertEquals(1, sqlStat.getClobOpenCount()); sqlStat.reset(); Assert.assertEquals(0, sqlStat.getClobOpenCount()); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecErrorTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecErrorTest.java index 4d7e490169..a155979d7a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecErrorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecErrorTest.java @@ -18,7 +18,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterExecErrorTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -28,16 +27,15 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public ResultSetProxy statement_executeQuery(FilterChain chain, StatementProxy statement, String sql) - throws SQLException { + throws SQLException { throw new SQLException(); } @Override public ResultSetProxy preparedStatement_executeQuery(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { + throws SQLException { throw new SQLException(); } }); @@ -62,7 +60,6 @@ public void test_stat() throws Exception { try { stmt.executeQuery(); } catch (SQLException eror) { - } finally { JdbcUtils.close(stmt); JdbcUtils.close(conn); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java index 10230b3a85..e07acf5755 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterExecuteFirstResultSetTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -42,7 +41,6 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(false); MockDriver driver = new MockDriver() { - public MockPreparedStatement createMockPreparedStatement(MockConnection conn, String sql) { return new MyMockPreparedStatement(conn, sql); } @@ -58,7 +56,6 @@ protected void tearDown() throws Exception { } public void test_stat() throws Exception { - Assert.assertTrue(dataSource.isInited()); final String sql = "select 1"; @@ -85,8 +82,7 @@ public void test_stat() throws Exception { } static class MyMockPreparedStatement extends MockPreparedStatement { - - public MyMockPreparedStatement(MockConnection conn, String sql){ + public MyMockPreparedStatement(MockConnection conn, String sql) { super(conn, sql); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java index 5a27f9d31c..eb75a4c252 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterExecuteTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -41,7 +40,6 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(false); MockDriver driver = new MockDriver() { - public MockPreparedStatement createMockPreparedStatement(MockConnection conn, String sql) { return new MyMockPreparedStatement(conn, sql); } @@ -57,16 +55,15 @@ protected void tearDown() throws Exception { } public void test_stat() throws Exception { - Assert.assertTrue(dataSource.isInited()); final String sql = "update x"; - + Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement(sql); - + Assert.assertEquals(0, dataSource.getDataSourceStat().getSqlStat(sql).getExecuteAndResultHoldTimeHistogramSum()); - + boolean firstResult = stmt.execute(); Assert.assertFalse(firstResult); @@ -82,8 +79,7 @@ public void test_stat() throws Exception { } static class MyMockPreparedStatement extends MockPreparedStatement { - - public MyMockPreparedStatement(MockConnection conn, String sql){ + public MyMockPreparedStatement(MockConnection conn, String sql) { super(conn, sql); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest.java index 46dc1e7152..a9c9b0ec4e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest.java @@ -18,7 +18,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterOpenBlobCountTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -28,16 +27,15 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public Blob resultSet_getBlob(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return new MockBlob(); } @Override public Blob resultSet_getBlob(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return new MockBlob(); } }); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest2.java index 9e49420ae1..54ee0271ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest2.java @@ -18,7 +18,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterOpenBlobCountTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -28,16 +27,15 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return new MockBlob(); } @Override public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return new MockBlob(); } @@ -123,10 +121,10 @@ public void test_stat_2() throws Exception { ResultSet rs = stmt.executeQuery(); rs.next(); - rs.getObject(1, Collections.> emptyMap()); - rs.getObject(2, Collections.> emptyMap()); - rs.getObject(3, Collections.> emptyMap()); - rs.getObject(4, Collections.> emptyMap()); + rs.getObject(1, Collections.>emptyMap()); + rs.getObject(2, Collections.>emptyMap()); + rs.getObject(3, Collections.>emptyMap()); + rs.getObject(4, Collections.>emptyMap()); rs.close(); stmt.close(); @@ -150,11 +148,11 @@ public void test_stat_4() throws Exception { ResultSet rs = stmt.executeQuery(); rs.next(); - rs.getObject("1", Collections.> emptyMap()); - rs.getObject("2", Collections.> emptyMap()); - rs.getObject("3", Collections.> emptyMap()); - rs.getObject("4", Collections.> emptyMap()); - rs.getObject("5", Collections.> emptyMap()); + rs.getObject("1", Collections.>emptyMap()); + rs.getObject("2", Collections.>emptyMap()); + rs.getObject("3", Collections.>emptyMap()); + rs.getObject("4", Collections.>emptyMap()); + rs.getObject("5", Collections.>emptyMap()); rs.close(); stmt.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest.java index 7e4804623b..8770832ddf 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterOpenClobCountTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -29,19 +28,18 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public Clob resultSet_getClob(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return new ClobProxyImpl(result.getStatementProxy().getConnectionProxy().getDirectDataSource(), - result.getStatementProxy().getConnectionProxy(), new MockClob()); + result.getStatementProxy().getConnectionProxy(), new MockClob()); } @Override public Clob resultSet_getClob(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return new ClobProxyImpl(result.getStatementProxy().getConnectionProxy().getDirectDataSource(), - result.getStatementProxy().getConnectionProxy(), new MockClob()); + result.getStatementProxy().getConnectionProxy(), new MockClob()); } }); dataSource.init(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest2.java index 5c99687fca..229def4c3c 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest2.java @@ -19,7 +19,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterOpenClobCountTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -29,33 +28,32 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return new ClobProxyImpl(result.getStatementProxy().getConnectionProxy().getDirectDataSource(), - result.getStatementProxy().getConnectionProxy(), new MockClob()); + result.getStatementProxy().getConnectionProxy(), new MockClob()); } @Override public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return new ClobProxyImpl(result.getStatementProxy().getConnectionProxy().getDirectDataSource(), - result.getStatementProxy().getConnectionProxy(), new MockClob()); + result.getStatementProxy().getConnectionProxy(), new MockClob()); } @Override public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, int columnIndex, java.util.Map> map) throws SQLException { return new ClobProxyImpl(result.getStatementProxy().getConnectionProxy().getDirectDataSource(), - result.getStatementProxy().getConnectionProxy(), new MockClob()); + result.getStatementProxy().getConnectionProxy(), new MockClob()); } @Override public Object resultSet_getObject(FilterChain chain, ResultSetProxy result, String columnIndex, java.util.Map> map) throws SQLException { return new ClobProxyImpl(result.getStatementProxy().getConnectionProxy().getDirectDataSource(), - result.getStatementProxy().getConnectionProxy(), new MockClob()); + result.getStatementProxy().getConnectionProxy(), new MockClob()); } }); dataSource.init(); @@ -115,7 +113,7 @@ public void test_stat_1() throws Exception { sqlStat.reset(); Assert.assertEquals(0, sqlStat.getClobOpenCount()); } - + public void test_stat_2() throws Exception { Connection conn = dataSource.getConnection(); @@ -128,10 +126,10 @@ public void test_stat_2() throws Exception { ResultSet rs = stmt.executeQuery(); rs.next(); - rs.getObject(1, Collections.>emptyMap()); - rs.getObject(2, Collections.>emptyMap()); - rs.getObject(3, Collections.>emptyMap()); - rs.getObject(4, Collections.>emptyMap()); + rs.getObject(1, Collections.>emptyMap()); + rs.getObject(2, Collections.>emptyMap()); + rs.getObject(3, Collections.>emptyMap()); + rs.getObject(4, Collections.>emptyMap()); rs.close(); stmt.close(); @@ -142,7 +140,7 @@ public void test_stat_2() throws Exception { sqlStat.reset(); Assert.assertEquals(0, sqlStat.getClobOpenCount()); } - + public void test_stat_4() throws Exception { Connection conn = dataSource.getConnection(); @@ -155,11 +153,11 @@ public void test_stat_4() throws Exception { ResultSet rs = stmt.executeQuery(); rs.next(); - rs.getObject("1", Collections.>emptyMap()); - rs.getObject("2", Collections.>emptyMap()); - rs.getObject("3", Collections.>emptyMap()); - rs.getObject("4", Collections.>emptyMap()); - rs.getObject("5", Collections.>emptyMap()); + rs.getObject("1", Collections.>emptyMap()); + rs.getObject("2", Collections.>emptyMap()); + rs.getObject("3", Collections.>emptyMap()); + rs.getObject("4", Collections.>emptyMap()); + rs.getObject("5", Collections.>emptyMap()); rs.close(); stmt.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest.java index ed94ad5291..d12cbfc500 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest.java @@ -17,7 +17,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterOpenInputStreamCountTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -27,16 +26,15 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public java.io.InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return new ByteArrayInputStream(new byte[0]); } @Override public java.io.InputStream resultSet_getBinaryStream(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return new ByteArrayInputStream(new byte[0]); } }); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest2.java index 9a995d3268..bebe9258e4 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest2.java @@ -17,7 +17,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterOpenInputStreamCountTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -27,7 +26,6 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public java.io.InputStream resultSet_getAsciiStream(FilterChain chain, ResultSetProxy result, int columnIndex) throws SQLException { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenReaderCountTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenReaderCountTest.java index 3ad2ee76aa..55dbd7e069 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenReaderCountTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenReaderCountTest.java @@ -18,7 +18,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterOpenReaderCountTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -28,16 +27,15 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public java.io.Reader resultSet_getCharacterStream(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return new StringReader(""); } @Override public java.io.Reader resultSet_getCharacterStream(FilterChain chain, ResultSetProxy result, String columnLabel) - throws SQLException { + throws SQLException { return new StringReader(""); } }); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadBytesLengthTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadBytesLengthTest.java index f4ac5e3d6e..e1152e0102 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadBytesLengthTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadBytesLengthTest.java @@ -16,7 +16,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterReadBytesLengthTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -26,16 +25,15 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public byte[] resultSet_getBytes(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return new byte[6]; } @Override public byte[] resultSet_getBytes(FilterChain chain, ResultSetProxy result, String columnIndex) - throws SQLException { + throws SQLException { return new byte[7]; } }); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadStringLengthTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadStringLengthTest.java index 054d00808f..221a458395 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadStringLengthTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadStringLengthTest.java @@ -16,7 +16,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterReadStringLengthTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -26,16 +25,15 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public String resultSet_getString(FilterChain chain, ResultSetProxy result, int columnIndex) - throws SQLException { + throws SQLException { return "123456"; } @Override public String resultSet_getString(FilterChain chain, ResultSetProxy result, String columnIndex) - throws SQLException { + throws SQLException { return "1234567"; } }); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java index 85e27d630e..f6fab4c974 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatFilterResultSetMultiCloseTest extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -47,7 +46,6 @@ protected void tearDown() throws Exception { } public void test_stat() throws Exception { - final String sql = "SELECT 1"; Assert.assertTrue(dataSource.isInited()); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java index bd65927058..bedf4badbe 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java @@ -15,7 +15,6 @@ * @author Jonas Yang */ public class ConfigFilterTest extends ConfigFileGenerator { - String encryptedString = "OJfUm6WCHi7EuXqE6aEc+Po2xFrAGBeSNy8O2jWhV2FTG8/5kbRRr2rjNKhptlevm/03Y0048P7h88gdUOXAYg=="; @Test @@ -78,7 +77,7 @@ public void testInitDecrypt() throws SQLException { try { dataSource.init(); Assert.assertEquals("The password is " + dataSource.getPassword() + ", is not xiaoyu", "xiaoyu", - dataSource.getPassword()); + dataSource.getPassword()); } finally { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest1.java index 9ae0eb1602..4a84b98f54 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest1.java @@ -10,29 +10,29 @@ public class ConfigFilterTest1 extends TestCase { private DruidDataSource dataSource; - + protected void setUp() throws Exception { dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setFilters("config"); } - + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } - + public void test_decrypt() throws Exception { String plainPassword = "abcdefg1234567890"; - + dataSource.setPassword(ConfigTools.encrypt(plainPassword)); - + Assert.assertFalse(plainPassword.equals(dataSource.getPassword())); - + dataSource.addConnectionProperty(ConfigFilter.CONFIG_DECRYPT, "true"); - + dataSource.init(); - + Assert.assertEquals(plainPassword, dataSource.getPassword()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest2.java index 670b3d888b..9122e7058f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest2.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcUtils; public class ConfigFilterTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest3.java index 8e23785e0e..357116e0bd 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest3.java @@ -14,7 +14,6 @@ import com.alibaba.druid.util.JdbcUtils; public class ConfigFilterTest3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest4.java index b7afa13acf..90c7e38d88 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest4.java @@ -14,7 +14,6 @@ import com.alibaba.druid.util.JdbcUtils; public class ConfigFilterTest4 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigToolsTest.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigToolsTest.java index cb6b3fa1f8..4861f0869b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigToolsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigToolsTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.filter.config.ConfigTools; public class ConfigToolsTest extends TestCase { - public void test_0() throws Exception { String plainText = "abcdef"; String cipherText = ConfigTools.encrypt(plainText); @@ -24,11 +23,11 @@ public void test_genKeys() throws Exception { String cipherText = ConfigTools.encrypt(keys[0], plainText); Assert.assertEquals(plainText, ConfigTools.decrypt(keys[1], cipherText)); } - + public void test_genKeys1024() throws Exception { String plainText = Long.toString(new Random().nextLong()); String[] keys = ConfigTools.genKeyPair(1024); - + String cipherText = ConfigTools.encrypt(keys[0], plainText); Assert.assertEquals(plainText, ConfigTools.decrypt(keys[1], cipherText)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest.java index 97b6daed0b..72edb84717 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest.java @@ -10,7 +10,6 @@ import com.alibaba.druid.util.JdbcUtils; public class LogFilterTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -18,19 +17,19 @@ protected void setUp() throws Exception { dataSource.setUrl("jdbc:derby:classpath:petstore-db"); dataSource.setFilters("log4j"); } - + public void test_select() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + for (int i = 0; i < 10; ++i) { ResultSet rs = stmt.executeQuery("SELECT * FROM ITEM WHERE LISTPRICE > 10"); rs.close(); } - + stmt.close(); - + conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest2.java index b7260e8366..4b4d749c63 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest2.java @@ -10,7 +10,6 @@ import com.alibaba.druid.util.JdbcUtils; public class LogFilterTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -18,19 +17,19 @@ protected void setUp() throws Exception { dataSource.setUrl("jdbc:derby:classpath:petstore-db"); dataSource.setFilters("log4j"); } - + public void test_select() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement("SELECT * FROM ITEM WHERE LISTPRICE > 10"); - + for (int i = 0; i < 10; ++i) { ResultSet rs = stmt.executeQuery(); rs.close(); } - + stmt.close(); - + conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest3.java index 5e7903e240..bbd7f072f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest3.java @@ -10,7 +10,6 @@ import com.alibaba.druid.util.JdbcUtils; public class LogFilterTest3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -19,26 +18,26 @@ protected void setUp() throws Exception { dataSource.setUrl("jdbc:derby:classpath:petstore-db"); dataSource.setFilters("log4j,slf4j"); } - + public void test_select() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement("SELECT * FROM ITEM WHERE LISTPRICE > ?"); stmt.setInt(1, 10); - + for (int i = 0; i < 10; ++i) { ResultSet rs = stmt.executeQuery(); rs.close(); } - + stmt.close(); - + conn.close(); } protected void tearDown() throws Exception { JdbcUtils.close(dataSource); - + System.clearProperty("druid.log.stmt.executableSql"); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest4.java index 9ca3d69677..d1a80a9e60 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest4.java @@ -10,7 +10,6 @@ import com.alibaba.druid.filter.logging.LogFilter; public class LogFilterTest4 extends TestCase { - public void test_properties() throws Exception { LogFilter filter = new Log4jFilter(); @@ -21,7 +20,6 @@ public void test_properties() throws Exception { } public void test_properties_1() throws Exception { - System.setProperty("druid.log.conn", "false"); System.setProperty("druid.log.stmt", "false"); System.setProperty("druid.log.rs", "false"); @@ -34,15 +32,15 @@ public void test_properties_1() throws Exception { Assert.assertEquals(false, filter.isStatementLogEnabled()); Assert.assertEquals(true, filter.isStatementExecutableSqlLogEnable()); Assert.assertEquals(false, filter.isResultSetLogEnabled()); - + Properties properties = new Properties(); properties.setProperty("druid.log.conn", "true"); properties.setProperty("druid.log.stmt", "true"); properties.setProperty("druid.log.rs", "true"); properties.setProperty("druid.log.stmt.executableSql", "false"); - + filter.configFromProperties(properties); - + Assert.assertEquals(true, filter.isConnectionLogEnabled()); Assert.assertEquals(true, filter.isStatementLogEnabled()); Assert.assertEquals(false, filter.isStatementExecutableSqlLogEnable()); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest5.java b/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest5.java index d6e6cabd9b..daa58d8640 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest5.java @@ -10,7 +10,6 @@ import com.alibaba.druid.util.JdbcUtils; public class LogFilterTest5 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -19,26 +18,25 @@ protected void setUp() throws Exception { dataSource.setUrl("jdbc:derby:classpath:petstore-db"); dataSource.setFilters("log4j2"); } catch (Throwable ignored) { - } } - + public void test_select() throws Exception { if (dataSource == null) { return; } Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement("SELECT * FROM ITEM WHERE LISTPRICE > 10"); - + for (int i = 0; i < 10; ++i) { ResultSet rs = stmt.executeQuery(); rs.close(); } - + stmt.close(); - + conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/log/Slf4jLogFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/log/Slf4jLogFilterTest.java index f93c6236f6..60e405a6ee 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/log/Slf4jLogFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/log/Slf4jLogFilterTest.java @@ -15,27 +15,27 @@ public void test_slf4j() throws Exception { Assert.assertEquals("druid.sql.Connection", filter.getConnectionLoggerName()); Assert.assertEquals("druid.sql.Statement", filter.getStatementLoggerName()); Assert.assertEquals("druid.sql.ResultSet", filter.getResultSetLoggerName()); - + filter.setDataSourceLoggerName("x.sql.DataSource"); filter.setConnectionLoggerName("x.sql.Connection"); filter.setStatementLoggerName("x.sql.Statement"); filter.setResultSetLoggerName("x.sql.ResultSet"); - + Assert.assertEquals("x.sql.DataSource", filter.getDataSourceLoggerName()); Assert.assertEquals("x.sql.Connection", filter.getConnectionLoggerName()); Assert.assertEquals("x.sql.Statement", filter.getStatementLoggerName()); Assert.assertEquals("x.sql.ResultSet", filter.getResultSetLoggerName()); - + filter.setDataSourceLogger(LoggerFactory.getLogger("y.sql.DataSource")); filter.setConnectionLogger(LoggerFactory.getLogger("y.sql.Connection")); filter.setStatementLogger(LoggerFactory.getLogger("y.sql.Statement")); filter.setResultSetLogger(LoggerFactory.getLogger("y.sql.ResultSet")); - + Assert.assertEquals("y.sql.DataSource", filter.getDataSourceLoggerName()); Assert.assertEquals("y.sql.Connection", filter.getConnectionLoggerName()); Assert.assertEquals("y.sql.Statement", filter.getStatementLoggerName()); Assert.assertEquals("y.sql.ResultSet", filter.getResultSetLoggerName()); - + filter.isDataSourceLogEnabled(); filter.isConnectionLogEnabled(); filter.isConnectionLogErrorEnabled(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/BigSqlTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/BigSqlTest.java index 6bcbba19df..3046779cf0 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/BigSqlTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/BigSqlTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.wall.WallUtils; public class BigSqlTest extends TestCase { - public void test_true() throws Exception { String sql = "SELECT c from sbtest where id=0"; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseAndTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseAndTest.java index a89154d621..5c21137742 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseAndTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseAndTest.java @@ -8,16 +8,15 @@ import com.alibaba.druid.wall.WallUtils; public class BitwiseAndTest extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT * from t where (id = 1) & 2")); // + "SELECT * from t where (id = 1) & 2")); // } public void test_false() throws Exception { WallConfig config = new WallConfig(); config.setConditionOpBitwseAllow(false); Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT * from t where (id = 1) & 2", config)); // + "SELECT * from t where (id = 1) & 2", config)); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseInvertTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseInvertTest.java index 51e4a04943..a94c5ceef3 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseInvertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseInvertTest.java @@ -8,16 +8,15 @@ import com.alibaba.druid.wall.WallUtils; public class BitwiseInvertTest extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT * from t where ~2")); // + "SELECT * from t where ~2")); // } public void test_false() throws Exception { WallConfig config = new WallConfig(); config.setConditionOpBitwseAllow(false); Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT * from t where ~2", config)); // + "SELECT * from t where ~2", config)); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseOrTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseOrTest.java index 7ded29cb79..7aad34d6f4 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseOrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseOrTest.java @@ -8,16 +8,15 @@ import com.alibaba.druid.wall.WallUtils; public class BitwiseOrTest extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT * from t where (id = 1) | 2")); // + "SELECT * from t where (id = 1) | 2")); // } public void test_false() throws Exception { WallConfig config = new WallConfig(); config.setConditionOpBitwseAllow(false); Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT * from t where (id = 1) | 2", config)); // + "SELECT * from t where (id = 1) | 2", config)); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseXorTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseXorTest.java index 728a46ab4b..76b2d58be6 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseXorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseXorTest.java @@ -8,16 +8,15 @@ import com.alibaba.druid.wall.WallUtils; public class BitwiseXorTest extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT * from t where (id = 1) ^ (1=1)")); // + "SELECT * from t where (id = 1) ^ (1=1)")); // } public void test_false() throws Exception { WallConfig config = new WallConfig(); config.setConditionOpBitwseAllow(false); Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT * from t where (id = 1) ^ (1=1)", config)); // + "SELECT * from t where (id = 1) ^ (1=1)", config)); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/BooleanXorTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/BooleanXorTest.java index fcb38d971e..9cf77cdcb6 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/BooleanXorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/BooleanXorTest.java @@ -8,16 +8,15 @@ import com.alibaba.druid.wall.WallUtils; public class BooleanXorTest extends TestCase { - public void test_false() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT * from t where id = 1 XOR id = 2")); // + "SELECT * from t where id = 1 XOR id = 2")); // } public void test_true() throws Exception { WallConfig config = new WallConfig(); config.setConditionOpXorAllow(true); Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT * from t where id = 1 XOR id = 2", config)); // + "SELECT * from t where id = 1 XOR id = 2", config)); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/ConstantArithmeticCheckTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/ConstantArithmeticCheckTest.java index 787d40aefc..2c01f9a1ee 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/ConstantArithmeticCheckTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/ConstantArithmeticCheckTest.java @@ -8,16 +8,15 @@ import com.alibaba.druid.wall.WallUtils; public class ConstantArithmeticCheckTest extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT * from t where 3 - 1")); // + "SELECT * from t where 3 - 1")); // } public void test_false() throws Exception { WallConfig config = new WallConfig(); config.setConstArithmeticAllow(false); Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT * from t where 3 - 1", config)); // + "SELECT * from t where 3 - 1", config)); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/CountTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/CountTest.java index 5819039e78..8b920a59fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/CountTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/CountTest.java @@ -23,16 +23,14 @@ import com.alibaba.druid.wall.spi.WallVisitorUtils; public class CountTest extends TestCase { - public void test_isTrue() throws Exception { - Assert.assertEquals(Boolean.TRUE, WallVisitorUtils.getValue(SQLUtils.toSQLExpr("(select count(*) from t) > 0"))); Assert.assertEquals(Boolean.TRUE, - WallVisitorUtils.getValue(SQLUtils.toSQLExpr("(select count(*) from t) >= 0"))); + WallVisitorUtils.getValue(SQLUtils.toSQLExpr("(select count(*) from t) >= 0"))); Assert.assertEquals(Boolean.FALSE, - WallVisitorUtils.getValue(SQLUtils.toSQLExpr("(select count(*) from t) < 0"))); + WallVisitorUtils.getValue(SQLUtils.toSQLExpr("(select count(*) from t) < 0"))); Assert.assertEquals(Boolean.TRUE, - WallVisitorUtils.getValue(SQLUtils.toSQLExpr("NOT (select count(*) from t) < 0"))); + WallVisitorUtils.getValue(SQLUtils.toSQLExpr("NOT (select count(*) from t) < 0"))); // } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/DoPrivilegedTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/DoPrivilegedTest.java index bff35d31cd..f4369d6cc4 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/DoPrivilegedTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/DoPrivilegedTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.wall.WallUtils; public class DoPrivilegedTest extends TestCase { - public void test_0() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql("select @@version_compile_os FROM X")); } @@ -40,7 +39,6 @@ public void test_1() throws Exception { config.setDoPrivilegedAllow(true); WallProvider.doPrivileged(new PrivilegedAction() { - @Override public Object run() { Assert.assertTrue(WallUtils.isValidateMySql("select @@version_compile_os FROM X", config)); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest.java index 87f06afbcf..1e6fae5413 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest.java @@ -23,13 +23,11 @@ import com.alibaba.druid.wall.WallUtils; public class IdentEqualsTest extends TestCase { - - private String sql = "select * from t where FID = 1 OR id = id"; + private String sql = "select * from t where FID = 1 OR id = id"; private WallConfig config = new WallConfig(); protected void setUp() throws Exception { - } public void testMySql() throws Exception { @@ -37,7 +35,6 @@ public void testMySql() throws Exception { } public void testORACLE() throws Exception { - Assert.assertFalse(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest1.java index ce9ffec85a..58854962d2 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest1.java @@ -23,13 +23,11 @@ import com.alibaba.druid.wall.WallUtils; public class IdentEqualsTest1 extends TestCase { - - private String sql = "select * from t where FID = 1 OR not (id != id)"; + private String sql = "select * from t where FID = 1 OR not (id != id)"; private WallConfig config = new WallConfig(); protected void setUp() throws Exception { - } public void testMySql() throws Exception { @@ -37,7 +35,6 @@ public void testMySql() throws Exception { } public void testORACLE() throws Exception { - Assert.assertFalse(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/IntersectTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/IntersectTest.java index 242db2acce..25778515f5 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/IntersectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/IntersectTest.java @@ -8,16 +8,15 @@ import com.alibaba.druid.wall.WallUtils; public class IntersectTest extends TestCase { - public void test_false() throws Exception { WallConfig config = new WallConfig(); config.setMinusAllow(false); Assert.assertFalse(WallUtils.isValidateOracle(// - "SELECT * FROM A MINUS SELECT * FROM B", config)); // + "SELECT * FROM A MINUS SELECT * FROM B", config)); // } public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateOracle(// - "SELECT * FROM A MINUS SELECT * FROM B")); // + "SELECT * FROM A MINUS SELECT * FROM B")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/LikeTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/LikeTest.java index d1ab4435e0..1cf18d53cd 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/LikeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/LikeTest.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.WallVisitorUtils; public class LikeTest extends TestCase { - public void test_isTrue() throws Exception { Assert.assertEquals(Boolean.TRUE, WallVisitorUtils.getValue(SQLUtils.toSQLExpr("f1 like '%'"))); Assert.assertEquals(Boolean.TRUE, WallVisitorUtils.getValue(SQLUtils.toSQLExpr("f1 like '%%'"))); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MinusTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MinusTest.java index 129626315b..6ed21d794a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MinusTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MinusTest.java @@ -8,17 +8,15 @@ import com.alibaba.druid.wall.WallUtils; public class MinusTest extends TestCase { - public void test_false() throws Exception { WallConfig config = new WallConfig(); config.setIntersectAllow(false); Assert.assertFalse(WallUtils.isValidateOracle(// - "SELECT * FROM A Intersect SELECT * FROM B", config)); // + "SELECT * FROM A Intersect SELECT * FROM B", config)); // } public void test_true() throws Exception { - Assert.assertTrue(WallUtils.isValidateOracle(// - "SELECT * FROM A Intersect SELECT * FROM B")); // + "SELECT * FROM A Intersect SELECT * FROM B")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest.java index c01ba0be9d..d1b52c5cdd 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest.java @@ -23,8 +23,7 @@ import com.alibaba.druid.wall.WallUtils; public class MustParameterizedTest extends TestCase { - - private String sql = "select * from t where id = 3"; + private String sql = "select * from t where id = 3"; private WallConfig config = new WallConfig(); @@ -37,7 +36,6 @@ public void testMySql() throws Exception { } public void testORACLE() throws Exception { - Assert.assertFalse(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest1.java index 891d32013d..f89c49ce77 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest1.java @@ -23,8 +23,7 @@ import com.alibaba.druid.wall.WallUtils; public class MustParameterizedTest1 extends TestCase { - - private String sql = "select * from t where id = 3 + 5"; + private String sql = "select * from t where id = 3 + 5"; private WallConfig config = new WallConfig(); @@ -37,7 +36,6 @@ public void testMySql() throws Exception { } public void testORACLE() throws Exception { - Assert.assertFalse(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest2.java index 4658f1ec7b..588d1d1b69 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest2.java @@ -23,8 +23,7 @@ import com.alibaba.druid.wall.WallUtils; public class MustParameterizedTest2 extends TestCase { - - private String sql = "select * from t where id in (3, 5)"; + private String sql = "select * from t where id in (3, 5)"; private WallConfig config = new WallConfig(); @@ -37,7 +36,6 @@ public void testMySql() throws Exception { } public void testORACLE() throws Exception { - Assert.assertFalse(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest3.java index e2b039f694..7988486246 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest3.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.WallUtils; public class MustParameterizedTest3 extends TestCase { - private WallConfig config = new WallConfig(); protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest4.java index f6221b60b1..fcc4a15d49 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest4.java @@ -23,8 +23,7 @@ import com.alibaba.druid.wall.WallUtils; public class MustParameterizedTest4 extends TestCase { - - private String sql = "select * from t where id not in (3, 5)"; + private String sql = "select * from t where id not in (3, 5)"; private WallConfig config = new WallConfig(); @@ -37,7 +36,6 @@ public void testMySql() throws Exception { } public void testORACLE() throws Exception { - Assert.assertFalse(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/PGDenyFunctionTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/PGDenyFunctionTest.java index 8e1244ce65..3e5714274a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/PGDenyFunctionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/PGDenyFunctionTest.java @@ -8,16 +8,15 @@ import com.alibaba.druid.wall.WallUtils; public class PGDenyFunctionTest extends TestCase { - public void test_false() throws Exception { Assert.assertFalse(WallUtils.isValidatePostgres(// - "select * from t where fid = 1 union SELECT current_catalog() from t where id = ?")); // + "select * from t where fid = 1 union SELECT current_catalog() from t where id = ?")); // } public void test_true() throws Exception { WallConfig config = new WallConfig(); config.setFunctionCheck(false); Assert.assertTrue(WallUtils.isValidatePostgres(// - "SELECT current_catalog() from t where id = ?", config)); // + "SELECT current_catalog() from t where id = ?", config)); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/PGWallTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/PGWallTest.java index 8d23aca6c5..6d092e5bac 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/PGWallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/PGWallTest.java @@ -7,9 +7,8 @@ import com.alibaba.druid.wall.WallUtils; public class PGWallTest extends TestCase { - public void test_false() throws Exception { Assert.assertTrue(WallUtils.isValidatePostgres(// - "select wm_concat(article_id) over() from t_nds_web_article")); // + "select wm_concat(article_id) over() from t_nds_web_article")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/StrictSyntaxCheckTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/StrictSyntaxCheckTest.java index 1796272f21..3d95382695 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/StrictSyntaxCheckTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/StrictSyntaxCheckTest.java @@ -8,16 +8,15 @@ import com.alibaba.druid.wall.WallUtils; public class StrictSyntaxCheckTest extends TestCase { - public void test_syntax() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT SELECT")); // 部分永真 + "SELECT SELECT")); // 部分永真 } public void test_syntax_1() throws Exception { WallConfig config = new WallConfig(); config.setStrictSyntaxCheck(false); Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT SELECT", config)); // 部分永真 + "SELECT SELECT", config)); // 部分永真 } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/TAEWallTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/TAEWallTest.java index 171e387d97..e08327e80c 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/TAEWallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/TAEWallTest.java @@ -23,20 +23,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class TAEWallTest extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "select * from t where 1=1 AND status = 1")); // + "select * from t where 1=1 AND status = 1")); // } - + public void test_false() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "select * from t where status = 1 AND 1=1")); // + "select * from t where status = 1 AND 1=1")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantDeleteTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantDeleteTest.java index f738c657ee..6fe05fa5ec 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantDeleteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantDeleteTest.java @@ -27,8 +27,7 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class TenantDeleteTest extends TestCase { - - private String sql = "DELETE FROM orders WHERE FID = ?"; + private String sql = "DELETE FROM orders WHERE FID = ?"; private WallConfig config = new WallConfig(); @@ -40,13 +39,13 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { WallProvider.setTenantValue(123); MySqlWallProvider provider = new MySqlWallProvider(config); - + WallProvider.setTenantValue("test"); WallCheckResult checkResult = provider.check(sql); Assert.assertEquals(0, checkResult.getViolations().size()); String resultSql = SQLUtils.toSQLString(checkResult.getStatementList(), JdbcConstants.MYSQL); Assert.assertEquals("DELETE FROM orders" + // - "\nWHERE FID = ?", resultSql); + "\nWHERE FID = ?", resultSql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantInsertTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantInsertTest.java index 20e4d4145a..3030306844 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantInsertTest.java @@ -33,8 +33,7 @@ * @author kiki */ public class TenantInsertTest extends TestCase { - - private WallConfig config = new WallConfig(); + private WallConfig config = new WallConfig(); private WallConfig config_callback = new WallConfig(); protected void setUp() throws Exception { @@ -99,9 +98,9 @@ public void testMySql4() throws Exception { public void testMySql5() throws Exception { String insert_sql = "INSERT INTO orders (ID, NAME) SELECT ID, NAME FROM temp WHERE age = 18"; String expect_sql = "INSERT INTO orders (ID, NAME, tenant)" + // - "\nSELECT ID, NAME, 123" + // - "\nFROM temp" + // - "\nWHERE age = 18"; + "\nSELECT ID, NAME, 123" + // + "\nFROM temp" + // + "\nWHERE age = 18"; { MySqlWallProvider provider = new MySqlWallProvider(config_callback); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest.java index c1b888be44..ccca033f95 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest.java @@ -27,13 +27,12 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class TenantSelectTest extends TestCase { + private String sql = "SELECT ID, NAME FROM orders WHERE FID = ?"; + private String expect_sql = "SELECT ID, NAME, tenant" + // + "\nFROM orders" + // + "\nWHERE FID = ?"; - private String sql = "SELECT ID, NAME FROM orders WHERE FID = ?"; - private String expect_sql = "SELECT ID, NAME, tenant" + // - "\nFROM orders" + // - "\nWHERE FID = ?"; - - private WallConfig config = new WallConfig(); + private WallConfig config = new WallConfig(); private WallConfig config_callback = new WallConfig(); protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest2.java index 20cb5f6868..220a343c1f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest2.java @@ -27,14 +27,13 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class TenantSelectTest2 extends TestCase { + private String sql = "SELECT ID, NAME FROM orders WHERE FID = ? OR FID = ?"; + private String expect_sql = "SELECT ID, NAME, tenant" + // + "\nFROM orders" + // + "\nWHERE FID = ?" + // + "\n\tOR FID = ?"; - private String sql = "SELECT ID, NAME FROM orders WHERE FID = ? OR FID = ?"; - private String expect_sql = "SELECT ID, NAME, tenant" + // - "\nFROM orders" + // - "\nWHERE FID = ?" + // - "\n\tOR FID = ?"; - - private WallConfig config = new WallConfig(); + private WallConfig config = new WallConfig(); private WallConfig config_callback = new WallConfig(); protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest3.java index aff49d9f9d..b3006daf3e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest3.java @@ -27,18 +27,16 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class TenantSelectTest3 extends TestCase { - - private String sql = "SELECT ID, NAME " + // - "FROM orders o inner join users u ON o.userid = u.id " + // - "WHERE FID = ? OR FID = ?"; + private String sql = "SELECT ID, NAME " + // + "FROM orders o inner join users u ON o.userid = u.id " + // + "WHERE FID = ? OR FID = ?"; private String expect_sql = "SELECT ID, NAME, u.tenant, o.tenant" + // - "\nFROM orders o" + // - "\n\tINNER JOIN users u ON o.userid = u.id" + // - "\nWHERE FID = ?" + // - "\n\tOR FID = ?"; + "\nFROM orders o" + // + "\n\tINNER JOIN users u ON o.userid = u.id" + // + "\nWHERE FID = ?" + // + "\n\tOR FID = ?"; protected void setUp() throws Exception { - } public void testMySql() throws Exception { @@ -48,7 +46,7 @@ public void testMySql() throws Exception { config.setTenantColumn("tenant"); config_callback.setTenantCallBack(new TenantTestCallBack()); - + WallProvider.setTenantValue(123); MySqlWallProvider provider = new MySqlWallProvider(config); WallCheckResult checkResult = provider.check(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest4.java index a81cbd78d6..c9426d129b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest4.java @@ -27,17 +27,16 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class TenantSelectTest4 extends TestCase { + private String sql = "SELECT a.*,b.name " + // + "FROM vote_info a left join vote_item b on a.item_id=b.id " + // + "where 1=1 limit 1,10"; + private String expect_sql = "SELECT a.*, b.name, b.tenant, a.tenant" + // + "\nFROM vote_info a" + // + "\n\tLEFT JOIN vote_item b ON a.item_id = b.id" + // + "\nWHERE 1 = 1" + // + "\nLIMIT 1, 10"; - private String sql = "SELECT a.*,b.name " + // - "FROM vote_info a left join vote_item b on a.item_id=b.id " + // - "where 1=1 limit 1,10"; - private String expect_sql = "SELECT a.*, b.name, b.tenant, a.tenant" + // - "\nFROM vote_info a" + // - "\n\tLEFT JOIN vote_item b ON a.item_id = b.id" + // - "\nWHERE 1 = 1" + // - "\nLIMIT 1, 10"; - - private WallConfig config = new WallConfig(); + private WallConfig config = new WallConfig(); private WallConfig config_callback = new WallConfig(); protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantTestCallBack.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantTestCallBack.java index 19a057f75c..b3eef4e363 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantTestCallBack.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantTestCallBack.java @@ -18,7 +18,6 @@ import com.alibaba.druid.wall.WallConfig.TenantCallBack; public class TenantTestCallBack implements TenantCallBack { - @Override public Object getTenantValue(StatementType statementType, String tableName) { return 123; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantUpdateTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantUpdateTest.java index 95bea37647..464b47e785 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantUpdateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantUpdateTest.java @@ -27,13 +27,12 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class TenantUpdateTest extends TestCase { + private String sql = "UPDATE T_USER SET FNAME = ? WHERE FID = ?"; + private String expect_sql = "UPDATE T_USER" + // + "\nSET FNAME = ?, tenant = 123" + // + "\nWHERE FID = ?"; - private String sql = "UPDATE T_USER SET FNAME = ? WHERE FID = ?"; - private String expect_sql = "UPDATE T_USER" + // - "\nSET FNAME = ?, tenant = 123" + // - "\nWHERE FID = ?"; - - private WallConfig config = new WallConfig(); + private WallConfig config = new WallConfig(); private WallConfig config_callback = new WallConfig(); protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnDefaultTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnDefaultTest.java index 6caf41b8cd..f690eeac13 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnDefaultTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnDefaultTest.java @@ -24,25 +24,25 @@ /** * 这个场景，检测可疑的Having条件 - * @author wenshao * + * @author wenshao */ public class WallAllowSelectAllColumnDefaultTest extends TestCase { private String sql = "select * from t where fid = ?"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { } public void testMySql() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); } - + public void testSQLServer() throws Exception { Assert.assertTrue(WallUtils.isValidateSqlServer(sql, config)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest.java index 0970f2035d..ee01b6dc41 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest.java @@ -24,14 +24,14 @@ /** * 这个场景，检测可疑的Having条件 - * @author wenshao * + * @author wenshao */ public class WallAllowSelectAllColumnTest extends TestCase { private String sql = "select * from t where fid = ?"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setSelectAllColumnAllow(false); } @@ -39,11 +39,11 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(sql, config)); } - + public void testSQLServer() throws Exception { Assert.assertFalse(WallUtils.isValidateSqlServer(sql, config)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest1.java index 2eb2840c6b..74c091cade 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest1.java @@ -24,14 +24,14 @@ /** * 这个场景，检测可疑的Having条件 - * @author wenshao * + * @author wenshao */ public class WallAllowSelectAllColumnTest1 extends TestCase { private String sql = "select count(*) from t where fid = ?"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setSelectAllColumnAllow(false); } @@ -39,11 +39,11 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); } - + public void testSQLServer() throws Exception { Assert.assertTrue(WallUtils.isValidateSqlServer(sql, config)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest2.java index 98168e9b3f..6ebf4ba934 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest2.java @@ -24,14 +24,14 @@ /** * 这个场景，检测可疑的Having条件 - * @author wenshao * + * @author wenshao */ public class WallAllowSelectAllColumnTest2 extends TestCase { private String sql = "select * from (select id, name from t where fid = ?) as a"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setSelectAllColumnAllow(false); } @@ -39,11 +39,11 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); } - + public void testSQLServer() throws Exception { Assert.assertTrue(WallUtils.isValidateSqlServer(sql, config)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAlterTest_0.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAlterTest_0.java index ef42d7eb92..2797d7763a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAlterTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAlterTest_0.java @@ -22,15 +22,14 @@ public class WallAlterTest_0 extends TestCase { private String sql = "alter index idx_t1 rebuild"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setUpdateAllow(true); } - + public void testORACLE() throws Exception { - assertTrue(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCallTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCallTest.java index 0f002d38e6..ae105553eb 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCallTest.java @@ -23,19 +23,18 @@ /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 - * @author wenshao * + * @author wenshao */ public class WallCallTest extends TestCase { - public void testMySql() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql("{ call INTERFACE_DATA_EXTRACTION.INVOICE_INFO(?,?,?)}")); } - + public void testOracle() throws Exception { Assert.assertTrue(WallUtils.isValidateOracle("{ call INTERFACE_DATA_EXTRACTION.INVOICE_INFO(?,?,?)}")); } - + public void testSqlServer() throws Exception { Assert.assertTrue(WallUtils.isValidateSqlServer("{ call INTERFACE_DATA_EXTRACTION.INVOICE_INFO(?,?,?)}")); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCommentTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCommentTest.java index aa5d4cad71..e29d48ce3d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCommentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCommentTest.java @@ -27,7 +27,6 @@ * @author wenshao */ public class WallCommentTest extends TestCase { - public void testORACLE() throws Exception { String sql = "SELECT F1, F2 FROM ABC --test"; @@ -36,7 +35,7 @@ public void testORACLE() throws Exception { Assert.assertEquals(1, provider.getCommentDenyStat().getDenyCount()); } - + public void testmysql() throws Exception { String sql = "SELECT F1, F2 FROM ABC -- test"; @@ -45,7 +44,7 @@ public void testmysql() throws Exception { Assert.assertEquals(1, provider.getCommentDenyStat().getDenyCount()); } - + public void testsqlserver() throws Exception { String sql = "SELECT F1, F2 FROM ABC --test"; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallConfigTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallConfigTest.java index d6105640d3..b71cda8d03 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallConfigTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallConfigTest.java @@ -14,71 +14,71 @@ public void test_selectAllow() throws Exception { properties.setProperty("druid.wall.selelctAllow", "true"); WallConfig config = new WallConfig(); config.configFromProperties(properties); - + Assert.assertTrue(config.isSelectAllow()); } - + public void test_selectAllow_false() throws Exception { Properties properties = new Properties(); properties.setProperty("druid.wall.selelctAllow", "false"); WallConfig config = new WallConfig(); config.configFromProperties(properties); - + Assert.assertFalse(config.isSelectAllow()); } - + public void test_deleteAllow() throws Exception { Properties properties = new Properties(); properties.setProperty("druid.wall.deleteAllow", "true"); WallConfig config = new WallConfig(); config.configFromProperties(properties); - + Assert.assertTrue(config.isDeleteAllow()); } - + public void test_deleteAllow_false() throws Exception { Properties properties = new Properties(); properties.setProperty("druid.wall.deleteAllow", "false"); WallConfig config = new WallConfig(); config.configFromProperties(properties); - + Assert.assertFalse(config.isDeleteAllow()); } - + public void test_updateAllow() throws Exception { Properties properties = new Properties(); properties.setProperty("druid.wall.updateAllow", "true"); WallConfig config = new WallConfig(); config.configFromProperties(properties); - + Assert.assertTrue(config.isUpdateAllow()); } - + public void test_updateAllow_false() throws Exception { Properties properties = new Properties(); properties.setProperty("druid.wall.updateAllow", "false"); WallConfig config = new WallConfig(); config.configFromProperties(properties); - + Assert.assertFalse(config.isUpdateAllow()); } - - + + public void test_insertAllow() throws Exception { Properties properties = new Properties(); properties.setProperty("druid.wall.insertAllow", "true"); WallConfig config = new WallConfig(); config.configFromProperties(properties); - + Assert.assertTrue(config.isInsertAllow()); } - + public void test_insertAllow_false() throws Exception { Properties properties = new Properties(); properties.setProperty("druid.wall.insertAllow", "false"); WallConfig config = new WallConfig(); config.configFromProperties(properties); - + Assert.assertFalse(config.isInsertAllow()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteTest.java index 1bfdcdc4f7..6831a2ae26 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteTest.java @@ -24,14 +24,14 @@ /** * 这个场景，检测 - * @author wenshao * + * @author wenshao */ public class WallDeleteTest extends TestCase { private String sql = "DELETE FROM T WHERE F1 = ?"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setDeleteAllow(false); } @@ -39,9 +39,8 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { - Assert.assertFalse(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest.java index 20d7379114..6e4a82b1ec 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest.java @@ -25,8 +25,7 @@ * @author wenshao */ public class WallDeleteWhereTest extends TestCase { - - private String sql = "DELETE FROM T WHERE 1 = 1"; + private String sql = "DELETE FROM T WHERE 1 = 1"; private String sql2 = "DELETE FROM T WHERE id = 0 and 1 = 1"; public void testMySql() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest1.java index d8cfb3f83b..636c142b49 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest1.java @@ -24,11 +24,10 @@ /** * 这个场景，检测可疑的Having条件 - * + * * @author wenshao */ public class WallDeleteWhereTest1 extends TestCase { - private String sql = "DELETE FROM T"; public void testMySql() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest2.java index 1418963b40..17d4bb53ae 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest2.java @@ -26,7 +26,6 @@ * @author wenshao */ public class WallDeleteWhereTest2 extends TestCase { - private String sql = "DELETE FROM T WHERE id = 0 or 1 = 1 --"; private String sql1 = "DELETE FROM T WHERE id = 0 or 1 = 1 #and c=1"; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenySchemaTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenySchemaTest.java index fba4876d9a..fa9de611c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenySchemaTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenySchemaTest.java @@ -25,7 +25,6 @@ * @author wenshao */ public class WallDenySchemaTest extends TestCase { - public void testORACLE() throws Exception { String sql = "SELECT * FROM T UNION SELECT F1, F2 FROM ALL_ALL_TABLES"; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenyTableTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenyTableTest.java index 127f9c776f..90170ebd4b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenyTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenyTableTest.java @@ -25,7 +25,6 @@ * @author wenshao */ public class WallDenyTableTest extends TestCase { - public void testORACLE() throws Exception { String sql = "SELECT *FROM T UNION SELECT F1, F2 FROM SYS.ABC"; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest.java index 511db959ad..24ae42bb73 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest.java @@ -24,11 +24,10 @@ /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 - * + * * @author wenshao */ public class WallDropTest extends TestCase { - public void testMySql() throws Exception { WallConfig config = new WallConfig(); config.setDropTableAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest1.java index 45e5034d25..99a7bb68da 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest1.java @@ -25,9 +25,9 @@ public class WallDropTest1 extends TestCase { private String sql = "DROP TABLE T1"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setDropTableAllow(true); } @@ -35,9 +35,8 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { - Assert.assertTrue(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest2.java index aafe8d4b80..7c3fcd2b86 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest2.java @@ -25,9 +25,9 @@ public class WallDropTest2 extends TestCase { private String sql = "DROP PROCEDURE IF EXISTS CP_PayCalc1"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setDropTableAllow(true); } @@ -35,7 +35,7 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { Assert.assertTrue(WallUtils.isValidateOracle(sql, config)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest.java index 48849efe25..b380e8c6fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest.java @@ -13,9 +13,8 @@ import com.alibaba.druid.wall.WallFilter; public class WallFilterTest extends TestCase { - private DruidDataSource dataSource; - private WallFilter wallFilter; + private WallFilter wallFilter; protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -57,7 +56,6 @@ public void test_wallFilter() throws Exception { PreparedStatement stmt = conn.prepareStatement(sql); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -100,7 +98,7 @@ public void test_wallFilter() throws Exception { conn.close(); } Assert.assertEquals(4, wallFilter.getProvider().getTableStat("t").getUpdateDataCount()); - + { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("update t SET fname = 'xx' where FID = ? OR FID = ?"); @@ -114,13 +112,13 @@ public void test_wallFilter() throws Exception { { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("update t SET fname = 'xx' where FID = ?"); - + stmt.setInt(1, 3); stmt.addBatch(); - + stmt.setInt(1, 4); stmt.addBatch(); - + stmt.executeBatch(); stmt.close(); conn.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest2.java index c14f1cacf5..3f95deadd1 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest2.java @@ -14,9 +14,8 @@ import com.alibaba.druid.wall.WallFilter; public class WallFilterTest2 extends TestCase { - private DruidDataSource dataSource; - private WallFilter wallFilter; + private WallFilter wallFilter; protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -114,7 +113,6 @@ public void test_wallFilter() throws Exception { PreparedStatement stmt = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -127,11 +125,10 @@ public void test_wallFilter() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.CONCUR_READ_ONLY, + ResultSet.HOLD_CURSORS_OVER_COMMIT); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -146,7 +143,6 @@ public void test_wallFilter() throws Exception { PreparedStatement stmt = conn.prepareStatement(sql, new int[0]); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -161,7 +157,6 @@ public void test_wallFilter() throws Exception { PreparedStatement stmt = conn.prepareStatement(sql, new String[0]); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -176,7 +171,6 @@ public void test_wallFilter() throws Exception { PreparedStatement stmt = conn.prepareCall(sql); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -191,7 +185,6 @@ public void test_wallFilter() throws Exception { PreparedStatement stmt = conn.prepareCall(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -204,10 +197,9 @@ public void test_wallFilter() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareCall(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -223,7 +215,6 @@ public void test_wallFilter() throws Exception { stmt.execute(sql, Statement.NO_GENERATED_KEYS); ResultSet rs = stmt.getResultSet(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -236,28 +227,26 @@ public void test_wallFilter() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.execute(sql, new int[0]); ResultSet rs = stmt.getResultSet(); while (rs.next()) { - } rs.close(); stmt.close(); conn.close(); } Assert.assertEquals(150, wallFilter.getProvider().getTableStat("t").getFetchRowCount()); - + { String sql = "SELECT * FROM T LIMIT 10"; - + Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.execute(sql, new String[0]); ResultSet rs = stmt.getResultSet(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -283,7 +272,7 @@ public void test_wallFilter() throws Exception { } Assert.assertEquals(3, wallFilter.getProvider().getTableStat("t").getDeleteDataCount()); Assert.assertEquals(0, wallFilter.getProvider().getTableStat("t").getUpdateDataCount()); - + { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); @@ -293,7 +282,7 @@ public void test_wallFilter() throws Exception { } Assert.assertEquals(4, wallFilter.getProvider().getTableStat("t").getDeleteDataCount()); Assert.assertEquals(0, wallFilter.getProvider().getTableStat("t").getUpdateDataCount()); - + { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); @@ -303,7 +292,7 @@ public void test_wallFilter() throws Exception { } Assert.assertEquals(5, wallFilter.getProvider().getTableStat("t").getDeleteDataCount()); Assert.assertEquals(0, wallFilter.getProvider().getTableStat("t").getUpdateDataCount()); - + { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("DELETE from t where FID = ?"); @@ -314,7 +303,7 @@ public void test_wallFilter() throws Exception { } Assert.assertEquals(6, wallFilter.getProvider().getTableStat("t").getDeleteDataCount()); Assert.assertEquals(0, wallFilter.getProvider().getTableStat("t").getUpdateDataCount()); - + { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); @@ -377,7 +366,7 @@ public void test_wallFilter() throws Exception { conn.close(); } Assert.assertEquals(1, wallFilter.getProvider().getTableStat("t").getDropCount()); - + Assert.assertEquals(0, wallFilter.getViolationCount()); wallFilter.resetViolationCount(); wallFilter.checkValid("select 1"); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest3.java index 94c876e1a1..3ff28810eb 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest3.java @@ -18,9 +18,8 @@ import com.alibaba.druid.wall.WallFilter; public class WallFilterTest3 extends TestCase { - private DruidDataSource dataSource; - private WallFilter wallFilter; + private WallFilter wallFilter; protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -128,7 +127,6 @@ public void test_wallFilter() throws Exception { PreparedStatement stmt = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -141,11 +139,10 @@ public void test_wallFilter() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.CONCUR_READ_ONLY, + ResultSet.HOLD_CURSORS_OVER_COMMIT); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -160,7 +157,6 @@ public void test_wallFilter() throws Exception { PreparedStatement stmt = conn.prepareStatement(sql, new int[0]); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -175,7 +171,6 @@ public void test_wallFilter() throws Exception { PreparedStatement stmt = conn.prepareStatement(sql, new String[0]); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -190,7 +185,6 @@ public void test_wallFilter() throws Exception { PreparedStatement stmt = conn.prepareCall(sql); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -205,7 +199,6 @@ public void test_wallFilter() throws Exception { PreparedStatement stmt = conn.prepareCall(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -218,10 +211,9 @@ public void test_wallFilter() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareCall(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -237,7 +229,6 @@ public void test_wallFilter() throws Exception { stmt.execute(sql, Statement.NO_GENERATED_KEYS); ResultSet rs = stmt.getResultSet(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -250,11 +241,10 @@ public void test_wallFilter() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.execute(sql, new int[0]); ResultSet rs = stmt.getResultSet(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -267,11 +257,10 @@ public void test_wallFilter() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.execute(sql, new String[0]); ResultSet rs = stmt.getResultSet(); while (rs.next()) { - } rs.close(); stmt.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest.java index 40797d96a8..1d484dca2d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest.java @@ -23,8 +23,8 @@ /** * 这个场景，检测可疑的Having条件 - * @author wenshao * + * @author wenshao */ public class WallHavingTest extends TestCase { private String sql = "SELECT F1, COUNT(*) FROM T GROUP BY F1 HAVING COUNT(*) OR 1 = 1"; @@ -32,7 +32,7 @@ public class WallHavingTest extends TestCase { public void testMySql() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(sql)); } - + public void testORACLE() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest6.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest6.java index 354fcdff8c..9ac6455956 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest6.java @@ -26,9 +26,8 @@ * @author wenshao */ public class WallHavingTest6 extends TestCase { - private String sql = "SELECT region, SUM(population), SUM(area) FROM bbc GROUP BY region HAVING SUM(area)>1000000 or 1 = 1 --"; - + private String sql1 = "SELECT region, SUM(population), SUM(area) FROM bbc GROUP BY region HAVING SUM(area)>1000000 or 1 = 1 #and c=1"; public void test_check_true() throws Exception { @@ -50,7 +49,6 @@ public void test_check_false() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); Assert.assertTrue(WallUtils.isValidateMySql(sql1, config)); } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest.java index ccda2e99e2..756ff1cb18 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest.java @@ -24,9 +24,9 @@ public class WallInsertTest extends TestCase { private String sql = "INSERT INTO T (F1, F2) VALUES (1, 2)"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setInsertAllow(false); } @@ -34,9 +34,8 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { - Assert.assertFalse(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest2.java index 68a0efe972..006305318e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest2.java @@ -24,9 +24,9 @@ public class WallInsertTest2 extends TestCase { private String sql = "INSERT INTO T (F1, F2) VALUES (1, 2)"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setInsertAllow(true); } @@ -34,9 +34,8 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { - Assert.assertTrue(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallLineCommentTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallLineCommentTest.java index e7b4078154..e281228612 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallLineCommentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallLineCommentTest.java @@ -24,11 +24,11 @@ public class WallLineCommentTest extends TestCase { private String sql = "select f1 from t -- "; - + public void testOracle() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle(sql)); } - + public void testMySql() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiLineCommentTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiLineCommentTest.java index a41d8e55a7..fec29b0b57 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiLineCommentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiLineCommentTest.java @@ -23,11 +23,11 @@ public class WallMultiLineCommentTest extends TestCase { private String sql = "select f1 from t where a=1 /* and b=1 */"; - + public void testOracle() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle(sql)); } - + public void testMySql() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiStatementTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiStatementTest.java index d83f59647b..f025d509e5 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiStatementTest.java @@ -23,16 +23,16 @@ /** * 测试禁止多条语句执行的场景 - * @author admin * + * @author admin */ public class WallMultiStatementTest extends TestCase { private String sql = "SELECT email FROM members WHERE email = 'x'; UPDATE members SET email = 'steve@unixwiz.net' WHERE email = 'bob@example.com';"; - + public void testOracle() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle(sql)); } - + public void testMySql() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallProviderTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallProviderTest.java index 659d83529d..5c6f438e15 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallProviderTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallProviderTest.java @@ -10,7 +10,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class WallProviderTest extends TestCase { - public void test_getSqlStat() throws Exception { String whiteSql_1 = "select * from t1 where fid = 1"; String whiteSql_2 = "select * from t1 where fid = 2"; @@ -42,10 +41,10 @@ public void test_getSqlStat() throws Exception { Assert.assertTrue(provider.checkValid(whiteSql_1)); Assert.assertTrue(provider.checkValid(whiteSql_2)); - + Assert.assertFalse(provider.checkValid(blackSql_1)); Assert.assertFalse(provider.checkValid(blackSql_2)); - + for (int i = 1000; i < 1000 * 2; ++i) { String sql_x = "select * from t1 where fid = " + i; Assert.assertTrue(provider.checkValid(sql_x)); @@ -56,39 +55,39 @@ public void test_getSqlStat() throws Exception { Assert.assertEquals(2, provider.getSqlList().size()); Assert.assertFalse(provider.checkValid("slelc")); - + { WallProviderStatValue statValue = provider.getStatValue(true); Assert.assertNotNull(statValue); - + Assert.assertEquals(2, statValue.getTables().size()); Assert.assertEquals(1, statValue.getFunctions().size()); - + Assert.assertEquals(1009, statValue.getCheckCount()); Assert.assertEquals(2, statValue.getBlackListHitCount()); Assert.assertEquals(4, statValue.getHardCheckCount()); Assert.assertEquals(1, statValue.getSyntaxErrorCount()); Assert.assertEquals(5, statValue.getViolationCount()); Assert.assertEquals(1003, statValue.getWhiteListHitCount()); - + Assert.assertEquals(1, statValue.getWhiteList().size()); Assert.assertEquals(2, statValue.getBlackList().size()); } - + { WallProviderStatValue statValue = provider.getStatValue(true); Assert.assertNotNull(statValue); - + Assert.assertEquals(0, statValue.getTables().size()); Assert.assertEquals(0, statValue.getFunctions().size()); - + Assert.assertEquals(0, statValue.getCheckCount()); Assert.assertEquals(0, statValue.getBlackListHitCount()); Assert.assertEquals(0, statValue.getHardCheckCount()); Assert.assertEquals(0, statValue.getSyntaxErrorCount()); Assert.assertEquals(0, statValue.getViolationCount()); Assert.assertEquals(0, statValue.getWhiteListHitCount()); - + Assert.assertEquals(0, statValue.getWhiteList().size()); Assert.assertEquals(0, statValue.getBlackList().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest.java index a27d35662a..bb93ec7169 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest.java @@ -24,15 +24,16 @@ /** * 这个场景，检测可疑的Having条件 - * @author wenshao * + * @author wenshao */ public class WallReadOnlyTest extends TestCase { private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.addReadOnlyTable("members"); } + private String sql = "SELECT F1, F2 members"; private String insert_sql = "INSERT INTO members (FID, FNAME) VALUES (?, ?)"; private String update_sql = "UPDATE members SET FNAME = ? WHERe FID = ?"; @@ -44,7 +45,7 @@ public void testMySql() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(update_sql, config)); Assert.assertFalse(WallUtils.isValidateMySql(delete_sql, config)); } - + public void testORACLE() throws Exception { Assert.assertTrue(WallUtils.isValidateOracle(sql, config)); Assert.assertFalse(WallUtils.isValidateOracle(insert_sql, config)); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest2.java index 9c02a35808..49c181b725 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest2.java @@ -25,18 +25,17 @@ /** * 这个场景，检测可疑的Having条件 - * + * * @author wenshao */ public class WallReadOnlyTest2 extends TestCase { - private WallConfig config = new WallConfig(); protected void setUp() throws Exception { config.addReadOnlyTable("members"); } - private String sql = "SELECT F1, F2 members"; + private String sql = "SELECT F1, F2 members"; private String insert_sql = "INSERT INTO members (FID, FNAME) VALUES (?, ?)"; private String update_sql = "UPDATE members SET FNAME = ? WHERe FID = ?"; private String delete_sql = "DELETE members WHERE FID = ?"; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest.java index 815c959a50..06a3758388 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest.java @@ -23,8 +23,8 @@ /** * 这个场景，检测可疑的Having条件 - * @author wenshao * + * @author wenshao */ public class WallSelectIntoTest extends TestCase { private String sql = "SELECT F1, F2 INTO T2 FROM T1"; @@ -32,7 +32,7 @@ public class WallSelectIntoTest extends TestCase { public void testMySql() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql)); } - + public void testORACLE() throws Exception { Assert.assertTrue(WallUtils.isValidateOracle(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest1.java index e8918e6e90..d7f7398626 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest1.java @@ -24,9 +24,9 @@ public class WallSelectIntoTest1 extends TestCase { private String sql = "SELECT F1, F2 INTO T2 FROM T1"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setSelectIntoAllow(false); } @@ -34,9 +34,8 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { - Assert.assertFalse(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest.java index 1b1545266d..df6352d4f4 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest.java @@ -25,9 +25,9 @@ public class WallSelectLimitTest extends TestCase { private String sql = "select * from t"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setSelectLimit(1000); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java index 471efe9a88..ef3bca7631 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java @@ -25,7 +25,7 @@ public class WallSelectLimitTest_2 extends TestCase { private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setSelectLimit(1000); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest.java index 1bb9f48c2e..01fbf25ea1 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest.java @@ -23,8 +23,8 @@ /** * 这个场景，检测可疑的Having条件 - * @author wenshao * + * @author wenshao */ public class WallSelectWhereTest extends TestCase { private String sql = "SELECT F1, F2 from t WHERE 1 = 1"; @@ -32,7 +32,7 @@ public class WallSelectWhereTest extends TestCase { public void testMySql() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql)); } - + public void testORACLE() throws Exception { Assert.assertTrue(WallUtils.isValidateOracle(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest0.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest0.java index b2b4a90b13..3ab9486e82 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest0.java @@ -23,11 +23,10 @@ /** * 这个场景，检测可疑的Having条件 - * + * * @author wenshao */ public class WallSelectWhereTest0 extends TestCase { - private String sql = "SELECT F1, F2 from t WHERE 1 = 1 AND F1 = ?"; public void testMySql() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest1.java index c1ffe10c01..45da224344 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest1.java @@ -23,11 +23,10 @@ /** * 这个场景，检测可疑的Having条件 - * + * * @author wenshao */ public class WallSelectWhereTest1 extends TestCase { - public void testMySql_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql("SELECT F1, F2 from t WHERE 1 = 1 AND FID = ?")); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest2.java index 6645a7130d..71374ff7fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest2.java @@ -23,8 +23,8 @@ /** * 这个场景，检测可疑的Having条件 - * @author wenshao * + * @author wenshao */ public class WallSelectWhereTest2 extends TestCase { private String sql = "SELECT F1, F2 from t WHERE 1 = 1 AND FID = ?"; @@ -32,7 +32,7 @@ public class WallSelectWhereTest2 extends TestCase { public void testMySql() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql)); } - + public void testORACLE() throws Exception { Assert.assertTrue(WallUtils.isValidateOracle(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest3.java index 82ffa70f9f..ce73691741 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest3.java @@ -23,7 +23,6 @@ /** * @author wenshao - * */ public class WallSelectWhereTest3 extends TestCase { private String sql = "select * from t WHERE FID = 256 AND CHR(67)||CHR(65)||CHR(84) = 'CAT'"; @@ -31,7 +30,7 @@ public class WallSelectWhereTest3 extends TestCase { public void testMySql() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(sql)); } - + public void testORACLE() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest4.java index 965972601e..ba76a6d781 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest4.java @@ -23,8 +23,8 @@ /** * 这个场景，检测可疑的Where条件 - * @author wenshao * + * @author wenshao */ public class WallSelectWhereTest4 extends TestCase { private String sql = "select * from t WHERE FID = 256 OR CHR(67)||CHR(65)||CHR(84) = 'CAT'"; @@ -32,7 +32,7 @@ public class WallSelectWhereTest4 extends TestCase { // public void testMySql() throws Exception { // Assert.assertFalse(WallUtils.isValidateMySql(sql)); // } - + public void testORACLE() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest5.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest5.java index 89551a6f56..2ccab95af5 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest5.java @@ -23,7 +23,6 @@ /** * @author wenshao - * */ public class WallSelectWhereTest5 extends TestCase { private String sql = "select * from t WHERE FID = 256 OR CONCAT(CHR(67)||CHR(65)||CHR(84), '-DOG') = 'CAT-DOG'"; @@ -31,7 +30,7 @@ public class WallSelectWhereTest5 extends TestCase { // public void testMySql() throws Exception { // Assert.assertFalse(WallUtils.isValidateMySql(sql)); // } - + public void testORACLE() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest6.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest6.java index c43b60133d..d8bf6666a9 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest6.java @@ -26,9 +26,8 @@ * @author wenshao */ public class WallSelectWhereTest6 extends TestCase { - private String sql = "SELECT * FROM T WHERE id = 0 or 1 = 1 --"; - + private String sql1 = "SELECT * FROM T WHERE id = 0 or 1 = 1 #and c=1"; public void test_check_true() throws Exception { @@ -50,7 +49,6 @@ public void test_check_false() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); Assert.assertTrue(WallUtils.isValidateMySql(sql1, config)); } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList.java index 70fc04dd9e..fcab043691 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList.java @@ -10,7 +10,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class WallStatTest_WhiteList extends TestCase { - protected void setUp() throws Exception { WallContext.clearContext(); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList_disable.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList_disable.java index 2eba41946c..4c596dc787 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList_disable.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList_disable.java @@ -10,7 +10,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class WallStatTest_WhiteList_disable extends TestCase { - protected void setUp() throws Exception { WallContext.clearContext(); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_alter_table.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_alter_table.java index 81f2e049ce..3ca4bd1dfa 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_alter_table.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_alter_table.java @@ -17,22 +17,22 @@ public void testMySql() throws Exception { String sql = "alter table t add column fname varchar(50)"; WallProvider provider = new MySqlWallProvider(); provider.getConfig().setAlterTableAllow(true); - + Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getAlterCount()); } - + public void testOracle() throws Exception { String sql = "alter table t add (fname varchar(50))"; WallProvider provider = new OracleWallProvider(); provider.getConfig().setAlterTableAllow(true); - + Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getAlterCount()); } - + // public void testPG() throws Exception { // WallProvider provider = new PGWallProvider(); // provider.getConfig().setAlterTableAllow(true); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_1.java index ea6631e635..b62d7beba8 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_1.java @@ -10,7 +10,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class WallStatTest_blackList_1 extends TestCase { - protected void setUp() throws Exception { WallContext.clearContext(); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_syntaxError.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_syntaxError.java index cf42c68993..a37ea5165b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_syntaxError.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_syntaxError.java @@ -10,7 +10,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class WallStatTest_blackList_syntaxError extends TestCase { - protected void setUp() throws Exception { WallContext.clearContext(); } @@ -35,7 +34,7 @@ public void testMySql() throws Exception { Assert.assertEquals(1, provider.getSyntaxErrorCount()); Assert.assertEquals(1, provider.getHardCheckCount()); } - + Assert.assertFalse(provider.checkValid(sql)); { WallTableStat tableStat = provider.getTableStat("t"); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blacklist.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blacklist.java index 3840a6802e..cdb6f02aee 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blacklist.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blacklist.java @@ -10,7 +10,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class WallStatTest_blacklist extends TestCase { - private String sql = "select * from t where id = ? and 1 = 1"; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_create_table.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_create_table.java index 996ef88dab..b41ee0727f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_create_table.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_create_table.java @@ -18,36 +18,36 @@ public class WallStatTest_create_table extends TestCase { public void testMySql() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCreateTableAllow(true); - + Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getCreateCount()); } - + public void testOracle() throws Exception { WallProvider provider = new OracleWallProvider(); provider.getConfig().setCreateTableAllow(true); - + Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getCreateCount()); } - + public void testPG() throws Exception { WallProvider provider = new PGWallProvider(); provider.getConfig().setCreateTableAllow(true); - + Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getCreateCount()); } - + public void testSQLServer() throws Exception { WallProvider provider = new SQLServerWallProvider(); provider.getConfig().setCreateTableAllow(true); - + Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getCreateCount()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_delete.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_delete.java index 26f7e1642f..ad358e0df7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_delete.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_delete.java @@ -13,7 +13,6 @@ import com.alibaba.druid.wall.spi.SQLServerWallProvider; public class WallStatTest_delete extends TestCase { - private String sql = "delete from T where fid = ?"; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_drop_table.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_drop_table.java index a2cdc60008..dc92c2a74c 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_drop_table.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_drop_table.java @@ -13,7 +13,6 @@ import com.alibaba.druid.wall.spi.SQLServerWallProvider; public class WallStatTest_drop_table extends TestCase { - private String sql = "drop table t"; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_function_stats.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_function_stats.java index 2a12cf9363..f6861a623e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_function_stats.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_function_stats.java @@ -11,7 +11,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class WallStatTest_function_stats extends TestCase { - private String sql = "select len(fname), len(fdesc) from t"; protected void setUp() throws Exception { @@ -44,5 +43,5 @@ public void testMySql() throws Exception { } } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_insert.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_insert.java index 21d13bc62b..25907f58cd 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_insert.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_insert.java @@ -18,28 +18,28 @@ public class WallStatTest_insert extends TestCase { public void testMySql() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getInsertCount()); } - + public void testOracle() throws Exception { WallProvider provider = new OracleWallProvider(); Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getInsertCount()); } - + public void testPG() throws Exception { WallProvider provider = new PGWallProvider(); Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getInsertCount()); } - + public void testSQLServer() throws Exception { WallProvider provider = new SQLServerWallProvider(); Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getInsertCount()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select.java index b2ab732de8..8bf244a526 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select.java @@ -13,7 +13,6 @@ import com.alibaba.druid.wall.spi.SQLServerWallProvider; public class WallStatTest_select extends TestCase { - private String sql = "select * from t where id = ?"; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_1.java index 5ffb05c620..5f48f59827 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_1.java @@ -13,7 +13,6 @@ import com.alibaba.druid.wall.spi.SQLServerWallProvider; public class WallStatTest_select_1 extends TestCase { - private String sql = "SELECT b.* FROM lhwbbs_posts_reply a LEFT JOIN lhwbbs_posts b ON a.pid=b.pid WHERE a.rpid=? AND b.disabled=? ORDER BY a.pid DESC"; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_2.java index e34995f04c..1a2bbf5a6f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_2.java @@ -10,7 +10,6 @@ public class WallStatTest_select_2 extends TestCase { - private String sql = "SELECT *\n" + "FROM `t`\n" + "WHERE `t`.`col1` = '1'\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_into.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_into.java index 0ba4ecb6b6..736db1b9ca 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_into.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_into.java @@ -13,7 +13,6 @@ import com.alibaba.druid.wall.spi.SQLServerWallProvider; public class WallStatTest_select_into extends TestCase { - private String sql = "select * into x from t where id = ?"; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java index f156f98502..4884649324 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java @@ -14,7 +14,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class WallStatTest_statMap extends TestCase { - protected void setUp() throws Exception { WallContext.clearContext(); } @@ -39,7 +38,7 @@ public void testMySql() throws Exception { Assert.assertFalse(providerB.checkValid(sql)); providerB.addViolationEffectRowCount(11); } - + WallProvider providerC = new MySqlWallProvider(); { String sql = "select * from t where len(fname2) = 2 OR 1 = 1"; @@ -57,11 +56,11 @@ public void testMySql() throws Exception { Map statMapMerged = DruidStatManagerFacade.mergeWallStat(statMapA, statMapB); System.out.println(JSONUtils.toJSONString(statMapMerged)); - + Assert.assertEquals(2L, statMapMerged.get("checkCount")); Assert.assertEquals(21L, statMapMerged.get("violationEffectRowCount")); Assert.assertEquals(2, ((Collection>) statMapMerged.get("blackList")).size()); - + statMapMerged = DruidStatManagerFacade.mergeWallStat(statMapMerged, statMapC); System.out.println(JSONUtils.toJSONString(statMapMerged)); Assert.assertEquals(2, ((Collection>) statMapMerged.get("blackList")).size()); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_update.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_update.java index f936b83883..6ec1c7e38f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_update.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_update.java @@ -23,32 +23,32 @@ protected void setUp() throws Exception { protected void tearDown() throws Exception { WallContext.clearContext(); } - + public void testMySql() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getUpdateCount()); } - + public void testOracle() throws Exception { WallProvider provider = new OracleWallProvider(); Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getUpdateCount()); } - + public void testPG() throws Exception { WallProvider provider = new PGWallProvider(); Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getUpdateCount()); } - + public void testSQLServer() throws Exception { WallProvider provider = new SQLServerWallProvider(); Assert.assertTrue(provider.checkValid(sql)); - WallTableStat tableStat = provider.getTableStat("t"); + WallTableStat tableStat = provider.getTableStat("t"); Assert.assertEquals(1, tableStat.getUpdateCount()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_whiteList_syntaxError.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_whiteList_syntaxError.java index 27473b581f..958f0e627a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_whiteList_syntaxError.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_whiteList_syntaxError.java @@ -10,7 +10,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class WallStatTest_whiteList_syntaxError extends TestCase { - protected void setUp() throws Exception { WallContext.clearContext(); } @@ -36,7 +35,7 @@ public void testMySql() throws Exception { Assert.assertEquals(1, provider.getSyntaxErrorCount()); Assert.assertEquals(1, provider.getHardCheckCount()); } - + Assert.assertTrue(provider.checkValid(sql)); { WallTableStat tableStat = provider.getTableStat("t"); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest.java index 6aad7a1d58..5b5cfb8b8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest.java @@ -24,8 +24,8 @@ public class WallTruncateTest extends TestCase { private String sql = "TRUNCATE TABLE T1"; - - + + protected void setUp() throws Exception { //config.setTruncateAllow(true); } @@ -34,18 +34,18 @@ public void testMySql() throws Exception { WallConfig config = new WallConfig(); Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { WallConfig config = new WallConfig(); Assert.assertTrue(WallUtils.isValidateOracle(sql, config)); } - + public void testMySql_false() throws Exception { WallConfig config = new WallConfig(); config.setTruncateAllow(false); Assert.assertFalse(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE_false() throws Exception { WallConfig config = new WallConfig(); config.setTruncateAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest1.java index e86b21492e..b6ecb80b44 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest1.java @@ -24,9 +24,9 @@ public class WallTruncateTest1 extends TestCase { private String sql = "TRUNCATE TABLE T1"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setTruncateAllow(true); } @@ -34,9 +34,8 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { - Assert.assertTrue(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest.java index 936ed695de..a3ad5e62fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest.java @@ -24,11 +24,10 @@ /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 - * + * * @author wenshao */ public class WallUnionTest extends TestCase { - public void testMySql() throws Exception { WallConfig config = new WallConfig(); config.setSelectUnionCheck(true); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest2.java index 950f284510..523bd3b1d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest2.java @@ -24,26 +24,25 @@ /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 - * + * * @author wenshao */ public class WallUnionTest2 extends TestCase { - public void testMySql() throws Exception { WallConfig config = new WallConfig(); config.setSelectUnionCheck(true); Assert.assertTrue(WallUtils.isValidateMySql("select f1, f2 from t where f1 = 1 union select 1, 2 where 1 = 1", - config)); + config)); Assert.assertFalse(WallUtils.isValidateMySql("select f1, f2 from t where f1 = 1 union select 1, 2 where 1 = 1 --", - config)); + config)); } public void testOracle() throws Exception { WallConfig config = new WallConfig(); config.setSelectUnionCheck(true); Assert.assertTrue(WallUtils.isValidateOracle("select f1, f2 from t where f1 = 1 union select 1, 2 where 1 = 1", - config)); + config)); Assert.assertFalse(WallUtils.isValidateOracle("select f1, f2 from t where f1 = 1 union select 1, 2 where 1 = 1 --", - config)); + config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest3.java index aa3fa1c8d7..080e1f27cd 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest3.java @@ -23,11 +23,10 @@ /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 - * @author wenshao * + * @author wenshao */ public class WallUnionTest3 extends TestCase { - public void testMySql() throws Exception { // Assert.assertFalse(WallUtils.isValidateMySql("SELECT id, product FROM test.test t LIMIT 0,0 UNION ALL SELECT 1,'x'")); // Assert.assertFalse(WallUtils.isValidateMySql("SELECT id, product FROM test.test t LIMIT 0,0 UNION ALL SELECT 1,'x';")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest4.java index b059f1d572..d11f5c45cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest4.java @@ -24,26 +24,25 @@ /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 - * + * * @author wenshao */ public class WallUnionTest4 extends TestCase { - public void testMySql() throws Exception { WallConfig config = new WallConfig(); config.setSelectUnionCheck(true); Assert.assertTrue(WallUtils.isValidateMySql("SELECT id, product FROM T1 t where id=1 UNION (SELECT * FROM (SELECT 1,'x') X)", - config)); + config)); Assert.assertFalse(WallUtils.isValidateMySql("SELECT id, product FROM T1 t where id=1 UNION (SELECT * FROM (SELECT 1,'x') X) -- ", - config)); + config)); } public void testORACLE() throws Exception { WallConfig config = new WallConfig(); config.setSelectUnionCheck(true); Assert.assertTrue(WallUtils.isValidateOracle("SELECT id, product FROM T1 t where id=1 UNION (SELECT * FROM (SELECT 1,'x') X)", - config)); + config)); Assert.assertFalse(WallUtils.isValidateOracle("SELECT id, product FROM T1 t where id=1 UNION (SELECT * FROM (SELECT 1,'x') X) -- ", - config)); + config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateCheckTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateCheckTest.java index 9c11877a4f..9fb702b872 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateCheckTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateCheckTest.java @@ -27,7 +27,6 @@ public void test_update_check_handler() throws Exception { assertTrue(result.getViolations().isEmpty()); } wallProvider.getConfig().setUpdateCheckHandler(new WallUpdateCheckHandler() { - @Override public boolean check(String table, String column, Object setValue, List filterValues) { return false; @@ -38,7 +37,6 @@ public boolean check(String table, String column, Object setValue, List assertTrue(result.getViolations().size() > 0); } wallProvider.getConfig().setUpdateCheckHandler(new WallUpdateCheckHandler() { - @Override public boolean check(String table, String column, Object setValue, List filterValues) { return true; @@ -51,7 +49,6 @@ public boolean check(String table, String column, Object setValue, List assertEquals(0, wallProvider.getWhiteListHitCount()); assertEquals(0, wallProvider.getBlackListHitCount()); wallProvider.getConfig().setUpdateCheckHandler(new WallUpdateCheckHandler() { - @Override public boolean check(String table, String column, Object setValue, List filterValues) { //增加对in语句的支持， status in (1, 2) 应该返回的filterValue为1和2 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest.java index c86676f264..6a8ecf9d7c 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest.java @@ -24,9 +24,9 @@ public class WallUpdateTest extends TestCase { private String sql = "UPDATE T_USER SET FNAME = ? WHERE FID = ?"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setDeleteAllow(false); } @@ -34,9 +34,8 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { - Assert.assertTrue(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest1.java index d1a7fc7697..be0c5a2f01 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest1.java @@ -25,9 +25,9 @@ public class WallUpdateTest1 extends TestCase { private String sql = "UPDATE T_USER SET FNAME = ? WHERE FID = ?"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setUpdateAllow(false); } @@ -35,9 +35,8 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { - Assert.assertFalse(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest2.java index 5fc889619e..e308b55ad7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest2.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.WallUtils; public class WallUpdateTest2 extends TestCase { - private String sql = "UPDATE T_USER SET FNAME = ?"; public void testMySql_true() throws Exception { @@ -35,13 +34,13 @@ public void testORACLE_true() throws Exception { WallConfig config = new WallConfig(); Assert.assertTrue(WallUtils.isValidateOracle(sql, config)); } - + public void testMySql_false() throws Exception { WallConfig config = new WallConfig(); config.setUpdateAllow(false); Assert.assertFalse(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE_false() throws Exception { WallConfig config = new WallConfig(); config.setUpdateAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest3.java index 1ad26c3cfa..a7a1d1e6ca 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest3.java @@ -24,13 +24,12 @@ /** * 这个场景，检测 - * + * * @author wenshao */ public class WallUpdateTest3 extends TestCase { - - private String sql = "UPDATE T_USER SET FNAME = ? WHERE 1 = 1"; - private String sql2 = "UPDATE T_USER SET FNAME = ? WHERE id = 1 or1 = 1"; + private String sql = "UPDATE T_USER SET FNAME = ? WHERE 1 = 1"; + private String sql2 = "UPDATE T_USER SET FNAME = ? WHERE id = 1 or1 = 1"; private WallConfig config = new WallConfig(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest4.java index 9a6ea6703e..e2fa98e34d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest4.java @@ -24,9 +24,9 @@ public class WallUpdateTest4 extends TestCase { private String sql = "UPDATE T_USER SET FNAME = ? WHERE FID = ? OR 1 = 1"; - + private WallConfig config = new WallConfig(); - + protected void setUp() throws Exception { config.setUpdateAllow(true); } @@ -34,9 +34,8 @@ protected void setUp() throws Exception { public void testMySql() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(sql, config)); } - + public void testORACLE() throws Exception { - Assert.assertFalse(WallUtils.isValidateOracle(sql, config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest.java index b6585dbc54..e070f29191 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest.java @@ -23,12 +23,11 @@ /** * 这个场景，检测可疑的Having条件 - * + * * @author wenshao */ public class WallUpdateWhereTest extends TestCase { - - private String sql = "UPDATE T SET F1 = 0 WHERE 1 = 1"; + private String sql = "UPDATE T SET F1 = 0 WHERE 1 = 1"; private String sql2 = "UPDATE T SET F1 = 0 WHERE id=0 and 1 = 1"; public void testMySql() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest1.java index 08c1c5ca93..4e13f01bb7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest1.java @@ -26,8 +26,7 @@ * @author wenshao */ public class WallUpdateWhereTest1 extends TestCase { - - private String sql = "update wx_shop set shop_view = shop_view + 1 where id = 118 OR 69=69 LIMIT 100 --"; + private String sql = "update wx_shop set shop_view = shop_view + 1 where id = 118 OR 69=69 LIMIT 100 --"; private String sql1 = "update wx_shop set shop_view = shop_view + 1 where id = 118 OR 69=69 LIMIT 100 #and c=1"; public void test_check_true() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsLargeOrTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsLargeOrTest.java index 50d1d1d06f..8add94956d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsLargeOrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsLargeOrTest.java @@ -7,13 +7,13 @@ import com.alibaba.druid.wall.spi.WallVisitorUtils; public class WallVisitorUtilsLargeOrTest extends TestCase { - public void test_largeOr() throws Exception { - StringBuilder buf = new StringBuilder(); - buf.append("ID = 1"); - for (int i = 2; i <= 1000 * 10; ++i) { - buf.append(" OR ID = " + i); - } - - Assert.assertEquals(null, WallVisitorUtils.getValue(SQLUtils.toSQLExpr(buf.toString()))); - } + public void test_largeOr() throws Exception { + StringBuilder buf = new StringBuilder(); + buf.append("ID = 1"); + for (int i = 2; i <= 1000 * 10; ++i) { + buf.append(" OR ID = " + i); + } + + Assert.assertEquals(null, WallVisitorUtils.getValue(SQLUtils.toSQLExpr(buf.toString()))); + } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java index 1ded09cf58..56bc27381e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java @@ -22,7 +22,6 @@ import com.alibaba.druid.wall.spi.WallVisitorUtils; public class WallVisitorUtilsTest extends TestCase { - public void test_isTrue() throws Exception { Assert.assertEquals(Boolean.TRUE, WallVisitorUtils.getValue(SQLUtils.toSQLExpr("1 != 2"))); Assert.assertEquals(Boolean.TRUE, WallVisitorUtils.getValue(SQLUtils.toSQLExpr("1 != 2 AND 2 = 2"))); @@ -47,11 +46,11 @@ public void test_isTrue() throws Exception { Assert.assertEquals(Boolean.TRUE, WallVisitorUtils.getValue(SQLUtils.toSQLExpr("(select count(*) from t) > 0"))); Assert.assertEquals(Boolean.TRUE, - WallVisitorUtils.getValue(SQLUtils.toSQLExpr("(select count(*) from t) >= 0"))); + WallVisitorUtils.getValue(SQLUtils.toSQLExpr("(select count(*) from t) >= 0"))); Assert.assertEquals(Boolean.FALSE, - WallVisitorUtils.getValue(SQLUtils.toSQLExpr("(select count(*) from t) < 0"))); + WallVisitorUtils.getValue(SQLUtils.toSQLExpr("(select count(*) from t) < 0"))); Assert.assertEquals(Boolean.TRUE, - WallVisitorUtils.getValue(SQLUtils.toSQLExpr("NOT (select count(*) from t) < 0"))); + WallVisitorUtils.getValue(SQLUtils.toSQLExpr("NOT (select count(*) from t) < 0"))); // } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallDescribteTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallDescribteTest.java index d181573e9c..f38a67b328 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallDescribteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallDescribteTest.java @@ -24,22 +24,21 @@ /** * 这个场景测试访问Oracle系统对象 - * + * * @author admin */ public class MySqlWallDescribteTest extends TestCase { - public void test_allow() throws Exception { WallConfig config = new WallConfig(); config.setDescribeAllow(true); - + Assert.assertTrue(WallUtils.isValidateMySql("describe t", config)); } - + public void test_not_allow() throws Exception { WallConfig config = new WallConfig(); config.setDescribeAllow(false); - + Assert.assertFalse(WallUtils.isValidateMySql("describe t", config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLimitTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLimitTest.java index 47de653744..ee6c708259 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLimitTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLimitTest.java @@ -23,14 +23,13 @@ /** * 这个场景测试访问MySql系统函数 - * + * * @author admin */ public class MySqlWallLimitTest extends TestCase { - public void test_permitTable() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql("SELECT * FROM T LIMIT 0")); Assert.assertFalse(WallUtils.isValidateMySql("SELECT * FROM T LIMIT 10, 0")); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLoadDataInfileTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLoadDataInfileTest.java index 13a48db751..9475057507 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLoadDataInfileTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLoadDataInfileTest.java @@ -23,13 +23,12 @@ /** * 这个场景测试访问MySql系统函数 - * + * * @author admin */ public class MySqlWallLoadDataInfileTest extends TestCase { - public void test_permit_stmt() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql("load data infile 'c:/boot.ini' into table foo")); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitFunctionTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitFunctionTest.java index fe12a668db..da12e01ed3 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitFunctionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitFunctionTest.java @@ -22,7 +22,6 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallPermitFunctionTest extends TestCase { - public void test_permitTable() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql("SELECT *FROM T UNION SELECT User,Password FROM mysql.user")); Assert.assertFalse(WallUtils.isValidateMySql("SELECT *FROM T UNION SELECT User,Password FROM `mysql`.`user`")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitTableTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitTableTest.java index f8bac4e1b1..6168ceb163 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitTableTest.java @@ -23,21 +23,20 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallPermitTableTest extends TestCase { - public void test_default_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql("select * from t union select benchmark( 500000, sha1( 'test' ) ) FROM X")); } - + public void test_default_false() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql("select * from t where fid = 1 union select benchmark( 500000, sha1( 'test' ) ) FROM X")); } - - + + public void test_allow() throws Exception { WallConfig config = new WallConfig(); config.setTableCheck(false); - + Assert.assertTrue(WallUtils.isValidateMySql("select benchmark( 500000, sha1( 'test' ) ) FROM X", config)); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitVariantTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitVariantTest.java index cc867e2580..5866905f70 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitVariantTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitVariantTest.java @@ -23,11 +23,10 @@ /** * 这个场景测试访问Oracle系统对象 - * + * * @author admin */ public class MySqlWallPermitVariantTest extends TestCase { - private String sql = "select * FROM X where id=1 or version=@@version_compile_os"; public void test_allow() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest.java index aff36d98a2..b0f2dda718 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest.java @@ -22,7 +22,6 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest extends TestCase { - public void testWall() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql("SELECT * FROM X where id=1 and 1!=1 union select 14,13,12,11,10,@@version_compile_os,8,7,6,5,4,3,2,1 FROM X")); Assert.assertTrue(WallUtils.isValidateMySql("select '@@version_compile_os' FROM X")); @@ -45,11 +44,11 @@ public void testWall() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql("select 'outfile'")); //Assert.assertFalse(WallUtils.isValidateMySql("select f1, f2 from t where c1=1 union select 1, 2")); - + Assert.assertTrue(WallUtils.isValidateMySql("select c1 from t where 1=1 or id =1")); Assert.assertFalse(WallUtils.isValidateMySql("select c1 from t where id =1 or 1=1")); Assert.assertFalse(WallUtils.isValidateMySql("select c1 from t where id =1 || 1=1")); - + Assert.assertFalse(WallUtils.isValidateMySql("select * from person where id = '3'/**/union select v,b,a from (select 1,2,4/*! ,database() as b,user() as a,version() as v*/) a where '1'<>''")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest1.java index b555dc2f8f..193bcf59a3 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest1.java @@ -23,7 +23,7 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see @@ -31,6 +31,6 @@ public class MySqlWallTest1 extends TestCase { public void test_stuff() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "select count(*) from (select DATE_FORMAT(staydate,'%m月') as month,sum(a) as addnum,sum(q) as quitnum from (select staydate,1 as a,0 as q from add_person union all select quitdate,0 as a,1 as q from quit_person) t where (DATE_FORMAT(staydate,'%Y')= ? ) group by DATE_FORMAT(staydate,'%Y-%m'))")); + "select count(*) from (select DATE_FORMAT(staydate,'%m月') as month,sum(a) as addnum,sum(q) as quitnum from (select staydate,1 as a,0 as q from add_person union all select quitdate,0 as a,1 as q from quit_person) t where (DATE_FORMAT(staydate,'%Y')= ? ) group by DATE_FORMAT(staydate,'%Y-%m'))")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest10.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest10.java index 25ccc968e3..89f9a777de 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest10.java @@ -23,15 +23,14 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest10 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT t.*,a.param_id FROM lhwtag AS t RIGHT JOIN lhwtag_relation AS a USING(`tag_id`) WHERE a.`type_id`=1 AND a.`param_id` IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9') ORDER BY t.`content_count`")); + "SELECT t.*,a.param_id FROM lhwtag AS t RIGHT JOIN lhwtag_relation AS a USING(`tag_id`) WHERE a.`type_id`=1 AND a.`param_id` IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9') ORDER BY t.`content_count`")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest100.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest100.java index 4000f82d82..e978fbefd6 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest100.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest100.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest100 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest101.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest101.java index 92ed3a4d23..6ec832e8f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest101.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest101.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest101 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest102.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest102.java index ed7269c49e..87758fe00d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest102.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest102.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest102 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest103.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest103.java index e951ff5e6c..101fad2fae 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest103.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest103.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest103 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest104.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest104.java index 8fbaa86a28..e9ca2a640e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest104.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest104.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest104 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest105.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest105.java index 6aeb8149c6..9bba422a57 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest105.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest105.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest105 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest106.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest106.java index 395a28385a..3268cfdf07 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest106.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest106.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest106 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest107.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest107.java index 736c70e9dc..3dd9b9675f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest107.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest107.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest107 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest108.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest108.java index 1ba9980962..e75370f9a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest108.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest108.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest108 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest109.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest109.java index 5b44a7022c..ebbbcfb468 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest109.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest109.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest109 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest11.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest11.java index b479d33c6e..ca268a8f26 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest11.java @@ -23,20 +23,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest11 extends TestCase { - public void test_true() throws Exception { assertTrue(WallUtils.isValidateMySql(// - "SELECT *, MATCH(question_content_fulltext) " + // - "AGAINST('2015431867 2636826089 3807520117 2796321160 2615920174' IN BOOLEAN MODE) AS score " + // - "FROM aws_question " + // - "WHERE MATCH(question_content_fulltext) " + // - " AGAINST('2015431867 2636826089 3807520117 2796321160 2615920174' IN BOOLEAN MODE) " + // - "ORDER BY score DESC, agree_count DESC LIMIT 10")); // + "SELECT *, MATCH(question_content_fulltext) " + // + "AGAINST('2015431867 2636826089 3807520117 2796321160 2615920174' IN BOOLEAN MODE) AS score " + // + "FROM aws_question " + // + "WHERE MATCH(question_content_fulltext) " + // + " AGAINST('2015431867 2636826089 3807520117 2796321160 2615920174' IN BOOLEAN MODE) " + // + "ORDER BY score DESC, agree_count DESC LIMIT 10")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest110.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest110.java index 78700cb602..3b343cd71f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest110.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest110.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest110 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest111.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest111.java index bac5d56cbf..50aada54f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest111.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest111.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest111 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest112.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest112.java index aa5efe2fe4..4109f87ca2 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest112.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest112.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest112 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest113.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest113.java index ffe1d3c546..7becc599a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest113.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest113.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest113 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest114.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest114.java index 4613a0f4f1..708c1bcc49 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest114.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest114.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest114 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest115.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest115.java index 1eb78cc988..e08d147633 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest115.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest115.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest115 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest116.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest116.java index 76ae65c986..0a88088e04 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest116.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest116.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest116 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest117.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest117.java index 47c6b5a67a..4625a41e65 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest117.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest117.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest117 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest118.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest118.java index d1b7705488..c9ad8d01fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest118.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest118.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest118 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest119.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest119.java index 837350ff4d..c3c7b8366a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest119.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest119.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest119 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest12.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest12.java index 889af54b0c..8611762775 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest12.java @@ -23,17 +23,16 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest12 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT a.* FROM lhwbbs_threads a " + // - "WHERE 1 AND a.disabled=0 AND a.ifupload&1=1 " + // - "ORDER BY a.created_time DESC LIMIT 0,100")); // + "SELECT a.* FROM lhwbbs_threads a " + // + "WHERE 1 AND a.disabled=0 AND a.ifupload&1=1 " + // + "ORDER BY a.created_time DESC LIMIT 0,100")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest120.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest120.java index c7d3272229..370d18ff3d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest120.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest120.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest120 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest121.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest121.java index a3f618687e..919ca56f49 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest121.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest121.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest121 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest122.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest122.java index c13e7bfd36..9819026322 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest122.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest122.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest122 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest123.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest123.java index d8b47e2bb4..52cf45094e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest123.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest123.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest123 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest124.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest124.java index 06ee09c867..09d01d0775 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest124.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest124.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest124 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest125.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest125.java index b52cfcd843..bbf85d3af9 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest125.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest125.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest125 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest126.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest126.java index 7dd47c9e26..133e953059 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest126.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest126.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest126 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest127.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest127.java index 945e294485..eb9d70dc58 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest127.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest127.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest127 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest128.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest128.java index 4ac2c5e314..fa6bd20972 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest128.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest128.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest128 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest129.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest129.java index e296350ff1..62bc7dc9ac 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest129.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest129.java @@ -25,11 +25,10 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest129 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); - + Assert.assertTrue(provider.checkValid("select * from t where id = 1")); String sql = "select * from t where id = "; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest13.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest13.java index a1845f7531..73f72f1ea3 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest13.java @@ -23,18 +23,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest13 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT index_privacy AS index,msgboard_privacy AS messageboard," + // - "photos_privacy AS photos,diary_privacy AS diary," + // - "owrite_privacy AS weibo " + // - "FROM pw_ouserdata WHERE uid= ?")); // + "SELECT index_privacy AS index,msgboard_privacy AS messageboard," + // + "photos_privacy AS photos,diary_privacy AS diary," + // + "owrite_privacy AS weibo " + // + "FROM pw_ouserdata WHERE uid= ?")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest130.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest130.java index 80e4408276..d0e9b2ce93 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest130.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest130.java @@ -25,11 +25,10 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest130 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); - + Assert.assertTrue(provider.checkValid("select * from t where id = 1")); String sql = "select * from t where id = "; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest131.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest131.java index bbd029c98b..63f1ad3de4 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest131.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest131.java @@ -23,11 +23,10 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest131 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(true); - + Assert.assertFalse(provider.checkValid("select * from t where id = 1 /*!30000union all select 2*/")); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest132.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest132.java index 1a01bde140..3245d84a26 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest132.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest132.java @@ -23,11 +23,10 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest132 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(true); - + Assert.assertFalse(provider.checkValid("select * from t where id = 1 UNION SELECT GROUP_CONCAT(table_name) FROM information_schema.tables WHERE version=10;")); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest133.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest133.java index 01e30c9d52..0b8acff61d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest133.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest133.java @@ -23,12 +23,11 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest133 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertFalse(provider.checkValid("select * from t where id = 1 " // - + "UNION SELECT @ from t")); + + "UNION SELECT @ from t")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest134.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest134.java index f6c3eb6abb..9d1cbba0da 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest134.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest134.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest134 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSelectUnionCheck(true); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest135.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest135.java index 349724555e..2d8a8ce7de 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest135.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest135.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest135 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest136.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest136.java index e03f8256ea..4df214cc2d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest136.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest136.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest136 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest137.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest137.java index e1677df57d..c5b34197a3 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest137.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest137.java @@ -23,13 +23,12 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest137 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid("select bi.title from bbt_item_chd_3 bi " // - + "where bi.title = '具8\\'\\'/200mm迷OK-6295'" - + " and bi.item_id <> null and bi.nick = '营店'")); + + "where bi.title = '具8\\'\\'/200mm迷OK-6295'" + + " and bi.item_id <> null and bi.nick = '营店'")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest138.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest138.java index 937dd2a6e3..25693a42da 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest138.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest138.java @@ -23,20 +23,19 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest138 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); String sql = "INSERT INTO T01_CHECKIN_CUSTOMER" // - + "(WEB_USER_ID,NAME,COUNTRY,PROVINCE,CITY" // - + ",POSTCODE,PHONE,FAX,EMAIL,ADDRESS,FIRST_NAME,LAST_NAME,sex) " // - + "select 2,null,'4225',null,'beijing','','1','','1223@123.com','beijing','booking','test',null "// - + "from dual " // - + "where not exists ("// - + " select EMAIL" // - + " from T01_CHECKIN_CUSTOMER" // - + " where WEB_USER_ID=2 and EMAIL='1223@123.com'" // - + ")"; + + "(WEB_USER_ID,NAME,COUNTRY,PROVINCE,CITY" // + + ",POSTCODE,PHONE,FAX,EMAIL,ADDRESS,FIRST_NAME,LAST_NAME,sex) " // + + "select 2,null,'4225',null,'beijing','','1','','1223@123.com','beijing','booking','test',null "// + + "from dual " // + + "where not exists ("// + + " select EMAIL" // + + " from T01_CHECKIN_CUSTOMER" // + + " where WEB_USER_ID=2 and EMAIL='1223@123.com'" // + + ")"; Assert.assertTrue(provider.checkValid(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest139.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest139.java index e803a20bf0..88e65b7995 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest139.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest139.java @@ -23,31 +23,30 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest139 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); String sql = "select count(1) as total "// - + " from (" // - + " select '' buyer_nick from dual " // - + " where 1=0 "// - + " union " // - + " select distinct buyer_nick "// - + " from sys_info.orders "// - + " where 1=1 and receiver_district in ('平谷区')" // - + ") a " // - + "inner join (" // - + " select buyer_nick from ("// - + " select distinct buyer_nick "// - + " from sys_info.orders " // - + " where 1=1 and created > '2013-07-28' "// - + " ) recent_days " // - + "inner join (" // - + " select distinct buyer_nick " // - + " from sys_info.orders " // - + " where 1=1 and seller_nick in ('创维官方旗舰店') " // - + " ) seller_nick using(buyer_nick) "// - + ") b using(buyer_nick)"; + + " from (" // + + " select '' buyer_nick from dual " // + + " where 1=0 "// + + " union " // + + " select distinct buyer_nick "// + + " from sys_info.orders "// + + " where 1=1 and receiver_district in ('平谷区')" // + + ") a " // + + "inner join (" // + + " select buyer_nick from ("// + + " select distinct buyer_nick "// + + " from sys_info.orders " // + + " where 1=1 and created > '2013-07-28' "// + + " ) recent_days " // + + "inner join (" // + + " select distinct buyer_nick " // + + " from sys_info.orders " // + + " where 1=1 and seller_nick in ('创维官方旗舰店') " // + + " ) seller_nick using(buyer_nick) "// + + ") b using(buyer_nick)"; Assert.assertTrue(provider.checkValid(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest14.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest14.java index 57d10fed77..ee8d53862c 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest14.java @@ -23,17 +23,16 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest14 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT index_privacy AS index,info_privacy AS ?,msgboard_privacy AS messageboard,photos_privacy AS photos," + // - "diary_privacy AS diary,owrite_privacy AS weibo " + // - "FROM pw_ouserdata WHERE uid= ?")); // + "SELECT index_privacy AS index,info_privacy AS ?,msgboard_privacy AS messageboard,photos_privacy AS photos," + // + "diary_privacy AS diary,owrite_privacy AS weibo " + // + "FROM pw_ouserdata WHERE uid= ?")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest140.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest140.java index 664f96ec32..4a3ed801b8 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest140.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest140.java @@ -23,13 +23,12 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest140 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); String sql = "SELECT name, '******' password, createTime from user " // - + "where name like 'admin%' "// - + " AND 8600=CONVERT(INT,(SELECT CHAR(113)+CHAR(118)+CHAR(100)+CHAR(114)+CHAR(113)+(SELECT (CASE WHEN (8600=8600) THEN CHAR(49) ELSE CHAR(48) END))+CHAR(113)+CHAR(118)+CHAR(98)+CHAR(97)+CHAR(113))) AND '%'=''"; + + "where name like 'admin%' "// + + " AND 8600=CONVERT(INT,(SELECT CHAR(113)+CHAR(118)+CHAR(100)+CHAR(114)+CHAR(113)+(SELECT (CASE WHEN (8600=8600) THEN CHAR(49) ELSE CHAR(48) END))+CHAR(113)+CHAR(118)+CHAR(98)+CHAR(97)+CHAR(113))) AND '%'=''"; Assert.assertFalse(provider.checkValid(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest141.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest141.java index cb597f92a5..04ac27aa11 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest141.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest141.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest141 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest142.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest142.java index eb194acd3e..b14544185c 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest142.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest142.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest142 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest143.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest143.java index b07da1b538..7594120ad9 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest143.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest143.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest143 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest144.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest144.java index 8704f5301f..60f90f18fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest144.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest144.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest144 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest145.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest145.java index 273ba099fa..475e17b8c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest145.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest145.java @@ -8,7 +8,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest145 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest146.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest146.java index 69d610c537..ce9a81bbc7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest146.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest146.java @@ -6,7 +6,6 @@ import org.junit.Assert; public class MySqlWallTest146 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest147_optimize.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest147_optimize.java index 9c5bf8f1eb..5d1cc86cd2 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest147_optimize.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest147_optimize.java @@ -6,7 +6,6 @@ import org.junit.Assert; public class MySqlWallTest147_optimize extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest148.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest148.java index df330d6c17..5ec30f138f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest148.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest148.java @@ -6,7 +6,6 @@ import org.junit.Assert; public class MySqlWallTest148 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest149.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest149.java index 65a3ee6e11..a732845be5 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest149.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest149.java @@ -6,7 +6,6 @@ import org.junit.Assert; public class MySqlWallTest149 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest15.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest15.java index c891a9143b..248ea2f984 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest15.java @@ -23,24 +23,23 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest15 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT m.*, m.icon AS micon, md.uid as md.uid, md.lastmsg,md.postnum," + // - "md.rvrc,md.money,md.credit,md.currency,md.lastvisit,md.thisvisit," + // - "md.onlinetime,md.lastpost,md.todaypost, md.monthpost,md.onlineip," + // - "md.uploadtime,md.uploadnum,md.starttime,md.pwdctime,md.monoltime," + // - "md.digests,md.f_num,md.creditpop, md.jobnum,md.lastgrab,md.follows,md.fans," + // - "md.newfans,md.newreferto,md.newcomment,md.postcheck,md.punch, mi.customdata " + // - "FROM pw_members m " + // - " LEFT JOIN pw_memberdata md ON m.uid=md.uid " + // - " LEFT JOIN pw_memberinfo mi ON mi.uid=m.uid " + // - "WHERE m.uid IN (?)")); // + "SELECT m.*, m.icon AS micon, md.uid as md.uid, md.lastmsg,md.postnum," + // + "md.rvrc,md.money,md.credit,md.currency,md.lastvisit,md.thisvisit," + // + "md.onlinetime,md.lastpost,md.todaypost, md.monthpost,md.onlineip," + // + "md.uploadtime,md.uploadnum,md.starttime,md.pwdctime,md.monoltime," + // + "md.digests,md.f_num,md.creditpop, md.jobnum,md.lastgrab,md.follows,md.fans," + // + "md.newfans,md.newreferto,md.newcomment,md.postcheck,md.punch, mi.customdata " + // + "FROM pw_members m " + // + " LEFT JOIN pw_memberdata md ON m.uid=md.uid " + // + " LEFT JOIN pw_memberinfo mi ON mi.uid=m.uid " + // + "WHERE m.uid IN (?)")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest150.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest150.java index db947680fe..33ed86dd3b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest150.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest150.java @@ -6,7 +6,6 @@ import junit.framework.TestCase; public class MySqlWallTest150 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest151_update.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest151_update.java index 285929b059..c8097357a4 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest151_update.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest151_update.java @@ -6,7 +6,6 @@ import junit.framework.TestCase; public class MySqlWallTest151_update extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest152.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest152.java index 3eff105c43..33ce13889b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest152.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest152.java @@ -6,7 +6,6 @@ import junit.framework.TestCase; public class MySqlWallTest152 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest16.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest16.java index 5617cd200f..5c20787f88 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest16.java @@ -23,15 +23,14 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest16 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT * FROM lhwbbs_threads_cate_index FORCE INDEX(PRIMARY) WHERE cid=? AND disabled=? ORDER BY tid DESC LIMIT ?,?")); // + "SELECT * FROM lhwbbs_threads_cate_index FORCE INDEX(PRIMARY) WHERE cid=? AND disabled=? ORDER BY tid DESC LIMIT ?,?")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest17.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest17.java index ec97e8b0d3..0b7e68ca10 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest17.java @@ -23,15 +23,14 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest17 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "DELETE FROM as_home_notification WHERE uid>? AND new=? AND dateline? AND new=? AND dateline FNAME)")); // + "select * from t where FID = 1 OR NOT(UNHEX(HEX(FNAME)) > FNAME)")); // } - + public void test_false_2() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "select * from t where FID = 1 OR NOT(UNHEX(HEX(FNAME)) < FNAME)")); // + "select * from t where FID = 1 OR NOT(UNHEX(HEX(FNAME)) < FNAME)")); // } - + public void test_false_3() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "select * from t where FID = 1 OR NOT(UNHEX(HEX(FNAME)) NOT LIKE FNAME)")); // + "select * from t where FID = 1 OR NOT(UNHEX(HEX(FNAME)) NOT LIKE FNAME)")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest33.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest33.java index b1bdd67f6f..16d59a60bb 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest33.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest33.java @@ -24,22 +24,21 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest33 extends TestCase { - public void test_false() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "DELETE FROM lhwdesign_data WHERE data_id IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?")); // + "DELETE FROM lhwdesign_data WHERE data_id IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?")); // } public void test_true() throws Exception { WallConfig config = new WallConfig(); config.setStrictSyntaxCheck(false); Assert.assertTrue(WallUtils.isValidateMySql(// - "DELETE FROM lhwdesign_data WHERE data_id IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?", config)); // + "DELETE FROM lhwdesign_data WHERE data_id IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?", config)); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest34.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest34.java index 63c4387858..c4674da42a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest34.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest34.java @@ -23,15 +23,14 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest34 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT @@sql_big_selects")); // + "SELECT @@sql_big_selects")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest35.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest35.java index 0f217e3620..55493362c4 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest35.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest35.java @@ -25,19 +25,18 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest35 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "REPLACE INTO `test2tb` VALUES " + // - "('51', '6714105741', '亦美珊不掉正品隐形文胸安全硅胶文胸 小胸聚拢比基尼游泳衣泳装', 'http://img03.taobaocdn.com/bao/uploaded/i3/16011019585534199/T1cnlaXA8bXXXXXXXX_!!0-item_pic.jpg', 'liqiang198163', 'c', '25.00', '20.00', '1000.00', '76', '529', '4.86', '4.91', '4.90', '0.00', '4.80', '2878', '77', '12', '15');")); // + "REPLACE INTO `test2tb` VALUES " + // + "('51', '6714105741', '亦美珊不掉正品隐形文胸安全硅胶文胸 小胸聚拢比基尼游泳衣泳装', 'http://img03.taobaocdn.com/bao/uploaded/i3/16011019585534199/T1cnlaXA8bXXXXXXXX_!!0-item_pic.jpg', 'liqiang198163', 'c', '25.00', '20.00', '1000.00', '76', '529', '4.86', '4.91', '4.90', '0.00', '4.80', '2878', '77', '12', '15');")); // Assert.assertEquals(1, provider.getTableStat("test2tb").getReplaceCount()); System.out.println(JSONUtils.toJSONString(provider.getStatsMap())); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest36.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest36.java index 8113dd6cff..bd7d159f58 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest36.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest36.java @@ -25,18 +25,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest36 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "select * FROM `13452845947` WHERE gpstime < (now()-90) order by gpstime desc")); // + "select * FROM `13452845947` WHERE gpstime < (now()-90) order by gpstime desc")); // Assert.assertEquals(1, provider.getTableStat("13452845947").getSelectCount()); System.out.println(JSONUtils.toJSONString(provider.getStatsMap())); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest37.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest37.java index 5519748e28..20231e7945 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest37.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest37.java @@ -25,18 +25,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest37 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "call partnerAttribute(3061975048797781,105385028,5,@ret)")); // + "call partnerAttribute(3061975048797781,105385028,5,@ret)")); // Assert.assertEquals(0, provider.getTableStats().size()); System.out.println(JSONUtils.toJSONString(provider.getStatsMap())); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest38.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest38.java index d1739753e8..3efb3599a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest38.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest38.java @@ -25,18 +25,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest38 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "/* mysql-connector-java-5.1.20 ( Revision: tonci.grgin@oracle.com-20111003110438-qfydx066wsbydkbw ) */SELECT @@session.auto_increment_increment")); // + "/* mysql-connector-java-5.1.20 ( Revision: tonci.grgin@oracle.com-20111003110438-qfydx066wsbydkbw ) */SELECT @@session.auto_increment_increment")); // Assert.assertEquals(0, provider.getTableStats().size()); System.out.println(JSONUtils.toJSONString(provider.getStatsMap())); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest39.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest39.java index 3979746422..618e7ae141 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest39.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest39.java @@ -25,18 +25,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest39 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "COMMIT")); // + "COMMIT")); // Assert.assertEquals(0, provider.getTableStats().size()); System.out.println(JSONUtils.toJSONString(provider.getStatsMap())); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest4.java index a234d40860..e36d4aea6f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest4.java @@ -23,15 +23,14 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest4 extends TestCase { - public void test_stuff() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "SSELECT a.*,b.name FROM vote_info a left join vote_item b on a.item_id=b.id where a.id<10 or 1=1 limit 1,10")); + "SSELECT a.*,b.name FROM vote_info a left join vote_item b on a.item_id=b.id where a.id<10 or 1=1 limit 1,10")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest40.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest40.java index 2dd806b09d..5d5488a007 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest40.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest40.java @@ -24,19 +24,18 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest40 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setUseAllow(false); Assert.assertFalse(provider.checkValid(// - "use huaianapp")); // + "use huaianapp")); // Assert.assertEquals(0, provider.getTableStats().size()); } @@ -45,7 +44,7 @@ public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "use huaianapp")); // + "use huaianapp")); // Assert.assertEquals(0, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest41.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest41.java index a21bae1a17..63f9d1f607 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest41.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest41.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest41 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertFalse(provider.checkValid(// - "SELECT * FROM pw_pushdata WHERE invokepieceid= '49' AND ifverify=0 AND starttime<= '1364976942' ORDER BY vieworder DESC,starttime DESC LIMIT 0")); // + "SELECT * FROM pw_pushdata WHERE invokepieceid= '49' AND ifverify=0 AND starttime<= '1364976942' ORDER BY vieworder DESC,starttime DESC LIMIT 0")); // Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest42.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest42.java index 6a1a5bbafc..143333f27f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest42.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest42.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest42 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "SELECT COUNT(1) AS count FROM `team` " + // - "WHERE `team_type` = 'normal' AND `city_id` IN (0,10) " + // - "AND (begin_time <= '1364832000')AND (end_time > '1364873430')AND (( title like '%%' ))AND (( `team_price` > '151' AND `team_price` <= '200'))AND ((now_number >= min_number)OR (end_time > '1364832000'))AND (group_id = 9 OR sub_id = 9)")); // + "SELECT COUNT(1) AS count FROM `team` " + // + "WHERE `team_type` = 'normal' AND `city_id` IN (0,10) " + // + "AND (begin_time <= '1364832000')AND (end_time > '1364873430')AND (( title like '%%' ))AND (( `team_price` > '151' AND `team_price` <= '200'))AND ((now_number >= min_number)OR (end_time > '1364832000'))AND (group_id = 9 OR sub_id = 9)")); // Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest43.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest43.java index cb8aa47fd9..e325a317f5 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest43.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest43.java @@ -24,19 +24,18 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest43 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertFalse(provider.checkValid(// - "SELECT COUNT(1) AS count FROM `team` " + // - "WHERE `team_type` = 'normal' AND 1 = 1 AND `city_id` IN (0,10)")); + "SELECT COUNT(1) AS count FROM `team` " + // + "WHERE `team_type` = 'normal' AND 1 = 1 AND `city_id` IN (0,10)")); Assert.assertEquals(1, provider.getTableStats().size()); } @@ -46,8 +45,8 @@ public void test_true() throws Exception { provider.getConfig().setConditionAndAlwayTrueAllow(true); Assert.assertTrue(provider.checkValid(// - "SELECT COUNT(1) AS count FROM `team` " + // - "WHERE `team_type` = 'normal' AND 1 = 1 AND `city_id` IN (0,10)")); + "SELECT COUNT(1) AS count FROM `team` " + // + "WHERE `team_type` = 'normal' AND 1 = 1 AND `city_id` IN (0,10)")); Assert.assertEquals(1, provider.getTableStats().size()); } @@ -56,8 +55,8 @@ public void test_false2() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertFalse(provider.checkValid(// - "SELECT COUNT(1) AS count FROM `team` " + // - "WHERE `team_type` = 'normal' AND 1 = 2 AND `city_id` IN (0,10)")); + "SELECT COUNT(1) AS count FROM `team` " + // + "WHERE `team_type` = 'normal' AND 1 = 2 AND `city_id` IN (0,10)")); Assert.assertEquals(1, provider.getTableStats().size()); } @@ -67,8 +66,8 @@ public void test_true2() throws Exception { provider.getConfig().setConditionAndAlwayFalseAllow(true); Assert.assertTrue(provider.checkValid(// - "SELECT COUNT(1) AS count FROM `team` " + // - "WHERE `team_type` = 'normal' AND 1 = 2 AND `city_id` IN (0,10)")); + "SELECT COUNT(1) AS count FROM `team` " + // + "WHERE `team_type` = 'normal' AND 1 = 2 AND `city_id` IN (0,10)")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest44.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest44.java index 495d5af3cc..e80d8db38e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest44.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest44.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest44 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertFalse(provider.checkValid(// - "SELECT * FROM pw_pushdata WHERE invokepieceid= '49' AND ifverify=0 AND starttime<= '1365331510' ORDER BY vieworder DESC,starttime DESC LIMIT 0")); + "SELECT * FROM pw_pushdata WHERE invokepieceid= '49' AND ifverify=0 AND starttime<= '1365331510' ORDER BY vieworder DESC,starttime DESC LIMIT 0")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest45.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest45.java index b912ab18a5..a77b635621 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest45.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest45.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest45 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "SELECT @1119453529t_processID, @1119453529t_ret")); + "SELECT @1119453529t_processID, @1119453529t_ret")); Assert.assertEquals(0, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest46.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest46.java index 703c64afc7..4a44fac307 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest46.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest46.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest46 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "select aid,subject,dateline from www_subject where subject like '%%' order by aid desc limit 30;")); + "select aid,subject,dateline from www_subject where subject like '%%' order by aid desc limit 30;")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest47.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest47.java index 73d5beb79a..4187f45170 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest47.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest47.java @@ -24,23 +24,22 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest47 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "update Fans," + // - " (select 361659 as ToID, 5 as Score " + // - " union all select 382885 as ToID, 2 as Score" + // - " union all select 407537 as ToID, 6 as Score) temp " + // - "set Fans.score = Fans.score+temp.Score " + // - "where Fans.FansID = 382885 and Fans.UserID = temp.ToID")); + "update Fans," + // + " (select 361659 as ToID, 5 as Score " + // + " union all select 382885 as ToID, 2 as Score" + // + " union all select 407537 as ToID, 6 as Score) temp " + // + "set Fans.score = Fans.score+temp.Score " + // + "where Fans.FansID = 382885 and Fans.UserID = temp.ToID")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest48.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest48.java index 05ed15fa47..852bf4ce24 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest48.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest48.java @@ -24,22 +24,21 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest48 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "select sum(size) as total " + // - "from file " + // - "join file_to_post on file_to_post.file_id = file.id " + // - "join notice on file_to_post.post_id = notice.id " + // - "where profile_id = 18544 and file.url like '%/notice/%/file' AND EXTRACT(month FROM file.modified) = EXTRACT(month FROM now()) and EXTRACT(year FROM file.modified) = EXTRACT(year FROM now())")); + "select sum(size) as total " + // + "from file " + // + "join file_to_post on file_to_post.file_id = file.id " + // + "join notice on file_to_post.post_id = notice.id " + // + "where profile_id = 18544 and file.url like '%/notice/%/file' AND EXTRACT(month FROM file.modified) = EXTRACT(month FROM now()) and EXTRACT(year FROM file.modified) = EXTRACT(year FROM now())")); Assert.assertEquals(3, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest49.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest49.java index 4efef4b90f..bd65d4d302 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest49.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest49.java @@ -24,41 +24,40 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest49 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "select temp.*, u.CanComment, u.CanBeShared, " + // - " u.CanForward, COALESCE(b.UserID,0) as isBlocked, " + // - " COALESCE(f.UserID,0) as Followed, COALESCE(ff.UserID,0) as IsFollowed, " + // - " COALESCE(ul.UserID,0) as liked, " + // - " COALESCE(fff.UserID,0) as RIsFollowed " + // - "from " + "(select 281319 as UserID, 0 as RUserID, 7797549 as PicID " + // - " union all " + // - " select 55608 as UserID, 0 as RUserID, 7797527 as PicID " + // - " union all " + // - " select 281319 as UserID, 0 as RUserID, 7797233 as PicID " + // - " union all " + // - " select 281319 as UserID, 0 as RUserID, 7797221 as PicID " + // - " union all select 281319 as UserID, 0 as RUserID, 7797217 as PicID " + // - " union all select 281319 as UserID, 0 as RUserID, 7797189 as PicID " + // - " union all select 12271 as UserID, 0 as RUserID, 7796057 as PicID " + // - " union all select 401697 as UserID, 494381 as RUserID, 7795057 as PicID " + // - " union all select 401697 as UserID, 470693 as RUserID, 7795041 as PicID " + // - " union all select 401697 as UserID, 470693 as RUserID, 7795039 as PicID) temp " + // - "left join Users as u on u.UserID = temp.UserID " + // - "left join BlockUser as b on b.UserID = temp.UserID and b.BlockUserID = 281319 " + // - "left join Fans as f on f.FansID = temp.UserID and f.UserID = 281319 " + // - "left join Fans as ff ON ff.FansID = 281319 and ff.UserID = temp.UserID " + // - "left join Fans as fff ON fff.FansID = 281319 and fff.UserID = temp.RUserID " + // - "left join UserLikes as ul on ul.PicID = temp.PicID and ul.UserID = 281319")); + "select temp.*, u.CanComment, u.CanBeShared, " + // + " u.CanForward, COALESCE(b.UserID,0) as isBlocked, " + // + " COALESCE(f.UserID,0) as Followed, COALESCE(ff.UserID,0) as IsFollowed, " + // + " COALESCE(ul.UserID,0) as liked, " + // + " COALESCE(fff.UserID,0) as RIsFollowed " + // + "from " + "(select 281319 as UserID, 0 as RUserID, 7797549 as PicID " + // + " union all " + // + " select 55608 as UserID, 0 as RUserID, 7797527 as PicID " + // + " union all " + // + " select 281319 as UserID, 0 as RUserID, 7797233 as PicID " + // + " union all " + // + " select 281319 as UserID, 0 as RUserID, 7797221 as PicID " + // + " union all select 281319 as UserID, 0 as RUserID, 7797217 as PicID " + // + " union all select 281319 as UserID, 0 as RUserID, 7797189 as PicID " + // + " union all select 12271 as UserID, 0 as RUserID, 7796057 as PicID " + // + " union all select 401697 as UserID, 494381 as RUserID, 7795057 as PicID " + // + " union all select 401697 as UserID, 470693 as RUserID, 7795041 as PicID " + // + " union all select 401697 as UserID, 470693 as RUserID, 7795039 as PicID) temp " + // + "left join Users as u on u.UserID = temp.UserID " + // + "left join BlockUser as b on b.UserID = temp.UserID and b.BlockUserID = 281319 " + // + "left join Fans as f on f.FansID = temp.UserID and f.UserID = 281319 " + // + "left join Fans as ff ON ff.FansID = 281319 and ff.UserID = temp.UserID " + // + "left join Fans as fff ON fff.FansID = 281319 and fff.UserID = temp.RUserID " + // + "left join UserLikes as ul on ul.PicID = temp.PicID and ul.UserID = 281319")); Assert.assertEquals(4, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest5.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest5.java index 6964796b90..e8b1a77ddf 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest5.java @@ -23,15 +23,14 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest5 extends TestCase { - public void test_stuff() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "select * from tbl_product WHERE delFlag=0 AND cateId = 40 OR EXTRACTVALUE(1,CONCAT(0x7c,database(),0x7c)) order by sort desc, productId desc limit 20,20")); + "select * from tbl_product WHERE delFlag=0 AND cateId = 40 OR EXTRACTVALUE(1,CONCAT(0x7c,database(),0x7c)) order by sort desc, productId desc limit 20,20")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest50.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest50.java index 7359919e17..87dca947eb 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest50.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest50.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest50 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "SHOW /* 113.97.255.240 */ GLOBAL VARIABLES LIKE 'ft\\_min\\_word\\_len'")); + "SHOW /* 113.97.255.240 */ GLOBAL VARIABLES LIKE 'ft\\_min\\_word\\_len'")); Assert.assertEquals(0, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest51.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest51.java index 320e43c094..5dcfddf0f4 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest51.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest51.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest51 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "REPLACE /* SearchMySQL::update Wikiadmin */ INTO `wiki_searchindex` (si_page,si_title,si_text) VALUES ('15',' u8e5858d u8e8b4a3 u8e5a3b0 u8e6988e')")); + "REPLACE /* SearchMySQL::update Wikiadmin */ INTO `wiki_searchindex` (si_page,si_title,si_text) VALUES ('15',' u8e5858d u8e8b4a3 u8e5a3b0 u8e6988e')")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest52.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest52.java index 91520821f4..a6d2838ee0 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest52.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest52.java @@ -24,29 +24,28 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest52 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setLimitZeroAllow(true); Assert.assertTrue(provider.checkValid(// - "select * from t limit 0")); + "select * from t limit 0")); Assert.assertEquals(1, provider.getTableStats().size()); } - + public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertFalse(provider.checkValid(// "select * from t limit 0")); - + Assert.assertEquals(1, provider.getTableStats().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest53.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest53.java index 0f3b73e8c8..bce990b308 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest53.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest53.java @@ -24,29 +24,28 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest53 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setLimitZeroAllow(true); Assert.assertTrue(provider.checkValid(// - "select * from t limit 0,0")); + "select * from t limit 0,0")); Assert.assertEquals(1, provider.getTableStats().size()); } - + public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertFalse(provider.checkValid(// "select * from t limit 0,0")); - + Assert.assertEquals(1, provider.getTableStats().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest54.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest54.java index 55501a9e70..af1bb2f01b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest54.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest54.java @@ -24,29 +24,28 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest54 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(false); Assert.assertTrue(provider.checkValid(// - "SELECT *FROM T UNION select `ENGINE`, `SUPPORT` from information_schema.Engines")); + "SELECT *FROM T UNION select `ENGINE`, `SUPPORT` from information_schema.Engines")); Assert.assertEquals(2, provider.getTableStats().size()); } - + public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertFalse(provider.checkValid(// "SELECT *FROM T UNION select `ENGINE`, `SUPPORT` from information_schema.Engines")); - + Assert.assertEquals(2, provider.getTableStats().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest55.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest55.java index e49c405f8b..88d00141a3 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest55.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest55.java @@ -24,45 +24,44 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest55 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "SELECT USER()")); + "SELECT USER()")); Assert.assertEquals(0, provider.getTableStats().size()); } - + public void test_true_1() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertTrue(provider.checkValid(// "SELECT USER() FROM DUAL")); - + Assert.assertEquals(1, provider.getTableStats().size()); } - + public void test_true_2() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertTrue(provider.checkValid(// "SELECT USER() FROM X")); - + Assert.assertEquals(1, provider.getTableStats().size()); } - + public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertFalse(provider.checkValid(// "select * from t where fid = 1 union SELECT USER() FROM X")); - + } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest56.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest56.java index 4a5acf6307..51f8968fe7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest56.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest56.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest56 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "SHOW GRANTS FOR CURRENT_USER()")); + "SHOW GRANTS FOR CURRENT_USER()")); Assert.assertEquals(0, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest57.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest57.java index 7c8d1a8975..6e136c56f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest57.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest57.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest57 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "SELECT @@version")); + "SELECT @@version")); Assert.assertEquals(0, provider.getTableStats().size()); } @@ -44,7 +43,7 @@ public void test_true_1() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "SELECT @@version FROM DUAL")); + "SELECT @@version FROM DUAL")); Assert.assertEquals(1, provider.getTableStats().size()); } @@ -53,7 +52,7 @@ public void test_true_2() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "SELECT @@version FROM X")); + "SELECT @@version FROM X")); Assert.assertEquals(1, provider.getTableStats().size()); } @@ -62,7 +61,7 @@ public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertFalse(provider.checkValid(// - "SELECT * FROM X where id=1 and 1!=1 union select @@version")); + "SELECT * FROM X where id=1 and 1!=1 union select @@version")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest58.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest58.java index 9bb2f759bd..176d2bcb47 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest58.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest58.java @@ -24,21 +24,20 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest58 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(false); Assert.assertTrue(provider.checkValid(// - "SELECT COUNT(*) FROM information_schema.processlist " + // - "WHERE user <> 'replication' AND id <> CONNECTION_ID() " + // - "AND time > 60 AND command <> 'Sleep'")); + "SELECT COUNT(*) FROM information_schema.processlist " + // + "WHERE user <> 'replication' AND id <> CONNECTION_ID() " + // + "AND time > 60 AND command <> 'Sleep'")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest59.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest59.java index 8ca4d742bd..61d9638ffe 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest59.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest59.java @@ -24,21 +24,20 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest59 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(true); Assert.assertTrue(provider.checkValid(// - "SELECT * FROM mysql.proc " + // - "WHERE 1=1 AND db LIKE 'dsmessagedb001'" + // - " AND name LIKE 'Proc_getRemindinfoByRemindFlag'")); + "SELECT * FROM mysql.proc " + // + "WHERE 1=1 AND db LIKE 'dsmessagedb001'" + // + " AND name LIKE 'Proc_getRemindinfoByRemindFlag'")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest6.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest6.java index a404894f28..35841f9ca8 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest6.java @@ -23,15 +23,14 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest6 extends TestCase { - public void test_stuff() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT a.* FROM vote_info a where a.id<10 or (id <5 or 1=1) limit 1,10")); + "SELECT a.* FROM vote_info a where a.id<10 or (id <5 or 1=1) limit 1,10")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest60.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest60.java index ca4bad29c9..59da91bc7b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest60.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest60.java @@ -24,19 +24,18 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest60 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(true); Assert.assertTrue(provider.checkValid(// - "show create table `mysql`.`help_relation`")); + "show create table `mysql`.`help_relation`")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest61.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest61.java index 35ebdc764c..f178a8e90a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest61.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest61.java @@ -24,19 +24,18 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest61 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(true); Assert.assertTrue(provider.checkValid(// - "SELECT * FROM `information_schema`.`columns` WHERE TABLE_NAME='aaaa' AND TABLE_SCHEMA='xxxx'")); + "SELECT * FROM `information_schema`.`columns` WHERE TABLE_NAME='aaaa' AND TABLE_SCHEMA='xxxx'")); Assert.assertEquals(1, provider.getTableStats().size()); } @@ -46,9 +45,9 @@ public void test_false() throws Exception { provider.getConfig().setSchemaCheck(true); Assert.assertFalse(provider.checkValid(// - "SELECT * FROM T " + // - "UNION " + // - "SELECT * FROM `information_schema`.`columns` WHERE TABLE_NAME='aaaa' AND TABLE_SCHEMA='xxxx'")); + "SELECT * FROM T " + // + "UNION " + // + "SELECT * FROM `information_schema`.`columns` WHERE TABLE_NAME='aaaa' AND TABLE_SCHEMA='xxxx'")); Assert.assertEquals(2, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest62.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest62.java index 2d20e6b209..d58b8ccab6 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest62.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest62.java @@ -24,46 +24,44 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest62 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(true); Assert.assertTrue(provider.checkValid(// - "select temp.*, u.CanComment, u.CanBeShared, u.CanForward, COALESCE(b.UserID,0) as isBlocked" + // - " , COALESCE(f.UserID,0) as Followed, COALESCE(ff.UserID,0) as IsFollowed" + // - " , COALESCE(ul.UserID,0) as liked, COALESCE(fff.UserID,0) as RIsFollowed " + // - "from (select 294765 as UserID, 0 as RUserID, 7785977 as PicID " + // - " union all select 294765 as UserID, 0 as RUserID, 7780341 as PicID) temp " + // - "left join Users as u on u.UserID = temp.UserID " + // - "left join BlockUser as b on b.UserID = temp.UserID and b.BlockUserID = 294765 " + // - "left join Fans as f on f.FansID = temp.UserID and f.UserID = 294765 " + // - "left join Fans as ff ON ff.FansID = 294765 and ff.UserID = temp.UserID " + // - "left join Fans as fff ON fff.FansID = 294765 and fff.UserID = temp.RUserID " + // - "left join UserLikes as ul on ul.PicID = temp.PicID and ul.UserID = 294765")); + "select temp.*, u.CanComment, u.CanBeShared, u.CanForward, COALESCE(b.UserID,0) as isBlocked" + // + " , COALESCE(f.UserID,0) as Followed, COALESCE(ff.UserID,0) as IsFollowed" + // + " , COALESCE(ul.UserID,0) as liked, COALESCE(fff.UserID,0) as RIsFollowed " + // + "from (select 294765 as UserID, 0 as RUserID, 7785977 as PicID " + // + " union all select 294765 as UserID, 0 as RUserID, 7780341 as PicID) temp " + // + "left join Users as u on u.UserID = temp.UserID " + // + "left join BlockUser as b on b.UserID = temp.UserID and b.BlockUserID = 294765 " + // + "left join Fans as f on f.FansID = temp.UserID and f.UserID = 294765 " + // + "left join Fans as ff ON ff.FansID = 294765 and ff.UserID = temp.UserID " + // + "left join Fans as fff ON fff.FansID = 294765 and fff.UserID = temp.RUserID " + // + "left join UserLikes as ul on ul.PicID = temp.PicID and ul.UserID = 294765")); Assert.assertEquals(4, provider.getTableStats().size()); } - + public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(true); provider.getConfig().setSelectUnionCheck(true); String sql = "SELECT 1, 2, 3" + // - " UNION ALL SELECT a from tt where c=1" + // - " UNION ALL SELECT 2 FROM dual --"; + " UNION ALL SELECT a from tt where c=1" + // + " UNION ALL SELECT 2 FROM dual --"; Assert.assertFalse(provider.checkValid(sql)); - + sql = "SELECT a from t where c=1 UNION ALL SELECT 2 FROM dual --"; Assert.assertFalse(provider.checkValid(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest63.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest63.java index df4659bc71..2a4a507c3c 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest63.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest63.java @@ -24,13 +24,12 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest63 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(true); @@ -39,10 +38,10 @@ public void test_true() throws Exception { provider.setWhiteListEnable(false); Assert.assertTrue(provider.checkValid(// - "SELECT FID, FNAME FROM T WHERE C=1 UNION SELECT 1, 'AAA'")); + "SELECT FID, FNAME FROM T WHERE C=1 UNION SELECT 1, 'AAA'")); Assert.assertFalse(provider.checkValid(// - "SELECT FID, FNAME FROM T WHERE C=1 UNION SELECT 1, 'AAA' --")); + "SELECT FID, FNAME FROM T WHERE C=1 UNION SELECT 1, 'AAA' --")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest64.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest64.java index b41a950dc5..4e28e7aaae 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest64.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest64.java @@ -24,21 +24,20 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest64 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(true); Assert.assertFalse(provider.checkValid(// - "SELECT email, passwd, login_id, full_name" + - " FROM members" + - " WHERE member_id = 3 AND 1=(SELECT COUNT(*) FROM tabname);'")); + "SELECT email, passwd, login_id, full_name" + + " FROM members" + + " WHERE member_id = 3 AND 1=(SELECT COUNT(*) FROM tabname);'")); Assert.assertEquals(2, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest65.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest65.java index 6031adbfe1..a060483127 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest65.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest65.java @@ -24,21 +24,20 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest65 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(true); Assert.assertFalse(provider.checkValid(// - "SELECT email, passwd, login_id, full_name" + - " FROM members" + - " WHERE member_id = 3 AND 0<(SELECT COUNT(*) FROM tabname);")); + "SELECT email, passwd, login_id, full_name" + + " FROM members" + + " WHERE member_id = 3 AND 0<(SELECT COUNT(*) FROM tabname);")); Assert.assertEquals(2, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest66.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest66.java index 4c753b6931..02778b2228 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest66.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest66.java @@ -24,29 +24,28 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest66 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(true); Assert.assertTrue(provider.checkValid(// - "SELECT LOGFILE_GROUP_NAME, FILE_NAME, TOTAL_EXTENTS, INITIAL_SIZE, ENGINE, EXTRA " + // - "FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE = 'UNDO LOG' AND FILE_NAME IS NOT NULL " + // - "AND LOGFILE_GROUP_NAME IN (" + // - " SELECT DISTINCT LOGFILE_GROUP_NAME FROM INFORMATION_SCHEMA.FILES " + // - " WHERE FILE_TYPE = 'DATAFILE' " + // - " AND TABLESPACE_NAME IN (" + // - " SELECT DISTINCT TABLESPACE_NAME FROM INFORMATION_SCHEMA.PARTITIONS " + // - " WHERE TABLE_SCHEMA IN ('stat'))" + // - ") " + // - "GROUP BY LOGFILE_GROUP_NAME, FILE_NAME, ENGINE " + // - "ORDER BY LOGFILE_GROUP_NAME")); + "SELECT LOGFILE_GROUP_NAME, FILE_NAME, TOTAL_EXTENTS, INITIAL_SIZE, ENGINE, EXTRA " + // + "FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE = 'UNDO LOG' AND FILE_NAME IS NOT NULL " + // + "AND LOGFILE_GROUP_NAME IN (" + // + " SELECT DISTINCT LOGFILE_GROUP_NAME FROM INFORMATION_SCHEMA.FILES " + // + " WHERE FILE_TYPE = 'DATAFILE' " + // + " AND TABLESPACE_NAME IN (" + // + " SELECT DISTINCT TABLESPACE_NAME FROM INFORMATION_SCHEMA.PARTITIONS " + // + " WHERE TABLE_SCHEMA IN ('stat'))" + // + ") " + // + "GROUP BY LOGFILE_GROUP_NAME, FILE_NAME, ENGINE " + // + "ORDER BY LOGFILE_GROUP_NAME")); Assert.assertEquals(2, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest67.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest67.java index 295164fda2..ba9219b4db 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest67.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest67.java @@ -24,29 +24,28 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest67 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(true); Assert.assertTrue(provider.checkValid(// - "SELECT c.table_name, column_name, column_type, is_nullable, column_key" + // - " , column_default, extra, collation_name, character_set_name, column_comment " + // - "FROM information_schema.columns c " + // - "INNER JOIN (" + // - " SELECT table_schema, table_name " + // - " FROM information_schema.tables " + // - " WHERE LOWER(table_schema) = LOWER('sp5035d3d0b2d4a')" + // - ") t ON t.table_name COLLATE utf8_bin = c.table_name COLLATE utf8_bin " + // - "WHERE LOWER(c.table_schema) = LOWER('sp5035d3d0b2d4a') " + // - " AND ('Y' = '' OR LOWER(c.table_name) IN ('leader01_weibo')) " + // - "ORDER BY t.table_name")); + "SELECT c.table_name, column_name, column_type, is_nullable, column_key" + // + " , column_default, extra, collation_name, character_set_name, column_comment " + // + "FROM information_schema.columns c " + // + "INNER JOIN (" + // + " SELECT table_schema, table_name " + // + " FROM information_schema.tables " + // + " WHERE LOWER(table_schema) = LOWER('sp5035d3d0b2d4a')" + // + ") t ON t.table_name COLLATE utf8_bin = c.table_name COLLATE utf8_bin " + // + "WHERE LOWER(c.table_schema) = LOWER('sp5035d3d0b2d4a') " + // + " AND ('Y' = '' OR LOWER(c.table_name) IN ('leader01_weibo')) " + // + "ORDER BY t.table_name")); Assert.assertEquals(2, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest68.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest68.java index d98a68b6eb..9176c7efa7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest68.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest68.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest68 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(true); Assert.assertTrue(provider.checkValid(// - "SELECT * FROM `information_schema`.`ROUTINES` " + // - "WHERE `information_schema`.`ROUTINES`.`ROUTINE_SCHEMA` = 'mzsg_g001'")); + "SELECT * FROM `information_schema`.`ROUTINES` " + // + "WHERE `information_schema`.`ROUTINES`.`ROUTINE_SCHEMA` = 'mzsg_g001'")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest69.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest69.java index f081d69622..c19c6b0a93 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest69.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest69.java @@ -24,19 +24,18 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest69 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(true); Assert.assertTrue(provider.checkValid(// - "select * from T--")); + "select * from T--")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest7.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest7.java index 042f315e16..c420f02f34 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest7.java @@ -23,15 +23,14 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest7 extends TestCase { - public void test_stuff() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT a.* FROM vote_info a where a.id<10 and (id <5 or 1=1) limit 1,10")); // 部分永真 + "SELECT a.* FROM vote_info a where a.id<10 and (id <5 or 1=1) limit 1,10")); // 部分永真 } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest70.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest70.java index aa061e5bf4..da52271683 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest70.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest70.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest70 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); - + provider.getConfig().setCommentAllow(true); Assert.assertTrue(provider.checkValid(// - "select * from T/**/")); + "select * from T/**/")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest71.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest71.java index 56ed0c30de..c0a5b438c0 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest71.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest71.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest71 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(true); Assert.assertTrue(provider.checkValid(// - "update order_return set return_goods_money =0.00 ,return_other_money = 8--149.00, return_total_fee = ifnull(return_shipping,0)+ifnull(return_other_discount,0)+0.00--149.00-0.00,return_goods_amount=1,return_real_money=0.00 where id=1319")); + "update order_return set return_goods_money =0.00 ,return_other_money = 8--149.00, return_total_fee = ifnull(return_shipping,0)+ifnull(return_other_discount,0)+0.00--149.00-0.00,return_goods_amount=1,return_real_money=0.00 where id=1319")); Assert.assertEquals(1, provider.getTableStats().size()); } @@ -48,7 +47,7 @@ public void test_false1() throws Exception { provider.getConfig().setCommentAllow(true); Assert.assertFalse(provider.checkValid(// - "select * from order_return where return_goods_money =0.00 ,return_other_money = 8--149.00, return_total_fee = ifnull(return_shipping,0)+ifnull(return_other_discount,0)+0.00--149.00-0.00,return_goods_amount=1,return_real_money=0.00")); + "select * from order_return where return_goods_money =0.00 ,return_other_money = 8--149.00, return_total_fee = ifnull(return_shipping,0)+ifnull(return_other_discount,0)+0.00--149.00-0.00,return_goods_amount=1,return_real_money=0.00")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest72.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest72.java index 21e597d922..067ae829c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest72.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest72.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest72 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + provider.getConfig().setCommentAllow(true); Assert.assertFalse(provider.checkValid(// - "select * from t /**/ where fid = 123 AND 1=1")); + "select * from t /**/ where fid = 123 AND 1=1")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest73.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest73.java index 2ccb459f92..37a324cc20 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest73.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest73.java @@ -24,27 +24,26 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest73 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + provider.getConfig().setCommentAllow(true); Assert.assertTrue(provider.checkValid(// - "DELETE FROM D1 USING PCHS_DETAIL D1 " + // - " INNER JOIN (" + // - " SELECT D.DETAIL_UID " + // - " FROM PCHS_DETAIL D " + // - " INNER JOIN PCHS_BILL B ON D.BILL_UID=B.BILL_UID " + // - " WHERE B.COM_UID='0892E8A38EF83AB6B9E25C25D8085486' " + // - " LIMIT 1000 " + // - " ) D2 ON D1.DETAIL_UID=D2.DETAIL_UID")); + "DELETE FROM D1 USING PCHS_DETAIL D1 " + // + " INNER JOIN (" + // + " SELECT D.DETAIL_UID " + // + " FROM PCHS_DETAIL D " + // + " INNER JOIN PCHS_BILL B ON D.BILL_UID=B.BILL_UID " + // + " WHERE B.COM_UID='0892E8A38EF83AB6B9E25C25D8085486' " + // + " LIMIT 1000 " + // + " ) D2 ON D1.DETAIL_UID=D2.DETAIL_UID")); Assert.assertEquals(3, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest74.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest74.java index 81a5ad0a94..8df7cb7b54 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest74.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest74.java @@ -24,29 +24,28 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest74 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + provider.getConfig().setCommentAllow(true); Assert.assertTrue(provider.checkValid(// - "select _t0.`ownUser` as _c0, _t0.`showTime` as _c1, _t0.`showType` as _c2, " + // - " _t0.`itemId` as _c3, _t0.`queueId` as _c4 " + // - "from `itemshow_queue` as _t0 " + // - "where ( _t0.`isShowed` = 'F' and _t0.`showTime` <= ? ) " + // - " and _t0.`ownUser` in ( " + // - " select _t0.`userId` as _c0 from `users_top` as _t0 " + // - " where ( 1 = 1 ) " + // - " ) " + // - "order by _t0.`showTime` asc " + // - "limit 1000 offset 8000")); + "select _t0.`ownUser` as _c0, _t0.`showTime` as _c1, _t0.`showType` as _c2, " + // + " _t0.`itemId` as _c3, _t0.`queueId` as _c4 " + // + "from `itemshow_queue` as _t0 " + // + "where ( _t0.`isShowed` = 'F' and _t0.`showTime` <= ? ) " + // + " and _t0.`ownUser` in ( " + // + " select _t0.`userId` as _c0 from `users_top` as _t0 " + // + " where ( 1 = 1 ) " + // + " ) " + // + "order by _t0.`showTime` asc " + // + "limit 1000 offset 8000")); Assert.assertEquals(2, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest75.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest75.java index 1040120a35..ce2640fc87 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest75.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest75.java @@ -24,22 +24,21 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest75 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(true); Assert.assertFalse(provider.checkValid(// - "UPDATE friends_a SET requests='-^B}q^A(X \\0\\0\\0176403924cdatetime\\ndatetime\\nq^BU\\n^G--\\Z^K:5^Hw.-Rq^CX \\0\\0\\0942515122h^BU\\n^G--^X^G^^$\\n^NӅRq^DX \\0\\0\\0760857294h^BU\\n^G-- ^F8+ ---Rq^EX \\0\\0\\0207000491h^BU\\n^G--^X^E^_^L^F-$-Rq^FX \\0\\0\\0281067699h^BU\\n^G--^B^O^C-^A<13>Rq^GX \\0\\0\\0941678014h^BU\\n^G--^\\^W^N^W^F-$-Rq^HX \\0\\0\\0840070155h^BU\\n^G--^\\^L\\n6^D*ʅRq X \\0\\0\\0468440035h^BU\\n^G--^V^W*^N^Bp^K-Rq\\nU 169240315h^BU\\n^G--^W^U^W1^D-m-Rq^KX \\0\\0\\0199411251h^BU\\n^G--^V^W%^^^A---Rq^LU 210660648h^BU\\n^G--^\\^W^Y-^F\\Zd-Rq\\rU 262672217h^BU\\n^G--\\Z^V2:^O^U--Rq^NX \\0\\0\\0952838443h^BU\\n^G--^\\^W!7\\r-{-Rq^OX \\0\\0\\0263642777h^BU\\n^G--^B^U/^D^G-̅Rq^PX \\0\\0\\0286685152h^BU\\n^G--^W^T3,^Ggs-Rq^QU 290976173h^BU\\n^G--^\\^V)^X^D---Rq^RX \\0\\0\\0825427842h^BU\\n^G--\\Z^V;^Q^N- -Rq^SX \\0\\0\\0399352674h^BU\\n^G--^\\^V-0^KC\\0-Rq^TX \\0\\0\\0429293778h^BU\\n^G--^Y^U ^]^C-��Rq^UX \\0\\0\\0796702973h^BU\\n^G--^Y^S^U#^F\\\\^W-Rq^Vu.'"// - + ",friends='-^B}q^A(X \\0\\0\\0288854421cdatetime\\ndatetime\\nq^BU\\n^G--^[^N38^L6---q^CX \\0\\0\\0307943786h^BU\\n^G--^F^V7 ^D---Rq^DX \\0\\0\\0290783072NX \\0\\0\\0498070760NX \\0\\0\\0457575155NX \\0\\0\\0304215892h^BU\\n^G--^F^W^L+^L---Rq^EX \\0\\0\\0300254457h^BU\\n^G--^F^G$)^A---Rq^FX \\0\\0\\0252042226h^BU\\n^G-- ^R8\\r ----q^GX \\0\\0\\0697110711NX \\0\\0\\0809118053h^BU\\n^G-- ^L^H^O\\0ɲ-Rq^HX \\0\\0\\0293303495h^BU\\n^G-- ^T!.^B/ʅRq X \\0\\0\\0302651538h^BU\\n^G--^G^P)^C^Fn---q\\nU 888879887h^BU\\n^G--^H^W.*^G---Rq^KX \\0\\0\\0240865621h^BU\\n^G--^G\\n2;\\n---Rq^LU 300728616h^BU\\n^G--^A^L^N8\\0\\'" // - + "--Rq\\rX \\0\\0\\0856456443NX \\0\\0\\0302371154h^BU\\n^G--^A^Q^R^^\\0---Rq^NX \\0\\0\\0696458616h^BU\\n^G--^G\\n98\\n---Rq^OU 297082613NX \\0\\0\\0811281930h^BU\\n^G--\\n^Q^P^X^L^OɅRq^PU 300986758h^BU\\n^G--^F^F\\r3^G-$-Rq^QU 276325435h^BU\\n^G--^B^P^P^T^E^N8-Rq^RX \\0\\0\\0299082034h^BU\\n^G--^H^W^_^Q^D<--Rq^SX \\0\\0\\0171238051h^BU\\n^G--\\n\\r)^S^Dܢ-Rq^TX \\0\\0\\0780724792h^BU\\n^G--\\n^N+ ^F*>-Rq^UX \\0\\0\\0893552392h^BU\\n^G--\\n^N^_-^K^L--Rq^VX \\0\\0\\0590290136h^BU\\n^G-- \\r^Y0\\r --Rq^WX \\0\\0\\0302913387h^BU\\n^G--^C^K#,\\0^X9-Rq^XX \\0\\0\\0252736446NX \\0\\0\\0302360033h^BU\\n^G--^C^O^A^^^H-[-Rq^YU 276564368h^BU\\n^G--\\n\\r:+^K-q-Rq\\ZX \\0\\0\\0296693715h^BU\\n^G-- ^G^[/^A-F-Rq^[X \\0\\0\\0223225019h^BU\\n^G-- ^S^X^C\\07\\Z-Rq^\\X \\0\\0\\0232453764h^BU\\n^G--^_\\r3^V\\0---Rq^]U 297276051h^BU\\n^G--^C^K/4^K-؅Rq^^X \\0\\0\\0184978889NX \\0\\0\\0813351784h^BU\\n^G--^H^H%^X^E&^S-Rq^_X \\0\\0\\03028705")); + "UPDATE friends_a SET requests='-^B}q^A(X \\0\\0\\0176403924cdatetime\\ndatetime\\nq^BU\\n^G--\\Z^K:5^Hw.-Rq^CX \\0\\0\\0942515122h^BU\\n^G--^X^G^^$\\n^NӅRq^DX \\0\\0\\0760857294h^BU\\n^G-- ^F8+ ---Rq^EX \\0\\0\\0207000491h^BU\\n^G--^X^E^_^L^F-$-Rq^FX \\0\\0\\0281067699h^BU\\n^G--^B^O^C-^A<13>Rq^GX \\0\\0\\0941678014h^BU\\n^G--^\\^W^N^W^F-$-Rq^HX \\0\\0\\0840070155h^BU\\n^G--^\\^L\\n6^D*ʅRq X \\0\\0\\0468440035h^BU\\n^G--^V^W*^N^Bp^K-Rq\\nU 169240315h^BU\\n^G--^W^U^W1^D-m-Rq^KX \\0\\0\\0199411251h^BU\\n^G--^V^W%^^^A---Rq^LU 210660648h^BU\\n^G--^\\^W^Y-^F\\Zd-Rq\\rU 262672217h^BU\\n^G--\\Z^V2:^O^U--Rq^NX \\0\\0\\0952838443h^BU\\n^G--^\\^W!7\\r-{-Rq^OX \\0\\0\\0263642777h^BU\\n^G--^B^U/^D^G-̅Rq^PX \\0\\0\\0286685152h^BU\\n^G--^W^T3,^Ggs-Rq^QU 290976173h^BU\\n^G--^\\^V)^X^D---Rq^RX \\0\\0\\0825427842h^BU\\n^G--\\Z^V;^Q^N- -Rq^SX \\0\\0\\0399352674h^BU\\n^G--^\\^V-0^KC\\0-Rq^TX \\0\\0\\0429293778h^BU\\n^G--^Y^U ^]^C-��Rq^UX \\0\\0\\0796702973h^BU\\n^G--^Y^S^U#^F\\\\^W-Rq^Vu.'"// + + ",friends='-^B}q^A(X \\0\\0\\0288854421cdatetime\\ndatetime\\nq^BU\\n^G--^[^N38^L6---q^CX \\0\\0\\0307943786h^BU\\n^G--^F^V7 ^D---Rq^DX \\0\\0\\0290783072NX \\0\\0\\0498070760NX \\0\\0\\0457575155NX \\0\\0\\0304215892h^BU\\n^G--^F^W^L+^L---Rq^EX \\0\\0\\0300254457h^BU\\n^G--^F^G$)^A---Rq^FX \\0\\0\\0252042226h^BU\\n^G-- ^R8\\r ----q^GX \\0\\0\\0697110711NX \\0\\0\\0809118053h^BU\\n^G-- ^L^H^O\\0ɲ-Rq^HX \\0\\0\\0293303495h^BU\\n^G-- ^T!.^B/ʅRq X \\0\\0\\0302651538h^BU\\n^G--^G^P)^C^Fn---q\\nU 888879887h^BU\\n^G--^H^W.*^G---Rq^KX \\0\\0\\0240865621h^BU\\n^G--^G\\n2;\\n---Rq^LU 300728616h^BU\\n^G--^A^L^N8\\0\\'" // + + "--Rq\\rX \\0\\0\\0856456443NX \\0\\0\\0302371154h^BU\\n^G--^A^Q^R^^\\0---Rq^NX \\0\\0\\0696458616h^BU\\n^G--^G\\n98\\n---Rq^OU 297082613NX \\0\\0\\0811281930h^BU\\n^G--\\n^Q^P^X^L^OɅRq^PU 300986758h^BU\\n^G--^F^F\\r3^G-$-Rq^QU 276325435h^BU\\n^G--^B^P^P^T^E^N8-Rq^RX \\0\\0\\0299082034h^BU\\n^G--^H^W^_^Q^D<--Rq^SX \\0\\0\\0171238051h^BU\\n^G--\\n\\r)^S^Dܢ-Rq^TX \\0\\0\\0780724792h^BU\\n^G--\\n^N+ ^F*>-Rq^UX \\0\\0\\0893552392h^BU\\n^G--\\n^N^_-^K^L--Rq^VX \\0\\0\\0590290136h^BU\\n^G-- \\r^Y0\\r --Rq^WX \\0\\0\\0302913387h^BU\\n^G--^C^K#,\\0^X9-Rq^XX \\0\\0\\0252736446NX \\0\\0\\0302360033h^BU\\n^G--^C^O^A^^^H-[-Rq^YU 276564368h^BU\\n^G--\\n\\r:+^K-q-Rq\\ZX \\0\\0\\0296693715h^BU\\n^G-- ^G^[/^A-F-Rq^[X \\0\\0\\0223225019h^BU\\n^G-- ^S^X^C\\07\\Z-Rq^\\X \\0\\0\\0232453764h^BU\\n^G--^_\\r3^V\\0---Rq^]U 297276051h^BU\\n^G--^C^K/4^K-؅Rq^^X \\0\\0\\0184978889NX \\0\\0\\0813351784h^BU\\n^G--^H^H%^X^E&^S-Rq^_X \\0\\0\\03028705")); Assert.assertEquals(0, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest76.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest76.java index 513ac7b0b1..0119284afd 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest76.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest76.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest76 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertFalse(provider.checkValid(// - "SELECT * FROM T WHERE FID = ? OR GREATEST(2,0) = 2")); + "SELECT * FROM T WHERE FID = ? OR GREATEST(2,0) = 2")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest77.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest77.java index 678871762e..ab7802780e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest77.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest77.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest77 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertFalse(provider.checkValid(// - "SELECT * FROM T WHERE FID = ? OR LEAST(2,0) = 0")); + "SELECT * FROM T WHERE FID = ? OR LEAST(2,0) = 0")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest78.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest78.java index 80c6a40140..5b3d2fdf73 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest78.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest78.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest78 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertFalse(provider.checkValid(// - "SELECT * FROM T WHERE FID = ? OR LEAST(2,1,9,8) = 1")); + "SELECT * FROM T WHERE FID = ? OR LEAST(2,1,9,8) = 1")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest79.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest79.java index a86b57bc77..97f7b3493f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest79.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest79.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest79 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertFalse(provider.checkValid(// - "SELECT * FROM T WHERE FID = ? OR LEAST(2,1,9,8) = 1")); + "SELECT * FROM T WHERE FID = ? OR LEAST(2,1,9,8) = 1")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest8.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest8.java index 051295bbd4..d39bc3b292 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest8.java @@ -23,30 +23,29 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest8 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT a.* FROM vote_info a where 1=1 AND FID = ?")); // 前置永真 + "SELECT a.* FROM vote_info a where 1=1 AND FID = ?")); // 前置永真 } - + public void test_false_1() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT a.* FROM vote_info a where FID = ? AND 1=1")); // 后置永真，拦截 + "SELECT a.* FROM vote_info a where FID = ? AND 1=1")); // 后置永真，拦截 } - + public void test_false_2() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT a.* FROM vote_info a where FID = ? OR (FID = ? AND 1=1)")); // 后置永真，拦截 + "SELECT a.* FROM vote_info a where FID = ? OR (FID = ? AND 1=1)")); // 后置永真，拦截 } - + public void test_false_3() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT a.* FROM vote_info a where FID = ? OR (1=1 AND FID = ?)")); // 后置永真，拦截 + "SELECT a.* FROM vote_info a where FID = ? OR (1=1 AND FID = ?)")); // 后置永真，拦截 } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest80.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest80.java index 8d1d5c1bf2..68d7b23f55 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest80.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest80.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest80 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertTrue(provider.checkValid(// - "SELECT * FROM T WHERE FID = ? OR FID LIKE 1")); + "SELECT * FROM T WHERE FID = ? OR FID LIKE 1")); Assert.assertEquals(1, provider.getTableStats().size()); } @@ -46,7 +45,7 @@ public void test_false() throws Exception { provider.getConfig().setCommentAllow(true); Assert.assertTrue(provider.checkValid(// - "SELECT * FROM T WHERE FID = ? OR FID LIKE 1 --")); + "SELECT * FROM T WHERE FID = ? OR FID LIKE 1 --")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest81.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest81.java index 367cd38e27..29fb78db9b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest81.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest81.java @@ -24,19 +24,18 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest81 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setStrictSyntaxCheck(false); - + Assert.assertFalse(provider.checkValid(// - "SELECT * FROM T WHERE FID = '\\'a' OR LEAST(2,1,9,8) = 1")); + "SELECT * FROM T WHERE FID = '\\'a' OR LEAST(2,1,9,8) = 1")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest82.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest82.java index fb4a00d6b6..27c6bfa59a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest82.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest82.java @@ -24,19 +24,18 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest82 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setStrictSyntaxCheck(false); - + Assert.assertFalse(provider.checkValid(// - "SELECT * FROM T WHERE FID = '\0a' OR LEAST(2,1,9,8) = 1")); + "SELECT * FROM T WHERE FID = '\0a' OR LEAST(2,1,9,8) = 1")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest83.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest83.java index 3bb2a18399..ca4c37bc46 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest83.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest83.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest83 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertTrue(provider.checkValid(// - "alter table rms.rms_Person_Event drop foreign key FKA382487726D72F65")); + "alter table rms.rms_Person_Event drop foreign key FKA382487726D72F65")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest84.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest84.java index c42005d3ff..ccc964ab8d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest84.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest84.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest84 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertTrue(provider.checkValid(// - "CREATE INDEX part_of_name ON customer (name(10));")); + "CREATE INDEX part_of_name ON customer (name(10));")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest85.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest85.java index 69c424e0d3..772d131ca9 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest85.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest85.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest85 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertTrue(provider.checkValid(// - "CREATE TABLE lookup (id INT) ENGINE = MEMORY;")); + "CREATE TABLE lookup (id INT) ENGINE = MEMORY;")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest86.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest86.java index 5d93e91a74..5b44f7ef76 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest86.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest86.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest86 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertTrue(provider.checkValid(// - "CREATE INDEX id_index ON lookup (id) USING BTREE;")); + "CREATE INDEX id_index ON lookup (id) USING BTREE;")); Assert.assertEquals(1, provider.getTableStats().size()); Assert.assertTrue(provider.getTableStats().containsKey("lookup")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest87.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest87.java index 9d54006c00..362f7a34c8 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest87.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest87.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest87 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertTrue(provider.checkValid(// - "CREATE VIEW test.v AS SELECT * FROM t;")); + "CREATE VIEW test.v AS SELECT * FROM t;")); Assert.assertEquals(2, provider.getTableStats().size()); Assert.assertTrue(provider.getTableStats().containsKey("t")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest88.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest88.java index 54a644aa45..1f47d4fb02 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest88.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest88.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest88 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertTrue(provider.checkValid(// - "DROP INDEX `PRIMARY` ON t;")); + "DROP INDEX `PRIMARY` ON t;")); Assert.assertEquals(1, provider.getTableStats().size()); Assert.assertTrue(provider.getTableStats().containsKey("t")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest89.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest89.java index 446c888496..02a9ab8794 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest89.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest89.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest89 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); - + provider.getConfig().setSelectHavingAlwayTrueCheck(true); - + Assert.assertTrue(provider.checkValid(// - "select login('', '', 'guest', '47ea3937793101011caaa5dd88d3bcae926526624796b8a26a9615e8d3bea6b4', 'iPad3,4', 'unknown'), '', (select max(num) from accounts) + @@auto_increment_increment")); + "select login('', '', 'guest', '47ea3937793101011caaa5dd88d3bcae926526624796b8a26a9615e8d3bea6b4', 'iPad3,4', 'unknown'), '', (select max(num) from accounts) + @@auto_increment_increment")); Assert.assertEquals(1, provider.getTableStats().size()); Assert.assertTrue(provider.getTableStats().containsKey("accounts")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest9.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest9.java index fcdff653c6..6b7fb01272 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest9.java @@ -23,17 +23,16 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest9 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "REPLACE INTO lhwonline_guest (`ip`, `created_time`, `modify_time`, `fid`, `tid`, `request`)" + // - "\nVALUES ('1', '1364366764', '1364368276', '0', '3436'" + // - "\n , 'bbs/read/run')")); // 前置永真 + "REPLACE INTO lhwonline_guest (`ip`, `created_time`, `modify_time`, `fid`, `tid`, `request`)" + // + "\nVALUES ('1', '1364366764', '1364368276', '0', '3436'" + // + "\n , 'bbs/read/run')")); // 前置永真 } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest90.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest90.java index 966325b08f..dc8744e35a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest90.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest90.java @@ -24,22 +24,21 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest90 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSelectHavingAlwayTrueCheck(true); Assert.assertTrue(provider.checkValid(// - "select * from (select t10006_men_xing_jia_ge_fen_lei.bian_hao as \"bian_hao\", " + // - " t10006_men_xing_jia_ge_fen_lei.ming_cheng as \"ming_cheng\" " + // - "from t10006_men_xing_jia_ge_fen_lei where 1=1 ) as tables where 1=1 order by tables.bian_hao")); + "select * from (select t10006_men_xing_jia_ge_fen_lei.bian_hao as \"bian_hao\", " + // + " t10006_men_xing_jia_ge_fen_lei.ming_cheng as \"ming_cheng\" " + // + "from t10006_men_xing_jia_ge_fen_lei where 1=1 ) as tables where 1=1 order by tables.bian_hao")); Assert.assertEquals(1, provider.getTableStats().size()); Assert.assertTrue(provider.getTableStats().containsKey("t10006_men_xing_jia_ge_fen_lei")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest91.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest91.java index fc2126d98b..9ae2563596 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest91.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest91.java @@ -30,7 +30,6 @@ * @see */ public class MySqlWallTest91 extends TestCase { - private WallProvider initWallProvider() { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest92.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest92.java index a905c2f5f2..b91b73b999 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest92.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest92.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest92 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); Assert.assertFalse(provider.checkValid(// - "SELECT * FROM T WHERE FID = 40 OR 1 = (SELECT (CASE WHEN (4484=4484) THEN 1 ELSE 0 END))")); + "SELECT * FROM T WHERE FID = 40 OR 1 = (SELECT (CASE WHEN (4484=4484) THEN 1 ELSE 0 END))")); Assert.assertEquals(1, provider.getTableStats().size()); Assert.assertTrue(provider.getTableStats().containsKey("t")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest93.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest93.java index d084286527..b06b2291e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest93.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest93.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest93 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertTrue(provider.checkValid(// - "desc tablename")); + "desc tablename")); Assert.assertEquals(0, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest94.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest94.java index f08e30f173..0202a70723 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest94.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest94.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest94 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertTrue(provider.checkValid(// - "select * from test having 1=1")); + "select * from test having 1=1")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest95.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest95.java index 97a562bdf2..4470a622b8 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest95.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest95.java @@ -24,19 +24,18 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest95 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); Assert.assertFalse(provider.checkValid(// - "select * from test /*!40101fff*/")); + "select * from test /*!40101fff*/")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest96.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest96.java index a6c8296a50..60dec33e25 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest96.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest96.java @@ -24,13 +24,12 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest96 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); @@ -38,7 +37,7 @@ public void test_false() throws Exception { String sql = "insert into darenai_stat_url SET user='nologin',ip='58.101.223.183',reffer='http://item.taobao.com/item.htm?spm=a230r.1.14.419.KDVewC&id=17052767689',url='/d/jingpinhui?spm=2013.1.0.0.zr4nLz&ac=shop&imageid=1019937265&s=1259538&s=1259538',shopnick='零利润3232',time=NOW()"; Assert.assertTrue(provider.checkValid(// - sql)); + sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest97.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest97.java index e8475297bc..768aa996e9 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest97.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest97.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest97 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest98.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest98.java index 468e4787e6..0ae6d594df 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest98.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest98.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest98 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest99.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest99.java index baadab69b8..8ce336072e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest99.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest99.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest99 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_comment.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_comment.java index e5a80dbac5..59fbfe797f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_comment.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_comment.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest_comment extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setCommentAllow(true); assertTrue(provider.checkValid(// - "SELECT * FROM T WHERE FID = ? #AND 1")); + "SELECT * FROM T WHERE FID = ? #AND 1")); assertEquals(1, provider.getTableStats().size()); } @@ -50,7 +49,7 @@ public void test_false() throws Exception { assertTrue(provider.checkValid("/* this is comment */ SELECT id FROM t ")); assertTrue(provider.checkValid("-- this is comment \n SELECT * FROM t")); assertTrue(provider.checkValid("#this is comment \n SELECT * FROM t")); - + assertTrue(provider.checkValid("/*!40101fff*/ select * from t")); assertFalse(provider.checkValid("select * from t/*!40101fff*/")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_concat.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_concat.java index fb1005a028..fd036e46f0 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_concat.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_concat.java @@ -23,14 +23,13 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class MySqlWallTest_concat extends TestCase { - public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSelectHavingAlwayTrueCheck(true); Assert.assertTrue(provider.checkValid(// - "select * from tb_product_word where name='' or CONCAT(name,style)='' or CONCAT(shop,style)='' or CONCAT(ename,style)=''")); + "select * from tb_product_word where name='' or CONCAT(name,style)='' or CONCAT(shop,style)='' or CONCAT(ename,style)=''")); Assert.assertEquals(1, provider.getTableStats().size()); Assert.assertTrue(provider.getTableStats().containsKey("tb_product_word")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_having.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_having.java index f5e4857c2e..0f6c24cb49 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_having.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_having.java @@ -23,25 +23,24 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest_having extends TestCase { - public void test_having() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "select id, count(*) from t group by id having 1 = 1")); + "select id, count(*) from t group by id having 1 = 1")); } - + public void test_having_true_first() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "select id, count(*) from t group by id having 1 = 1 AND count(*) > 2")); + "select id, count(*) from t group by id having 1 = 1 AND count(*) > 2")); } public void test_having_false() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "select id, count(*) from t group by id having count(*) > 2 OR 1 = 1")); + "select id, count(*) from t group by id having count(*) > 2 OR 1 = 1")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_hint.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_hint.java index a5289b93da..5418971de6 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_hint.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_hint.java @@ -6,7 +6,6 @@ import org.junit.Assert; public class MySqlWallTest_hint extends TestCase { - public void test_false() throws Exception { WallConfig config = new WallConfig(); config.setHintAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_if.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_if.java index d86b8ee970..abb9a175e7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_if.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_if.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest_if extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertFalse(provider.checkValid(// - "SELECT * FROM T WHERE FID = ? OR IF(1>2,2,3) = 3")); + "SELECT * FROM T WHERE FID = ? OR IF(1>2,2,3) = 3")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_1.java index 9698089947..868ad48584 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_1.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest_ifnull_1 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertFalse(provider.checkValid(// - "SELECT * FROM T WHERE FID = ? OR ISNULL(1) = 0")); + "SELECT * FROM T WHERE FID = ? OR ISNULL(1) = 0")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_2.java index f755bfd1ec..145cc37bbe 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_2.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest_ifnull_2 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertFalse(provider.checkValid(// - "SELECT * FROM T WHERE FID = ? OR IFNULL(CAST(CURRENT_USER() AS CHAR))")); + "SELECT * FROM T WHERE FID = ? OR IFNULL(CAST(CURRENT_USER() AS CHAR))")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_like_1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_like_1.java index bc5addfedf..68de7694d7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_like_1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_like_1.java @@ -24,18 +24,17 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest_like_1 extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - + Assert.assertTrue(provider.checkValid(// - "SELECT * FROM T WHERE FID = ? OR FID LIKE 1")); + "SELECT * FROM T WHERE FID = ? OR FID LIKE 1")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_sqlmap.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_sqlmap.java index a75c444ba7..b396e5ea5d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_sqlmap.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_sqlmap.java @@ -24,21 +24,20 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest_sqlmap extends TestCase { - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setSchemaCheck(true); Assert.assertFalse(provider.checkValid(// - "SELECT email, passwd, login_id, full_name" + - " FROM members" + - " 'W'=UPPER(MID(@@version_compile_os,1,1))")); + "SELECT email, passwd, login_id, full_name" + + " FROM members" + + " 'W'=UPPER(MID(@@version_compile_os,1,1))")); Assert.assertEquals(1, provider.getTableStats().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_union.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_union.java index cdcfa495cc..bfa85a4a05 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_union.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_union.java @@ -23,7 +23,6 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest_union extends TestCase { - public void testUnion() throws Exception { WallConfig config = new WallConfig(); config.setSelectUnionCheck(true); @@ -38,15 +37,14 @@ public void testUnion() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql("select f1, f2 from t where id=1 union select c1, c2", config)); //union select item is not const Assert.assertTrue(WallUtils.isValidateMySql("SELECT typeid, typename FROM (SELECT typeid, typename FROM materialtype UNION ALL SELECT ? AS typeid, ? AS typename) a ORDER BY typeid", - config)); // union select item has alias + config)); // union select item has alias Assert.assertFalse(WallUtils.isValidateMySql("select f1, f2 from (select 1 as f1, 2 as f2) t union select 'u1', 'u2' --", config)); // from is subQuery - Assert.assertTrue(WallUtils.isValidateMySql("select f1, f2 from t where id=1 union select 'u1' as u1, 'u2' as u2", config)); // union select item has alias + Assert.assertTrue(WallUtils.isValidateMySql("select f1, f2 from t where id=1 union select 'u1' as u1, 'u2' as u2", config)); // union select item has alias } - public void testUnion2() throws Exception - { + public void testUnion2() throws Exception { // assertFalse( // WallUtils.isValidateMySql("SELECT name, surname FROM users WHERE name='' UNION SELECT @@version, 'string1'") // ); @@ -55,7 +53,7 @@ public void testUnion2() throws Exception WallUtils.isValidateMySql("SELECT name, surname FROM users WHERE name='' UNION SELECT /*! @@version,*/ 'string1'") ); - assertFalse( + assertFalse( WallUtils.isValidateMySql("SELECT name, surname FROM users WHERE name=' ' UNION SELECT /*! (select table_name FROM information_schema.tables limit 1,1),*/ 'string1'") ); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var.java index 70b7386443..ddc5e399f0 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var.java @@ -23,35 +23,34 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest_var extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT @@GLOBAL.sql_mode")); // + "SELECT @@GLOBAL.sql_mode")); // } public void test_true_1() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT @@SESSION.sql_mode;")); // + "SELECT @@SESSION.sql_mode;")); // } public void test_false() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT * FROM T WHERE @@SESSION.sql_mode = 'ANSI'")); // + "SELECT * FROM T WHERE @@SESSION.sql_mode = 'ANSI'")); // } public void test_true2() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "SELECT * FROM T WHERE @@sql_mode = 'ANSI'")); // + "SELECT * FROM T WHERE @@sql_mode = 'ANSI'")); // } public void test_false_1() throws Exception { Assert.assertFalse(WallUtils.isValidateMySql(// - "SELECT * FROM T WHERE @@basedir = 'ANSI'")); // + "SELECT * FROM T WHERE @@basedir = 'ANSI'")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var_autoincrement.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var_autoincrement.java index ee11e1e502..239e193c3b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var_autoincrement.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var_autoincrement.java @@ -23,15 +23,14 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class MySqlWallTest_var_autoincrement extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateMySql(// - "/* mysql-connector-java-5.? ( Revision: bzr.revision-id ) */SELECT @@session.auto_increment_increment")); // + "/* mysql-connector-java-5.? ( Revision: bzr.revision-id ) */SELECT @@session.auto_increment_increment")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MysqlWallTest_rename_table.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MysqlWallTest_rename_table.java index e04a3080ea..b3ccaa2340 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MysqlWallTest_rename_table.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MysqlWallTest_rename_table.java @@ -8,13 +8,12 @@ import junit.framework.TestCase; public class MysqlWallTest_rename_table extends TestCase { - public void test_true() throws Exception { WallConfig config = new WallConfig(); config.setRenameTableAllow(true); Assert.assertTrue(WallUtils.isValidateMySql("RENAME TABLE t1 TO t2", config)); } - + public void test_false() throws Exception { WallConfig config = new WallConfig(); config.setRenameTableAllow(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitFunctionTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitFunctionTest.java index f61c3bddf6..59d01d0387 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitFunctionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitFunctionTest.java @@ -24,19 +24,18 @@ /** * 这个场景测试访问Oracle系统对象 - * + * * @author admin */ public class OracleWallPermitFunctionTest extends TestCase { - public void test_permitTable() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle("select * from t where fid = 1 union select SYS_CONTEXT ('USERENV', 'CURRENT_USER') from X")); } - + public void test_permitTable_allow() throws Exception { WallConfig config = new WallConfig(); config.setFunctionCheck(false); Assert.assertTrue(WallUtils.isValidateOracle("select SYS_CONTEXT ('USERENV', 'CURRENT_USER') from X", config)); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitObjectTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitObjectTest.java index d1db548521..4f455f8727 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitObjectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitObjectTest.java @@ -24,11 +24,10 @@ /** * 这个场景测试访问Oracle系统对象 - * + * * @author admin */ public class OracleWallPermitObjectTest extends TestCase { - public void test_permitTable() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle("select sys.LinxReadFile('c:/boot.ini') from dual")); Assert.assertFalse(WallUtils.isValidateOracle("select sys.LinxRunCMD('cmd /c net user linx /add') from dual")); @@ -37,7 +36,7 @@ public void test_permitTable() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle("SELECT SYS.DBMS_EXPORT_EXTENSION.GET_DOMAIN_INDEX_TABLES('FOO','BAR','DBMS_OUTPUT'.PUT(:P1));")); Assert.assertFalse(WallUtils.isValidateOracle("select SYS.DBMS_EXPORT_EXTENSION.GET_DOMAIN_INDEX_TABLES()")); } - + public void test_permitTable_allow() throws Exception { WallConfig config = new WallConfig(); config.setObjectCheck(false); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitSchemaTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitSchemaTest.java index 44dffbdc23..1bbd94a4da 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitSchemaTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitSchemaTest.java @@ -22,15 +22,14 @@ import com.alibaba.druid.wall.WallUtils; public class OracleWallPermitSchemaTest extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateOracle("select banner from sys.v_$version where rownum=1")); Assert.assertTrue(WallUtils.isValidateOracle("select banner from sys.v where rownum=1")); } - + public void test_false() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle("SELECT * FROM T UNION select banner from sys.v_$version where rownum=1")); Assert.assertFalse(WallUtils.isValidateOracle("SELECT * FROM T UNION select banner from sys.v where rownum=1")); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitTableTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitTableTest.java index 72fe79cf27..ee5d4fae0d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitTableTest.java @@ -22,7 +22,6 @@ import com.alibaba.druid.wall.WallUtils; public class OracleWallPermitTableTest extends TestCase { - public void test_permitTable() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle("SELECT * FROM T UNION select * from TAB")); Assert.assertFalse(WallUtils.isValidateOracle("SELECT * FROM T UNION select * from tab")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest.java index 0fe6fee17f..af4f15824f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest.java @@ -24,18 +24,17 @@ /** * 这个场景测试访问Oracle系统对象 - * + * * @author admin */ public class OracleWallPermitVariantTest extends TestCase { - public void test_permitTable() throws Exception { WallConfig config = new WallConfig(); config.setVariantCheck(false); - + Assert.assertTrue(WallUtils.isValidateOracle("select UID from dual", config)); Assert.assertTrue(WallUtils.isValidateOracle("select USER from dual", config)); Assert.assertTrue(WallUtils.isValidateOracle("select user from dual", config)); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest2.java index 72b53048fb..1bbf42b4c8 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest2.java @@ -23,14 +23,13 @@ /** * 这个场景测试访问Oracle系统对象 - * + * * @author admin */ public class OracleWallPermitVariantTest2 extends TestCase { - public void test_permitTable() throws Exception { Assert.assertFalse(WallUtils.isValidateOracle("select UID from dual")); Assert.assertFalse(WallUtils.isValidateOracle("select USER from dual")); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest.java index ce176bdf5a..6d67df9f98 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest.java @@ -23,21 +23,20 @@ import com.alibaba.druid.wall.WallUtils; public class OracleWallTest extends TestCase { - public void testWall() throws Exception { WallConfig config = new WallConfig(); config.setSelectUnionCheck(true); - assertTrue(WallUtils.isValidateOracle("select f1, f2 from t where c=1 union select 1, 2",config)); - assertFalse(WallUtils.isValidateOracle("select f1, f2 from t where c=1 union select 1, 2 --",config)); - + assertTrue(WallUtils.isValidateOracle("select f1, f2 from t where c=1 union select 1, 2", config)); + assertFalse(WallUtils.isValidateOracle("select f1, f2 from t where c=1 union select 1, 2 --", config)); + assertFalse(WallUtils.isValidateOracle("SELECT * FROM T UNION select * from TAB")); assertFalse(WallUtils.isValidateOracle("SELECT * FROM T UNION select * from ALL_TABLES where (1=1 or (1+1)=2) and (4=8 or 1=1)")); } public void testWall_1() throws Exception { WallConfig config = new WallConfig(); - + assertTrue( - WallUtils.isValidateOracle("select/*+QUERY_TIMEOUT(600000000)*/ * from test_number",config)); + WallUtils.isValidateOracle("select/*+QUERY_TIMEOUT(600000000)*/ * from test_number", config)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest1.java index b6b1ba9266..a9b9569470 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest1.java @@ -22,7 +22,6 @@ import com.alibaba.druid.wall.WallUtils; public class OracleWallTest1 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateOracle("SELECT DICT_ID,NAME,VALUE,STATUS FROM T_EBM_DICT WHERE T_EBM_DICT.PID=10 OR T_EBM_DICT.PID=11")); Assert.assertTrue(WallUtils.isValidateMySql("SELECT DICT_ID,NAME,VALUE,STATUS FROM T_EBM_DICT WHERE T_EBM_DICT.PID=10 OR T_EBM_DICT.PID=11")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest10.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest10.java index 0173a623a3..49a61af3f0 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest10.java @@ -20,41 +20,40 @@ import org.junit.Assert; public class OracleWallTest10 extends TestCase { - public void test_true() throws Exception { String sql = // - "select\n" + - "tpl.projectname as 项目名称,\n" + - "tpl.address as 项目地址,\n" + - "tpl.transactor as 联系人,\n" + - "tpl.transactor_tel as 联系人电话,\n" + - "dbms_lob.substr(wmsys.wm_concat(\n" + - "case when (tap.type = 'LESS_THIS_MONTH_SALARY' AND tap.month = '4') then '4月份'\n" + - "when (tap.type = 'LESS_THIS_MONTH_SALARY' AND tap.month = '5') then '5月份'\n" + - "when (tap.type = 'LESS_THIS_MONTH_SALARY' AND tap.month = '6') then '6月份'\n" + - "else null end\n" + - ")) as YA,\n" + - "dbms_lob.substr(wmsys.wm_concat(\n" + - "case when tap.type = 'NO_PAY_MONTH' AND tap.month = '4' then '4月份'\n" + - "when tap.type = 'NO_PAY_MONTH' AND tap.month = '5' then '5月份'\n" + - "when tap.type = 'NO_PAY_MONTH' AND tap.month = '6' then '6月份'\n" + - "else null end\n" + - ")) as YB,\n" + - "dbms_lob.substr(wmsys.wm_concat(\n" + - "case when tap.type = 'SALARY_DATA_MONTH' AND tap.month = '4' then '4月份'\n" + - "when tap.type = 'SALARY_DATA_MONTH' AND tap.month = '5' then '5月份'\n" + - "when tap.type = 'SALARY_DATA_MONTH' AND tap.month = '6' then '6月份'\n" + - "else null end\n" + - ")) as YC\n" + - "from t_alert_project tap\n" + - "inner join t_project_list tpl on tpl.projectid = tap.projectid\n" + - "where tap.month in ('4','5','6')\n" + - "group by\n" + - "tpl.projectname,\n" + - "tpl.address,\n" + - "tpl.transactor,\n" + - "tpl.transactor_tel\n" + - "order by tpl.projectname"; + "select\n" + + "tpl.projectname as 项目名称,\n" + + "tpl.address as 项目地址,\n" + + "tpl.transactor as 联系人,\n" + + "tpl.transactor_tel as 联系人电话,\n" + + "dbms_lob.substr(wmsys.wm_concat(\n" + + "case when (tap.type = 'LESS_THIS_MONTH_SALARY' AND tap.month = '4') then '4月份'\n" + + "when (tap.type = 'LESS_THIS_MONTH_SALARY' AND tap.month = '5') then '5月份'\n" + + "when (tap.type = 'LESS_THIS_MONTH_SALARY' AND tap.month = '6') then '6月份'\n" + + "else null end\n" + + ")) as YA,\n" + + "dbms_lob.substr(wmsys.wm_concat(\n" + + "case when tap.type = 'NO_PAY_MONTH' AND tap.month = '4' then '4月份'\n" + + "when tap.type = 'NO_PAY_MONTH' AND tap.month = '5' then '5月份'\n" + + "when tap.type = 'NO_PAY_MONTH' AND tap.month = '6' then '6月份'\n" + + "else null end\n" + + ")) as YB,\n" + + "dbms_lob.substr(wmsys.wm_concat(\n" + + "case when tap.type = 'SALARY_DATA_MONTH' AND tap.month = '4' then '4月份'\n" + + "when tap.type = 'SALARY_DATA_MONTH' AND tap.month = '5' then '5月份'\n" + + "when tap.type = 'SALARY_DATA_MONTH' AND tap.month = '6' then '6月份'\n" + + "else null end\n" + + ")) as YC\n" + + "from t_alert_project tap\n" + + "inner join t_project_list tpl on tpl.projectid = tap.projectid\n" + + "where tap.month in ('4','5','6')\n" + + "group by\n" + + "tpl.projectname,\n" + + "tpl.address,\n" + + "tpl.transactor,\n" + + "tpl.transactor_tel\n" + + "order by tpl.projectname"; Assert.assertTrue(WallUtils.isValidateOracle(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest2.java index 5b5167bbab..b0138dbd31 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest2.java @@ -22,7 +22,6 @@ import com.alibaba.druid.wall.WallUtils; public class OracleWallTest2 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateOracle("CREATE SEQUENCE projects_seq START WITH 10000")); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest3.java index e1f8d51f71..5f0eb2c5a0 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest3.java @@ -22,15 +22,14 @@ import com.alibaba.druid.wall.WallUtils; public class OracleWallTest3 extends TestCase { - public void test_true() throws Exception { String sql = // - "CREATE TRIGGER \"AO_4AEACD_WEBHOOK_D367380484\" " // - + "BEFORE INSERT"// - + " ON \"AO_4AEACD_WEBHOOK_DAO\" FOR EACH ROW "// - + "BEGIN"// - + " SELECT \"AO_4AEACD_WEBHOOK_DAO_ID_SEQ\".NEXTVAL INTO :NEW.\"ID\" FROM DUAL;"// - + "END;"; + "CREATE TRIGGER \"AO_4AEACD_WEBHOOK_D367380484\" " // + + "BEFORE INSERT"// + + " ON \"AO_4AEACD_WEBHOOK_DAO\" FOR EACH ROW "// + + "BEGIN"// + + " SELECT \"AO_4AEACD_WEBHOOK_DAO_ID_SEQ\".NEXTVAL INTO :NEW.\"ID\" FROM DUAL;"// + + "END;"; Assert.assertTrue(WallUtils.isValidateOracle(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest4.java index 82fcba1d7c..ea099d5f7e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest4.java @@ -22,14 +22,13 @@ import com.alibaba.druid.wall.WallUtils; public class OracleWallTest4 extends TestCase { - public void test_true() throws Exception { String sql = // - "select sequence_name from all_sequences " // - + "union select synonym_name" // - + " from all_synonyms us, all_sequences asq" // - + " where asq.sequence_name = us.table_name" // - + " and asq.sequence_owner = us.table_owner"; // + "select sequence_name from all_sequences " // + + "union select synonym_name" // + + " from all_synonyms us, all_sequences asq" // + + " where asq.sequence_name = us.table_name" // + + " and asq.sequence_owner = us.table_owner"; // Assert.assertTrue(WallUtils.isValidateOracle(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest5.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest5.java index 5a37d86c96..0c92dd4098 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest5.java @@ -22,10 +22,9 @@ import com.alibaba.druid.wall.WallUtils; public class OracleWallTest5 extends TestCase { - public void test_true() throws Exception { String sql = // - "DROP TRIGGER \"AO_4AEACD_WEBHOOK_D367380484\""; + "DROP TRIGGER \"AO_4AEACD_WEBHOOK_D367380484\""; Assert.assertTrue(WallUtils.isValidateOracle(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest6.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest6.java index 9e9a07d83b..4f69025202 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest6.java @@ -22,45 +22,44 @@ import com.alibaba.druid.wall.WallUtils; public class OracleWallTest6 extends TestCase { - public void test_true() throws Exception { String sql = // - "select *" - + " from (SELECT Distinct notice.NSERIAL," - + " unit.CUNIT_name," - + " us.CUSER_name," - + " to_char(notice.DCREATE, 'yyyy-mm-dd') DCREATE," - + " notice.csubject," - + " notice.ccontent" - + " From mewp_notice_info notice, bas_user us, bas_unit unit" - + " Left Join bas_area xsArea" - + " On unit.ccounty_code = xsArea.Carea_Code" - + " Left Join bas_area pqArea" - + " On unit.cpiece_code = pqArea.Carea_Code" - + " Left Join bas_area xzArea" - + " On unit.cctown_code = xzArea.Carea_Code" - + " Left Join bas_area czArea" - + " On unit.cvillage_code = czArea.Carea_Code" - + " Where notice.cunit_code = unit.cunit_code" - + " And notice.cuser_id = us.cuser_code" - + " And notice.nstate = 4" - + " And (notice.nrole = '****' or notice.nrole = '202')" - + " and notice.cunit_code in" - + " (select 'CP0008'" - + " from dual" - + " union" - + " select Distinct t.cunit_code" - + " from bas_unit t, bas_area us" - + " where t.ccounty_code = us.carea_code" - + " and t.ccounty_code = 'CP'" - + " and t.ctype = '201'" - + " union" - + " select Distinct auser.cunit_code" - + " from bas_user auser, bas_user_role ur" - + " where auser.cuser_code = ur.cuser_code" - + " and (ur.nrole_id = '1' or ur.nrole_id = '20'))" - + " order by DCREATE desc)" - + " where rownum <= 30"; + "select *" + + " from (SELECT Distinct notice.NSERIAL," + + " unit.CUNIT_name," + + " us.CUSER_name," + + " to_char(notice.DCREATE, 'yyyy-mm-dd') DCREATE," + + " notice.csubject," + + " notice.ccontent" + + " From mewp_notice_info notice, bas_user us, bas_unit unit" + + " Left Join bas_area xsArea" + + " On unit.ccounty_code = xsArea.Carea_Code" + + " Left Join bas_area pqArea" + + " On unit.cpiece_code = pqArea.Carea_Code" + + " Left Join bas_area xzArea" + + " On unit.cctown_code = xzArea.Carea_Code" + + " Left Join bas_area czArea" + + " On unit.cvillage_code = czArea.Carea_Code" + + " Where notice.cunit_code = unit.cunit_code" + + " And notice.cuser_id = us.cuser_code" + + " And notice.nstate = 4" + + " And (notice.nrole = '****' or notice.nrole = '202')" + + " and notice.cunit_code in" + + " (select 'CP0008'" + + " from dual" + + " union" + + " select Distinct t.cunit_code" + + " from bas_unit t, bas_area us" + + " where t.ccounty_code = us.carea_code" + + " and t.ccounty_code = 'CP'" + + " and t.ctype = '201'" + + " union" + + " select Distinct auser.cunit_code" + + " from bas_user auser, bas_user_role ur" + + " where auser.cuser_code = ur.cuser_code" + + " and (ur.nrole_id = '1' or ur.nrole_id = '20'))" + + " order by DCREATE desc)" + + " where rownum <= 30"; Assert.assertTrue(WallUtils.isValidateOracle(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest7.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest7.java index c7e42cdd62..519dfa3ed8 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest7.java @@ -20,28 +20,27 @@ import org.junit.Assert; public class OracleWallTest7 extends TestCase { - public void test_true() throws Exception { String sql = // - "begin\n" - + "end"; + "begin\n" + + "end"; Assert.assertTrue(WallUtils.isValidateOracle(sql)); } public void test_insert_all() throws Exception { String sql = // - "INSERT ALL\n" + - " INTO mytable (column1, column2, column_n) VALUES (expr1, expr2, expr_n)\n" + - " INTO mytable (column1, column2, column_n) VALUES (expr1, expr2, expr_n)\n" + - " INTO mytable (column1, column2, column_n) VALUES (expr1, expr2, expr_n)\n" + - "SELECT * FROM dual;"; + "INSERT ALL\n" + + " INTO mytable (column1, column2, column_n) VALUES (expr1, expr2, expr_n)\n" + + " INTO mytable (column1, column2, column_n) VALUES (expr1, expr2, expr_n)\n" + + " INTO mytable (column1, column2, column_n) VALUES (expr1, expr2, expr_n)\n" + + "SELECT * FROM dual;"; assertTrue(WallUtils.isValidateOracle(sql)); } public void test_lock() throws Exception { String sql = // - "LOCK TABLE \"SFXT\".\"FLYWAY_SCHEMA_HISTORY\" IN EXCLUSIVE MODE"; + "LOCK TABLE \"SFXT\".\"FLYWAY_SCHEMA_HISTORY\" IN EXCLUSIVE MODE"; assertTrue(WallUtils.isValidateOracle(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest8_alter_rebuild.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest8_alter_rebuild.java index 1e8552821e..1df4ac33ca 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest8_alter_rebuild.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest8_alter_rebuild.java @@ -20,10 +20,9 @@ import org.junit.Assert; public class OracleWallTest8_alter_rebuild extends TestCase { - public void test_true() throws Exception { String sql = // - "alter index idx_t1 rebuild"; + "alter index idx_t1 rebuild"; Assert.assertTrue(WallUtils.isValidateOracle(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest9_exists.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest9_exists.java index cd73a251fb..0c439c80f5 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest9_exists.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest9_exists.java @@ -20,14 +20,13 @@ import org.junit.Assert; public class OracleWallTest9_exists extends TestCase { - public void test_true() throws Exception { String sql = // - "select *\n" + - " from V v\n" + - " where v.u_id in (select id from U where wx_b = 1)\n" + - " and not exists (select 1 from M where code = v.code)\n" + - " and rownum < 1000"; + "select *\n" + + " from V v\n" + + " where v.u_id in (select id from U where wx_b = 1)\n" + + " and not exists (select 1 from M where code = v.code)\n" + + " and rownum < 1000"; Assert.assertTrue(WallUtils.isValidateOracle(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/pg/PGWallTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/pg/PGWallTest1.java index 9a55c12a45..9936298ca3 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/pg/PGWallTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/pg/PGWallTest1.java @@ -21,7 +21,7 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see @@ -29,6 +29,6 @@ public class PGWallTest1 extends TestCase { public void test_wall() throws Exception { Assert.assertTrue(WallUtils.isValidatePostgres(// - "select pg_encoding_to_char(encoding) from pg_database where datname = current_database()")); + "select pg_encoding_to_char(encoding) from pg_database where datname = current_database()")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/pg/PGWallTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/pg/PGWallTest2.java index 4ffc6a09c4..29940ee609 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/pg/PGWallTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/pg/PGWallTest2.java @@ -21,7 +21,7 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see @@ -29,12 +29,12 @@ public class PGWallTest2 extends TestCase { public void test_wall() throws Exception { assertTrue(WallUtils.isValidatePostgres(// - "select u.id, (\n" + - "\tWITH RECURSIVE users AS (\n" + - "\t\tselect id from t_user limit 1\n" + - "\t) select id from users\n" + - ") from t_user u \n" + - "limit 1;")); + "select u.id, (\n" + + "\tWITH RECURSIVE users AS (\n" + + "\t\tselect id from t_user limit 1\n" + + "\t) select id from users\n" + + ") from t_user u \n" + + "limit 1;")); } public void test_wall_2() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitFunctionTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitFunctionTest.java index 1dc2407024..f77e7906f1 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitFunctionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitFunctionTest.java @@ -23,17 +23,16 @@ /** * SQLServerWallPermitFunctionTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class SQLServerWallPermitFunctionTest extends TestCase { - /** * @param name */ - public SQLServerWallPermitFunctionTest(String name){ + public SQLServerWallPermitFunctionTest(String name) { super(name); } @@ -85,7 +84,7 @@ public final void test_host_name() throws Exception { /** * 测试权限结构 - * + * * @throws Exception */ public void test_is_srvrolemember() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitObjectTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitObjectTest.java index 9aaa990b42..1cdb5b4f20 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitObjectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitObjectTest.java @@ -23,17 +23,16 @@ /** * SQLServerWallPermitObjectTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class SQLServerWallPermitObjectTest extends TestCase { - /** * @param name */ - public SQLServerWallPermitObjectTest(String name){ + public SQLServerWallPermitObjectTest(String name) { super(name); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitSchemaTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitSchemaTest.java index dbfe4d34a8..58d2789cbf 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitSchemaTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitSchemaTest.java @@ -29,7 +29,6 @@ * @see */ public class SQLServerWallPermitSchemaTest extends TestCase { - /** * @param name */ diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitTableTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitTableTest.java index 838824a938..4aa34d1ff7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitTableTest.java @@ -23,13 +23,12 @@ /** * 这个场景测试访问SQLServer系统表 - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class SQLServerWallPermitTableTest extends TestCase { - public void test01() throws Exception { Assert.assertFalse(WallUtils.isValidateSqlServer("SELECT * FROM T UNION select * from sysObjects")); Assert.assertFalse(WallUtils.isValidateSqlServer("SELECT * FROM T UNION select * from sysdatabases")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest.java index 1d3c7149a4..30d28bfc8a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest.java @@ -23,17 +23,16 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class SQLServerWallTest extends TestCase { - /** * @param name */ - public SQLServerWallTest(String name){ + public SQLServerWallTest(String name) { super(name); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_0.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_0.java index 253af477ab..ebdaff747f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_0.java @@ -24,13 +24,12 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class SQLServerWallTest_0 extends TestCase { - private WallProvider initWallProvider() { WallProvider provider = new SQLServerWallProvider(); @@ -71,17 +70,17 @@ public void test_false2() throws Exception { WallProvider provider = initWallProvider(); { String sql = "SELECT characteristic.columnname + '|' + RTRIM(characteristic.rpid) as rpid ," // - + " characteristic.columnname, characteristic.chnname " // - + "FROM characteristic" // - + " inner join content_sort" // - + " on characteristic.rpid = content_sort.rpid and content_sort.opid = 2" - + "WHERE (characteristic.columnname IN (" // - + " SELECT name FROM syscolumns" // - + " WHERE (id =(SELECT id FROM sysobjects WHERE (name = 'content')))" // - + " AND (name NOT IN ('billid', 'itemno', 'tableid', 'rpid'))" // - + " ))" // - + " AND (characteristic.closed = 0)" // - + "ORDER BY content_sort.sort, characteristic.code"; + + " characteristic.columnname, characteristic.chnname " // + + "FROM characteristic" // + + " inner join content_sort" // + + " on characteristic.rpid = content_sort.rpid and content_sort.opid = 2" + + "WHERE (characteristic.columnname IN (" // + + " SELECT name FROM syscolumns" // + + " WHERE (id =(SELECT id FROM sysobjects WHERE (name = 'content')))" // + + " AND (name NOT IN ('billid', 'itemno', 'tableid', 'rpid'))" // + + " ))" // + + " AND (characteristic.closed = 0)" // + + "ORDER BY content_sort.sort, characteristic.code"; Assert.assertFalse(provider.checkValid(sql)); } } @@ -91,10 +90,10 @@ public void test_false3() throws Exception { { String sql = "SELECT rpid, columnname, chnname, type, textfield" // - + " , valuefield, ddlbtable, ddlbwhere, ddlbsort, datatype "// - + "FROM characteristic "// - + "WHERE (closed = 0)" // - + " AND ((SELECT COUNT(*) FROM sysobjects WHERE (id IN (SELECT id FROM syscolumns WHERE name = columnname)) AND (name = 'content')) > 0) ORDER BY code"; + + " , valuefield, ddlbtable, ddlbwhere, ddlbsort, datatype "// + + "FROM characteristic "// + + "WHERE (closed = 0)" // + + " AND ((SELECT COUNT(*) FROM sysobjects WHERE (id IN (SELECT id FROM syscolumns WHERE name = columnname)) AND (name = 'content')) > 0) ORDER BY code"; Assert.assertFalse(provider.checkValid(sql)); } } @@ -119,10 +118,10 @@ public void test_true4() throws Exception { WallProvider provider = initWallProvider(); { String sql = "SELECT tableid, chnname "// - + "FROM r_temptable "// - + "INNER JOIN sys_func_pwr ss ON r_temptable.tableid = ss.mainid "// - + "INNER JOIN sys_func_pwr sys ON ss.parentid = sys.funcid " // - + "WHERE (ismaintable = 1) and 1=1 and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 550) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 551) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 391) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 552) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 393) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 396) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 4628) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 4836) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 394) AND (functype = 8) AND (Closed = 0))) and ss.funcid <> 4298 and ss.funcid <> 7441 AND (ss.funcid IN (SELECT DISTINCT funcid FROM sys_func_pwr WHERE (functype = 8) AND (Closed = 0) )) ORDER BY sys.sortflag ,ss.sortflag "; + + "FROM r_temptable "// + + "INNER JOIN sys_func_pwr ss ON r_temptable.tableid = ss.mainid "// + + "INNER JOIN sys_func_pwr sys ON ss.parentid = sys.funcid " // + + "WHERE (ismaintable = 1) and 1=1 and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 550) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 551) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 391) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 552) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 393) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 396) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 4628) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 4836) AND (functype = 8) AND (Closed = 0))) and (r_temptable.tableid NOT IN (SELECT DISTINCT mainid FROM sys_func_pwr WHERE (parentid = 394) AND (functype = 8) AND (Closed = 0))) and ss.funcid <> 4298 and ss.funcid <> 7441 AND (ss.funcid IN (SELECT DISTINCT funcid FROM sys_func_pwr WHERE (functype = 8) AND (Closed = 0) )) ORDER BY sys.sortflag ,ss.sortflag "; Assert.assertTrue(provider.checkValid(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_1.java index 546e62beff..3ecdcffd23 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_1.java @@ -29,8 +29,7 @@ * @see */ public class SQLServerWallTest_1 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateSqlServer("SELECT @ret")); - } + } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_10.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_10.java index 7c9bc34108..9340246ed7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_10.java @@ -24,11 +24,10 @@ /** * SQLServerWallTest - * + * * @see */ public class SQLServerWallTest_10 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_11.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_11.java index bde005e185..8535d6876f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_11.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_11.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @see */ public class SQLServerWallTest_11 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); provider.getConfig().setCommentAllow(true); String sql = "SELECT KL_ArticleContent,KL_ArticleTitle " // - + "FROM dbo.KL_Article " // - + "WHERE KL_ArticleId =-4731 "// - + "UNION ALL "// - + "SELECT (SELECT TOP 1 CHAR(58)+CHAR(108)+CHAR(107)+CHAR(103)+CHAR(58)+ISNULL(CAST(name AS NVARCHAR(4000)),CHAR(32))+CHAR(58)+CHAR(109)+CHAR(122)+CHAR(104)+CHAR(58) FROM sys.sql_logins WHERE ISNULL(name,CHAR(32)) NOT IN (SELECT TOP 0 ISNULL(name,CHAR(32)) FROM sys.sql_logins ORDER BY 1) ORDER BY 1),NULL-- "; + + "FROM dbo.KL_Article " // + + "WHERE KL_ArticleId =-4731 "// + + "UNION ALL "// + + "SELECT (SELECT TOP 1 CHAR(58)+CHAR(108)+CHAR(107)+CHAR(103)+CHAR(58)+ISNULL(CAST(name AS NVARCHAR(4000)),CHAR(32))+CHAR(58)+CHAR(109)+CHAR(122)+CHAR(104)+CHAR(58) FROM sys.sql_logins WHERE ISNULL(name,CHAR(32)) NOT IN (SELECT TOP 0 ISNULL(name,CHAR(32)) FROM sys.sql_logins ORDER BY 1) ORDER BY 1),NULL-- "; Assert.assertFalse(provider.checkValid(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_12.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_12.java index 2a41541d04..8c53f374bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_12.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_12.java @@ -24,11 +24,10 @@ /** * SQLServerWallTest - * + * * @see */ public class SQLServerWallTest_12 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); provider.getConfig().setCommentAllow(true); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_2.java index 95a9021092..1a821fb563 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_2.java @@ -29,8 +29,7 @@ * @see */ public class SQLServerWallTest_2 extends TestCase { - public void test_true() throws Exception { Assert.assertTrue(WallUtils.isValidateSqlServer("rollback")); - } + } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_3.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_3.java index ceb6b114c3..f7c2b42893 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_3.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class SQLServerWallTest_3 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); provider.getConfig().setSelectHavingAlwayTrueCheck(true); Assert.assertFalse(provider.checkValid(// - "select * from t where LEN(HOST_NAME()) > 0")); + "select * from t where LEN(HOST_NAME()) > 0")); Assert.assertEquals(1, provider.getTableStats().size()); Assert.assertTrue(provider.getTableStats().containsKey("t")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_4.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_4.java index 7e67a4b133..b3fcafa95b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_4.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class SQLServerWallTest_4 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); provider.getConfig().setSelectHavingAlwayTrueCheck(true); Assert.assertTrue(provider.checkValid(// - "insert into t (fid, name) values (1, HOST_NAME())")); + "insert into t (fid, name) values (1, HOST_NAME())")); Assert.assertEquals(1, provider.getTableStats().size()); Assert.assertTrue(provider.getTableStats().containsKey("t")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_5.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_5.java index d15802f67e..2086c849d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_5.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class SQLServerWallTest_5 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); provider.getConfig().setSelectHavingAlwayTrueCheck(true); Assert.assertFalse(provider.checkValid(// - "delete t where LEN(HOST_NAME()) > 0")); + "delete t where LEN(HOST_NAME()) > 0")); Assert.assertEquals(1, provider.getTableStats().size()); Assert.assertTrue(provider.getTableStats().containsKey("t")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_6.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_6.java index 487f3d51b6..66d44c696f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_6.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class SQLServerWallTest_6 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); provider.getConfig().setSelectHavingAlwayTrueCheck(true); Assert.assertFalse(provider.checkValid(// - "update t set fid = 1 where LEN(HOST_NAME()) > 0")); + "update t set fid = 1 where LEN(HOST_NAME()) > 0")); Assert.assertEquals(1, provider.getTableStats().size()); Assert.assertTrue(provider.getTableStats().containsKey("t")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_7.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_7.java index 5ca71f9c97..80d22d9f32 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_7.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class SQLServerWallTest_7 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); provider.getConfig().setSelectHavingAlwayTrueCheck(true); Assert.assertTrue(provider.checkValid(// - "select * from (select top 3000 jol.id as primaryKeyIds, jo.orderNo as 委托单号, bm.custname as 委托方名称, manuCustInfo.custname as 出证方, jo.chkerDate as 委托日期, bcc.connectName as 联系人, bcc.mobile as 电话,jol.barcode as 样品条码, jol.name as 样品名称, jol.qtysub as 套件数量,jol.OnlyCode as 唯一识别码,jol.manufacture as 制造厂商,jol.sprc as 规格型号, jol.outno as 出厂编号, djod.name as 任务状态, djoc.name 委托类别, dct.name as 证书类型,bdp.organ_name as 分配室组, jol.task_id as 任务ID, be.user_name as 检定人员, verifyUser.user_name as 核验员, checkUser.user_name as 批准员, jol.ddate 交款日期,cjcs.name as 缴款状态, jc.moneys as 应收费, jc.moneystotal as 实收费, be.organ_id from jl_OrderList jol left outer join jl_CheckList jc on jol.checkList_id = jc.id left outer join jl_Order jo on jol.orderid = jo.id left outer join ba_dptinfo bdp on jol.dptid = bdp.id left outer join jl_Task jt on jol.task_id = jt.id left outer join ba_manucustinfo bm on jo.entrustCustId = bm.id left outer join ba_manucustinfo manuCustInfo on jo.custid = manuCustInfo.id left outer join ba_custconnect bcc on jo.linkPerson = bcc.id left outer join ba_employeeinfo be on jt.jdUserId = be.id left outer join ba_employeeinfo verifyUser on jt.verifyUser = verifyUser.id left outer join ba_employeeinfo checkUser on jt.checkUser = checkUser.id left outer join dict_jl_order_doType djod on jol.dotypeid = djod.id left outer join dict_jl_order_class djoc on jo.orderclassid = djoc.id left outer join dict_certificate_type dct on jt.certificatetype = dct.id left outer join dict_jl_chargestatus cjcs on jol.chargestatus = cjcs.id where jol.id >= (select min(primaryKeyId) from (select top 3000 jol.id as primaryKeyId from jl_OrderList jol left outer join jl_CheckList jc on jol.checkList_id = jc.id left outer join jl_Order jo on jol.orderid = jo.id left outer join ba_dptinfo bdp on jol.dptid = bdp.id left outer join jl_Task jt on jol.task_id = jt.id left outer join ba_manucustinfo bm on jo.entrustCustId = bm.id left outer join ba_manucustinfo manuCustInfo on jo.custid = manuCustInfo.id left outer join ba_custconnect bcc on jo.linkPerson = bcc.id left outer join ba_employeeinfo be on jt.jdUserId = be.id left outer join ba_employeeinfo verifyUser on jt.verifyUser = verifyUser.id left outer join ba_employeeinfo checkUser on jt.checkUser = checkUser.id left outer join dict_jl_order_doType djod on jol.dotypeid = djod.id left outer join dict_jl_order_class djoc on jo.orderclassid = djoc.id left outer join dict_certificate_type dct on jt.certificatetype = dct.id left outer join dict_jl_chargestatus cjcs on jol.chargestatus = cjcs.id where jo.chkerDate >= ? and jo.chkerDate <= ? and jol.ddate >= ? order by jol.id desc, jo.id DESC) as T) and jo.chkerDate >= ? and jo.chkerDate <= ? and jol.ddate >= ? order by jol.id asc, jo.id DESC) as T1 order by T1.primaryKeyIds desc")); + "select * from (select top 3000 jol.id as primaryKeyIds, jo.orderNo as 委托单号, bm.custname as 委托方名称, manuCustInfo.custname as 出证方, jo.chkerDate as 委托日期, bcc.connectName as 联系人, bcc.mobile as 电话,jol.barcode as 样品条码, jol.name as 样品名称, jol.qtysub as 套件数量,jol.OnlyCode as 唯一识别码,jol.manufacture as 制造厂商,jol.sprc as 规格型号, jol.outno as 出厂编号, djod.name as 任务状态, djoc.name 委托类别, dct.name as 证书类型,bdp.organ_name as 分配室组, jol.task_id as 任务ID, be.user_name as 检定人员, verifyUser.user_name as 核验员, checkUser.user_name as 批准员, jol.ddate 交款日期,cjcs.name as 缴款状态, jc.moneys as 应收费, jc.moneystotal as 实收费, be.organ_id from jl_OrderList jol left outer join jl_CheckList jc on jol.checkList_id = jc.id left outer join jl_Order jo on jol.orderid = jo.id left outer join ba_dptinfo bdp on jol.dptid = bdp.id left outer join jl_Task jt on jol.task_id = jt.id left outer join ba_manucustinfo bm on jo.entrustCustId = bm.id left outer join ba_manucustinfo manuCustInfo on jo.custid = manuCustInfo.id left outer join ba_custconnect bcc on jo.linkPerson = bcc.id left outer join ba_employeeinfo be on jt.jdUserId = be.id left outer join ba_employeeinfo verifyUser on jt.verifyUser = verifyUser.id left outer join ba_employeeinfo checkUser on jt.checkUser = checkUser.id left outer join dict_jl_order_doType djod on jol.dotypeid = djod.id left outer join dict_jl_order_class djoc on jo.orderclassid = djoc.id left outer join dict_certificate_type dct on jt.certificatetype = dct.id left outer join dict_jl_chargestatus cjcs on jol.chargestatus = cjcs.id where jol.id >= (select min(primaryKeyId) from (select top 3000 jol.id as primaryKeyId from jl_OrderList jol left outer join jl_CheckList jc on jol.checkList_id = jc.id left outer join jl_Order jo on jol.orderid = jo.id left outer join ba_dptinfo bdp on jol.dptid = bdp.id left outer join jl_Task jt on jol.task_id = jt.id left outer join ba_manucustinfo bm on jo.entrustCustId = bm.id left outer join ba_manucustinfo manuCustInfo on jo.custid = manuCustInfo.id left outer join ba_custconnect bcc on jo.linkPerson = bcc.id left outer join ba_employeeinfo be on jt.jdUserId = be.id left outer join ba_employeeinfo verifyUser on jt.verifyUser = verifyUser.id left outer join ba_employeeinfo checkUser on jt.checkUser = checkUser.id left outer join dict_jl_order_doType djod on jol.dotypeid = djod.id left outer join dict_jl_order_class djoc on jo.orderclassid = djoc.id left outer join dict_certificate_type dct on jt.certificatetype = dct.id left outer join dict_jl_chargestatus cjcs on jol.chargestatus = cjcs.id where jo.chkerDate >= ? and jo.chkerDate <= ? and jol.ddate >= ? order by jol.id desc, jo.id DESC) as T) and jo.chkerDate >= ? and jo.chkerDate <= ? and jol.ddate >= ? order by jol.id asc, jo.id DESC) as T1 order by T1.primaryKeyIds desc")); // Assert.assertEquals(12, provider.getTableStats().size()); // Assert.assertTrue(provider.getTableStats().containsKey("jl_OrderList")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_8.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_8.java index e3fd1d23a9..381df8604c 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_8.java @@ -24,13 +24,12 @@ /** * SQLServerWallTest - * + * * @author RaymondXiu * @version 1.0, 2012-3-18 * @see */ public class SQLServerWallTest_8 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_9.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_9.java index 301d81998a..17691e95de 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_9.java @@ -24,20 +24,19 @@ /** * SQLServerWallTest - * + * * @see */ public class SQLServerWallTest_9 extends TestCase { - public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); String sql = "SELECT s.id FROM snapshots s " // - + "WHERE s.scope='PRJ'"// - + " and s.qualifier IN ('TRK', 'BRC')"// - + " AND status='P'" // - + " AND islast=0" // - + " AND NOT EXISTS (select m.id from project_measures m WHERE m.snapshot_id=s.id)"; + + "WHERE s.scope='PRJ'"// + + " and s.qualifier IN ('TRK', 'BRC')"// + + " AND status='P'" // + + " AND islast=0" // + + " AND NOT EXISTS (select m.id from project_measures m WHERE m.snapshot_id=s.id)"; Assert.assertTrue(provider.checkValid(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/hibernate/HibernateCRUDTest.java b/src/test/java/com/alibaba/druid/bvt/hibernate/HibernateCRUDTest.java index 8c0d2c284c..e17e8647e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/hibernate/HibernateCRUDTest.java +++ b/src/test/java/com/alibaba/druid/bvt/hibernate/HibernateCRUDTest.java @@ -22,188 +22,187 @@ * @date 2012-11-26 下午11:41 */ public class HibernateCRUDTest extends TestCase { - - private static final Logger log = LoggerFactory.getLogger(HibernateCRUDTest.class); - - private DruidDataSource dataSource; - - private SessionFactory sessionFactory; - - @Override - public void setUp() throws Exception { - /*init dataSource*/ - dataSource = new DruidDataSource(); - dataSource.setUrl("jdbc:h2:file:~/.h2/HibernateCRUDTest;AUTO_SERVER=TRUE"); - dataSource.setUsername("sa"); - dataSource.setPassword(""); - dataSource.setDefaultAutoCommit(false); - dataSource.setFilters("log4j"); - - /*init sessionFactory*/ - LocalSessionFactoryBean factoryBean = new LocalSessionFactoryBean(); - factoryBean.setDataSource(dataSource); - - Properties prop = new Properties(); - prop.put("hibernate.show_sql", "true"); - //prop.put("hibernate.format_sql", "true"); - prop.put("hibernate.hbm2ddl.auto", "create"); - prop.put("hibernate.dialect", "org.hibernate.dialect.H2Dialect"); - factoryBean.setHibernateProperties(prop); - factoryBean.setAnnotatedClasses(new Class[]{Sample.class}); - - try { - factoryBean.afterPropertiesSet(); - } catch (IOException e) { - e.printStackTrace(); - } - sessionFactory = factoryBean.getObject(); - } - - @Override - public void tearDown() throws Exception { - sessionFactory.close(); - JdbcUtils.close(dataSource); - } - - private void doCreate(Session session) { - Sample sample = new Sample(); - sample.setId(1L); - sample.setDesc("sample"); - sample.setCreateTime(new Date()); - session.save(sample); - } - - private void doGet(Session session) { - Sample sample = (Sample) session.get(Sample.class, 1L); - log.debug("**sample:{}", sample); - assert sample != null; - } - - private void doUpdate(Session session) { - Sample sample = (Sample) session.get(Sample.class, 1L); - assert sample != null; - sample.setDesc("update sample"); - sample.setUpdateTime(new Date()); - session.update(sample); - } - - private void doDelete(Session session) { - Sample sample = (Sample) session.get(Sample.class, 1L); - assert sample != null; - session.delete(sample); - } - - /*-------- test start --------*/ - - public void test_create() { - Session session = null; - try { - session = sessionFactory.openSession(); - doCreate(session); - } finally { - if (session != null){ - session.flush(); - session.close(); - } - } - } - - public void test_get() { - Session session = null; - try { - session = sessionFactory.openSession(); - doCreate(session); - doGet(session); - } finally { - if (session != null){ - session.flush(); - session.close(); - } - } - } - - public void test_update() { - Session session = null; - try { - session = sessionFactory.openSession(); - doCreate(session); - doUpdate(session); - } finally { - if (session != null){ - session.flush(); - session.close(); - } - } - } - - public void test_delete() { - Session session = null; - try { - session = sessionFactory.openSession(); - doCreate(session); - doDelete(session); - } finally { - if (session != null){ - session.flush(); - session.close(); - } - } - } - - public void test_transactional_create() { - Session session = null; - Transaction tran = null; - try { - session = sessionFactory.openSession(); - tran = session.beginTransaction(); - doCreate(session); - } finally { - if (tran != null) { - tran.commit(); - } - if (session != null){ - session.flush(); - session.close(); - } - } - } - - public void test_transactional_update() { - Session session = null; - Transaction tran = null; - try { - session = sessionFactory.openSession(); - tran = session.beginTransaction(); - doCreate(session); - doUpdate(session); - } finally { - if (tran != null) { - tran.commit(); - } - if (session != null){ - session.flush(); - session.close(); - } - } - } - - public void test_transactional_delete() { - Session session = null; - Transaction tran = null; - try { - session = sessionFactory.openSession(); - tran = session.beginTransaction(); - doCreate(session); - doDelete(session); - } finally { - if (tran != null) { - tran.commit(); - } - if (session != null){ - session.flush(); - session.close(); - } - } - } + private static final Logger log = LoggerFactory.getLogger(HibernateCRUDTest.class); + + private DruidDataSource dataSource; + + private SessionFactory sessionFactory; + + @Override + public void setUp() throws Exception { + /*init dataSource*/ + dataSource = new DruidDataSource(); + dataSource.setUrl("jdbc:h2:file:~/.h2/HibernateCRUDTest;AUTO_SERVER=TRUE"); + dataSource.setUsername("sa"); + dataSource.setPassword(""); + dataSource.setDefaultAutoCommit(false); + dataSource.setFilters("log4j"); + + /*init sessionFactory*/ + LocalSessionFactoryBean factoryBean = new LocalSessionFactoryBean(); + factoryBean.setDataSource(dataSource); + + Properties prop = new Properties(); + prop.put("hibernate.show_sql", "true"); + //prop.put("hibernate.format_sql", "true"); + prop.put("hibernate.hbm2ddl.auto", "create"); + prop.put("hibernate.dialect", "org.hibernate.dialect.H2Dialect"); + factoryBean.setHibernateProperties(prop); + factoryBean.setAnnotatedClasses(new Class[]{Sample.class}); + + try { + factoryBean.afterPropertiesSet(); + } catch (IOException e) { + e.printStackTrace(); + } + sessionFactory = factoryBean.getObject(); + } + + @Override + public void tearDown() throws Exception { + sessionFactory.close(); + JdbcUtils.close(dataSource); + } + + private void doCreate(Session session) { + Sample sample = new Sample(); + sample.setId(1L); + sample.setDesc("sample"); + sample.setCreateTime(new Date()); + session.save(sample); + } + + private void doGet(Session session) { + Sample sample = (Sample) session.get(Sample.class, 1L); + log.debug("**sample:{}", sample); + assert sample != null; + } + + private void doUpdate(Session session) { + Sample sample = (Sample) session.get(Sample.class, 1L); + assert sample != null; + sample.setDesc("update sample"); + sample.setUpdateTime(new Date()); + session.update(sample); + } + + private void doDelete(Session session) { + Sample sample = (Sample) session.get(Sample.class, 1L); + assert sample != null; + session.delete(sample); + } + + /*-------- test start --------*/ + + public void test_create() { + Session session = null; + try { + session = sessionFactory.openSession(); + doCreate(session); + } finally { + if (session != null) { + session.flush(); + session.close(); + } + } + } + + public void test_get() { + Session session = null; + try { + session = sessionFactory.openSession(); + doCreate(session); + doGet(session); + } finally { + if (session != null) { + session.flush(); + session.close(); + } + } + } + + public void test_update() { + Session session = null; + try { + session = sessionFactory.openSession(); + doCreate(session); + doUpdate(session); + } finally { + if (session != null) { + session.flush(); + session.close(); + } + } + } + + public void test_delete() { + Session session = null; + try { + session = sessionFactory.openSession(); + doCreate(session); + doDelete(session); + } finally { + if (session != null) { + session.flush(); + session.close(); + } + } + } + + public void test_transactional_create() { + Session session = null; + Transaction tran = null; + try { + session = sessionFactory.openSession(); + tran = session.beginTransaction(); + doCreate(session); + } finally { + if (tran != null) { + tran.commit(); + } + if (session != null) { + session.flush(); + session.close(); + } + } + } + + public void test_transactional_update() { + Session session = null; + Transaction tran = null; + try { + session = sessionFactory.openSession(); + tran = session.beginTransaction(); + doCreate(session); + doUpdate(session); + } finally { + if (tran != null) { + tran.commit(); + } + if (session != null) { + session.flush(); + session.close(); + } + } + } + + public void test_transactional_delete() { + Session session = null; + Transaction tran = null; + try { + session = sessionFactory.openSession(); + tran = session.beginTransaction(); + doCreate(session); + doDelete(session); + } finally { + if (tran != null) { + tran.commit(); + } + if (session != null) { + session.flush(); + session.close(); + } + } + } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/hibernate/entity/Sample.java b/src/test/java/com/alibaba/druid/bvt/hibernate/entity/Sample.java index 51fb247b8a..8961946d17 100644 --- a/src/test/java/com/alibaba/druid/bvt/hibernate/entity/Sample.java +++ b/src/test/java/com/alibaba/druid/bvt/hibernate/entity/Sample.java @@ -13,66 +13,65 @@ @Entity @Table(name = "SAMPLE") public class Sample implements Serializable { + @Id + private Long id; - @Id - private Long id; + private String name; - private String name; + private String desc; - private String desc; + private Date createTime; - private Date createTime; + private Date updateTime; - private Date updateTime; + public Date getCreateTime() { + return createTime; + } - public Date getCreateTime() { - return createTime; - } + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } + public String getDesc() { + return desc; + } - public String getDesc() { - return desc; - } + public void setDesc(String desc) { + this.desc = desc; + } - public void setDesc(String desc) { - this.desc = desc; - } + public Long getId() { + return id; + } - public Long getId() { - return id; - } + public void setId(Long id) { + this.id = id; + } - public void setId(Long id) { - this.id = id; - } + public String getName() { + return name; + } - public String getName() { - return name; - } + public void setName(String name) { + this.name = name; + } - public void setName(String name) { - this.name = name; - } + public Date getUpdateTime() { + return updateTime; + } - public Date getUpdateTime() { - return updateTime; - } + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - @Override - public String toString() { - return "Sample{" + - "createTime=" + createTime + - ", id=" + id + - ", name='" + name + '\'' + - ", desc='" + desc + '\'' + - ", updateTime=" + updateTime + - '}'; - } + @Override + public String toString() { + return "Sample{" + + "createTime=" + createTime + + ", id=" + id + + ", name='" + name + '\'' + + ", desc='" + desc + '\'' + + ", updateTime=" + updateTime + + '}'; + } } diff --git a/src/test/java/com/alibaba/druid/bvt/jmx/DupRegisterTest.java b/src/test/java/com/alibaba/druid/bvt/jmx/DupRegisterTest.java index 871cbf8e68..0fe547b2a8 100644 --- a/src/test/java/com/alibaba/druid/bvt/jmx/DupRegisterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/jmx/DupRegisterTest.java @@ -11,19 +11,17 @@ import junit.framework.TestCase; public class DupRegisterTest extends TestCase { - private DruidDataSource dataSource; public void test_0() throws Exception { dataSource.init(); - + MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); mbeanServer.registerMBean(dataSource, dataSource.getObjectName()); Assert.assertTrue(mbeanServer.isRegistered(dataSource.getObjectName())); } protected void setUp() throws Exception { - dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setMinEvictableIdleTimeMillis(10); diff --git a/src/test/java/com/alibaba/druid/bvt/jmx/JMXExporterTest.java b/src/test/java/com/alibaba/druid/bvt/jmx/JMXExporterTest.java index a142ff4adf..2e7a947fbf 100644 --- a/src/test/java/com/alibaba/druid/bvt/jmx/JMXExporterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/jmx/JMXExporterTest.java @@ -25,7 +25,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class JMXExporterTest extends TestCase { - public void test_export() throws Exception { String file = "com/alibaba/druid/jmx/spring_stat_export.xml"; diff --git a/src/test/java/com/alibaba/druid/bvt/log/LoggerTest.java b/src/test/java/com/alibaba/druid/bvt/log/LoggerTest.java index 1f927213d4..e19687b066 100644 --- a/src/test/java/com/alibaba/druid/bvt/log/LoggerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/log/LoggerTest.java @@ -17,15 +17,13 @@ import com.alibaba.druid.util.JdbcUtils; public class LoggerTest extends TestCase { - private static java.security.ProtectionDomain DOMAIN; - private ClassLoader contextClassLoader; - private DruidDataSource dataSource; + private ClassLoader contextClassLoader; + private DruidDataSource dataSource; static { DOMAIN = (java.security.ProtectionDomain) java.security.AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { return TestLoader.class.getProtectionDomain(); } @@ -33,12 +31,11 @@ public Object run() { } public static class TestLoader extends ClassLoader { - private ClassLoader loader; private Set definedSet = new HashSet(); - public TestLoader(){ + public TestLoader() { super(null); loader = DruidDriver.class.getClassLoader(); } diff --git a/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java b/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java index a9dcd820d0..de55616e6a 100644 --- a/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java @@ -27,7 +27,6 @@ import org.junit.Assert; public class MockExecuteTest extends PoolTestCase { - public void test_0() throws Exception { Connection conn = DriverManager.getConnection("jdbc:mock:"); Statement stmt = conn.createStatement(); diff --git a/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java b/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java index 6707373af1..05b7da07d2 100644 --- a/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java +++ b/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; public class MockResultSetMetaDataTest extends TestCase { - public void test_resultSet_metadata() throws Exception { MockResultSetMetaData meta = new MockResultSetMetaData(); Assert.assertTrue(meta.isWrapperFor(MockResultSetMetaData.class)); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Bug_for_dupCloseStmtError.java b/src/test/java/com/alibaba/druid/bvt/pool/Bug_for_dupCloseStmtError.java index 011ec43e57..742e08c175 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Bug_for_dupCloseStmtError.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Bug_for_dupCloseStmtError.java @@ -30,7 +30,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class Bug_for_dupCloseStmtError extends PoolTestCase { - protected DruidDataSource dataSource; protected void setUp() throws Exception { @@ -66,9 +65,9 @@ public void test_2() throws Exception { } catch (MockConnectionClosedException ex) { error = ex; } - + Assert.assertNotNull(error); - + conn.close(); stmt.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java b/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java index 9ce3f488df..075cea1f26 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java @@ -31,7 +31,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class CallableStatmentTest extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -45,7 +44,6 @@ protected void setUp() throws Exception { dataSource.setFilters("log4j"); dataSource.setDriver(new MockDriver() { - public MockCallableStatement createMockCallableStatement(MockConnection conn, String sql) { return new MyMockCallableStatement(conn, sql); } @@ -69,17 +67,17 @@ public void test_connect() throws Exception { rawStmt = stmt.unwrap(MockCallableStatement.class); ResultSet rs = (ResultSet) stmt.getObject(0); - + rawRs = rs.unwrap(MockResultSet.class); - + rs.next(); - + rs.close(); stmt.close(); - + Assert.assertFalse(rawStmt.isClosed()); Assert.assertTrue(rawRs.isClosed()); - + rawRs = rs.unwrap(MockResultSet.class); Assert.assertNotNull(rawRs); @@ -108,8 +106,7 @@ public void test_connect() throws Exception { } public static class MyMockCallableStatement extends MockCallableStatement { - - public MyMockCallableStatement(MockConnection conn, String sql){ + public MyMockCallableStatement(MockConnection conn, String sql) { super(conn, sql); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java index a9f88f068e..354eb32319 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java @@ -29,13 +29,10 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class Case0 extends PoolTestCase { - public void test_0() throws Exception { - final DruidDataSource dataSource = new DruidDataSource(); dataSource.setDriver(new MockDriver() { - }); dataSource.setUrl("jdbc:mock:"); @@ -50,7 +47,6 @@ public void test_0() throws Exception { final CountDownLatch completeLatch = new CountDownLatch(1); final AtomicInteger waitCount = new AtomicInteger(); Thread t = new Thread() { - public void run() { try { startLatch.countDown(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case1.java b/src/test/java/com/alibaba/druid/bvt/pool/Case1.java index d4b9e82b8a..f62ab5f313 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case1.java @@ -29,7 +29,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class Case1 extends PoolTestCase { - public void test_f() throws Exception { final DruidDataSource dataSource = new DruidDataSource(); dataSource.setTimeBetweenConnectErrorMillis(100); @@ -38,7 +37,6 @@ public void test_f() throws Exception { final long okTime = startTime + 1000 * 1; dataSource.setDriver(new MockDriver() { - @Override public Connection connect(String url, Properties info) throws SQLException { if (System.currentTimeMillis() < okTime) { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java index c6d7e1d853..679f5b2ba0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java @@ -29,13 +29,11 @@ /** * 类Case2.java的实现描述：TODO 类实现描述 - * + * * @author admin 2011-5-4 下午02:45:21 */ public class Case2 extends PoolTestCase { - public void test_singleThread() throws Exception { - Class.forName("com.alibaba.druid.mock.MockDriver"); Properties properties = new Properties(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java index bdc3db8e6c..cbc71345fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java @@ -29,7 +29,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class Case3 extends PoolTestCase { - // public void test_0() throws Exception { // DruidDataSource dataSource = new DruidDataSource(); // dataSource.setUrl("jdbc:mock:xxx"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java index 7bb1de9578..3f2163e747 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class ClosedTest extends PoolTestCase { - public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java index c29147cbb2..6082229153 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.support.logging.Log; public class ConfigErrorTest extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -47,14 +46,14 @@ public void test_connect() throws Exception { Field field = DruidDataSource.class.getDeclaredField("LOG"); field.setAccessible(true); Log LOG = (Log) field.get(null); - + LOG.resetStat(); - + Assert.assertEquals(0, LOG.getErrorCount()); - + Connection conn = dataSource.getConnection(); conn.close(); - + Assert.assertEquals(1, LOG.getErrorCount()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java index fcfd3fcb18..5c729406cc 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.support.logging.Log; public class ConfigErrorTest2 extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -49,14 +48,14 @@ public void test_connect() throws Exception { Field field = DruidDataSource.class.getDeclaredField("LOG"); field.setAccessible(true); Log LOG = (Log) field.get(null); - + LOG.resetStat(); - + Assert.assertEquals(0, LOG.getErrorCount()); Connection conn = dataSource.getConnection(); conn.close(); - + Assert.assertEquals(1, LOG.getErrorCount()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest3.java index d34088acc5..8ace6b8a88 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest3.java @@ -26,7 +26,6 @@ import com.alibaba.druid.support.logging.Log; public class ConfigErrorTest3 extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -51,9 +50,9 @@ public void test_connect() throws Exception { Field field = DruidDataSource.class.getDeclaredField("LOG"); field.setAccessible(true); Log LOG = (Log) field.get(null); - + LOG.resetStat(); - + Assert.assertEquals(0, LOG.getErrorCount()); dataSource.init(); Assert.assertEquals(0, LOG.getErrorCount()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java index 589010c75e..58ac763a2a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java @@ -25,7 +25,6 @@ import com.alibaba.druid.support.logging.Log; public class ConfigErrorTestMysql extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest.java b/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest.java index 905c1b7ccd..db607c35d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest.java @@ -12,8 +12,7 @@ import com.alibaba.druid.pool.DruidDataSource; public class CreateSchedulerTest extends PoolTestCase { - - private DruidDataSource dataSource; + private DruidDataSource dataSource; private ScheduledExecutorService createScheduler; protected void setUp() throws Exception { @@ -40,11 +39,11 @@ public void test_connectAndClose() throws Exception { for (int i = 0; i < connections.length; ++i) { connections[i] = dataSource.getConnection(); } - + for (int i = 0; i < connections.length; ++i) { connections[i].close(); } - + Thread.sleep(100); Assert.assertEquals(0, dataSource.getPoolingCount()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest_directCreate.java b/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest_directCreate.java index e35ae11330..4b02e1b67c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest_directCreate.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest_directCreate.java @@ -15,8 +15,7 @@ import java.util.concurrent.ScheduledExecutorService; public class CreateSchedulerTest_directCreate extends PoolTestCase { - - private DruidDataSource[] dataSources; + private DruidDataSource[] dataSources; private ScheduledExecutorService createScheduler; private ScheduledExecutorService destroyScheduler; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java index da2ca77026..5b0211019e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java @@ -11,12 +11,12 @@ public void test_0() throws Exception { DataSourceDisableException ex = new DataSourceDisableException(); Assert.assertEquals(null, ex.getMessage()); } - + public void test_1() throws Exception { DataSourceDisableException ex = new DataSourceDisableException("XXX"); Assert.assertEquals("XXX", ex.getMessage()); } - + public void test_2() throws Exception { DataSourceDisableException ex = new DataSourceDisableException(new IllegalStateException()); Assert.assertTrue(ex.getCause() instanceof IllegalStateException); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DestorySchedulerTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DestorySchedulerTest.java index a0319158c9..8c62b31400 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DestorySchedulerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DestorySchedulerTest.java @@ -12,8 +12,7 @@ import com.alibaba.druid.pool.DruidDataSource; public class DestorySchedulerTest extends PoolTestCase { - - private DruidDataSource dataSource; + private DruidDataSource dataSource; private ScheduledExecutorService destroyScheduler; protected void setUp() throws Exception { @@ -40,11 +39,11 @@ public void test_connectAndClose() throws Exception { for (int i = 0; i < connections.length; ++i) { connections[i] = dataSource.getConnection(); } - + for (int i = 0; i < connections.length; ++i) { connections[i].close(); } - + Thread.sleep(100); Assert.assertEquals(0, dataSource.getPoolingCount()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest.java index 5a1efedf76..10a4adf884 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest.java @@ -11,7 +11,6 @@ import java.sql.SQLException; public class DruidConnectionHolderTest extends PoolTestCase { - Driver driver; private DruidDataSource dataSource; @@ -30,7 +29,6 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(false); dataSource.setInitialSize(1); dataSource.getProxyFilters().add(new FilterAdapter() { - public int connection_getTransactionIsolation(FilterChain chain, ConnectionProxy connection) throws SQLException { throw createSyntaxException(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java index d4e12c942a..2c52108e34 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java @@ -13,7 +13,6 @@ import com.alibaba.druid.proxy.jdbc.ConnectionProxy; public class DruidConnectionHolderTest2 extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -24,9 +23,8 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(false); dataSource.setPoolPreparedStatements(true); dataSource.getProxyFilters().add(new FilterAdapter() { - public int connection_getTransactionIsolation(FilterChain chain, ConnectionProxy connection) - throws SQLException { + throws SQLException { throw new SQLException(); } }); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java index d51c85cb15..869c3975ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java @@ -13,7 +13,6 @@ import com.alibaba.druid.proxy.jdbc.ConnectionProxy; public class DruidConnectionHolderTest3 extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -24,9 +23,8 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(false); dataSource.setInitialSize(1); dataSource.getProxyFilters().add(new FilterAdapter() { - public int connection_getTransactionIsolation(FilterChain chain, ConnectionProxy connection) - throws SQLException { + throws SQLException { throw new MySQLException(); } }); @@ -62,6 +60,5 @@ public void test_mysqlSyntaxError() throws Exception { } public static class MySQLException extends SQLException { - } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java index 4b761f3cd5..ca10d87a99 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java @@ -13,7 +13,6 @@ import com.alibaba.druid.pool.DruidPooledConnection; public class DruidConnectionHolderTest4 extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -56,9 +55,9 @@ public void test_toString() throws Exception { stmt.close(); conn.close(); - + Assert.assertEquals(1, holder.getStatementPool().size()); - + holder.toString(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceC3P0AdapterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceC3P0AdapterTest.java index 7fe99182f1..1a9572be76 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceC3P0AdapterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceC3P0AdapterTest.java @@ -11,7 +11,6 @@ import com.alibaba.druid.pool.DruidDataSourceC3P0Adapter; public class DruidDataSourceC3P0AdapterTest extends TestCase { - private DruidDataSourceC3P0Adapter dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceConverterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceConverterTest.java index 11934b982c..f84dba4568 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceConverterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceConverterTest.java @@ -11,40 +11,39 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidDataSourceConverterTest extends TestCase { - - private DruidDataSource dataSource; - - protected void setUp() throws Exception { - String osName = System.getProperty("os.name"); - - String root = DruidDataSourceConverterTest.class - .getResource("/com/alibaba/druid/pool/simplejndi/").toString(); - if (root.startsWith("file:/")) { - root = root.substring("file://".length() - 1); - } - - if (osName.toLowerCase().indexOf("win") == -1) { - root = "/" + root; - } - Properties props = new Properties(); - props.put("org.osjava.sj.root", root); - props.put("java.naming.factory.initial", - "org.osjava.sj.SimpleContextFactory"); - props.put("org.osjava.sj.delimiter", "/"); - javax.naming.Context ctx = new SimpleContext(props); - dataSource = (DruidDataSource) ctx.lookup("jdbc/druidTest"); - dataSource.init(); - } - - protected void tearDown() throws Exception { - dataSource.close(); - } - - public void test_conn() throws Exception { - Assert.assertEquals(true, dataSource.isInited()); - Connection conn = dataSource.getConnection(); - Assert.assertEquals(1, dataSource.getActiveCount()); - conn.close(); - Assert.assertEquals(0, dataSource.getActiveCount()); - } + private DruidDataSource dataSource; + + protected void setUp() throws Exception { + String osName = System.getProperty("os.name"); + + String root = DruidDataSourceConverterTest.class + .getResource("/com/alibaba/druid/pool/simplejndi/").toString(); + if (root.startsWith("file:/")) { + root = root.substring("file://".length() - 1); + } + + if (osName.toLowerCase().indexOf("win") == -1) { + root = "/" + root; + } + Properties props = new Properties(); + props.put("org.osjava.sj.root", root); + props.put("java.naming.factory.initial", + "org.osjava.sj.SimpleContextFactory"); + props.put("org.osjava.sj.delimiter", "/"); + javax.naming.Context ctx = new SimpleContext(props); + dataSource = (DruidDataSource) ctx.lookup("jdbc/druidTest"); + dataSource.init(); + } + + protected void tearDown() throws Exception { + dataSource.close(); + } + + public void test_conn() throws Exception { + Assert.assertEquals(true, dataSource.isInited()); + Connection conn = dataSource.getConnection(); + Assert.assertEquals(1, dataSource.getActiveCount()); + conn.close(); + Assert.assertEquals(0, dataSource.getActiveCount()); + } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceDecryptTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceDecryptTest.java index 3db3d4f6aa..c33f73eb5a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceDecryptTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceDecryptTest.java @@ -12,7 +12,6 @@ * @author Jonas Yang */ public class DruidDataSourceDecryptTest { - @Test public void testDecrypt() throws SQLException { DruidDataSource dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest.java index 744067c0c0..1b07423c57 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest.java @@ -30,9 +30,8 @@ import com.alibaba.druid.util.JdbcUtils; public class DruidDataSourceFactoryTest extends TestCase { - private DruidDataSource dataSource; - + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest0.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest0.java index f3a365dadc..f5b3417a7e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest0.java @@ -7,12 +7,11 @@ import com.alibaba.druid.pool.DruidDataSourceFactory; public class DruidDataSourceFactoryTest0 extends TestCase { - public void test_factory_null() throws Exception { DruidDataSourceFactory factory = new DruidDataSourceFactory(); Assert.assertNull(factory.getObjectInstance(null, null, null, null)); } - + public void test_factory_null_1() throws Exception { DruidDataSourceFactory factory = new DruidDataSourceFactory(); Assert.assertNull(factory.getObjectInstance(new Object(), null, null, null)); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java index 82e4f56239..daa990c9b5 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java @@ -11,7 +11,6 @@ import com.alibaba.druid.util.JdbcUtils; public class DruidDataSourceFactoryTest1 extends TestCase { - public void test_NONE() throws Exception { Properties properties = new Properties(); properties.put(DruidDataSourceFactory.PROP_URL, "jdbc:mock:xxx"); @@ -42,7 +41,7 @@ public void test_READ_COMMITTED() throws Exception { Assert.assertEquals("jdbc:mock:xxx", dataSource.getUrl()); Assert.assertEquals(Connection.TRANSACTION_READ_COMMITTED, - dataSource.getDefaultTransactionIsolation().intValue()); + dataSource.getDefaultTransactionIsolation().intValue()); } finally { JdbcUtils.close(dataSource); @@ -61,7 +60,7 @@ public void test_READ_UNCOMMITTED() throws Exception { Assert.assertEquals("jdbc:mock:xxx", dataSource.getUrl()); Assert.assertEquals(Connection.TRANSACTION_READ_UNCOMMITTED, - dataSource.getDefaultTransactionIsolation().intValue()); + dataSource.getDefaultTransactionIsolation().intValue()); } finally { JdbcUtils.close(dataSource); @@ -80,7 +79,7 @@ public void test_REPEATABLE_READ() throws Exception { Assert.assertEquals("jdbc:mock:xxx", dataSource.getUrl()); Assert.assertEquals(Connection.TRANSACTION_REPEATABLE_READ, - dataSource.getDefaultTransactionIsolation().intValue()); + dataSource.getDefaultTransactionIsolation().intValue()); } finally { JdbcUtils.close(dataSource); @@ -99,7 +98,7 @@ public void test_SERIALIZABLE() throws Exception { Assert.assertEquals("jdbc:mock:xxx", dataSource.getUrl()); Assert.assertEquals(Connection.TRANSACTION_SERIALIZABLE, - dataSource.getDefaultTransactionIsolation().intValue()); + dataSource.getDefaultTransactionIsolation().intValue()); } finally { JdbcUtils.close(dataSource); @@ -128,7 +127,7 @@ public void test_integer() throws Exception { Properties properties = new Properties(); properties.put(DruidDataSourceFactory.PROP_URL, "jdbc:mock:xxx"); properties.put(DruidDataSourceFactory.PROP_DEFAULTTRANSACTIONISOLATION, - Integer.toString(Connection.TRANSACTION_SERIALIZABLE)); + Integer.toString(Connection.TRANSACTION_SERIALIZABLE)); DruidDataSource dataSource = null; @@ -137,7 +136,7 @@ public void test_integer() throws Exception { Assert.assertEquals("jdbc:mock:xxx", dataSource.getUrl()); Assert.assertEquals(Connection.TRANSACTION_SERIALIZABLE, - dataSource.getDefaultTransactionIsolation().intValue()); + dataSource.getDefaultTransactionIsolation().intValue()); } finally { JdbcUtils.close(dataSource); @@ -164,7 +163,7 @@ public void test_init() throws Exception { public void test_getObjectInstance() throws Exception { Assert.assertNull(new DruidDataSourceFactory().getObjectInstance(null, null, null, null)); } - + public void test_getObjectInstance_1() throws Exception { Assert.assertNull(new DruidDataSourceFactory().getObjectInstance(new Object(), null, null, null)); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest2.java index b9f23f5e36..9c511c7c32 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest2.java @@ -11,7 +11,6 @@ import com.alibaba.druid.util.JdbcUtils; public class DruidDataSourceFactoryTest2 extends TestCase { - private DruidDataSource dataSource; protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java index f53fab33ec..2e5032dfbc 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.JdbcStatManager; public class DruidDataSourceFilterTest extends TestCase { - protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); } @@ -36,7 +35,7 @@ protected void tearDown() throws Exception { } public void test_filter() throws Exception { - System.out.println(System.nanoTime()/(1000 * 1000)); + System.out.println(System.nanoTime() / (1000 * 1000)); DruidDataSource dataSource = new DruidDataSource(); Assert.assertEquals(0, dataSource.getProxyFilters().size()); @@ -57,9 +56,9 @@ public void test_filter_3() throws Exception { dataSource.setFilters("stat"); JdbcStatManager.getInstance().reset(); - + dataSource.init(); - JdbcDataSourceStat dataSourceStat =dataSource.getDataSourceStat(); + JdbcDataSourceStat dataSourceStat = dataSource.getDataSourceStat(); // Assert.assertEquals(1, JdbcStatManager.getInstance().getDataSources().size()); // JdbcDataSourceStat dataSourceStat = JdbcStatManager.getInstance().getDataSources().values().iterator().next(); @@ -76,7 +75,7 @@ public void test_filter_3() throws Exception { Assert.assertEquals(1, dataSourceStat.getConnectionStat().getConnectCount()); Assert.assertEquals(0, dataSourceStat.getConnectionStat().getCloseCount()); // logic - // close不会导致计数器＋1 + // close不会导致计数器＋1 } Assert.assertEquals(1, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest.java index 1b88de63e9..0a6d916d93 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest.java @@ -10,7 +10,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidDataSourceTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest1.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest1.java index 5fa4663f30..ec623480aa 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest1.java @@ -10,7 +10,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidDataSourceTest1 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -36,45 +35,45 @@ public void test_oracle() throws Exception { } Assert.assertNotNull(error); } - + public void test_transactionQueryTimeout() throws Exception { dataSource.setTransactionQueryTimeout(123456); - + Assert.assertEquals(123456, dataSource.getTransactionQueryTimeout()); } - + public void test_dupCloseLogEnable() throws Exception { Assert.assertFalse(dataSource.isDupCloseLogEnable()); - + dataSource.setDupCloseLogEnable(true); - + Assert.assertTrue(dataSource.isDupCloseLogEnable()); } - + public void test_getClosedPreparedStatementCount() throws Exception { Assert.assertEquals(0, dataSource.getClosedPreparedStatementCount()); Assert.assertEquals(0, dataSource.getPreparedStatementCount()); - + Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("select 1"); stmt.close(); - + Assert.assertEquals(1, dataSource.getPreparedStatementCount()); Assert.assertEquals(1, dataSource.getClosedPreparedStatementCount()); } - + public void test_getDriverMajorVersion() throws Exception { Assert.assertEquals(-1, dataSource.getDriverMajorVersion()); dataSource.init(); Assert.assertEquals(0, dataSource.getDriverMajorVersion()); } - + public void test_getDriverMinorVersion() throws Exception { Assert.assertEquals(-1, dataSource.getDriverMinorVersion()); dataSource.init(); Assert.assertEquals(0, dataSource.getDriverMinorVersion()); } - + public void test_getExceptionSorterClassName() throws Exception { Assert.assertNull(dataSource.getExceptionSorterClassName()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest2.java index 7b02888064..3fd42dfd35 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest2.java @@ -7,11 +7,10 @@ /** * 这个场景测试minIdle > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest3.java index a69f3d44a5..4c3967f75d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest3.java @@ -15,12 +15,11 @@ /** * 这个场景测试并发初始化 - * @author wenshao [szujobs@hotmail.com] * + * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest3 extends TestCase { - - private DruidDataSource dataSource; + private DruidDataSource dataSource; private volatile Exception error; private volatile Exception errorB; @@ -31,7 +30,6 @@ protected void setUp() throws Exception { dataSource.setInitialSize(1); dataSource.getProxyFilters().add(new FilterAdapter() { - public ConnectionProxy connection_connect(FilterChain chain, Properties info) throws SQLException { try { Thread.sleep(Long.MAX_VALUE); @@ -53,7 +51,6 @@ public void test_error() throws Exception { final CountDownLatch endLatch = new CountDownLatch(1); Thread threadA = new Thread("A") { - public void run() { try { startedLatch.countDown(); @@ -76,7 +73,6 @@ public void run() { final CountDownLatch startedLatchB = new CountDownLatch(1); final CountDownLatch endLatchB = new CountDownLatch(1); Thread threadB = new Thread("B") { - public void run() { try { startedLatchB.countDown(); @@ -93,7 +89,7 @@ public void run() { threadB.interrupt(); endLatchB.await(); - + Assert.assertNotNull(errorB); Assert.assertTrue(errorB.getCause() instanceof InterruptedException); @@ -102,7 +98,7 @@ public void run() { endLatch.await(); endLatchB.await(); Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getCreateErrorCount()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest4.java index 6cf507a5b7..553f83bdcf 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest4.java @@ -12,7 +12,6 @@ import com.alibaba.druid.pool.vendor.MySqlValidConnectionChecker; public class DruidDataSourceTest4 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -81,7 +80,7 @@ public void test_setExceptionSorter_error2() throws Exception { } Assert.assertNotNull(error); } - + public void test_getParentLogger() throws Exception { Exception error = null; try { @@ -93,7 +92,6 @@ public void test_getParentLogger() throws Exception { } private class MyExceptionSorter implements ExceptionSorter { - @Override public boolean isExceptionFatal(SQLException e) { return false; @@ -102,7 +100,7 @@ public boolean isExceptionFatal(SQLException e) { @Override public void configFromProperties(Properties properties) { // TODO Auto-generated method stub - + } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest5.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest5.java index 6e2d4383f0..7751d3b496 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest5.java @@ -12,21 +12,19 @@ import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; public class DruidDataSourceTest5 extends TestCase { - - private DruidDataSource dataSource; + private DruidDataSource dataSource; private final AtomicBoolean validate = new AtomicBoolean(true); protected void setUp() throws Exception { validate.set(true); - + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); dataSource.setInitialSize(1); dataSource.setValidConnectionChecker(new ValidConnectionCheckerAdapter() { - @Override public boolean isValidConnection(Connection c, String query, int validationQueryTimeout) { return validate.get(); @@ -67,14 +65,14 @@ public void testValidate_1() throws Exception { Assert.assertNotNull(error); validate.set(true); - + Connection conn = dataSource.getConnection(); conn.close(); } - + public void testValidate_3() throws Exception { validate.set(false); - + Exception error = null; try { dataSource.init(); @@ -82,9 +80,9 @@ public void testValidate_3() throws Exception { error = e; } Assert.assertNotNull(error); - + validate.set(true); - + Connection conn = dataSource.getConnection(); conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest6.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest6.java index dfc32456f0..bb1caef75f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest6.java @@ -21,10 +21,9 @@ import com.alibaba.druid.util.DruidPasswordCallback; public class DruidDataSourceTest6 extends TestCase { + private DruidDataSource dataSource; - private DruidDataSource dataSource; - - private final AtomicInteger errorCount = new AtomicInteger(); + private final AtomicInteger errorCount = new AtomicInteger(); private final AtomicInteger returnEmptyCount = new AtomicInteger(); protected void setUp() throws Exception { @@ -37,11 +36,10 @@ protected void setUp() throws Exception { dataSource.setValidationQuery("select 1"); dataSource.setValidationQueryTimeout(10); dataSource.setQueryTimeout(100); - + dataSource.setUserCallback(new NameCallback("xx") { - }); - + dataSource.setPasswordCallback(new DruidPasswordCallback() { @Override public char[] getPassword() { @@ -50,9 +48,8 @@ public char[] getPassword() { }); dataSource.getProxyFilters().add(new FilterAdapter() { - public ResultSetProxy statement_executeQuery(FilterChain chain, StatementProxy statement, String sql) - throws SQLException { + throws SQLException { if (errorCount.get() > 0) { errorCount.decrementAndGet(); throw new RuntimeException(); @@ -94,19 +91,19 @@ public void testValidate() throws Exception { Connection conn = dataSource.getConnection(); conn.close(); } - + { errorCount.set(1); Connection conn = dataSource.getConnection(); conn.close(); } - + Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); Assert.assertEquals(100, stmt.getQueryTimeout()); stmt.close(); - + conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest7.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest7.java index 293acbbbdf..0ed14e15c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest7.java @@ -13,7 +13,6 @@ import com.alibaba.druid.proxy.jdbc.ConnectionProxy; public class DruidDataSourceTest7 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -21,7 +20,6 @@ protected void setUp() throws Exception { dataSource.setUrl("jdbc:mock:xxx"); dataSource.setInitialSize(1); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public ConnectionProxy connection_connect(FilterChain chain, Properties info) throws SQLException { throw new RuntimeException(); @@ -43,7 +41,7 @@ public void testInitError() throws Exception { } Assert.assertNotNull(error); Assert.assertTrue(dataSource.getCreateErrorCount() > 0); - + dataSource.getCompositeData(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java index 520f8395a0..428b90623b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java @@ -13,7 +13,6 @@ import com.alibaba.druid.proxy.jdbc.ConnectionProxy; public class DruidDataSourceTest8 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -21,7 +20,6 @@ protected void setUp() throws Exception { dataSource.setUrl("jdbc:mock:xxx"); dataSource.setInitialSize(1); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public ConnectionProxy connection_connect(FilterChain chain, Properties info) throws SQLException { throw new Error(); @@ -43,7 +41,7 @@ public void testInitError() throws Exception { } Assert.assertNotNull(error); Assert.assertTrue(dataSource.getCreateErrorCount() > 0); - + dataSource.getCompositeData(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java index 105130e4d8..93ee9ce4a4 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java @@ -13,7 +13,6 @@ import java.util.Properties; public class DruidDataSourceTest9_phyMaxUseCount extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -46,7 +45,7 @@ public void test_for_phyMaxUseCount() throws Exception { DruidPooledConnection conn = dataSource.getConnection(); if (i % 10 == 0) { if (conn.getConnection() == phyConn) { - throw new IllegalStateException(); + throw new IllegalStateException(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTestValidConnectionChecker.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTestValidConnectionChecker.java index f6e2eebbfc..b96affec67 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTestValidConnectionChecker.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTestValidConnectionChecker.java @@ -16,7 +16,6 @@ * 如需运行此用例, 请先修改连接信息. */ public class DruidDataSourceTestValidConnectionChecker { - public static void main(String[] args) throws SQLException { DruidDataSource dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit.java index aa5cc96df1..bfe78c280a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit.java @@ -15,11 +15,10 @@ /** * 这个场景测试defaultAutoCommit - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_autocommit extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -44,9 +43,9 @@ protected void tearDown() throws Exception { public void test_autoCommit() throws Exception { Connection conn = dataSource.getConnection(); - + Assert.assertTrue(conn.getAutoCommit()); - + conn.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit2.java index 84c2c07136..45a1db6e63 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit2.java @@ -15,11 +15,10 @@ /** * 这个场景测试defaultAutoCommit - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_autocommit2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -44,9 +43,9 @@ protected void tearDown() throws Exception { public void test_autoCommit() throws Exception { Connection conn = dataSource.getConnection(); - + Assert.assertFalse(conn.getAutoCommit()); - + conn.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit3.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit3.java index b0fc5b866d..70390f3ddc 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit3.java @@ -15,11 +15,10 @@ /** * 这个场景测试defaultAutoCommit - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_autocommit3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -44,9 +43,9 @@ protected void tearDown() throws Exception { public void test_autoCommit() throws Exception { Connection conn = dataSource.getConnection(); - + Assert.assertFalse(conn.getAutoCommit()); - + conn.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit4.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit4.java index aea782f8a5..a6bef0b85a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit4.java @@ -15,11 +15,10 @@ /** * 这个场景测试defaultAutoCommit - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_autocommit4 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -44,9 +43,9 @@ protected void tearDown() throws Exception { public void test_autoCommit() throws Exception { Connection conn = dataSource.getConnection(); - + Assert.assertTrue(conn.getAutoCommit()); - + conn.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_clearCache.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_clearCache.java index ca705cd484..d272532972 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_clearCache.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_clearCache.java @@ -10,11 +10,10 @@ /** * 这个场景测试minIdle > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_clearCache extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -42,9 +41,9 @@ public void test_clearStatementCache() throws Exception { conn.close(); } Assert.assertEquals(2, dataSource.getCachedPreparedStatementCount()); - + dataSource.clearStatementCache(); - + Assert.assertEquals(0, dataSource.getCachedPreparedStatementCount()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_closeError.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_closeError.java index 5e6a977afb..8be5beb52b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_closeError.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_closeError.java @@ -11,11 +11,10 @@ /** * 这个场景测试initialSize > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_closeError extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -24,7 +23,6 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(false); dataSource.setInitialSize(1); dataSource.getProxyFilters().add(new FilterAdapter() { - public void connection_close(FilterChain chain, ConnectionProxy connection) throws SQLException { throw new SQLException(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_createError.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_createError.java index 11e0a32b43..70af7ccf07 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_createError.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_createError.java @@ -14,11 +14,10 @@ /** * 这个场景测试createError - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_createError extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -28,7 +27,6 @@ protected void setUp() throws Exception { dataSource.setDefaultAutoCommit(true); dataSource.setInitialSize(1); dataSource.getProxyFilters().add(new FilterAdapter() { - public ConnectionProxy connection_connect(FilterChain chain, Properties info) throws SQLException { throw new SQLException(); } @@ -47,7 +45,7 @@ public void test_error() throws Exception { } catch (Exception e) { error = e; } - + Assert.assertNotNull(error); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_enable.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_enable.java index 76f4cb85dc..3b123715a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_enable.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_enable.java @@ -10,11 +10,10 @@ /** * 这个场景测试minIdle > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_enable extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -50,12 +49,12 @@ public void test_disable() throws Exception { } Assert.assertNotNull(error); } - + public void test_disable_() throws Exception { dataSource.setEnable(false); - + Assert.assertFalse(dataSource.isEnable()); - + Exception error = null; try { Connection conn = dataSource.getConnection(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter.java index 5ae6f4bb68..dcae345596 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter.java @@ -17,11 +17,10 @@ /** * 这个场景测试defaultAutoCommit - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_exceptionSorter extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -30,13 +29,11 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(false); dataSource.setRemoveAbandoned(true); dataSource.setDriver(new MockDriver() { - public ResultSet executeQuery(MockStatementBase stmt, String sql) throws SQLException { throw new SQLException(); } }); dataSource.setExceptionSorter(new ExceptionSorter() { - @Override public boolean isExceptionFatal(SQLException e) { return true; @@ -44,7 +41,6 @@ public boolean isExceptionFatal(SQLException e) { @Override public void configFromProperties(Properties properties) { - } }); @@ -62,7 +58,6 @@ public void test_event_error() throws Exception { try { stmt.executeQuery(); } catch (SQLException e) { - } conn.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter_extend.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter_extend.java index 2d53858eba..704fdcfccf 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter_extend.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter_extend.java @@ -16,13 +16,11 @@ /** * 这个场景测试exceptionSorter_extend - * + * * @author xiaoying [caohongxi001@gmail.com] */ public class DruidDataSourceTest_exceptionSorter_extend extends TestCase { - - public static class SubDriver extends com.mysql.jdbc.Driver{ - + public static class SubDriver extends com.mysql.jdbc.Driver { /** * Construct a new driver and register it with DriverManager * @@ -31,8 +29,8 @@ public static class SubDriver extends com.mysql.jdbc.Driver{ public SubDriver() throws SQLException { } } - public static class SubDriver1 implements java.sql.Driver{ + public static class SubDriver1 implements java.sql.Driver { /** * Construct a new driver and register it with DriverManager * @@ -79,6 +77,7 @@ public Logger getParentLogger() throws SQLFeatureNotSupportedException { /** * 测试继承自com.mysql.jdbc.Driver的子类可以设置sorter + * * @throws Exception */ public void testExceptionSorter() throws Exception { @@ -95,6 +94,7 @@ public void testExceptionSorter() throws Exception { /** * 测试实现自java.sql.Driver的类未设置sorter + * * @throws Exception */ public void testExceptionSorterNull() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill.java index 724ae1a656..ffafccaa14 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill.java @@ -7,10 +7,9 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidDataSourceTest_fill extends TestCase { - private DruidDataSource dataSource; - private int maxActive = 10; + private int maxActive = 10; protected void setUp() throws Exception { dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill2.java index d7cfbaff58..41fe0bfb71 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill2.java @@ -12,10 +12,9 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidDataSourceTest_fill2 extends TestCase { - private DruidDataSource dataSource; - private int maxActive = 100; + private int maxActive = 100; protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -37,7 +36,6 @@ public void test_fill() throws Exception { Thread[] threads = new Thread[THREAD_COUNT]; for (int i = 0; i < THREAD_COUNT; ++i) { threads[i] = new Thread("thread-" + i) { - public void run() { startLatch.countDown(); try { @@ -60,7 +58,6 @@ public void run() { final AtomicLong fillErrorCount = new AtomicLong(); final AtomicLong fillCount = new AtomicLong(); Thread fillThread = new Thread() { - public void run() { try { int count = dataSource.fill(); @@ -73,7 +70,7 @@ public void run() { } }; fillThread.start(); - + fillLatch.await(1000, TimeUnit.MILLISECONDS); Assert.assertEquals(0, fillErrorCount.get()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection.java index 072d3b9cfe..5c3d30b39a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection.java @@ -10,11 +10,10 @@ /** * 这个场景测试defaultAutoCommit - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_getConnection extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection_2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection_2.java index eeb8b09484..c7890a36b8 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection_2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection_2.java @@ -8,11 +8,10 @@ /** * 这个场景测试defaultAutoCommit - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_getConnection_2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPooledConnection.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPooledConnection.java index c4fdc145fa..3d6be806cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPooledConnection.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPooledConnection.java @@ -20,11 +20,10 @@ /** * 这个场景测试defaultAutoCommit - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_getPooledConnection extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -33,7 +32,6 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(false); dataSource.setRemoveAbandoned(true); dataSource.setDriver(new MockDriver() { - public ResultSet executeQuery(MockStatementBase stmt, String sql) throws SQLException { throw new SQLException(); } @@ -65,7 +63,6 @@ public void test_event_error() throws Exception { final AtomicInteger errorCount = new AtomicInteger(); conn.addConnectionEventListener(new ConnectionEventListener() { - @Override public void connectionErrorOccurred(ConnectionEvent event) { errorCount.incrementAndGet(); @@ -73,7 +70,6 @@ public void connectionErrorOccurred(ConnectionEvent event) { @Override public void connectionClosed(ConnectionEvent event) { - } }); @@ -81,9 +77,8 @@ public void connectionClosed(ConnectionEvent event) { try { stmt.executeQuery(); } catch (SQLException e) { - } - + Assert.assertEquals(1, errorCount.get()); conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPoolingPeakTime.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPoolingPeakTime.java index b7b09fe74b..809eeca33e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPoolingPeakTime.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPoolingPeakTime.java @@ -9,11 +9,10 @@ /** * 这个场景测试initialSize > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_getPoolingPeakTime extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -30,10 +29,10 @@ protected void tearDown() throws Exception { public void test_error() throws Exception { Assert.assertNull(dataSource.getPoolingPeakTime()); Assert.assertNull(dataSource.getActivePeakTime()); - + Connection conn = dataSource.getConnection(); conn.close(); - + Assert.assertNotNull(dataSource.getPoolingPeakTime()); Assert.assertNotNull(dataSource.getActivePeakTime()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getProperties.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getProperties.java index a3c40c6726..da762471d7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getProperties.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getProperties.java @@ -7,11 +7,10 @@ /** * 这个场景测试initialSize > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_getProperties extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql.java index 7f3a4f0837..96d0f4ba12 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql.java @@ -12,7 +12,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidDataSourceTest_initSql extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql_factory.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql_factory.java index ca2146896a..45f3d71b9c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql_factory.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql_factory.java @@ -12,7 +12,6 @@ import com.alibaba.druid.pool.DruidDataSourceFactory; public class DruidDataSourceTest_initSql_factory extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSqls.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSqls.java index f735d2730a..781b9fb856 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSqls.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSqls.java @@ -9,7 +9,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidDataSourceTest_initSqls extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -20,18 +19,18 @@ protected void setUp() throws Exception { dataSource.setDefaultTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE); dataSource.setDefaultCatalog("c123"); } - + protected void tearDown() throws Exception { dataSource.close(); } public void testDefault() throws Exception { Connection conn = dataSource.getConnection(); - + Assert.assertEquals(true, conn.isReadOnly()); Assert.assertEquals(Connection.TRANSACTION_SERIALIZABLE, conn.getTransactionIsolation()); Assert.assertEquals("c123", conn.getCatalog()); - + conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt.java index 5da08102fb..4eeb757eac 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt.java @@ -9,12 +9,10 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidDataSourceTest_interrupt extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { dataSource = new DruidDataSource() { - protected void createAndStartCreatorThread() { return; } @@ -35,7 +33,6 @@ public void test_autoCommit() throws Exception { final CountDownLatch endLatch = new CountDownLatch(1); final AtomicInteger errorCount = new AtomicInteger(); Thread thread = new Thread() { - public void run() { try { startLatch.countDown(); @@ -49,15 +46,15 @@ public void run() { }; thread.setDaemon(true); thread.start(); - + startLatch.await(); - + Thread.sleep(10); - + Assert.assertEquals(0, errorCount.get()); - + thread.interrupt(); - + endLatch.await(); Assert.assertEquals(1, errorCount.get()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt2.java index 6bcdbc12eb..1dd8a56a8b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt2.java @@ -12,7 +12,6 @@ public class DruidDataSourceTest_interrupt2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -33,15 +32,14 @@ public void test_autoCommit() throws Exception { Connection conn = dataSource.getConnection(); conn.close(); } - + dataSource.getLock().lock(); - + try { final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(1); final AtomicInteger errorCount = new AtomicInteger(); Thread thread = new Thread() { - public void run() { try { startLatch.countDown(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt3.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt3.java index b133e6225d..d09e204d6a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt3.java @@ -11,7 +11,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidDataSourceTest_interrupt3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -39,7 +38,6 @@ public void test_autoCommit() throws Exception { final CountDownLatch endLatch = new CountDownLatch(1); final AtomicInteger errorCount = new AtomicInteger(); Thread thread = new Thread() { - public void run() { try { startLatch.countDown(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastCreateError.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastCreateError.java index d50532da10..8a95f8c332 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastCreateError.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastCreateError.java @@ -14,11 +14,10 @@ /** * 这个场景测试minIdle > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_lastCreateError extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -27,7 +26,6 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - public ConnectionProxy connection_connect(FilterChain chain, Properties info) throws SQLException { throw new SQLException(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastError.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastError.java index b2946821d0..110d6bef49 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastError.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastError.java @@ -14,11 +14,10 @@ /** * 这个场景测试minIdle > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_lastError extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -27,9 +26,8 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - public void connection_setAutoCommit(FilterChain chain, ConnectionProxy connection, boolean autoCommit) - throws SQLException { + throws SQLException { throw new SQLException(); } }); @@ -43,7 +41,7 @@ public void test_error() throws Exception { Assert.assertNull(dataSource.getLastError()); Assert.assertNull(dataSource.getLastErrorTime()); Assert.assertEquals(0, dataSource.getLastErrorTimeMillis()); - + Connection conn = dataSource.getConnection(); Exception error = null; @@ -52,9 +50,9 @@ public void test_error() throws Exception { } catch (Exception e) { error = e; } - + Assert.assertNotNull(error); - + Assert.assertNotNull(dataSource.getLastError()); Assert.assertNotNull(dataSource.getLastErrorTime()); Assert.assertEquals(true, dataSource.getLastErrorTimeMillis() > 0); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_loadSysPropertyFilter.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_loadSysPropertyFilter.java index f27577ef64..fd19cb837e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_loadSysPropertyFilter.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_loadSysPropertyFilter.java @@ -8,11 +8,10 @@ /** * 这个场景测试defaultAutoCommit - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_loadSysPropertyFilter extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -28,8 +27,8 @@ protected void tearDown() throws Exception { } public void test_autoCommit() throws Exception { - dataSource.init(); - - Assert.assertEquals(2, dataSource.getProxyFilters().size()); + dataSource.init(); + + Assert.assertEquals(2, dataSource.getProxyFilters().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive1.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive1.java index 3052be7938..cdcc2f5b94 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive1.java @@ -7,11 +7,10 @@ /** * 这个场景测试initialSize > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_maxActive1 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive2.java index 0ee86761a1..407c97e137 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive2.java @@ -7,11 +7,10 @@ /** * 这个场景测试maxActive < 0 - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_maxActive2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive3.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive3.java index c4eb9a0bdb..b5c65590a4 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive3.java @@ -7,11 +7,10 @@ /** * 这个场景测试initialSize > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_maxActive3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive4.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive4.java index f63614439e..eb33b5cb5f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive4.java @@ -7,11 +7,10 @@ /** * 这个场景测试initialSize > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_maxActive4 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxWait.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxWait.java index c7e14e6b78..a398225b77 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxWait.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxWait.java @@ -11,11 +11,10 @@ /** * 这个场景测试initialSize > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_maxWait extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -39,7 +38,6 @@ public void test_maxWait() throws Exception { final CountDownLatch endLatch = new CountDownLatch(2); Thread t1 = new Thread("t-1") { - public void run() { try { dataSource.getConnection(); @@ -50,9 +48,8 @@ public void run() { } } }; - + Thread t2 = new Thread("t-2") { - public void run() { try { dataSource.getConnection(); @@ -63,15 +60,15 @@ public void run() { } } }; - + t1.start(); t2.start(); - + Thread.sleep(10); t1.interrupt(); - + endLatch.await(); - + Assert.assertEquals(2, errorCount.get()); conn.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java index 49d9d5ce82..664a943e0d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java @@ -11,11 +11,10 @@ /** * 这个场景测试maxActive < 0 - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_notEmptyWait extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -51,7 +50,6 @@ public void test_error() throws Exception { Thread[] threads = new Thread[THREAD_COUNT]; for (int i = 0; i < THREAD_COUNT; ++i) { threads[i] = new Thread("thread-" + i) { - public void run() { startLatch.countDown(); try { @@ -76,14 +74,14 @@ public void run() { } Thread.sleep(10); } - + Assert.assertEquals(10, dataSource.getNotEmptyWaitThreadCount()); Assert.assertEquals(10, dataSource.getNotEmptyWaitThreadPeak()); conn.close(); endLatch.await(100, TimeUnit.MILLISECONDS); - + Thread.sleep(10); // Assert.assertEquals(0, dataSource.getNotEmptyWaitThreadCount()); Assert.assertEquals(10, dataSource.getNotEmptyWaitThreadPeak()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait2.java index 29103f1e35..5810fa3c7e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait2.java @@ -12,7 +12,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidDataSourceTest_notEmptyWait2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -43,7 +42,6 @@ public void test_maxWaitThread() throws Exception { Thread[] threads = new Thread[THREAD_COUNT]; for (int i = 0; i < THREAD_COUNT; ++i) { threads[i] = new Thread("thread-" + i) { - public void run() { startLatch.countDown(); try { @@ -62,7 +60,7 @@ public void run() { } startLatch.await(100, TimeUnit.MILLISECONDS); - + final CountDownLatch errorThreadEndLatch = new CountDownLatch(THREAD_COUNT); final AtomicLong maxWaitErrorCount = new AtomicLong(); Thread errorThread = new Thread() { @@ -79,9 +77,9 @@ public void run() { } }; errorThread.start(); - + errorThreadEndLatch.await(100, TimeUnit.MILLISECONDS); - + Assert.assertEquals(1, maxWaitErrorCount.get()); Assert.assertTrue(dataSource.getNotEmptySignalCount() > 0); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle.java index c36a3342bc..c28d05dd44 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle.java @@ -8,11 +8,10 @@ /** * 这个场景测试minIdle > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_oracle extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -22,7 +21,6 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setDbType("oracle"); dataSource.setDriver(new MockDriver() { - @Override public int getMajorVersion() { return 11; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java index f30cfba530..c9c52dde75 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java @@ -8,11 +8,10 @@ /** * 这个场景测试minIdle > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_oracle2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -23,7 +22,6 @@ protected void setUp() throws Exception { dataSource.setDbType("oracle"); dataSource.setPoolPreparedStatements(true); dataSource.setDriver(new MockDriver() { - @Override public int getMajorVersion() { return 10; @@ -40,18 +38,18 @@ public void test_oracle() throws Exception { dataSource.init(); Assert.assertTrue(dataSource.isOracle()); Assert.assertEquals("true", dataSource.getConnectProperties().get("oracle.jdbc.FreeMemoryOnEnterImplicitCache")); - + dataSource.setUseOracleImplicitCache(false); Assert.assertNull(dataSource.getConnectProperties().get("oracle.jdbc.FreeMemoryOnEnterImplicitCache")); dataSource.setUseOracleImplicitCache(true); dataSource.setUseOracleImplicitCache(true); Assert.assertEquals("true", dataSource.getConnectProperties().get("oracle.jdbc.FreeMemoryOnEnterImplicitCache")); - + dataSource.setUseOracleImplicitCache(false); Assert.assertNull(dataSource.getConnectProperties().get("oracle.jdbc.FreeMemoryOnEnterImplicitCache")); dataSource.setDriver(null); - + dataSource.setUseOracleImplicitCache(true); Assert.assertNull(dataSource.getConnectProperties().get("oracle.jdbc.FreeMemoryOnEnterImplicitCache")); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle3.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle3.java index 440aea4f08..460794e078 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle3.java @@ -8,11 +8,10 @@ /** * 这个场景测试minIdle > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_oracle3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle_error.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle_error.java index 6f02cf8f6e..c6af538689 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle_error.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle_error.java @@ -8,11 +8,10 @@ /** * 这个场景测试minIdle > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_oracle_error extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -22,7 +21,6 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setDbType("oracle"); dataSource.setDriver(new MockDriver() { - @Override public int getMajorVersion() { return 9; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle.java index 85893d1ea3..8a887c6928 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle.java @@ -10,11 +10,10 @@ /** * 这个场景测试initialSize > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_recycle extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -32,10 +31,10 @@ public void test_recycle() throws Exception { DruidPooledConnection conn = dataSource.getConnection(); conn.setAutoCommit(false); conn.setReadOnly(false); - + Statement stmt = conn.createStatement(); stmt.execute("select 1"); - + conn.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle2.java index 470aa28ef6..d97f2a5090 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle2.java @@ -19,11 +19,10 @@ /** * 这个场景测试initialSize > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_recycle2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -31,7 +30,6 @@ protected void setUp() throws Exception { dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); dataSource.getProxyFilters().add(new FilterAdapter() { - public void connection_rollback(FilterChain chain, ConnectionProxy connection) throws SQLException { throw new SQLException(); } @@ -75,7 +73,7 @@ public void test_recycle_error() throws Exception { error = e; } Assert.assertNull(error); - + { Connection conn2 = dataSource.getConnection(); conn2.close(); @@ -93,7 +91,6 @@ public void f_test_recycle_error_interrupt() throws Exception { final CountDownLatch endLatch = new CountDownLatch(1); Thread thread = new Thread() { - public void run() { try { DruidPooledConnection conn = dataSource.getConnection(); @@ -123,7 +120,7 @@ public void run() { dataSource.getLock().lock(); lockLatch.countDown(); - + Thread.sleep(10); thread.interrupt(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnBorrowFailed.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnBorrowFailed.java index 652aacaf2c..98ecf07a69 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnBorrowFailed.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnBorrowFailed.java @@ -14,14 +14,13 @@ /** * 这个场景测试defaultAutoCommit - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_testOnBorrowFailed extends TestCase { - private DruidDataSource dataSource; - private AtomicInteger validCount = new AtomicInteger(); + private AtomicInteger validCount = new AtomicInteger(); protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -29,15 +28,14 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(true); dataSource.setValidationQuery("select 'x'"); dataSource.setValidConnectionChecker(new ValidConnectionCheckerAdapter() { - @Override public boolean isValidConnection(Connection c, String query, int validationQueryTimeout) { int count = validCount.getAndIncrement(); - + if (count == 0) { return true; } - + if (count == 1) { return false; } @@ -54,7 +52,7 @@ protected void tearDown() throws Exception { public void test_conn() throws Exception { PooledConnection conn = dataSource.getPooledConnection(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(2, dataSource.getCreateCount()); Assert.assertEquals(1, dataSource.getDiscardCount()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnWhileIdleFailed.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnWhileIdleFailed.java index 3eb921c32a..61fde4669b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnWhileIdleFailed.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnWhileIdleFailed.java @@ -14,14 +14,13 @@ /** * 这个场景测试defaultAutoCommit - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_testOnWhileIdleFailed extends TestCase { - private DruidDataSource dataSource; - private AtomicInteger validCount = new AtomicInteger(); + private AtomicInteger validCount = new AtomicInteger(); protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -31,7 +30,6 @@ protected void setUp() throws Exception { dataSource.setTimeBetweenEvictionRunsMillis(20); dataSource.setValidationQuery("select 'x'"); dataSource.setValidConnectionChecker(new ValidConnectionCheckerAdapter() { - @Override public boolean isValidConnection(Connection c, String query, int validationQueryTimeout) { int count = validCount.getAndIncrement(); @@ -68,12 +66,12 @@ public void test_conn() throws Exception { Assert.assertEquals(1, dataSource.getCloseCount()); Thread.sleep(21); - + { PooledConnection conn = dataSource.getPooledConnection(); conn.close(); } - + Assert.assertEquals(3, validCount.get()); // createValidate Assert.assertEquals(1, dataSource.getPoolingCount()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_tryGet.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_tryGet.java index d337cec62b..0624fe7c46 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_tryGet.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_tryGet.java @@ -8,7 +8,6 @@ import com.alibaba.druid.pool.DruidPooledConnection; public class DruidDataSourceTest_tryGet extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -30,7 +29,7 @@ public void test_0() throws Exception { DruidPooledConnection conn2 = this.dataSource.tryGetConnection(); Assert.assertNull(conn2); - + conn1.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_wrapDriverFilters.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_wrapDriverFilters.java index 386a452b23..30eb187e3a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_wrapDriverFilters.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_wrapDriverFilters.java @@ -8,16 +8,15 @@ /** * 这个场景测试defaultAutoCommit - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_wrapDriverFilters extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { System.setProperty("druid.filters", "stat,log4j"); - + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); @@ -30,8 +29,8 @@ protected void tearDown() throws Exception { } public void test_autoCommit() throws Exception { - dataSource.init(); - - Assert.assertEquals(2, dataSource.getProxyFilters().size()); + dataSource.init(); + + Assert.assertEquals(2, dataSource.getProxyFilters().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledCallableStatementTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledCallableStatementTest.java index bc829e9e3d..6b2b1ae97d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledCallableStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledCallableStatementTest.java @@ -18,10 +18,9 @@ import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; public class DruidPooledCallableStatementTest extends TestCase { - private DruidDataSource dataSource; - private boolean throwError = true; + private boolean throwError = true; protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -31,11 +30,10 @@ protected void setUp() throws Exception { dataSource.setInitialSize(1); dataSource.getProxyFilters().add(new FilterAdapter() { - public boolean callableStatement_wasNull(FilterChain chain, CallableStatementProxy statement) - throws SQLException { + throws SQLException { if (throwError) { - throw new SQLException(); + throw new SQLException(); } else { return chain.callableStatement_wasNull(statement); } @@ -62,14 +60,14 @@ public void test_wasNull_noerror() throws Exception { Assert.assertEquals(1, dataSource.getPoolingCount()); } - + public void test_wasNull_error() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select 1"); stmt.execute(); - + Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.wasNull(); @@ -77,12 +75,12 @@ public void test_wasNull_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); } @@ -133,7 +131,6 @@ public void test_getObject_1() throws Exception { } public void test_wrap() throws Exception { - Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select 1"); @@ -145,7 +142,6 @@ public void test_wrap() throws Exception { } public void test_wrap_1() throws Exception { - Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select 1"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest.java index 70443076a8..e100cb3767 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest.java @@ -10,7 +10,6 @@ import com.alibaba.druid.pool.DruidPooledConnection; public class DruidPooledConnectionTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -23,63 +22,63 @@ protected void setUp() throws Exception { protected void tearDown() throws Exception { dataSource.close(); } - + public void test_rollback() throws Exception { Connection conn = dataSource.getConnection(); conn.rollback(); - + Savepoint savepoint = conn.setSavepoint("xx"); conn.rollback(savepoint); - + conn.close(); } - + public void test_rollback_1() throws Exception { Connection conn = dataSource.getConnection(); conn.setAutoCommit(false); - + conn.close(); conn.rollback(); conn.rollback(null); } - + public void test_getOwnerThread() throws Exception { DruidPooledConnection conn = (DruidPooledConnection) dataSource.getConnection(); - + Assert.assertEquals(Thread.currentThread(), conn.getOwnerThread()); - + conn.close(); } - + public void test_isDiable() throws Exception { DruidPooledConnection conn = (DruidPooledConnection) dataSource.getConnection(); - + Assert.assertEquals(false, conn.isDisable()); - + conn.close(); - + Assert.assertEquals(true, conn.isDisable()); } - + public void test_dupClose() throws Exception { DruidPooledConnection conn = (DruidPooledConnection) dataSource.getConnection(); - + conn.close(); conn.close(); } - + public void test_disable() throws Exception { Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); - + DruidPooledConnection conn = (DruidPooledConnection) dataSource.getConnection(); conn.disable(); Assert.assertEquals(true, conn.isDisable()); - + Assert.assertEquals(1, dataSource.getActiveCount()); - + conn.close(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest1.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest1.java index 8716878c75..9b2be70dcf 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest1.java @@ -11,7 +11,6 @@ import com.alibaba.druid.pool.DruidPooledPreparedStatement; public class DruidPooledConnectionTest1 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -20,7 +19,7 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(false); dataSource.setFilters("stat"); dataSource.setPoolPreparedStatements(true); - + } protected void tearDown() throws Exception { @@ -39,7 +38,7 @@ public void test_conn() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getRecycleCount()); Assert.assertEquals(1, dataSource.getCloseCount()); Assert.assertEquals(1, dataSource.getPoolingCount()); @@ -58,7 +57,7 @@ public void test_handleException_1() throws Exception { Assert.assertNotNull(error); conn.close(); - + Assert.assertEquals(1, dataSource.getRecycleCount()); Assert.assertEquals(1, dataSource.getCloseCount()); Assert.assertEquals(1, dataSource.getPoolingCount()); @@ -77,7 +76,7 @@ public void test_dup_close() throws Exception { conn.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getRecycleCount()); Assert.assertEquals(1, dataSource.getCloseCount()); Assert.assertEquals(1, dataSource.getPoolingCount()); @@ -89,7 +88,7 @@ public void test_recycle() throws Exception { conn.close(); conn.recycle(); - + Assert.assertEquals(1, dataSource.getRecycleCount()); Assert.assertEquals(1, dataSource.getCloseCount()); Assert.assertEquals(1, dataSource.getPoolingCount()); @@ -102,7 +101,7 @@ public void test_recycle_2() throws Exception { conn.recycle(); conn.recycle(); conn.close(); - + Assert.assertEquals(1, dataSource.getRecycleCount()); Assert.assertEquals(1, dataSource.getCloseCount()); Assert.assertEquals(1, dataSource.getPoolingCount()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest_prepareError.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest_prepareError.java index dfdbc47cb2..b328c11da3 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest_prepareError.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest_prepareError.java @@ -15,7 +15,6 @@ import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; public class DruidPooledConnectionTest_prepareError extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -25,7 +24,6 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setPoolPreparedStatements(true); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql) throws SQLException { @@ -35,7 +33,7 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con @Override public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { throw new SQLException(); } @@ -50,21 +48,21 @@ public PreparedStatementProxy connection_prepareStatement(FilterChain chain, Con public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) - throws SQLException { + throws SQLException { throw new SQLException(); } @Override public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql, int[] columnIndexes) - throws SQLException { + throws SQLException { throw new SQLException(); } @Override public PreparedStatementProxy connection_prepareStatement(FilterChain chain, ConnectionProxy connection, String sql, String[] columnNames) - throws SQLException { + throws SQLException { throw new SQLException(); } @@ -77,7 +75,7 @@ public CallableStatementProxy connection_prepareCall(FilterChain chain, Connecti @Override public CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { throw new SQLException(); } @@ -85,7 +83,7 @@ public CallableStatementProxy connection_prepareCall(FilterChain chain, Connecti public CallableStatementProxy connection_prepareCall(FilterChain chain, ConnectionProxy connection, String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) - throws SQLException { + throws SQLException { throw new SQLException(); } @@ -197,55 +195,55 @@ public void test_prepare_error_5() throws Exception { Assert.assertEquals(1, dataSource.getErrorCount()); } - + public void test_prepareCall_error_1() throws Exception { Connection conn = dataSource.getConnection(); - + Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { conn.prepareCall("select 1"); } catch (Exception e) { error = e; } - + Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); } - + public void test_prepareCall_error_2() throws Exception { Connection conn = dataSource.getConnection(); - + Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { conn.prepareCall("select 1", 0, 0); } catch (Exception e) { error = e; } - + Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); } - + public void test_prepareCall_error_3() throws Exception { Connection conn = dataSource.getConnection(); - + Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { conn.prepareCall("select 1", 0, 0, 0); } catch (Exception e) { error = e; } - + Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest.java index cde9d3ad9b..0d76299093 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest.java @@ -11,7 +11,6 @@ import com.alibaba.druid.pool.DruidPooledPreparedStatement; public class DruidPooledPreparedStatementTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -31,7 +30,7 @@ public void test_hitCount() throws Exception { { Connection conn = dataSource.getConnection(); DruidPooledPreparedStatement stmt = (DruidPooledPreparedStatement) conn.prepareStatement(sql); - + Assert.assertEquals(0, stmt.getFetchSize()); Assert.assertEquals(0, stmt.getFetchDirection()); Assert.assertEquals(0, stmt.getMaxRows()); @@ -44,13 +43,13 @@ public void test_hitCount() throws Exception { stmt.setMaxRows(3); stmt.setMaxFieldSize(4); stmt.setQueryTimeout(5); - + Assert.assertEquals(1, stmt.getFetchSize()); Assert.assertEquals(2, stmt.getFetchDirection()); Assert.assertEquals(3, stmt.getMaxRows()); Assert.assertEquals(4, stmt.getMaxFieldSize()); Assert.assertEquals(5, stmt.getQueryTimeout()); - + stmt.setString(1, "xx"); ResultSet rs = stmt.executeQuery(); Assert.assertTrue(rs.next()); @@ -63,20 +62,20 @@ public void test_hitCount() throws Exception { { Connection conn = dataSource.getConnection(); DruidPooledPreparedStatement stmt = (DruidPooledPreparedStatement) conn.prepareStatement(sql); - + Assert.assertEquals(0, stmt.getFetchSize()); Assert.assertEquals(0, stmt.getFetchDirection()); Assert.assertEquals(0, stmt.getMaxRows()); Assert.assertEquals(0, stmt.getMaxFieldSize()); Assert.assertEquals(0, stmt.getQueryTimeout()); - + stmt.setString(1, "xx"); ResultSet rs = stmt.executeQuery(); Assert.assertTrue(rs.next()); Assert.assertFalse(rs.next()); rs.close(); conn.close(); - + Assert.assertEquals(1, stmt.getHitCount()); Assert.assertNotNull(stmt.getKey()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest1.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest1.java index 58eeb51ae7..903c0a9b2c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest1.java @@ -17,7 +17,6 @@ import com.alibaba.druid.proxy.jdbc.StatementProxy; public class DruidPooledPreparedStatementTest1 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -28,26 +27,25 @@ protected void setUp() throws Exception { dataSource.setInitialSize(1); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public boolean preparedStatement_execute(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { + throws SQLException { throw new SQLException(); } @Override public int preparedStatement_executeUpdate(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { + throws SQLException { throw new SQLException(); } public ResultSetProxy preparedStatement_executeQuery(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { + throws SQLException { throw new SQLException(); } public void preparedStatement_clearParameters(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { + throws SQLException { throw new SQLException(); } @@ -55,10 +53,10 @@ public void preparedStatement_clearParameters(FilterChain chain, PreparedStateme public int[] statement_executeBatch(FilterChain chain, StatementProxy statement) throws SQLException { throw new SQLException(); } - + @Override public ParameterMetaData preparedStatement_getParameterMetaData(FilterChain chain, PreparedStatementProxy statement) - throws SQLException { + throws SQLException { throw new SQLException(); } }); @@ -177,13 +175,13 @@ public void test_executeBatch_error() throws Exception { Assert.assertEquals(1, dataSource.getPoolingCount()); } - + public void test_getParameterMetaData_error() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("select 1"); - + Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.getParameterMetaData(); @@ -191,12 +189,12 @@ public void test_getParameterMetaData_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest.java index a518c71fdc..5b1a9c473f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.pool.DruidPooledResultSet; public class DruidPooledResultSetTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -79,15 +78,15 @@ public void test_notSupport() throws Exception { conn.close(); } - + public void test_notSupport_1() throws Exception { String sql = "select ?"; Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement(sql); stmt.setString(1, "xxx"); DruidPooledResultSet rs = (DruidPooledResultSet) stmt.executeQuery(); - + Exception error = null; try { rs.getObject("1", String.class); @@ -95,39 +94,39 @@ public void test_notSupport_1() throws Exception { error = e; } Assert.assertNotNull(error); - + rs.close(); - + conn.close(); } - + public void test_rowCount() throws Exception { String sql = "select ?"; Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement(sql); stmt.setString(1, "xxx"); DruidPooledResultSet rs = (DruidPooledResultSet) stmt.executeQuery(); - + Assert.assertEquals(true, rs.next()); Assert.assertEquals(false, rs.next()); - + Assert.assertEquals(1, rs.getFetchRowCount()); - + Assert.assertEquals(true, rs.previous()); Assert.assertEquals(false, rs.previous()); - + Assert.assertEquals(1, rs.getFetchRowCount()); - + Assert.assertEquals(true, rs.next()); Assert.assertEquals(false, rs.next()); - + Assert.assertEquals(1, rs.getFetchRowCount()); - + Assert.assertFalse(rs.rowUpdated()); - + rs.close(); - + conn.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest2.java index 763e47d880..922d588d66 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidPooledResultSetTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledStatementTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledStatementTest.java index 8ec964d685..d55a0e733d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledStatementTest.java @@ -18,7 +18,6 @@ import com.alibaba.druid.proxy.jdbc.StatementProxy; public class DruidPooledStatementTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -578,16 +577,16 @@ public void test_getResultSet_error() throws Exception { Assert.assertEquals(0, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getDataSourceStat().getResultSetStat().getOpenCount()); } - + public void test_getUpdateCount_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.getUpdateCount(); @@ -595,25 +594,25 @@ public void test_getUpdateCount_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_getMoreResults_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.getMoreResults(); @@ -621,25 +620,25 @@ public void test_getMoreResults_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_setFetchDirection_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.setFetchDirection(0); @@ -647,25 +646,25 @@ public void test_setFetchDirection_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_getFetchDirection_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.getFetchDirection(); @@ -673,25 +672,25 @@ public void test_getFetchDirection_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_setFetchSize_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.setFetchSize(0); @@ -699,25 +698,25 @@ public void test_setFetchSize_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_getFetchSize_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.getFetchSize(); @@ -725,25 +724,25 @@ public void test_getFetchSize_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_getResultSetConcurrency_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.getResultSetConcurrency(); @@ -751,25 +750,25 @@ public void test_getResultSetConcurrency_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_getResultSetType_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.getResultSetType(); @@ -777,25 +776,25 @@ public void test_getResultSetType_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_addBatch_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.addBatch("select 1"); @@ -803,25 +802,25 @@ public void test_addBatch_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_clearBatch_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.clearBatch(); @@ -829,25 +828,25 @@ public void test_clearBatch_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_executeBatch_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.executeBatch(); @@ -855,25 +854,25 @@ public void test_executeBatch_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_getMoreResults_error_1() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.getMoreResults(0); @@ -881,25 +880,25 @@ public void test_getMoreResults_error_1() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_getGeneratedKeys_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.getGeneratedKeys(); @@ -907,25 +906,25 @@ public void test_getGeneratedKeys_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_getResultSetHoldability_error() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.getResultSetHoldability(); @@ -933,25 +932,25 @@ public void test_getResultSetHoldability_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(1, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_closeOnCompletion_error() throws Exception { Connection conn = dataSource.getConnection(); - + DruidPooledStatement stmt = (DruidPooledStatement) conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.closeOnCompletion(); @@ -959,25 +958,25 @@ public void test_closeOnCompletion_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(0, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + public void test_isCloseOnCompletion_error() throws Exception { Connection conn = dataSource.getConnection(); - + DruidPooledStatement stmt = (DruidPooledStatement) conn.createStatement(); - + Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getErrorCount()); - + Exception error = null; try { stmt.isCloseOnCompletion(); @@ -985,21 +984,20 @@ public void test_isCloseOnCompletion_error() throws Exception { error = e; } Assert.assertNotNull(error); - + Assert.assertEquals(0, dataSource.getErrorCount()); - + stmt.close(); conn.close(); - + Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); } private final class ErrorFilter extends FilterAdapter { - @Override public ResultSetProxy statement_executeQuery(FilterChain chain, StatementProxy statement, String sql) - throws SQLException { + throws SQLException { throw new SQLException(); } @@ -1015,14 +1013,14 @@ public int statement_executeUpdate(FilterChain chain, StatementProxy statement, } @Override - public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { throw new SQLException(); } @Override public int statement_executeUpdate(FilterChain chain, StatementProxy statement, String sql, - String columnNames[]) throws SQLException { + String[] columnNames) throws SQLException { throw new SQLException(); } @@ -1033,19 +1031,19 @@ public boolean statement_execute(FilterChain chain, StatementProxy statement, St @Override public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { throw new SQLException(); } @Override - public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { throw new SQLException(); } @Override - public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql, String[] columnNames) + throws SQLException { throw new SQLException(); } @@ -1071,7 +1069,7 @@ public void statement_setMaxRows(FilterChain chain, StatementProxy statement, in @Override public void statement_setEscapeProcessing(FilterChain chain, StatementProxy statement, boolean enable) - throws SQLException { + throws SQLException { throw new SQLException(); } @@ -1082,7 +1080,7 @@ public int statement_getQueryTimeout(FilterChain chain, StatementProxy statement @Override public void statement_setQueryTimeout(FilterChain chain, StatementProxy statement, int seconds) - throws SQLException { + throws SQLException { throw new SQLException(); } @@ -1103,7 +1101,7 @@ public void statement_clearWarnings(FilterChain chain, StatementProxy statement) @Override public void statement_setCursorName(FilterChain chain, StatementProxy statement, String name) - throws SQLException { + throws SQLException { throw new SQLException(); } @@ -1124,7 +1122,7 @@ public boolean statement_getMoreResults(FilterChain chain, StatementProxy statem @Override public void statement_setFetchDirection(FilterChain chain, StatementProxy statement, int value) - throws SQLException { + throws SQLException { throw new SQLException(); } @@ -1167,18 +1165,18 @@ public void statement_clearBatch(FilterChain chain, StatementProxy statement) th public int[] statement_executeBatch(FilterChain chain, StatementProxy statement) throws SQLException { throw new SQLException(); } - + @Override public boolean statement_getMoreResults(FilterChain chain, StatementProxy statement, int current) throws SQLException { throw new SQLException(); } - + @Override public ResultSetProxy statement_getGeneratedKeys(FilterChain chain, StatementProxy statement) throws SQLException { throw new SQLException(); } - + @Override public int statement_getResultSetHoldability(FilterChain chain, StatementProxy statement) throws SQLException { throw new SQLException(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DumpTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DumpTest.java index 6e4e2c2823..1c1ac16f31 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DumpTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DumpTest.java @@ -28,7 +28,6 @@ * limitations under the License. */ public class DumpTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -72,7 +71,7 @@ public void testToString() throws Exception { conn.close(); } - + String sql = "select ?, ?"; Connection conn = dataSource.getConnection(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java index e1a88d1a3e..062ebab0ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java @@ -13,7 +13,6 @@ import com.alibaba.druid.util.JdbcUtils; public class ExceptionSorterTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -33,7 +32,7 @@ protected void tearDown() throws Exception { public void test_exceptionSorter() throws Exception { Assert.assertTrue(dataSource.getExceptionSorterClassName(), - dataSource.getExceptionSorter() instanceof MockExceptionSorter); + dataSource.getExceptionSorter() instanceof MockExceptionSorter); Connection conn = dataSource.getConnection(); MockConnection mockConn = conn.unwrap(MockConnection.class); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/FullTest.java b/src/test/java/com/alibaba/druid/bvt/pool/FullTest.java index 7a66d6027c..9279b3decd 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/FullTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/FullTest.java @@ -9,7 +9,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class FullTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/HoldableUnsupportTest.java b/src/test/java/com/alibaba/druid/bvt/pool/HoldableUnsupportTest.java index 65b13dc89e..8b06d86b3f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/HoldableUnsupportTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/HoldableUnsupportTest.java @@ -31,13 +31,13 @@ public int connection_getHoldability(FilterChain chain, ConnectionProxy connecti protected void tearDown() throws Exception { dataSource.close(); } - - public void test_0 () throws Exception { + + public void test_0() throws Exception { Connection[] connections = new Connection[8]; for (int i = 0; i < connections.length; ++i) { connections[i] = dataSource.getConnection(); } - + for (int i = 0; i < connections.length; ++i) { connections[i].close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/JdbcDataSourceStatTest.java b/src/test/java/com/alibaba/druid/bvt/pool/JdbcDataSourceStatTest.java index d2c2813d31..11c63f50aa 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/JdbcDataSourceStatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/JdbcDataSourceStatTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.stat.JdbcDataSourceStat; public class JdbcDataSourceStatTest extends TestCase { - public void test_max() throws Exception { JdbcDataSourceStat stat = new JdbcDataSourceStat("", ""); @@ -46,16 +45,16 @@ public void test_max_10() throws Exception { Assert.assertEquals(10, stat.getSqlStatMap().size()); } - + public void test_max_10_str() throws Exception { Properties connectProperties = new Properties(); connectProperties.put(Constants.DRUID_STAT_SQL_MAX_SIZE, "10"); JdbcDataSourceStat stat = new JdbcDataSourceStat("", "", "mysql", connectProperties); - + for (int i = 0; i < 1000 * 1; ++i) { stat.createSqlStat("select " + i); } - + Assert.assertEquals(10, stat.getSqlStatMap().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/KeepAliveTest_scheduler.java b/src/test/java/com/alibaba/druid/bvt/pool/KeepAliveTest_scheduler.java index 5b646da5c3..a958faf7d8 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/KeepAliveTest_scheduler.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/KeepAliveTest_scheduler.java @@ -62,7 +62,6 @@ public void test_keepAlive() throws Exception { // assertEquals(dataSource.getMaxActive(), dataSource.getPoolingCount()); - // Thread.sleep(1000 * 1000); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/LastActiveTest_0.java b/src/test/java/com/alibaba/druid/bvt/pool/LastActiveTest_0.java index d5c28807d2..3fb1f56d66 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/LastActiveTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/LastActiveTest_0.java @@ -13,13 +13,12 @@ /** * 这个场景测试initialSize > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class LastActiveTest_0 extends TestCase { - private DruidDataSource dataSource; - private Field field; + private Field field; protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -39,7 +38,6 @@ protected void tearDown() throws Exception { } public void test_0() throws Exception { - long t0, t1; { DruidPooledConnection conn = (DruidPooledConnection) dataSource.getConnection(); @@ -58,7 +56,7 @@ public void test_0() throws Exception { PreparedStatement stmt = conn.prepareStatement("select 1"); Thread.sleep(2); stmt.execute(); - + stmt.close(); conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/LockFairTest.java b/src/test/java/com/alibaba/druid/bvt/pool/LockFairTest.java index bbc917646c..0d1ef60ca9 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/LockFairTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/LockFairTest.java @@ -10,7 +10,6 @@ import com.alibaba.druid.util.JdbcUtils; public class LockFairTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -38,7 +37,7 @@ public void test_fair() throws Exception { Connection conn = dataSource.getConnection(); conn.close(); } - + dataSource.setMaxWait(0); Assert.assertEquals(true, ((ReentrantLock) dataSource.getLock()).isFair()); @@ -49,7 +48,6 @@ public void test_fair() throws Exception { } public void test_fair_1() throws Exception { - Connection conn = dataSource.getConnection(); conn.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java index 451914b657..6e80eacfab 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class ManagedDataSourceTest extends TestCase { - private DruidDataSource dataSource; public void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest.java b/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest.java index cfd16401bc..b8ef43461b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest.java @@ -31,7 +31,7 @@ public void test_for_fatalError() throws Exception { field.setAccessible(true); SQLException faltalError = null; - for ( int i = 0; i < 2; i++) { + for (int i = 0; i < 2; i++) { faltalError = new SQLException(); Connection conn = dataSource.getConnection(); Method method = DruidDataSource.class.getDeclaredMethod("handleFatalError", DruidPooledConnection.class, SQLException.class, String.class); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest_1.java b/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest_1.java index 48b2c4c105..c90f1ced1c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/OnFatalErrorMaxActiveTest_1.java @@ -31,7 +31,7 @@ public void test_for_fatalError() throws Exception { field.setAccessible(true); SQLException faltalError = null; - for ( int i = 0; i < 2; i++) { + for (int i = 0; i < 2; i++) { faltalError = new SQLException(); Connection conn = dataSource.getConnection(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest.java index 997609defb..c928c9de6e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.util.JdbcUtils; public class PSCacheTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest1.java b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest1.java index 08731e4402..57b0c1616c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest1.java @@ -26,7 +26,6 @@ import com.alibaba.druid.util.JdbcUtils; public class PSCacheTest1 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -60,7 +59,7 @@ public void test_noTxn() throws Exception { DruidPooledPreparedStatement pooledStmt2 = (DruidPooledPreparedStatement) stmt2; Assert.assertNotSame(pooledStmt1.getPreparedStatementHolder(), pooledStmt2.getPreparedStatementHolder()); // not - // same + // same conn.close(); } @@ -85,7 +84,7 @@ public void test_noTxn() throws Exception { DruidPooledPreparedStatement pooledStmt2 = (DruidPooledPreparedStatement) stmt2; Assert.assertNotSame(pooledStmt1.getPreparedStatementHolder(), pooledStmt2.getPreparedStatementHolder()); // not - // same + // same stmt1.close(); stmt2.close(); @@ -94,5 +93,5 @@ public void test_noTxn() throws Exception { } } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest2.java index d013917bd8..59f550af1a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.util.JdbcUtils; public class PSCacheTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -69,7 +68,7 @@ public void test_0() throws Exception { public void test_txn() throws Exception { Connection conn = dataSource.getConnection(); - + conn.setAutoCommit(true); String sql = "select 1"; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest3.java index bc183fcf53..544814afb2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest3.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcUtils; public class PSCacheTest3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -60,7 +59,7 @@ public void test_pscache() throws Exception { PreparedStatementHolder stmtHoler_2; PreparedStatementHolder stmtHoler_3; PreparedStatementHolder stmtHoler_4; - + // sql_0连续执行两次 { DruidPooledPreparedStatement stmt_0 = (DruidPooledPreparedStatement) conn.prepareStatement(sql_0); @@ -83,22 +82,22 @@ public void test_pscache() throws Exception { Assert.assertTrue(stmt_0.getPreparedStatementHolder().isPooling()); Assert.assertEquals(1, stmtPool.size()); } - + DruidPooledPreparedStatement stmt_0 = (DruidPooledPreparedStatement) conn.prepareStatement(sql_0); - + stmtHoler_0 = stmt_0.getPreparedStatementHolder(); - + Assert.assertTrue(stmtHoler_0.isInUse()); Assert.assertTrue(stmtHoler_0.isPooling()); - + stmt_0.execute(); - + { DruidPooledPreparedStatement stmt_1 = (DruidPooledPreparedStatement) conn.prepareStatement(sql_1); Assert.assertEquals(1, stmtPool.size()); - + stmtHoler_1 = stmt_1.getPreparedStatementHolder(); - + Assert.assertTrue(stmt_1.getPreparedStatementHolder().isInUse()); Assert.assertFalse(stmt_1.getPreparedStatementHolder().isPooling()); @@ -109,79 +108,79 @@ public void test_pscache() throws Exception { Assert.assertTrue(stmt_1.getPreparedStatementHolder().isPooling()); Assert.assertEquals(2, stmtPool.size()); } - + Assert.assertTrue(stmtHoler_0.isPooling()); Assert.assertTrue(stmtHoler_1.isPooling()); - + { DruidPooledPreparedStatement stmt_2 = (DruidPooledPreparedStatement) conn.prepareStatement(sql_2); Assert.assertEquals(2, stmtPool.size()); - + stmtHoler_2 = stmt_2.getPreparedStatementHolder(); - + Assert.assertTrue(stmt_2.getPreparedStatementHolder().isInUse()); Assert.assertFalse(stmt_2.getPreparedStatementHolder().isPooling()); - + stmt_2.close(); - + Assert.assertFalse(stmt_2.getPreparedStatementHolder().isInUse()); Assert.assertTrue(stmt_2.getPreparedStatementHolder().isPooling()); Assert.assertTrue(stmt_2.getPreparedStatementHolder().isPooling()); Assert.assertEquals(3, stmtPool.size()); } - + Assert.assertTrue(stmtHoler_0.isPooling()); Assert.assertTrue(stmtHoler_1.isPooling()); Assert.assertTrue(stmtHoler_2.isPooling()); - + { DruidPooledPreparedStatement stmt_3 = (DruidPooledPreparedStatement) conn.prepareStatement(sql_3); Assert.assertEquals(3, stmtPool.size()); - + stmtHoler_3 = stmt_3.getPreparedStatementHolder(); - + Assert.assertTrue(stmt_3.getPreparedStatementHolder().isInUse()); Assert.assertFalse(stmt_3.getPreparedStatementHolder().isPooling()); - + stmt_3.close(); - + Assert.assertFalse(stmt_3.getPreparedStatementHolder().isInUse()); Assert.assertTrue(stmt_3.getPreparedStatementHolder().isPooling()); Assert.assertTrue(stmt_3.getPreparedStatementHolder().isPooling()); Assert.assertEquals(3, stmtPool.size()); } - - + + Assert.assertFalse(stmtHoler_0.isPooling()); Assert.assertTrue(stmtHoler_1.isPooling()); Assert.assertTrue(stmtHoler_2.isPooling()); Assert.assertTrue(stmtHoler_3.isPooling()); - + { DruidPooledPreparedStatement stmt_4 = (DruidPooledPreparedStatement) conn.prepareStatement(sql_4); Assert.assertEquals(3, stmtPool.size()); - + stmtHoler_4 = stmt_4.getPreparedStatementHolder(); - + Assert.assertTrue(stmt_4.getPreparedStatementHolder().isInUse()); Assert.assertFalse(stmt_4.getPreparedStatementHolder().isPooling()); - + stmt_4.close(); - + Assert.assertFalse(stmt_4.getPreparedStatementHolder().isInUse()); Assert.assertTrue(stmt_4.getPreparedStatementHolder().isPooling()); Assert.assertTrue(stmt_4.getPreparedStatementHolder().isPooling()); Assert.assertEquals(3, stmtPool.size()); } - + Assert.assertFalse(stmtHoler_0.isPooling()); Assert.assertFalse(stmtHoler_1.isPooling()); Assert.assertTrue(stmtHoler_2.isPooling()); Assert.assertTrue(stmtHoler_3.isPooling()); Assert.assertTrue(stmtHoler_4.isPooling()); - + stmt_0.close(); - + Assert.assertTrue(stmtHoler_0.isPooling()); Assert.assertFalse(stmtHoler_1.isPooling()); Assert.assertFalse(stmtHoler_2.isPooling()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest4.java index f3a60b7c5e..c5976bd044 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest4.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcUtils; public class PSCacheTest4 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -68,7 +67,7 @@ public void test_pscache() throws Exception { DruidPooledPreparedStatement stmt_1_F; DruidPooledPreparedStatement stmt_1_G; DruidPooledPreparedStatement stmt_1_H; - + DruidPooledResultSet rs_0; DruidPooledResultSet rs_1_A; DruidPooledResultSet rs_1_B; @@ -81,69 +80,69 @@ public void test_pscache() throws Exception { stmt_0 = (DruidPooledPreparedStatement) conn.prepareStatement(sql_0); rs_0 = (DruidPooledResultSet) stmt_0.executeQuery(); - + Assert.assertTrue(stmt_0.getPreparedStatementHolder().isInUse()); stmt_1_A = (DruidPooledPreparedStatement) conn.prepareStatement(sql_1); rs_1_A = (DruidPooledResultSet) stmt_1_A.executeQuery(); - + Assert.assertTrue(stmt_0.getPreparedStatementHolder().isInUse()); Assert.assertTrue(stmt_1_A.getPreparedStatementHolder().isInUse()); - + stmt_1_B = (DruidPooledPreparedStatement) conn.prepareStatement(sql_1); rs_1_B = (DruidPooledResultSet) stmt_1_B.executeQuery(); rs_1_B.close(); stmt_1_B.close(); - + Assert.assertTrue(stmt_0.getPreparedStatementHolder().isInUse()); Assert.assertTrue(stmt_1_A.getPreparedStatementHolder().isInUse()); Assert.assertFalse(stmt_1_B.getPreparedStatementHolder().isInUse()); - + stmt_1_C = (DruidPooledPreparedStatement) conn.prepareStatement(sql_1); rs_1_C = (DruidPooledResultSet) stmt_1_C.executeQuery(); rs_1_C.close(); stmt_1_C.close(); - + Assert.assertTrue(stmt_0.getPreparedStatementHolder().isInUse()); Assert.assertTrue(stmt_1_A.getPreparedStatementHolder().isInUse()); Assert.assertFalse(stmt_1_B.getPreparedStatementHolder().isInUse()); Assert.assertFalse(stmt_1_C.getPreparedStatementHolder().isInUse()); - + stmt_1_D = (DruidPooledPreparedStatement) conn.prepareStatement(sql_1); rs_1_D = (DruidPooledResultSet) stmt_1_D.executeQuery(); rs_1_D.close(); stmt_1_D.close(); - + Assert.assertTrue(stmt_0.getPreparedStatementHolder().isInUse()); Assert.assertTrue(stmt_1_A.getPreparedStatementHolder().isInUse()); Assert.assertFalse(stmt_1_B.getPreparedStatementHolder().isInUse()); Assert.assertFalse(stmt_1_C.getPreparedStatementHolder().isInUse()); Assert.assertFalse(stmt_1_D.getPreparedStatementHolder().isInUse()); - + stmt_1_E = (DruidPooledPreparedStatement) conn.prepareStatement(sql_1); rs_1_E = (DruidPooledResultSet) stmt_1_E.executeQuery(); rs_1_E.close(); stmt_1_E.close(); - + rs_1_A.close(); stmt_1_A.close(); - + stmt_1_F = (DruidPooledPreparedStatement) conn.prepareStatement(sql_1); rs_1_F = (DruidPooledResultSet) stmt_1_F.executeQuery(); rs_1_F.close(); stmt_1_F.close(); - + stmt_1_G = (DruidPooledPreparedStatement) conn.prepareStatement(sql_1); rs_1_G = (DruidPooledResultSet) stmt_1_G.executeQuery(); - + stmt_1_H = (DruidPooledPreparedStatement) conn.prepareStatement(sql_1); rs_1_H = (DruidPooledResultSet) stmt_1_H.executeQuery(); rs_1_H.close(); stmt_1_H.close(); - + rs_1_G.close(); stmt_1_G.close(); - + conn.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java index eb38ced42e..26f4572b26 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.JdbcStatManager; public class ParamTest extends TestCase { - protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); } @@ -61,7 +60,7 @@ public void test_default() throws Exception { Assert.assertEquals(1, stat.getConnectionStat().getConnectCount()); Assert.assertEquals(0, stat.getConnectionStat().getCloseCount()); // logic - // close不会导致计数器＋1 + // close不会导致计数器＋1 } dataSource.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java index a250b82769..6d9e8d7384 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.util.DruidPasswordCallback; public class PasswordCallbackTest extends TestCase { - protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); } @@ -52,16 +51,15 @@ public void test_0() throws Exception { } public static class TestPasswordCallback extends DruidPasswordCallback { - private static final long serialVersionUID = 1L; - private Properties properties; + private Properties properties; - public TestPasswordCallback(){ + public TestPasswordCallback() { super("test", false); } - public TestPasswordCallback(String prompt, boolean echoOn){ + public TestPasswordCallback(String prompt, boolean echoOn) { super(prompt, echoOn); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementKeyTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementKeyTest.java index 27d961205c..a00781180d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementKeyTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementKeyTest.java @@ -7,7 +7,6 @@ import com.alibaba.druid.pool.PreparedStatementPool.MethodType; public class PreparedStatementKeyTest extends TestCase { - public void test_0() throws Exception { PreparedStatementKey k1 = new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103); Assert.assertEquals(101, k1.getResultSetType()); @@ -17,49 +16,49 @@ public void test_0() throws Exception { public void test_eq() throws Exception { Assert.assertEquals(new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103), - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103)); + new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103)); } public void test_not_eq() throws Exception { Assert.assertFalse( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 201, 102, 103))); + new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // + new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 201, 102, 103))); } public void test_not_eq_1() throws Exception { Assert.assertFalse( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 202, 103))); + new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // + new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 202, 103))); } public void test_not_eq_2() throws Exception { Assert.assertFalse( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 203))); + new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // + new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 203))); } public void test_not_eq_3() throws Exception { Assert.assertFalse( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M2, 101, 102, 103))); + new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // + new PreparedStatementKey("select 'a'", "c1", MethodType.M2, 101, 102, 103))); } public void test_not_eq_4() throws Exception { Assert.assertFalse( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // - new PreparedStatementKey("select 'a'", "c2", MethodType.M1, 101, 102, 103))); + new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // + new PreparedStatementKey("select 'a'", "c2", MethodType.M1, 101, 102, 103))); } public void test_not_eq_5() throws Exception { Assert.assertFalse( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // - new PreparedStatementKey("select 'b'", "c1", MethodType.M1, 101, 102, 103))); + new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // + new PreparedStatementKey("select 'b'", "c1", MethodType.M1, 101, 102, 103))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementProxyImplTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementProxyImplTest.java index 2aa429e7df..3076636524 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementProxyImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementProxyImplTest.java @@ -13,7 +13,6 @@ import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; public class PreparedStatementProxyImplTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/RegisterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/RegisterTest.java index c8a811ba25..db6fd883fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/RegisterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/RegisterTest.java @@ -12,16 +12,16 @@ public void test() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.init(); - + Assert.assertTrue(dataSource.isMbeanRegistered()); - + dataSource.registerMbean(); Assert.assertTrue(dataSource.isMbeanRegistered()); - + dataSource.unregisterMbean(); Assert.assertFalse(dataSource.isMbeanRegistered()); Assert.assertFalse(dataSource.isMbeanRegistered()); - + dataSource.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SavepointTest.java b/src/test/java/com/alibaba/druid/bvt/pool/SavepointTest.java index 6008d2de21..87889eec0f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/SavepointTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/SavepointTest.java @@ -11,7 +11,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class SavepointTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -32,41 +31,41 @@ public void test_multi_savepoint() throws Exception { Assert.assertEquals(true, conn.getAutoCommit()); Assert.assertEquals(true, physicalConn.getAutoCommit()); - + conn.setAutoCommit(false); - + Assert.assertEquals(false, conn.getAutoCommit()); Assert.assertEquals(false, physicalConn.getAutoCommit()); - + Savepoint[] savepoints = new Savepoint[100]; for (int i = 0; i < savepoints.length; ++i) { Statement stmt = conn.createStatement(); stmt.execute("insert t (" + i + ")"); stmt.close(); savepoints[i] = conn.setSavepoint(); - + Assert.assertEquals(i + 1, physicalConn.getSavepoints().size()); for (int j = 0; j <= i; ++j) { Assert.assertTrue(physicalConn.getSavepoints().contains(savepoints[j])); } } - + // rollback single conn.rollback(savepoints[99]); Assert.assertEquals(99, physicalConn.getSavepoints().size()); - + // release single conn.releaseSavepoint(savepoints[97]); Assert.assertEquals(98, physicalConn.getSavepoints().size()); - + // rollback multi conn.rollback(savepoints[90]); Assert.assertEquals(90, physicalConn.getSavepoints().size()); - + // rollback all conn.rollback(); Assert.assertEquals(0, physicalConn.getSavepoints().size()); - + conn.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest2.java index 3479fd22d0..f8567493df 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest2.java @@ -33,7 +33,7 @@ protected void setUp() throws Exception { dataSource.setTestWhileIdle(false); System.setProperty("druid.stat.slowSqlMillis", "500"); dataSource.setFilters("stat"); - + { StatFilter filter = (StatFilter) dataSource.getProxyFilters().get(0); Assert.assertEquals(3000, filter.getSlowSqlMillis()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java index d09c5ada8c..d9398fc39f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java @@ -40,7 +40,6 @@ import com.alibaba.druid.support.json.JSONUtils; public class SpringIbatisFilterTest extends TestCase { - protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); } @@ -53,7 +52,7 @@ public void test_spring() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "com/alibaba/druid/pool/ibatis/spring-config-ibatis.xml"); + "com/alibaba/druid/pool/ibatis/spring-config-ibatis.xml"); DataSource dataSource = (DataSource) context.getBean("dataSource"); @@ -106,18 +105,17 @@ public void test_spring() throws Exception { } Assert.assertEquals(1, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - + Map wallStats = DruidStatService.getInstance().getWallStatMap(Collections.emptyMap()); - + System.out.println("wall-stats : " + JSONUtils.toJSONString(wallStats)); - + context.close(); Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } public static class TestFilter extends FilterAdapter { - private AtomicLong connectCount = new AtomicLong(); @Override diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java index 6a8c73651c..8709f39b1e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java @@ -32,7 +32,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class SpringMybatisFilterTest extends TestCase { - protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); } @@ -45,7 +44,7 @@ public void test_spring() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "com/alibaba/druid/pool/mybatis/spring-config-mybatis.xml"); + "com/alibaba/druid/pool/mybatis/spring-config-mybatis.xml"); DataSource dataSource = (DataSource) context.getBean("dataSource"); @@ -81,11 +80,11 @@ public void test_spring() throws Exception { userMapper.addUser(user); } - + { userMapper.errorSelect(1); } - + { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); @@ -107,10 +106,9 @@ public void test_spring() throws Exception { } public static interface UserMapper { - @Insert(value = "insert into t_User (id, name) values (#{user.id}, #{user.name})") void addUser(@Param("user") User user); - + @Select(value = "delete from t_User where id = #{id}") void errorSelect(@Param("id") long id); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java b/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java index 9ca03d5e06..cdd897afd6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java @@ -25,7 +25,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestActiveTrace extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java index 54c00d5ee4..7ea602e44f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java @@ -30,7 +30,7 @@ public class TestClone extends PoolTestCase { private DruidDataSource dataSource; - + protected void setUp() throws Exception { super.setUp(); @@ -42,72 +42,72 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setMaxOpenPreparedStatements(30); } - + public void test_clone() throws Exception { Connection conn_0 = dataSource.getConnection(); Connection conn_1 = dataSource.getConnection(); Connection conn_2 = dataSource.getConnection(); - + DruidDataSource clone = (DruidDataSource) dataSource.clone(); clone.init(); - + Connection conn_3 = dataSource.getConnection(); Connection conn_4 = dataSource.getConnection(); Connection conn_5 = dataSource.getConnection(); - + conn_3.close(); conn_4.close(); conn_5.close(); - + dataSource.close(); - + Assert.assertEquals(dataSource.getUrl(), clone.getUrl()); Assert.assertEquals(dataSource.getUsername(), clone.getUsername()); Assert.assertEquals(dataSource.getPassword(), clone.getPassword()); Assert.assertEquals(dataSource.getFilterClassNames(), clone.getFilterClassNames()); Assert.assertEquals(dataSource.getMaxOpenPreparedStatements(), clone.getMaxOpenPreparedStatements()); - + PreparedStatement ps_0 = conn_0.prepareStatement("select 1"); ResultSet rs = ps_0.executeQuery(); rs.next(); rs.close(); ps_0.close(); - + // dataSource is closed, but connections is not closed Assert.assertFalse(conn_0.isClosed()); Assert.assertFalse(conn_1.isClosed()); Assert.assertFalse(conn_2.isClosed()); - + MockConnection mockConn_0 = conn_0.unwrap(MockConnection.class); MockConnection mockConn_1 = conn_1.unwrap(MockConnection.class); MockConnection mockConn_2 = conn_2.unwrap(MockConnection.class); - + Assert.assertFalse(mockConn_0.isClosed()); Assert.assertFalse(mockConn_1.isClosed()); Assert.assertFalse(mockConn_2.isClosed()); - + conn_0.close(); // no error conn_1.close(); // no error conn_2.close(); // no error - + // real connection already closed Assert.assertTrue(mockConn_0.isClosed()); Assert.assertTrue(mockConn_1.isClosed()); Assert.assertTrue(mockConn_2.isClosed()); - + // now is new dataSource; dataSource = clone; - + Connection conn_6 = dataSource.getConnection(); Connection conn_7 = dataSource.getConnection(); Connection conn_8 = dataSource.getConnection(); - + conn_6.close(); conn_7.close(); conn_8.close(); - + } - + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); super.tearDown(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java index bc7f5d3e1c..5aa62f25fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestClose_0 extends PoolTestCase { - public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java index 4376693879..450edcb398 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java @@ -28,7 +28,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestClose_1 extends PoolTestCase { - public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setPoolPreparedStatements(true); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java b/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java index c5443b1eeb..f2ab6d987e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java @@ -28,13 +28,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestConnectError extends TestCase { - private DruidDataSource dataSource; - private MockDriver driver; + private MockDriver driver; protected void setUp() throws Exception { driver = new MockDriver() { - private AtomicInteger count = new AtomicInteger(); public Connection connect(String url, Properties info) throws SQLException { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestConnectTimeout.java b/src/test/java/com/alibaba/druid/bvt/pool/TestConnectTimeout.java index 0d61f44bbf..1ff3e98b75 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestConnectTimeout.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestConnectTimeout.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcUtils; public class TestConnectTimeout extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -65,7 +64,6 @@ public void testConnectTimeout() throws Exception { final CountDownLatch latch = new CountDownLatch(THREAD_COUNT); for (int i = 0; i < THREAD_COUNT; ++i) { Thread thread = new Thread() { - public void run() { try { for (int i = 0; i < 100; ++i) { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java index 4ecd375f72..cabcc2b377 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDefault extends TestCase { - protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java index cdfe0ac450..c3f30a08db 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java @@ -27,8 +27,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDisable extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -64,7 +63,6 @@ public void test_close() throws Exception { for (int i = 0; i < threadCount; ++i) { threads[i] = new Thread("thread-" + i) { - public void run() { try { startLatch.await(); @@ -87,7 +85,6 @@ public void run() { Thread.sleep(1000); new Thread("close thread") { - public void run() { dataSource.setEnable(false); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java index f137a1bafc..7cf391123e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java @@ -25,7 +25,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDruidDataSource extends TestCase { - protected void tearDown() throws Exception { DruidDataSourceStatManager.clear(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestGetUpdateCount.java b/src/test/java/com/alibaba/druid/bvt/pool/TestGetUpdateCount.java index dc16571b8d..6380deb823 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestGetUpdateCount.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestGetUpdateCount.java @@ -30,13 +30,11 @@ import com.alibaba.druid.util.JdbcUtils; public class TestGetUpdateCount extends TestCase { - private DruidDataSource dataSource; - private MockDriver driver; + private MockDriver driver; protected void setUp() throws Exception { driver = new MockDriver() { - @Override public MockPreparedStatement createMockPreparedStatement(MockConnection conn, String sql) { return new MyPreparedStatement(conn, sql); @@ -140,10 +138,9 @@ public void test_execute_multi() throws Exception { } public static class MyPreparedStatement extends MockPreparedStatement { - Integer updateCount = null; - public MyPreparedStatement(MockConnection conn, String sql){ + public MyPreparedStatement(MockConnection conn, String sql) { super(conn, sql); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java b/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java index c6c7a6fbdf..4c3381edec 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java @@ -28,8 +28,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestGraceShutdown extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -64,7 +63,6 @@ public void test_close() throws Exception { for (int i = 0; i < threadCount; ++i) { threads[i] = new Thread("thread-" + i) { - public void run() { try { startLatch.await(); @@ -86,7 +84,6 @@ public void run() { Thread.sleep(1000); new Thread("close thread") { - public void run() { dataSource.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestH2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestH2.java index b9e6e78286..88af26c54a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestH2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestH2.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcUtils; public class TestH2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -35,7 +34,7 @@ protected void setUp() throws Exception { dataSource.setUrl("jdbc:h2:mem:"); dataSource.setPoolPreparedStatements(true); dataSource.setMaxOpenPreparedStatements(10); - + dataSource.init(); } @@ -45,7 +44,7 @@ protected void tearDown() throws Exception { public void test_h2() throws Exception { Assert.assertSame(JdbcUtils.H2, DbType.of(dataSource.getDbType())); - + Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELECT ?"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java index 15dfe3e0a0..af22b9f493 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class TestIdle extends TestCase { - private DruidDataSource dataSource; protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java index a14c1a14de..567b0b9ffb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java @@ -25,7 +25,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle2 extends TestCase { - protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java index c63f313302..cc12c816c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java @@ -28,7 +28,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle3 extends TestCase { - protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); } @@ -55,11 +54,11 @@ public void test_idle2() throws Exception { dataSource.setFilters("stat"); ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, - new ObjectName( - "com.alibaba:type=DataSource,name=mysql")); + new ObjectName( + "com.alibaba:type=DataSource,name=mysql")); ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, - new ObjectName( - "com.alibaba:type=DataSource,name=oracle")); + new ObjectName( + "com.alibaba:type=DataSource,name=oracle")); // 第一次创建连接 { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestLogLongTimeTransaction.java b/src/test/java/com/alibaba/druid/bvt/pool/TestLogLongTimeTransaction.java index 74bcaf77fb..21366e1f7f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestLogLongTimeTransaction.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestLogLongTimeTransaction.java @@ -29,13 +29,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestLogLongTimeTransaction extends TestCase { - private DruidDataSource dataSource; - private MockDriver driver; + private MockDriver driver; protected void setUp() throws Exception { driver = new MockDriver() { - protected ResultSet executeQuery(MockStatement stmt, String sql) throws SQLException { try { Thread.sleep(2); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java index 57412ef39b..d968dc5330 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java @@ -37,9 +37,8 @@ protected void tearDown() throws Exception { } public void test_stat() throws Exception { - String sql = "SELECT NOW()"; - + JdbcSqlStat.setContextSqlName("select_now"); JdbcSqlStat.setContextSqlFile("test_file"); @@ -60,17 +59,17 @@ public void test_stat() throws Exception { JdbcStatManager.getInstance().getDataSourceList(); Assert.assertEquals(1, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - + Assert.assertEquals(2, dataSource.getDataSourceStat().getSqlList().size()); - + Iterator iterator = dataSource.getDataSourceStat().getSqlStatMap().values().iterator(); JdbcSqlStat sql_0 = iterator.next(); JdbcSqlStat sql_1 = iterator.next(); - + Assert.assertEquals("SELECT 1", sql_0.getSql()); Assert.assertNull(sql_0.getFile()); Assert.assertNull(sql_0.getName()); - + Assert.assertEquals("SELECT NOW()", sql_1.getSql()); Assert.assertEquals("test_file", sql_1.getFile()); Assert.assertEquals("select_now", sql_1.getName()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOraclePrefetch.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOraclePrefetch.java index 9f5a417d04..b637a87529 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOraclePrefetch.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOraclePrefetch.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class TestOraclePrefetch extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -48,7 +47,6 @@ protected void tearDown() throws Exception { } public void test_oracle() throws Exception { - String sql = "SELECT 1"; OracleConnection oracleConn; @@ -66,7 +64,7 @@ public void test_oracle() throws Exception { oracleStmt = stmt.unwrap(OraclePreparedStatement.class); Assert.assertEquals(50, oracleStmt.getRowPrefetch()); - + Assert.assertTrue(stmt.isWrapperFor(PreparedStatementHolder.class)); stmtHolder = stmt.unwrap(PreparedStatementHolder.class); Assert.assertNotNull(stmtHolder); @@ -90,7 +88,7 @@ public void test_oracle() throws Exception { } PreparedStatement stmt = conn.prepareStatement(sql); - + { PreparedStatementHolder stmtHolder2 = stmt.unwrap(PreparedStatementHolder.class); Assert.assertSame(stmtHolder2, stmtHolder); @@ -109,7 +107,7 @@ public void test_oracle() throws Exception { conn.close(); } - + Assert.assertEquals(1, dataSource.getCachedPreparedStatementCount()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall.java index fc09362c45..da7d3307a0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcUtils; public class TestOracleWall extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -48,7 +47,6 @@ protected void tearDown() throws Exception { } public void test_oracle() throws Exception { - String sql = "SELECT 1"; { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall2.java index 501f87bd39..47ceaf2da4 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall2.java @@ -32,7 +32,6 @@ import com.alibaba.druid.wall.WallFilter; public class TestOracleWall2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -58,7 +57,6 @@ protected void tearDown() throws Exception { } public void test_oracle() throws Exception { - String sql = "SELECT 1"; { @@ -69,7 +67,7 @@ public void test_oracle() throws Exception { Assert.assertFalse(conn.isWrapperFor(oracle.jdbc.OracleConnection.class)); Assert.assertNull(conn.unwrap(oracle.jdbc.OracleConnection.class)); - + Assert.assertFalse(conn.isWrapperFor(java.sql.Connection.class)); Assert.assertNull(conn.unwrap(java.sql.Connection.class)); @@ -82,7 +80,7 @@ public void test_oracle() throws Exception { Assert.assertTrue(stmt.isWrapperFor(DruidPooledPreparedStatement.class)); Assert.assertNotNull(stmt.unwrap(DruidPooledPreparedStatement.class)); - + Assert.assertFalse(stmt.isWrapperFor(java.sql.PreparedStatement.class)); Assert.assertNull(stmt.unwrap(java.sql.PreparedStatement.class)); @@ -90,10 +88,10 @@ public void test_oracle() throws Exception { Assert.assertNull(rs.unwrap(oracle.jdbc.OracleResultSet.class)); Assert.assertFalse(rs.isWrapperFor(oracle.jdbc.OracleResultSet.class)); - + Assert.assertTrue(rs.isWrapperFor(DruidPooledResultSet.class)); Assert.assertNotNull(rs.unwrap(DruidPooledResultSet.class)); - + Assert.assertFalse(rs.isWrapperFor(java.sql.ResultSet.class)); Assert.assertNull(rs.unwrap(java.sql.ResultSet.class)); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall3.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall3.java index 52e67a1234..6a3d08be84 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall3.java @@ -32,7 +32,6 @@ import com.alibaba.druid.wall.WallFilter; public class TestOracleWall3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -58,7 +57,6 @@ protected void tearDown() throws Exception { } public void test_oracle() throws Exception { - String sql = "SELECT 1"; { @@ -69,7 +67,7 @@ public void test_oracle() throws Exception { Assert.assertTrue(conn.isWrapperFor(oracle.jdbc.OracleConnection.class)); Assert.assertNotNull(conn.unwrap(oracle.jdbc.OracleConnection.class)); - + Assert.assertTrue(conn.isWrapperFor(java.sql.Connection.class)); Assert.assertNotNull(conn.unwrap(java.sql.Connection.class)); @@ -82,7 +80,7 @@ public void test_oracle() throws Exception { Assert.assertTrue(stmt.isWrapperFor(DruidPooledPreparedStatement.class)); Assert.assertNotNull(stmt.unwrap(DruidPooledPreparedStatement.class)); - + Assert.assertTrue(stmt.isWrapperFor(java.sql.PreparedStatement.class)); Assert.assertNotNull(stmt.unwrap(java.sql.PreparedStatement.class)); @@ -90,10 +88,10 @@ public void test_oracle() throws Exception { Assert.assertNotNull(rs.unwrap(oracle.jdbc.OracleResultSet.class)); Assert.assertTrue(rs.isWrapperFor(oracle.jdbc.OracleResultSet.class)); - + Assert.assertTrue(rs.isWrapperFor(DruidPooledResultSet.class)); Assert.assertNotNull(rs.unwrap(DruidPooledResultSet.class)); - + Assert.assertTrue(rs.isWrapperFor(java.sql.ResultSet.class)); Assert.assertNotNull(rs.unwrap(java.sql.ResultSet.class)); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWallJdbc3.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWallJdbc3.java index 136dab177e..7afe6115ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWallJdbc3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWallJdbc3.java @@ -32,7 +32,6 @@ import com.alibaba.druid.wall.WallFilter; public class TestOracleWallJdbc3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -58,7 +57,6 @@ protected void tearDown() throws Exception { } public void test_oracle() throws Exception { - String sql = "SELECT 1"; { @@ -69,7 +67,7 @@ public void test_oracle() throws Exception { Assert.assertTrue(conn.isWrapperFor(oracle.jdbc.OracleConnection.class)); Assert.assertNotNull(conn.unwrap(oracle.jdbc.OracleConnection.class)); - + Assert.assertTrue(conn.isWrapperFor(java.sql.Connection.class)); Assert.assertNotNull(conn.unwrap(java.sql.Connection.class)); @@ -82,7 +80,7 @@ public void test_oracle() throws Exception { Assert.assertTrue(stmt.isWrapperFor(DruidPooledPreparedStatement.class)); Assert.assertNotNull(stmt.unwrap(DruidPooledPreparedStatement.class)); - + Assert.assertTrue(stmt.isWrapperFor(java.sql.PreparedStatement.class)); Assert.assertNotNull(stmt.unwrap(java.sql.PreparedStatement.class)); @@ -90,10 +88,10 @@ public void test_oracle() throws Exception { Assert.assertNotNull(rs.unwrap(oracle.jdbc.OracleResultSet.class)); Assert.assertTrue(rs.isWrapperFor(oracle.jdbc.OracleResultSet.class)); - + Assert.assertTrue(rs.isWrapperFor(DruidPooledResultSet.class)); Assert.assertNotNull(rs.unwrap(DruidPooledResultSet.class)); - + Assert.assertTrue(rs.isWrapperFor(java.sql.ResultSet.class)); Assert.assertNotNull(rs.unwrap(java.sql.ResultSet.class)); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap.java index 904be51357..aa14c4dc3a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class TestOracleWrap extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -50,7 +49,6 @@ protected void tearDown() throws Exception { } public void test_oracle() throws Exception { - String sql = "SELECT 1"; { @@ -61,7 +59,7 @@ public void test_oracle() throws Exception { Assert.assertTrue(conn.isWrapperFor(oracle.jdbc.OracleConnection.class)); Assert.assertNotNull(conn.unwrap(oracle.jdbc.OracleConnection.class)); - + Assert.assertTrue(conn.isWrapperFor(java.sql.Connection.class)); Assert.assertNotNull(conn.unwrap(java.sql.Connection.class)); @@ -74,7 +72,7 @@ public void test_oracle() throws Exception { Assert.assertTrue(stmt.isWrapperFor(DruidPooledPreparedStatement.class)); Assert.assertNotNull(stmt.unwrap(DruidPooledPreparedStatement.class)); - + Assert.assertTrue(stmt.isWrapperFor(java.sql.PreparedStatement.class)); Assert.assertNotNull(stmt.unwrap(java.sql.PreparedStatement.class)); @@ -82,10 +80,10 @@ public void test_oracle() throws Exception { Assert.assertNotNull(rs.unwrap(oracle.jdbc.OracleResultSet.class)); Assert.assertTrue(rs.isWrapperFor(oracle.jdbc.OracleResultSet.class)); - + Assert.assertTrue(rs.isWrapperFor(DruidPooledResultSet.class)); Assert.assertNotNull(rs.unwrap(DruidPooledResultSet.class)); - + Assert.assertTrue(rs.isWrapperFor(java.sql.ResultSet.class)); Assert.assertNotNull(rs.unwrap(java.sql.ResultSet.class)); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap2.java index 0f8d03ee23..41dc05a689 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap2.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class TestOracleWrap2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -50,7 +49,6 @@ protected void tearDown() throws Exception { } public void test_oracle() throws Exception { - String sql = "SELECT 1"; { @@ -61,7 +59,7 @@ public void test_oracle() throws Exception { Assert.assertTrue(conn.isWrapperFor(oracle.jdbc.OracleConnection.class)); Assert.assertNotNull(conn.unwrap(oracle.jdbc.OracleConnection.class)); - + Assert.assertTrue(conn.isWrapperFor(java.sql.Connection.class)); Assert.assertNotNull(conn.unwrap(java.sql.Connection.class)); @@ -74,7 +72,7 @@ public void test_oracle() throws Exception { Assert.assertTrue(stmt.isWrapperFor(DruidPooledPreparedStatement.class)); Assert.assertNotNull(stmt.unwrap(DruidPooledPreparedStatement.class)); - + Assert.assertTrue(stmt.isWrapperFor(java.sql.PreparedStatement.class)); Assert.assertNotNull(stmt.unwrap(java.sql.PreparedStatement.class)); @@ -82,10 +80,10 @@ public void test_oracle() throws Exception { Assert.assertNotNull(rs.unwrap(oracle.jdbc.OracleResultSet.class)); Assert.assertTrue(rs.isWrapperFor(oracle.jdbc.OracleResultSet.class)); - + Assert.assertTrue(rs.isWrapperFor(DruidPooledResultSet.class)); Assert.assertNotNull(rs.unwrap(DruidPooledResultSet.class)); - + Assert.assertTrue(rs.isWrapperFor(java.sql.ResultSet.class)); Assert.assertNotNull(rs.unwrap(java.sql.ResultSet.class)); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java index b1c30241b5..fa818ce5e2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java @@ -27,8 +27,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestPoolPreparedStatement extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -59,7 +58,6 @@ protected void tearDown() throws Exception { } public void test_removeAbandoned() throws Exception { - MockPreparedStatement raw; { Connection conn = dataSource.getConnection(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java index 2fc1dea191..6beab62327 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java @@ -27,8 +27,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestPoolPreparedStatement2 extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -51,7 +50,7 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); dataSource.setPoolPreparedStatements(false); dataSource.setMaxPoolPreparedStatementPerConnectionSize(20); - + // ((StatFilter) dataSource.getProxyFilters().get(0)).setMaxSqlStatCount(100); } @@ -98,7 +97,7 @@ public void test_stmtCache() throws Exception { Assert.assertNotNull(poolableConn); Assert.assertEquals(dataSource.getMaxPoolPreparedStatementPerConnectionSize(), - poolableConn.getConnectionHolder().getStatementPool().getMap().size()); + poolableConn.getConnectionHolder().getStatementPool().getMap().size()); conn.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java b/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java index fb524cf663..68347c3b9d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java @@ -25,8 +25,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestRemoveAbandoned extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java index 63bf171262..590754df4c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java @@ -26,8 +26,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestRemoveAbandoned2 extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -63,12 +62,11 @@ public void test_removeAbandoned() throws Exception { conn.close(); } Assert.assertEquals(0, dataSource.getActiveCount()); - - Thread abandonThread = new Thread("abandoned") { + Thread abandonThread = new Thread("abandoned") { public void run() { - for (;;) { + for (; ; ) { dataSource.removeAbandoned(); if (Thread.interrupted()) { break; @@ -85,7 +83,7 @@ public void run() { } Assert.assertEquals(0, dataSource.getActiveCount()); abandonThread.interrupt(); - + System.out.println("removeAbandondedCount : " + dataSource.getRemoveAbandonedCount()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java b/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java index 91e76f9766..ba1a33295c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestSharePreparedStatements extends TestCase { - protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); } @@ -37,7 +36,6 @@ protected void tearDown() throws Exception { } public void test_sharePreparedStatements() throws Exception { - // sharePreparedStatements DruidDataSource dataSource = new DruidDataSource(); @@ -59,7 +57,7 @@ public void test_sharePreparedStatements() throws Exception { conn.close(); } - + { Connection conn = dataSource.getConnection(); @@ -86,18 +84,18 @@ public void test_sharePreparedStatements() throws Exception { conn.close(); } - + { Connection conn = dataSource.getConnection(); conn.setAutoCommit(false); - + PreparedStatement stmt = conn.prepareStatement(sql); Assert.assertSame(mockStmt, stmt.unwrap(MockPreparedStatement.class)); ResultSet rs = stmt.executeQuery(); rs.next(); rs.close(); stmt.close(); - + conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java b/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java index fae44ce159..a426f34974 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.JdbcStatManager; public class TestStat extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -47,7 +46,6 @@ protected void tearDown() throws Exception { } public void test_stat() throws Exception { - String sql = "SELECT 1"; Connection conn = dataSource.getConnection(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest.java b/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest.java index c3d0e25dbd..9f1700bdbe 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcUtils; public class TimeBetweenLogStatsMillisTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -32,10 +31,10 @@ public void test_0() throws Exception { Assert.assertEquals(0, dataSource.getResetCount()); dataSource.setConnectionProperties("druid.resetStatEnable=true"); Assert.assertEquals(true, dataSource.isResetStatEnable()); - + dataSource.setConnectionProperties("druid.resetStatEnable=false"); Assert.assertEquals(false, dataSource.isResetStatEnable()); - + dataSource.setConnectionProperties("druid.resetStatEnable=xxx"); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest2.java index 5eef91891b..dbb9388c56 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest2.java @@ -8,12 +8,11 @@ import com.alibaba.druid.util.JdbcUtils; public class TimeBetweenLogStatsMillisTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { System.setProperty("druid.timeBetweenLogStatsMillis", "1000"); - + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest3.java index 4373f3b495..67aa4996ba 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest3.java @@ -12,7 +12,6 @@ import com.alibaba.druid.util.JdbcUtils; public class TimeBetweenLogStatsMillisTest3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -38,7 +37,7 @@ public void test_0() throws Exception { rs.close(); stmt.close(); conn.close(); - + Thread.sleep(10); } Assert.assertEquals(10, dataSource.getTimeBetweenLogStatsMillis()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TransactionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/TransactionTest.java index 55e61934e5..305590c538 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TransactionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TransactionTest.java @@ -19,10 +19,10 @@ protected void setUp() throws Exception { protected void tearDown() throws Exception { dataSource.close(); } - + public void test_txn() throws Exception { Connection conn = dataSource.getConnection(); - + conn.setAutoCommit(false); for (int i = 0; i < 100; ++i) { PreparedStatement stmt = conn.prepareStatement("select + " + (i % 10)); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest.java b/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest.java index ac4439c8d7..0994674e7f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest.java @@ -21,11 +21,9 @@ import com.alibaba.druid.proxy.jdbc.StatementProxy; public class UnwrapTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { - dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(true); @@ -50,7 +48,7 @@ public void test_unwrap() throws Exception { Assert.assertTrue(conn.isWrapperFor(MockConnection.class)); Assert.assertNotNull(conn.unwrap(MockConnection.class)); - + PreparedStatement stmt = conn.prepareStatement("select ?"); Assert.assertTrue(stmt.isWrapperFor(Statement.class)); @@ -67,7 +65,7 @@ public void test_unwrap() throws Exception { Assert.assertTrue(stmt.isWrapperFor(PreparedStatementProxyImpl.class)); Assert.assertNotNull(stmt.unwrap(PreparedStatementProxyImpl.class)); - + Assert.assertTrue(stmt.isWrapperFor(MockPreparedStatement.class)); Assert.assertNotNull(stmt.unwrap(MockPreparedStatement.class)); @@ -79,13 +77,13 @@ public void test_unwrap() throws Exception { Assert.assertTrue(rs.isWrapperFor(ResultSetProxy.class)); Assert.assertNotNull(rs.unwrap(ResultSetProxy.class)); - + Assert.assertTrue(rs.isWrapperFor(ResultSetProxyImpl.class)); Assert.assertNotNull(rs.unwrap(ResultSetProxyImpl.class)); - + Assert.assertTrue(rs.isWrapperFor(MockResultSet.class)); Assert.assertNotNull(rs.unwrap(MockResultSet.class)); - + rs.close(); stmt.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest2.java index 6cfad6e01f..0ffd9efb97 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest2.java @@ -19,11 +19,9 @@ import com.alibaba.druid.proxy.jdbc.StatementProxyImpl; public class UnwrapTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { - dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(true); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest_filter.java b/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest_filter.java index 1511f7d693..22108e6e84 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest_filter.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest_filter.java @@ -14,7 +14,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class UnwrapTest_filter extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -40,16 +39,16 @@ protected void tearDown() throws Exception { public void test_unwrap() throws Exception { Connection conn = dataSource.getConnection(); conn.close(); - + Assert.assertTrue(dataSource.isWrapperFor(StatFilter.class)); Assert.assertNotNull(dataSource.unwrap(StatFilter.class)); - + Assert.assertTrue(dataSource.isWrapperFor(MergeStatFilter.class)); Assert.assertNotNull(dataSource.unwrap(MergeStatFilter.class)); - + Assert.assertTrue(dataSource.isWrapperFor(LogFilter.class)); Assert.assertNotNull(dataSource.unwrap(LogFilter.class)); - + Assert.assertTrue(dataSource.isWrapperFor(Log4jFilter.class)); Assert.assertNotNull(dataSource.unwrap(Log4jFilter.class)); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java b/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java index 48ba2cd245..d329955472 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java @@ -13,7 +13,6 @@ import com.alibaba.druid.util.JdbcConstants; public class ValidationQueryLogDB2Test extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -41,12 +40,12 @@ public void test_oracle() throws Exception { field.setAccessible(true); Log log = (Log) field.get(null); log.resetStat(); - + Connection conn = dataSource.getConnection(); - + conn.close(); - - + + Assert.assertEquals(1, log.getErrorCount()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java index 42c82a9889..534790d223 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java @@ -13,7 +13,6 @@ import com.alibaba.druid.util.JdbcConstants; public class ValidationQueryLogTest extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -41,11 +40,11 @@ public void test_oracle() throws Exception { field.setAccessible(true); Log log = (Log) field.get(null); log.resetStat(); - + Connection conn = dataSource.getConnection(); - + conn.close(); - + Assert.assertEquals(1, log.getErrorCount()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java index 3864170291..2970386665 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java @@ -26,8 +26,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class DruidDataSourceC3P0AdapterTest extends PoolTestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSourceC3P0Adapter dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java index 3d70473e68..489eff7ac6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class DruidDataSourceC3P0AdapterTest2 extends PoolTestCase { - public void test_0() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java index 8afbcb784f..078a3a3a73 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java @@ -29,8 +29,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class ConnectionTest extends PoolTestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -71,7 +70,7 @@ public void test_prepare2() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.close(); conn.close(); @@ -126,7 +125,7 @@ public void test_prepareCall2() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareCall("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.close(); conn.close(); @@ -154,7 +153,7 @@ public void test_create2() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.close(); conn.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java index 896ae002d7..7514dad2f6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java @@ -29,8 +29,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class ConnectionTest2 extends PoolTestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -76,7 +75,7 @@ public void test_prepare2() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.close(); conn.close(); @@ -131,7 +130,7 @@ public void test_prepareCall2() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareCall("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.close(); conn.close(); @@ -159,7 +158,7 @@ public void test_create2() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.close(); conn.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java index 0bca46fbac..973aca2033 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java @@ -32,8 +32,7 @@ import com.alibaba.druid.stat.JdbcStatManager; public class ConnectionTest3 extends PoolTestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java index e73eed2da0..bdd5ae4df6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java @@ -37,8 +37,7 @@ import com.alibaba.druid.stat.JdbcStatManager; public class ConnectionTest4 extends PoolTestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -138,7 +137,7 @@ public void test_prepareStatement_error3() throws Exception { SQLException error = null; try { conn.prepareStatement("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); } catch (SQLException ex) { error = ex; } @@ -155,7 +154,7 @@ public void test_prepareStatement_error4() throws Exception { SQLException error = null; try { conn.prepareStatement(null, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); } catch (SQLException ex) { error = ex; } @@ -238,13 +237,13 @@ public void test_prepareStatement() throws Exception { MockPreparedStatement raw = null; { PreparedStatement stmt = conn.prepareStatement("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY); + ResultSet.CONCUR_READ_ONLY); raw = stmt.unwrap(MockPreparedStatement.class); stmt.close(); } { PreparedStatement stmt = conn.prepareStatement("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY); + ResultSet.CONCUR_READ_ONLY); Assert.assertSame(raw, stmt.unwrap(MockPreparedStatement.class)); stmt.close(); } @@ -258,15 +257,15 @@ public void test_prepareStatement_1() throws Exception { MockPreparedStatement raw = null; { PreparedStatement stmt = conn.prepareStatement("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.CONCUR_READ_ONLY, + ResultSet.HOLD_CURSORS_OVER_COMMIT); raw = stmt.unwrap(MockPreparedStatement.class); stmt.close(); } { PreparedStatement stmt = conn.prepareStatement("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.CONCUR_READ_ONLY, + ResultSet.HOLD_CURSORS_OVER_COMMIT); Assert.assertSame(raw, stmt.unwrap(MockPreparedStatement.class)); stmt.close(); } @@ -336,7 +335,7 @@ public void test_preCall_error() throws Exception { SQLException error = null; try { conn.prepareCall("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); } catch (SQLException ex) { error = ex; } @@ -386,13 +385,13 @@ public void test_prepCall() throws Exception { MockPreparedStatement raw = null; { PreparedStatement stmt = conn.prepareCall("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); raw = stmt.unwrap(MockPreparedStatement.class); stmt.close(); } { PreparedStatement stmt = conn.prepareCall("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); Assert.assertEquals(raw, stmt.unwrap(MockPreparedStatement.class)); stmt.close(); } @@ -406,13 +405,13 @@ public void test_prepCall_1() throws Exception { MockPreparedStatement raw = null; { PreparedStatement stmt = conn.prepareCall("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY); + ResultSet.CONCUR_READ_ONLY); raw = stmt.unwrap(MockPreparedStatement.class); stmt.close(); } { PreparedStatement stmt = conn.prepareCall("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY); + ResultSet.CONCUR_READ_ONLY); Assert.assertEquals(raw, stmt.unwrap(MockPreparedStatement.class)); stmt.close(); } @@ -451,7 +450,7 @@ public void test_create_1() throws Exception { SQLException error = null; try { conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); } catch (SQLException ex) { error = ex; } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java index a65ee055c0..635501b76a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java @@ -33,8 +33,7 @@ import com.alibaba.druid.stat.JdbcStatManager; public class ConnectionTest5 extends PoolTestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -154,15 +153,12 @@ public void test_handleException_4() throws Exception { public void test_handleException_5() throws Exception { DruidPooledConnection conn = dataSource.getConnection().unwrap(DruidPooledConnection.class); conn.addConnectionEventListener(new ConnectionEventListener() { - @Override public void connectionClosed(ConnectionEvent event) { - } @Override public void connectionErrorOccurred(ConnectionEvent event) { - } }); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java index c806da5229..16629329a6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java @@ -36,8 +36,7 @@ import com.alibaba.druid.stat.JdbcStatManager; public class DataSourceTest3 extends PoolTestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -241,7 +240,7 @@ public void test_ValidConnectionChecker() throws Exception { dataSource.getValidConnectionCheckerClassName(); dataSource.setValidConnectionChecker(new MySqlValidConnectionChecker(false)); Assert.assertEquals(MySqlValidConnectionChecker.class.getName(), - dataSource.getValidConnectionCheckerClassName()); + dataSource.getValidConnectionCheckerClassName()); } public void test_setConnectionInitSqls_1() throws Exception { @@ -250,13 +249,12 @@ public void test_setConnectionInitSqls_1() throws Exception { } public static class MyPasswordCallbackClassName extends PasswordCallback { - - public MyPasswordCallbackClassName(){ + public MyPasswordCallbackClassName() { super("password", false); } /** - * + * */ private static final long serialVersionUID = 1L; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/DruidDataSourceFactoryTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/DruidDataSourceFactoryTest.java index 92b1068f38..40164eebf7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/DruidDataSourceFactoryTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/DruidDataSourceFactoryTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.pool.DruidDataSourceFactory; public class DruidDataSourceFactoryTest extends TestCase { - @SuppressWarnings("serial") public void test_factory() throws Exception { DruidDataSourceFactory factory = new DruidDataSourceFactory(); @@ -38,7 +37,6 @@ public void test_factory() throws Exception { Reference ref = new Reference("javax.sql.DataSource"); ref.add(new RefAddr("user") { - @Override public Object getContent() { return null; @@ -46,7 +44,6 @@ public Object getContent() { }); ref.add(new RefAddr("defaultReadOnly") { - @Override public Object getContent() { return Boolean.TRUE; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest.java index 963e80d2c5..be19b98a8b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest.java @@ -11,7 +11,6 @@ import junit.framework.TestCase; public class MaxEvictableIdleTimeMillisTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -40,7 +39,7 @@ public void test_error() throws Exception { Assert.assertNotNull(error); Assert.assertEquals(100, dataSource.getMaxEvictableIdleTimeMillis()); } - + public void test_error2() throws Exception { Exception error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java index c1ec2680dc..535b5a4210 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java @@ -5,7 +5,6 @@ import org.junit.Assert; public class MaxEvictableIdleTimeMillisTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -14,7 +13,7 @@ protected void setUp() throws Exception { dataSource.setTestOnBorrow(false); dataSource.setMaxActive(50); dataSource.setMinIdle(5); - + } @@ -38,6 +37,6 @@ public void test_error() throws Exception { Assert.assertTrue(dataSource.isInited()); Assert.assertEquals(30, dataSource.getMaxEvictableIdleTimeMillis()); } - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxPhyTimeMillisTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxPhyTimeMillisTest.java index 8ea1d50876..1998a3c5e4 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxPhyTimeMillisTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxPhyTimeMillisTest.java @@ -11,7 +11,6 @@ import junit.framework.TestCase; public class MaxPhyTimeMillisTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java index 8cb87e3afc..51741b14c0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java @@ -32,10 +32,9 @@ import com.alibaba.druid.pool.PreparedStatementHolder; public class PoolableCallableStatementTest extends TestCase { - - private DruidDataSource dataSource = new DruidDataSource(); - protected DruidPooledConnection conn; - protected MockCallableStatement raw; + private DruidDataSource dataSource = new DruidDataSource(); + protected DruidPooledConnection conn; + protected MockCallableStatement raw; protected DruidPooledCallableStatement stmt; protected void setUp() throws Exception { @@ -44,9 +43,8 @@ protected void setUp() throws Exception { conn = new DruidPooledConnection(connHolder); raw = new MockCallableStatement(null, null); stmt = new DruidPooledCallableStatement(conn, new PreparedStatementHolder(new PreparedStatementKey("", null, - null, 0, 0, - 0), raw)) { - + null, 0, 0, + 0), raw)) { protected SQLException checkException(Throwable error) throws SQLException { if (error instanceof SQLException) { return (SQLException) error; @@ -77,7 +75,6 @@ public void test_basic() throws Exception { @SuppressWarnings("deprecation") public void test_callableStmt() throws Exception { - Assert.assertTrue(stmt.wasNull() == false); stmt.getString(1); Assert.assertTrue(stmt.wasNull()); @@ -455,7 +452,6 @@ public void test_get_error() { } public void test_getNClob() throws Exception { - stmt.getNClob(1); stmt.getNClob("1"); @@ -481,7 +477,6 @@ public void test_getNClob() throws Exception { } public void test_getNString() throws Exception { - stmt.getNString(1); stmt.getNString("1"); @@ -507,7 +502,6 @@ public void test_getNString() throws Exception { } public void test_getNCharacterStream() throws Exception { - stmt.getNCharacterStream(1); stmt.getNCharacterStream("1"); @@ -533,7 +527,6 @@ public void test_getNCharacterStream() throws Exception { } public void test_getCharacterStream() throws Exception { - stmt.getCharacterStream(1); stmt.getCharacterStream("1"); @@ -559,7 +552,6 @@ public void test_getCharacterStream() throws Exception { } public void test_updateCharacterStream_2() throws Exception { - stmt.setCharacterStream(1, (Reader) null, 1L); stmt.setCharacterStream("1", (Reader) null, 1L); @@ -585,7 +577,6 @@ public void test_updateCharacterStream_2() throws Exception { } public void test_setNClob() throws Exception { - stmt.setNClob(1, (Reader) null); stmt.setNClob("1", (Reader) null); @@ -611,7 +602,6 @@ public void test_setNClob() throws Exception { } public void test_setClob() throws Exception { - stmt.setClob(1, (Reader) null); stmt.setClob("1", (Reader) null); @@ -637,7 +627,6 @@ public void test_setClob() throws Exception { } public void test_setNCharacterStream() throws Exception { - stmt.setNCharacterStream(1, (Reader) null); stmt.setNCharacterStream("1", (Reader) null); @@ -663,7 +652,6 @@ public void test_setNCharacterStream() throws Exception { } public void test_setCharacterStream() throws Exception { - stmt.setCharacterStream(1, (Reader) null); stmt.setCharacterStream("1", (Reader) null); @@ -689,7 +677,6 @@ public void test_setCharacterStream() throws Exception { } public void test_setBinaryStream() throws Exception { - stmt.setBinaryStream(1, (InputStream) null); stmt.setBinaryStream("1", (InputStream) null); @@ -715,7 +702,6 @@ public void test_setBinaryStream() throws Exception { } public void test_setBinaryStream_1() throws Exception { - stmt.setBinaryStream(1, (InputStream) null, 1); stmt.setBinaryStream("1", (InputStream) null, 1); @@ -741,7 +727,6 @@ public void test_setBinaryStream_1() throws Exception { } public void test_setBinaryStream_2() throws Exception { - stmt.setBinaryStream(1, (InputStream) null, 1L); stmt.setBinaryStream("1", (InputStream) null, 1L); @@ -767,7 +752,6 @@ public void test_setBinaryStream_2() throws Exception { } public void test_setAsciiStream() throws Exception { - stmt.setAsciiStream(1, (InputStream) null); stmt.setAsciiStream("1", (InputStream) null); @@ -793,7 +777,6 @@ public void test_setAsciiStream() throws Exception { } public void test_setBlob() throws Exception { - stmt.setBlob(1, (InputStream) null); stmt.setBlob("1", (InputStream) null); @@ -819,7 +802,6 @@ public void test_setBlob() throws Exception { } public void test_setClob_1() throws Exception { - stmt.setClob(1, (Clob) null); stmt.setClob("1", (Clob) null); @@ -845,7 +827,6 @@ public void test_setClob_1() throws Exception { } public void test_setClob_2() throws Exception { - stmt.setClob(1, (Reader) null, 1L); stmt.setClob("1", (Reader) null, 1L); @@ -871,7 +852,6 @@ public void test_setClob_2() throws Exception { } public void test_setAsciiStream_1() throws Exception { - stmt.setAsciiStream(1, (InputStream) null, 1L); stmt.setAsciiStream("1", (InputStream) null, 1L); @@ -897,7 +877,6 @@ public void test_setAsciiStream_1() throws Exception { } public void test_setNull() throws Exception { - stmt.setNull(1, Types.INTEGER, "Int"); stmt.setNull("1", Types.INTEGER, "Int"); @@ -923,7 +902,6 @@ public void test_setNull() throws Exception { } public void test_setTimestamp() throws Exception { - stmt.setTimestamp(1, (Timestamp) null); stmt.setTimestamp("1", (Timestamp) null); @@ -949,7 +927,6 @@ public void test_setTimestamp() throws Exception { } public void test_setTimestamp_1() throws Exception { - stmt.setTimestamp(1, (Timestamp) null, null); stmt.setTimestamp("1", (Timestamp) null, null); @@ -975,7 +952,6 @@ public void test_setTimestamp_1() throws Exception { } public void test_setTime() throws Exception { - stmt.setTime(1, (Time) null); stmt.setTime("1", (Time) null); @@ -1001,7 +977,6 @@ public void test_setTime() throws Exception { } public void test_setTime_1() throws Exception { - stmt.setTime(1, (Time) null, null); stmt.setTime("1", (Time) null, null); @@ -1027,7 +1002,6 @@ public void test_setTime_1() throws Exception { } public void test_setDate() throws Exception { - stmt.setDate(1, (Date) null); stmt.setDate("1", (Date) null); @@ -1053,7 +1027,6 @@ public void test_setDate() throws Exception { } public void test_setDate_1() throws Exception { - stmt.setDate(1, (Date) null, null); stmt.setDate("1", (Date) null, null); @@ -1079,7 +1052,6 @@ public void test_setDate_1() throws Exception { } public void test_setCharacterStream_1() throws Exception { - stmt.setCharacterStream(1, (Reader) null, 1); stmt.setCharacterStream("1", (Reader) null, 1); @@ -1105,7 +1077,6 @@ public void test_setCharacterStream_1() throws Exception { } public void test_setObject() throws Exception { - stmt.setObject(1, null); stmt.setObject("1", null); @@ -1131,7 +1102,6 @@ public void test_setObject() throws Exception { } public void test_setObject_1() throws Exception { - stmt.setObject(1, null, Types.INTEGER); stmt.setObject("1", null, Types.INTEGER); @@ -1157,7 +1127,6 @@ public void test_setObject_1() throws Exception { } public void test_setObject_2() throws Exception { - stmt.setObject(1, null, Types.INTEGER, 2); stmt.setObject("1", null, Types.INTEGER, 2); @@ -1183,7 +1152,6 @@ public void test_setObject_2() throws Exception { } public void test_setAsciiStream_2() throws Exception { - stmt.setAsciiStream(1, (InputStream) null, 1); stmt.setAsciiStream("1", (InputStream) null, 1); @@ -1209,7 +1177,6 @@ public void test_setAsciiStream_2() throws Exception { } public void test_setBytes() throws Exception { - stmt.setBytes(1, null); stmt.setBytes("1", null); @@ -1235,7 +1202,6 @@ public void test_setBytes() throws Exception { } public void test_setString() throws Exception { - stmt.setString(1, null); stmt.setString("1", null); @@ -1261,7 +1227,6 @@ public void test_setString() throws Exception { } public void test_setBigDecimal() throws Exception { - stmt.setBigDecimal(1, null); stmt.setBigDecimal("1", null); @@ -1287,7 +1252,6 @@ public void test_setBigDecimal() throws Exception { } public void test_setDouble() throws Exception { - stmt.setDouble(1, 1.0D); stmt.setDouble("1", 1.0D); @@ -1313,7 +1277,6 @@ public void test_setDouble() throws Exception { } public void test_setFloat() throws Exception { - stmt.setFloat(1, 1.0F); stmt.setFloat("1", 1.0F); @@ -1339,7 +1302,6 @@ public void test_setFloat() throws Exception { } public void test_setLong() throws Exception { - stmt.setLong(1, 2); stmt.setLong("1", 2); @@ -1365,7 +1327,6 @@ public void test_setLong() throws Exception { } public void test_setInt() throws Exception { - stmt.setInt(1, 2); stmt.setInt("1", 2); @@ -1391,7 +1352,6 @@ public void test_setInt() throws Exception { } public void test_setShort() throws Exception { - stmt.setShort(1, Short.MAX_VALUE); stmt.setShort("1", Short.MAX_VALUE); @@ -1417,7 +1377,6 @@ public void test_setShort() throws Exception { } public void test_setByte() throws Exception { - stmt.setByte(1, Byte.MAX_VALUE); stmt.setByte("1", Byte.MAX_VALUE); @@ -1443,7 +1402,6 @@ public void test_setByte() throws Exception { } public void test_getClob() throws Exception { - stmt.getClob(1); stmt.getClob("1"); @@ -1469,7 +1427,6 @@ public void test_getClob() throws Exception { } public void test_getArray() throws Exception { - stmt.getArray(1); stmt.getArray("1"); @@ -1495,7 +1452,6 @@ public void test_getArray() throws Exception { } public void test_getDate() throws Exception { - stmt.getDate(1); stmt.getDate("1"); @@ -1521,7 +1477,6 @@ public void test_getDate() throws Exception { } public void test_getDate_1() throws Exception { - stmt.getDate(1, null); stmt.getDate("1", null); @@ -1547,7 +1502,6 @@ public void test_getDate_1() throws Exception { } public void test_getTime() throws Exception { - stmt.getTime(1); stmt.getTime("1"); @@ -1573,7 +1527,6 @@ public void test_getTime() throws Exception { } public void test_getTime_1() throws Exception { - stmt.getTime(1, null); stmt.getTime("1", null); @@ -1599,7 +1552,6 @@ public void test_getTime_1() throws Exception { } public void test_getTimestamp() throws Exception { - stmt.getTimestamp(1); stmt.getTimestamp("1"); @@ -1625,7 +1577,6 @@ public void test_getTimestamp() throws Exception { } public void test_getTimestamp_1() throws Exception { - stmt.getTimestamp(1, null); stmt.getTimestamp("1", null); @@ -1651,7 +1602,6 @@ public void test_getTimestamp_1() throws Exception { } public void test_getURL() throws Exception { - stmt.getURL(1); stmt.getURL("1"); @@ -1677,7 +1627,6 @@ public void test_getURL() throws Exception { } public void test_setBlob_1() throws Exception { - stmt.setBlob(1, (Blob) null); stmt.setBlob("1", (Blob) null); @@ -1703,7 +1652,6 @@ public void test_setBlob_1() throws Exception { } public void test_setSQLXML() throws Exception { - stmt.setSQLXML(1, (SQLXML) null); stmt.setSQLXML("1", (SQLXML) null); @@ -1729,7 +1677,6 @@ public void test_setSQLXML() throws Exception { } public void test_getSQLXML() throws Exception { - stmt.getSQLXML(1); stmt.getSQLXML("1"); @@ -1755,7 +1702,6 @@ public void test_getSQLXML() throws Exception { } public void test_setBlob_2() throws Exception { - stmt.setBlob(1, (InputStream) null, 1L); stmt.setBlob("1", (InputStream) null, 1L); @@ -1781,7 +1727,6 @@ public void test_setBlob_2() throws Exception { } public void test_setNClob_1() throws Exception { - stmt.setNClob(1, (Reader) null, 1L); stmt.setNClob("1", (Reader) null, 1L); @@ -1807,7 +1752,6 @@ public void test_setNClob_1() throws Exception { } public void test_setNCharacterStream_1() throws Exception { - stmt.setNCharacterStream(1, (Reader) null, 1L); stmt.setNCharacterStream("1", (Reader) null, 1L); @@ -1833,7 +1777,6 @@ public void test_setNCharacterStream_1() throws Exception { } public void test_setRowId() throws Exception { - stmt.setRowId(1, (RowId) null); stmt.setRowId("1", (RowId) null); @@ -1859,7 +1802,6 @@ public void test_setRowId() throws Exception { } public void test_getRowId() throws Exception { - stmt.getRowId(1); stmt.getRowId("1"); @@ -1885,7 +1827,6 @@ public void test_getRowId() throws Exception { } public void test_setNString() throws Exception { - stmt.setNString(1, (String) null); stmt.setNString("1", (String) null); @@ -1911,7 +1852,6 @@ public void test_setNString() throws Exception { } public void test_getObject() throws Exception { - stmt.getObject(1, (java.util.Map) null); stmt.getObject("1", (java.util.Map) null); @@ -1937,7 +1877,6 @@ public void test_getObject() throws Exception { } public void test_setBoolean() throws Exception { - stmt.setBoolean(1, true); stmt.setBoolean("1", true); @@ -1963,7 +1902,6 @@ public void test_setBoolean() throws Exception { } public void test_setURL() throws Exception { - stmt.setURL(1, null); stmt.setURL("1", null); @@ -1989,7 +1927,6 @@ public void test_setURL() throws Exception { } public void test_setNClob_2() throws Exception { - stmt.setNClob(1, (NClob) null); stmt.setNClob("1", (NClob) null); @@ -2015,7 +1952,6 @@ public void test_setNClob_2() throws Exception { } public void test_setNull_1() throws Exception { - stmt.setNull(1, Types.INTEGER); stmt.setNull("1", Types.INTEGER); @@ -2041,7 +1977,6 @@ public void test_setNull_1() throws Exception { } public void test_registerOutParameter() throws Exception { - stmt.registerOutParameter(1, Types.INTEGER, "Int"); stmt.registerOutParameter("1", Types.INTEGER, "Int"); @@ -2067,7 +2002,6 @@ public void test_registerOutParameter() throws Exception { } public void test_registerOutParameter_1() throws Exception { - stmt.registerOutParameter(1, Types.INTEGER, 2); stmt.registerOutParameter("1", Types.INTEGER, 2); @@ -2093,7 +2027,6 @@ public void test_registerOutParameter_1() throws Exception { } public void test_registerOutParameter_2() throws Exception { - stmt.registerOutParameter(1, Types.INTEGER); stmt.registerOutParameter("1", Types.INTEGER); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolablePreparedStatementTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolablePreparedStatementTest.java index 910a5c6e9c..b76368df49 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolablePreparedStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolablePreparedStatementTest.java @@ -38,21 +38,19 @@ import com.alibaba.druid.pool.PreparedStatementHolder; public class PoolablePreparedStatementTest extends TestCase { - - protected MockPreparedStatement raw; + protected MockPreparedStatement raw; protected DruidPooledPreparedStatement stmt; protected void setUp() throws Exception { - DruidDataSource dataSource = new DruidDataSource(); + DruidDataSource dataSource = new DruidDataSource(); MockConnection mockConn = new MockConnection(); DruidConnectionHolder connHolder = new DruidConnectionHolder(dataSource, mockConn, 0); DruidPooledConnection conn = new DruidPooledConnection(connHolder); raw = new MockPreparedStatement(null, null); stmt = new DruidPooledPreparedStatement(conn, new PreparedStatementHolder(new PreparedStatementKey("", null, - null, 0, 0, - 0), raw)) { - + null, 0, 0, + 0), raw)) { protected SQLException checkException(Throwable error) throws SQLException { if (error instanceof SQLException) { return (SQLException) error; @@ -337,7 +335,6 @@ public void test_setBinaryStream() throws Exception { } public void test_updateCharacterStream_2() throws Exception { - stmt.setCharacterStream(1, (Reader) null, 1L); { @@ -352,7 +349,6 @@ public void test_updateCharacterStream_2() throws Exception { } public void test_setRef() throws Exception { - stmt.setRef(1, null); { @@ -367,7 +363,6 @@ public void test_setRef() throws Exception { } public void test_setArray() throws Exception { - stmt.setArray(1, null); { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest.java index 504441fce3..de01bed316 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest.java @@ -26,14 +26,12 @@ import com.alibaba.druid.pool.DruidPooledStatement; public class PoolableStatementTest extends TestCase { - - protected Statement raw; + protected Statement raw; protected DruidPooledStatement stmt; protected void setUp() throws Exception { raw = new MockStatement(null); stmt = new DruidPooledStatement(null, raw) { - protected SQLException checkException(Throwable error) throws SQLException { if (error instanceof SQLException) { return (SQLException) error; @@ -45,7 +43,6 @@ protected SQLException checkException(Throwable error) throws SQLException { } protected void tearDown() throws Exception { - } public void test_basic() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java index 56649339e9..0f7e6516b8 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java @@ -34,8 +34,7 @@ import com.alibaba.druid.stat.JdbcStatManager; public class PoolableStatementTest2 extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest3.java index 7c6823b515..19acc8b079 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest3.java @@ -23,17 +23,14 @@ import com.alibaba.druid.pool.DruidPooledStatement; public class PoolableStatementTest3 extends TestCase { - public void test_clearResultSetError() throws Exception { final MockResultSet rs = new MockResultSet(null) { - public void close() throws SQLException { throw new SQLException(); } }; DruidPooledStatement stmt = new DruidPooledStatement(null, null) { - public void close() throws SQLException { addResultSetTrace(rs); clearResultSet(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java index 846b332359..f6eeb2fc2b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java @@ -22,7 +22,6 @@ import com.alibaba.druid.pool.PoolableWrapper; public class PoolableWrapperTest extends TestCase { - public void test_isWrapper() throws Exception { PoolableWrapper wrapper = new PoolableWrapper(new MockConnection()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PreparedStatementKeyTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PreparedStatementKeyTest.java index 3cd0d0f36f..5365bfbccd 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PreparedStatementKeyTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PreparedStatementKeyTest.java @@ -29,7 +29,6 @@ import com.alibaba.druid.pool.PreparedStatementPool.MethodType; public class PreparedStatementKeyTest extends TestCase { - public void test_equals_0() throws Exception { PreparedStatementKey k1 = new PreparedStatementKey("x1", "c1", MethodType.M1); PreparedStatementKey k2 = new PreparedStatementKey("x1", "c2", MethodType.M1); @@ -111,7 +110,7 @@ public void test_equals_6() throws Exception { Assert.assertFalse(k3.equals(k2)); Assert.assertFalse(k3.equals(k1)); } - + public void test_equals_7() throws Exception { PreparedStatementKey k1 = new PreparedStatementKey("x1", null, MethodType.M1, 0, 0); PreparedStatementKey k2 = new PreparedStatementKey("x1", null, MethodType.M1, 1, 0); @@ -126,7 +125,7 @@ public void test_equals_7() throws Exception { Assert.assertFalse(k3.equals(k2)); Assert.assertFalse(k3.equals(k1)); } - + public void test_equals_8() throws Exception { PreparedStatementKey k1 = new PreparedStatementKey("x1", null, MethodType.M1, 0, 0, 0); PreparedStatementKey k2 = new PreparedStatementKey("x1", null, MethodType.M1, 0, 0, 1); @@ -141,14 +140,14 @@ public void test_equals_8() throws Exception { Assert.assertFalse(k3.equals(k2)); Assert.assertFalse(k3.equals(k1)); } - + public void test_equals_9() throws Exception { PreparedStatementKey k1 = new PreparedStatementKey("x1", null, MethodType.M1, 2); - PreparedStatementKey k2 = new PreparedStatementKey("x1", null, MethodType.M1, new int[] {}); - PreparedStatementKey k3 = new PreparedStatementKey("x2", null, MethodType.M1, new String[] {}); - + PreparedStatementKey k2 = new PreparedStatementKey("x1", null, MethodType.M1, new int[]{}); + PreparedStatementKey k3 = new PreparedStatementKey("x2", null, MethodType.M1, new String[]{}); + k1.hashCode(); - + Assert.assertFalse(k1.equals(k2)); Assert.assertFalse(k1.equals(k3)); Assert.assertFalse(k2.equals(k1)); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest.java index 23b3834f58..cbd6ce22e2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest.java @@ -34,14 +34,12 @@ import com.alibaba.druid.pool.DruidPooledStatement; public class ResultSetTest extends TestCase { - private DruidPooledStatement stmt; - private MockResultSet raw; + private MockResultSet raw; private DruidPooledResultSet resultSet; protected void setUp() throws Exception { stmt = new DruidPooledStatement(null, null) { - protected SQLException checkException(Throwable error) throws SQLException { if (error instanceof SQLException) { return (SQLException) error; @@ -52,13 +50,12 @@ protected SQLException checkException(Throwable error) throws SQLException { }; raw = new MockResultSet(null); - raw.getRows().add(new Object[] { null }); + raw.getRows().add(new Object[]{null}); resultSet = new DruidPooledResultSet(stmt, raw); } @SuppressWarnings("deprecation") public void test_get() throws Exception { - Assert.assertTrue(stmt == resultSet.getPoolableStatement()); Assert.assertTrue(raw == resultSet.getRawResultSet()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest2.java index 50a53b739b..0ac3df2954 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest2.java @@ -27,14 +27,12 @@ import com.alibaba.druid.pool.DruidPooledStatement; public class ResultSetTest2 extends TestCase { - private DruidPooledStatement stmt; - private MockResultSet raw; + private MockResultSet raw; private DruidPooledResultSet resultSet; protected void setUp() throws Exception { stmt = new DruidPooledStatement(null, null) { - protected SQLException checkException(Throwable error) throws SQLException { if (error instanceof SQLException) { return (SQLException) error; @@ -45,7 +43,7 @@ protected SQLException checkException(Throwable error) throws SQLException { }; raw = new MockResultSet(null); - raw.getRows().add(new Object[] { null }); + raw.getRows().add(new Object[]{null}); resultSet = new DruidPooledResultSet(stmt, raw); } @@ -624,7 +622,6 @@ public void test_findColumn() throws Exception { public void test_closeError() throws Exception { MockResultSet mock = new MockResultSet(null) { - public void close() throws SQLException { throw new SQLException(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java index b6b5748f69..b02c485009 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java @@ -27,8 +27,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestCommit extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java index a8d7e86c4d..3afe96d877 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java @@ -32,8 +32,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDataSourceBasic extends PoolTestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java index b80e44c31a..ec66ca0526 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java @@ -28,7 +28,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDataSourceBasic2 extends PoolTestCase { - public void test_0() throws Exception { DruidDataSourceStatManager.clear(); @@ -55,7 +54,7 @@ public void test_0() throws Exception { assertEquals(1, dataSource.getConnectProperties().size()); assertEquals(0, dataSource.getConnectionInitSqls().size()); - dataSource.setConnectionInitSqls(Arrays. asList("SELECT 1", null, "")); + dataSource.setConnectionInitSqls(Arrays.asList("SELECT 1", null, "")); assertEquals(1, dataSource.getConnectionInitSqls().size()); assertEquals(500, dataSource.getTimeBetweenConnectErrorMillis()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java index f4af86a021..3c4caa7c36 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java @@ -28,10 +28,9 @@ import com.alibaba.druid.support.logging.Log; public class ConnectPropertiesChangeTest extends PoolTestCase { - private DruidDataSource dataSource; - private Log dataSourceLog; + private Log dataSourceLog; protected void setUp() throws Exception { super.setUp(); @@ -91,11 +90,11 @@ public void test_connectPropertiesChange() throws Exception { Assert.assertEquals("true", dataSource.getConnectProperties().getProperty("druid.stat.mergeSql")); Assert.assertEquals("5", dataSource.getConnectProperties().getProperty("b")); Assert.assertEquals("6", dataSource.getConnectProperties().getProperty("c")); - + dataSource.setConnectionProperties("b=5;c=6;druid.stat.mergeSql=false"); Assert.assertFalse(filter.isMergeSql()); - + Assert.assertEquals("false", dataSource.getConnectProperties().getProperty("druid.stat.mergeSql")); Assert.assertEquals("5", dataSource.getConnectProperties().getProperty("b")); Assert.assertEquals("6", dataSource.getConnectProperties().getProperty("c")); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java index f80fe6fbcc..712ba0bc45 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java @@ -28,10 +28,9 @@ import com.alibaba.druid.support.logging.Log; public class ConnectPropertiesChangeTest1 extends PoolTestCase { - private DruidDataSource dataSource; - private Log dataSourceLog; + private Log dataSourceLog; protected void setUp() throws Exception { super.setUp(); @@ -70,7 +69,7 @@ public void test_connectPropertiesChange() throws Exception { dataSource.setConnectionProperties("druid.stat.mergeSql=true;druid.stat.sql.MaxSize=456"); Assert.assertEquals(456, dataSource.getDataSourceStat().getMaxSqlSize()); - + Assert.assertTrue(filter.isMergeSql()); Assert.assertEquals(2, dataSource.getConnectProperties().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/DruidDataSourceStatLoggerImplTest.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/DruidDataSourceStatLoggerImplTest.java index d8e05fb2ee..094b365e8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/DruidDataSourceStatLoggerImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/DruidDataSourceStatLoggerImplTest.java @@ -13,10 +13,9 @@ import com.alibaba.druid.support.logging.Log; public class DruidDataSourceStatLoggerImplTest extends PoolTestCase { - private DruidDataSource dataSource; - private Log statLog; + private Log statLog; protected void setUp() throws Exception { super.setUp(); @@ -47,7 +46,7 @@ public void test_connectPropertiesChange() throws Exception { Assert.assertTrue(dataSource.isWrapperFor(DruidDataSourceStatLoggerImpl.class)); DruidDataSourceStatLoggerImpl loggerImpl = dataSource.unwrap(DruidDataSourceStatLoggerImpl.class); Assert.assertSame(statLog, loggerImpl.getLogger()); - + dataSource.setConnectionProperties("druid.stat.loggerName=xxx"); Assert.assertNotSame(statLog, loggerImpl.getLogger()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java index b93ca873a0..a33c6b46ed 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.util.JdbcUtils; public class MaxActiveChangeTest extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java index f2eb04fa2c..07c45106ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java @@ -28,10 +28,9 @@ import com.alibaba.druid.support.logging.Log; public class PoolPreparedStatementsChangeTest extends PoolTestCase { - private DruidDataSource dataSource; - private Log dataSourceLog; + private Log dataSourceLog; protected void setUp() throws Exception { super.setUp(); @@ -84,34 +83,34 @@ public void test_connectPropertiesChange() throws Exception { } Assert.assertEquals(1, dataSource.getCachedPreparedStatementCount()); Assert.assertEquals(1, dataSource.getCachedPreparedStatementAccessCount()); - + { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement(sql); stmt.setString(1, "xxx"); ResultSet rs = stmt.executeQuery(); - + rs.close(); - + conn.close(); } Assert.assertEquals(1, dataSource.getCachedPreparedStatementCount()); Assert.assertEquals(2, dataSource.getCachedPreparedStatementAccessCount()); - + dataSource.setPoolPreparedStatements(false); Assert.assertEquals(0, dataSource.getCachedPreparedStatementCount()); Assert.assertEquals(2, dataSource.getCachedPreparedStatementAccessCount()); - + { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement(sql); stmt.setString(1, "xxx"); ResultSet rs = stmt.executeQuery(); - + rs.close(); - + conn.close(); } Assert.assertEquals(0, dataSource.getCachedPreparedStatementCount()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/SqlSkipCountTest.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/SqlSkipCountTest.java index 674f0683fb..d13020de9a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/SqlSkipCountTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/SqlSkipCountTest.java @@ -14,10 +14,9 @@ import com.alibaba.druid.support.logging.Log; public class SqlSkipCountTest extends PoolTestCase { - private DruidDataSource dataSource; - private Log dataSourceLog; + private Log dataSourceLog; protected void setUp() throws Exception { super.setUp(); @@ -56,7 +55,7 @@ public void test_connectPropertiesChange() throws Exception { Assert.assertEquals(1000, statValue.getSqlList().size()); Assert.assertEquals(1000, statValue.getSqlSkipCount()); } - + dataSource.setConnectionProperties("druid.stat.sql.MaxSize=2000"); for (int i = 0; i < 2000; ++i) { Connection conn = dataSource.getConnection(); @@ -75,7 +74,7 @@ public void test_connectPropertiesChange() throws Exception { Assert.assertEquals(0, statValue.getSqlList().size()); Assert.assertEquals(0, statValue.getSqlSkipCount()); } - + dataSource.setConnectionProperties("druid.stat.sql.MaxSize=2000"); for (int i = 0; i < 2000; ++i) { Connection conn = dataSource.getConnection(); @@ -89,7 +88,7 @@ public void test_connectPropertiesChange() throws Exception { Assert.assertEquals(2000, statValue.getSqlList().size()); Assert.assertEquals(0, statValue.getSqlSkipCount()); } - + dataSource.setConnectionProperties("druid.stat.sql.MaxSize=100"); for (int i = 0; i < 2000; ++i) { Connection conn = dataSource.getConnection(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OceanBaseOracleExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OceanBaseOracleExceptionSorterTest.java index 347dfb0b7d..25bb9fb3ae 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OceanBaseOracleExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OceanBaseOracleExceptionSorterTest.java @@ -14,12 +14,11 @@ import java.sql.SQLException; public class OceanBaseOracleExceptionSorterTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OceanBaseOracleExceptionSorter()); @@ -68,10 +67,10 @@ public void test_connect() throws Exception { } catch (SQLException ex) { commitError = ex; } - + Assert.assertNotNull(commitError); Assert.assertSame(exception, commitError.getCause()); - + conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java index 659870ce92..f86cdc4629 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java @@ -15,12 +15,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -69,10 +68,10 @@ public void test_connect() throws Exception { } catch (SQLException ex) { commitError = ex; } - + Assert.assertNotNull(commitError); Assert.assertSame(exception, commitError.getCause()); - + conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java index ff8bb81f22..ded985f0c7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java @@ -17,12 +17,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_closeConn extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -47,7 +46,7 @@ public void test_connect() throws Exception { pstmt.execute(); pstmt.close(); conn.close(); - + Assert.assertEquals(0, dataSource.getActiveCount()); Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getCreateCount()); @@ -66,7 +65,7 @@ public void test_connect() throws Exception { Assert.assertEquals(1, dataSource.getActiveCount()); conn.close(); Assert.assertEquals(0, dataSource.getActiveCount()); - + { Connection conn2 = dataSource.getConnection(); conn2.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java index f3f8638e83..ef69e68574 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java @@ -17,12 +17,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_closeConn_1 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -47,7 +46,7 @@ public void test_connect() throws Exception { pstmt.execute(); pstmt.close(); conn.close(); - + Assert.assertEquals(0, dataSource.getActiveCount()); Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getCreateCount()); @@ -63,7 +62,7 @@ public void test_connect() throws Exception { mockConn.setError(exception); conn.close(); - + { Connection conn2 = dataSource.getConnection(); conn2.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java index 8e6ace6ad7..8e1f90324e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java @@ -17,12 +17,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_closeConn_2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -47,7 +46,7 @@ public void test_connect() throws Exception { pstmt.execute(); pstmt.close(); conn.close(); - + Assert.assertEquals(0, dataSource.getActiveCount()); Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getCreateCount()); @@ -63,7 +62,7 @@ public void test_connect() throws Exception { mockConn.setError(exception); conn.close(); - + { Connection conn2 = dataSource.getConnection(); conn2.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java index 8d1084f526..cf5fe372c6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java @@ -17,12 +17,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_closeConn_3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -47,7 +46,7 @@ public void test_connect() throws Exception { pstmt.execute(); pstmt.close(); conn.close(); - + Assert.assertEquals(0, dataSource.getActiveCount()); Assert.assertEquals(1, dataSource.getPoolingCount()); Assert.assertEquals(1, dataSource.getCreateCount()); @@ -64,7 +63,7 @@ public void test_connect() throws Exception { mockConn.setError(exception); conn.close(); - + { Connection conn2 = dataSource.getConnection(); conn2.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeStmt.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeStmt.java index 95df717c6b..9d611eaf34 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeStmt.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeStmt.java @@ -17,12 +17,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_closeStmt extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(closedErrror); Assert.assertSame(exception, closedErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java index 56447bd9e2..0eb2bafb06 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java @@ -17,12 +17,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_commit extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -71,7 +70,7 @@ public void test_connect() throws Exception { commitError = ex; } Assert.assertNotNull(commitError); - + conn.close(); { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_concurrent.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_concurrent.java index 884e8ea066..228b8003a1 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_concurrent.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_concurrent.java @@ -18,7 +18,6 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_concurrent extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -46,7 +45,6 @@ public void test_connect() throws Exception { final CountDownLatch latch_0 = new CountDownLatch(1); Thread errorThread = new Thread() { - public void run() { try { Connection conn = dataSource.getConnection(); @@ -76,7 +74,6 @@ public void run() { final CountDownLatch workCompleteLatch = new CountDownLatch(2); for (int i = 0; i < 2; ++i) { Thread thread = new Thread() { - public void run() { try { for (int i = 0; i < 1000; ++i) { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java index 9f8229254a..7dc41ed5b6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java @@ -17,12 +17,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_rollback extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -72,7 +71,7 @@ public void test_connect() throws Exception { rollbackError = ex; } Assert.assertNotNull(rollbackError); - + conn.close(); { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java index 0d3d816e43..83dd57de5d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java @@ -17,12 +17,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_setCatalog extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -56,7 +55,7 @@ public void test_connect() throws Exception { DruidPooledConnection conn = dataSource.getConnection(); MockConnection mockConn = conn.unwrap(MockConnection.class); Assert.assertNotNull(mockConn); - + SQLException exception = new SQLException("xx", "xxx", 28); mockConn.setError(exception); @@ -67,7 +66,7 @@ public void test_connect() throws Exception { setError = ex; } Assert.assertNotNull(setError); - + conn.close(); { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java index ef221a19b7..78ac699aab 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java @@ -17,12 +17,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_setIsolationLevel extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -56,7 +55,7 @@ public void test_connect() throws Exception { DruidPooledConnection conn = dataSource.getConnection(); MockConnection mockConn = conn.unwrap(MockConnection.class); Assert.assertNotNull(mockConn); - + SQLException exception = new SQLException("xx", "xxx", 28); mockConn.setError(exception); @@ -67,7 +66,7 @@ public void test_connect() throws Exception { setError = ex; } Assert.assertNotNull(setError); - + conn.close(); { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java index 9877e9393c..a2230a0b27 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java @@ -17,12 +17,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_setReadOnly extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -56,7 +55,7 @@ public void test_connect() throws Exception { DruidPooledConnection conn = dataSource.getConnection(); MockConnection mockConn = conn.unwrap(MockConnection.class); Assert.assertNotNull(mockConn); - + SQLException exception = new SQLException("xx", "xxx", 28); mockConn.setError(exception); @@ -67,7 +66,7 @@ public void test_connect() throws Exception { setError = ex; } Assert.assertNotNull(setError); - + conn.close(); { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java index 83ebf37950..b37bf00181 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java @@ -17,12 +17,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_setSavepoint extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -56,7 +55,7 @@ public void test_connect() throws Exception { DruidPooledConnection conn = dataSource.getConnection(); MockConnection mockConn = conn.unwrap(MockConnection.class); Assert.assertNotNull(mockConn); - + SQLException exception = new SQLException("xx", "xxx", 28); mockConn.setError(exception); @@ -67,7 +66,7 @@ public void test_connect() throws Exception { setError = ex; } Assert.assertNotNull(setError); - + conn.close(); { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepointWithName.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepointWithName.java index 863b25a968..067726caa3 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepointWithName.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepointWithName.java @@ -17,12 +17,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_setSavepointWithName extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -56,7 +55,7 @@ public void test_connect() throws Exception { DruidPooledConnection conn = dataSource.getConnection(); MockConnection mockConn = conn.unwrap(MockConnection.class); assertNotNull(mockConn); - + SQLException exception = new SQLException("xx", "xxx", 28); mockConn.setError(exception); @@ -67,7 +66,7 @@ public void test_connect() throws Exception { setError = ex; } assertNotNull(setError); - + conn.close(); { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_addBatch.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_addBatch.java index d28dd6f0fb..ea40606b9a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_addBatch.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_addBatch.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_addBatch extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_cancel.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_cancel.java index bc71a8150d..d1c18d2941 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_cancel.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_cancel.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_cancel extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -69,7 +68,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearBatch.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearBatch.java index 6aaa9c187d..a053acbf92 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearBatch.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearBatch.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_clearBatch extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -57,7 +56,7 @@ public void test_connect() throws Exception { Statement stmt = conn.createStatement(); stmt.addBatch(sql); - + SQLException exception = new SQLException("xx", "xxx", 28); mockConn.setError(exception); @@ -69,7 +68,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearWarrnings.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearWarrnings.java index 78038fb40f..c2d9862e1f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearWarrnings.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearWarrnings.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_clearWarrnings extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -69,7 +68,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute.java index 2ea93d3ee0..e2e4368021 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_execute extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(execErrror); Assert.assertSame(exception, execErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeBatch.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeBatch.java index ec7b408cfe..d6c40153b8 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeBatch.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeBatch.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_executeBatch extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -57,7 +56,7 @@ public void test_connect() throws Exception { Statement stmt = conn.createStatement(); stmt.addBatch(sql); - + SQLException exception = new SQLException("xx", "xxx", 28); mockConn.setError(exception); @@ -69,7 +68,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeQuery.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeQuery.java index ea0009dd86..9610febeac 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeQuery.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeQuery.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_executeQuery extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(execErrror); Assert.assertSame(exception, execErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate.java index cc9eb6191b..edba78e371 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_executeUpdate extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(execErrror); Assert.assertSame(exception, execErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_1.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_1.java index 6b357493f2..32df9dcc8a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_1.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_executeUpdate_1 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(execErrror); Assert.assertSame(exception, execErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_2.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_2.java index cb0fe7d87f..3de2b56549 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_2.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_executeUpdate_2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(execErrror); Assert.assertSame(exception, execErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_3.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_3.java index e901f085a4..8b205cfea9 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_3.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_executeUpdate_3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(execErrror); Assert.assertSame(exception, execErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_1.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_1.java index d0f05e39a2..fc6449618a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_1.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_execute_1 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(execErrror); Assert.assertSame(exception, execErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_2.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_2.java index 4a6c7f946d..721f6c7a7d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_2.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_execute_2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(execErrror); Assert.assertSame(exception, execErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_3.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_3.java index 7c28cf2ed2..a79967af9d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_3.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_execute_3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(execErrror); Assert.assertSame(exception, execErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchDirection.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchDirection.java index 932b425e5c..a824cfdc4a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchDirection.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchDirection.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getFetchDirection extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchSize.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchSize.java index 4b0deb67a7..4891c68673 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchSize.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchSize.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getFetchSize extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getGeneratedKeys.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getGeneratedKeys.java index 603d2c591e..2f5055d091 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getGeneratedKeys.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getGeneratedKeys.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getGeneratedKeys extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxField.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxField.java index bb3cd4a89b..42d60f1f1b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxField.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxField.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getMaxField extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxRows.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxRows.java index ed4c8ecec0..cbba136e33 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxRows.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxRows.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getMaxRows extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults.java index 995570b2f8..9ae6a46979 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getMoreResults extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -69,7 +68,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults_1.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults_1.java index 7474a7472d..641ba0d138 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults_1.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getMoreResults_1 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getQueryTimeout.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getQueryTimeout.java index 14d17fcc45..1fd8005429 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getQueryTimeout.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getQueryTimeout.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getQueryTimeout extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSet.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSet.java index cb17727e4e..8fd316ed76 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSet.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSet.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getResultSet extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -69,7 +68,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetConcurrency.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetConcurrency.java index 45856e88ea..787b071fdb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetConcurrency.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetConcurrency.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getResultSetConcurrency extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetHoldability.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetHoldability.java index 7708ba66ee..c57c68d12e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetHoldability.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetHoldability.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getResultSetHoldability extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetType.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetType.java index ad2899f8d9..ffaa8f2e91 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetType.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetType.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getResultSetType extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getUpdateCount.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getUpdateCount.java index 56271f5e8f..8e9624e429 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getUpdateCount.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getUpdateCount.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getUpdateCount extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -69,7 +68,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getWarrnings.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getWarrnings.java index 8feb7c0545..71151097b7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getWarrnings.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getWarrnings.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_getWarrnings extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -69,7 +68,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setCursorName.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setCursorName.java index 731458d8e8..bf2f4f1fab 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setCursorName.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setCursorName.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_setCursorName extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setEscapeProcessing.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setEscapeProcessing.java index 5534e6e413..c591e2450a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setEscapeProcessing.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setEscapeProcessing.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_setEscapeProcessing extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchDirection.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchDirection.java index a72c607fd9..c3dd628e9a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchDirection.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchDirection.java @@ -19,12 +19,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_setFetchDirection extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -69,7 +68,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchSize.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchSize.java index 0b1254f147..33e0616ed3 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchSize.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchSize.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_setFetchSize extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxField.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxField.java index df1ed4e63f..4840fda7f0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxField.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxField.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_setMaxField extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxRows.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxRows.java index b540338d18..f4159a3d79 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxRows.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxRows.java @@ -18,12 +18,11 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_setMaxRows extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -68,7 +67,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setQueryTimeout.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setQueryTimeout.java index c746389e50..819369e3c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setQueryTimeout.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setQueryTimeout.java @@ -19,14 +19,13 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorterTest_stmt_setQueryTimeout extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { super.setUp(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSource = new DruidDataSource(); dataSource.setExceptionSorter(new OracleExceptionSorter()); @@ -72,7 +71,7 @@ public void test_connect() throws Exception { } Assert.assertNotNull(stmtErrror); Assert.assertSame(exception, stmtErrror); - + SQLException commitError = null; try { conn.commit(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined.java index b786a9fdc9..bacda15a8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined.java @@ -10,7 +10,6 @@ import com.alibaba.druid.pool.vendor.OracleExceptionSorter; public class OracleExceptionSorter_userDefined extends PoolTestCase { - protected void setUp() throws Exception { super.setUp(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined_1.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined_1.java index f75304c18b..cdc7dae773 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined_1.java @@ -14,7 +14,6 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleExceptionSorter_userDefined_1 extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -39,9 +38,9 @@ protected void tearDown() throws Exception { public void test_userDefinedErrorCodes() throws Exception { dataSource.init(); - + dataSource.setConnectionProperties("druid.oracle.fatalErrorCodes=1,2,3,a,"); - + OracleExceptionSorter sorter = (OracleExceptionSorter) dataSource.getExceptionSorter(); Assert.assertEquals(3, sorter.getFatalErrorCodes().size()); Assert.assertTrue(sorter.getFatalErrorCodes().contains(1)); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java b/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java index 875465f2c3..89a35eb241 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java @@ -16,7 +16,6 @@ import junit.framework.TestCase; public class FailFastTest extends PoolTestCase { - private DruidDataSource dataSource; private AtomicInteger index = new AtomicInteger(); @@ -44,10 +43,10 @@ public PhysicalConnectionInfo createPhysicalConnection() throws SQLException { throw ex; } }; - + dataSource.setUrl("jdbc:mock:xxx"); dataSource.setMaxWait(1000 * 1000); - + Properties properties = new Properties(); properties.setProperty("druid.failFast", "true"); dataSource.configFromPropety(properties); @@ -79,9 +78,9 @@ public void run() { }; connectThread.setName("ConnectThread"); connectThread.start(); - + connectStartLatch.await(); - + latch.countDown(); connectEndLatch.await(3, TimeUnit.SECONDS); SQLException ex = errorHolder.get(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/profile/ProfileEnableTest.java b/src/test/java/com/alibaba/druid/bvt/pool/profile/ProfileEnableTest.java index db0e0c1e6b..11db3c0e9a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/profile/ProfileEnableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/profile/ProfileEnableTest.java @@ -6,7 +6,6 @@ import junit.framework.TestCase; public class ProfileEnableTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_filters.java b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_filters.java index 2d29896f1b..f0530b6d0e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_filters.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_filters.java @@ -18,15 +18,15 @@ public void test_stat() { Assert.assertEquals(1, dataSource.getProxyFilters().size()); Assert.assertEquals("com.alibaba.druid.filter.stat.StatFilter", dataSource.getFilterClassNames().get(0)); } - + public void test_false() { System.setProperty("druid.filters", ""); dataSource = new DruidDataSource(); Assert.assertEquals(0, dataSource.getProxyFilters().size()); - + Assert.assertNull(dataSource.getWallStatMap()); } - + protected void tearDown() throws Exception { System.clearProperty("druid.filters"); JdbcUtils.close(dataSource); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testOnBorrow.java b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testOnBorrow.java index 444ab3ebc7..fa154f3edb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testOnBorrow.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testOnBorrow.java @@ -16,15 +16,15 @@ public void test_true() { dataSource = new DruidDataSource(); Assert.assertTrue(dataSource.isTestOnBorrow()); } - + public void test_false() { System.setProperty("druid.testOnBorrow", "false"); dataSource = new DruidDataSource(); Assert.assertFalse(dataSource.isTestOnBorrow()); - + Assert.assertNull(dataSource.getWallStatMap()); } - + protected void tearDown() throws Exception { System.clearProperty("druid.testOnBorrow"); JdbcUtils.close(dataSource); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testWhileIdle.java b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testWhileIdle.java index c169a92863..32a5e03f37 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testWhileIdle.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testWhileIdle.java @@ -16,13 +16,13 @@ public void test_true() { dataSource = new DruidDataSource(); Assert.assertTrue(dataSource.isTestWhileIdle()); } - + public void test_false() { System.setProperty("druid.testWhileIdle", "false"); dataSource = new DruidDataSource(); Assert.assertFalse(dataSource.isTestWhileIdle()); } - + protected void tearDown() throws Exception { System.clearProperty("druid.testWhileIdle"); JdbcUtils.close(dataSource); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_useGlobalDataSourceStat.java b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_useGlobalDataSourceStat.java index e6d97441e4..98408cab8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_useGlobalDataSourceStat.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_useGlobalDataSourceStat.java @@ -16,13 +16,13 @@ public void test_true() { dataSource = new DruidDataSource(); Assert.assertTrue(dataSource.isUseGlobalDataSourceStat()); } - + public void test_false() { System.setProperty("druid.useGlobalDataSourceStat", "false"); dataSource = new DruidDataSource(); Assert.assertFalse(dataSource.isUseGlobalDataSourceStat()); } - + protected void tearDown() throws Exception { System.clearProperty("druid.useGlobalDataSourceStat"); JdbcUtils.close(dataSource); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_validationQuery.java b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_validationQuery.java index a6a7d9576f..8ea9f201d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_validationQuery.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_validationQuery.java @@ -17,7 +17,7 @@ public void test_validationQuery() { dataSource = new DruidDataSource(); Assert.assertEquals("select 1", dataSource.getValidationQuery()); } - + protected void tearDown() throws Exception { System.clearProperty("druid.validationQuery"); JdbcUtils.close(dataSource); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/InformixExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/InformixExceptionSorterTest.java index 1dcee7e410..6c6dcc9375 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/InformixExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/InformixExceptionSorterTest.java @@ -10,7 +10,6 @@ import com.alibaba.druid.pool.vendor.InformixExceptionSorter; public class InformixExceptionSorterTest extends PoolTestCase { - public void test_informix() throws Exception { InformixExceptionSorter sorter = new InformixExceptionSorter(); Assert.assertEquals(false, sorter.isExceptionFatal(new SQLException())); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MSSQLValidConnectionCheckerTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MSSQLValidConnectionCheckerTest.java index 3a723262ff..fed3f564a6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MSSQLValidConnectionCheckerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MSSQLValidConnectionCheckerTest.java @@ -11,7 +11,6 @@ import com.alibaba.druid.pool.vendor.MSSQLValidConnectionChecker; public class MSSQLValidConnectionCheckerTest extends PoolTestCase { - public void test_0() throws Exception { MSSQLValidConnectionChecker checker = new MSSQLValidConnectionChecker(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySQLValidConnectionCheckerTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySQLValidConnectionCheckerTest.java index 59d7820c48..66c72ec3fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySQLValidConnectionCheckerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySQLValidConnectionCheckerTest.java @@ -11,7 +11,6 @@ import com.alibaba.druid.pool.vendor.MySqlValidConnectionChecker; public class MySQLValidConnectionCheckerTest extends PoolTestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java index 08ad13be9a..df641fc2df 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java @@ -15,33 +15,33 @@ public void test_true() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); Assert.assertTrue(sorter.isExceptionFatal(new SQLException("", "", 1040))); } - + public void test_true_1() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); Assert.assertTrue(sorter.isExceptionFatal(new SQLException("", "", 1042))); } - + public void test_true_2() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); Assert.assertTrue(sorter.isExceptionFatal(new SQLException("", "08xx", 0))); } - + public void test_false_2() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); Assert.assertFalse(sorter.isExceptionFatal(new SQLException("", null, 0))); } - + public void test_false() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); Assert.assertFalse(sorter.isExceptionFatal(new SQLException("", "", -10001))); } - + public void test_false_1() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); Assert.assertTrue(sorter.isExceptionFatal(new SQLException("", "", -8000))); Assert.assertFalse(sorter.isExceptionFatal(new SQLException("", "", -9100))); } - + // public void test_true_3() throws Exception { // MySqlExceptionSorter sorter = new MySqlExceptionSorter(); // Class clazz = Class.forName("new com.mysql.jdbc.CommunicationsException"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_oceanbase.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_oceanbase.java index 888258c26a..0b079a4e5b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_oceanbase.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_oceanbase.java @@ -16,17 +16,17 @@ public void test_true() throws Exception { SQLException exception = new SQLException("", "", -9000); Assert.assertTrue(sorter.isExceptionFatal(exception)); } - + public void test_true_1() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); Assert.assertFalse(sorter.isExceptionFatal(new SQLException("", "", -10000))); } - + public void test_false() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); Assert.assertFalse(sorter.isExceptionFatal(new SQLException("", "", -10001))); } - + public void test_false_1() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); Assert.assertTrue(sorter.isExceptionFatal(new SQLException("", "", -8000))); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/PGExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/PGExceptionSorterTest.java index eb4f27b9eb..cd3b386c84 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/PGExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/PGExceptionSorterTest.java @@ -11,12 +11,11 @@ import com.alibaba.druid.pool.vendor.PGExceptionSorter; public class PGExceptionSorterTest extends PoolTestCase { - public void test_pg() throws Exception { PGExceptionSorter exSorter = new PGExceptionSorter(); PSQLException ex = new PSQLException(GT.tr("Expected an EOF from server, got: {0}", new Integer(0)), - PSQLState.COMMUNICATION_ERROR); + PSQLState.COMMUNICATION_ERROR); Assert.assertTrue(exSorter.isExceptionFatal(ex)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/SybaseExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/SybaseExceptionSorterTest.java index 6b938cb0e6..0b96d3d8ee 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/SybaseExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/SybaseExceptionSorterTest.java @@ -10,22 +10,21 @@ import com.alibaba.druid.pool.vendor.SybaseExceptionSorter; public class SybaseExceptionSorterTest extends PoolTestCase { - public void test_false() throws Exception { SybaseExceptionSorter sorter = new SybaseExceptionSorter(); Assert.assertFalse(sorter.isExceptionFatal(new SQLException())); } - + public void test_false_2() throws Exception { SybaseExceptionSorter sorter = new SybaseExceptionSorter(); Assert.assertFalse(sorter.isExceptionFatal(new SQLException("xxx"))); } - + public void test_true() throws Exception { SybaseExceptionSorter sorter = new SybaseExceptionSorter(); Assert.assertTrue(sorter.isExceptionFatal(new SQLException("JZ0C0"))); } - + public void test_true_1() throws Exception { SybaseExceptionSorter sorter = new SybaseExceptionSorter(); Assert.assertTrue(sorter.isExceptionFatal(new SQLException("JZ0C1"))); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/xa/H2XATest.java b/src/test/java/com/alibaba/druid/bvt/pool/xa/H2XATest.java index d949b28d39..9fbbc76ba3 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/xa/H2XATest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/xa/H2XATest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.util.JdbcUtils; public class H2XATest extends PoolTestCase { - private DruidXADataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/xa/JtdsXAConnectionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/xa/JtdsXAConnectionTest.java index 2b8f74ac0d..6012ab24ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/xa/JtdsXAConnectionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/xa/JtdsXAConnectionTest.java @@ -12,7 +12,6 @@ import com.alibaba.druid.pool.xa.JtdsXAResource; public class JtdsXAConnectionTest extends PoolTestCase { - public void test_jtds() throws Exception { Constructor constrcutor = JtdsConnection.class.getDeclaredConstructor(); constrcutor.setAccessible(true); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/AllStatisticTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/AllStatisticTest.java index a2d33f2859..c8e6b5dbb0 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/AllStatisticTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/AllStatisticTest.java @@ -35,12 +35,11 @@ import com.alibaba.druid.util.JdbcUtils; public class AllStatisticTest extends TestCase { + String url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=statTest:jdbc:derby:classpath:petstore-db"; - String url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=statTest:jdbc:derby:classpath:petstore-db"; + private AtomicLong fetchRowCout = new AtomicLong(); - private AtomicLong fetchRowCout = new AtomicLong(); - - Connection globalConnection = null; + Connection globalConnection = null; protected void setUp() throws Exception { JdbcStatManager stat = JdbcStatManager.getInstance(); @@ -71,7 +70,6 @@ protected void tearDown() throws Exception { } public void test_stmt() throws Exception { - // //////////////////////// f1(); @@ -81,12 +79,10 @@ public void test_stmt() throws Exception { } public void f1() throws Exception { - Statement pstmt = null; ResultSet rs = null; try { - pstmt = globalConnection.createStatement(); rs = pstmt.executeQuery("SELECT * FROM ITEM WHERE LISTPRICE > 10"); while (rs.next()) { @@ -100,7 +96,6 @@ public void f1() throws Exception { } public void f2() throws Exception { - Connection conn = null; Statement pstmt = null; ResultSet rs = null; @@ -123,7 +118,6 @@ public void f2() throws Exception { } public void f3() throws Exception { - Connection conn = null; PreparedStatement pstmt = null; ResultSet rs = null; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java index a012c245cc..2718de0554 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java @@ -37,7 +37,6 @@ import com.alibaba.druid.util.JdbcUtils; public class BasicTypeTest extends TestCase { - private static String create_url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=basicType:jdbc:derby:memory:basicTypeTestDB;create=true"; protected void setUp() throws Exception { @@ -55,9 +54,9 @@ private void createDDL() throws SQLException { Statement stmt = conn.createStatement(); stmt.execute("CREATE TABLE T_BASIC_TYPE (F1 FLOAT, F2 DOUBLE, F3 REAL, F4 DATE, F5 TIME, F6 SMALLINT, F7 SMALLINT, F8 INTEGER, F9 BIGINT, F10 DECIMAL(9,2), F11 TIMESTAMP, F12 BLOB, F13 VARCHAR(256), F14 VARCHAR(256), F15 VARCHAR(256), F16 VARCHAR(256), F17 SMALLINT)"); stmt.execute("CREATE PROCEDURE BASIC_CALL_0(INOUT F1 FLOAT, INOUT F2 DOUBLE, INOUT F3 REAL, INOUT F4 DATE, INOUT F5 TIME, INOUT F6 SMALLINT, INOUT F7 SMALLINT, INOUT F8 INTEGER, INOUT F9 BIGINT, INOUT F10 DECIMAL(9,2), INOUT F11 TIMESTAMP, INOUT F12 VARCHAR(128) FOR BIT DATA, INOUT F13 VARCHAR(256), INOUT F14 VARCHAR(256), INOUT F15 VARCHAR(256), INOUT F16 VARCHAR(256), INOUT F17 SMALLINT) " - + "LANGUAGE JAVA PARAMETER STYLE JAVA EXTERNAL NAME '" - + BasicTypeTest.class.getName() - + ".basic_process_0' " + "DYNAMIC RESULT SETS 1"); + + "LANGUAGE JAVA PARAMETER STYLE JAVA EXTERNAL NAME '" + + BasicTypeTest.class.getName() + + ".basic_process_0' " + "DYNAMIC RESULT SETS 1"); stmt.close(); conn.close(); } @@ -73,14 +72,13 @@ private void dropTable() throws SQLException { protected void tearDown() throws Exception { dropTable(); - + DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } @SuppressWarnings("deprecation") public void test_basicType() throws Exception { - Connection conn = null; PreparedStatement pstmt = null; CallableStatement cstmt = null; @@ -131,7 +129,7 @@ public void test_basicType() throws Exception { stmt.close(); stmt = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE, - ResultSet.CLOSE_CURSORS_AT_COMMIT); + ResultSet.CLOSE_CURSORS_AT_COMMIT); stmt.setQueryTimeout(stmt.getQueryTimeout()); stmt.setEscapeProcessing(true); stmt.clearBatch(); @@ -258,25 +256,25 @@ public void test_basicType() throws Exception { JdbcUtils.close(pstmt); pstmt = conn.prepareStatement("SELECT F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, F13, F14, F15, F16 FROM T_BASIC_TYPE", - new int[] { 1, 2 }); + new int[]{1, 2}); JdbcUtils.close(pstmt); pstmt = conn.prepareStatement("SELECT F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, F13, F14, F15, F16 FROM T_BASIC_TYPE", - new String[] { "F1", "F2" }); + new String[]{"F1", "F2"}); JdbcUtils.close(pstmt); pstmt = conn.prepareStatement("SELECT F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, F13, F14, F15, F16 FROM T_BASIC_TYPE", - Statement.RETURN_GENERATED_KEYS); + Statement.RETURN_GENERATED_KEYS); JdbcUtils.close(pstmt); pstmt = conn.prepareStatement("SELECT F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, F13, F14, F15, F16 FROM T_BASIC_TYPE", - ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE); + ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE); pstmt.executeQuery().close(); JdbcUtils.close(pstmt); pstmt = conn.prepareStatement("SELECT F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, F13, F14, F15, F16 FROM T_BASIC_TYPE", - ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE, - ResultSet.CLOSE_CURSORS_AT_COMMIT); + ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE, + ResultSet.CLOSE_CURSORS_AT_COMMIT); JdbcUtils.close(pstmt); cstmt = conn.prepareCall("CALL BASIC_CALL_0(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?)"); @@ -477,87 +475,70 @@ public void test_basicType() throws Exception { try { cstmt.getDouble(2); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getFloat(3); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getDate(4); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getDate(4, Calendar.getInstance()); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getTime(5); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getTime(5, Calendar.getInstance()); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getByte(6); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getShort(7); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getInt(8); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getLong(9); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getBigDecimal(10); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getBigDecimal(10, 2); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getTimestamp(11); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getTimestamp(11, Calendar.getInstance()); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getBytes(12); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getBlob(12).free(); } catch (SQLException ex) { - } try { cstmt.getString(13); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getCharacterStream(14); @@ -566,17 +547,14 @@ public void test_basicType() throws Exception { try { cstmt.getObject(15); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getObject(15, new HashMap>()); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getBoolean(17); } catch (SQLFeatureNotSupportedException ex) { - } // / @@ -588,102 +566,82 @@ public void test_basicType() throws Exception { try { cstmt.getDouble("F2"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getFloat("F3"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getDate("F4"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getDate("F4", Calendar.getInstance()); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getTime("F5"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getTime("F5", Calendar.getInstance()); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getByte("F6"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getShort("F7"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getInt("F8"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getLong("F9"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getBigDecimal("F10"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getTimestamp("F11"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getTimestamp("F11", Calendar.getInstance()); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getBytes("F12"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getBlob("F12").free(); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getString("F13"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getCharacterStream("F14"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getObject("F15"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getObject("F15", new HashMap>()); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getBoolean("F17"); } catch (SQLFeatureNotSupportedException ex) { - } cstmt.wasNull(); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/BatchReadTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/BatchReadTest.java index 38bf41b9cd..3b1bce4115 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/BatchReadTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/BatchReadTest.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcUtils; public class BatchReadTest extends TestCase { - private static String create_url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=batchReadTest:jdbc:derby:memory:batchDB;create=true"; protected void setUp() throws Exception { @@ -64,7 +63,7 @@ private void dropTable() throws SQLException { protected void tearDown() throws Exception { dropTable(); - + DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } @@ -86,7 +85,7 @@ public void test_stmt_batch() throws Exception { stmt.addBatch("INSERT INTO T_USER (ID, NAME, BIRTHDATE) VALUES (2, 'B', NULL)"); stmt.executeBatch(); - for (;;) { + for (; ; ) { boolean moreResults = stmt.getMoreResults(); if (moreResults) { @@ -110,7 +109,6 @@ public void test_stmt_batch() throws Exception { } public void test_pstmt_batch() throws Exception { - Connection conn = null; Statement stmt = null; PreparedStatement pstmt = null; @@ -135,7 +133,7 @@ public void test_pstmt_batch() throws Exception { int[] updateCounts = pstmt.executeBatch(); - Assert.assertArrayEquals(new int[] { 1, 1 }, updateCounts); + Assert.assertArrayEquals(new int[]{1, 1}, updateCounts); pstmt.setFetchDirection(stmt.getFetchDirection()); pstmt.setFetchSize(pstmt.getFetchSize()); @@ -158,7 +156,7 @@ public void test_pstmt_batch() throws Exception { pstmt.getWarnings(); stmt.execute("SELECT * FROM T_USER"); - for (;;) { + for (; ; ) { rs = stmt.getResultSet(); rs.getWarnings(); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/BlobTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/BlobTest.java index 334d0d8147..f3c67e7263 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/BlobTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/BlobTest.java @@ -33,7 +33,6 @@ import com.alibaba.druid.util.JdbcUtils; public class BlobTest extends TestCase { - private static String create_url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=demo:jdbc:derby:memory:blobTestDB;create=true"; protected void setUp() throws Exception { @@ -64,13 +63,12 @@ private void dropTable() throws SQLException { protected void tearDown() throws Exception { dropTable(); - + DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } public void test_blob() throws Exception { - Connection conn = null; PreparedStatement pstmt = null; Statement stmt = null; @@ -109,7 +107,7 @@ public void test_blob() throws Exception { Assert.assertEquals(1, updateCount); stmt = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE, - ResultSet.CLOSE_CURSORS_AT_COMMIT); + ResultSet.CLOSE_CURSORS_AT_COMMIT); conn.nativeSQL("SELECT ID, DATA FROM T_BLOB"); // ////// diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/CallStatementTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/CallStatementTest.java index b42c093ca5..b6726c1be0 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/CallStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/CallStatementTest.java @@ -31,13 +31,11 @@ import com.alibaba.druid.stat.JdbcStatManager; public class CallStatementTest extends TestCase { - /** * Procedures that should be created before the tests are run and dropped when the tests have finished. First * element in each row is the name of the procedure, second element is SQL which creates it. */ private static final String[] PROCEDURES = { - "CREATE PROCEDURE RETRIEVE_DYNAMIC_RESULTS(number INT) " + "LANGUAGE JAVA PARAMETER STYLE JAVA EXTERNAL NAME '" + CallStatementTest.class.getName() + ".retrieveDynamicResults' " + "DYNAMIC RESULT SETS 4", @@ -57,9 +55,9 @@ public class CallStatementTest extends TestCase { + "PARAMETER STYLE JAVA EXTERNAL NAME '" + CallStatementTest.class.getName() + ".nestedDynamicResultSets' " + "DYNAMIC RESULT SETS 6" - }; + }; - private static String create_url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=demo:jdbc:derby:memory:callableStatementDB;create=true"; + private static String create_url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=demo:jdbc:derby:memory:callableStatementDB;create=true"; protected void setUp() throws Exception { Class.forName("com.alibaba.druid.proxy.DruidDriver"); @@ -142,15 +140,13 @@ public static void retrieveClosedResult(ResultSet[] closed) throws SQLException } public static void retrieveExternalResult(String dbName, String user, String password, ResultSet[] external) - throws SQLException { - + throws SQLException { Connection conn = DriverManager.getConnection(create_url); external[0] = conn.createStatement().executeQuery("VALUES(1)"); } public static void selectRows(int p1, ResultSet[] data) throws SQLException { - System.out.println("selectRows - 1 arg - 1 rs"); Connection conn = DriverManager.getConnection("jdbc:default:connection"); @@ -161,7 +157,6 @@ public static void selectRows(int p1, ResultSet[] data) throws SQLException { } public static void selectRows(int p1, int p2, ResultSet[] data1, ResultSet[] data2) throws SQLException { - System.out.println("selectRows - 2 arg - 2 rs"); Connection conn = DriverManager.getConnection("jdbc:default:connection"); @@ -203,7 +198,6 @@ public static void selectRows(String table, ResultSet[] rs) throws SQLException public static void fivejp(ResultSet[] data1, ResultSet[] data2, ResultSet[] data3, ResultSet[] data4, ResultSet[] data5) throws SQLException { - Connection conn = DriverManager.getConnection("jdbc:default:connection"); PreparedStatement ps1 = conn.prepareStatement("select * from MRS.FIVERS where i > ?"); @@ -230,7 +224,6 @@ public static void fivejp(ResultSet[] data1, ResultSet[] data2, ResultSet[] data } public static void parameter1(int a, String b, String c, java.sql.ResultSet[] rs) throws SQLException { - System.out.print("PT1 a=" + a); if (b == null) System.out.println(" b = null"); else System.out.print(" b=<" + b + ">(" + b.length() + ")"); @@ -253,7 +246,7 @@ public static void parameter1(int a, String b, String c, java.sql.ResultSet[] rs } public static void parameter2(int a, java.math.BigDecimal b, java.math.BigDecimal c, java.sql.ResultSet[] rs) - throws SQLException { + throws SQLException { Connection conn = DriverManager.getConnection("jdbc:default:connection"); PreparedStatement ps = conn.prepareStatement("insert into PT1 values (?, ?, ?)"); ps.setInt(1, a); @@ -286,7 +279,6 @@ public static void retrieveDynamicResults(int number, ResultSet[] rs1, ResultSet } public static void outparams1(int[] p1, int p2) { - p1[0] = p2 * 2; } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/CallableStatementProxyImplTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/CallableStatementProxyImplTest.java index e54f3e923a..58bed71ac6 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/CallableStatementProxyImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/CallableStatementProxyImplTest.java @@ -52,7 +52,7 @@ protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } - + public void test_call() throws Exception { DataSourceProxyConfig config = new DataSourceProxyConfig(); DataSourceProxy dataSource = new DataSourceProxyImpl(null, config); @@ -146,8 +146,7 @@ public void test_call() throws Exception { } private static final class FakeCallableStatement extends CallableStatementProxyImpl { - - private FakeCallableStatement(ConnectionProxy connection, CallableStatement statement, String sql, long id){ + private FakeCallableStatement(ConnectionProxy connection, CallableStatement statement, String sql, long id) { super(connection, statement, sql, id); } @@ -166,12 +165,10 @@ public void registerOutParameter(int parameterIndex, int sqlType) throws SQLExce @Override public void registerOutParameter(int parameterIndex, int sqlType, int scale) throws SQLException { - } @Override public void registerOutParameter(String parameterIndex, int sqlType, String typeName) throws SQLException { - } @Override @@ -180,12 +177,10 @@ public void registerOutParameter(String parameterIndex, int sqlType) throws SQLE @Override public void registerOutParameter(String parameterIndex, int sqlType, int scale) throws SQLException { - } @Override public void registerOutParameter(int parameterIndex, int sqlType, String typeName) throws SQLException { - } @Override diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java index 928444b010..df771a8a15 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java @@ -33,7 +33,6 @@ import com.alibaba.druid.util.JdbcUtils; public class ClobTest extends TestCase { - private static String create_url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=clobTest:jdbc:derby:memory:clobTestDB;create=true"; protected void setUp() throws Exception { @@ -48,7 +47,7 @@ protected void setUp() throws Exception { protected void tearDown() throws Exception { dropTable(); - + DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } @@ -70,7 +69,6 @@ private void dropTable() throws SQLException { } public void test_clob() throws Exception { - Connection conn = null; PreparedStatement pstmt = null; Statement stmt = null; @@ -103,12 +101,12 @@ public void test_clob() throws Exception { pstmt.setInt(1, 1); pstmt.setClob(2, new StringReader("ABCAAAAAAAAAAABCAAAAAAAAAAAAABCAAAAAAAAAAABCAAAAAAAAAAAA"), - "ABCAAAAAAAAAAABCAAAAAAAAAAAAABCAAAAAAAAAAABCAAAAAAAAAAAA".length()); + "ABCAAAAAAAAAAABCAAAAAAAAAAAAABCAAAAAAAAAAABCAAAAAAAAAAAA".length()); updateCount = pstmt.executeUpdate(); Assert.assertEquals(1, updateCount); stmt = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE, - ResultSet.CLOSE_CURSORS_AT_COMMIT); + ResultSet.CLOSE_CURSORS_AT_COMMIT); // ////// rs = stmt.executeQuery("SELECT ID, DATA FROM T_CLOB"); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/CommonsLogFilterTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/CommonsLogFilterTest.java index 20de643893..d0c56d558c 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/CommonsLogFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/CommonsLogFilterTest.java @@ -31,7 +31,7 @@ protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } - + public void test_logger() throws Exception { CommonsLogFilter filter = new CommonsLogFilter(); @@ -226,10 +226,9 @@ public void test_logger() throws Exception { @SuppressWarnings("serial") public static class FakeLogger extends Log4JLogger { - private boolean enable; - public FakeLogger(String name, boolean enable){ + public FakeLogger(String name, boolean enable) { super(name); this.enable = enable; } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionProxyImplTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionProxyImplTest.java index 8f4db2015a..084f7d807a 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionProxyImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionProxyImplTest.java @@ -31,12 +31,11 @@ import com.alibaba.druid.stat.JdbcStatManager; public class ConnectionProxyImplTest extends TestCase { - protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } - + public void test_connection() throws Exception { DataSourceProxyConfig config = new DataSourceProxyConfig(); DataSourceProxy dataSource = new DataSourceProxyImpl(null, config); @@ -46,9 +45,7 @@ public void test_connection() throws Exception { filter.init(dataSource); ConnectionProxyImpl rawConnection = new ConnectionProxyImpl(null, null, new Properties(), 0) { - public void setClientInfo(String name, String value) throws SQLClientInfoException { - } }; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionStatisticTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionStatisticTest.java index b7e46b9d8b..b6f19f2a08 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionStatisticTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionStatisticTest.java @@ -22,7 +22,6 @@ import com.alibaba.druid.stat.JdbcConnectionStat; public class ConnectionStatisticTest extends TestCase { - public void test_connection_stat() throws Exception { JdbcConnectionStat.Entry stat = new JdbcConnectionStat.Entry(null, 1001L); Assert.assertEquals(null, stat.getEstablishTime()); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionTest.java index 7d0e1d5831..ddede45590 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionTest.java @@ -35,7 +35,6 @@ import com.alibaba.druid.util.JdbcUtils; public class ConnectionTest extends TestCase { - private static String create_url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=demo:jdbc:derby:memory:connectionTestDB;create=true"; protected void setUp() throws Exception { @@ -90,11 +89,10 @@ public void test_connection() throws Exception { try { conn.setClientInfo("name", "value"); } catch (SQLClientInfoException ex) { - } try { - conn.createArrayOf("VARCHAR", new String[] { "A", "B" }); + conn.createArrayOf("VARCHAR", new String[]{"A", "B"}); } catch (SQLFeatureNotSupportedException ex) { } @@ -109,7 +107,7 @@ public void test_connection() throws Exception { } try { - conn.createStruct("VARCHAR", new String[] { "A", "B" }); + conn.createStruct("VARCHAR", new String[]{"A", "B"}); } catch (SQLFeatureNotSupportedException ex) { } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/CounterFilterTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/CounterFilterTest.java index 3ce91b9e72..cc8fb55943 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/CounterFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/CounterFilterTest.java @@ -37,21 +37,20 @@ import com.alibaba.druid.stat.JdbcStatManager; public class CounterFilterTest extends TestCase { - String sql = "SELECT 1"; protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } - + public void test_countFilter() throws Exception { DataSourceProxyConfig config = new DataSourceProxyConfig(); config.setUrl(""); DataSourceProxyImpl dataSource = new DataSourceProxyImpl(null, config); JdbcDataSourceStat dataSourceStat = dataSource.getDataSourceStat(); - + StatFilter filter = new StatFilter(); filter.init(dataSource); @@ -62,7 +61,6 @@ public void test_countFilter() throws Exception { Assert.assertNull(dataSourceStat.getConnectionStat().getConnectLastTime()); FilterChain chain = new FilterChainImpl(dataSource) { - public ConnectionProxy connection_connect(Properties info) throws SQLException { throw new SQLException(); } @@ -101,7 +99,7 @@ public void test_count_filter() throws Exception { conn.close(); conn.close(); - + dataSource.getCompositeData(); dataSource.getProperties(); dataSource.getDataSourceMBeanDomain(); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/DriverTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/DriverTest.java index 1d66d0a301..841c771823 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/DriverTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/DriverTest.java @@ -34,7 +34,7 @@ protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } - + public void test_driver() throws Exception { String url_0 = "jdbc:wrap-jdbc:filters=default:name=driverTest:jdbc:derby:memory:driverTestDB;create=true"; String url_1 = "jdbc:wrap-jdbc:filters=counter:name=driverTest:jdbc:derby:memory:driverTestDB;create=true"; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java index b51c58e8dd..2bb51331f4 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java @@ -33,40 +33,32 @@ protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } - - public static class PublicJdbcFilterAdapter extends FilterAdapter { - - public PublicJdbcFilterAdapter(){ + public static class PublicJdbcFilterAdapter extends FilterAdapter { + public PublicJdbcFilterAdapter() { } } static class PrivateJdbcFilterAdapter extends FilterAdapter { - - private PrivateJdbcFilterAdapter(){ - + private PrivateJdbcFilterAdapter() { } } public static class InitErrorJdbcFilterAdapter extends FilterAdapter { - - public InitErrorJdbcFilterAdapter() throws InstantiationException{ + public InitErrorJdbcFilterAdapter() throws InstantiationException { throw new InstantiationException("init error"); } } static class PrivateDriver extends MockDriver { - - private PrivateDriver(){ - + private PrivateDriver() { } } public static class InitErrorDriver extends MockDriver { - - public InitErrorDriver() throws InstantiationException{ + public InitErrorDriver() throws InstantiationException { throw new InstantiationException("init error"); } } @@ -85,7 +77,7 @@ public void test_getRawDriverClassName() throws Exception { Assert.assertEquals("oracle.jdbc.OracleDriver", JdbcUtils.getDriverClassName("jdbc:oracle:")); Assert.assertEquals("com.microsoft.jdbc.sqlserver.SQLServerDriver", - JdbcUtils.getDriverClassName("jdbc:microsoft:")); + JdbcUtils.getDriverClassName("jdbc:microsoft:")); Assert.assertEquals("org.postgresql.Driver", JdbcUtils.getDriverClassName("jdbc:postgresql:xx")); Assert.assertEquals("net.sourceforge.jtds.jdbc.Driver", JdbcUtils.getDriverClassName("jdbc:jtds:")); { @@ -139,45 +131,45 @@ public void test_driver_wrap() throws Exception { { ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:filters=:name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true", - new Properties()); + new Properties()); Assert.assertEquals(0, conn.getDirectDataSource().getProxyFilters().size()); conn.close(); } { ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:filters=,:name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true", - new Properties()); + new Properties()); Assert.assertEquals(0, conn.getDirectDataSource().getProxyFilters().size()); conn.close(); } { ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:filters=,:jdbc:derby:memory:driverWrapperTestDB;create=true", - new Properties()); + new Properties()); Assert.assertEquals(0, conn.getDirectDataSource().getProxyFilters().size()); conn.close(); } { ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:filters=,:name=:jdbc:derby:memory:driverWrapperTestDB;create=true", - new Properties()); + new Properties()); Assert.assertEquals(0, conn.getDirectDataSource().getProxyFilters().size()); conn.close(); } { ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:driver=:filters=,:name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true", - new Properties()); + new Properties()); Assert.assertEquals(0, conn.getDirectDataSource().getProxyFilters().size()); conn.close(); } { ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true", - new Properties()); + new Properties()); Assert.assertEquals(0, conn.getDirectDataSource().getProxyFilters().size()); conn.close(); } { ConnectionProxyImpl conn = (ConnectionProxyImpl) driver.connect("jdbc:wrap-jdbc:filters=" - + PublicJdbcFilterAdapter.class.getName() - + ":name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true", - new Properties()); + + PublicJdbcFilterAdapter.class.getName() + + ":name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true", + new Properties()); Assert.assertEquals(1, conn.getDirectDataSource().getProxyFilters().size()); conn.close(); } @@ -185,8 +177,8 @@ public void test_driver_wrap() throws Exception { Exception error = null; try { driver.connect("jdbc:wrap-jdbc:filters=" + PrivateJdbcFilterAdapter.class.getName() - + ":name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true", - new Properties()).close(); + + ":name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true", + new Properties()).close(); } catch (Exception ex) { error = ex; } @@ -196,8 +188,8 @@ public void test_driver_wrap() throws Exception { Exception error = null; try { driver.connect("jdbc:wrap-jdbc:filters=" + InitErrorJdbcFilterAdapter.class.getName() - + ":name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true", - new Properties()).close(); + + ":name=driverWrapperTest:jdbc:derby:memory:driverWrapperTestDB;create=true", + new Properties()).close(); } catch (Exception ex) { error = ex; } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/JdbcFilterEventAdapterTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/JdbcFilterEventAdapterTest.java index 4842531bfd..9a61b379e1 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/JdbcFilterEventAdapterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/JdbcFilterEventAdapterTest.java @@ -46,7 +46,7 @@ protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } - + public void test_filterEventAdapter() throws Exception { DataSourceProxyConfig config = new DataSourceProxyConfig(); DataSourceProxy dataSource = new DataSourceProxyImpl(null, config); @@ -60,7 +60,6 @@ public void test_filterEventAdapter() throws Exception { { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public boolean statement_execute(StatementProxy statement, String sql) throws SQLException { throw new SQLException(); } @@ -77,7 +76,6 @@ public boolean statement_execute(StatementProxy statement, String sql) throws SQ { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public boolean statement_execute(StatementProxy statement, String sql) throws SQLException { throw new RuntimeException(); } @@ -94,7 +92,6 @@ public boolean statement_execute(StatementProxy statement, String sql) throws SQ { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public boolean statement_execute(StatementProxy statement, String sql) throws SQLException { throw new Error(); } @@ -113,9 +110,8 @@ public boolean statement_execute(StatementProxy statement, String sql) throws SQ { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public boolean statement_execute(StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { throw new SQLException(); } }; @@ -131,9 +127,8 @@ public boolean statement_execute(StatementProxy statement, String sql, int autoG { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public boolean statement_execute(StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { throw new RuntimeException(); } }; @@ -149,9 +144,8 @@ public boolean statement_execute(StatementProxy statement, String sql, int autoG { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public boolean statement_execute(StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { throw new Error(); } }; @@ -169,9 +163,8 @@ public boolean statement_execute(StatementProxy statement, String sql, int autoG { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - - public boolean statement_execute(StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public boolean statement_execute(StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { throw new SQLException(); } }; @@ -187,9 +180,8 @@ public boolean statement_execute(StatementProxy statement, String sql, int colum { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - - public boolean statement_execute(StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public boolean statement_execute(StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { throw new RuntimeException(); } }; @@ -205,9 +197,8 @@ public boolean statement_execute(StatementProxy statement, String sql, int colum { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - - public boolean statement_execute(StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public boolean statement_execute(StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { throw new Error(); } }; @@ -225,9 +216,8 @@ public boolean statement_execute(StatementProxy statement, String sql, int colum { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - - public boolean statement_execute(StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public boolean statement_execute(StatementProxy statement, String sql, String[] columnNames) + throws SQLException { throw new SQLException(); } }; @@ -243,9 +233,8 @@ public boolean statement_execute(StatementProxy statement, String sql, String co { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - - public boolean statement_execute(StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public boolean statement_execute(StatementProxy statement, String sql, String[] columnNames) + throws SQLException { throw new RuntimeException(); } }; @@ -261,9 +250,8 @@ public boolean statement_execute(StatementProxy statement, String sql, String co { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - - public boolean statement_execute(StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public boolean statement_execute(StatementProxy statement, String sql, String[] columnNames) + throws SQLException { throw new Error(); } }; @@ -281,7 +269,6 @@ public boolean statement_execute(StatementProxy statement, String sql, String co { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public int[] statement_executeBatch(StatementProxy statement) throws SQLException { throw new SQLException(); } @@ -298,7 +285,6 @@ public int[] statement_executeBatch(StatementProxy statement) throws SQLExceptio { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public int[] statement_executeBatch(StatementProxy statement) throws SQLException { throw new RuntimeException(); } @@ -315,7 +301,6 @@ public int[] statement_executeBatch(StatementProxy statement) throws SQLExceptio { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public int[] statement_executeBatch(StatementProxy statement) throws SQLException { throw new Error(); } @@ -334,7 +319,6 @@ public int[] statement_executeBatch(StatementProxy statement) throws SQLExceptio { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public ResultSetProxy statement_executeQuery(StatementProxy statement, String sql) throws SQLException { throw new SQLException(); } @@ -351,7 +335,6 @@ public ResultSetProxy statement_executeQuery(StatementProxy statement, String sq { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public ResultSetProxy statement_executeQuery(StatementProxy statement, String sql) throws SQLException { throw new RuntimeException(); } @@ -368,7 +351,6 @@ public ResultSetProxy statement_executeQuery(StatementProxy statement, String sq { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public ResultSetProxy statement_executeQuery(StatementProxy statement, String sql) throws SQLException { throw new Error(); } @@ -387,7 +369,6 @@ public ResultSetProxy statement_executeQuery(StatementProxy statement, String sq { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public int preparedStatement_executeUpdate(PreparedStatementProxy statement) throws SQLException { throw new SQLException(); } @@ -404,7 +385,6 @@ public int preparedStatement_executeUpdate(PreparedStatementProxy statement) thr { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public int preparedStatement_executeUpdate(PreparedStatementProxy statement) throws SQLException { throw new RuntimeException(); } @@ -421,7 +401,6 @@ public int preparedStatement_executeUpdate(PreparedStatementProxy statement) thr { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public int preparedStatement_executeUpdate(PreparedStatementProxy statement) throws SQLException { throw new Error(); } @@ -442,7 +421,6 @@ public int preparedStatement_executeUpdate(PreparedStatementProxy statement) thr { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public int statement_executeUpdate(StatementProxy statement, String sql) throws SQLException { throw new SQLException(); } @@ -459,7 +437,6 @@ public int statement_executeUpdate(StatementProxy statement, String sql) throws { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public int statement_executeUpdate(StatementProxy statement, String sql) throws SQLException { throw new RuntimeException(); } @@ -476,7 +453,6 @@ public int statement_executeUpdate(StatementProxy statement, String sql) throws { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public int statement_executeUpdate(StatementProxy statement, String sql) throws SQLException { throw new Error(); } @@ -495,9 +471,8 @@ public int statement_executeUpdate(StatementProxy statement, String sql) throws { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public int statement_executeUpdate(StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { throw new SQLException(); } }; @@ -513,9 +488,8 @@ public int statement_executeUpdate(StatementProxy statement, String sql, int aut { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public int statement_executeUpdate(StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { throw new RuntimeException(); } }; @@ -531,9 +505,8 @@ public int statement_executeUpdate(StatementProxy statement, String sql, int aut { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public int statement_executeUpdate(StatementProxy statement, String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { throw new Error(); } }; @@ -551,9 +524,8 @@ public int statement_executeUpdate(StatementProxy statement, String sql, int aut { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - - public int statement_executeUpdate(StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public int statement_executeUpdate(StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { throw new SQLException(); } }; @@ -569,9 +541,8 @@ public int statement_executeUpdate(StatementProxy statement, String sql, int col { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - - public int statement_executeUpdate(StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public int statement_executeUpdate(StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { throw new RuntimeException(); } }; @@ -587,9 +558,8 @@ public int statement_executeUpdate(StatementProxy statement, String sql, int col { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - - public int statement_executeUpdate(StatementProxy statement, String sql, int columnIndexes[]) - throws SQLException { + public int statement_executeUpdate(StatementProxy statement, String sql, int[] columnIndexes) + throws SQLException { throw new Error(); } }; @@ -607,9 +577,8 @@ public int statement_executeUpdate(StatementProxy statement, String sql, int col { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - - public int statement_executeUpdate(StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public int statement_executeUpdate(StatementProxy statement, String sql, String[] columnNames) + throws SQLException { throw new SQLException(); } }; @@ -625,9 +594,8 @@ public int statement_executeUpdate(StatementProxy statement, String sql, String { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - - public int statement_executeUpdate(StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public int statement_executeUpdate(StatementProxy statement, String sql, String[] columnNames) + throws SQLException { throw new RuntimeException(); } }; @@ -643,9 +611,8 @@ public int statement_executeUpdate(StatementProxy statement, String sql, String { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - - public int statement_executeUpdate(StatementProxy statement, String sql, String columnNames[]) - throws SQLException { + public int statement_executeUpdate(StatementProxy statement, String sql, String[] columnNames) + throws SQLException { throw new Error(); } }; @@ -663,7 +630,6 @@ public int statement_executeUpdate(StatementProxy statement, String sql, String { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public ResultSetProxy statement_getGeneratedKeys(StatementProxy statement) throws SQLException { return null; } @@ -675,7 +641,6 @@ public ResultSetProxy statement_getGeneratedKeys(StatementProxy statement) throw { final ResultSetProxy resultSet = new ResultSetProxyImpl(statement, null, 2001, null); FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public ResultSetProxy statement_getGeneratedKeys(StatementProxy statement) throws SQLException { return resultSet; } @@ -688,7 +653,6 @@ public ResultSetProxy statement_getGeneratedKeys(StatementProxy statement) throw { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public boolean preparedStatement_execute(PreparedStatementProxy statement) throws SQLException { throw new SQLException(); } @@ -705,7 +669,6 @@ public boolean preparedStatement_execute(PreparedStatementProxy statement) throw { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public boolean preparedStatement_execute(PreparedStatementProxy statement) throws SQLException { throw new RuntimeException(); } @@ -722,7 +685,6 @@ public boolean preparedStatement_execute(PreparedStatementProxy statement) throw { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public boolean preparedStatement_execute(PreparedStatementProxy statement) throws SQLException { throw new Error(); } @@ -741,9 +703,8 @@ public boolean preparedStatement_execute(PreparedStatementProxy statement) throw { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public ResultSetProxy preparedStatement_executeQuery(PreparedStatementProxy statement) - throws SQLException { + throws SQLException { throw new SQLException(); } }; @@ -759,9 +720,8 @@ public ResultSetProxy preparedStatement_executeQuery(PreparedStatementProxy stat { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public ResultSetProxy preparedStatement_executeQuery(PreparedStatementProxy statement) - throws SQLException { + throws SQLException { throw new RuntimeException(); } }; @@ -777,9 +737,8 @@ public ResultSetProxy preparedStatement_executeQuery(PreparedStatementProxy stat { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public ResultSetProxy preparedStatement_executeQuery(PreparedStatementProxy statement) - throws SQLException { + throws SQLException { throw new Error(); } }; @@ -792,13 +751,12 @@ public ResultSetProxy preparedStatement_executeQuery(PreparedStatementProxy stat } Assert.assertNotNull(error); } - + // ////////////////////////// { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public void dataSource_recycle(DruidPooledConnection connection) throws SQLException { throw new SQLException(); } @@ -815,7 +773,6 @@ public void dataSource_recycle(DruidPooledConnection connection) throws SQLExcep { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public void dataSource_recycle(DruidPooledConnection connection) throws SQLException { throw new RuntimeException(); } @@ -832,7 +789,6 @@ public void dataSource_recycle(DruidPooledConnection connection) throws SQLExcep { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public void dataSource_recycle(DruidPooledConnection connection) throws SQLException { throw new Error(); } @@ -851,9 +807,8 @@ public void dataSource_recycle(DruidPooledConnection connection) throws SQLExcep { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public DruidPooledConnection dataSource_connect(DruidDataSource dataSource, long maxWaitMillis) - throws SQLException { + throws SQLException { throw new SQLException(); } }; @@ -869,9 +824,8 @@ public DruidPooledConnection dataSource_connect(DruidDataSource dataSource, long { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public DruidPooledConnection dataSource_connect(DruidDataSource dataSource, long maxWaitMillis) - throws SQLException { + throws SQLException { throw new RuntimeException(); } }; @@ -887,9 +841,8 @@ public DruidPooledConnection dataSource_connect(DruidDataSource dataSource, long { FilterChain chain = new FilterChainImpl(new DataSourceProxyImpl(null, config)) { - public DruidPooledConnection dataSource_connect(DruidDataSource dataSource, long maxWaitMillis) - throws SQLException { + throws SQLException { throw new Error(); } }; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/JdbcUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/JdbcUtilsTest.java index ad981d1e11..5959d63bfb 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/JdbcUtilsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/JdbcUtilsTest.java @@ -44,19 +44,18 @@ protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } - + public void test_print() throws Exception { final AtomicInteger nextCount = new AtomicInteger(2); final MockResultSetMetaData rsMeta = new MockResultSetMetaData() { + private int[] types = new int[]{Types.DATE, Types.BIT, Types.BOOLEAN, Types.TINYINT, - private int[] types = new int[] { Types.DATE, Types.BIT, Types.BOOLEAN, Types.TINYINT, - - Types.SMALLINT, Types.INTEGER, Types.CLOB, Types.LONGVARCHAR, Types.OTHER, + Types.SMALLINT, Types.INTEGER, Types.CLOB, Types.LONGVARCHAR, Types.OTHER, - Types.VARCHAR, Types.CHAR, Types.NVARCHAR, Types.NCHAR + Types.VARCHAR, Types.CHAR, Types.NVARCHAR, Types.NCHAR - }; + }; @Override public int getColumnCount() throws SQLException { @@ -75,7 +74,6 @@ public String getColumnName(int column) throws SQLException { }; MockResultSet rs = new MockResultSet(null) { - @Override public boolean next() throws SQLException { return nextCount.getAndDecrement() > 0; @@ -113,35 +111,30 @@ public void test_close() throws Exception { JdbcUtils.close((ResultSet) null); JdbcUtils.close(new MockConnection() { - @Override public void close() throws SQLException { throw new SQLException(); } }); JdbcUtils.close(new MockStatement(null) { - @Override public void close() throws SQLException { throw new SQLException(); } }); JdbcUtils.close(new MockResultSet(null) { - @Override public void close() throws SQLException { throw new SQLException(); } }); JdbcUtils.close(new Closeable() { - @Override public void close() throws IOException { throw new IOException(); } }); JdbcUtils.close(new Closeable() { - @Override public void close() throws IOException { } @@ -194,7 +187,6 @@ public void test_read() throws Exception { Exception error = null; try { Utils.read(new Reader() { - @Override public int read(char[] cbuf, int off, int len) throws IOException { throw new IOException(); @@ -215,7 +207,6 @@ public void close() throws IOException { Exception error = null; try { Utils.read(new Reader() { - @Override public int read(char[] cbuf, int off, int len) throws IOException { throw new IOException(); @@ -235,7 +226,6 @@ public void close() throws IOException { { String text = Utils.read(new Reader() { - @Override public int read(char[] cbuf, int off, int len) throws IOException { return -1; @@ -251,7 +241,6 @@ public void close() throws IOException { } { String text = Utils.read(new Reader() { - @Override public int read(char[] cbuf, int off, int len) throws IOException { for (int i = off; i < len; ++i) { @@ -270,7 +259,6 @@ public void close() throws IOException { } { Reader reader = new Reader() { - @Override public int read(char[] cbuf, int off, int len) throws IOException { cbuf[off] = 'A'; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/Log4j2FilterTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/Log4j2FilterTest.java index 09a07b0cad..30d382e761 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/Log4j2FilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/Log4j2FilterTest.java @@ -34,7 +34,6 @@ import junit.framework.TestCase; public class Log4j2FilterTest extends TestCase { - protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); @@ -240,11 +239,10 @@ private void setLogDisableAll(LogFilter logFilter, boolean enable) { } public static class FakeLogger implements Logger { - private boolean enable; private String name; - public FakeLogger(String name, boolean enable){ + public FakeLogger(String name, boolean enable) { this.name = name; this.enable = enable; } @@ -259,764 +257,612 @@ public boolean isEnabledFor(Priority level) { @Override public void catching(Level level, Throwable t) { - } @Override public void catching(Throwable t) { - } @Override public void debug(Marker marker, Message msg) { - } @Override public void debug(Marker marker, Message msg, Throwable t) { - } @Override public void debug(Marker marker, MessageSupplier msgSupplier) { - } @Override public void debug(Marker marker, MessageSupplier msgSupplier, Throwable t) { - } @Override public void debug(Marker marker, CharSequence message) { - } @Override public void debug(Marker marker, CharSequence message, Throwable t) { - } @Override public void debug(Marker marker, Object message) { - } @Override public void debug(Marker marker, Object message, Throwable t) { - } @Override public void debug(Marker marker, String message) { - } @Override public void debug(Marker marker, String message, Object... params) { - } @Override public void debug(Marker marker, String message, Supplier... paramSuppliers) { - } @Override public void debug(Marker marker, String message, Throwable t) { - } @Override public void debug(Marker marker, Supplier msgSupplier) { - } @Override public void debug(Marker marker, Supplier msgSupplier, Throwable t) { - } @Override public void debug(Message msg) { - } @Override public void debug(Message msg, Throwable t) { - } @Override public void debug(MessageSupplier msgSupplier) { - } @Override public void debug(MessageSupplier msgSupplier, Throwable t) { - } @Override public void debug(CharSequence message) { - } @Override public void debug(CharSequence message, Throwable t) { - } @Override public void debug(Object message) { - } @Override public void debug(Object message, Throwable t) { - } @Override public void debug(String message) { - } @Override public void debug(String message, Object... params) { - } @Override public void debug(String message, Supplier... paramSuppliers) { - } @Override public void debug(String message, Throwable t) { - } @Override public void debug(Supplier msgSupplier) { - } @Override public void debug(Supplier msgSupplier, Throwable t) { - } @Override public void debug(Marker marker, String message, Object p0) { - } @Override public void debug(Marker marker, String message, Object p0, Object p1) { - } @Override public void debug(Marker marker, String message, Object p0, Object p1, Object p2) { - } @Override public void debug(Marker marker, String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void debug(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void debug(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void debug(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void debug(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void debug(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void debug(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override public void debug(String message, Object p0) { - } @Override public void debug(String message, Object p0, Object p1) { - } @Override public void debug(String message, Object p0, Object p1, Object p2) { - } @Override public void debug(String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void debug(String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void debug(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void debug(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void debug(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void debug(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void debug(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override public void entry() { - } @Override public void entry(Object... params) { - } @Override public void error(Marker marker, Message msg) { - } @Override public void error(Marker marker, Message msg, Throwable t) { - } @Override public void error(Marker marker, MessageSupplier msgSupplier) { - } @Override public void error(Marker marker, MessageSupplier msgSupplier, Throwable t) { - } @Override public void error(Marker marker, CharSequence message) { - } @Override public void error(Marker marker, CharSequence message, Throwable t) { - } @Override public void error(Marker marker, Object message) { - } @Override public void error(Marker marker, Object message, Throwable t) { - } @Override public void error(Marker marker, String message) { - } @Override public void error(Marker marker, String message, Object... params) { - } @Override public void error(Marker marker, String message, Supplier... paramSuppliers) { - } @Override public void error(Marker marker, String message, Throwable t) { - } @Override public void error(Marker marker, Supplier msgSupplier) { - } @Override public void error(Marker marker, Supplier msgSupplier, Throwable t) { - } @Override public void error(Message msg) { - } @Override public void error(Message msg, Throwable t) { - } @Override public void error(MessageSupplier msgSupplier) { - } @Override public void error(MessageSupplier msgSupplier, Throwable t) { - } @Override public void error(CharSequence message) { - } @Override public void error(CharSequence message, Throwable t) { - } @Override public void error(Object message) { - } @Override public void error(Object message, Throwable t) { - } @Override public void error(String message) { - } @Override public void error(String message, Object... params) { - } @Override public void error(String message, Supplier... paramSuppliers) { - } @Override public void error(String message, Throwable t) { - } @Override public void error(Supplier msgSupplier) { - } @Override public void error(Supplier msgSupplier, Throwable t) { - } @Override public void error(Marker marker, String message, Object p0) { - } @Override public void error(Marker marker, String message, Object p0, Object p1) { - } @Override public void error(Marker marker, String message, Object p0, Object p1, Object p2) { - } @Override public void error(Marker marker, String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void error(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void error(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void error(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void error(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void error(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void error(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override public void error(String message, Object p0) { - } @Override public void error(String message, Object p0, Object p1) { - } @Override public void error(String message, Object p0, Object p1, Object p2) { - } @Override public void error(String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void error(String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void error(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void error(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void error(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void error(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void error(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override public void exit() { - } @Override public R exit(R result) { - return null; } @Override public void fatal(Marker marker, Message msg) { - } @Override public void fatal(Marker marker, Message msg, Throwable t) { - } @Override public void fatal(Marker marker, MessageSupplier msgSupplier) { - } @Override public void fatal(Marker marker, MessageSupplier msgSupplier, Throwable t) { - } @Override public void fatal(Marker marker, CharSequence message) { - } @Override public void fatal(Marker marker, CharSequence message, Throwable t) { - } @Override public void fatal(Marker marker, Object message) { - } @Override public void fatal(Marker marker, Object message, Throwable t) { - } @Override public void fatal(Marker marker, String message) { - } @Override public void fatal(Marker marker, String message, Object... params) { - } @Override public void fatal(Marker marker, String message, Supplier... paramSuppliers) { - } @Override public void fatal(Marker marker, String message, Throwable t) { - } @Override public void fatal(Marker marker, Supplier msgSupplier) { - } @Override public void fatal(Marker marker, Supplier msgSupplier, Throwable t) { - } @Override public void fatal(Message msg) { - } @Override public void fatal(Message msg, Throwable t) { - } @Override public void fatal(MessageSupplier msgSupplier) { - } @Override public void fatal(MessageSupplier msgSupplier, Throwable t) { - } @Override public void fatal(CharSequence message) { - } @Override public void fatal(CharSequence message, Throwable t) { - } @Override public void fatal(Object message) { - } @Override public void fatal(Object message, Throwable t) { - } @Override public void fatal(String message) { - } @Override public void fatal(String message, Object... params) { - } @Override public void fatal(String message, Supplier... paramSuppliers) { - } @Override public void fatal(String message, Throwable t) { - } @Override public void fatal(Supplier msgSupplier) { - } @Override public void fatal(Supplier msgSupplier, Throwable t) { - } @Override public void fatal(Marker marker, String message, Object p0) { - } @Override public void fatal(Marker marker, String message, Object p0, Object p1) { - } @Override public void fatal(Marker marker, String message, Object p0, Object p1, Object p2) { - } @Override public void fatal(Marker marker, String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void fatal(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void fatal(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void fatal(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void fatal(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void fatal(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void fatal(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override public void fatal(String message, Object p0) { - } @Override public void fatal(String message, Object p0, Object p1) { - } @Override public void fatal(String message, Object p0, Object p1, Object p2) { - } @Override public void fatal(String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void fatal(String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void fatal(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void fatal(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void fatal(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void fatal(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void fatal(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override public Level getLevel() { - return null; } @Override public MessageFactory getMessageFactory() { - return null; } @@ -1027,259 +873,208 @@ public String getName() { @Override public void info(Marker marker, Message msg) { - } @Override public void info(Marker marker, Message msg, Throwable t) { - } @Override public void info(Marker marker, MessageSupplier msgSupplier) { - } @Override public void info(Marker marker, MessageSupplier msgSupplier, Throwable t) { - } @Override public void info(Marker marker, CharSequence message) { - } @Override public void info(Marker marker, CharSequence message, Throwable t) { - } @Override public void info(Marker marker, Object message) { - } @Override public void info(Marker marker, Object message, Throwable t) { - } @Override public void info(Marker marker, String message) { - } @Override public void info(Marker marker, String message, Object... params) { - } @Override public void info(Marker marker, String message, Supplier... paramSuppliers) { - } @Override public void info(Marker marker, String message, Throwable t) { - } @Override public void info(Marker marker, Supplier msgSupplier) { - } @Override public void info(Marker marker, Supplier msgSupplier, Throwable t) { - } @Override public void info(Message msg) { - } @Override public void info(Message msg, Throwable t) { - } @Override public void info(MessageSupplier msgSupplier) { - } @Override public void info(MessageSupplier msgSupplier, Throwable t) { - } @Override public void info(CharSequence message) { - } @Override public void info(CharSequence message, Throwable t) { - } @Override public void info(Object message) { - } @Override public void info(Object message, Throwable t) { - } @Override public void info(String message) { - } @Override public void info(String message, Object... params) { - } @Override public void info(String message, Supplier... paramSuppliers) { - } @Override public void info(String message, Throwable t) { - } @Override public void info(Supplier msgSupplier) { - } @Override public void info(Supplier msgSupplier, Throwable t) { - } @Override public void info(Marker marker, String message, Object p0) { - } @Override public void info(Marker marker, String message, Object p0, Object p1) { - } @Override public void info(Marker marker, String message, Object p0, Object p1, Object p2) { - } @Override public void info(Marker marker, String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void info(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void info(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void info(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void info(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void info(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void info(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override public void info(String message, Object p0) { - } @Override public void info(String message, Object p0, Object p1) { - } @Override public void info(String message, Object p0, Object p1, Object p2) { - } @Override public void info(String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void info(String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void info(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void info(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void info(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void info(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void info(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override public boolean isDebugEnabled(Marker marker) { - return this.enable; } @Override public boolean isEnabled(Level level) { - return this.enable; } @Override public boolean isEnabled(Level level, Marker marker) { - return this.enable; } @@ -1290,558 +1085,449 @@ public boolean isErrorEnabled() { @Override public boolean isErrorEnabled(Marker marker) { - return this.enable; } @Override public boolean isFatalEnabled() { - return this.enable; } @Override public boolean isFatalEnabled(Marker marker) { - return this.enable; } @Override public boolean isInfoEnabled() { - return this.enable; } @Override public boolean isInfoEnabled(Marker marker) { - return this.enable; } @Override public boolean isTraceEnabled() { - return this.enable; } @Override public boolean isTraceEnabled(Marker marker) { - return this.enable; } @Override public boolean isWarnEnabled() { - return this.enable; } @Override public boolean isWarnEnabled(Marker marker) { - return this.enable; } @Override public void log(Level level, Marker marker, Message msg) { - } @Override public void log(Level level, Marker marker, Message msg, Throwable t) { - } @Override public void log(Level level, Marker marker, MessageSupplier msgSupplier) { - } @Override public void log(Level level, Marker marker, MessageSupplier msgSupplier, Throwable t) { - } @Override public void log(Level level, Marker marker, CharSequence message) { - } @Override public void log(Level level, Marker marker, CharSequence message, Throwable t) { - } @Override public void log(Level level, Marker marker, Object message) { - } @Override public void log(Level level, Marker marker, Object message, Throwable t) { - } @Override public void log(Level level, Marker marker, String message) { - } @Override public void log(Level level, Marker marker, String message, Object... params) { - } @Override public void log(Level level, Marker marker, String message, Supplier... paramSuppliers) { - } @Override public void log(Level level, Marker marker, String message, Throwable t) { - } @Override public void log(Level level, Marker marker, Supplier msgSupplier) { - } @Override public void log(Level level, Marker marker, Supplier msgSupplier, Throwable t) { - } @Override public void log(Level level, Message msg) { - } @Override public void log(Level level, Message msg, Throwable t) { - } @Override public void log(Level level, MessageSupplier msgSupplier) { - } @Override public void log(Level level, MessageSupplier msgSupplier, Throwable t) { - } @Override public void log(Level level, CharSequence message) { - } @Override public void log(Level level, CharSequence message, Throwable t) { - } @Override public void log(Level level, Object message) { - } @Override public void log(Level level, Object message, Throwable t) { - } @Override public void log(Level level, String message) { - } @Override public void log(Level level, String message, Object... params) { - } @Override public void log(Level level, String message, Supplier... paramSuppliers) { - } @Override public void log(Level level, String message, Throwable t) { - } @Override public void log(Level level, Supplier msgSupplier) { - } @Override public void log(Level level, Supplier msgSupplier, Throwable t) { - } @Override public void log(Level level, Marker marker, String message, Object p0) { - } @Override public void log(Level level, Marker marker, String message, Object p0, Object p1) { - } @Override public void log(Level level, Marker marker, String message, Object p0, Object p1, Object p2) { - } @Override public void log(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void log(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void log(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void log(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void log(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void log(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void log(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override public void log(Level level, String message, Object p0) { - } @Override public void log(Level level, String message, Object p0, Object p1) { - } @Override public void log(Level level, String message, Object p0, Object p1, Object p2) { - } @Override public void log(Level level, String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void log(Level level, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void log(Level level, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void log(Level level, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void log(Level level, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void log(Level level, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void log(Level level, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override public void printf(Level level, Marker marker, String format, Object... params) { - } @Override public void printf(Level level, String format, Object... params) { - } @Override public T throwing(Level level, T t) { - return null; } @Override public T throwing(T t) { - return null; } @Override public void trace(Marker marker, Message msg) { - } @Override public void trace(Marker marker, Message msg, Throwable t) { - } @Override public void trace(Marker marker, MessageSupplier msgSupplier) { - } @Override public void trace(Marker marker, MessageSupplier msgSupplier, Throwable t) { - } @Override public void trace(Marker marker, CharSequence message) { - } @Override public void trace(Marker marker, CharSequence message, Throwable t) { - } @Override public void trace(Marker marker, Object message) { - } @Override public void trace(Marker marker, Object message, Throwable t) { - } @Override public void trace(Marker marker, String message) { - } @Override public void trace(Marker marker, String message, Object... params) { - } @Override public void trace(Marker marker, String message, Supplier... paramSuppliers) { - } @Override public void trace(Marker marker, String message, Throwable t) { - } @Override public void trace(Marker marker, Supplier msgSupplier) { - } @Override public void trace(Marker marker, Supplier msgSupplier, Throwable t) { - } @Override public void trace(Message msg) { - } @Override public void trace(Message msg, Throwable t) { - } @Override public void trace(MessageSupplier msgSupplier) { - } @Override public void trace(MessageSupplier msgSupplier, Throwable t) { - } @Override public void trace(CharSequence message) { - } @Override public void trace(CharSequence message, Throwable t) { - } @Override public void trace(Object message) { - } @Override public void trace(Object message, Throwable t) { - } @Override public void trace(String message) { - } @Override public void trace(String message, Object... params) { - } @Override public void trace(String message, Supplier... paramSuppliers) { - } @Override public void trace(String message, Throwable t) { - } @Override public void trace(Supplier msgSupplier) { - } @Override public void trace(Supplier msgSupplier, Throwable t) { - } @Override public void trace(Marker marker, String message, Object p0) { - } @Override public void trace(Marker marker, String message, Object p0, Object p1) { - } @Override public void trace(Marker marker, String message, Object p0, Object p1, Object p2) { - } @Override public void trace(Marker marker, String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void trace(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void trace(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void trace(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void trace(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void trace(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void trace(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override public void trace(String message, Object p0) { - } @Override public void trace(String message, Object p0, Object p1) { - } @Override public void trace(String message, Object p0, Object p1, Object p2) { - } @Override public void trace(String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void trace(String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void trace(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void trace(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void trace(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void trace(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void trace(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override @@ -1871,7 +1557,6 @@ public EntryMessage traceEntry(Message message) { @Override public void traceExit() { - } @Override @@ -1886,7 +1571,6 @@ public R traceExit(String format, R result) { @Override public void traceExit(EntryMessage message) { - } @Override @@ -1901,242 +1585,194 @@ public R traceExit(Message message, R result) { @Override public void warn(Marker marker, Message msg) { - } @Override public void warn(Marker marker, Message msg, Throwable t) { - } @Override public void warn(Marker marker, MessageSupplier msgSupplier) { - } @Override public void warn(Marker marker, MessageSupplier msgSupplier, Throwable t) { - } @Override public void warn(Marker marker, CharSequence message) { - } @Override public void warn(Marker marker, CharSequence message, Throwable t) { - } @Override public void warn(Marker marker, Object message) { - } @Override public void warn(Marker marker, Object message, Throwable t) { - } @Override public void warn(Marker marker, String message) { - } @Override public void warn(Marker marker, String message, Object... params) { - } @Override public void warn(Marker marker, String message, Supplier... paramSuppliers) { - } @Override public void warn(Marker marker, String message, Throwable t) { - } @Override public void warn(Marker marker, Supplier msgSupplier) { - } @Override public void warn(Marker marker, Supplier msgSupplier, Throwable t) { - } @Override public void warn(Message msg) { - } @Override public void warn(Message msg, Throwable t) { - } @Override public void warn(MessageSupplier msgSupplier) { - } @Override public void warn(MessageSupplier msgSupplier, Throwable t) { - } @Override public void warn(CharSequence message) { - } @Override public void warn(CharSequence message, Throwable t) { - } @Override public void warn(Object message) { - } @Override public void warn(Object message, Throwable t) { - } @Override public void warn(String message) { - } @Override public void warn(String message, Object... params) { - } @Override public void warn(String message, Supplier... paramSuppliers) { - } @Override public void warn(String message, Throwable t) { - } @Override public void warn(Supplier msgSupplier) { - } @Override public void warn(Supplier msgSupplier, Throwable t) { - } @Override public void warn(Marker marker, String message, Object p0) { - } @Override public void warn(Marker marker, String message, Object p0, Object p1) { - } @Override public void warn(Marker marker, String message, Object p0, Object p1, Object p2) { - } @Override public void warn(Marker marker, String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void warn(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void warn(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void warn(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void warn(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void warn(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void warn(Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } @Override public void warn(String message, Object p0) { - } @Override public void warn(String message, Object p0, Object p1) { - } @Override public void warn(String message, Object p0, Object p1, Object p2) { - } @Override public void warn(String message, Object p0, Object p1, Object p2, Object p3) { - } @Override public void warn(String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - } @Override public void warn(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { - } @Override public void warn(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { - } @Override public void warn(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { - } @Override public void warn(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { - } @Override public void warn(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { - } } } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/Log4jFilterTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/Log4jFilterTest.java index 1af1664ff2..43d07c30c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/Log4jFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/Log4jFilterTest.java @@ -31,7 +31,7 @@ protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } - + public void test_logger() throws Exception { Log4jFilter filter = new Log4jFilter(); @@ -227,10 +227,9 @@ private void setLogDisableAll(LogFilter logFilter, boolean enable) { } public static class FakeLogger extends Logger { - private boolean enable; - public FakeLogger(String name, boolean enable){ + public FakeLogger(String name, boolean enable) { super(name); this.enable = enable; } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java index b63bea7a64..74a1d18925 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java @@ -52,7 +52,7 @@ protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } - + public void test_logFilter_0() throws Exception { DataSourceProxyConfig config = new DataSourceProxyConfig(); config.setRawUrl("jdbc:mock:"); @@ -64,7 +64,6 @@ public void test_logFilter_0() throws Exception { setLogDisableAll(log4jFilter, true); CommonsLogFilter commonLogFilter = new CommonsLogFilter() { - @Override public boolean isDataSourceLogEnabled() { return true; @@ -113,7 +112,6 @@ public void test_logFilter_1() throws Exception { setLogDisableAll(log4jFilter, true); CommonsLogFilter commonLogFilter = new CommonsLogFilter() { - @Override public boolean isDataSourceLogEnabled() { return false; @@ -171,8 +169,7 @@ public void test_logFilter_2() throws Exception { } final MockResultSetMetaData rsMeta = new MockResultSetMetaData() { - - private int[] types = new int[] { Types.BLOB, Types.CLOB, Types.NCLOB, Types.BINARY, Types.OTHER }; + private int[] types = new int[]{Types.BLOB, Types.CLOB, Types.NCLOB, Types.BINARY, Types.OTHER}; @Override public int getColumnCount() throws SQLException { @@ -191,7 +188,6 @@ public int getColumnType(int column) throws SQLException { { StatementProxy stmt = (StatementProxy) conn.createStatement(); MockResultSet rs = new MockResultSet(null) { - @Override public ResultSetMetaData getMetaData() throws SQLException { return rsMeta; @@ -216,7 +212,6 @@ public Object getObject(int columnIndex) throws SQLException { } { final MockResultSet rs = new MockResultSet(null) { - @Override public ResultSetMetaData getMetaData() throws SQLException { throw new SQLException(); @@ -224,7 +219,6 @@ public ResultSetMetaData getMetaData() throws SQLException { }; StatementProxy stmt = new StatementProxyImpl(conn, new MockStatement(conn) { - public ResultSet getResultSet() throws SQLException { return rs; } @@ -236,7 +230,6 @@ public ResultSet getResultSet() throws SQLException { { StatementProxy stmt = (StatementProxy) conn.createStatement(); MockResultSet rs = new MockResultSet(null) { - @Override public ResultSetMetaData getMetaData() throws SQLException { return rsMeta; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/PrecallTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/PrecallTest.java index b6e49582fa..0f5be8bab4 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/PrecallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/PrecallTest.java @@ -39,7 +39,6 @@ import com.alibaba.druid.util.JdbcUtils; public class PrecallTest extends TestCase { - private static String create_url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=preCallTest:jdbc:derby:memory:preCallDB;create=true"; protected void setUp() throws Exception { @@ -70,13 +69,12 @@ private void dropTable() throws SQLException { protected void tearDown() throws Exception { dropTable(); - + DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } public void test_precall() throws Exception { - Connection conn = null; CallableStatement cstmt = null; ResultSet rs = null; @@ -85,11 +83,11 @@ public void test_precall() throws Exception { conn = DriverManager.getConnection(create_url); cstmt = conn.prepareCall("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(?, ?)", ResultSet.FETCH_FORWARD, - ResultSet.CONCUR_READ_ONLY); + ResultSet.CONCUR_READ_ONLY); cstmt.close(); cstmt = conn.prepareCall("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(?, ?)", ResultSet.FETCH_FORWARD, - ResultSet.CONCUR_READ_ONLY, ResultSet.CLOSE_CURSORS_AT_COMMIT); + ResultSet.CONCUR_READ_ONLY, ResultSet.CLOSE_CURSORS_AT_COMMIT); cstmt.close(); cstmt = conn.prepareCall("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(?, ?)"); @@ -97,288 +95,236 @@ public void test_precall() throws Exception { try { cstmt.setObject(1, null); } catch (SQLDataException ex) { - } try { cstmt.setObject(1, null, Types.VARCHAR); } catch (SQLDataException ex) { - } try { cstmt.setURL(1, null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setURL("F1", null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setSQLXML(1, null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setSQLXML("F1", null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setRowId(1, null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setRowId("F1", null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNString(1, null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNString("F1", null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setBlob(1, (Blob) null); } catch (SQLDataException ex) { - } try { cstmt.setBlob("F1", (Blob) null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setBlob(1, (InputStream) null); } catch (SQLDataException ex) { - } try { cstmt.setBlob("F1", (InputStream) null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setBlob(1, (InputStream) null, 0); } catch (SQLDataException ex) { - } try { cstmt.setBlob("F1", (InputStream) null, 0); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setClob(1, (Clob) null); } catch (SQLDataException ex) { - } try { cstmt.setClob("F1", (Clob) null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setClob(1, (Reader) null); } catch (SQLDataException ex) { - } try { cstmt.setClob("F1", (Reader) null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setClob(1, (Reader) null, 0); } catch (SQLDataException ex) { - } try { cstmt.setClob("F1", (Reader) null, 0); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNClob(1, (NClob) null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNClob("F1", (NClob) null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNClob(1, (Reader) null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNClob("F1", (Reader) null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNClob(1, (Reader) null, 0); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNClob("F1", (Reader) null, 0); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNCharacterStream(1, (Reader) null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNCharacterStream("F1", (Reader) null); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNCharacterStream(1, (Reader) null, 0); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNCharacterStream("F1", (Reader) null, 0); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNull("F1", Types.VARCHAR); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.setNull("F1", Types.VARCHAR, "VARCHAR"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getRef(1); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getRef("F1"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getClob(1); } catch (SQLException ex) { - } try { cstmt.getClob("F1"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getArray(1); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getArray("F1"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getURL(1); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getURL("F1"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getSQLXML(1); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getSQLXML("F1"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getRowId(1); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getRowId("F1"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getNClob(1); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getNClob("F1"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getNString(1); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getNString("F1"); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getNCharacterStream(1); } catch (SQLFeatureNotSupportedException ex) { - } try { cstmt.getNCharacterStream("F1"); } catch (SQLFeatureNotSupportedException ex) { - } cstmt.setString(1, "derby.locks.deadlockTimeout"); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementProxyImplGetParametersTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementProxyImplGetParametersTest.java index 105a408260..125afb4282 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementProxyImplGetParametersTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementProxyImplGetParametersTest.java @@ -13,8 +13,7 @@ import com.alibaba.druid.util.JdbcUtils; public class PreparedStatementProxyImplGetParametersTest extends TestCase { - - private String url = "jdbc:wrap-jdbc:filters=default:name=driverTest:jdbc:mock:xxx"; + private String url = "jdbc:wrap-jdbc:filters=default:name=driverTest:jdbc:mock:xxx"; private Connection conn; protected void setUp() throws Exception { @@ -37,10 +36,10 @@ public void test_get_parameters() throws Exception { { Map paramMap1 = stmt.getParameters(); Assert.assertNotNull(paramMap1); - + Map paramMap2 = stmt.getParameters(); Assert.assertNotNull(paramMap2); - + Assert.assertSame(paramMap1, paramMap2); Assert.assertEquals(paramMap1.size(), 1); } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementTest.java index 12a90be655..aab20945f2 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementTest.java @@ -37,7 +37,6 @@ import com.alibaba.druid.util.JdbcUtils; public class PreparedStatementTest extends TestCase { - private static String create_url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=preparedStatementTest:jdbc:derby:memory:preparedStatementTestDB;create=true"; protected void setUp() throws Exception { @@ -68,14 +67,13 @@ private void dropTable() throws SQLException { protected void tearDown() throws Exception { dropTable(); - + DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } @SuppressWarnings("deprecation") public void test_pstmt() throws Exception { - Connection conn = null; PreparedStatement pstmt = null; PreparedStatement pstmt2 = null; @@ -85,7 +83,7 @@ public void test_pstmt() throws Exception { conn = DriverManager.getConnection(create_url); pstmt = conn.prepareStatement("INSERT INTO T_PRE_STMT_TEST (ID, NAME, BIRTHDATE) VALUES (?, ?, ?)", - Statement.RETURN_GENERATED_KEYS); + Statement.RETURN_GENERATED_KEYS); pstmt.setShort(1, (short) 1); pstmt.setString(2, "A"); @@ -108,72 +106,59 @@ public void test_pstmt() throws Exception { try { pstmt.setArray(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { pstmt.setObject(2, null); } catch (SQLDataException ex) { - } try { pstmt.setNCharacterStream(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { pstmt.setNCharacterStream(2, null, 0L); } catch (SQLFeatureNotSupportedException ex) { - } try { pstmt.setNClob(2, (NClob) null); } catch (SQLFeatureNotSupportedException ex) { - } try { pstmt.setNClob(2, (Reader) null); } catch (SQLFeatureNotSupportedException ex) { - } try { pstmt.setNClob(2, null, 0L); } catch (SQLFeatureNotSupportedException ex) { - } try { pstmt.setNString(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { pstmt.setRef(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { pstmt.setRowId(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { pstmt.setSQLXML(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { pstmt.setURL(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { pstmt.setUnicodeStream(2, null, 0); } catch (SQLFeatureNotSupportedException ex) { - } pstmt.execute(); pstmt2 = conn.prepareStatement("SELECT * FROM T_PRE_STMT_TEST ORDER BY 2", ResultSet.TYPE_SCROLL_SENSITIVE, - ResultSet.CONCUR_UPDATABLE); + ResultSet.CONCUR_UPDATABLE); rs = pstmt2.executeQuery(); rs.getCursorName(); rs.clearWarnings(); @@ -204,102 +189,89 @@ public void test_pstmt() throws Exception { rs.close(); pstmt2 = conn.prepareStatement("SELECT * FROM T_PRE_STMT_TEST ORDER BY 2", ResultSet.TYPE_SCROLL_SENSITIVE, - ResultSet.CONCUR_UPDATABLE); + ResultSet.CONCUR_UPDATABLE); rs = pstmt2.executeQuery(); rs.first(); rs.last(); rs.close(); pstmt2 = conn.prepareStatement("SELECT * FROM T_PRE_STMT_TEST ORDER BY 2", ResultSet.TYPE_SCROLL_SENSITIVE, - ResultSet.CONCUR_UPDATABLE, ResultSet.CLOSE_CURSORS_AT_COMMIT); + ResultSet.CONCUR_UPDATABLE, ResultSet.CLOSE_CURSORS_AT_COMMIT); rs = pstmt2.executeQuery(); rs.first(); rs.last(); rs.close(); - pstmt2 = conn.prepareStatement("SELECT * FROM T_PRE_STMT_TEST ORDER BY 2", new int[] { 1 }); + pstmt2 = conn.prepareStatement("SELECT * FROM T_PRE_STMT_TEST ORDER BY 2", new int[]{1}); rs = pstmt2.executeQuery(); JdbcUtils.printResultSet(rs, System.out); rs.close(); - pstmt2 = conn.prepareStatement("SELECT * FROM T_PRE_STMT_TEST ORDER BY 2", new String[] { "ID" }); + pstmt2 = conn.prepareStatement("SELECT * FROM T_PRE_STMT_TEST ORDER BY 2", new String[]{"ID"}); rs = pstmt2.executeQuery(); JdbcUtils.printResultSet(rs, System.out); rs.close(); - pstmt2 = conn.prepareStatement("SELECT * FROM T_PRE_STMT_TEST ORDER BY 2", new String[] { "ID" }); + pstmt2 = conn.prepareStatement("SELECT * FROM T_PRE_STMT_TEST ORDER BY 2", new String[]{"ID"}); rs = pstmt2.executeQuery(); try { rs.getArray(2); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getArray("NAME"); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getNCharacterStream(2); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getNCharacterStream("NAME"); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getNClob(2); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getNClob("NAME"); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getNString(2); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getNString("NAME"); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getRowId(2); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getRowId("NAME"); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getSQLXML(2); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getSQLXML("NAME"); } catch (SQLFeatureNotSupportedException ex) { - } JdbcUtils.printResultSet(rs, System.out); rs.close(); pstmt2 = conn.prepareStatement("SELECT * FROM T_PRE_STMT_TEST ORDER BY 2", - ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE); + ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE); rs = pstmt2.executeQuery(); rs.next(); try { rs.refreshRow(); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.insertRow(); @@ -317,133 +289,109 @@ public void test_pstmt() throws Exception { try { rs.getURL(2); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getURL("NAME"); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateArray(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateArray("NAME", null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateNCharacterStream(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateNCharacterStream("NAME", null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateNCharacterStream(2, null, 0); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateNCharacterStream("NAME", null, 0); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateNClob(2, (NClob) null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateNClob("NAME", (NClob) null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateNClob(2, (Reader) null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateNClob("NAME", (Reader) null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateNClob(2, (Reader) null, 0); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateNClob("NAME", (Reader) null, 0); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateNString(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateNString("NAME", null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getRef(2); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.getRef("NAME"); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateRef(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateRef("NAME", null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateRowId(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateRowId("NAME", null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateSQLXML(2, null); } catch (SQLFeatureNotSupportedException ex) { - } try { rs.updateSQLXML("NAME", null); } catch (SQLFeatureNotSupportedException ex) { - } JdbcUtils.printResultSet(rs, System.out); rs.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/ProxyDriverTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/ProxyDriverTest.java index d8234b56e0..0c6a23372f 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/ProxyDriverTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/ProxyDriverTest.java @@ -26,13 +26,12 @@ import junit.framework.TestCase; public class ProxyDriverTest extends TestCase { - public void test_connect() throws Exception { String url = "jdbc:wrap-jdbc:filters=default:name=clobTest:jdbc:derby:memory:clobTestDB;create=true"; Connection conn = DriverManager.getConnection(url); conn.close(); } - + protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/ResultSetProxyImplTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/ResultSetProxyImplTest.java index 928fadda6c..fd318a7887 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/ResultSetProxyImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/ResultSetProxyImplTest.java @@ -34,16 +34,14 @@ import com.alibaba.druid.stat.JdbcStatManager; public class ResultSetProxyImplTest extends TestCase { - String sql = "SELECT 1"; - + protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } public void test_resultset() throws Exception { - MockDriver driver = new MockDriver(); DataSourceProxyConfig config = new DataSourceProxyConfig(); config.setUrl(""); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/SchemaReadTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/SchemaReadTest.java index 2c6a03b10a..4e11198354 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/SchemaReadTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/SchemaReadTest.java @@ -35,14 +35,13 @@ import com.alibaba.druid.util.JdbcUtils; public class SchemaReadTest extends TestCase { - private static String url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=demo:jdbc:derby:classpath:petstore-db"; protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } - + public void test_schema() throws Exception { Class.forName("com.alibaba.druid.proxy.DruidDriver"); @@ -185,7 +184,6 @@ public static void printResultSetUseColumnName(ResultSet rs, PrintStream out) th out.println(); while (rs.next()) { - for (int columnIndex = 1; columnIndex <= columnCount; ++columnIndex) { if (columnIndex != 1) { out.print('\t'); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/SqlStatisticTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/SqlStatisticTest.java index 0d25d83c96..96793805f4 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/SqlStatisticTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/SqlStatisticTest.java @@ -22,7 +22,6 @@ import com.alibaba.druid.stat.JdbcSqlStat; public class SqlStatisticTest extends TestCase { - public void test_sql_stat() throws Exception { JdbcSqlStat stat = new JdbcSqlStat("SELECT * FROM t_user"); Assert.assertEquals(null, stat.getExecuteLastStartTime()); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/StatementTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/StatementTest.java index b8b89a471e..8eb1d5d8b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/StatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/StatementTest.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcUtils; public class StatementTest extends TestCase { - private static String create_url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=statementTest:jdbc:derby:memory:statementTest;create=true"; protected void setUp() throws Exception { @@ -67,7 +66,6 @@ protected void tearDown() throws Exception { } public void test_stmt() throws Exception { - Connection conn = null; Statement stmt = null; ResultSet rs = null; @@ -78,17 +76,17 @@ public void test_stmt() throws Exception { stmt = conn.createStatement(); stmt.execute("INSERT INTO T_PRE_STMT_TEST (ID, NAME, BIRTHDATE) VALUES (1, 'A', NULL)"); stmt.execute("INSERT INTO T_PRE_STMT_TEST (ID, NAME, BIRTHDATE) VALUES (11, 'A1', NULL)", - Statement.NO_GENERATED_KEYS); - stmt.execute("INSERT INTO T_PRE_STMT_TEST (ID, NAME, BIRTHDATE) VALUES (12, 'A2', NULL)", new int[] { 1 }); + Statement.NO_GENERATED_KEYS); + stmt.execute("INSERT INTO T_PRE_STMT_TEST (ID, NAME, BIRTHDATE) VALUES (12, 'A2', NULL)", new int[]{1}); stmt.execute("INSERT INTO T_PRE_STMT_TEST (ID, NAME, BIRTHDATE) VALUES (12, 'A3', NULL)", - new String[] { "ID" }); + new String[]{"ID"}); stmt.executeUpdate("INSERT INTO T_PRE_STMT_TEST (ID, NAME, BIRTHDATE) VALUES (2, 'B', NULL)"); stmt.executeUpdate("INSERT INTO T_PRE_STMT_TEST (ID, NAME, BIRTHDATE) VALUES (3, 'C', NULL)", - Statement.NO_GENERATED_KEYS); + Statement.NO_GENERATED_KEYS); stmt.executeUpdate("INSERT INTO T_PRE_STMT_TEST (ID, NAME, BIRTHDATE) VALUES (4, 'D', NULL)", - new int[] { 1 }); + new int[]{1}); stmt.executeUpdate("INSERT INTO T_PRE_STMT_TEST (ID, NAME, BIRTHDATE) VALUES (5, 'E', NULL)", - new String[] { "ID" }); + new String[]{"ID"}); try { stmt.cancel(); } catch (SQLFeatureNotSupportedException ex) { diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/StatisticTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/StatisticTest.java index 93867f1ebc..c1315ed497 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/StatisticTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/StatisticTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.stat.JdbcStatManager; public class StatisticTest extends TestCase { - public void test_stat() throws Exception { JdbcConnectionStat stat = new JdbcConnectionStat(); Assert.assertEquals(null, stat.getConnectLastTime()); @@ -33,7 +32,7 @@ public void test_stat() throws Exception { stat.setActiveCount(2); Assert.assertEquals(2, stat.getActiveMax()); } - + protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java index 46251ff785..92d10baf49 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.Utils; public class WrapImplTest extends TestCase { - private static String url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j,encoding,null:name=demo:jdbc:derby:classpath:petstore-db"; public void test_clone() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/fake/DruidDriverTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/fake/DruidDriverTest.java index bbf96c7e96..2007029655 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/fake/DruidDriverTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/fake/DruidDriverTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.proxy.DruidDriver; public class DruidDriverTest extends TestCase { - public void test_0() throws Exception { String url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=preCallTest:jdbc:fake:c1"; Properties info = new Properties(); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/fake/FakeDriverTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/fake/FakeDriverTest.java index 5780823124..232ae1a382 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/fake/FakeDriverTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/fake/FakeDriverTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.mock.MockDriver; public class FakeDriverTest extends TestCase { - public void test_0() throws Exception { String url = "jdbc:fake:x1"; Properties info = new Properties(); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java index 0790c9b7a6..a9483e6653 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java @@ -31,9 +31,8 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class ClobTest extends TestCase { - protected int dataSourceListSize; - + protected void setUp() throws Exception { dataSourceListSize = DruidDataSourceStatManager.getInstance().getDataSourceList().size(); } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java index fb959b3ec8..1da981a565 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java @@ -18,13 +18,12 @@ import com.alibaba.druid.util.JdbcUtils; public class GlobalStatTest0 extends TestCase { - private DruidDataSource dataSourceA; private DruidDataSource dataSourceB; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSourceA = new DruidDataSource(); dataSourceA.setUrl("jdbc:mock:xx_A"); dataSourceA.setFilters("stat"); @@ -39,9 +38,9 @@ protected void setUp() throws Exception { protected void tearDown() throws Exception { JdbcUtils.close(dataSourceA); JdbcUtils.close(dataSourceB); - + JdbcDataSourceStat.setGlobal(null); - + Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } @@ -52,7 +51,6 @@ public void test_execute() throws Exception { PreparedStatement stmt = conn.prepareStatement("SELECT 1"); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); @@ -63,7 +61,6 @@ public void test_execute() throws Exception { PreparedStatement stmt = conn.prepareStatement("SELECT 1"); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest1.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest1.java index 5008cbbf3c..abe78b8e15 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest1.java @@ -15,13 +15,12 @@ import com.alibaba.druid.util.JdbcUtils; public class GlobalStatTest1 extends TestCase { - private DruidDataSource dataSourceA; private DruidDataSource dataSourceB; protected void setUp() throws Exception { Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); - + dataSourceA = new DruidDataSource(); dataSourceA.setUrl("jdbc:mock:xx_A"); dataSourceA.setFilters("stat"); @@ -36,9 +35,9 @@ protected void setUp() throws Exception { protected void tearDown() throws Exception { JdbcUtils.close(dataSourceA); JdbcUtils.close(dataSourceB); - + JdbcDataSourceStat.setGlobal(null); - + Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } @@ -48,7 +47,6 @@ public void test_execute() throws Exception { Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("SELECT 1"); while (rs.next()) { - } rs.close(); stmt.close(); @@ -59,7 +57,6 @@ public void test_execute() throws Exception { PreparedStatement stmt = conn.prepareStatement("SELECT 1"); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest.java index 18c458c0ad..242dcb3f4a 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest.java @@ -24,31 +24,31 @@ import com.alibaba.druid.pool.DruidDataSource; public class MergeStatFilterTest extends TestCase { - private DruidDataSource dataSource; - - protected void setUp() throws Exception { - dataSource = new DruidDataSource(); - dataSource.setUrl("jdbc:mock:xx"); - dataSource.setFilters("mergeStat"); - } - - protected void tearDown() throws Exception { - dataSource.close(); - } - - public void test_merge() throws Exception { - for (int i = 0; i < 100; ++i) { - String sql = "select * from t where id = " + i; - Connection conn = dataSource.getConnection(); - - Statement stmt = conn.createStatement(); - stmt.execute(sql); - stmt.close(); - - conn.close(); - } - - Assert.assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap().size()); - } + private DruidDataSource dataSource; + + protected void setUp() throws Exception { + dataSource = new DruidDataSource(); + dataSource.setUrl("jdbc:mock:xx"); + dataSource.setFilters("mergeStat"); + } + + protected void tearDown() throws Exception { + dataSource.close(); + } + + public void test_merge() throws Exception { + for (int i = 0; i < 100; ++i) { + String sql = "select * from t where id = " + i; + Connection conn = dataSource.getConnection(); + + Statement stmt = conn.createStatement(); + stmt.execute(sql); + stmt.close(); + + conn.close(); + } + + Assert.assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap().size()); + } } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest2.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest2.java index aa236178b4..5ff02363f7 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest2.java @@ -25,43 +25,43 @@ import com.alibaba.druid.pool.DruidDataSource; public class MergeStatFilterTest2 extends TestCase { - private DruidDataSource dataSource; + private DruidDataSource dataSource; - protected void setUp() throws Exception { - dataSource = new DruidDataSource(); - dataSource.setUrl("jdbc:mock:xx"); - dataSource.setFilters("mergeStat"); - } + protected void setUp() throws Exception { + dataSource = new DruidDataSource(); + dataSource.setUrl("jdbc:mock:xx"); + dataSource.setFilters("mergeStat"); + } - protected void tearDown() throws Exception { - dataSource.close(); - } + protected void tearDown() throws Exception { + dataSource.close(); + } - public void test_merge() throws Exception { - { - String sql = "select * from t where id = 3 or id = 5 or id = 7"; - Connection conn = dataSource.getConnection(); + public void test_merge() throws Exception { + { + String sql = "select * from t where id = 3 or id = 5 or id = 7"; + Connection conn = dataSource.getConnection(); - Statement stmt = conn.createStatement(); - stmt.execute(sql); - stmt.close(); + Statement stmt = conn.createStatement(); + stmt.execute(sql); + stmt.close(); - conn.close(); - } + conn.close(); + } - { - String sql = "select * from t where id = 122 or id = 55"; - Connection conn = dataSource.getConnection(); + { + String sql = "select * from t where id = 122 or id = 55"; + Connection conn = dataSource.getConnection(); - Statement stmt = conn.createStatement(); - stmt.execute(sql); - stmt.close(); + Statement stmt = conn.createStatement(); + stmt.execute(sql); + stmt.close(); - conn.close(); - } + conn.close(); + } - Assert.assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap() - .size()); - } + Assert.assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap() + .size()); + } } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest3.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest3.java index da5c6330dd..9f57ee0b20 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest3.java @@ -27,36 +27,35 @@ import com.alibaba.druid.util.Utils; public class MergeStatFilterTest3 extends TestCase { - private DruidDataSource dataSource; - - protected void setUp() throws Exception { - dataSource = new DruidDataSource(); - dataSource.setUrl("jdbc:mock:xx"); - dataSource.setFilters("mergeStat"); - dataSource.setDbType("postgresql"); - } - - protected void tearDown() throws Exception { - dataSource.close(); - } - - public void test_merge() throws Exception { - String sqllist = Utils.read(new InputStreamReader(this.getClass().getResourceAsStream("/bvt/parser/postgresql.txt"))); - String[] ss = sqllist.split("--"); - for(String sql:ss) - { - Connection conn = dataSource.getConnection(); - Statement stmt = conn.createStatement(); - stmt.execute(sql); - stmt.close(); - conn.close(); - } - - - Assert.assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap() - .size()); - System.out.println(dataSource.getDataSourceStat().getSqlStatMap().keySet().iterator().next()); - - } + private DruidDataSource dataSource; + + protected void setUp() throws Exception { + dataSource = new DruidDataSource(); + dataSource.setUrl("jdbc:mock:xx"); + dataSource.setFilters("mergeStat"); + dataSource.setDbType("postgresql"); + } + + protected void tearDown() throws Exception { + dataSource.close(); + } + + public void test_merge() throws Exception { + String sqllist = Utils.read(new InputStreamReader(this.getClass().getResourceAsStream("/bvt/parser/postgresql.txt"))); + String[] ss = sqllist.split("--"); + for (String sql : ss) { + Connection conn = dataSource.getConnection(); + Statement stmt = conn.createStatement(); + stmt.execute(sql); + stmt.close(); + conn.close(); + } + + + Assert.assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap() + .size()); + System.out.println(dataSource.getDataSourceStat().getSqlStatMap().keySet().iterator().next()); + + } } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl.java index 4a39d3350f..ba33b5aff5 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class MergeStatFilterTest_tddl extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -41,7 +40,7 @@ protected void setUp() throws Exception { System.out.println(text); } } - + Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_1.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_1.java index 7dbe7cacb5..dcfc261c3a 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_1.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_1.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class MergeStatFilterTest_tddl_1 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -41,7 +40,7 @@ protected void setUp() throws Exception { System.out.println(text); } } - + Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_2.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_2.java index f13061e559..0ee7d373f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_2.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_2.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class MergeStatFilterTest_tddl_2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -41,7 +40,7 @@ protected void setUp() throws Exception { System.out.println(text); } } - + Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_3.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_3.java index ae2aebc99c..d85867c096 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_3.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_3.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class MergeStatFilterTest_tddl_3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -41,7 +40,7 @@ protected void setUp() throws Exception { System.out.println(text); } } - + Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); dataSource = new DruidDataSource(); @@ -60,7 +59,7 @@ protected void tearDown() throws Exception { public void test_merge() throws Exception { for (int i = 1000; i < 2000; ++i) { String tableName = "t_" + i; - + Connection conn = dataSource.getConnection(); String sql = "update " + tableName + " SET a = ? WHERE b = ?"; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_4.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_4.java index 988f23df27..d75f9f9241 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_4.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_4.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class MergeStatFilterTest_tddl_4 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -41,7 +40,7 @@ protected void setUp() throws Exception { System.out.println(text); } } - + Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); dataSource = new DruidDataSource(); @@ -61,7 +60,7 @@ protected void tearDown() throws Exception { public void test_merge() throws Exception { for (int i = 1000; i < 2000; ++i) { String tableName = "t_" + i; - + Connection conn = dataSource.getConnection(); String sql = "update " + tableName + " SET a = ? WHERE b = ?"; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterConcurrentTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterConcurrentTest.java index 103f64ec72..5cfc723e6f 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterConcurrentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterConcurrentTest.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.JdbcSqlStat; public class StatFilterConcurrentTest extends TestCase { - private DruidDataSource dataSource; - private StatFilter statFilter; - private int LOOP_COUNT = 1000 * 1; + private StatFilter statFilter; + private int LOOP_COUNT = 1000 * 1; public void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -58,7 +57,6 @@ public void concurrent(int threadCount) throws Exception { for (int i = 0; i < threadCount; ++i) { threads[i] = new Thread() { - public void run() { try { for (int i = 0; i < LOOP_COUNT; ++i) { diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest.java index 718801c753..a4e725c5b0 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest.java @@ -32,14 +32,13 @@ import com.alibaba.druid.support.json.JSONUtils; public class StatFilterTest extends TestCase { - public void setUp() throws Exception { JdbcStatManager.getInstance().reset(); } public void tearDown() throws Exception { JdbcStatManager.getInstance().reset(); - + DruidDriver.getProxyDataSources().clear(); Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest2.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest2.java index 3b59ac4270..e837e38308 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest2.java @@ -25,7 +25,6 @@ import com.alibaba.druid.stat.JdbcStatManager; public class StatFilterTest2 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -39,7 +38,6 @@ protected void tearDown() throws Exception { } public void test_0() throws Exception { - Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); @@ -52,7 +50,7 @@ public void test_0() throws Exception { conn.close(); } - public final static void setStatSql(String val) { + public static final void setStatSql(String val) { JdbcStatContext context = JdbcStatManager.getInstance().getStatContext(); if (context == null) { context = JdbcStatManager.getInstance().createStatContext(); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest3.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest3.java index 343c9e8e6b..3b8659f077 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest3.java @@ -12,36 +12,36 @@ public class StatFilterTest3 extends TestCase { @SuppressWarnings("deprecation") public void test_dbType() throws Exception { StatFilter filter = new StatFilter(); - + Assert.assertFalse(filter.isMergeSql()); - + filter.setDbType("mysql"); filter.setMergeSql(true); - + Assert.assertTrue(filter.isMergeSql()); Assert.assertEquals(DbType.mysql, filter.getDbType()); - - Assert.assertEquals("SELECT ?\nLIMIT ?" , filter.mergeSql("select 'x' limit 1")); + + Assert.assertEquals("SELECT ?\nLIMIT ?", filter.mergeSql("select 'x' limit 1")); } - + public void test_dbType_error() throws Exception { StatFilter filter = new StatFilter(); filter.setDbType("mysql"); filter.setMergeSql(true); - + Assert.assertEquals(DbType.mysql, filter.getDbType()); - - Assert.assertEquals("sdafawer asf " , filter.mergeSql("sdafawer asf ")); + + Assert.assertEquals("sdafawer asf ", filter.mergeSql("sdafawer asf ")); } - + public void test_merge() throws Exception { StatFilter filter = new StatFilter(); filter.setDbType("mysql"); filter.setMergeSql(false); - + Assert.assertEquals(DbType.mysql, filter.getDbType()); - - Assert.assertEquals("select 'x' limit 1" , filter.mergeSql("select 'x' limit 1")); + + Assert.assertEquals("select 'x' limit 1", filter.mergeSql("select 'x' limit 1")); } @@ -59,7 +59,7 @@ public void test_merge_pg() throws Exception { "FROM postman_trace_info_one\n" + "WHERE lng > ?\n" + "\tAND lat > ?\n" + - "\tAND site_id = ?;" , filter.mergeSql("drop table if exists test_site_data_select_111; create table test_site_data_select_111 AS select * from postman_trace_info_one where lng>0 and lat>0 and site_id='17814' ;", JdbcConstants.POSTGRESQL)); + "\tAND site_id = ?;", filter.mergeSql("drop table if exists test_site_data_select_111; create table test_site_data_select_111 AS select * from postman_trace_info_one where lng>0 and lat>0 and site_id='17814' ;", JdbcConstants.POSTGRESQL)); } public void test_merge_oracle() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetConvertTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetConvertTest.java index 0feb5a50b9..cb9cbdd42b 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetConvertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetConvertTest.java @@ -26,10 +26,9 @@ * @author gang.su */ public class CharsetConvertTest extends TestCase { - - private final static String CLIENT_ENCODEING = "gbk"; - private final static String SERVER_ENCODEING = "utf-8"; - public CharsetConvert charsetConvert = new CharsetConvert(CLIENT_ENCODEING, SERVER_ENCODEING); + private static final String CLIENT_ENCODEING = "gbk"; + private static final String SERVER_ENCODEING = "utf-8"; + public CharsetConvert charsetConvert = new CharsetConvert(CLIENT_ENCODEING, SERVER_ENCODEING); public void testIsEmpty() { Assert.assertTrue(charsetConvert.isEmpty(null)); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetParameterTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetParameterTest.java index e7b1a751af..b80c1b9d13 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetParameterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetParameterTest.java @@ -24,7 +24,6 @@ * @author gang.su */ public class CharsetParameterTest extends TestCase { - public void testQ() { CharsetParameter c = new CharsetParameter(); c.setClientEncoding("1"); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java index 7dab82eeaf..6c5c651b15 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java @@ -31,13 +31,11 @@ /** * druidLoader util 测试 - * + * * @author gang.su */ public class DruidLoaderUtilsTest extends TestCase { - public void testLoadFilter() throws SQLException { - List filters = new ArrayList(); // log4j String filterItem = "log4j"; @@ -80,14 +78,14 @@ public void testLoadFilter() throws SQLException { filterConfig = filters.get(0); Assert.assertNotNull(filterConfig); Assert.assertEquals("com.alibaba.druid.filter.encoding.EncodingConvertFilter", - filterConfig.getClass().getName()); + filterConfig.getClass().getName()); // 判定重复 filterItem = "stat"; filters.clear(); FilterManager.loadFilter(filters, filterItem); filterItem = "default"; FilterManager.loadFilter(filters, filterItem); - for (Iterator iterator = filters.iterator(); iterator.hasNext();) { + for (Iterator iterator = filters.iterator(); iterator.hasNext(); ) { Filter filter = (Filter) iterator.next(); System.out.println(filter.getClass().getName()); } @@ -98,7 +96,7 @@ public void twest_loadClass() throws Exception { Assert.assertEquals(null, Utils.loadClass(null)); Assert.assertEquals(null, Utils.loadClass("xxx")); Assert.assertEquals(PublicJdbcFilterAdapter.class, - Utils.loadClass(PublicJdbcFilterAdapter.class.getName())); + Utils.loadClass(PublicJdbcFilterAdapter.class.getName())); Assert.assertNull(Utils.loadClass(null)); Assert.assertNull(Utils.loadClass("")); } diff --git a/src/test/java/com/alibaba/druid/bvt/spring/DruidJdbcExtractorTest.java b/src/test/java/com/alibaba/druid/bvt/spring/DruidJdbcExtractorTest.java index 70e5d1cc73..ac31ca74aa 100644 --- a/src/test/java/com/alibaba/druid/bvt/spring/DruidJdbcExtractorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/spring/DruidJdbcExtractorTest.java @@ -30,7 +30,6 @@ import com.alibaba.druid.support.spring.DruidNativeJdbcExtractor; public class DruidJdbcExtractorTest extends TestCase { - public void test_spring() throws Exception { DruidDataSource dataSource = new DruidDataSource(); @@ -40,25 +39,25 @@ public void test_spring() throws Exception { dataSource.setUrl("jdbc:mock:xx1"); Connection conn = dataSource.getConnection(); Assert.assertEquals(true, extractor.getNativeConnection(conn) instanceof MockConnection); - + Statement stmt = conn.createStatement(); Assert.assertEquals(true, extractor.getNativeConnectionFromStatement(stmt) instanceof MockConnection); Assert.assertEquals(true, extractor.getNativeStatement(stmt) instanceof MockStatement); - + stmt.close(); - + PreparedStatement preStmt = conn.prepareStatement("select 1"); Assert.assertEquals(true, extractor.getNativeConnectionFromStatement(preStmt) instanceof MockConnection); Assert.assertEquals(true, extractor.getNativeStatement(preStmt) instanceof MockPreparedStatement); Assert.assertEquals(true, extractor.getNativePreparedStatement(preStmt) instanceof MockPreparedStatement); preStmt.close(); - + PreparedStatement callStmt = conn.prepareCall("select 1"); Assert.assertEquals(true, extractor.getNativeConnectionFromStatement(callStmt) instanceof MockConnection); Assert.assertEquals(true, extractor.getNativeStatement(callStmt) instanceof MockCallableStatement); Assert.assertEquals(true, extractor.getNativePreparedStatement(callStmt) instanceof MockCallableStatement); callStmt.close(); - + conn.close(); } finally { dataSource.close(); @@ -75,25 +74,25 @@ public void test_spring_filter() throws Exception { dataSource.setFilters("stat"); Connection conn = dataSource.getConnection(); Assert.assertEquals(true, extractor.getNativeConnection(conn) instanceof MockConnection); - + Statement stmt = conn.createStatement(); Assert.assertEquals(true, extractor.getNativeConnectionFromStatement(stmt) instanceof MockConnection); Assert.assertEquals(true, extractor.getNativeStatement(stmt) instanceof MockStatement); - + stmt.close(); - + PreparedStatement preStmt = conn.prepareStatement("select 1"); Assert.assertEquals(true, extractor.getNativeConnectionFromStatement(preStmt) instanceof MockConnection); Assert.assertEquals(true, extractor.getNativeStatement(preStmt) instanceof MockPreparedStatement); Assert.assertEquals(true, extractor.getNativePreparedStatement(preStmt) instanceof MockPreparedStatement); preStmt.close(); - + PreparedStatement callStmt = conn.prepareCall("select 1"); Assert.assertEquals(true, extractor.getNativeConnectionFromStatement(callStmt) instanceof MockConnection); Assert.assertEquals(true, extractor.getNativeStatement(callStmt) instanceof MockCallableStatement); Assert.assertEquals(true, extractor.getNativePreparedStatement(callStmt) instanceof MockCallableStatement); callStmt.close(); - + conn.close(); } finally { dataSource.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/spring/SpringMethodInfoTest.java b/src/test/java/com/alibaba/druid/bvt/spring/SpringMethodInfoTest.java index efcdbd0b6c..73c5319cf1 100644 --- a/src/test/java/com/alibaba/druid/bvt/spring/SpringMethodInfoTest.java +++ b/src/test/java/com/alibaba/druid/bvt/spring/SpringMethodInfoTest.java @@ -23,7 +23,6 @@ import com.alibaba.druid.support.spring.stat.SpringStat; public class SpringMethodInfoTest extends TestCase { - public void test_equals() throws Exception { SpringMethodInfo b1 = new SpringMethodInfo(B.class, B.class.getMethod("f", int.class)); SpringMethodInfo c = new SpringMethodInfo(C.class, C.class.getMethod("f", int.class)); @@ -49,17 +48,13 @@ public void test_get() throws Exception { } public static class A { - public void f(int i) { - } } public static class B extends A { - } public static class C extends A { - } } diff --git a/src/test/java/com/alibaba/druid/bvt/spring/SqlMapClientWrapperTest.java b/src/test/java/com/alibaba/druid/bvt/spring/SqlMapClientWrapperTest.java index 010cb53334..081cc0547a 100644 --- a/src/test/java/com/alibaba/druid/bvt/spring/SqlMapClientWrapperTest.java +++ b/src/test/java/com/alibaba/druid/bvt/spring/SqlMapClientWrapperTest.java @@ -17,7 +17,6 @@ import com.ibatis.sqlmap.engine.impl.SqlMapClientImpl; public class SqlMapClientWrapperTest extends TestCase { - private ClassPathXmlApplicationContext context = null; protected void setUp() throws Exception { @@ -94,17 +93,13 @@ public void test_wrap() throws Exception { Assert.assertEquals(1, wrapper.queryForList("User.select", Collections.emptyMap(), 0, 2).size()); wrapper.queryWithRowHandler("User.select", new RowHandler() { - @Override public void handleRow(Object valueObject) { - } }); wrapper.queryWithRowHandler("User.select", Collections.emptyMap(), new RowHandler() { - @Override public void handleRow(Object valueObject) { - } }); @@ -113,7 +108,7 @@ public void handleRow(Object valueObject) { Assert.assertNotNull(wrapper.queryForMap("User.select", Collections.emptyMap(), "id")); Assert.assertNotNull(wrapper.queryForMap("User.select", Collections.emptyMap(), "id", "name")); - + wrapper.delete("User.delete", 12345678L); { Exception error = null; @@ -124,7 +119,7 @@ public void handleRow(Object valueObject) { } Assert.assertNotNull(error); } - + wrapper.startBatch(); wrapper.executeBatch(); wrapper.executeBatchDetailed(); diff --git a/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest.java b/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest.java index 323c19fe87..076f709ba5 100644 --- a/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest.java +++ b/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest.java @@ -11,7 +11,6 @@ import com.ibatis.sqlmap.engine.impl.SqlMapClientImpl; public class SqlMapExecutorWrapperTest extends TestCase { - private ClassPathXmlApplicationContext context = null; protected void setUp() throws Exception { @@ -48,16 +47,16 @@ public void test_wrap() throws Exception { Assert.assertNotNull(error); wrapper.startTransaction(); wrapper.commitTransaction(); - + wrapper.getMappedStatement("Sequence.getValue"); - + wrapper.isEnhancementEnabled(); wrapper.isLazyLoadingEnabled(); - + wrapper.getSqlExecutor(); - + wrapper.getDelegate(); - + wrapper.getResultObjectFactory(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest_2.java b/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest_2.java index bb75e6eeb4..6a91978229 100644 --- a/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest_2.java @@ -17,7 +17,6 @@ import com.ibatis.sqlmap.engine.impl.SqlMapClientImpl; public class SqlMapExecutorWrapperTest_2 extends TestCase { - private ClassPathXmlApplicationContext context = null; protected void setUp() throws Exception { @@ -94,17 +93,13 @@ public void test_wrap() throws Exception { Assert.assertEquals(1, wrapper.queryForList("User.select", Collections.emptyMap(), 0, 2).size()); wrapper.queryWithRowHandler("User.select", new RowHandler() { - @Override public void handleRow(Object valueObject) { - } }); wrapper.queryWithRowHandler("User.select", Collections.emptyMap(), new RowHandler() { - @Override public void handleRow(Object valueObject) { - } }); @@ -113,7 +108,7 @@ public void handleRow(Object valueObject) { Assert.assertNotNull(wrapper.queryForMap("User.select", Collections.emptyMap(), "id")); Assert.assertNotNull(wrapper.queryForMap("User.select", Collections.emptyMap(), "id", "name")); - + wrapper.delete("User.delete", 12345678L); { Exception error = null; @@ -124,7 +119,7 @@ public void handleRow(Object valueObject) { } Assert.assertNotNull(error); } - + wrapper.startBatch(); wrapper.executeBatch(); wrapper.executeBatchDetailed(); diff --git a/src/test/java/com/alibaba/druid/bvt/spring/SqlMapSessionWrapperTest.java b/src/test/java/com/alibaba/druid/bvt/spring/SqlMapSessionWrapperTest.java index 29e440b234..085138353d 100644 --- a/src/test/java/com/alibaba/druid/bvt/spring/SqlMapSessionWrapperTest.java +++ b/src/test/java/com/alibaba/druid/bvt/spring/SqlMapSessionWrapperTest.java @@ -10,7 +10,6 @@ import com.ibatis.sqlmap.engine.impl.SqlMapSessionImpl; public class SqlMapSessionWrapperTest extends TestCase { - private ClassPathXmlApplicationContext context = null; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/BigOrTest.java b/src/test/java/com/alibaba/druid/bvt/sql/BigOrTest.java index 4a4fb5e560..47730f2f4b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/BigOrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/BigOrTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; public class BigOrTest extends TestCase { - public void testBigOr() throws Exception { StringBuilder buf = new StringBuilder(); buf.append("SELECT * FROM T WHERE FID = ?"); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest.java b/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest.java index 074c272762..12c3151cfb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest.java @@ -67,16 +67,16 @@ public void test_0() throws Exception { SQLCreateTableStatement.sort(stmtList); - assertEquals("t9", ((SQLCreateTableStatement)stmtList.get(9)).getName().getSimpleName()); - assertEquals("t3", ((SQLCreateTableStatement)stmtList.get(8)).getName().getSimpleName()); - assertEquals("t0", ((SQLCreateTableStatement)stmtList.get(7)).getName().getSimpleName()); - assertEquals("t1", ((SQLCreateTableStatement)stmtList.get(6)).getName().getSimpleName()); - assertEquals("t8", ((SQLCreateTableStatement)stmtList.get(5)).getName().getSimpleName()); - assertEquals("t7", ((SQLCreateTableStatement)stmtList.get(4)).getName().getSimpleName()); - assertEquals("t6", ((SQLCreateTableStatement)stmtList.get(3)).getName().getSimpleName()); - assertEquals("t5", ((SQLCreateTableStatement)stmtList.get(2)).getName().getSimpleName()); - assertEquals("t4", ((SQLCreateTableStatement)stmtList.get(1)).getName().getSimpleName()); - assertEquals("t2", ((SQLCreateTableStatement)stmtList.get(0)).getName().getSimpleName()); + assertEquals("t9", ((SQLCreateTableStatement) stmtList.get(9)).getName().getSimpleName()); + assertEquals("t3", ((SQLCreateTableStatement) stmtList.get(8)).getName().getSimpleName()); + assertEquals("t0", ((SQLCreateTableStatement) stmtList.get(7)).getName().getSimpleName()); + assertEquals("t1", ((SQLCreateTableStatement) stmtList.get(6)).getName().getSimpleName()); + assertEquals("t8", ((SQLCreateTableStatement) stmtList.get(5)).getName().getSimpleName()); + assertEquals("t7", ((SQLCreateTableStatement) stmtList.get(4)).getName().getSimpleName()); + assertEquals("t6", ((SQLCreateTableStatement) stmtList.get(3)).getName().getSimpleName()); + assertEquals("t5", ((SQLCreateTableStatement) stmtList.get(2)).getName().getSimpleName()); + assertEquals("t4", ((SQLCreateTableStatement) stmtList.get(1)).getName().getSimpleName()); + assertEquals("t2", ((SQLCreateTableStatement) stmtList.get(0)).getName().getSimpleName()); String sortedSql = SQLUtils.toSQLString(stmtList, JdbcConstants.ORACLE); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_1.java index edd08d0da0..bec751e713 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_1.java @@ -93,11 +93,11 @@ public void test_0() throws Exception { SQLCreateTableStatement.sort(stmtList); - assertEquals("XT_DJ_XT", ((SQLCreateTableStatement)stmtList.get(0)).getName().getSimpleName()); - assertEquals("XT_DM_GN", ((SQLCreateTableStatement)stmtList.get(1)).getName().getSimpleName()); - assertEquals("XT_DJ_YH", ((SQLCreateTableStatement)stmtList.get(2)).getName().getSimpleName()); - assertEquals("XT_DJ_GN", ((SQLCreateTableStatement)stmtList.get(3)).getName().getSimpleName()); - assertEquals("XT_DJ_YHCD", ((SQLCreateTableStatement)stmtList.get(4)).getName().getSimpleName()); + assertEquals("XT_DJ_XT", ((SQLCreateTableStatement) stmtList.get(0)).getName().getSimpleName()); + assertEquals("XT_DM_GN", ((SQLCreateTableStatement) stmtList.get(1)).getName().getSimpleName()); + assertEquals("XT_DJ_YH", ((SQLCreateTableStatement) stmtList.get(2)).getName().getSimpleName()); + assertEquals("XT_DJ_GN", ((SQLCreateTableStatement) stmtList.get(3)).getName().getSimpleName()); + assertEquals("XT_DJ_YHCD", ((SQLCreateTableStatement) stmtList.get(4)).getName().getSimpleName()); String sortedSql = SQLUtils.toSQLString(stmtList, JdbcConstants.ORACLE); System.out.println(sortedSql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_cycle.java b/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_cycle.java index 6ddf2f4bb0..bf0af7aef9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_cycle.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_cycle.java @@ -79,22 +79,21 @@ public void test_0() throws Exception { String sortedSql = SQLUtils.toSQLString(stmtList, JdbcConstants.ORACLE); System.out.println(sortedSql); - assertEquals("t0", ((SQLCreateTableStatement)stmtList.get(9)).getName().getSimpleName()); - assertEquals("t9", ((SQLCreateTableStatement)stmtList.get(8)).getName().getSimpleName()); - assertEquals("t8", ((SQLCreateTableStatement)stmtList.get(7)).getName().getSimpleName()); - assertEquals("t7", ((SQLCreateTableStatement)stmtList.get(6)).getName().getSimpleName()); - assertEquals("t6", ((SQLCreateTableStatement)stmtList.get(5)).getName().getSimpleName()); - assertEquals("t5", ((SQLCreateTableStatement)stmtList.get(4)).getName().getSimpleName()); - assertEquals("t4", ((SQLCreateTableStatement)stmtList.get(3)).getName().getSimpleName()); - assertEquals("t3", ((SQLCreateTableStatement)stmtList.get(2)).getName().getSimpleName()); - assertEquals("t2", ((SQLCreateTableStatement)stmtList.get(1)).getName().getSimpleName()); - assertEquals("t1", ((SQLCreateTableStatement)stmtList.get(0)).getName().getSimpleName()); + assertEquals("t0", ((SQLCreateTableStatement) stmtList.get(9)).getName().getSimpleName()); + assertEquals("t9", ((SQLCreateTableStatement) stmtList.get(8)).getName().getSimpleName()); + assertEquals("t8", ((SQLCreateTableStatement) stmtList.get(7)).getName().getSimpleName()); + assertEquals("t7", ((SQLCreateTableStatement) stmtList.get(6)).getName().getSimpleName()); + assertEquals("t6", ((SQLCreateTableStatement) stmtList.get(5)).getName().getSimpleName()); + assertEquals("t5", ((SQLCreateTableStatement) stmtList.get(4)).getName().getSimpleName()); + assertEquals("t4", ((SQLCreateTableStatement) stmtList.get(3)).getName().getSimpleName()); + assertEquals("t3", ((SQLCreateTableStatement) stmtList.get(2)).getName().getSimpleName()); + assertEquals("t2", ((SQLCreateTableStatement) stmtList.get(1)).getName().getSimpleName()); + assertEquals("t1", ((SQLCreateTableStatement) stmtList.get(0)).getName().getSimpleName()); - assertEquals("t4", ((SQLAlterTableStatement)stmtList.get(10)).getName().getSimpleName()); + assertEquals("t4", ((SQLAlterTableStatement) stmtList.get(10)).getName().getSimpleName()); assertEquals(11, stmtList.size()); - } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/CreateDatabaseTest.java b/src/test/java/com/alibaba/druid/bvt/sql/CreateDatabaseTest.java index f2953f7428..5278e84f8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/CreateDatabaseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/CreateDatabaseTest.java @@ -27,19 +27,19 @@ public class CreateDatabaseTest extends TestCase { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "CREATE DATABASE mydb"; List stmtList = SQLUtils.toStatementList(sql, null); SQLStatement stmt = stmtList.get(0); - + Assert.assertEquals("CREATE DATABASE mydb", SQLUtils.toSQLString(stmt, (DbType) null)); } - - public void test_mysql () throws Exception { + + public void test_mysql() throws Exception { String sql = "CREATE DATABASE mydb"; List stmtList = SQLUtils.toStatementList(sql, JdbcUtils.MYSQL); SQLStatement stmt = stmtList.get(0); - + Assert.assertEquals("CREATE DATABASE mydb", SQLUtils.toSQLString(stmt, JdbcUtils.MYSQL)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java b/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java index 999db4c7fb..9b94226680 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class DistinctTest extends TestCase { - private String sql = "select count(distinct *) from t"; public void test_mysql() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest2.java index 1dcdb9750d..4a744a7518 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest2.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest2 extends TestCase { - public void test_exits() throws Exception { String sql = "INTERVAL '30.12345' SECOND(2, 4)"; String sql_c = "INTERVAL '30.12345' SECOND(2, 3)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleDate.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleDate.java index 9a7c484435..a690f91562 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleDate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleDate.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.ast.expr.SQLDateExpr; public class EqualTest_OracleDate extends TestCase { - public void test_eq() throws Exception { SQLDateExpr exprA = new SQLDateExpr(); SQLDateExpr exprB = new SQLDateExpr(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleTimestampExpr.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleTimestampExpr.java index e2435f371e..d77609ce6b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleTimestampExpr.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleTimestampExpr.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_OracleTimestampExpr extends TestCase { - public void test_exits() throws Exception { String sql = "TIMESTAMP '' AT TIME ZONE ''"; String sql_c = "TIMESTAMP '' AT TIME ZONE 'a'"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLTimestampExpr(), new SQLTimestampExpr()); Assert.assertEquals(new SQLTimestampExpr().hashCode(), new SQLTimestampExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_SQLSelectQueryBlock.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_SQLSelectQueryBlock.java index d6cac4aa2f..864ee172f1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_SQLSelectQueryBlock.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_SQLSelectQueryBlock.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; public class EqualTest_SQLSelectQueryBlock extends TestCase { - public void test_eq() throws Exception { SQLSelectQueryBlock exprA = new SQLSelectQueryBlock(); SQLSelectQueryBlock exprB = new SQLSelectQueryBlock(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate.java index 99ca939841..1ff910bcef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_aggreate extends TestCase { - public void test_exits() throws Exception { String sql = "count(*)"; String sql_c = "count(id)"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLAggregateExpr(null), new SQLAggregateExpr(null)); Assert.assertEquals(new SQLAggregateExpr(null).hashCode(), new SQLAggregateExpr(null).hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate_over.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate_over.java index d82ecb198e..cc645f9a50 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate_over.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate_over.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.parser.SQLExprParser; public class EqualTest_aggreate_over extends TestCase { - public void test_exits() throws Exception { String sql = "count(*) OVER (ORDER BY f1)"; String sql_c = "count(id) OVER (ORDER BY f2)"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLAggregateExpr(null), new SQLAggregateExpr(null)); Assert.assertEquals(new SQLAggregateExpr(null).hashCode(), new SQLAggregateExpr(null).hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_any.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_any.java index 506ea80ba0..8f9c6a5871 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_any.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_any.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_any extends TestCase { - public void test_exits() throws Exception { String sql = "any(select id from t)"; String sql_c = "any(select id from t1)"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLAnyExpr(), new SQLAnyExpr()); Assert.assertEquals(new SQLAnyExpr().hashCode(), new SQLAnyExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_between.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_between.java index 6338968204..67d26fceda 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_between.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_between.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_between extends TestCase { - public void test_exits() throws Exception { String sql = "x between 1 AND 2"; String sql_c = "x between 1 AND 3"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLBetweenExpr(), new SQLBetweenExpr()); Assert.assertEquals(new SQLBetweenExpr().hashCode(), new SQLBetweenExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binary.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binary.java index 7fc5085ed2..817a86d2a5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binary.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binary.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.parser.SQLExprParser; public class EqualTest_binary extends TestCase { - public void test_exits() throws Exception { String sql = "b'01010'"; String sql_c = "b'010101'"; @@ -31,7 +30,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLBinaryExpr(), new SQLBinaryExpr()); Assert.assertEquals(new SQLBinaryExpr().hashCode(), new SQLBinaryExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binaryOp.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binaryOp.java index 4c1472da11..859628a374 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binaryOp.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binaryOp.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_binaryOp extends TestCase { - public void test_exits() throws Exception { String sql = "a > b"; String sql_c = "a > 2"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLBinaryOpExpr(), new SQLBinaryOpExpr()); Assert.assertEquals(new SQLBinaryOpExpr().hashCode(), new SQLBinaryOpExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_boolean.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_boolean.java index ae68890016..1afacdd9f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_boolean.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_boolean.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.parser.SQLExprParser; public class EqualTest_boolean extends TestCase { - public void test_exits() throws Exception { String sql = "true"; String sql_c = "false"; @@ -31,7 +30,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLBooleanExpr(), new SQLBooleanExpr()); Assert.assertEquals(new SQLBooleanExpr().hashCode(), new SQLBooleanExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_case.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_case.java index 87534df139..61df0ee4ad 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_case.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_case.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_case extends TestCase { - public void test_exits() throws Exception { String sql = "case x when 1 then 0 else 2 end"; String sql_c = "case x when 2 then 0 else 2 end"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLCaseExpr(), new SQLCaseExpr()); Assert.assertEquals(new SQLCaseExpr().hashCode(), new SQLCaseExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cast.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cast.java index 5d479fe9e0..1fd1b9bfb1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cast.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cast.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_cast extends TestCase { - public void test_exits() throws Exception { String sql = "cast(a as varchar(50))"; String sql_c = "cast(b as varchar(50))"; @@ -31,10 +30,10 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLCastExpr(), new SQLCastExpr()); Assert.assertEquals(new SQLCastExpr().hashCode(), new SQLCastExpr().hashCode()); - + Assert.assertEquals(new SQLDataTypeImpl(), new SQLDataTypeImpl()); Assert.assertEquals(new SQLDataTypeImpl().hashCode(), new SQLDataTypeImpl().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cursor.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cursor.java index cb63ce1056..b5e3360011 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cursor.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cursor.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_cursor extends TestCase { - public void test_exits() throws Exception { String sql = "CURSOR(select id from t)"; String sql_c = "CURSOR(select id from t1)"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new OracleCursorExpr(), new OracleCursorExpr()); Assert.assertEquals(new OracleCursorExpr().hashCode(), new OracleCursorExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_dbLink.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_dbLink.java index fd7f8d0331..9ec4354d47 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_dbLink.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_dbLink.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_dbLink extends TestCase { - public void test_eq() throws Exception { String sql = "a@b"; String sql_c = "a@c"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_exists.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_exists.java index 58c1dded38..2c2f35d0ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_exists.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_exists.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_exists extends TestCase { - public void test_exits() throws Exception { String sql = "exists (select 1)"; String sql_c = "not exists (select 1)"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLExistsExpr(), new SQLExistsExpr()); Assert.assertEquals(new SQLExistsExpr().hashCode(), new SQLExistsExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_mysql.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_mysql.java index a6860aad2b..a2b49e64e9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_mysql.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_mysql.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; public class EqualTest_extract_mysql extends TestCase { - public void test_exits() throws Exception { String sql = "EXTRACT (YEAR FROM x)"; String sql_c = "EXTRACT (MONTH FROM y)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_oracle.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_oracle.java index cd9f864350..e66f0f9689 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_oracle.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_oracle.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_extract_oracle extends TestCase { - public void test_exits() throws Exception { String sql = "EXTRACT(MONTH FROM x)"; String sql_c = "EXTRACT(MONTH FROM 7)"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLMethodInvokeExpr(), new SQLMethodInvokeExpr()); Assert.assertEquals(new SQLMethodInvokeExpr().hashCode(), new SQLMethodInvokeExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_groupSet.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_groupSet.java index 57f3b85289..90a0a9aa65 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_groupSet.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_groupSet.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.ast.expr.SQLGroupingSetExpr; public class EqualTest_groupSet extends TestCase { - public void test_eq() throws Exception { SQLGroupingSetExpr exprA = new SQLGroupingSetExpr(); SQLGroupingSetExpr exprB = new SQLGroupingSetExpr(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inList.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inList.java index 607ee923a5..367758680b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inList.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inList.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_inList extends TestCase { - public void test_exits() throws Exception { String sql = "x in (1, 2, 3)"; String sql_c = "x not in (1, 2, 3)"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLInListExpr(), new SQLInListExpr()); Assert.assertEquals(new SQLInListExpr().hashCode(), new SQLInListExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery.java index e2bf8acd6a..cbff7c9009 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; public class EqualTest_inquery extends TestCase { - public void test_exits() throws Exception { String sql = "fstate in (select state from t_status)"; String sql_c = "fstate_c in (select state from t_status)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_mysql.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_mysql.java index 21a21e7bef..276cd74c16 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_mysql.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_mysql.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.parser.SQLExprParser; public class EqualTest_inquery_mysql extends TestCase { - public void test_exits() throws Exception { String sql = "fstate in (select state from t_status)"; String sql_c = "fstate_c in (select state from t_status)"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLInSubQueryExpr(), new SQLInSubQueryExpr()); Assert.assertEquals(new SQLInSubQueryExpr().hashCode(), new SQLInSubQueryExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_oracle.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_oracle.java index 4681c89f82..e29f047292 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_oracle.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_oracle.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.parser.SQLExprParser; public class EqualTest_inquery_oracle extends TestCase { - public void test_exits() throws Exception { String sql = "fstate in (select state from t_status)"; String sql_c = "fstate_c in (select state from t_status)"; @@ -31,7 +30,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLInSubQueryExpr(), new SQLInSubQueryExpr()); Assert.assertEquals(new SQLInSubQueryExpr().hashCode(), new SQLInSubQueryExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_interval_mysql.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_interval_mysql.java index 2b0d18e2a5..6e36a8ef01 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_interval_mysql.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_interval_mysql.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.parser.SQLExprParser; public class EqualTest_interval_mysql extends TestCase { - public void test_exits() throws Exception { String sql = "INTERVAL 3 YEAR"; String sql_c = "INTERVAL 3 MONTH"; @@ -31,7 +30,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLIntervalExpr(), new SQLIntervalExpr()); Assert.assertEquals(new SQLIntervalExpr().hashCode(), new SQLIntervalExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_mysqlMatch.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_mysqlMatch.java index 0cc6701c11..991a231688 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_mysqlMatch.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_mysqlMatch.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; public class EqualTest_mysqlMatch extends TestCase { - public void test_exits() throws Exception { String sql = "MATCH (f1, f2) AGAINST (f3 IN BOOLEAN MODE)"; String sql_c = "MATCH (f1, f2) AGAINST (f4 IN BOOLEAN MODE)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not.java index 1c39ebfcfb..a9cda975bf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_not extends TestCase { - public void test_exits() throws Exception { String sql = "not f1 = f2"; String sql_c = "not f1 = f3"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLNotExpr(), new SQLNotExpr()); Assert.assertEquals(new SQLNotExpr().hashCode(), new SQLNotExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not_2.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not_2.java index 912b6d0f0e..cf93118f4f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not_2.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_not_2 extends TestCase { - public void test_exits() throws Exception { String sql = "NOT A=1 AND NOT B=1"; SQLNotExpr exprA, exprB; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_number.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_number.java index 0e1e66dd05..8cdbd4dcf3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_number.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_number.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_number extends TestCase { - public void test_exits() throws Exception { String sql = "3.5"; String sql_c = "3.51"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLNumberExpr(), new SQLNumberExpr()); Assert.assertEquals(new SQLNumberExpr().hashCode(), new SQLNumberExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_orderBy.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_orderBy.java index fdd0575218..263177de5b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_orderBy.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_orderBy.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.parser.SQLExprParser; public class EqualTest_orderBy extends TestCase { - public void test_exits() throws Exception { String sql = "ORDER BY f1"; String sql_c = "ORDER BY f2"; @@ -31,10 +30,10 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLOrderBy(), new SQLOrderBy()); Assert.assertEquals(new SQLOrderBy().hashCode(), new SQLOrderBy().hashCode()); - + Assert.assertEquals(new SQLSelectOrderByItem(), new SQLSelectOrderByItem()); Assert.assertEquals(new SQLSelectOrderByItem().hashCode(), new SQLSelectOrderByItem().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_query.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_query.java index e109eed909..eb1cf3fe33 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_query.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_query.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_query extends TestCase { - public void test_exits() throws Exception { String sql = "(select id from t)"; String sql_c = "(select id from t1)"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLQueryExpr(), new SQLQueryExpr()); Assert.assertEquals(new SQLQueryExpr().hashCode(), new SQLQueryExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_select.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_select.java index 2adb9cb717..0617bd51c0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_select.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_select.java @@ -12,7 +12,6 @@ import java.util.List; public class EqualTest_select extends TestCase { - public void test_eq_select() throws Exception { List stmtsA = SQLUtils.parseStatements("select * from a", JdbcConstants.ODPS); List stmtsB = SQLUtils.parseStatements("select * from b", JdbcConstants.ODPS); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_some.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_some.java index 8311d82921..6af96e8e28 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_some.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_some.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_some extends TestCase { - public void test_exits() throws Exception { String sql = "some(select id from t)"; String sql_c = "some(select id from t1)"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLSomeExpr(), new SQLSomeExpr()); Assert.assertEquals(new SQLSomeExpr().hashCode(), new SQLSomeExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary.java index 47c791e094..075b0e41d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; public class EqualTest_unary extends TestCase { - public void test_exits() throws Exception { String sql = "-a"; String sql_c = "-(a+1 + +(b+1))"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLUnaryExpr(), new SQLUnaryExpr()); Assert.assertEquals(new SQLUnaryExpr().hashCode(), new SQLUnaryExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary_mysql.java b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary_mysql.java index 618650daaa..7c0239693c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary_mysql.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary_mysql.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; public class EqualTest_unary_mysql extends TestCase { - public void test_exits() throws Exception { String sql = "-a"; String sql_c = "-(a+1 + +(b+1))"; @@ -30,7 +29,7 @@ public void test_exits() throws Exception { Assert.assertTrue(exprA.equals(exprA)); Assert.assertFalse(exprA.equals(new Object())); Assert.assertEquals(exprA.hashCode(), exprB.hashCode()); - + Assert.assertEquals(new SQLUnaryExpr(), new SQLUnaryExpr()); Assert.assertEquals(new SQLUnaryExpr().hashCode(), new SQLUnaryExpr().hashCode()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/GroupingSetsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/GroupingSetsTest.java index a3d4e850be..e3b61b1f4f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/GroupingSetsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/GroupingSetsTest.java @@ -10,9 +10,9 @@ public class GroupingSetsTest extends TestCase { public void test_groupingSets() throws Exception { String sql = "SELECT brand, size, sum(sales) FROM items_sold GROUP BY GROUPING SETS ((brand), (size), ());"; - + String result = SQLUtils.format(sql, (DbType) null); - + Assert.assertEquals("SELECT brand, size, sum(sales)" + "\nFROM items_sold" + "\nGROUP BY GROUPING SETS ((brand), (size), ());", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/HashTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/HashTest_0.java index 32393b7a1a..27f0a09913 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/HashTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/HashTest_0.java @@ -6,16 +6,19 @@ public class HashTest_0 extends TestCase { public void test_issue() throws Exception { assertEquals(new SQLIdentifierExpr("a").nameHashCode64() - , new SQLIdentifierExpr("A").nameHashCode64());; + , new SQLIdentifierExpr("A").nameHashCode64()); + ; } public void test_issue_1() throws Exception { assertEquals(new SQLIdentifierExpr("a").nameHashCode64() - , new SQLIdentifierExpr("`A`").nameHashCode64());; + , new SQLIdentifierExpr("`A`").nameHashCode64()); + ; } public void test_issue_2() throws Exception { assertEquals(new SQLIdentifierExpr("\"a\"").nameHashCode64() - , new SQLIdentifierExpr("`A`").nameHashCode64());; + , new SQLIdentifierExpr("`A`").nameHashCode64()); + ; } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/HashTest_1_propertyExpr.java b/src/test/java/com/alibaba/druid/bvt/sql/HashTest_1_propertyExpr.java index 729e9cca07..4d15075e01 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/HashTest_1_propertyExpr.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/HashTest_1_propertyExpr.java @@ -7,34 +7,39 @@ public class HashTest_1_propertyExpr extends TestCase { public void test_issue() throws Exception { - assertEquals(new SQLPropertyExpr("t","a").nameHashCode64() - , new SQLPropertyExpr("t","A").nameHashCode64());; + assertEquals(new SQLPropertyExpr("t", "a").nameHashCode64() + , new SQLPropertyExpr("t", "A").nameHashCode64()); + ; } public void test_issue_1() throws Exception { - assertEquals(new SQLPropertyExpr("t","a").nameHashCode64() - , new SQLPropertyExpr("t","`A`").nameHashCode64());; + assertEquals(new SQLPropertyExpr("t", "a").nameHashCode64() + , new SQLPropertyExpr("t", "`A`").nameHashCode64()); + ; } public void test_issue_2() throws Exception { - assertEquals(new SQLPropertyExpr("t","\"a\"").nameHashCode64() - , new SQLPropertyExpr("t","`A`").nameHashCode64());; + assertEquals(new SQLPropertyExpr("t", "\"a\"").nameHashCode64() + , new SQLPropertyExpr("t", "`A`").nameHashCode64()); + ; } public void test_issue_3() throws Exception { - assertEquals(new SQLPropertyExpr("ESCROW","HT_TASK_TRADE_HISTORY_NEW").nameHashCode64() - , new SQLPropertyExpr("\"ESCROW\"","\"HT_TASK_TRADE_HISTORY_NEW\"").nameHashCode64());; + assertEquals(new SQLPropertyExpr("ESCROW", "HT_TASK_TRADE_HISTORY_NEW").nameHashCode64() + , new SQLPropertyExpr("\"ESCROW\"", "\"HT_TASK_TRADE_HISTORY_NEW\"").nameHashCode64()); + ; } public void test_issue_4() throws Exception { - assertEquals(new SQLPropertyExpr("ESCROW","HT_TASK_TRADE_HISTORY_NEW").hashCode64() - , new SQLPropertyExpr("\"ESCROW\"","\"HT_TASK_TRADE_HISTORY_NEW\"").hashCode64());; + assertEquals(new SQLPropertyExpr("ESCROW", "HT_TASK_TRADE_HISTORY_NEW").hashCode64() + , new SQLPropertyExpr("\"ESCROW\"", "\"HT_TASK_TRADE_HISTORY_NEW\"").hashCode64()); + ; } public void test_issue_5() throws Exception { assertEquals( FnvHash.fnv1a_64_lower("a.b"), - new SQLPropertyExpr("\"a\"","\"b\"") + new SQLPropertyExpr("\"a\"", "\"b\"") .hashCode64() ); } @@ -42,7 +47,7 @@ public void test_issue_5() throws Exception { public void test_issue_6() throws Exception { assertEquals( FnvHash.fnv1a_64_lower("ESCROW.HT_TASK_TRADE_HISTORY_NEW"), - new SQLPropertyExpr("\"ESCROW\"","\"HT_TASK_TRADE_HISTORY_NEW\"").hashCode64()); + new SQLPropertyExpr("\"ESCROW\"", "\"HT_TASK_TRADE_HISTORY_NEW\"").hashCode64()); } public void test_changeOwner() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest.java b/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest.java index b5f7f0ac5d..8eaae38156 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.util.JdbcUtils; public class MybatisTest extends TestCase { - private String sql = "select * from t where id = #{id}"; public void test_mysql() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java index 0d15f13a39..315ba3f8a6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java @@ -23,7 +23,6 @@ import com.alibaba.druid.util.JdbcUtils; public class MybatisTest2 extends TestCase { - private String sql = "select * from t where id = ${id}"; public void test_mysql() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/OverTest.java b/src/test/java/com/alibaba/druid/bvt/sql/OverTest.java index 2f574f04a5..a9cbf6c6ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/OverTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/OverTest.java @@ -10,16 +10,15 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; public class OverTest extends TestCase { - public void test_over() throws Exception { String sql = "SELECT SalesOrderID, ProductID, OrderQty" + // - " ,SUM(OrderQty) OVER(PARTITION BY SalesOrderID) AS 'Total'" + // - " ,AVG(OrderQty) OVER(PARTITION BY SalesOrderID) AS 'Avg'" + // - " ,COUNT(OrderQty) OVER(PARTITION BY SalesOrderID) AS 'Count'" + // - " ,MIN(OrderQty) OVER(PARTITION BY SalesOrderID) AS 'Min'" + // - " ,MAX(OrderQty) OVER(PARTITION BY SalesOrderID) AS 'Max' " + // - "FROM Sales.SalesOrderDetail " + // - "WHERE SalesOrderID IN(43659,43664);"; + " ,SUM(OrderQty) OVER(PARTITION BY SalesOrderID) AS 'Total'" + // + " ,AVG(OrderQty) OVER(PARTITION BY SalesOrderID) AS 'Avg'" + // + " ,COUNT(OrderQty) OVER(PARTITION BY SalesOrderID) AS 'Count'" + // + " ,MIN(OrderQty) OVER(PARTITION BY SalesOrderID) AS 'Min'" + // + " ,MAX(OrderQty) OVER(PARTITION BY SalesOrderID) AS 'Max' " + // + "FROM Sales.SalesOrderDetail " + // + "WHERE SalesOrderID IN(43659,43664);"; SQLStatementParser parser = new SQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java index 4d175b3b56..456f47054f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java @@ -9,7 +9,6 @@ import org.junit.Assert; public class PagerUtilsTest_Count_MySql_0 extends TestCase { - public void test_mysql_0() throws Exception { String sql = "select * from t"; String result = PagerUtils.count(sql, JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java index bee8ab6646..1485ef3194 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java @@ -8,12 +8,11 @@ import com.alibaba.druid.util.JdbcConstants; public class PagerUtilsTest_Count_Oracle_0 extends TestCase { - public void test_oracle_0() throws Exception { String sql = "select * from t"; String result = PagerUtils.count(sql, JdbcConstants.ORACLE); Assert.assertEquals("SELECT COUNT(*)\n" + // - "FROM t", result); + "FROM t", result); result = PagerUtils.count(sql, JdbcConstants.OCEANBASE_ORACLE); Assert.assertEquals("SELECT COUNT(*)\n" + // "FROM t", result); @@ -23,7 +22,7 @@ public void test_oracle_1() throws Exception { String sql = "select id, name from t"; String result = PagerUtils.count(sql, JdbcConstants.ORACLE); Assert.assertEquals("SELECT COUNT(*)\n" + // - "FROM t", result); + "FROM t", result); result = PagerUtils.count(sql, JdbcConstants.OCEANBASE_ORACLE); Assert.assertEquals("SELECT COUNT(*)\n" + // "FROM t", result); @@ -33,7 +32,7 @@ public void test_oracle_2() throws Exception { String sql = "select id, name from t order by id"; String result = PagerUtils.count(sql, JdbcConstants.ORACLE); Assert.assertEquals("SELECT COUNT(*)\n" + // - "FROM t", result); + "FROM t", result); result = PagerUtils.count(sql, JdbcConstants.OCEANBASE_ORACLE); Assert.assertEquals("SELECT COUNT(*)\n" + // "FROM t", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_PG_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_PG_0.java index 18c6f766d7..5b16947c5c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_PG_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_PG_0.java @@ -8,26 +8,25 @@ import com.alibaba.druid.util.JdbcConstants; public class PagerUtilsTest_Count_PG_0 extends TestCase { - public void test_pg_0() throws Exception { String sql = "select * from t"; String result = PagerUtils.count(sql, JdbcConstants.POSTGRESQL); Assert.assertEquals("SELECT COUNT(*)\n" + // - "FROM t", result); + "FROM t", result); } public void test_pg_1() throws Exception { String sql = "select id, name from t"; String result = PagerUtils.count(sql, JdbcConstants.POSTGRESQL); Assert.assertEquals("SELECT COUNT(*)\n" + // - "FROM t", result); + "FROM t", result); } public void test_pg_2() throws Exception { String sql = "select id, name from t order by id"; String result = PagerUtils.count(sql, JdbcConstants.POSTGRESQL); Assert.assertEquals("SELECT COUNT(*)\n" + // - "FROM t", result); + "FROM t", result); } public void test_pg_3() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_SQLServer_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_SQLServer_0.java index 75af842af1..1d75aa2026 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_SQLServer_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_SQLServer_0.java @@ -8,26 +8,25 @@ import com.alibaba.druid.util.JdbcConstants; public class PagerUtilsTest_Count_SQLServer_0 extends TestCase { - public void test_sqlserver_0() throws Exception { String sql = "select * from t"; String result = PagerUtils.count(sql, JdbcConstants.SQL_SERVER); assertEquals("SELECT COUNT(*)\n" + // - "FROM t", result); + "FROM t", result); } public void test_sqlserver_1() throws Exception { String sql = "select id, name from t"; String result = PagerUtils.count(sql, JdbcConstants.SQL_SERVER); assertEquals("SELECT COUNT(*)\n" + // - "FROM t", result); + "FROM t", result); } public void test_sqlserver_2() throws Exception { String sql = "select id, name from t order by id"; String result = PagerUtils.count(sql, JdbcConstants.SQL_SERVER); assertEquals("SELECT COUNT(*)\n" + // - "FROM t", result); + "FROM t", result); } public void test_sqlserver_group_0() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_1.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_1.java index 562acc39b0..643c3b82ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_1.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class PagerUtilsTest_Limit_SQLServer_1 extends TestCase { - public void test_db2_union() throws Exception { String sql = "select * from t1 union select * from t2"; String result = PagerUtils.limit(sql, JdbcConstants.SQL_SERVER, 20, 10); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_2.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_2.java index 4d01bf770f..fec0ddf02d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_2.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class PagerUtilsTest_Limit_SQLServer_2 extends TestCase { - public void test_db2_union() throws Exception { String sql = "select * from t1 union select * from t2"; String result = PagerUtils.limit(sql, JdbcConstants.SQL_SERVER, 0, 10); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_3.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_3.java index babb5b1646..2577afa571 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_3.java @@ -8,12 +8,11 @@ import com.alibaba.druid.util.JdbcConstants; public class PagerUtilsTest_Limit_SQLServer_3 extends TestCase { - public void test_db2_union() throws Exception { String sql = "select * from t1 where id > 1"; String result = PagerUtils.limit(sql, JdbcConstants.SQL_SERVER, 0, 10); Assert.assertEquals("SELECT TOP 10 *" // - + "\nFROM t1" // - + "\nWHERE id > 1", result); + + "\nFROM t1" // + + "\nWHERE id > 1", result); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_4.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_4.java index ab10d03f28..1561e9116e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_4.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class PagerUtilsTest_Limit_SQLServer_4 extends TestCase { - public void test_db2_union() throws Exception { String sql = "select * from t1 where id > 1"; String result = PagerUtils.limit(sql, JdbcConstants.SQL_SERVER, 100, 10); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_5.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_5.java index 837e763904..ffc29a7453 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_5.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class PagerUtilsTest_Limit_SQLServer_5 extends TestCase { - public void test_db2_union() throws Exception { String sql = " select * from test t with (nolock)"; String result = PagerUtils.limit(sql, JdbcConstants.SQL_SERVER, 0, 10); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_6.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_6.java index 22dea5a70f..7404f4be18 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_6.java @@ -6,7 +6,6 @@ import org.junit.Assert; public class PagerUtilsTest_Limit_SQLServer_6 extends TestCase { - public void test_db2_union() throws Exception { String sql = "SELECT t.name USER_NAME, t.xxx FROM t_sd_users t ORDER BY t.name ASC"; String result = PagerUtils.limit(sql, JdbcConstants.SQL_SERVER, 10, 10); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_0.java index 61575e978a..561d0d8a8d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_0.java @@ -8,13 +8,12 @@ import com.alibaba.druid.util.JdbcConstants; public class PagerUtilsTest_Limit_db2_0 extends TestCase { - public void test_mysql_0() throws Exception { String sql = "select * from t"; String result = PagerUtils.limit(sql, JdbcConstants.DB2, 0, 10); Assert.assertEquals("SELECT *" + // - "\nFROM t" + // - "\nFETCH FIRST 10 ROWS ONLY", result); + "\nFROM t" + // + "\nFETCH FIRST 10 ROWS ONLY", result); } public void test_mysql_1() throws Exception { @@ -55,13 +54,13 @@ public void test_mysql_3() throws Exception { } public void test_fetch_order() { - String sql="SELECT t.CUSTNAME AS custname\n" + + String sql = "SELECT t.CUSTNAME AS custname\n" + "FROM CPS_LOAN_INFO t WHERE t.DEL_FLAG = 0\n" + "ORDER BY t.CREATE_TIME DESC"; - String limitSql=PagerUtils.limit(sql, JdbcConstants.DB2,0,20) ; - int fetchRowIndex=limitSql.indexOf("FETCH FIRST"); - int orderIndex=limitSql.indexOf("ORDER BY") ; - Assert.assertTrue(fetchRowIndex>orderIndex); + String limitSql = PagerUtils.limit(sql, JdbcConstants.DB2, 0, 20); + int fetchRowIndex = limitSql.indexOf("FETCH FIRST"); + int orderIndex = limitSql.indexOf("ORDER BY"); + Assert.assertTrue(fetchRowIndex > orderIndex); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_1.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_1.java index 0af18935b6..be93dec59b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_1.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class PagerUtilsTest_Limit_db2_1 extends TestCase { - public void test_db2_union() throws Exception { String sql = "select * from t1 union select * from t2"; String result = PagerUtils.limit(sql, JdbcConstants.DB2, 20, 10); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_h2_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_h2_0.java index c4c7754df0..3669190b0e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_h2_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_h2_0.java @@ -7,7 +7,6 @@ import org.junit.Assert; public class PagerUtilsTest_Limit_h2_0 extends TestCase { - public void test_db2_union() throws Exception { String sql = "select * from t1 union select * from t2"; String result = PagerUtils.limit("SELECT * FROM test", JdbcUtils.H2, 0, 10); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_hive_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_hive_0.java index ba57b89e77..9c18966231 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_hive_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_hive_0.java @@ -7,7 +7,6 @@ import org.junit.Assert; public class PagerUtilsTest_Limit_hive_0 extends TestCase { - public void test_hive_0() throws Exception { String result = PagerUtils.limit("SELECT * FROM test", DbType.hive, 0, 10); System.out.println(result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_0.java index 5f6d7915c4..a11ff9e8ab 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_0.java @@ -6,7 +6,6 @@ import org.junit.Assert; public class PagerUtilsTest_Limit_mysql_0 extends TestCase { - public void test_mysql_0() throws Exception { String sql = "select * from t"; String result = PagerUtils.limit(sql, JdbcConstants.MYSQL, 0, 10); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_question_placeholder.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_question_placeholder.java index 16b7b850ab..87ef2028a6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_question_placeholder.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_question_placeholder.java @@ -13,26 +13,25 @@ import java.util.List; public class PagerUtilsTest_Limit_mysql_question_placeholder extends TestCase { - - public void testQuestionLimitPlaceholder1(){ + public void testQuestionLimitPlaceholder1() { String sql = "select * from test_table limit ?"; testQuestionLimitPlaceholderInternal(sql); } - public void testQuestionLimitPlaceholder2(){ + public void testQuestionLimitPlaceholder2() { String sql = "select * from test_table limit 0, ?"; testQuestionLimitPlaceholderInternal(sql); } - private void testQuestionLimitPlaceholderInternal(String sql){ + private void testQuestionLimitPlaceholderInternal(String sql) { List statements; - try{ + try { statements = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - }catch(ParserException e){ + } catch (ParserException e) { Assert.fail(e.getMessage()); return; } - if (statements == null || statements.isEmpty()){ + if (statements == null || statements.isEmpty()) { Assert.fail("no sql found!"); return; } @@ -40,7 +39,7 @@ private void testQuestionLimitPlaceholderInternal(String sql){ Assert.fail("sql not support count : " + sql); return; } - SQLSelectStatement statement = (SQLSelectStatement)statements.get(0); + SQLSelectStatement statement = (SQLSelectStatement) statements.get(0); if (!(statement instanceof SQLSelectStatement)) { Assert.fail("sql not support count : " + sql); return; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_oracle_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_oracle_0.java index 99e4f595d4..95c23524ec 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_oracle_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_oracle_0.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class PagerUtilsTest_Limit_oracle_0 extends TestCase { - public void test_oracle_oderby_0() throws Exception { String sql = "select * from t order by id"; String result = PagerUtils.limit(sql, JdbcConstants.ORACLE, 0, 10); @@ -25,8 +24,8 @@ public void test_oracle_0() throws Exception { String sql = "select * from t"; String result = PagerUtils.limit(sql, JdbcConstants.ORACLE, 0, 10); Assert.assertEquals("SELECT *" + // - "\nFROM t" + // - "\nWHERE ROWNUM <= 10", result); + "\nFROM t" + // + "\nWHERE ROWNUM <= 10", result); } public void test_oracle_1() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_presto_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_presto_0.java index b31efe460c..927eb6971a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_presto_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_presto_0.java @@ -12,7 +12,6 @@ * @date 2022/02/08 */ public class PagerUtilsTest_Limit_presto_0 extends TestCase { - public void test_presto_0() throws Exception { String result = PagerUtils.limit("SELECT * FROM test", DbType.presto, 0, 10); System.out.println(result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit.java index 0e7d346bd4..dd82013c52 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit.java @@ -6,7 +6,6 @@ import org.junit.Assert; public class PagerUtilsTest_hasUnorderedLimit extends TestCase { - public void test_false() throws Exception { String sql = " select * from test t order by id limit 3"; assertFalse(PagerUtils.hasUnorderedLimit(sql, JdbcConstants.MYSQL)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit_oracle.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit_oracle.java index 752643bc1b..ef9ab0f3c0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit_oracle.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit_oracle.java @@ -5,7 +5,6 @@ import junit.framework.TestCase; public class PagerUtilsTest_hasUnorderedLimit_oracle extends TestCase { - public void test_false() throws Exception { String sql = "SELECT *" + // "\nFROM (SELECT XX.*, ROWNUM AS RN" + // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/SQLASTVisitorAdapterTest.java b/src/test/java/com/alibaba/druid/bvt/sql/SQLASTVisitorAdapterTest.java index 93141db538..004f62e857 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/SQLASTVisitorAdapterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/SQLASTVisitorAdapterTest.java @@ -36,7 +36,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; public class SQLASTVisitorAdapterTest extends TestCase { - public void test_adapter() throws Exception { SQLASTVisitorAdapter adapter = new SQLASTVisitorAdapter(); new SQLBinaryOpExpr().accept(adapter); @@ -45,30 +44,30 @@ public void test_adapter() throws Exception { new SQLDropTableStatement().accept(adapter); new SQLCreateTableStatement().accept(adapter); new SQLDeleteStatement().accept(adapter); - new SQLCurrentOfCursorExpr ().accept(adapter); - new SQLInsertStatement ().accept(adapter); - new SQLUpdateStatement ().accept(adapter); - new SQLNotNullConstraint ().accept(adapter); - new SQLMethodInvokeExpr ().accept(adapter); - new SQLCallStatement ().accept(adapter); - new SQLSomeExpr ().accept(adapter); - new SQLAnyExpr ().accept(adapter); - new SQLAllExpr ().accept(adapter); - new SQLDefaultExpr ().accept(adapter); - new SQLCommentStatement ().accept(adapter); - new SQLDropViewStatement ().accept(adapter); - new SQLSavePointStatement ().accept(adapter); - new SQLReleaseSavePointStatement ().accept(adapter); - new SQLCreateDatabaseStatement ().accept(adapter); - new SQLAlterTableDropIndex ().accept(adapter); - new SQLOver ().accept(adapter); + new SQLCurrentOfCursorExpr().accept(adapter); + new SQLInsertStatement().accept(adapter); + new SQLUpdateStatement().accept(adapter); + new SQLNotNullConstraint().accept(adapter); + new SQLMethodInvokeExpr().accept(adapter); + new SQLCallStatement().accept(adapter); + new SQLSomeExpr().accept(adapter); + new SQLAnyExpr().accept(adapter); + new SQLAllExpr().accept(adapter); + new SQLDefaultExpr().accept(adapter); + new SQLCommentStatement().accept(adapter); + new SQLDropViewStatement().accept(adapter); + new SQLSavePointStatement().accept(adapter); + new SQLReleaseSavePointStatement().accept(adapter); + new SQLCreateDatabaseStatement().accept(adapter); + new SQLAlterTableDropIndex().accept(adapter); + new SQLOver().accept(adapter); new SQLWithSubqueryClause().accept(adapter); - new SQLAlterTableAlterColumn ().accept(adapter); - new SQLAlterTableStatement ().accept(adapter); - new SQLAlterTableDisableConstraint ().accept(adapter); - new SQLAlterTableEnableConstraint ().accept(adapter); - new SQLColumnCheck ().accept(adapter); - new SQLExprHint ().accept(adapter); - new SQLAlterTableDropConstraint ().accept(adapter); + new SQLAlterTableAlterColumn().accept(adapter); + new SQLAlterTableStatement().accept(adapter); + new SQLAlterTableDisableConstraint().accept(adapter); + new SQLAlterTableEnableConstraint().accept(adapter); + new SQLColumnCheck().accept(adapter); + new SQLExprHint().accept(adapter); + new SQLAlterTableDropConstraint().accept(adapter); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/SQLCommentStatementTest.java b/src/test/java/com/alibaba/druid/bvt/sql/SQLCommentStatementTest.java index 890e16224a..e3042f4f36 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/SQLCommentStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/SQLCommentStatementTest.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLCommentStatementTest extends TestCase { - public void test_0() throws Exception { String sql = "COMMENT on table t1 IS 'xxx'"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/SQLJoinTest.java b/src/test/java/com/alibaba/druid/bvt/sql/SQLJoinTest.java index 29461398fc..b3ec731b41 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/SQLJoinTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/SQLJoinTest.java @@ -15,7 +15,7 @@ public class SQLJoinTest extends TestCase { public void test_0() throws Exception { SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseStatements("select a.* from t_user a inner join t_group b on a.gid = b.id", JdbcConstants.ORACLE) - .get(0); + .get(0); SQLSelectQueryBlock queryBlock = stmt.getSelect().getQueryBlock(); assertNotNull(queryBlock); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/SQLParseExceptionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/SQLParseExceptionTest.java index c30d58dd60..4e2785752f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/SQLParseExceptionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/SQLParseExceptionTest.java @@ -6,7 +6,6 @@ @SuppressWarnings("deprecation") public class SQLParseExceptionTest extends TestCase { - public void test_new() throws Exception { new SQLParseException(); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/SQLSelectQueryBlockTest.java b/src/test/java/com/alibaba/druid/bvt/sql/SQLSelectQueryBlockTest.java index c9b3c3e194..30b43218d8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/SQLSelectQueryBlockTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/SQLSelectQueryBlockTest.java @@ -21,7 +21,6 @@ protected void setUp() throws Exception { } public void test_findTableSource() throws Exception { - repository.console("create table t_emp(emp_id bigint, name varchar(20));"); repository.console("create table t_org(org_id bigint, name varchar(20));"); @@ -58,7 +57,7 @@ public void test_findTableSource() throws Exception { SQLColumnDefinition column = selectItemExpr.getResolvedColumn(); assertNotNull(column); assertEquals("name", column.getName().toString()); - assertEquals("t_org", (((SQLCreateTableStatement)column.getParent()).getName().toString())); + assertEquals("t_org", (((SQLCreateTableStatement) column.getParent()).getName().toString())); assertSame(queryBlock.findTableSource("B"), selectItemExpr.getResolvedTableSource()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/ShardingUnwrapTest.java b/src/test/java/com/alibaba/druid/bvt/sql/ShardingUnwrapTest.java index 2ccc72d8eb..5fb4e6a2b6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/ShardingUnwrapTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/ShardingUnwrapTest.java @@ -10,7 +10,6 @@ public class ShardingUnwrapTest extends TestCase { SQLASTOutputVisitor visitor = new SQLASTOutputVisitor(new StringBuffer()); public void test_sharding_unwrap() throws Exception { - assertEquals("t_like_count", visitor.unwrapShardingTable("t_like_count0057")); assertEquals("t_like_count", visitor.unwrapShardingTable("`t_like_count0057`")); assertEquals("t_like_count", visitor.unwrapShardingTable("\"t_like_count0057\"")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/SplitTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/SplitTest2.java index a26310a5bc..0d8efbdb12 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/SplitTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/SplitTest2.java @@ -34,7 +34,7 @@ public void test_0() throws Exception { assertEquals(count, items.size()); for (int i = 0; i < count; ++i) { SQLExpr item = items.get(i); - assertEquals(Integer.toString(i ), SQLUtils.toSQLString(item)); + assertEquals(Integer.toString(i), SQLUtils.toSQLString(item)); } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/TestNewSpout.java b/src/test/java/com/alibaba/druid/bvt/sql/TestNewSpout.java index 2499df21eb..d13005fb54 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/TestNewSpout.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/TestNewSpout.java @@ -12,7 +12,6 @@ */ public class TestNewSpout { - public static int indexOf_nsharp(byte[] bytes, int fromIndex) { int end = bytes.length - 2; for (int i = fromIndex; i < end; ++i) { @@ -294,7 +293,7 @@ public static long str2Long(byte[] data, int start, int end) { return value; } - public static double str2Double(byte[] data,int start,int end) { + public static double str2Double(byte[] data, int start, int end) { long value = 0; long power = 0; for (int i = start; i < end; ++i) { @@ -317,7 +316,6 @@ public static double str2Double(byte[] data,int start,int end) { } static class SqlUtil { - public static Set filterDb = new HashSet(); private static int[] orders = new int[]{2, 3, 0, 1}; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/UnsignedBigIntTest.java b/src/test/java/com/alibaba/druid/bvt/sql/UnsignedBigIntTest.java index 38c05c7ed3..a4a98920c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/UnsignedBigIntTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/UnsignedBigIntTest.java @@ -8,7 +8,6 @@ import junit.framework.TestCase; public class UnsignedBigIntTest extends TestCase { - public void test_mysqlUnsignedBitInt() throws Exception { String sql = "SELECT a from b where c <> 1 LIMIT 18446744073709551615 OFFSET 0"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderDeleteTest.java b/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderDeleteTest.java index 52df54d466..da0e3e3a11 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderDeleteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderDeleteTest.java @@ -9,18 +9,17 @@ import com.alibaba.druid.util.JdbcConstants; public class BuilderDeleteTest extends TestCase { - public void test_0() throws Exception { SQLDeleteBuilder builder = SQLBuilderFactory.createDeleteBuilder(JdbcConstants.MYSQL); builder // - .from("mytable") // - .whereAnd("f1 > 0") // + .from("mytable") // + .whereAnd("f1 > 0") // ; String sql = builder.toString(); System.out.println(sql); Assert.assertEquals("DELETE FROM mytable" // - + "\nWHERE f1 > 0", sql); + + "\nWHERE f1 > 0", sql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderSelectTest.java index ba6a2dab98..8319b9b14e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderSelectTest.java @@ -9,7 +9,6 @@ import com.alibaba.druid.util.JdbcConstants; public class BuilderSelectTest extends TestCase { - public void test_0() throws Exception { SQLSelectBuilder builder = SQLBuilderFactory.createSelectSQLBuilder(JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderUpdateTest.java b/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderUpdateTest.java index 61f8951995..14646f0247 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderUpdateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderUpdateTest.java @@ -9,19 +9,18 @@ import com.alibaba.druid.util.JdbcConstants; public class BuilderUpdateTest extends TestCase { - public void test_0() throws Exception { SQLUpdateBuilder builder = SQLBuilderFactory.createUpdateBuilder(JdbcConstants.MYSQL); builder // - .from("mytable") // - .whereAnd("f1 > 0") // - .set("f1 = f1 + 1", "f2 = ?"); + .from("mytable") // + .whereAnd("f1 > 0") // + .set("f1 = f1 + 1", "f2 = ?"); String sql = builder.toString(); System.out.println(sql); Assert.assertEquals("UPDATE mytable" // - + "\nSET f1 = f1 + 1, f2 = ?" // - + "\nWHERE f1 > 0", sql); + + "\nSET f1 = f1 + 1, f2 = ?" // + + "\nWHERE f1 > 0", sql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/canal/CanalSQLSchemaTest.java b/src/test/java/com/alibaba/druid/bvt/sql/canal/CanalSQLSchemaTest.java index 15514e03ac..03c93bd535 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/canal/CanalSQLSchemaTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/canal/CanalSQLSchemaTest.java @@ -8,15 +8,14 @@ import com.alibaba.druid.util.JdbcConstants; public class CanalSQLSchemaTest { - @Test public void testSimple() throws Throwable { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); String sql1 = "CREATE TABLE `table_x1` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, " - + "`key1` longtext NOT NULL COMMENT 'key1', `value1` longtext NOT NULL COMMENT 'value1', PRIMARY KEY (`id`) )" - + "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4"; + + "`key1` longtext NOT NULL COMMENT 'key1', `value1` longtext NOT NULL COMMENT 'value1', PRIMARY KEY (`id`) )" + + "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4"; String sql2 = " CREATE TABLE IF NOT EXISTS `table_x1` ( `id` bigint(20) NOT NULL AUTO_INCREMENT," - + "`key1` longtext NOT NULL COMMENT 'key1',PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4"; + + "`key1` longtext NOT NULL COMMENT 'key1',PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4"; repository.console(sql1); repository.console(sql2); repository.setDefaultSchema("test"); @@ -29,8 +28,8 @@ public void testSimple() throws Throwable { public void test_block_format() throws Throwable { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); String sql = " CREATE TABLE `parent` (`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT," - + "`created_at` timestamp NULL DEFAULT NULL, " + "PRIMARY KEY (`id`)" - + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 BLOCK_FORMAT=ENCRYPTED"; + + "`created_at` timestamp NULL DEFAULT NULL, " + "PRIMARY KEY (`id`)" + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 BLOCK_FORMAT=ENCRYPTED"; repository.console(sql); repository.setDefaultSchema("test"); SchemaObject table = repository.findTable("parent"); @@ -60,9 +59,9 @@ public void test_json_index() throws Throwable { public void test_invisible() throws Throwable { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); String sql = " CREATE TABLE `proposal_order_info` (`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT," - + "`created_at` timestamp NULL DEFAULT NULL, " + "PRIMARY KEY (`id`) , " - + "KEY `idx_create_time` (`created_at`) /*!80000 INVISIBLE */" - + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 BLOCK_FORMAT=ENCRYPTED"; + + "`created_at` timestamp NULL DEFAULT NULL, " + "PRIMARY KEY (`id`) , " + + "KEY `idx_create_time` (`created_at`) /*!80000 INVISIBLE */" + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 BLOCK_FORMAT=ENCRYPTED"; repository.console(sql); repository.setDefaultSchema("test"); SchemaObject table = repository.findTable("proposal_order_info"); @@ -73,8 +72,8 @@ public void test_invisible() throws Throwable { public void test_persistent() throws Throwable { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); String sql = " create table example_vc_tbl( c1 int not null auto_increment primary key," - + "c2 varchar(70), vc1 int as (length(c2)) virtual," - + "DIM_SUM varchar(128) AS (MD5(UPPER(CONCAT(c2, c1)))) PERSISTENT)"; + + "c2 varchar(70), vc1 int as (length(c2)) virtual," + + "DIM_SUM varchar(128) AS (MD5(UPPER(CONCAT(c2, c1)))) PERSISTENT)"; repository.console(sql); repository.setDefaultSchema("test"); SchemaObject table = repository.findTable("example_vc_tbl"); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java index d836ca8ef9..b27f28cc81 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/ClickHouseResourceTest.java @@ -35,7 +35,6 @@ import java.util.List; public class ClickHouseResourceTest extends OracleTest { - public void test_0() throws Exception { exec_test("bvt/parser/clickhouse-0.txt"); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java index af3c43ca1b..856d2c03c6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java @@ -27,9 +27,7 @@ import junit.framework.TestCase; import org.junit.Assert; - public class DALParserTest extends TestCase { - public void testdesc() throws Exception { String sql = "desc tb1"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -300,7 +298,6 @@ public void test_show_character_set3() throws Exception { Assert.assertEquals("SHOW CHARACTER SET LIKE 'utf8'", output); } - public void test_show_character_set_1() throws Exception { String sql = "SHOW CHARACTER SET where Charset = 'big5'"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -310,7 +307,6 @@ public void test_show_character_set_1() throws Exception { Assert.assertEquals("SHOW CHARACTER SET WHERE Charset = 'big5'", output); } - public void test_show_character_set_2() throws Exception { String sql = "SHOW CHARACTER SET"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -860,7 +856,6 @@ public void test_show_Stc_1() throws Exception { Assert.assertEquals("SHOW STC HIS", output); } - public void test_show_procedure_code() throws Exception { String sql = "SHOW procedure code x"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -951,7 +946,6 @@ public void test_show_profiles() throws Exception { Assert.assertEquals("SHOW PROFILES", output); } - public void test_show_profile() throws Exception { String sql = "SHOW profile"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -1051,7 +1045,6 @@ public void test_show_rule() throws Exception { Assert.assertEquals("SHOW RULE FROM A WHERE 1 = 1 ORDER BY A LIMIT 10", output); } - public void test_show_rule_1() throws Exception { String sql = "SHOW FULL RULE FROM A WHERE 1=1 ORDER BY A LIMIT 10"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -1069,6 +1062,7 @@ public void test_show_table_status() throws Exception { String output = SQLUtils.toMySqlString(show); Assert.assertEquals("SHOW TABLE STATUS FROM mysql", output); } + public void test_show_table_status_1() throws Exception { String sql = "SHOW TABLE STATUS LIKE 'test%'"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -1077,6 +1071,7 @@ public void test_show_table_status_1() throws Exception { String output = SQLUtils.toMySqlString(show); Assert.assertEquals("SHOW TABLE STATUS LIKE 'test%'", output); } + public void test_show_table_status_2() throws Exception { String sql = "SHOW TABLE STATUS FROM testdb.test_group LIKE 'test%'"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -1085,6 +1080,7 @@ public void test_show_table_status_2() throws Exception { String output = SQLUtils.toMySqlString(show); Assert.assertEquals("SHOW TABLE STATUS FROM testdb.test_group LIKE 'test%'", output); } + public void test_show_table_status_3() throws Exception { String sql = "SHOW TABLE STATUS FROM testdb.test_group WHERE schema_name = 'ss' or schema_name = 'ss1'"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -1094,6 +1090,7 @@ public void test_show_table_status_3() throws Exception { Assert.assertEquals("SHOW TABLE STATUS FROM testdb.test_group WHERE schema_name = 'ss'\n" + "OR schema_name = 'ss1'", output); } + public void test_show_table_status_4() throws Exception { String sql = "SHOW TABLE STATUS IN testdb.test_group WHERE schema_name = 'ss' or schema_name = 'ss1'"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -1158,7 +1155,6 @@ public void test_show_tables_1() throws Exception { Assert.assertEquals("SHOW FULL TABLES FROM a", output); } - public void test_show_tables_2() throws Exception { String sql = "SHOW FULL TABLES LIKE a"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -1318,7 +1314,6 @@ public void test_plancache_5() throws Exception { assertEquals("EXPLAIN PLANCACHE", output); } - // // public void testShow() throws Exception { // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DDLParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DDLParserTest.java index 0ab119560b..3c7276d8f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DDLParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DDLParserTest.java @@ -31,7 +31,6 @@ * @author YU Danping */ public class DDLParserTest extends TestCase { - public void testTruncate() throws Exception { String sql = "Truncate table tb1"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -75,9 +74,9 @@ public void testAlterTable_2() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tADD COLUMN `name` VARCHAR(45) NULL AFTER `fid`;", output); + "\n\tADD COLUMN `name` VARCHAR(45) NULL AFTER `fid`;", output); } - + public void testAlterTable_3() throws Exception { String sql = "ALTER TABLE `test`.`tb1` DROP COLUMN `name` ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -87,27 +86,27 @@ public void testAlterTable_3() throws Exception { Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // "\n\tDROP COLUMN `name`;", output); } - + public void test_createTable_0() throws Exception { String sql = "crEate temporary tabLe if not exists tb_name (fid int)"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("CREATE TEMPORARY TABLE IF NOT EXISTS tb_name (\n\tfid int\n)", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("create temporary table if not exists tb_name (\n\tfid int\n)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - + public void test_createTable_1() throws Exception { String sql = "crEate tabLe if not exists tb_name (fid int)"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("CREATE TABLE IF NOT EXISTS tb_name (\n\tfid int\n)", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("create table if not exists tb_name (\n\tfid int\n)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - + public void test_createIndex_0() throws Exception { String sql = "create index `idx1` ON tb1 (`fname` ASC) ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -116,7 +115,7 @@ public void test_createIndex_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE INDEX `idx1` ON tb1 (`fname` ASC);", output); } - + public void test_createIndex_1() throws Exception { String sql = "create unique index `idx1` ON tb1 (`fname` desc) ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -125,7 +124,7 @@ public void test_createIndex_1() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE UNIQUE INDEX `idx1` ON tb1 (`fname` DESC);", output); } - + public void test_createIndex_2() throws Exception { String sql = "CREATE INDEX id_index ON lookup (id) USING BTREE;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -134,7 +133,7 @@ public void test_createIndex_2() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE INDEX id_index ON lookup (id) USING BTREE;", output); } - + public void test_createIndex_3() throws Exception { String sql = "crEate index index_name using hash on tb(col(id))"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -143,7 +142,7 @@ public void test_createIndex_3() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE INDEX index_name ON tb (col(id)) USING HASH", output); } - + public void test_createIndex_4() throws Exception { String sql = "crEate spatial index index_name on tb(col(id))"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -152,7 +151,7 @@ public void test_createIndex_4() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE SPATIAL INDEX index_name ON tb (col(id))", output); } - + public void test_drop_index_0() throws Exception { String sql = "drop index index_name on tb1"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -161,7 +160,7 @@ public void test_drop_index_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DROP INDEX index_name ON tb1", output); } - + public void test_drop_index_1() throws Exception { String sql = "DROP INDEX `PRIMARY` ON t;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -170,7 +169,7 @@ public void test_drop_index_1() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DROP INDEX `PRIMARY` ON t;", output); } - + public void test_drop_table_0() throws Exception { String sql = "DROP TEMPORARY TABLE IF EXISTS tb1, tb2, tb3 RESTRICT"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -179,7 +178,7 @@ public void test_drop_table_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DROP TEMPORARY TABLE IF EXISTS tb1, tb2, tb3 RESTRICT", output); } - + public void test_drop_table_1() throws Exception { String sql = "DROP TEMPORARY TABLE IF EXISTS tb1, tb2, tb3 CASCADE"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -188,7 +187,7 @@ public void test_drop_table_1() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DROP TEMPORARY TABLE IF EXISTS tb1, tb2, tb3 CASCADE", output); } - + public void test_drop_table_2() throws Exception { String sql = "DROP TABLE t1"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -197,7 +196,7 @@ public void test_drop_table_2() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DROP TABLE t1", output); } - + public void test_rename_0() throws Exception { String sql = "RENAME TABLE current_db.tbl_name TO other_db.tbl_name"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -206,7 +205,7 @@ public void test_rename_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("RENAME TABLE current_db.tbl_name TO other_db.tbl_name", output); } - + public void test_rename_1() throws Exception { String sql = "rename table tb1 to ntb1,tb2 to ntb2"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -224,7 +223,7 @@ public void test_drop_view_1() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DROP VIEW IF EXISTS tb1, tb2, tb3 CASCADE", output); } - + public void test_drop_view_2() throws Exception { String sql = "DROP VIEW t1"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLCallParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLCallParserTest.java index d97bff5ee3..e129be110f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLCallParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLCallParserTest.java @@ -40,7 +40,7 @@ public void testCall_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CALL p(?, ?)", output); } - + public void testCall_1() throws Exception { String sql = "call p(@var1,'@var2',var3)"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -49,7 +49,7 @@ public void testCall_1() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CALL p(@var1, '@var2', var3)", output); } - + public void testCall_2() throws Exception { String sql = "call p()"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -58,7 +58,7 @@ public void testCall_2() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CALL p()", output); } - + // public void testCall() throws SQLSyntaxErrorException { // String sql = "call p(?,?) "; // SQLLexer lexer = new SQLLexer(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLDeleteParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLDeleteParserTest.java index 5699090377..4856835aff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLDeleteParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLDeleteParserTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.parser.Token; public class DMLDeleteParserTest extends TestCase { - public void testDelete_0() throws Exception { String sql = "deLetE LOW_PRIORITY from id1.id , id using t1 a where col1 =? "; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -44,7 +43,7 @@ public void testDelete_1() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DELETE FROM id1.id" + // - "\nUSING t1", output); + "\nUSING t1", output); } public void testDelete_2() throws Exception { @@ -66,8 +65,8 @@ public void testDelete_3() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DELETE FROM id1.id\n" + // - "WHERE col1 = 'adf'\n" + // - "LIMIT 1, ?", output); + "WHERE col1 = 'adf'\n" + // + "LIMIT 1, ?", output); } public void testDelete_4() throws Exception { @@ -77,9 +76,9 @@ public void testDelete_4() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DELETE FROM id\n" + // - "WHERE col1 = 'adf'\n" + // - "ORDER BY d\n" + // - "LIMIT 2, ?", output); + "WHERE col1 = 'adf'\n" + // + "ORDER BY d\n" + // + "LIMIT 2, ?", output); } public void testDelete_5() throws Exception { @@ -89,9 +88,9 @@ public void testDelete_5() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DELETE id.*\n" + // - "FROM t1, t2\n" + // - "WHERE col1 = 'adf'\n" + // - "\tAND col2 = 1", output); + "FROM t1, t2\n" + // + "WHERE col1 = 'adf'\n" + // + "\tAND col2 = 1", output); } public void testDelete_6() throws Exception { @@ -101,7 +100,7 @@ public void testDelete_6() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DELETE id, id.t\n" + // - "FROM t1", output); + "FROM t1", output); } public void testDelete_7() throws Exception { @@ -111,11 +110,11 @@ public void testDelete_7() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DELETE FROM t1\n" + // - "WHERE t1.id1 = 'abc'\n" + // - "ORDER BY a\n" + // - "LIMIT 5", output); + "WHERE t1.id1 = 'abc'\n" + // + "ORDER BY a\n" + // + "LIMIT 5", output); } - + public void testDelete_8() throws Exception { String sql = "deLetE from t1"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -124,7 +123,7 @@ public void testDelete_8() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DELETE FROM t1", output); } - + public void testDelete_9() throws Exception { String sql = "deLetE ignore tb1.*,id1.t from t1"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -132,9 +131,9 @@ public void testDelete_9() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DELETE IGNORE tb1.*, id1.t\n" + - "FROM t1", output); + "FROM t1", output); } - + public void testDelete_10() throws Exception { String sql = "deLetE quick tb1.*,id1.t from t1"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest.java index 9f095921fa..b5918107df 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest.java @@ -26,7 +26,6 @@ import java.util.Date; public class DMLInsertParserTest extends TestCase { - public void testInsert_0() throws Exception { String sql = "insErt HIGH_PRIORITY intO test.t1 seT t1.id1=?, id2 := '123'"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest_Special.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest_Special.java index 8efe7a38e7..647387e1d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest_Special.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest_Special.java @@ -32,7 +32,7 @@ public void testInsert_7() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("INSERT LOW_PRIORITY INTO t1 (col1, t1.col2)\nVALUES (123, '123''4')" + // - "\nON DUPLICATE KEY UPDATE ex.col1 = ?", - output); + "\nON DUPLICATE KEY UPDATE ex.col1 = ?", + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLReplaceParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLReplaceParserTest.java index 5591bfba0d..a69e879f19 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLReplaceParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLReplaceParserTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; - public class DMLReplaceParserTest extends TestCase { public void testReplace_0() throws Exception { String sql = "ReplaCe LOW_PRIORITY intO test.t1 seT t1.id1:=?, id2='123'"; @@ -34,7 +33,7 @@ public void testReplace_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("REPLACE LOW_PRIORITY INTO test.t1 (t1.id1, id2)\nVALUES (?, '123')", output); } - + public void testReplace_1() throws Exception { String sql = "ReplaCe test.t1 seT t1.id1:=? "; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -43,7 +42,7 @@ public void testReplace_1() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("REPLACE INTO test.t1 (t1.id1)\nVALUES (?)", output); } - + public void testReplace_2() throws Exception { String sql = "ReplaCe t1 value (123,?) "; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -52,7 +51,7 @@ public void testReplace_2() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("REPLACE INTO t1\nVALUES (123, ?)", output); } - + public void testReplace_3() throws Exception { String sql = "ReplaCe LOW_PRIORITY t1 valueS (12e-2), (?)"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -61,7 +60,7 @@ public void testReplace_3() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("REPLACE LOW_PRIORITY INTO t1\nVALUES (12e-2), (?)", output); } - + public void testReplace_4() throws Exception { String sql = "ReplaCe LOW_PRIORITY t1 select id from t1"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -70,7 +69,7 @@ public void testReplace_4() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("REPLACE LOW_PRIORITY INTO t1\n\tSELECT id\n\tFROM t1", output); } - + public void testReplace_5() throws Exception { String sql = "ReplaCe delayed t1 select id from t1"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -79,7 +78,7 @@ public void testReplace_5() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("REPLACE DELAYED INTO t1\n\tSELECT id\n\tFROM t1", output); } - + public void testReplace_6() throws Exception { String sql = "ReplaCe LOW_PRIORITY t1 (select id from t1) "; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -88,7 +87,7 @@ public void testReplace_6() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("REPLACE LOW_PRIORITY INTO t1\n\tSELECT id\n\tFROM t1", output); } - + public void testReplace_7() throws Exception { String sql = "ReplaCe LOW_PRIORITY t1 (t1.col1) valueS (123),('12''34')"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -97,7 +96,7 @@ public void testReplace_7() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("REPLACE LOW_PRIORITY INTO t1 (t1.col1)\nVALUES (123), ('12''34')", output); } - + public void testReplace_8() throws Exception { String sql = "ReplaCe LOW_PRIORITY t1 (col1, t1.col2) VALUE (123,'123\\'4') "; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -106,7 +105,7 @@ public void testReplace_8() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("REPLACE LOW_PRIORITY INTO t1 (col1, t1.col2)\nVALUES (123, '123''4')", output); } - + public void testReplace_9() throws Exception { String sql = "REPLACE LOW_PRIORITY t1 (col1, t1.col2) select id from t3 "; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -115,7 +114,7 @@ public void testReplace_9() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("REPLACE LOW_PRIORITY INTO t1 (col1, t1.col2)\n\tSELECT id\n\tFROM t3", output); } - + public void testReplace_10() throws Exception { String sql = "replace LOW_PRIORITY intO t1 (col1) ( select id from t3) "; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java index ecb2f2ab6b..9b014e2915 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.parser.Token; public class DMLSelectParserTest extends TestCase { - public void test_union_0() throws Exception { String sql = "(select id from t1) union all (select id from t2) union all (select id from t3) ordeR By d desC limit 1 offset ?"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -84,9 +83,9 @@ public void test_select_0() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT t1.id, t2.*\n" + // - "FROM t1, test.t2\n" + // - "WHERE test.t1.id = 1\n" + // - "\tAND t1.id = test.t2.id", output); + "FROM t1, test.t2\n" + // + "WHERE test.t1.id = 1\n" + // + "\tAND t1.id = test.t2.id", output); } public void test_select_1() throws Exception { @@ -96,11 +95,11 @@ public void test_select_1() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *" + // - "\nFROM offer a" + // - "\n\tSTRAIGHT_JOIN wp_image b USE INDEX FOR JOIN (t1, t2) ON a.member_id = b.member_id" + // - "\n\tINNER JOIN product_visit c" + // - "\nWHERE a.member_id = c.member_id\n" + // - "\tAND c.member_id = 'abc'", output); + "\nFROM offer a" + // + "\n\tSTRAIGHT_JOIN wp_image b USE INDEX FOR JOIN (t1, t2) ON a.member_id = b.member_id" + // + "\n\tINNER JOIN product_visit c" + // + "\nWHERE a.member_id = c.member_id\n" + // + "\tAND c.member_id = 'abc'", output); } public void test_select_2() throws Exception { @@ -110,8 +109,8 @@ public void test_select_2() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT ALL tb1.id, tb2.id\n" + // - "FROM tb1, tb2\n" + // - "WHERE tb1.id2 = tb2.id2", output); + "FROM tb1, tb2\n" + // + "WHERE tb1.id2 = tb2.id2", output); } public void test_select_3() throws Exception { @@ -121,7 +120,7 @@ public void test_select_3() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT DISTINCT HIGH_PRIORITY tb1.id, tb2.id\nFROM tb1, tb2\nWHERE tb1.id2 = tb2.id2", - output); + output); } public void test_select_4() throws Exception { @@ -131,7 +130,7 @@ public void test_select_4() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT DISTINCTROW HIGH_PRIORITY SQL_SMALL_RESULT tb1.id, tb2.id\nFROM tb1, tb2\nWHERE tb1.id2 = tb2.id2", - output); + output); } public void test_select_5() throws Exception { @@ -150,18 +149,18 @@ public void test_select_6() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT DISTINCT HIGH_PRIORITY tb1.id, tb2.id\nFROM tb1, tb2\nWHERE tb1.id2 = tb2.id2", - output); + output); } public void test_select_7() throws Exception { String sql = "SELect distinctrow high_priority sql_small_result tb1.id,tb2.id " - + "from tb1,tb2 where tb1.id2=tb2.id2"; + + "from tb1,tb2 where tb1.id2=tb2.id2"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT DISTINCTROW HIGH_PRIORITY SQL_SMALL_RESULT tb1.id, tb2.id\nFROM tb1, tb2\nWHERE tb1.id2 = tb2.id2", - output); + output); } public void test_select_8() throws Exception { @@ -180,7 +179,7 @@ public void test_select_9() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT SQL_CACHE id1, max(id2)\nFROM tb1\nGROUP BY id1\nHAVING id1 > 10\nORDER BY id3 DESC", - output); + output); } public void test_select_10() throws Exception { @@ -230,13 +229,13 @@ public void test_select_14() throws Exception { public void test_select_15() throws Exception { String sql = "SELect distinct high_priority straight_join sql_big_result sql_cache tb1.id,tb2.id " - + "from tb1,tb2 where tb1.id2=tb2.id2"; + + "from tb1,tb2 where tb1.id2=tb2.id2"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT DISTINCT HIGH_PRIORITY STRAIGHT_JOIN SQL_BIG_RESULT" - + " SQL_CACHE tb1.id, tb2.id\nFROM tb1, tb2\nWHERE tb1.id2 = tb2.id2", output); + + " SQL_CACHE tb1.id, tb2.id\nFROM tb1, tb2\nWHERE tb1.id2 = tb2.id2", output); } public void test_select_16() throws Exception { @@ -255,7 +254,7 @@ public void test_select_17() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT DISTINCT id1, id2\nFROM tb1, tb2\nWHERE tb1.id1 = tb2.id2\nLOCK IN SHARE MODE", - output); + output); } public void test_select_18() throws Exception { @@ -265,7 +264,7 @@ public void test_select_18() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT t1.id, t2.*\nFROM t1, test.t2\nWHERE test.t1.id = '中''‘文'\n\tAND t1.id = test.t2.id", - output); + output); } public void test_select_19() throws Exception { @@ -275,11 +274,11 @@ public void test_select_19() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *" + // - "\nFROM offer a" + // - "\n\tSTRAIGHT_JOIN wp_image b FORCE INDEX FOR JOIN (t1, t2) ON a.member_id = b.member_id" + // - "\n\tINNER JOIN product_visit c" + // - "\nWHERE a.member_id = c.member_id" + // - "\n\tAND c.member_id = 'abc'", output); + "\nFROM offer a" + // + "\n\tSTRAIGHT_JOIN wp_image b FORCE INDEX FOR JOIN (t1, t2) ON a.member_id = b.member_id" + // + "\n\tINNER JOIN product_visit c" + // + "\nWHERE a.member_id = c.member_id" + // + "\n\tAND c.member_id = 'abc'", output); } public void test_select_20() throws Exception { @@ -289,10 +288,10 @@ public void test_select_20() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *\n" + // - "FROM offer a" + // - "\n\tSTRAIGHT_JOIN wp_image b IGNORE INDEX FOR JOIN (t1, t2) ON a.member_id = b.member_id" + // - "\n\tINNER JOIN product_visit c" + // - "\nWHERE a.member_id = c.member_id" + // - "\n\tAND c.member_id = 'abc'", output); + "FROM offer a" + // + "\n\tSTRAIGHT_JOIN wp_image b IGNORE INDEX FOR JOIN (t1, t2) ON a.member_id = b.member_id" + // + "\n\tINNER JOIN product_visit c" + // + "\nWHERE a.member_id = c.member_id" + // + "\n\tAND c.member_id = 'abc'", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLUpdateParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLUpdateParserTest.java index dac3f879c5..2e63a661e2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLUpdateParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLUpdateParserTest.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; - public class DMLUpdateParserTest extends TestCase { public void test_update_0() throws Exception { String sql = "upDate LOw_PRIORITY IGNORE test.t1 sEt t1.col1=?, col2=DefaulT"; @@ -33,7 +32,7 @@ public void test_update_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("UPDATE LOW_PRIORITY IGNORE test.t1\nSET t1.col1 = ?, col2 = DEFAULT", output); } - + public void test_update_1() throws Exception { String sql = "upDate IGNORE (t1) set col2=DefaulT order bY t1.col2 "; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -42,7 +41,7 @@ public void test_update_1() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("UPDATE IGNORE t1\nSET col2 = DEFAULT\nORDER BY t1.col2", output); } - + public void test_update_2() throws Exception { String sql = "upDate (test.t1) SET col2=DefaulT order bY t1.col2 limit ? offset 1"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -51,7 +50,7 @@ public void test_update_2() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("UPDATE test.t1\nSET col2 = DEFAULT\nORDER BY t1.col2\nLIMIT 1, ?", output); } - + public void test_update_3() throws Exception { String sql = "upDate LOW_PRIORITY t1, test.t2 SET col2=DefaulT , col2='123''4'"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -60,7 +59,7 @@ public void test_update_3() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("UPDATE LOW_PRIORITY t1, test.t2\nSET col2 = DEFAULT, col2 = '123''4'", output); } - + public void test_update_4() throws Exception { String sql = "upDate LOW_PRIORITY t1, test.t2 SET col2:=DefaulT , col2='123''4' where id='a'"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/HintsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/HintsTest.java index e075bdb97b..08d4d81c32 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/HintsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/HintsTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; - public class HintsTest extends TestCase { public void test_hints_0() throws Exception { String sql = "CREATE /*!32302 TEMPORARY */ TABLE t (a INT);"; @@ -34,7 +33,7 @@ public void test_hints_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE /*!32302 TEMPORARY */ TABLE t (\n\ta INT\n);", output); } - + public void test_hints_1() throws Exception { String sql = "SELECT /*! STRAIGHT_JOIN */ col1 FROM table1,table2"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -43,7 +42,7 @@ public void test_hints_1() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT /*! STRAIGHT_JOIN */ col1\nFROM table1, table2", output); } - + public void test_hints_none() throws Exception { String sql = "SELECT /* STRAIGHT_JOIN */ col1 FROM table1,table2"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/LiteralHexadecimalTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/LiteralHexadecimalTest.java index a5611e8011..f5f285b8cb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/LiteralHexadecimalTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/LiteralHexadecimalTest.java @@ -39,25 +39,25 @@ public void test_1() throws Exception { SQLHexExpr hex = (SQLHexExpr) new MySqlExprParser(sql).expr(); Assert.assertEquals("\r\n", new String(hex.toBytes(), "utf-8")); } - + public void test_2() throws Exception { String sql = "X'4D7953514C'"; SQLHexExpr hex = (SQLHexExpr) new MySqlExprParser(sql).expr(); Assert.assertEquals("MySQL", new String(hex.toBytes(), "utf-8")); } - + public void test_3() throws Exception { String sql = "0x5061756c"; SQLHexExpr hex = (SQLHexExpr) new MySqlExprParser(sql).expr(); Assert.assertEquals("Paul", new String(hex.toBytes(), "utf-8")); } - + public void test_4() throws Exception { String sql = "0x41"; SQLHexExpr hex = (SQLHexExpr) new MySqlExprParser(sql).expr(); Assert.assertEquals("A", new String(hex.toBytes(), "utf-8")); } - + public void test_5() throws Exception { String sql = "0x636174"; SQLHexExpr hex = (SQLHexExpr) new MySqlExprParser(sql).expr(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java index 688af6999a..b3759f5c41 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.parser.Token; public class MTSParserTest extends TestCase { - public void test_mts_0() throws Exception { String sql = " savepoint xx"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -51,7 +50,7 @@ public void test_mts_2() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SAVEPOINT `select`", output); } - + public void test_mts_3() throws Exception { String sql = "Release sAVEPOINT xx "; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -60,7 +59,7 @@ public void test_mts_3() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("RELEASE SAVEPOINT xx", output); } - + public void test_rollback_0() throws Exception { String sql = "rollBack to x1"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -69,7 +68,7 @@ public void test_rollback_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ROLLBACK TO x1", output); } - + public void test_rollback_1() throws Exception { String sql = "rollBack work to x1"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -78,7 +77,7 @@ public void test_rollback_1() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ROLLBACK TO x1", output); } - + public void test_rollback_2() throws Exception { String sql = "rollBack work to savepoint x1"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -87,7 +86,7 @@ public void test_rollback_2() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ROLLBACK TO x1", output); } - + public void test_lockTable() throws Exception { String sql = "LOCK TABLES t1 READ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -96,7 +95,7 @@ public void test_lockTable() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("LOCK TABLES t1 READ;", output); } - + public void test_lockTable_1() throws Exception { String sql = "LOCK TABLES t2 READ LOCAL;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -105,7 +104,7 @@ public void test_lockTable_1() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("LOCK TABLES t2 READ LOCAL;", output); } - + public void test_unlockTable() throws Exception { String sql = "UNLOCK TABLES"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_1_setNotNull.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_1_setNotNull.java index 0c913e9cf7..54a841f743 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_1_setNotNull.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_1_setNotNull.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class DB2AlterTableTest_1_setNotNull extends TestCase { - public void test_alter_constraint() throws Exception { String sql = "alter table T_ORG alter column ORG_NAME set not null"; SQLStatement stmt = SQLUtils.parseStatements(sql, JdbcConstants.DB2).get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_2.java index c3b526376b..e1d4a8d5a5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_2.java @@ -23,7 +23,6 @@ import junit.framework.TestCase; public class DB2AlterTableTest_2 extends TestCase { - public void test_alter_constraint() throws Exception { String sql = "alter table audit.SQLHIS alter column EXPLAINMSG set data type VARCHAR(255)"; SQLStatement stmt = SQLUtils.parseStatements(sql, JdbcConstants.DB2).get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_drop_pk.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_drop_pk.java index 3fa91ed1aa..66f7668328 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_drop_pk.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_drop_pk.java @@ -25,7 +25,6 @@ import org.junit.Assert; public class DB2AlterTableTest_drop_pk extends TestCase { - public void test_alter_constraint() throws Exception { String sql = "alter table supplier drop primary key;"; SQLStatement stmt = SQLUtils.parseStatements(sql, JdbcConstants.DB2).get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_01.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_01.java index 992e4adfab..582d049c1a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_01.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_01.java @@ -27,7 +27,6 @@ import java.util.List; public class DB2CreateTableTest_01 extends DB2Test { - public void test_0() throws Exception { String sql = "CREATE TABLE MK.KPI_AREA_SORT_FACT_LATN_ID_MID\n" + "(\n" + @@ -80,8 +79,8 @@ public void test_0() throws Exception { "DATA CAPTURE NONE\n" + "IN WH_APP_TEMP\n" + "PARTITION BY HASH (LATN_ID, BUREAU_KEY, ADD_SUM);", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("create table MK.KPI_AREA_SORT_FACT_LATN_ID_MID (\n" + "\tLATN_ID INTEGER,\n" + "\tBUREAU_KEY INTEGER,\n" + @@ -93,6 +92,6 @@ public void test_0() throws Exception { "DATA CAPTURE NONE\n" + "IN WH_APP_TEMP\n" + "partition by hash (LATN_ID, BUREAU_KEY, ADD_SUM);", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_02.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_02.java index 4158e233c4..4701d2b08f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_02.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_02.java @@ -27,7 +27,6 @@ import java.util.List; public class DB2CreateTableTest_02 extends DB2Test { - public void test_0() throws Exception { String sql = " CREATE TABLE DSN8A10.DEPT\n" + " (DEPTNO CHAR(3) NOT NULL,\n" + @@ -72,8 +71,8 @@ public void test_0() throws Exception { "\tPRIMARY KEY (DEPTNO)\n" + ")\n" + "IN DSN8D10A.DSN8S10D;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("create table DSN8A10.DEPT (\n" + "\tDEPTNO CHAR(3) not null,\n" + "\tDEPTNAME VARCHAR(36) not null,\n" + @@ -83,6 +82,6 @@ public void test_0() throws Exception { "\tprimary key (DEPTNO)\n" + ")\n" + "IN DSN8D10A.DSN8S10D;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_03.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_03.java index 6813c82d41..6f00214fbb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_03.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_03.java @@ -26,7 +26,6 @@ import java.util.List; public class DB2CreateTableTest_03 extends DB2Test { - public void test_0() throws Exception { String sql = " CREATE TABLE DSN8A10.PROJ\n" + " (PROJNO CHAR(6) NOT NULL,\n" + @@ -77,8 +76,8 @@ public void test_0() throws Exception { ")\n" + "IN DATABASE DSN8D10A\n" + "VALIDPROC DSN8EAPR;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("create table DSN8A10.PROJ (\n" + "\tPROJNO CHAR(6) not null,\n" + "\tPROJNAME VARCHAR(24) not null,\n" + @@ -91,6 +90,6 @@ public void test_0() throws Exception { ")\n" + "IN DATABASE DSN8D10A\n" + "VALIDPROC DSN8EAPR;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_04.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_04.java index 1946f55a54..ac5bbdccca 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_04.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_04.java @@ -26,7 +26,6 @@ import java.util.List; public class DB2CreateTableTest_04 extends DB2Test { - public void test_0() throws Exception { String sql = "CREATE TABLE CUSTOMER\n" + " (CUSTOMERNUM INTEGER,\n" + @@ -73,8 +72,8 @@ public void test_0() throws Exception { "\tCUSTOMERNUMDIM INTEGER\n" + ")\n" + "COMPRESS YES;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("create table CUSTOMER (\n" + "\tCUSTOMERNUM INTEGER,\n" + "\tCUSTOMERNAME VARCHAR(80),\n" + @@ -85,6 +84,6 @@ public void test_0() throws Exception { "\tCUSTOMERNUMDIM INTEGER\n" + ")\n" + "compress yes;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_05.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_05.java index 4971469879..52a0399223 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_05.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_05.java @@ -26,7 +26,6 @@ import java.util.List; public class DB2CreateTableTest_05 extends DB2Test { - public void test_0() throws Exception { String sql = "CREATE TABLE MK.M_DM_BASE_CHARGE_TMP1\n" + "(PROD_ID BIGINT,\n" + @@ -79,8 +78,8 @@ public void test_0() throws Exception { "IN MK_APP_TEMP\n" + "INDEX IN WH_INDEX1\n" + "PARTITION BY HASH (PROD_ID)", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + assertEquals("create table MK.M_DM_BASE_CHARGE_TMP1 (\n" + "\tPROD_ID BIGINT,\n" + "\tITEM_ID SMALLINT,\n" + @@ -93,6 +92,6 @@ public void test_0() throws Exception { "IN MK_APP_TEMP\n" + "INDEX IN WH_INDEX1\n" + "partition by hash (PROD_ID)", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_06.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_06.java index 7579bd9f86..34dd3d239c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_06.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_06.java @@ -25,7 +25,6 @@ import java.util.List; public class DB2CreateTableTest_06 extends DB2Test { - public void test_0() throws Exception { String sql = "CREATE TABLE AUDIT.test ( ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1 ))"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_07.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_07.java index 8fc73ebea7..1970a222c4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_07.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_07.java @@ -25,7 +25,6 @@ import java.util.List; public class DB2CreateTableTest_07 extends DB2Test { - public void test_0() throws Exception { String sql = "CREATE TABLE EMPLOYEE\n" + " (EMPNO INTEGER GENERATED ALWAYS AS IDENTITY\n" + @@ -65,14 +64,14 @@ public void test_0() throws Exception { "\tSALARY DECIMAL(7, 2) NOT NULL,\n" + "\tWORKDEPT SMALLINT\n" + ");", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + assertEquals("create table EMPLOYEE (\n" + "\tEMPNO INTEGER primary key not null generated always as identity,\n" + "\tNAME CHAR(30) not null,\n" + "\tSALARY DECIMAL(7, 2) not null,\n" + "\tWORKDEPT SMALLINT\n" + ");", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2DropSequenceTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2DropSequenceTest_0.java index 0d1a84126f..79f89ad8ba 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2DropSequenceTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2DropSequenceTest_0.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2DropSequenceTest_0 extends DB2Test { - public void test_0() throws Exception { String sql = "drop sequence sales1_seq"; @@ -57,9 +56,9 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("DROP SEQUENCE sales1_seq", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("drop sequence sales1_seq", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_0.java index 4c2c661839..0d6f769f88 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_0.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2InsertTest_0 extends DB2Test { - public void test_0() throws Exception { String sql = "insert into t (id,name) values (?,?), (?,?), (?,?)"; @@ -54,13 +53,13 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("t", "id"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("t", "name"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("t", "id"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("t", "name"))); // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); Assert.assertEquals("INSERT INTO t (id, name)\n" + "VALUES (?, ?), (?, ?), (?, ?)", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_1.java index 74f99a2804..54986c71f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_1.java @@ -28,7 +28,6 @@ import java.util.List; public class DB2InsertTest_1 extends DB2Test { - public void test_0() throws Exception { String sql = "INSERT INTO MK.KPI_AREA_SORT_FACT_LATN_ID_MID\n" + "SELECT LATN_ID,BUREAU_KEY,\n" + @@ -97,7 +96,7 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("MK.KPI_AREA_SORT_FACT_LATN_ID_MID"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("MK.M_USER_COUNT_FACT_CDMA", "LATN_ID"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("MK.M_USER_COUNT_FACT_CDMA", "LATN_ID"))); // Assert.assertTrue(visitor.getColumns().contains(new Column("t", "name"))); // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); @@ -152,6 +151,6 @@ public void test_0() throws Exception { ") T\n" + "GROUP BY LATN_ID, BUREAU_KEY\n" + "WITH UR;", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java index dee593d9bf..195c679c9b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java @@ -27,13 +27,11 @@ import java.util.List; public class DB2MergeTest extends DB2Test { - public void test_0() throws Exception { String sql = "MERGE INTO product AS T " + " USING sales AS S" + " ON S.id = T.id" - + " WHEN MATCHED THEN UPDATE SET inventory = T.inventory - S.sold;" - ; + + " WHEN MATCHED THEN UPDATE SET inventory = T.inventory - S.sold;"; DB2StatementParser parser = new DB2StatementParser(sql); List statementList = parser.parseStatementList(); @@ -62,13 +60,13 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("MERGE INTO product T" - + "\nUSING sales S ON (S.id = T.id) " - + "\nWHEN MATCHED THEN UPDATE SET inventory = T.inventory - S.sold;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + + "\nUSING sales S ON (S.id = T.id) " + + "\nWHEN MATCHED THEN UPDATE SET inventory = T.inventory - S.sold;", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("merge into product T" - + "\nusing sales S on (S.id = T.id) " - + "\nwhen matched then update set inventory = T.inventory - S.sold;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nusing sales S on (S.id = T.id) " + + "\nwhen matched then update set inventory = T.inventory - S.sold;", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2ResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2ResourceTest.java index 3782f321ec..29e918f706 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2ResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2ResourceTest.java @@ -30,7 +30,6 @@ import java.util.List; public class DB2ResourceTest extends OracleTest { - public void test_0() throws Exception { exec_test("bvt/parser/db2-0.txt"); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_0.java index 39d55e5da9..58c19576c7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_0.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_0 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT * FROM DSN81010.EMP;"; @@ -59,7 +58,7 @@ public void test_0() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); Assert.assertEquals("SELECT *" // - + "\nFROM DSN81010.EMP;", // - output); + + "\nFROM DSN81010.EMP;", // + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_1.java index ab9aa587ea..43075d2cd8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_1.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_1 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT * FROM DSN81010.EMP FETCH FIRST 5 ROWS ONLY;"; @@ -59,8 +58,8 @@ public void test_0() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); Assert.assertEquals("SELECT *" // - + "\nFROM DSN81010.EMP" - + "\nFETCH FIRST 5 ROWS ONLY;", // - output); + + "\nFROM DSN81010.EMP" + + "\nFETCH FIRST 5 ROWS ONLY;", // + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java index 1137290344..92e5d4f26e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_10 extends DB2Test { - public void test_0() throws Exception { String sql = "select * from ( select inner2_.*, rownumber() over(order by order of inner2_) as rownumber_ from (" + " select tsuserstb0_.USERID as USERID1_1_, tsuserstb0_.CREASTAF as CREASTAF2_1_, tsuserstb0_.CREATIME as CREATIME3_1_" @@ -78,8 +77,8 @@ public void test_0() throws Exception { ") inner1_\n" + "WHERE rownumber_ > 10\n" + "ORDER BY rownumber_", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select *\n" + "from (\n" + "\tselect inner2_.*, rownumber() over (order by order of inner2_) as rownumber_\n" + @@ -93,6 +92,6 @@ public void test_0() throws Exception { ") inner1_\n" + "where rownumber_ > 10\n" + "order by rownumber_", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_11.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_11.java index 0660f03c2c..eb41a2cfa7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_11.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_11 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT A.F_0201, A.F_0301, A.F_0802, A.F_2100" + "\nFROM A, B" @@ -65,7 +64,7 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("A"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("A", "F_0201"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("A", "F_0201"))); // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); @@ -83,8 +82,8 @@ public void test_0() throws Exception { "\t\tFROM B\n" + "\t)\n" + "\tAND A.F_2100 > 0", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + assertEquals("select A.F_0201, A.F_0301, A.F_0802, A.F_2100\n" + "from A, B\n" + "where B.F_2211 = '5'\n" + @@ -99,6 +98,6 @@ public void test_0() throws Exception { "\t\tfrom B\n" + "\t)\n" + "\tand A.F_2100 > 0", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_12.java index 85447f667f..66b39f89f2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_12.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_12 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT * FROM TASK_POLICE_QUERY_BATCH WHERE STATUS = '0' ORDER BY PRIORITY FETCH FIRST 100 ROWS ONLY"; @@ -55,24 +54,24 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("TASK_POLICE_QUERY_BATCH"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("TASK_POLICE_QUERY_BATCH", "STATUS"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("TASK_POLICE_QUERY_BATCH", "*"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("TASK_POLICE_QUERY_BATCH", "PRIORITY"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("TASK_POLICE_QUERY_BATCH", "STATUS"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("TASK_POLICE_QUERY_BATCH", "*"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("TASK_POLICE_QUERY_BATCH", "PRIORITY"))); // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT *" - + "\nFROM TASK_POLICE_QUERY_BATCH" - + "\nWHERE STATUS = '0'" - + "\nORDER BY PRIORITY" - + "\nFETCH FIRST 100 ROWS ONLY", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + + "\nFROM TASK_POLICE_QUERY_BATCH" + + "\nWHERE STATUS = '0'" + + "\nORDER BY PRIORITY" + + "\nFETCH FIRST 100 ROWS ONLY", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select *" - + "\nfrom TASK_POLICE_QUERY_BATCH" - + "\nwhere STATUS = '0'" - + "\norder by PRIORITY" - + "\nfetch first 100 rows only", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom TASK_POLICE_QUERY_BATCH" + + "\nwhere STATUS = '0'" + + "\norder by PRIORITY" + + "\nfetch first 100 rows only", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_13.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_13.java index 541e0327e3..bbbb7ac713 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_13.java @@ -29,12 +29,11 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_13 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT WORKDEPT, EMPNO, SALARY, BONUS, COMM "// - + " FROM DSN8B10.EMP"// - + " WHERE WORKDEPT IN ('D11','D21')" // - + " FOR UPDATE;"; + + " FROM DSN8B10.EMP"// + + " WHERE WORKDEPT IN ('D11','D21')" // + + " FOR UPDATE;"; DB2StatementParser parser = new DB2StatementParser(sql); List statementList = parser.parseStatementList(); @@ -57,20 +56,20 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("DSN8B10.EMP"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("DSN8B10.EMP", "WORKDEPT"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("DSN8B10.EMP", "WORKDEPT"))); // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); assertEquals("SELECT WORKDEPT, EMPNO, SALARY, BONUS, COMM" - + "\nFROM DSN8B10.EMP" - + "\nWHERE WORKDEPT IN ('D11', 'D21')" - + "\nFOR UPDATE;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + + "\nFROM DSN8B10.EMP" + + "\nWHERE WORKDEPT IN ('D11', 'D21')" + + "\nFOR UPDATE;", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + assertEquals("select WORKDEPT, EMPNO, SALARY, BONUS, COMM" - + "\nfrom DSN8B10.EMP" - + "\nwhere WORKDEPT in ('D11', 'D21')" - + "\nfor update;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom DSN8B10.EMP" + + "\nwhere WORKDEPT in ('D11', 'D21')" + + "\nfor update;", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_14.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_14.java index d331277882..6c2c4bf693 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_14.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_14 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT (NEXTVAL FOR TEST_SEQ) FROM SYSIBM.SYSDUMMY1"; @@ -59,11 +58,11 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT TEST_SEQ.NEXTVAL" - + "\nFROM SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + + "\nFROM SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select TEST_SEQ.nextval" - + "\nfrom SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_15.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_15.java index 0461890321..cc59d16ac8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_15.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_15 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT (PREVVAL FOR TEST_SEQ) FROM SYSIBM.SYSDUMMY1"; @@ -59,11 +58,11 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT TEST_SEQ.PREVVAL" - + "\nFROM SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + + "\nFROM SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select TEST_SEQ.prevval" - + "\nfrom SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_16.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_16.java index a9d10de169..b3cbeccf17 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_16.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_16 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT (CURRVAL FOR TEST_SEQ) FROM SYSIBM.SYSDUMMY1"; @@ -59,11 +58,11 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT TEST_SEQ.CURRVAL" - + "\nFROM SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + + "\nFROM SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select TEST_SEQ.currval" - + "\nfrom SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_17.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_17.java index 4afc7fa14f..014c98b2c0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_17.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_17 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT (NEXT VALUE FOR EMPNO) FROM SYSIBM.SYSDUMMY1"; @@ -59,11 +58,11 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT EMPNO.NEXTVAL" - + "\nFROM SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + + "\nFROM SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select EMPNO.nextval" - + "\nfrom SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_18.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_18.java index 5d8f75acb4..96d6dd8fb3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_18.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_18 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT (PREVIOUS VALUE FOR EMPNO) FROM SYSIBM.SYSDUMMY1"; @@ -59,11 +58,11 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT EMPNO.PREVVAL" - + "\nFROM SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + + "\nFROM SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select EMPNO.prevval" - + "\nfrom SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_19.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_19.java index b05486cef6..0e2d8b2dee 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_19.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_19 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT EMPNO.CURRVAL FROM SYSIBM.SYSDUMMY1"; @@ -59,11 +58,11 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT EMPNO.CURRVAL" - + "\nFROM SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + + "\nFROM SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select EMPNO.currval" - + "\nfrom SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_2.java index 0ec7d7cd43..ca57962174 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_2.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_2 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT CTRYNUM, FMS_INSTANCE_CD FROM DBEFMSDR.FMSA_O_WW_CTRY_AG WHERE ACCT_YR=? WITH UR"; @@ -60,9 +59,9 @@ public void test_0() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); Assert.assertEquals("SELECT CTRYNUM, FMS_INSTANCE_CD" // - + "\nFROM DBEFMSDR.FMSA_O_WW_CTRY_AG"// - + "\nWHERE ACCT_YR = ?"// - + "\nWITH UR", // - output); + + "\nFROM DBEFMSDR.FMSA_O_WW_CTRY_AG"// + + "\nWHERE ACCT_YR = ?"// + + "\nWITH UR", // + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_20.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_20.java index 84a60964ff..5231752b67 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_20.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_20 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT EMPNO.PREVVAL FROM SYSIBM.SYSDUMMY1"; @@ -59,11 +58,11 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT EMPNO.PREVVAL" - + "\nFROM SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + + "\nFROM SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select EMPNO.prevval" - + "\nfrom SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_21.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_21.java index da118dcf5c..c76a564033 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_21.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_21 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT EMPNO.nextval FROM SYSIBM.SYSDUMMY1"; @@ -59,11 +58,11 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT EMPNO.NEXTVAL" - + "\nFROM SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + + "\nFROM SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select EMPNO.nextval" - + "\nfrom SYSIBM.SYSDUMMY1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_22.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_22.java index 7c8cd32c7f..8888f6de41 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_22.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_22 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT ID,IDENTITY,BUSICODE" + " FROM BUSINESS_ENTERPRISE_BUSIINFO" @@ -59,26 +58,26 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("BUSINESS_ENTERPRISE_BUSIINFO"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("BUSINESS_ENTERPRISE_BUSIINFO", "ID"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("BUSINESS_ENTERPRISE_BUSIINFO", "IDENTITY"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("BUSINESS_ENTERPRISE_BUSIINFO", "BUSICODE"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("BUSINESS_ENTERPRISE_BUSIINFO", "SYSCODE"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("BUSINESS_ENTERPRISE_BUSIINFO", "INTIME"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("BUSINESS_ENTERPRISE_BUSIINFO", "ID"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("BUSINESS_ENTERPRISE_BUSIINFO", "IDENTITY"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("BUSINESS_ENTERPRISE_BUSIINFO", "BUSICODE"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("BUSINESS_ENTERPRISE_BUSIINFO", "SYSCODE"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("BUSINESS_ENTERPRISE_BUSIINFO", "INTIME"))); // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT ID, IDENTITY, BUSICODE" - + "\nFROM BUSINESS_ENTERPRISE_BUSIINFO" - + "\nWHERE SYSCODE = '603'" - + "\nORDER BY INTIME DESC" - + "\nFETCH FIRST 1 ROWS ONLY", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + + "\nFROM BUSINESS_ENTERPRISE_BUSIINFO" + + "\nWHERE SYSCODE = '603'" + + "\nORDER BY INTIME DESC" + + "\nFETCH FIRST 1 ROWS ONLY", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select ID, IDENTITY, BUSICODE" - + "\nfrom BUSINESS_ENTERPRISE_BUSIINFO" - + "\nwhere SYSCODE = '603'" - + "\norder by INTIME desc" - + "\nfetch first 1 rows only", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom BUSINESS_ENTERPRISE_BUSIINFO" + + "\nwhere SYSCODE = '603'" + + "\norder by INTIME desc" + + "\nfetch first 1 rows only", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_23.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_23.java index 132e9de37f..e6382201ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_23.java @@ -27,7 +27,6 @@ import java.util.List; public class DB2SelectTest_23 extends DB2Test { - public void test_0() throws Exception { String sql = "select current date,current timestamp from dual"; @@ -58,10 +57,10 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT CURRENT DATE, CURRENT TIMESTAMP\n" + "FROM dual", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select CURRENT DATE, CURRENT TIMESTAMP\n" + "from dual", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_24.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_24.java index cfaf319cab..48587aad13 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_24.java @@ -27,7 +27,6 @@ import java.util.List; public class DB2SelectTest_24 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT BANK_CODE, CONN_LOCATION_TYPE,\n" + "OUTER_KEYLABEL_NAME, INNER_KEYLABEL_NAME,\n" + @@ -64,12 +63,12 @@ public void test_0() throws Exception { "\t, COMMENT, STATUS, DB_TIMESTAMP\n" + "FROM EGL_SYS_KEYLABEL_CONVERT_DEF\n" + "WHERE STATUS = '1'", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select BANK_CODE, CONN_LOCATION_TYPE, OUTER_KEYLABEL_NAME, INNER_KEYLABEL_NAME, DESC\n" + "\t, COMMENT, STATUS, DB_TIMESTAMP\n" + "from EGL_SYS_KEYLABEL_CONVERT_DEF\n" + "where STATUS = '1'", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_25_concat.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_25_concat.java index ac383c98a4..6fcd6c3635 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_25_concat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_25_concat.java @@ -28,7 +28,6 @@ import java.util.List; public class DB2SelectTest_25_concat extends DB2Test { - public void test_0() throws Exception { String sql = "select ID, AUTHORITY_TYPE from t_authority a where authority_type like CONCAT('%', ?)"; @@ -60,11 +59,11 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT ID, AUTHORITY_TYPE\n" + "FROM t_authority a\n" + "WHERE authority_type LIKE CONCAT('%', ?)", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select ID, AUTHORITY_TYPE\n" + "from t_authority a\n" + "where authority_type like CONCAT('%', ?)", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_26.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_26.java index 62cccb5419..bf22deb02c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_26.java @@ -28,7 +28,6 @@ import java.util.List; public class DB2SelectTest_26 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT LATN_ID,\n" + "CASE WHEN BUREAU_KEY = 116 THEN 46 ELSE BUREAU_KEY END BUREAU_KEY,\n" + @@ -124,8 +123,8 @@ public void test_0() throws Exception { "\t\tWHEN BUREAU_KEY = 116 THEN 46\n" + "\t\tELSE BUREAU_KEY\n" + "\tEND", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select LATN_ID\n" + "\t, case \n" + "\t\twhen BUREAU_KEY = 116 then 46\n" + @@ -165,6 +164,6 @@ public void test_0() throws Exception { "\t\twhen BUREAU_KEY = 116 then 46\n" + "\t\telse BUREAU_KEY\n" + "\tend", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_27_interval.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_27_interval.java index 034d5b0ebc..be9606fc54 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_27_interval.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_27_interval.java @@ -28,7 +28,6 @@ import java.util.List; public class DB2SelectTest_27_interval extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT current date + 1 YEAR, current date + 3 YEARS + 2 MONTHS + 15 DAYS, current time + 5 HOURS - 3 MINUTES + 10 SECONDS from sysibm.sysdummy1"; @@ -61,12 +60,12 @@ public void test_0() throws Exception { "\t, CURRENT DATE + 3 YEARS + 2 MONTHS + 15 DAYS\n" + "\t, CURRENT TIME + 5 HOURS - 3 MINUTES + 10 SECONDS\n" + "FROM sysibm.sysdummy1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("select CURRENT DATE + 1 as YEAR\n" + "\t, CURRENT DATE + 3 years + 2 months + 15 days\n" + "\t, CURRENT TIME + 5 hours - 3 minutes + 10 seconds\n" + "from sysibm.sysdummy1", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_28.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_28.java index 7475208430..03e87b85ab 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_28.java @@ -28,7 +28,6 @@ import java.util.List; public class DB2SelectTest_28 extends DB2Test { - public void test_0() throws Exception { String sql = "select a from (select b from d)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_29.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_29.java index b8d89bbafe..9dbb45d4cb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_29.java @@ -28,7 +28,6 @@ import java.util.List; public class DB2SelectTest_29 extends DB2Test { - public void test_0() throws Exception { String sql = "select to_char(current date - 7 day ,'yyyymmdd') from sysibm.dual"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_3.java index ce3ee931db..78b2266454 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_3.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_3 extends DB2Test { - public void test_0() throws Exception { String sql = "select * from t for read only"; @@ -60,8 +59,8 @@ public void test_0() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); Assert.assertEquals("SELECT *" // - + "\nFROM t"// - + "\nFOR READ ONLY", // - output); + + "\nFROM t"// + + "\nFOR READ ONLY", // + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_30.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_30.java index e56b17cf98..6e5aaa1f8f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_30.java @@ -27,7 +27,6 @@ import java.util.List; public class DB2SelectTest_30 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT CURRENT TIME FROM SYSIBM.SYSDUMMY1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_31.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_31.java index a86e6ff365..83e907826a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_31.java @@ -27,7 +27,6 @@ import java.util.List; public class DB2SelectTest_31 extends DB2Test { - public void test_0() throws Exception { String sql = "select rtrim(current_server), rtrim(current schema), rtrim(current_user) from sysibm.sysdummy1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_32.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_32.java index 78ca104d3b..4aec04b94d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_32.java @@ -27,7 +27,6 @@ import java.util.List; public class DB2SelectTest_32 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT CURRENT DATE FROM SYSIBM.SYSDUMMY1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_33.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_33.java index ed502fddc0..e90bd1c4bd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_33.java @@ -27,7 +27,6 @@ import java.util.List; public class DB2SelectTest_33 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT CURRENT_DATE -2 DAY FROM SYSIBM.SYSDUMMY1;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_34.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_34.java index d1dee9b383..986fbe60aa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_34.java @@ -26,7 +26,6 @@ import java.util.List; public class DB2SelectTest_34 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT * INTO Persons_backup FROM Persons"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_4.java index 23ed454a19..00e557750b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_4.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_4 extends DB2Test { - public void test_0() throws Exception { String sql = "select * from t OPTIMIZE FOR 10 ROWS"; @@ -60,8 +59,8 @@ public void test_0() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); Assert.assertEquals("SELECT *" // - + "\nFROM t"// - + "\nOPTIMIZE FOR 10", // - output); + + "\nFROM t"// + + "\nOPTIMIZE FOR 10", // + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_5.java index d60dd88361..b831018d9f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_5.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_5 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT * FROM (SELECT TEMP_TAB.*,ROWNUMBER() OVER() AS IDX FROM (SELECT" // + " DISTINCT ( OH.ORDER_ID )" // @@ -87,6 +86,6 @@ public void test_0() throws Exception { ") TEMP_TAB_WITH_IDX\n" + "WHERE TEMP_TAB_WITH_IDX.IDX > 0\n" + "\tAND TEMP_TAB_WITH_IDX.IDX <= 20", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_6.java index 1a0e472f42..f0429420d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_6.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_6 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT all id FROM DSN81010.EMP;"; @@ -58,10 +57,10 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT ALL id" // - + "\nFROM DSN81010.EMP;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + + "\nFROM DSN81010.EMP;", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); Assert.assertEquals("select all id" // - + "\nfrom DSN81010.EMP;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom DSN81010.EMP;", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_7.java index 9fab47c2d9..952f5c96f5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_7.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_7 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT distinct id FROM DSN81010.EMP;"; @@ -58,10 +57,10 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT DISTINCT id" // - + "\nFROM DSN81010.EMP;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + + "\nFROM DSN81010.EMP;", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); Assert.assertEquals("select distinct id" // - + "\nfrom DSN81010.EMP;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom DSN81010.EMP;", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_8.java index 4d14068ce2..c60776ffc5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_8.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_8 extends DB2Test { - public void test_0() throws Exception { String sql = "SELECT unique id FROM DSN81010.EMP where id = 1;"; @@ -58,12 +57,12 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT UNIQUE id" // - + "\nFROM DSN81010.EMP" - + "\nWHERE id = 1;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + + "\nFROM DSN81010.EMP" + + "\nWHERE id = 1;", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); Assert.assertEquals("select unique id" // - + "\nfrom DSN81010.EMP" - + "\nwhere id = 1;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nfrom DSN81010.EMP" + + "\nwhere id = 1;", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_9.java index 2eabe59fa4..45219a56cc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_9.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2SelectTest_9 extends DB2Test { - public void test_0() throws Exception { String sql = "select tsuserstb0_.USERID as USERID1_1_, tsuserstb0_.CREASTAF as CREASTAF2_1_" + " , tsuserstb0_.CREATIME as CREATIME3_1_, tsuserstb0_.LOCORGNO as LOCORGNO4_1_" @@ -64,16 +63,16 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SELECT tsuserstb0_.USERID AS USERID1_1_, tsuserstb0_.CREASTAF AS CREASTAF2_1_, tsuserstb0_.CREATIME AS CREATIME3_1_, tsuserstb0_.LOCORGNO AS LOCORGNO4_1_, tsuserstb0_.PWDMODIFYTIME AS PWDMODIF5_1_" - + "\n\t, tsuserstb0_.REMARK01 AS REMARK6_1_, tsuserstb0_.REMARK02 AS REMARK7_1_, tsuserstb0_.STAORGNO AS STAORGNO8_1_, tsuserstb0_.UPDASTAF AS UPDASTAF9_1_, tsuserstb0_.UPDATIME AS UPDATIM10_1_" - + "\n\t, tsuserstb0_.USERNAME AS USERNAM11_1_, tsuserstb0_.USERPWD AS USERPWD12_1_, tsuserstb0_.USERSTATE AS USERSTA13_1_" - + "\nFROM TS_USERSTB tsuserstb0_" - + "\nFETCH FIRST 10 ROWS ONLY", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + + "\n\t, tsuserstb0_.REMARK01 AS REMARK6_1_, tsuserstb0_.REMARK02 AS REMARK7_1_, tsuserstb0_.STAORGNO AS STAORGNO8_1_, tsuserstb0_.UPDASTAF AS UPDASTAF9_1_, tsuserstb0_.UPDATIME AS UPDATIM10_1_" + + "\n\t, tsuserstb0_.USERNAME AS USERNAM11_1_, tsuserstb0_.USERPWD AS USERPWD12_1_, tsuserstb0_.USERSTATE AS USERSTA13_1_" + + "\nFROM TS_USERSTB tsuserstb0_" + + "\nFETCH FIRST 10 ROWS ONLY", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); Assert.assertEquals("select tsuserstb0_.USERID as USERID1_1_, tsuserstb0_.CREASTAF as CREASTAF2_1_, tsuserstb0_.CREATIME as CREATIME3_1_, tsuserstb0_.LOCORGNO as LOCORGNO4_1_, tsuserstb0_.PWDMODIFYTIME as PWDMODIF5_1_" - + "\n\t, tsuserstb0_.REMARK01 as REMARK6_1_, tsuserstb0_.REMARK02 as REMARK7_1_, tsuserstb0_.STAORGNO as STAORGNO8_1_, tsuserstb0_.UPDASTAF as UPDASTAF9_1_, tsuserstb0_.UPDATIME as UPDATIM10_1_" - + "\n\t, tsuserstb0_.USERNAME as USERNAM11_1_, tsuserstb0_.USERPWD as USERPWD12_1_, tsuserstb0_.USERSTATE as USERSTA13_1_" - + "\nfrom TS_USERSTB tsuserstb0_" - + "\nfetch first 10 rows only", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\n\t, tsuserstb0_.REMARK01 as REMARK6_1_, tsuserstb0_.REMARK02 as REMARK7_1_, tsuserstb0_.STAORGNO as STAORGNO8_1_, tsuserstb0_.UPDASTAF as UPDASTAF9_1_, tsuserstb0_.UPDATIME as UPDATIM10_1_" + + "\n\t, tsuserstb0_.USERNAME as USERNAM11_1_, tsuserstb0_.USERPWD as USERPWD12_1_, tsuserstb0_.USERSTATE as USERSTA13_1_" + + "\nfrom TS_USERSTB tsuserstb0_" + + "\nfetch first 10 rows only", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_0.java index 528d0e3ec7..d1cbdf833b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_0.java @@ -27,7 +27,6 @@ import java.util.List; public class DB2SetTest_0 extends DB2Test { - public void test_0() throws Exception { String sql = "set current schema = 'PAYROLL'"; @@ -57,8 +56,8 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SET CURRENT SCHEMA = 'PAYROLL'", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); Assert.assertEquals("set CURRENT SCHEMA = 'PAYROLL'", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_1.java index 8482fbe406..11b40868f7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_1.java @@ -26,7 +26,6 @@ import java.util.List; public class DB2SetTest_1 extends DB2Test { - public void test_0() throws Exception { String sql = "SET :HVL = CURRENT PATH;"; @@ -56,8 +55,8 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SET :HVL = CURRENT PATH;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); Assert.assertEquals("set :HVL = CURRENT PATH;", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_2_schema.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_2_schema.java index 110ba2ccd5..0cfeb1b184 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_2_schema.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_2_schema.java @@ -26,7 +26,6 @@ import java.util.List; public class DB2SetTest_2_schema extends DB2Test { - public void test_0() throws Exception { String sql = "SET SCHEMA RICK"; @@ -56,8 +55,8 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("SET SCHEMA = RICK", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); Assert.assertEquals("set SCHEMA = RICK", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest.java index 69cca548fb..708a72267b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2TruncateTest extends DB2Test { - public void test_0() throws Exception { String sql = "TRUNCATE TASK_AICSFSM_QUERY_BATCH_TEMP IMMEDIATE"; @@ -58,9 +57,9 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("TRUNCATE TABLE TASK_AICSFSM_QUERY_BATCH_TEMP IMMEDIATE", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("truncate table TASK_AICSFSM_QUERY_BATCH_TEMP immediate", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest2.java index afd6e74438..ac58c80a59 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest2.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2TruncateTest2 extends DB2Test { - public void test_0() throws Exception { String sql = "TRUNCATE TABLE INVENTORY IGNORE DELETE TRIGGERS DROP STORAGE IMMEDIATE"; @@ -58,9 +57,9 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("TRUNCATE TABLE INVENTORY DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("truncate table INVENTORY drop storage ignore delete triggers immediate", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest3.java index 1c042a4bb3..96e5627d08 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest3.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2TruncateTest3 extends DB2Test { - public void test_0() throws Exception { String sql = "TRUNCATE TABLE INVENTORY REUSE STORAGE RESTRICT WHEN DELETE TRIGGERS"; @@ -58,9 +57,9 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("TRUNCATE TABLE INVENTORY REUSE STORAGE RESTRICT WHEN DELETE TRIGGERS", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("truncate table INVENTORY reuse storage restrict when delete triggers", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest4.java index 46fbc5ac1d..76d76d8410 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest4.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2TruncateTest4 extends DB2Test { - public void test_0() throws Exception { String sql = "TRUNCATE TABLE INVENTORY REUSE STORAGE IGNORE DELETE TRIGGERS IMMEDIATE"; @@ -58,9 +57,9 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("TRUNCATE TABLE INVENTORY REUSE STORAGE IGNORE DELETE TRIGGERS IMMEDIATE", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("truncate table INVENTORY reuse storage ignore delete triggers immediate", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest5.java index b90e838994..7ef62914a4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest5.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class DB2TruncateTest5 extends DB2Test { - public void test_0() throws Exception { String sql = "TRUNCATE TABLE INVENTORY REUSE STORAGE IGNORE DELETE TRIGGERS CONTINUE IDENTITY IMMEDIATE"; @@ -58,9 +57,9 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); Assert.assertEquals("TRUNCATE TABLE INVENTORY REUSE STORAGE IGNORE DELETE TRIGGERS IMMEDIATE", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + Assert.assertEquals("truncate table INVENTORY reuse storage ignore delete triggers immediate", // - SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2Values_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2Values_Test.java index a8f848edcd..47ef0fe044 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2Values_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2Values_Test.java @@ -26,7 +26,6 @@ import java.util.List; public class DB2Values_Test extends DB2Test { - public void test_0() throws Exception { String sql = "values 1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/dm/DM_MergeTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/dm/DM_MergeTest_0.java index be0cbf1b80..345c4f7c18 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/dm/DM_MergeTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/dm/DM_MergeTest_0.java @@ -14,7 +14,7 @@ public void test_0() throws Exception { "where sessionid = ?) b on (b.co <> 0) when matched then update set login_name = ?, dept_name = ?, ipaddr = ?, login_location = ?, browser = ?, os = ?, status = ?, start_timestamp = ?, last_access_time = ?, expire_time = ? where sessionid = ? when not matched then insert(SESSIONID, LOGIN_NAME, DEPT_NAME, IPADDR,LOGIN_LOCATION, BROWSER, OS, STATUS, START_TIMESTAMP, LAST_ACCESS_TIME, EXPIRE_TIME) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; // List statementList = SQLUtils.parseStatements(sql, DbType.dm); - SQLMergeStatement stmt = (SQLMergeStatement)statementList.get(0); + SQLMergeStatement stmt = (SQLMergeStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -28,7 +28,6 @@ public void test_0() throws Exception { "\tWHERE sessionid = ?\n" + "WHEN NOT MATCHED THEN INSERT (SESSIONID, LOGIN_NAME, DEPT_NAME, IPADDR, LOGIN_LOCATION, BROWSER, OS, STATUS, START_TIMESTAMP, LAST_ACCESS_TIME, EXPIRE_TIME) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", stmt.toString()); - } public void test_1() throws Exception { @@ -36,7 +35,7 @@ public void test_1() throws Exception { "where sessionid = ?) b on (b.co <> 0) when matched then update set login_name = ?, dept_name = ?, ipaddr = ?, login_location = ?, browser = ?, os = ?, status = ?, start_timestamp = ?, last_access_time = ?, expire_time = ? where sessionid = ? when not matched then insert(SESSIONID, LOGIN_NAME, DEPT_NAME, IPADDR,LOGIN_LOCATION, BROWSER, OS, STATUS, START_TIMESTAMP, LAST_ACCESS_TIME, EXPIRE_TIME) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; // List statementList = SQLUtils.parseStatements(sql, DbType.dm); - SQLMergeStatement stmt = (SQLMergeStatement)statementList.get(0); + SQLMergeStatement stmt = (SQLMergeStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -50,6 +49,5 @@ public void test_1() throws Exception { "\tWHERE sessionid = ?\n" + "WHEN NOT MATCHED THEN INSERT (SESSIONID, LOGIN_NAME, DEPT_NAME, IPADDR, LOGIN_LOCATION, BROWSER, OS, STATUS, START_TIMESTAMP, LAST_ACCESS_TIME, EXPIRE_TIME) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", stmt.toString()); - } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalAndOrTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalAndOrTest.java index 3fc6b7f5b4..e46c4cad2c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalAndOrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalAndOrTest.java @@ -6,14 +6,14 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalAndOrTest extends TestCase { public void test_and() throws Exception { - Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?>0 && ?>0", 1,0)); + Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?>0 && ?>0", 1, 0)); Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "2>1 && 100>10")); } + public void test_or() throws Exception { - Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "10>0 || 2>0")); + Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "10>0 || 2>0")); Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "10>0 || 2<0")); Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "2>10 || 100<10")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalBetweenTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalBetweenTest.java index 4b4a1e4220..99606e1046 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalBetweenTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalBetweenTest.java @@ -7,14 +7,13 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalBetweenTest extends TestCase { public void test_between() throws Exception { Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? between 1 and 3", 0)); Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? between 1 and 3", 2)); Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? between 1 and 3", 4)); } - + public void test_not_between() throws Exception { Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? not between 1 and 3", 0)); Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? not between 1 and 3", 2)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalCaseThen.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalCaseThen.java index 6d80171534..28f4678727 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalCaseThen.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalCaseThen.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalCaseThen extends TestCase { public void test_eval_then() throws Exception { Assert.assertEquals(111, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "case ? when 0 then 111 else 222 end", 0)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalConcatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalConcatTest.java index 1e9a853eeb..f80306665c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalConcatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalConcatTest.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalConcatTest extends TestCase { public void test_concat() throws Exception { Assert.assertEquals("abcd", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "concat(?, ?)", "ab", "cd")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalInTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalInTest.java index 0d00c1b145..a90a07e54a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalInTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalInTest.java @@ -6,13 +6,12 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalInTest extends TestCase { public void test_in() throws Exception { Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? IN (1, 2, 3)", 0)); Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? IN (1, 2, 3)", 1)); } - + public void test_not_in() throws Exception { Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? NOT IN (1, 2, 3)", 0)); Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? NOT IN (1, 2, 3)", 1)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalIsNullTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalIsNullTest.java index 894bcf2e23..5ccddf5c70 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalIsNullTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalIsNullTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalIsNullTest extends TestCase { public void test_null() throws Exception { Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? is null", 0)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalLikeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalLikeTest.java index cfeeee3f63..09b62beb3b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalLikeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalLikeTest.java @@ -7,12 +7,11 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalLikeTest extends TestCase { public void test_like() throws Exception { Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "'a' LIKE '[a-d]'")); } - + public void test_not_like() throws Exception { Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "'a' NOT LIKE '[a-d]'")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAbsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAbsTest.java index 8490bb2219..51c53c01d7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAbsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAbsTest.java @@ -10,7 +10,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodAbsTest extends TestCase { - public void test_abs_int() throws Exception { Assert.assertEquals(12, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "abs(-12)")); Assert.assertEquals(12, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "abs(12)")); @@ -20,7 +19,7 @@ public void test_abs_long() throws Exception { Assert.assertEquals(12L, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "abs(?)", 12L)); Assert.assertEquals(12L, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "abs(?)", -12L)); } - + public void test_abs_decimal() throws Exception { Assert.assertEquals(new BigDecimal("12"), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "abs(?)", new BigDecimal("12"))); Assert.assertEquals(new BigDecimal("12"), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "abs(?)", new BigDecimal("-12"))); @@ -35,7 +34,7 @@ public void test_abs_error() throws Exception { } Assert.assertNotNull(error); } - + public void test_abs_error_1() throws Exception { Exception error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAcosTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAcosTest.java index f9ef285abb..879ad54f22 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAcosTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAcosTest.java @@ -7,14 +7,13 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodAcosTest extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals(0.0D, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "acos(1)")); Assert.assertEquals(null, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "acos(1.001)")); Assert.assertEquals(Math.acos(0), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "acos(0)")); } - + public void test_abs_error() throws Exception { Exception error = null; try { @@ -24,7 +23,7 @@ public void test_abs_error() throws Exception { } Assert.assertNotNull(error); } - + public void test_abs_error_1() throws Exception { Exception error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsciiTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsciiTest.java index fbeb1add9a..caf374aa16 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsciiTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsciiTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodAsciiTest extends TestCase { public void test_ascii() throws Exception { Assert.assertEquals(50, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "ascii('2')")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsinTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsinTest.java index 16d48b8e1a..7d67c9b441 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsinTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsinTest.java @@ -7,12 +7,11 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodAsinTest extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals(Math.asin(0.2), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "asin(0.2)")); } - + public void test_abs_error() throws Exception { Exception error = null; try { @@ -22,7 +21,7 @@ public void test_abs_error() throws Exception { } Assert.assertNotNull(error); } - + public void test_abs_error_1() throws Exception { Exception error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtan2Test.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtan2Test.java index 32d1d45801..1ab560dbf0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtan2Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtan2Test.java @@ -7,12 +7,11 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodAtan2Test extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals(Math.atan2(-2, 2), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "atan2(-2, 2)")); } - + public void test_error() throws Exception { Exception error = null; try { @@ -22,7 +21,7 @@ public void test_error() throws Exception { } Assert.assertNotNull(error); } - + public void test_error_1() throws Exception { Exception error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtanTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtanTest.java index 6bd3a77190..e2886a49a6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtanTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtanTest.java @@ -7,13 +7,12 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodAtanTest extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals(Math.atan(2), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "atan(2)")); Assert.assertEquals(Math.atan(-2), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "atan(-2)")); } - + public void test_abs_error() throws Exception { Exception error = null; try { @@ -23,7 +22,7 @@ public void test_abs_error() throws Exception { } Assert.assertNotNull(error); } - + public void test_abs_error_1() throws Exception { Exception error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBinTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBinTest.java index 1632b0b615..2e82b4e3d5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBinTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBinTest.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodBinTest extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals(32, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "BIT_LENGTH('text')")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBitLengthTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBitLengthTest.java index 6d3c5f5d8d..643df80d69 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBitLengthTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBitLengthTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodBitLengthTest extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals("1100", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "BIN(12)")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCeilTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCeilTest.java index 84047ecd13..33ecbf8e09 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCeilTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCeilTest.java @@ -7,15 +7,13 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodCeilTest extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals(2, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "ceil(1.23)")); Assert.assertEquals(-1, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "ceil(-1.23)")); Assert.assertEquals(-1, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "ceiling(-1.24)")); } - - + public void test_error() throws Exception { Exception error = null; try { @@ -25,7 +23,7 @@ public void test_error() throws Exception { } Assert.assertNotNull(error); } - + public void test_error_1() throws Exception { Exception error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCosTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCosTest.java index 04b9a76483..ae8aabf078 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCosTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCosTest.java @@ -7,14 +7,13 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodCosTest extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals(Math.cos(1), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "cos(1)")); Assert.assertEquals(Math.cos(1.001), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "cos(1.001)")); Assert.assertEquals(Math.cos(0), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "cos(0)")); } - + public void test_error() throws Exception { Exception error = null; try { @@ -24,7 +23,7 @@ public void test_error() throws Exception { } Assert.assertNotNull(error); } - + public void test_error_1() throws Exception { Exception error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodInstrTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodInstrTest.java index 326b137890..784ea4b67b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodInstrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodInstrTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodInstrTest extends TestCase { public void test_length() throws Exception { Assert.assertEquals(4, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "instr('foobarbar', 'bar')")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLeftTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLeftTest.java index 19d96f2e8c..dbc9fe41b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLeftTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLeftTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodLeftTest extends TestCase { public void test_ascii() throws Exception { Assert.assertEquals("fooba", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LEFT('foobarbar', 5)")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLengthTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLengthTest.java index 51b3a5342e..7475c74e82 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLengthTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLengthTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodLengthTest extends TestCase { public void test_length() throws Exception { Assert.assertEquals(4, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "length('text')")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLog10Test.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLog10Test.java index f842fa3aec..58ab894aeb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLog10Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLog10Test.java @@ -7,14 +7,13 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodLog10Test extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals(Math.log10(1), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "log10(1)")); Assert.assertEquals(Math.log10(1.001), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "log10(1.001)")); Assert.assertEquals(Math.log10(0), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "log10(0)")); } - + public void test_error() throws Exception { Exception error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLogTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLogTest.java index 6961960705..878723a717 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLogTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLogTest.java @@ -7,14 +7,13 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodLogTest extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals(Math.log(1), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "log(1)")); Assert.assertEquals(Math.log(1.001), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "log(1.001)")); Assert.assertEquals(Math.log(0), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "log(0)")); } - + public void test_error() throws Exception { Exception error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodModTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodModTest.java index 612a0cd91b..3cc2566b3f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodModTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodModTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodModTest extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals(2, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "MOD(29,9)")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodNowTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodNowTest.java index dd617b396d..e0a172a25b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodNowTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodNowTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodNowTest extends TestCase { public void test_now() throws Exception { Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "now()") instanceof Date); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPITest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPITest.java index 7e06a1cefa..414d291b78 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPITest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPITest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodPITest extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals(Math.PI, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "pi()")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPowerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPowerTest.java index 0a90eb1976..3d9f21d8f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPowerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPowerTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodPowerTest extends TestCase { - public void test_reverse() throws Exception { Assert.assertEquals(Math.pow(1, 2), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "power(1, 2)")); Assert.assertEquals(Math.pow(3, 4), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "power(3, 4)")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRandom.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRandom.java index f4d866b4f1..7b1f275310 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRandom.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRandom.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodRandom extends TestCase { public void test_reverse() throws Exception { Assert.assertNotNull(SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "rand()")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodReverseTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodReverseTest.java index ff3961df91..3ccd49f010 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodReverseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodReverseTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodReverseTest extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals("cba", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "REVERSE('abc')")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRightTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRightTest.java index 34038bb968..efcfbb6e3e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRightTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRightTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodRightTest extends TestCase { public void test_ascii() throws Exception { Assert.assertEquals("rbar", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "right('foobarbar', 4)")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSinTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSinTest.java index b3797794bc..0c4096c2f1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSinTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSinTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodSinTest extends TestCase { - public void test_reverse() throws Exception { Assert.assertEquals(Math.sin(1), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "sin(1)")); Assert.assertEquals(Math.sin(1.001), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "sin(1.001)")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSqrtTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSqrtTest.java index 82cf273f79..1414cad2ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSqrtTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSqrtTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodSqrtTest extends TestCase { - public void test_reverse() throws Exception { Assert.assertEquals(Math.sqrt(1), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "sqrt(1)")); Assert.assertEquals(Math.sqrt(1.001), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "sqrt(1.001)")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTanTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTanTest.java index 79e42373d2..3a03afc412 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTanTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTanTest.java @@ -7,14 +7,13 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodTanTest extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals(Math.tan(1), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "tan(1)")); Assert.assertEquals(Math.tan(1.001), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "tan(1.001)")); Assert.assertEquals(Math.tan(0), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "tan(0)")); } - + public void test_error() throws Exception { Exception error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char.java index a0bc929430..f5c4ee5b48 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodTest_Char extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals("MySQL", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "CHAR(77,121,83,81,'76')")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char_1.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char_1.java index 6461b72c32..985fff7f8a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char_1.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodTest_Char_1 extends TestCase { public void test_reverse() throws Exception { Assert.assertEquals("MMM", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "CHAR(77,77.3,'77.3')")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt.java index 147549e6be..961a1dbc21 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_Elt extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("ej", - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "ELT(1, 'ej', 'Heja', 'hej', 'foo')")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "ELT(1, 'ej', 'Heja', 'hej', 'foo')")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt_1.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt_1.java index f4ac3fa399..62317fd8d7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt_1.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_Elt_1 extends TestCase { - public void test_method() throws Exception { Assert.assertEquals(null, - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "ELT(11, 'ej', 'Heja', 'hej', 'foo')")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "ELT(11, 'ej', 'Heja', 'hej', 'foo')")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert.java index c1642951c1..3bab421e5c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_insert extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("Quadratic", - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "INSERT('Quadratic', -1, 4, 'What')")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "INSERT('Quadratic', -1, 4, 'What')")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_1.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_1.java index 9f0d65bd39..ffa50bb2a8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_1.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_insert_1 extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("QuWhattic", - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "INSERT('Quadratic', 3, 4, 'What')")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "INSERT('Quadratic', 3, 4, 'What')")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_2.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_2.java index 4d735f4fcd..a252dbf7f5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_2.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_insert_2 extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("QuWhat", - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "INSERT('Quadratic', 3, 100, 'What')")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "INSERT('Quadratic', 3, 100, 'What')")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr.java index 07bdaf9ecf..2c0c0d9ae5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_instr extends TestCase { - public void test_method() throws Exception { Assert.assertEquals(4, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "INSTR('foobarbar', 'bar')")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr_1.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr_1.java index 28ae98dd62..09f63085ca 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr_1.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_instr_1 extends TestCase { - public void test_method() throws Exception { Assert.assertEquals(0, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "INSTR('xbar', 'foobar')")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lcase.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lcase.java index 47e9ce3b78..3145171111 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lcase.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lcase.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_lcase extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("quadratically", - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LOWER('QUADRATICALLY')")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LOWER('QUADRATICALLY')")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_left.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_left.java index fec8f694ce..d4b2e9b2e2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_left.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_left.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_left extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("fooba", - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LEFT('foobarbar', 5)")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LEFT('foobarbar', 5)")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_len.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_len.java index 96f8701e12..15fac4ceaf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_len.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_len.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_len extends TestCase { - public void test_method() throws Exception { Assert.assertEquals(4, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LENGTH('text')")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate.java index 0abe83a11b..d7df4a2766 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_locate extends TestCase { - public void test_method() throws Exception { Assert.assertEquals(4, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LOCATE('bar', 'foobarbar')")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_1.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_1.java index 5d0631e6d6..f255480354 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_1.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_locate_1 extends TestCase { - public void test_method() throws Exception { Assert.assertEquals(0, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LOCATE('xbar', 'foobar')")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_2.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_2.java index 83058931fc..31dd013fd0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_2.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_locate_2 extends TestCase { - public void test_method() throws Exception { Assert.assertEquals(7, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LOCATE('bar', 'foobarbar', 5)")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lower.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lower.java index 479c97e3ee..d0c84c7d6e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lower.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lower.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_lower extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("quadratically", - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LOWER('QUADRATICALLY')")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LOWER('QUADRATICALLY')")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad.java index 2d2ee9552d..323530034b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_lpad extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("??hi", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LPAD('hi',4,'??')")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad_1.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad_1.java index eaae5c649b..2fc46fc4e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad_1.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_lpad_1 extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("h", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LPAD('hi',1,'??')")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_ltrim.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_ltrim.java index 7a6147bf7e..6400fd00f7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_ltrim.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_ltrim.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_ltrim extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("barbar", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "LTRIM(' barbar')")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_mid.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_mid.java index 416622cfd5..d798ba092a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_mid.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_mid.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_mid extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("ratically", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "mid('Quadratically',5)")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring.java index c67465746d..a3509c48f6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_substring extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("barbar", - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "SUBSTRING('foobarbar' FROM 4)")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "SUBSTRING('foobarbar' FROM 4)")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_1.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_1.java index 2db890e7fb..6b23082ab3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_1.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_substring_1 extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("ratica", - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "SUBSTRING('Quadratically',5,6)")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "SUBSTRING('Quadratically',5,6)")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_2.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_2.java index 7551658b8b..dbb3303d12 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_2.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_substring_2 extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("ila", - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "SUBSTRING('Sakila', -3)")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "SUBSTRING('Sakila', -3)")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_3.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_3.java index 1a5ed41894..03207192b5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_3.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_substring_3 extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("aki", - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "SUBSTRING('Sakila', -5, 3)")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "SUBSTRING('Sakila', -5, 3)")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_4.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_4.java index 8a31e32ac3..47bd9c79a0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_4.java @@ -8,9 +8,8 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalMethodTest_substring_4 extends TestCase { - public void test_method() throws Exception { Assert.assertEquals("ki", - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "SUBSTRING('Sakila' FROM -4 FOR 2)")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "SUBSTRING('Sakila' FROM -4 FOR 2)")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTrimTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTrimTest.java index 6a0fd3031d..830c10a16a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTrimTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTrimTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalMethodTrimTest extends TestCase { public void test_trim() throws Exception { Assert.assertEquals("bar", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "TRIM(' bar ')")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalRlikeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalRlikeTest.java index 1153665ec4..24bee470cb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalRlikeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalRlikeTest.java @@ -6,14 +6,13 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalRlikeTest extends TestCase { public void test_rlike() throws Exception { Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "'a' REGEXP '^[a-d]'")); Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "'a' RLIKE '^[a-d]'")); Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "'1' RLIKE '^[a-d]'")); } - + public void test_not_rlike() throws Exception { Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "'a' NOT REGEXP '^[a-d]'")); Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "'a' NOT RLIKE '^[a-d]'")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalSelectTest.java index bcf6298fd0..7b324d8abd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalSelectTest.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalSelectTest extends TestCase { public void test_select() throws Exception { List> rows = new ArrayList>(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest.java index 5a97035e66..50dc9e229e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalTest extends TestCase { - public void testEval() throws Exception { Assert.assertEquals("A", SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?", "A")); Assert.assertEquals(123, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?", 123)); @@ -41,27 +40,27 @@ public void testEval_2() throws Exception { public void testEval_3() throws Exception { Assert.assertEquals(new BigDecimal("110"), SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? * ?", - new BigDecimal("10"), - new BigDecimal("11"))); + new BigDecimal("10"), + new BigDecimal("11"))); } public void testEval_4() throws Exception { Assert.assertEquals(new BigDecimal("110"), - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? * 11", new BigDecimal("10"))); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? * 11", new BigDecimal("10"))); } public void testEval_5() throws Exception { Assert.assertEquals(new BigDecimal("110.0"), - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? * 11.0", new BigDecimal("10"))); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? * 11.0", new BigDecimal("10"))); } public void testEval_6() throws Exception { Assert.assertEquals(new BigDecimal("110.0"), - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? * 11", new BigDecimal("10.0"))); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? * 11", new BigDecimal("10.0"))); } public void testEval_7() throws Exception { Assert.assertEquals(new BigDecimal("110.0"), - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? * 11.0", "10")); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? * 11.0", "10")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add.java index dbd0c21158..a38c57c573 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalTest_add extends TestCase { - public void test_byte() throws Exception { Assert.assertEquals(3, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? + ?", (byte) 1, (byte) 2)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_long.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_long.java index 9f080806a7..7e18b27ca3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_long.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_long.java @@ -7,28 +7,27 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalTest_add_long extends TestCase { public void test_add() throws Exception { Assert.assertEquals(3L, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? + ?", (long) 1, (byte) 2)); } - + public void test_add_1() throws Exception { Assert.assertEquals(3L, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? + ?", (long) 1, "2")); } - + public void test_add_2() throws Exception { Assert.assertEquals(null, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? + ?", (long) 1, null)); } - + public void test_add_3() throws Exception { Assert.assertEquals(3L, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? + ?", (byte) 2, (long) 1)); } - + public void test_add_4() throws Exception { Assert.assertEquals(3L, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? + ?", "2", (long) 1)); } - + public void test_add_5() throws Exception { Assert.assertEquals(null, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? + ?", null, (long) 1)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_short.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_short.java index f1231274fe..1a43ea5f8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_short.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_short.java @@ -7,20 +7,19 @@ import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; - public class EvalTest_add_short extends TestCase { public void test_byte() throws Exception { Assert.assertEquals(3, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? + ?", (short) 1, (byte) 2)); } - + public void test_byte_1() throws Exception { Assert.assertEquals(3, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? + ?", (short) 1, "2")); } - + public void test_byte_2() throws Exception { Assert.assertEquals(null, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? + ?", (short) 1, null)); } - + public void test_byte_3() throws Exception { Assert.assertEquals(3, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? + ?", "2", (short) 1)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_div.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_div.java index 5cbd714365..280e77e8f6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_div.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_div.java @@ -11,7 +11,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalTest_div extends TestCase { - public void test_long() throws Exception { Assert.assertEquals(0L, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (long) 1, (byte) 2)); } @@ -30,12 +29,12 @@ public void test_byte() throws Exception { public void test_BigInteger() throws Exception { Assert.assertEquals(BigInteger.ZERO, - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", BigInteger.ONE, (byte) 2)); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", BigInteger.ONE, (byte) 2)); } public void test_BigDecimal() throws Exception { Assert.assertEquals(new BigDecimal("0.5"), - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", BigDecimal.ONE, (byte) 2)); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", BigDecimal.ONE, (byte) 2)); } public void test_float() throws Exception { @@ -48,18 +47,17 @@ public void test_double() throws Exception { public void test_double_zero() throws Exception { Assert.assertEquals(Double.POSITIVE_INFINITY, - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (double) 1, 0)); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (double) 1, 0)); } public void test_double_zero_1() throws Exception { Assert.assertEquals(Double.NEGATIVE_INFINITY, - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (double) -1D, 0)); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (double) -1D, 0)); } - public void test_double_zero_2() throws Exception { Assert.assertEquals(Double.NaN, - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (double) 0D, 0)); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (double) 0D, 0)); } public void test_double_null() throws Exception { @@ -73,17 +71,17 @@ public void test_double_null_1() throws Exception { // public void test_float_zero() throws Exception { Assert.assertEquals(Float.POSITIVE_INFINITY, - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (float) 1, 0)); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (float) 1, 0)); } public void test_float_zero_1() throws Exception { Assert.assertEquals(Float.NEGATIVE_INFINITY, - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (float) -1F, 0)); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (float) -1F, 0)); } - + public void test_float_zero_2() throws Exception { Assert.assertEquals(Float.NaN, - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (float) 0F, 0)); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?/?", (float) 0F, 0)); } public void test_float_null() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt.java index 2c7fbe7077..af67a7cef7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt.java @@ -12,7 +12,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalTest_gt extends TestCase { - public void test_long() throws Exception { Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? > ?", (long) 1, (byte) 2)); } @@ -51,8 +50,8 @@ public void test_String() throws Exception { public void test_Date() throws Exception { Assert.assertEquals(false, - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?>?", - new Date(System.currentTimeMillis() - 10), - new Date(System.currentTimeMillis()))); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?>?", + new Date(System.currentTimeMillis() - 10), + new Date(System.currentTimeMillis()))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt_true.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt_true.java index f6f04afc96..acc8ebd12e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt_true.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt_true.java @@ -12,7 +12,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalTest_gt_true extends TestCase { - public void test_long() throws Exception { Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? > ?", (long) 10, (byte) 2)); } @@ -51,8 +50,8 @@ public void test_String() throws Exception { public void test_Date() throws Exception { Assert.assertEquals(true, - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?>?", - new Date(System.currentTimeMillis()), - new Date(System.currentTimeMillis() - 10))); + SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "?>?", + new Date(System.currentTimeMillis()), + new Date(System.currentTimeMillis() - 10))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lt.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lt.java index 0fb5c6124b..0190494217 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lt.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lt.java @@ -12,7 +12,6 @@ import com.alibaba.druid.util.JdbcConstants; public class EvalTest_lt extends TestCase { - public void test_long() throws Exception { Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? < ?", (long) 1, (byte) 2)); } @@ -51,8 +50,8 @@ public void test_String() throws Exception { public void test_Date() throws Exception { Assert.assertEquals(true, - SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? asList(2, 3))); - Assert.assertEquals(6, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? * ?", Arrays. asList(2, 3))); - Assert.assertEquals(-1, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(2, 3))); - Assert.assertEquals(2, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? / ?", Arrays. asList(6, 3))); + Assert.assertEquals(5, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(2, 3))); + Assert.assertEquals(6, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? * ?", Arrays.asList(2, 3))); + Assert.assertEquals(-1, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(2, 3))); + Assert.assertEquals(2, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? / ?", Arrays.asList(6, 3))); } - + public void test_evalExpr_3() throws Exception { Assert.assertEquals(5.0f, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", "2.0", 3)); Assert.assertEquals(6.0f, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? * ?", "2.0", 3)); @@ -39,135 +38,135 @@ public void test_evalExpr_3() throws Exception { } public void test_add() throws Exception { - Assert.assertEquals(5, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(2, 3))); - Assert.assertEquals(6, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(3, 3))); - Assert.assertEquals(7, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(4, 3))); + Assert.assertEquals(5, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(2, 3))); + Assert.assertEquals(6, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(3, 3))); + Assert.assertEquals(7, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(4, 3))); } public void test_add_1() throws Exception { - Assert.assertEquals(5.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(2.0, 3))); - Assert.assertEquals(6.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(3.0, 3))); - Assert.assertEquals(7.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(4.0, 3))); + Assert.assertEquals(5.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(2.0, 3))); + Assert.assertEquals(6.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(3.0, 3))); + Assert.assertEquals(7.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(4.0, 3))); } public void test_add_2() throws Exception { - Assert.assertEquals(5.1, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(2.1, 3))); - Assert.assertEquals(6.2, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(3.2, 3))); - Assert.assertEquals(7.3, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(4.3, 3))); + Assert.assertEquals(5.1, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(2.1, 3))); + Assert.assertEquals(6.2, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(3.2, 3))); + Assert.assertEquals(7.3, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(4.3, 3))); } public void test_add_3() throws Exception { Assert.assertEquals(5.1D, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(2.1D, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(2.1D, 3))); Assert.assertEquals(6.2D, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(3.2D, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(3.2D, 3))); Assert.assertEquals(7.3D, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(4.3D, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(4.3D, 3))); } public void test_add_4() throws Exception { - Assert.assertEquals(5.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(2, 3.0))); - Assert.assertEquals(6.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(3, 3.0))); - Assert.assertEquals(7.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays. asList(4, 3.0))); + Assert.assertEquals(5.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(2, 3.0))); + Assert.assertEquals(6.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(3, 3.0))); + Assert.assertEquals(7.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", Arrays.asList(4, 3.0))); } public void test_add_5() throws Exception { Assert.assertEquals(new BigInteger("5"), - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", - Arrays. asList(2, new BigInteger("3")))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", + Arrays.asList(2, new BigInteger("3")))); Assert.assertEquals(new BigInteger("6"), - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", - Arrays. asList(3, new BigInteger("3")))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", + Arrays.asList(3, new BigInteger("3")))); Assert.assertEquals(new BigInteger("7"), - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", - Arrays. asList(4, new BigInteger("3")))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", + Arrays.asList(4, new BigInteger("3")))); } - + public void test_add_6() throws Exception { Assert.assertEquals(new BigDecimal("5"), - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", - Arrays. asList(2, new BigDecimal("3")))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", + Arrays.asList(2, new BigDecimal("3")))); Assert.assertEquals(new BigDecimal("6"), - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", - Arrays. asList(3, new BigDecimal("3")))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", + Arrays.asList(3, new BigDecimal("3")))); Assert.assertEquals(new BigDecimal("7"), - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", - Arrays. asList(4, new BigDecimal("3")))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? + ?", + Arrays.asList(4, new BigDecimal("3")))); } public void test_sub() throws Exception { - Assert.assertEquals(-1, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(2, 3))); - Assert.assertEquals(0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(3, 3))); - Assert.assertEquals(1, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(4, 3))); + Assert.assertEquals(-1, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(2, 3))); + Assert.assertEquals(0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(3, 3))); + Assert.assertEquals(1, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(4, 3))); } public void test_sub_1() throws Exception { Assert.assertEquals(-1.0, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(2.0, 3))); - Assert.assertEquals(0.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(3.0, 3))); - Assert.assertEquals(1.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(4.0, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(2.0, 3))); + Assert.assertEquals(0.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(3.0, 3))); + Assert.assertEquals(1.0, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(4.0, 3))); } public void test_sub_2() throws Exception { Assert.assertEquals(2.1 - 3, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(2.1, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(2.1, 3))); Assert.assertEquals(3.2 - 3, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(3.2, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(3.2, 3))); Assert.assertEquals(4.3 - 3, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(4.3, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(4.3, 3))); } public void test_sub_3() throws Exception { Assert.assertEquals(2.1D - 3, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(2.1D, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(2.1D, 3))); Assert.assertEquals(3.2D - 3, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(3.2D, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(3.2D, 3))); Assert.assertEquals(4.3D - 3, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays. asList(4.3D, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? - ?", Arrays.asList(4.3D, 3))); } public void test_lt() throws Exception { - Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? < ?", Arrays. asList(2, 3))); - Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? < ?", Arrays. asList(3, 3))); - Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? < ?", Arrays. asList(4, 3))); + Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? < ?", Arrays.asList(2, 3))); + Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? < ?", Arrays.asList(3, 3))); + Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? < ?", Arrays.asList(4, 3))); } public void test_lt_1() throws Exception { Assert.assertEquals(true, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? < ?", Arrays. asList(2.0, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? < ?", Arrays.asList(2.0, 3))); Assert.assertEquals(false, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? < ?", Arrays. asList(3.0, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? < ?", Arrays.asList(3.0, 3))); Assert.assertEquals(false, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? < ?", Arrays. asList(4.0, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? < ?", Arrays.asList(4.0, 3))); } public void test_ltEq() throws Exception { - Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? <= ?", Arrays. asList(2, 3))); - Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? <= ?", Arrays. asList(3, 3))); + Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? <= ?", Arrays.asList(2, 3))); + Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? <= ?", Arrays.asList(3, 3))); Assert.assertEquals(false, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? <= ?", Arrays. asList(4, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? <= ?", Arrays.asList(4, 3))); } public void test_ltEq_1() throws Exception { Assert.assertEquals(true, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? <= ?", Arrays. asList(2.0, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? <= ?", Arrays.asList(2.0, 3))); Assert.assertEquals(true, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? <= ?", Arrays. asList(3.0, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? <= ?", Arrays.asList(3.0, 3))); Assert.assertEquals(false, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? <= ?", Arrays. asList(4.0, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? <= ?", Arrays.asList(4.0, 3))); } public void test_gt() throws Exception { - Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? > ?", Arrays. asList(2, 3))); - Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? > ?", Arrays. asList(3, 3))); - Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? > ?", Arrays. asList(4, 3))); + Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? > ?", Arrays.asList(2, 3))); + Assert.assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? > ?", Arrays.asList(3, 3))); + Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? > ?", Arrays.asList(4, 3))); } public void test_gtEq() throws Exception { Assert.assertEquals(false, - SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? >= ?", Arrays. asList(2, 3))); - Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? >= ?", Arrays. asList(3, 3))); - Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? >= ?", Arrays. asList(4, 3))); + SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? >= ?", Arrays.asList(2, 3))); + Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? >= ?", Arrays.asList(3, 3))); + Assert.assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcUtils.MYSQL, "? >= ?", Arrays.asList(4, 3))); } public void test_binary() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2ResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2ResourceTest.java index 35fc82855c..63317b4476 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2ResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2ResourceTest.java @@ -30,7 +30,6 @@ import java.util.List; public class H2ResourceTest extends TestCase { - public void test_0() throws Exception { exec_test("bvt/parser/h2-0.txt"); } @@ -97,5 +96,4 @@ void mergValidate(String sql, String expect) { Assert.assertEquals(expect, out.toString()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_AlterTableTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_AlterTableTest_0.java index 8d24ed1207..c2d5dfb0c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_AlterTableTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_AlterTableTest_0.java @@ -25,7 +25,6 @@ import java.util.List; public class H2_AlterTableTest_0 extends TestCase { - public void test_0() throws Exception { String sql = // "alter table ACT_GE_BYTEARRAY add constraint ACT_FK_BYTEARR_DEPL foreign key (DEPLOYMENT_ID_) references ACT_RE_DEPLOYMENT (ID_);"; // @@ -34,8 +33,6 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); System.out.println(stmt.toString()); - - Assert.assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_0.java index 1fb7281024..d96b8e4c40 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_0.java @@ -25,7 +25,6 @@ import java.util.List; public class H2_CreateTableTest_0 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE IF NOT EXISTS `DTS_EXECUTION_COUNTER` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `gmt_create` datetime DEFAULT NULL, `gmt_modified` datetime DEFAULT NULL, `job_id` bigint(20) DEFAULT NULL, `job_instance_id` bigint(20) DEFAULT NULL, `receive_node` varchar(255) DEFAULT NULL, `task_name` varchar(255) DEFAULT NULL, `total_counter` bigint(20), `queued_counter` bigint(20), `running_counter` bigint(20), `success_counter` bigint(20), `fail_counter` bigint(20), PRIMARY KEY (`id`) ) ; "; // @@ -34,8 +33,6 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); print(statementList); - - Assert.assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_1.java index d9583b60b1..7186f5c1c7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_1.java @@ -26,7 +26,6 @@ import java.util.List; public class H2_CreateTableTest_1 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE tutorials_tbl ( \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTriggerTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTriggerTest_0.java index fb9bd13081..c6bc632ef0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTriggerTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTriggerTest_0.java @@ -25,7 +25,6 @@ import java.util.List; public class H2_CreateTriggerTest_0 extends OracleTest { - public void test_0() throws Exception { String sql = // "create trigger employee_trigger after insert,update,delete on employee for each row call \"test.redisson.h2cluster.trigger.ClusterTrigger\"\n"; // @@ -34,8 +33,6 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); print(statementList); - - Assert.assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_DropDatabaseTest.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_DropDatabaseTest.java index fc5a8a764d..a916ccaede 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_DropDatabaseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_DropDatabaseTest.java @@ -25,7 +25,6 @@ import java.util.List; public class H2_DropDatabaseTest extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP DATABASE IF EXISTS sonar"; @@ -37,24 +36,24 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); assertEquals("DROP DATABASE IF EXISTS sonar", // - output); + output); assertTrue(stmt.isRestrict()); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Explain_0.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Explain_0.java index 714cd68864..6d967232e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Explain_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Explain_0.java @@ -25,7 +25,6 @@ import java.util.List; public class H2_Explain_0 extends OracleTest { - public void test_0() throws Exception { String sql = // "EXPLAIN SELECT * FROM TEST WHERE ID=1"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_InsertTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_InsertTest_0.java index 1d7b6f05ed..20d33f4164 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_InsertTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_InsertTest_0.java @@ -12,7 +12,6 @@ * @create 2018-08-02 */ public class H2_InsertTest_0 { - @Test public void test_insertSet() { String sql = "insert into tb1 set name='n1',age=12,date='1990-11-11 12:12:12'"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_0.java index d8fc4c7588..6e86429c69 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_0.java @@ -25,7 +25,6 @@ import java.util.List; public class H2_MergeTest_0 extends OracleTest { - public void test_0() throws Exception { String sql = // "merge into person key(id) select * from person_test"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_1.java index 7147655a9d..8d2ce0ddc7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_1.java @@ -25,7 +25,6 @@ import java.util.List; public class H2_MergeTest_1 extends OracleTest { - public void test_0() throws Exception { String sql = // "MERGE INTO CUSTOMER KEY (ID) VALUES (8, 'Loki', 32, 'Hyderabad', 3000);"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_0_limit.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_0_limit.java index ae14adc66d..ee64ba17d8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_0_limit.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_0_limit.java @@ -25,7 +25,6 @@ import java.util.List; public class H2_Select_0_limit extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT * FROM CUSTOMER LIMIT 1000;"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_for_update.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_for_update.java index 3b952acee4..1800c0ed62 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_for_update.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_for_update.java @@ -24,7 +24,6 @@ import java.util.List; public class H2_Select_1_for_update extends TestCase { - public void test_0() throws Exception { String sql = // "SELECT * FROM QRTZ_LOCKS WHERE SCHED_NAME = 'adminQuartzScheduler' AND LOCK_NAME = ? FOR UPDATE"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_nulls_first.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_nulls_first.java index 7944e5e40d..d3c5ed432c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_nulls_first.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_nulls_first.java @@ -25,7 +25,6 @@ import java.util.List; public class H2_Select_1_nulls_first extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT * FROM (SELECT ID, COUNT(*) FROM TEST\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateDatabase_0.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateDatabase_0.java index 5b2d094852..eeab5f1640 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateDatabase_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateDatabase_0.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateDatabase_0 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE DATABASE merge_data;"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_0.java index 16afffb7ec..df836f2f36 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_0.java @@ -38,7 +38,7 @@ public void test_select() throws Exception { stmt.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_1.java index 3fd79d65ac..957f4b67df 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_1.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_1 extends OracleTest { - public void test_0() throws Exception { String sql = // "create table if not EXISTS sc001.test stored as parquet as\n" + @@ -35,8 +34,6 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); print(statementList); - - Assert.assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.HIVE); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_10.java index 2b495a2237..5601a27158 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_10.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_10 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE new_key_value_store\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_11.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_11.java index 1486e50175..4e32a9441a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_11.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_11 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE empty_key_value_store\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_12.java index ab602cc8eb..587fdd364e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_12.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_12 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE page_view(viewTime INT, userid BIGINT,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_13_skew.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_13_skew.java index cb3c7cbf11..29e4b432d8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_13_skew.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_13_skew.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_13_skew extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE list_bucket_single (key STRING, value STRING)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_14_skew.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_14_skew.java index 9f1e2ec0e1..36e3ed87d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_14_skew.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_14_skew.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_14_skew extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE list_bucket_multiple (col1 STRING, col2 int, col3 STRING)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_15_pk.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_15_pk.java index 015f3219cd..1dd39637d7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_15_pk.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_15_pk.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_15_pk extends OracleTest { - public void test_0() throws Exception { String sql = // "create table pk(id1 integer, id2 integer,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_16_fk.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_16_fk.java index df40d94115..f23d002a83 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_16_fk.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_16_fk.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_16_fk extends OracleTest { - public void test_0() throws Exception { String sql = // "create table fk(id1 integer, id2 integer,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_17.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_17.java index 96b3b83529..bbabadeea0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_17.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_17 extends OracleTest { - public void test_0() throws Exception { String sql = // "create table dim_ad_sem_kw_intl(\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_18.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_18.java index 686319a243..982d4f78c8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_18.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_18 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE json_nested_test (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_19.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_19.java index 688535d7be..145e4e0b17 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_19.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_19 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE complex_array (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_2.java index 49cb376240..f8945ee848 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_2.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_2 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE pageviews (userid VARCHAR(64), link STRING, came_from STRING)\n" + @@ -35,8 +34,6 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); print(statementList); - - Assert.assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.HIVE); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_20.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_20.java index 5d70516916..f7ff2a340b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_20.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_20 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE mytable (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_21.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_21.java index 05736ae3ac..1a4e623de9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_21.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_21 extends OracleTest { - public void test_0() throws Exception { String sql = // "create table if not exists aliyun_cdm.test_903_table (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_22.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_22.java index 8994d6e678..f06c9a2369 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_22.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_22 extends OracleTest { - public void test_0() throws Exception { String sql = // "create table if not exists aliyun_cdm.test_904_table (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_23_temporary.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_23_temporary.java index 7db812ce0b..441df1dc16 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_23_temporary.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_23_temporary.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_23_temporary extends OracleTest { - public void test_0() throws Exception { String sql = // "create temporary table aliyun_cdm.test_893_table (col1 BIGINT,col2 STRING,col3 BOOLEAN,col4 DOUBLE,col5 DATETIME)\n"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_24.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_24.java index 4a64697645..e2ca80f7d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_24.java @@ -26,7 +26,6 @@ import java.util.List; public class HiveCreateTableTest_24 extends OracleTest { - public void test_0() throws Exception { String sql = // "create table aliyun_cdm.test_905_table \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_25.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_25.java index 49bfdc6e67..f17302db0a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_25.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_25 extends OracleTest { - public void test_0() throws Exception { String sql = // "create table aliyun_cdm.test_910_table(\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_26_struct.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_26_struct.java index 2ceae4dea9..092efcd260 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_26_struct.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_26_struct.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_26_struct extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE IF NOT EXISTS test_910_table (col19 STRUCT < col20:STRING COMMENT 'column19' >)"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_27.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_27.java index b5df7824e7..d2d7fdd469 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_27.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_27 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE EXTERNAL TABLE `customer_case.tradelist_csv`(\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_28_struct.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_28_struct.java index fef810fb54..88fc2134af 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_28_struct.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_28_struct.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_28_struct extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE EXTERNAL TABLE `json_table_1`(\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_29.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_29.java index 0172f198c5..30450efb24 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_29.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_29 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE dataphin_test (id STRING, name STRING) \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_3.java index 5743500bb6..14a69066ad 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_3.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_3 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE pub_ae_sess_type_dimt0_text\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_30.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_30.java index 2de5d703ad..dac0b3a2ca 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_30.java @@ -27,7 +27,6 @@ import java.util.List; public class HiveCreateTableTest_30 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE EXTERNAL TABLE `nation`(\n" + @@ -107,16 +106,17 @@ public void test_0() throws Exception { assertTrue(visitor.containsTable("nation")); } + public void test_1() throws Exception { String sql = // "CREATE EXTERNAL TABLE nation_test " - + "( n_nationkey INT NOT NULL COMMENT 'xxx', " - + "n_name STRING NULL COMMENT 'yyy', " - + "n_regionkey INT NULL COMMENT 'zzz', " - + "n_comment STRING NULL COMMENT 'hhh', " - + "PRIMARY KEY (n_nationkey)) " - + "TBLPROPERTIES ( TABLE_MAPPING = 'nation', COLUMN_MAPPING = 'n_nationkey,N_NATIONKEY; n_name,N_NAME;n_regionkey,N_REGIONKEY; n_comment,N_COMMENT; ' ) " - + "COMMENT '萌豆'"; // + + "( n_nationkey INT NOT NULL COMMENT 'xxx', " + + "n_name STRING NULL COMMENT 'yyy', " + + "n_regionkey INT NULL COMMENT 'zzz', " + + "n_comment STRING NULL COMMENT 'hhh', " + + "PRIMARY KEY (n_nationkey)) " + + "TBLPROPERTIES ( TABLE_MAPPING = 'nation', COLUMN_MAPPING = 'n_nationkey,N_NATIONKEY; n_name,N_NAME;n_regionkey,N_REGIONKEY; n_comment,N_COMMENT; ' ) " + + "COMMENT '萌豆'"; // List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -131,28 +131,29 @@ public void test_1() throws Exception { String text = SQLUtils.toSQLString(stmt, JdbcConstants.HIVE); assertEquals("CREATE EXTERNAL TABLE nation_test (\n" + "\tn_nationkey INT NOT NULL COMMENT 'xxx',\n" - + "\tn_name STRING NULL COMMENT 'yyy',\n" + "\tn_regionkey INT NULL COMMENT 'zzz',\n" - + "\tn_comment STRING NULL COMMENT 'hhh',\n" + "\tPRIMARY KEY (n_nationkey)\n" + ")\n" - + "COMMENT '萌豆'\n" + "TBLPROPERTIES (\n" + "\t'TABLE_MAPPING' = 'nation',\n" - + "\t'COLUMN_MAPPING' = 'n_nationkey,N_NATIONKEY; n_name,N_NAME;n_regionkey,N_REGIONKEY; n_comment,N_COMMENT; '\n" - + ")", text); + + "\tn_name STRING NULL COMMENT 'yyy',\n" + "\tn_regionkey INT NULL COMMENT 'zzz',\n" + + "\tn_comment STRING NULL COMMENT 'hhh',\n" + "\tPRIMARY KEY (n_nationkey)\n" + ")\n" + + "COMMENT '萌豆'\n" + "TBLPROPERTIES (\n" + "\t'TABLE_MAPPING' = 'nation',\n" + + "\t'COLUMN_MAPPING' = 'n_nationkey,N_NATIONKEY; n_name,N_NAME;n_regionkey,N_REGIONKEY; n_comment,N_COMMENT; '\n" + + ")", text); } } + public void test_2() throws Exception { String sql = // "CREATE EXTERNAL TABLE `tpch_100m_text`.`nation_line_terminated` (\n" - + " `n_nationkey` int,\n" - + " `n_name` string,\n" - + " `n_regionkey` int,\n" - + " `n_comment` string\n" - + ")\n" - + "ROW FORMAT DELIMITED\n" - + " FIELDS TERMINATED BY '|' \n" - + " ESCAPED BY '\\\\' \n" - + " LINES TERMINATED BY ';' \n" - + "STORED AS `TEXTFILE`\n" - + "LOCATION 'oss://oss-cn-beijing-for-openanalytics/datasets/tpch/0_1x/text/nation_line_terminated/'"; // + + " `n_nationkey` int,\n" + + " `n_name` string,\n" + + " `n_regionkey` int,\n" + + " `n_comment` string\n" + + ")\n" + + "ROW FORMAT DELIMITED\n" + + " FIELDS TERMINATED BY '|' \n" + + " ESCAPED BY '\\\\' \n" + + " LINES TERMINATED BY ';' \n" + + "STORED AS `TEXTFILE`\n" + + "LOCATION 'oss://oss-cn-beijing-for-openanalytics/datasets/tpch/0_1x/text/nation_line_terminated/'"; // List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -161,38 +162,40 @@ public void test_2() throws Exception { String text = SQLUtils.toSQLString(stmt, JdbcConstants.HIVE); assertEquals("CREATE EXTERNAL TABLE `tpch_100m_text`.`nation_line_terminated` (\n" - + "\t`n_nationkey` int,\n" + "\t`n_name` string,\n" + "\t`n_regionkey` int,\n" - + "\t`n_comment` string\n" + ")\n" + "ROW FORMAT DELIMITED\n" + "\tFIELDS TERMINATED BY '|'\n" - + "\tESCAPED BY '\\\\'\n" + "\tLINES TERMINATED BY ';'\n" + "STORED AS `TEXTFILE`\n" - + "LOCATION 'oss://oss-cn-beijing-for-openanalytics/datasets/tpch/0_1x/text/nation_line_terminated/'", text); + + "\t`n_nationkey` int,\n" + "\t`n_name` string,\n" + "\t`n_regionkey` int,\n" + + "\t`n_comment` string\n" + ")\n" + "ROW FORMAT DELIMITED\n" + "\tFIELDS TERMINATED BY '|'\n" + + "\tESCAPED BY '\\\\'\n" + "\tLINES TERMINATED BY ';'\n" + "STORED AS `TEXTFILE`\n" + + "LOCATION 'oss://oss-cn-beijing-for-openanalytics/datasets/tpch/0_1x/text/nation_line_terminated/'", text); } } + public void test_3() throws Exception { String sql = "-- 234234\ncreate table a(id varchar)"; SQLStatement statement = SQLUtils.parseSingleStatement(sql, DbType.hive, SQLParserFeature.KeepComments); assertEquals("-- 234234\n" + "CREATE TABLE a (\n" + "\tid varchar\n" + ")", - SQLUtils.toSQLString(statement, JdbcConstants.HIVE)); + SQLUtils.toSQLString(statement, JdbcConstants.HIVE)); } + public void test_4() throws Exception { String sql = "alter table partition_text_nation add partition (p=101,q) location 'oss://oss-cn-beijing-for-openanalytics-test/datasets/test/test_partition/text_table/part101/';"; SQLStatement statement = SQLUtils.parseSingleStatement(sql, DbType.hive, SQLParserFeature.KeepComments); assertEquals("ALTER TABLE partition_text_nation\n" - + "\tADD PARTITION (p = 101, q) LOCATION 'oss://oss-cn-beijing-for-openanalytics-test/datasets/test/test_partition/text_table/part101/';", - SQLUtils.toSQLString(statement, JdbcConstants.HIVE)); + + "\tADD PARTITION (p = 101, q) LOCATION 'oss://oss-cn-beijing-for-openanalytics-test/datasets/test/test_partition/text_table/part101/';", + SQLUtils.toSQLString(statement, JdbcConstants.HIVE)); } + public void test_5() throws Exception { String sql = "alter table partition_text_nation add partition (p, q=101) location 'oss://oss-cn-beijing-for-openanalytics-test/datasets/test/test_partition/text_table/part101/';"; SQLStatement statement = SQLUtils.parseSingleStatement(sql, DbType.hive, SQLParserFeature.KeepComments); assertEquals("ALTER TABLE partition_text_nation\n" - + "\tADD PARTITION (p, q = 101) LOCATION 'oss://oss-cn-beijing-for-openanalytics-test/datasets/test/test_partition/text_table/part101/';", - SQLUtils.toSQLString(statement, JdbcConstants.HIVE)); - + + "\tADD PARTITION (p, q = 101) LOCATION 'oss://oss-cn-beijing-for-openanalytics-test/datasets/test/test_partition/text_table/part101/';", + SQLUtils.toSQLString(statement, JdbcConstants.HIVE)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_31_mappedBy_for_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_31_mappedBy_for_dla.java index 4b2a05ae7e..99caf9e0f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_31_mappedBy_for_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_31_mappedBy_for_dla.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_31_mappedBy_for_dla extends OracleTest { - public void test_0() throws Exception { String sql = // "create table aaaa (\n" + @@ -67,5 +66,4 @@ public void test_0() throws Exception { } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_32_properties.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_32_properties.java index d6b24cf560..002bacbb0b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_32_properties.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_32_properties.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_32_properties extends OracleTest { - public void test_0() throws Exception { String sql = // "create table aaaa (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_33_struct.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_33_struct.java index c6893f14e5..63650dec70 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_33_struct.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_33_struct.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_33_struct extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE EXTERNAL TABLE user_snp_test_4 (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_34.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_34.java index 6dbc00ddf7..f50f8abbe1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_34.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_34 extends OracleTest { - public void test_0() throws Exception { String sql = "-- abc\n" + "CREATE DATABASE `ddl_json_string` WITH DBPROPERTIES (LOCATION = 'oss://oss-cn-hangzhou-for-openanalytics/datasets/tpch/1x/json_string/', catalog = 'oss');"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_35_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_35_dla.java index ea01d34cae..7984347379 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_35_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_35_dla.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_35_dla extends OracleTest { - public void test_0() throws Exception { String sql = "create table dla_table1 like dla_table2;"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_36_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_36_dla.java index bf597d1b41..d2e8932278 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_36_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_36_dla.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_36_dla extends OracleTest { - public void test_0() throws Exception { String sql = "create table dla_table1 like dla_table2 tblproperties (\n" + "\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_37_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_37_dla.java index 1d8237471b..4a83668bbf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_37_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_37_dla.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_37_dla extends OracleTest { - public void test_0() throws Exception { String sql = "create table dla_table1 like mapping('mysql_table1');"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_38_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_38_dla.java index 401b5a6922..4fb87012c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_38_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_38_dla.java @@ -27,9 +27,8 @@ import java.util.List; public class HiveCreateTableTest_38_dla extends OracleTest { - public void test_0() throws Exception { - String sql = "-- {\"n_nationkey\":0,\"n_name\":\"ALGERIA\",\"n_regionkey\":0,\"n_comment\":\" haggle. carefully final deposits detect slyly agai\"}\n\nCREATE SCHEMA ddl_json_string with DBPROPERTIES(LOCATION = 'oss://oss-cn-hangzhou-for-openanalytics/datasets/tpch/1x/json_string/' ,catalog = 'oss');\nCREATE EXTERNAL TABLE ddl_json_string.nation_json(n_comment string, n_name string, n_nationkey int, n_regionkey int, ) STORED AS JSON LOCATION 'oss://oss-cn-hangzhou-for-openanalytics/datasets/tpch/1x/json_string/nation_json/' TBLPROPERTIES ( \n'skip.header.line.count'='0',\n'recursive.directories'='false');"; + String sql = "-- {\"n_nationkey\":0,\"n_name\":\"ALGERIA\",\"n_regionkey\":0,\"n_comment\":\" haggle. carefully final deposits detect slyly agai\"}\n\nCREATE SCHEMA ddl_json_string with DBPROPERTIES(LOCATION = 'oss://oss-cn-hangzhou-for-openanalytics/datasets/tpch/1x/json_string/' ,catalog = 'oss');\nCREATE EXTERNAL TABLE ddl_json_string.nation_json(n_comment string, n_name string, n_nationkey int, n_regionkey int, ) STORED AS JSON LOCATION 'oss://oss-cn-hangzhou-for-openanalytics/datasets/tpch/1x/json_string/nation_json/' TBLPROPERTIES ( \n'skip.header.line.count'='0',\n'recursive.directories'='false');"; List statementList = SQLUtils.parseStatements(sql, DbType.hive, SQLParserFeature.KeepComments); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_39_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_39_dla.java index 44ac36697d..12740fd164 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_39_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_39_dla.java @@ -25,9 +25,8 @@ import java.util.List; public class HiveCreateTableTest_39_dla extends OracleTest { - public void test_0() throws Exception { - String sql = "--\n-- Sample on record\n-- {\"c_custkey\":1,\"c_name\":\"Customer#000000001\",\"c_address\":\"IVhzIApeRb ot,c,E\",\"c_nationkey\":15,\"c_phone\":\"25-989-741-2988\",\"c_acctbal\":711.56,\"c_mktsegment\":\"BUILDING\",\"c_comment\":\"to theeven, regular platelets. regular, ironic epitaphs nag e\"}\n\nCREATE EXTERNAL TABLE IF NOT EXISTS `mengdou_test`.`ddl_customer_json`(`c_acctbal` double, `c_address` string, `c_comment` string, `c_custkey` int, `c_mktsegment` string, `c_name` string, `c_nationkey` int, `c_phone` string, ) STORED AS JSON LOCATION 'oss://oss-cn-shanghai-for-openanalytics/datasets/tpch/0.01x/json_date/customer_json/' TBLPROPERTIES ( \n'skip.header.line.count'='0',\n'recursive.directories'='false');"; + String sql = "--\n-- Sample on record\n-- {\"c_custkey\":1,\"c_name\":\"Customer#000000001\",\"c_address\":\"IVhzIApeRb ot,c,E\",\"c_nationkey\":15,\"c_phone\":\"25-989-741-2988\",\"c_acctbal\":711.56,\"c_mktsegment\":\"BUILDING\",\"c_comment\":\"to theeven, regular platelets. regular, ironic epitaphs nag e\"}\n\nCREATE EXTERNAL TABLE IF NOT EXISTS `mengdou_test`.`ddl_customer_json`(`c_acctbal` double, `c_address` string, `c_comment` string, `c_custkey` int, `c_mktsegment` string, `c_name` string, `c_nationkey` int, `c_phone` string, ) STORED AS JSON LOCATION 'oss://oss-cn-shanghai-for-openanalytics/datasets/tpch/0.01x/json_date/customer_json/' TBLPROPERTIES ( \n'skip.header.line.count'='0',\n'recursive.directories'='false');"; List statementList = SQLUtils.parseStatements(sql, DbType.hive, SQLParserFeature.KeepComments); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_4.java index 55dd10bf18..2439c232f1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_4.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_4 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE merge_data.transactions(\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_40_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_40_dla.java index 1b7f56f379..db4de3abb8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_40_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_40_dla.java @@ -25,9 +25,8 @@ import java.util.List; public class HiveCreateTableTest_40_dla extends OracleTest { - public void test_0() throws Exception { - String sql = "CREATE EXTERNAL TABLE IF NOT EXISTS `customer_case`.`shangjian_6e958954-f2c7-11e8-94b7-0c54159e4818.json.snappy` (\n" + + String sql = "CREATE EXTERNAL TABLE IF NOT EXISTS `customer_case`.`shangjian_6e958954-f2c7-11e8-94b7-0c54159e4818.json.snappy` (\n" + " `batch_date` string,\n" + " `data` STRUCT<`goods_name`:STRING, `thumb_url`:STRING, `country`:STRING, `is_app`:INT, `sales_tip`:STRING, `image_url`:STRING, `cnt`:INT, `goods_id`:BIGINT, `hd_thumb_url`:STRING, `is_use_promotion`:INT, `event_type`:INT, `normal_price`:INT, `market_price`:INT, `short_name`:STRING, group:STRUCT<`price`:INT, `customer_num`:INT>>,\n" + " `goods_id` bigint,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_41.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_41.java index be6f54a60e..c39dc32046 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_41.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_41.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_41 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE TABLE IF NOT EXISTS default.create_test (id int COMMENT '学号', name string COMMENT '姓名');"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_42.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_42.java index 61d437276b..1344e9ae36 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_42.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_42.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_42 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE TABLE IF NOT EXISTS default.create_test (id int COMMENT '学号', name string COMMENT '姓名')ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' WITH SERDEPROPERTIES(\"serialization.encoding\"='gbk');"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43.java index 3cf3cad416..352de646c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_43 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE EXTERNAL TABLE tbl2_copy STORED AS PARQUET LOCATION 'oss://oss-cn-beijing-for-openanalytics-test-2/datasets/jinluo/tbl1_copy/' TBLPROPERTIES ('auto.create.location' = 'true')" + " like SELECT * FROM tbl1;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43_dla.java index 1b38f25f0f..4f55c24df2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43_dla.java @@ -24,9 +24,8 @@ import java.util.List; public class HiveCreateTableTest_43_dla extends OracleTest { - public void test_0() throws Exception { - String sql = "CREATE EXTERNAL TABLE special_char1(\n" + + String sql = "CREATE EXTERNAL TABLE special_char1(\n" + " data_time_str string,\n" + " entity_id string,\n" + " thread string,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_44.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_44.java index ff1aa26601..4a12655b38 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_44.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_44.java @@ -24,7 +24,6 @@ import java.util.List; public class HiveCreateTableTest_44 extends OracleTest { - public void test_0() throws Exception { String sql = "--\n-- Sample on record\n" + "-- {\"bid\":\"360\",\"request_id\":\"12c6b4b7c7d590fc\",\"hour\":\"2018121315\",\"time\":\"1544684400\",\"tagid\":\"2256906\",\"plan_id\":\"636102\",\"sid\":\"288\",\"creative_id\":\"198\",\"cookie_id\":\"7af422884e2fab197c9dfd068181ac0d\",\"ip\":\"117.136.89.121\",\"price\":\"0.2800\",\"bid_price\":\"0.1400\",\"user_agent\":\"Dalvik/2.1.0 (Linux; U; Android 6.0.1; OPPO A57 Build/MMB29M)\",\"refer\":\"\"}\n\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_45_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_45_dla.java index e520ff6fa6..f53ed7bf42 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_45_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_45_dla.java @@ -24,7 +24,6 @@ import java.util.List; public class HiveCreateTableTest_45_dla extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE EXTERNAL TABLE IF NOT EXISTS `bfbf8508d0a59644fe2003c7506f3676`.`device_group_relation` ( `device_name` VARCHAR NOT NULL COMMENT 'name,?meta device??', `gmt_create` TIMESTAMP NOT NULL COMMENT '????', `gmt_modified` TIMESTAMP NOT NULL COMMENT '????', `group_id` VARCHAR NOT NULL COMMENT 'group id', `group_relation_status` VARCHAR NOT NULL COMMENT 'inital 0, 1 isDeleted', `group_type` VARCHAR NOT NULL COMMENT 'group type, \"ISOLATION\", \"\"', `id` BIGINT NOT NULL COMMENT '??', `iot_id` VARCHAR NOT NULL COMMENT 'iot_id', `product_key` VARCHAR NOT NULL COMMENT 'product key', `tenant_id` VARCHAR NULL COMMENT 'rbac tenant_id' ) TBLPROPERTIES ( 'TABLE_MAPPING' = `device_group_relation` )\n"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_46_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_46_dla.java index 8e38c1665a..17102cc3ee 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_46_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_46_dla.java @@ -22,11 +22,10 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; public class HiveCreateTableTest_46_dla extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE EXTERNAL TABLE parquet_tbl LIKE MAPPING('oss://user/etl/destination/datafile1.dat')" + - " TBLPROPERTIES('target.table.location'='oss://user/etl/destination/')" ; - SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.hive, SQLParserFeature.KeepComments); + " TBLPROPERTIES('target.table.location'='oss://user/etl/destination/')"; + SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.hive, SQLParserFeature.KeepComments); assertEquals("CREATE EXTERNAL TABLE parquet_tbl\n" + "LIKE MAPPING('oss://user/etl/destination/datafile1.dat')\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_47_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_47_dla.java index 54e973345d..8b338f19a1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_47_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_47_dla.java @@ -23,7 +23,6 @@ public class HiveCreateTableTest_47_dla extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE external TABLE IF NOT EXISTS dwd_tfc_bas_rdnet_inter_info (\n" + "inter_id varchar(225) NOT NULL COMMENT ' 路口id ',\n" + @@ -42,8 +41,8 @@ public void test_0() throws Exception { "adcode varchar(225) NOT NULL COMMENT ' 所属城市代码，标准6位数字代码 ',\n" + "PRIMARY KEY (`inter_id`, `data_version`, `adcode`),\n" + "KEY `index_id` (`inter_id`)\n" + - ") ENGINE = innodb CHARSET = utf8 COMMENT '路口基本信息';" ; - SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.hive, SQLParserFeature.KeepComments); + ") ENGINE = innodb CHARSET = utf8 COMMENT '路口基本信息';"; + SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.hive, SQLParserFeature.KeepComments); assertEquals("CREATE EXTERNAL TABLE IF NOT EXISTS dwd_tfc_bas_rdnet_inter_info (\n" + "\tinter_id varchar(225) NOT NULL COMMENT ' 路口id ',\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_49_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_49_dla.java index a1781799b6..0db54821c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_49_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_49_dla.java @@ -23,15 +23,14 @@ public class HiveCreateTableTest_49_dla extends OracleTest { - public void test_0() throws Exception { String sql = "create external table `dla_result`.`sgm_add`\n" + "STORED AS parquet \n" + "LOCATION \n" + "'oss://aliyun-oa-query-results-1408722774623865-oss-cn-zhangjiakou/DLA_Result/sgm_add/'\n" + "TBLPROPERTIES ('auto.create.location' = 'true') like select pure_date,(substr(regexp_extract(fld11, '\"sgm_add\":\"?([^\"}]*)', 1), 1, 10)) AS sgm_add from \n" + - "log_push_1912 where pure_date = 20191120" ; - SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.hive, SQLParserFeature.KeepComments); + "log_push_1912 where pure_date = 20191120"; + SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.hive, SQLParserFeature.KeepComments); SQLStatement clone = stmt.clone(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_5.java index 5bb3f76a55..a01df1755f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_5.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_5 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE user_info_bucketed(user_id BIGINT, firstname STRING, lastname STRING)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_6.java index b1068c5a4e..1a5b34d8dd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_6.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_6 extends OracleTest { - public void test_0() throws Exception { String sql = // "create table table_name (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_7.java index 68dafb2f07..a03cf0725b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_7.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_7 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE page_view(viewTime INT, userid BIGINT,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_8.java index 6e2f917147..4cb46abb02 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_8.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_8 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE page_view(viewTime INT, userid BIGINT,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_9.java index 60a136b5f0..3c3f65cbc9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_9.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveCreateTableTest_9 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE EXTERNAL TABLE page_view(viewTime INT, userid BIGINT,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_0.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_0.java index 3355b0842e..b0db2e8010 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_0.java @@ -27,7 +27,6 @@ public void test_select() throws Exception { assertEquals("insert into table students\n" + "values ('fred flintstone', 35, 1.28), ('barney rubble', 32, 2.32);", SQLUtils.formatHive(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_1.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_1.java index d7b2227dfa..4262dc3d27 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_1.java @@ -32,7 +32,6 @@ public void test_select() throws Exception { "select pvs.viewTime, pvs.userid, pvs.page_url, pvs.referrer_url, null\n" + "\t, null, pvs.ip, pvs.cnt", SQLUtils.formatHive(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_3.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_3.java index eb05634f73..e8b6124628 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_3.java @@ -36,13 +36,10 @@ public void test_select() throws Exception { "insert overwrite table sale_detail_multi partition (sale_date='2010', region='china')\n" + "select shop_name, customer_id, total_price;", SQLUtils.formatHive(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); - System.out.println("coditions : " + visitor.getConditions()); - System.out.println("orderBy : " + visitor.getOrderByColumns()); - - + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(2, visitor.getTables().size()); assertEquals(5, visitor.getColumns().size()); @@ -54,6 +51,5 @@ public void test_select() throws Exception { assertTrue(visitor.containsColumn("sale_detail", "customer_id")); assertTrue(visitor.containsColumn("sale_detail", "total_price")); - } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java index ee6edeecb0..97f0852a16 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java @@ -31,7 +31,6 @@ import java.util.List; public class HiveResourceTest extends TestCase { - public void test_0() throws Exception { exec_test("bvt/parser/hive-0.txt"); } @@ -87,7 +86,7 @@ public void exec_test(String resource) throws Exception { String[] items = input.split("---------------------------"); String sql = items[0].trim(); String expect = null; - + if (items.length > 1) { expect = items[1].trim(); if (expect != null) { @@ -118,6 +117,4 @@ public void exec_test(String resource) throws Exception { System.out.println(SQLUtils.toHiveString(stmt)); } - - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_13_cluster_by.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_13_cluster_by.java index 1f906112dc..2a1fe782bd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_13_cluster_by.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_13_cluster_by.java @@ -27,9 +27,7 @@ public class HiveSelectTest_13_cluster_by extends TestCase { - - public void test_0() throws Exception - { + public void test_0() throws Exception { String sql = "select buyer_id,seller_id ,order_id,div_pay_amt,t1.dim_seller.member_id,t1.dim_buyer.member_id from LD_aly.fct_pay_ord_cn_di t1 cluster by buyer_id,seller_id \n"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_lateralview.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_lateralview.java index 5b2ba7058f..2b87b019b5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_lateralview.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_lateralview.java @@ -28,7 +28,7 @@ public void test_select() throws Exception { stmt.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_true.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_true.java index 6e04b42bef..145de6093f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_true.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_true.java @@ -32,7 +32,6 @@ public void test_select() throws Exception { SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.HIVE); stmt.accept(visitor); - // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_3_array.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_3_array.java index e499770ae3..6174ac6629 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_3_array.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_3_array.java @@ -10,8 +10,7 @@ public class HiveSelectTest_3_array extends TestCase { - public void test_select() throws Exception - { + public void test_select() throws Exception { String sql = "select languages[0] from json_nested_test;";// assertEquals("SELECT languages[0]\n" + "FROM json_nested_test;", SQLUtils.formatHive(sql)); @@ -26,9 +25,8 @@ public void test_select() throws Exception SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.HIVE); stmt.accept(visitor); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_41.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_41.java index a2c91a11f9..88976fac5c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_41.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_41.java @@ -25,7 +25,6 @@ import java.util.List; public class HiveSelectTest_41 extends TestCase { - public void test_0() throws Exception { String sql = "select\n" + "field['id'].string_type as banner_id\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_42_cte.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_42_cte.java index e2b9cac0fe..571e8de359 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_42_cte.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_42_cte.java @@ -24,7 +24,6 @@ import java.util.List; public class HiveSelectTest_42_cte extends TestCase { - public void test_0() throws Exception { String sql = "with dycg_perform_startgametaketimelog as(\n" + "select app_id, if(ver is null, '', ver) as ver, if(machine_name is null, '', split(machine_name, '-') [0]) as machine_dc, game_id, current_step, err_code\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_43_bug.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_43_bug.java index b2309b3a0c..386210dc5b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_43_bug.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_43_bug.java @@ -24,7 +24,6 @@ import java.util.List; public class HiveSelectTest_43_bug extends TestCase { - public void test_0() throws Exception { String sql = "from (select a.ddate\n" + " ,a.game_id\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_44_issue_3973.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_44_issue_3973.java index 09b97982e2..9b1592d8ed 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_44_issue_3973.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_44_issue_3973.java @@ -24,12 +24,11 @@ import java.util.List; public class HiveSelectTest_44_issue_3973 extends TestCase { - public void test_0() throws Exception { String sql = "WITH t AS (SELECT * FROM t1 ) INSERT OVERWRITE TABLE t2 SELECT * FROM t;"; List statementList = SQLUtils.parseStatements(sql, DbType.hive); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals("WITH t AS (\n" + "\t\tSELECT *\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_45_issue_3987.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_45_issue_3987.java index 7c4499f8ab..a5ee16fb80 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_45_issue_3987.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_45_issue_3987.java @@ -23,13 +23,12 @@ import java.util.List; public class HiveSelectTest_45_issue_3987 extends TestCase { - public void test_0() throws Exception { String sql = "select id,number_id,parent_id,layer_id,alias,name \n" + "from (select id,number_id,parent_id,layer_id,alias,name,row_number() over(distribute by number_id sort by create_time desc,id desc) rownum from hdw_ods.ods_my_coredata__dts_device_category where pdate ='') m where m.rownum = 1"; List statementList = SQLUtils.parseStatements(sql, DbType.hive); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals("SELECT id, number_id, parent_id, layer_id, alias\n" + "\t, name\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_47.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_47.java index 330c0ecc5c..83ab4f4245 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_47.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_47.java @@ -118,7 +118,6 @@ public class HiveSelectTest_47 extends TestCase { ";"; public void test_select() throws Exception { - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); @@ -128,9 +127,9 @@ public void test_select() throws Exception { stmt.accept(visitor); System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); - System.out.println("coditions : " + visitor.getConditions()); - System.out.println("orderBy : " + visitor.getOrderByColumns()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); // // assertEquals(1, visitor.getTables().size()); // assertEquals(2, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_48.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_48.java index f8f8d52e87..9f289167b7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_48.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_48.java @@ -12,8 +12,6 @@ import java.util.List; public class HiveSelectTest_48 extends TestCase { - - public void test_select() throws Exception { String sql = "SELECT account_id FROM taobao_office.cloud_yunpan WHERE dt='2021-04-12' AND target='update'"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_4_array.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_4_array.java index 6745eec901..88ec662412 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_4_array.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_4_array.java @@ -10,8 +10,7 @@ public class HiveSelectTest_4_array extends TestCase { - public void test_select() throws Exception - { + public void test_select() throws Exception { String sql = "select religions['catholic'][0] from json_nested_test;";// assertEquals("SELECT religions['catholic'][0]\n" + "FROM json_nested_test;", SQLUtils.formatHive(sql)); @@ -26,9 +25,8 @@ public void test_select() throws Exception SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.HIVE); stmt.accept(visitor); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_cluster_by.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_cluster_by.java index 33baf3ff45..d0cc754f04 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_cluster_by.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_cluster_by.java @@ -25,9 +25,7 @@ public class HiveSelectTest_cluster_by extends TestCase { - - public void test_0() throws Exception - { + public void test_0() throws Exception { String sql = "SELECT a from x cluster by a;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_distribute.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_distribute.java index 67074f0bc9..166e7c8a5e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_distribute.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_distribute.java @@ -25,9 +25,7 @@ public class HiveSelectTest_distribute extends TestCase { - - public void test_0() throws Exception - { + public void test_0() throws Exception { String sql = "select * from LD_aly.fct_pay_ord_cn_di t1 distribute by buyer_id sort by seller_id"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/informix/InformixSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/informix/InformixSelectTest.java index 71208b01c7..e6fff74c6f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/informix/InformixSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/informix/InformixSelectTest.java @@ -27,7 +27,6 @@ import java.util.List; public class InformixSelectTest extends TestCase { - public void test_0() throws Exception { String sql = "select skip 500 first 500 * from pub_menu "; @@ -36,7 +35,7 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT SKIP 500 FIRST 500 *\n" + "FROM pub_menu", SQLUtils.toSQLString(stmt, JdbcConstants.INFORMIX)); - + Assert.assertEquals("select skip 500 first 500 *\n" + "from pub_menu", SQLUtils.toSQLString(stmt, JdbcConstants.INFORMIX, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/AdsDumpTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/AdsDumpTest_0.java index 351ec5c4ba..72684b1570 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/AdsDumpTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/AdsDumpTest_0.java @@ -9,12 +9,11 @@ import java.util.List; public class AdsDumpTest_0 extends TestCase { - public void test_0() throws Exception { String sql = "/*+dump-merge=true*/DUMP DATA SELECT amp.buyer_add_cart_info.buyer_id,amp.buyer_add_cart_info.pre_score,amp.buyer_add_cart_info.cart_price FROM amp.buyer_add_cart_info JOIN amp.crm_user_base_info ON amp.crm_user_base_info.user_id = amp.buyer_add_cart_info.buyer_id where (((amp.buyer_add_cart_info.seller_id=1921906956)) AND ((amp.buyer_add_cart_info.auction_id=562769960283)) AND ((amp.buyer_add_cart_info.show_price>=13300))) LIMIT 144800 "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLDumpStatement stmt = (SQLDumpStatement)statementList.get(0); + SQLDumpStatement stmt = (SQLDumpStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java index 91e576de80..31bf5ac5ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class ArithmeticOperatorsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT 3+5;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java index 419dda7fee..e9d622d5e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class AssignmentOperatorsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT @var1, @var2;"; 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 9ae9162149..22b4e9a22e 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 @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; public class Binlog_Test extends TestCase { - public void test_0() throws Exception { String sql = "RESET MASTER, QUERY CACHE, SLAVE"; @@ -37,7 +36,6 @@ public void test_0() throws Exception { Assert.assertEquals("RESET MASTER, QUERY CACHE, SLAVE;", text); } - private String output(List stmtList) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java index 2919f711df..51fd74e6a5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class BitFunctionsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT 29 | 15"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java index f4147e5f9b..76bde3fd15 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class BooleanValuesTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT TRUE, true, FALSE, false;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java index 9adaa779dd..3c2ff685a3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java @@ -29,7 +29,6 @@ import junit.framework.TestCase; public class CALL_Test extends TestCase { - public void test_0() throws Exception { String sql = "CALL p(@version, @increment);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java index 688e20d1d4..77a4b2360b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class CastFunctionsAndOperatorsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT 'a' = 'A'"; @@ -82,7 +81,7 @@ public void test_4() throws Exception { String text = output(stmtList); assertEquals("SELECT 'A' LIKE CONVERT(blob_col USING latin1) COLLATE latin1_german1_ci\nFROM tbl_name;", - text); + text); } public void test_5() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CobarHintsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CobarHintsTest.java index 20e7b70ca7..7c4d9c5484 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CobarHintsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CobarHintsTest.java @@ -23,30 +23,30 @@ import junit.framework.TestCase; public class CobarHintsTest extends TestCase { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "/*!cobar: select,4,ireport.dm_mdm_mem_prod_noeff_sdt0.admin_member_seq=45654723*/ " + - "select product_id, noeff_days,total_cnt from (" + - "select product_id," + - " noeff_days," + - " count(*) over() as total_cnt " + - " from ( " + - " select product_id," + - " noeff_days " + - " from ireport.dm_mdm_mem_prod_noeff_sdt0" + - " where admin_member_seq = 45654723" + - ") b Order by product_id desc ) a limit 25 offset (1-1)*20"; + "select product_id, noeff_days,total_cnt from (" + + "select product_id," + + " noeff_days," + + " count(*) over() as total_cnt " + + " from ( " + + " select product_id," + + " noeff_days " + + " from ireport.dm_mdm_mem_prod_noeff_sdt0" + + " where admin_member_seq = 45654723" + + ") b Order by product_id desc ) a limit 25 offset (1-1)*20"; String mergedSql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.POSTGRESQL); - Assert.assertEquals("SELECT product_id, noeff_days, total_cnt\n" + - "FROM (\n" + - "\t(SELECT product_id, noeff_days, count(*) OVER () AS total_cnt\n" + - "\tFROM (\n" + - "\t\t(SELECT product_id, noeff_days\n" + - "\t\tFROM ireport.dm_mdm_mem_prod_noeff_sdt0\n" + - "\t\tWHERE admin_member_seq = ?)\n" + - "\t) b\n" + - "\tORDER BY product_id DESC)\n" + - ") a\n" + - "LIMIT ? OFFSET (? - ?) * ?", mergedSql); + Assert.assertEquals("SELECT product_id, noeff_days, total_cnt\n" + + "FROM (\n" + + "\t(SELECT product_id, noeff_days, count(*) OVER () AS total_cnt\n" + + "\tFROM (\n" + + "\t\t(SELECT product_id, noeff_days\n" + + "\t\tFROM ireport.dm_mdm_mem_prod_noeff_sdt0\n" + + "\t\tWHERE admin_member_seq = ?)\n" + + "\t) b\n" + + "\tORDER BY product_id DESC)\n" + + ") a\n" + + "LIMIT ? OFFSET (? - ?) * ?", mergedSql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java index 4e8efa0528..ef26a1b159 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class CommitTest extends MysqlTest { - public void test_0() throws Exception { String sql = "COMMIT;"; @@ -45,5 +44,5 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().size() == 0); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java index 5f512e40cd..412e8a2de5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class ComparisonFunctionsAndOperatorsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT 1 = 0;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java index 3b1dfe0ae5..f979847047 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class ControlFlowFunctionsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT CASE 1 WHEN 1 THEN 'one' WHEN 2 THEN 'two' ELSE 'more' END;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java index 17587a1407..c473f2eabf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class CreateUserTest extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';"; @@ -45,5 +44,5 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().size() == 0); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java index a2c7cfb273..25cda25c71 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class DateAndTimeFunctionsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT something FROM tbl_name WHERE DATE_SUB(CURDATE(),INTERVAL 30 DAY) <= date_col"; @@ -38,7 +37,7 @@ public void test_0() throws Exception { String text = output(stmtList); Assert.assertEquals("SELECT something\nFROM tbl_name\nWHERE DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date_col", - text); + text); } public void test_1() throws Exception { @@ -623,8 +622,8 @@ public void test_53() throws Exception { Assert.assertEquals("SELECT YEARWEEK('1987-01-01');", text); } - - + + public void test_54() throws Exception { String sql = "SELECT t.c1, DATE_ADD('2008-01-02', INTERVAL +t.c1 DAY) from t"; @@ -635,7 +634,7 @@ public void test_54() throws Exception { Assert.assertEquals("SELECT t.c1, DATE_ADD('2008-01-02', INTERVAL +t.c1 DAY)\nFROM t", text); } - + public void test_55() throws Exception { String sql = "SELECT t.c1, DATE_ADD('2008-01-02', INTERVAL -t.c1 DAY) from t"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java index 3ab4e5b69b..aa6d1a77b0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class DateAndTimeValuesTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT '2008-12-31 23:59:59' + INTERVAL 1 SECOND;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java index 3e487e485c..6ff72de919 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java @@ -25,7 +25,6 @@ import java.util.List; public class DeleteSyntaxTest extends TestCase { - public void test_0() throws Exception { String sql = "DELETE FROM somelog WHERE user = 'jcole' ORDER BY timestamp_column LIMIT 1;"; @@ -46,9 +45,9 @@ public void test_1() throws Exception { SQLStatement stmt = stmtList.get(0); assertEquals("DELETE t1" + // - "\nFROM t1" + // - "\n\tLEFT JOIN t2 ON t1.id = t2.id" + // - "\nWHERE t2.id IS NULL;", SQLUtils.toMySqlString(stmt)); + "\nFROM t1" + // + "\n\tLEFT JOIN t2 ON t1.id = t2.id" + // + "\nWHERE t2.id IS NULL;", SQLUtils.toMySqlString(stmt)); } public void test_2() throws Exception { @@ -60,8 +59,8 @@ public void test_2() throws Exception { SQLStatement stmt = stmtList.get(0); assertEquals("DELETE a1, a2\nFROM t1 a1" + // - "\n\tINNER JOIN t2 a2" + // - "\nWHERE a1.id = a2.id", SQLUtils.toMySqlString(stmt)); + "\n\tINNER JOIN t2 a2" + // + "\nWHERE a1.id = a2.id", SQLUtils.toMySqlString(stmt)); } public void test_3() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java index 6215c66a03..4e63da220f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class DropTableTest extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP TABLE films, distributors;"; @@ -45,12 +44,12 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("distributors"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("films")).getDropCount() == 1); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("distributors")).getDropCount() == 1); Assert.assertTrue(visitor.getColumns().isEmpty()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java index abd82ad53f..239729eec3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class DropUserTest extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP USER 'jeffrey'@'localhost';"; @@ -45,5 +44,5 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().size() == 0); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java index 80d9c0c164..1964b14540 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class EncryptionAndCompressionFunctionsTest extends TestCase { - public void test_0() throws Exception { String sql = "INSERT INTO t VALUES (1,AES_ENCRYPT('text','password'))"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java index 76d83c71f6..7c86de6c00 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java @@ -27,7 +27,6 @@ import junit.framework.TestCase; public class FullTextSearchesWithQueryExpansionTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('database' IN NATURAL LANGUAGE MODE)"; @@ -37,19 +36,19 @@ public void test_0() throws Exception { { String text = SQLUtils.toMySqlString(stmt); - + Assert.assertEquals("SELECT *" // - + "\nFROM articles" // - + "\nWHERE MATCH (title, body) AGAINST ('database' IN NATURAL LANGUAGE MODE)", - text); + + "\nFROM articles" // + + "\nWHERE MATCH (title, body) AGAINST ('database' IN NATURAL LANGUAGE MODE)", + text); } { String text = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - + Assert.assertEquals("select *" // - + "\nfrom articles" // - + "\nwhere match (title, body) against ('database' in natural language mode)", - text); + + "\nfrom articles" // + + "\nwhere match (title, body) against ('database' in natural language mode)", + text); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/HelpTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/HelpTest.java index 746363365c..5dbc4cccfa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/HelpTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/HelpTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.parser.Token; public class HelpTest extends TestCase { - public void test_help_0() throws Exception { String sql = "HELP 'contents'"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java index 470768ae51..dce99dc241 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class HexadecimalValuesTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT 0x5061756c;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/IdentifierTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/IdentifierTest.java index 1f3bd3254b..d425ea6e20 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/IdentifierTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/IdentifierTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class IdentifierTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT t.1c FROM tab t"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java index 8a6c6e5cc9..21ad196837 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class InformationFunctionsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT BENCHMARK(1000000,ENCODE('hello','goodbye'))"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java index 2d7e626a30..946d6e2b72 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java @@ -29,7 +29,6 @@ import junit.framework.TestCase; public class InsertSyntaxTest extends TestCase { - public void test_0() throws Exception { String sql = "INSERT INTO tbl_name () VALUES();"; @@ -72,8 +71,8 @@ public void test_3() throws Exception { String text = output(stmtList); Assert.assertEquals("INSERT INTO tbl_name (a, b, c)\nVALUES (1, 2, 3)," + // - "\n\t(4, 5, 6)," + // - "\n\t(7, 8, 9);", text); + "\n\t(4, 5, 6)," + // + "\n\t(7, 8, 9);", text); } public void test_4() throws Exception { @@ -85,8 +84,8 @@ public void test_4() throws Exception { String text = output(stmtList); Assert.assertEquals("INSERT INTO tbl_name (a, b, c)" + // - "\nVALUES (1, 2, 3, 4, 5" + // - "\n\t, 6, 7, 8, 9);", text); + "\nVALUES (1, 2, 3, 4, 5" + // + "\n\t, 6, 7, 8, 9);", text); } public void test_5() throws Exception { @@ -98,10 +97,10 @@ public void test_5() throws Exception { SQLStatement stmt = stmtList.get(0); Assert.assertEquals("INSERT LOW_PRIORITY DELAYED HIGH_PRIORITY IGNORE INTO tbl_name (a, b, c)\nVALUES (1, 2, 3);", - SQLUtils.toMySqlString(stmt)); - + SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("insert low_priority delayed high_priority ignore into tbl_name (a, b, c)\nvalues (1, 2, 3);", - SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } public void test_6() throws Exception { @@ -113,8 +112,8 @@ public void test_6() throws Exception { SQLStatement stmt = stmtList.get(0); Assert.assertEquals("INSERT INTO tbl_name (a, b, c)" + // - "\nVALUES (1, 2, 3)" + // - "\nON DUPLICATE KEY UPDATE c = c + 1;", SQLUtils.toMySqlString(stmt)); + "\nVALUES (1, 2, 3)" + // + "\nON DUPLICATE KEY UPDATE c = c + 1;", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("insert into tbl_name (a, b, c)" + // "\nvalues (1, 2, 3)" + // "\non duplicate key update c = c + 1;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/Kill_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/Kill_Test.java index 8491584bb2..f29d026b40 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/Kill_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/Kill_Test.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; public class Kill_Test extends TestCase { - public void test_0() throws Exception { String sql = "KILL QUERY 233"; @@ -36,39 +35,40 @@ public void test_0() throws Exception { Assert.assertEquals("KILL QUERY 233;", text); } - + public void test_1() throws Exception { - String sql = "KILL CONNECTION 233"; - - MySqlStatementParser parser = new MySqlStatementParser(sql); - List stmtList = parser.parseStatementList(); - - String text = output(stmtList); - - Assert.assertEquals("KILL CONNECTION 233;", text); + String sql = "KILL CONNECTION 233"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List stmtList = parser.parseStatementList(); + + String text = output(stmtList); + + Assert.assertEquals("KILL CONNECTION 233;", text); } public void test_2() throws Exception { String sql = "KILL 233"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - + String text = output(stmtList); - + Assert.assertEquals("KILL 233;", text); } public void test_3() throws Exception { String sql = "KILL 233,234"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - + String text = output(stmtList); - + Assert.assertEquals("KILL 233, 234;", text); } + private String output(List stmtList) { StringBuilder out = new StringBuilder(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java index afbe608879..1fc81709d3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class LOAD_XML_Syntax_Test extends TestCase { - public void test_0() throws Exception { String sql = "LOAD XML LOCAL INFILE 'person.xml' INTO TABLE person ROWS IDENTIFIED BY '';"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java index 1aab77f0cf..17d4b9eb61 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class LoadDataInFileSyntaxTest extends TestCase { - public void test_0() throws Exception { String sql = "LOAD DATA INFILE 'data.txt' INTO TABLE db2.my_table;"; @@ -49,7 +48,7 @@ public void test_1() throws Exception { String text = output(stmtList); Assert.assertEquals("LOAD DATA INFILE '/tmp/test.txt' INTO TABLE test COLUMNS TERMINATED BY ',' LINES STARTING BY 'xxx';", - text); + text); } public void test_2() throws Exception { @@ -61,7 +60,7 @@ public void test_2() throws Exception { String text = output(stmtList); Assert.assertEquals("LOAD DATA INFILE '/home/Order.txt' INTO TABLE Orders (Order_Number, Order_Date, Customer_ID);", - text); + text); } public void test_3() throws Exception { @@ -73,7 +72,7 @@ public void test_3() throws Exception { String text = output(stmtList); Assert.assertEquals("LOAD DATA INFILE 'data.txt' INTO TABLE tbl_name COLUMNS TERMINATED BY ',' ENCLOSED BY '\"' LINES TERMINATED BY '\r\n' IGNORE 1 LINES;", - text); + text); } private String output(List stmtList) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java index affcd44399..9ee958f6f4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java @@ -26,7 +26,6 @@ import java.util.List; public class LogicalOperatorsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT 10 IS TRUE;"; @@ -182,8 +181,7 @@ public void test_13() throws Exception { } - - public void test14(){ + public void test14() { String sql = "SELECT ~1;"; SQLStatementParser parser = new MySqlStatementParser(sql); @@ -204,7 +202,7 @@ public void test14(){ Assert.assertEquals("SELECT ~(1 + 1);", text); } - public void test15(){ + public void test15() { String sql = "SELECT * FROM SUNTEST WHERE ~ID = 1;"; SQLStatementParser parser = new MySqlStatementParser(sql); @@ -224,6 +222,7 @@ public void test15(){ text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("SELECT *\nFROM SUNTEST\nWHERE ~(ID = 1);", text); } + private String output(List stmtList) { return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java index 3d9b2834a8..28e87b2e9c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class MathematicalFunctionsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT ACOS(1);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java index fa03184af2..b27deaba38 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class MiscellaneousFunctionsTest extends TestCase { - public void test_0() throws Exception { String sql = "UPDATE t SET i = DEFAULT(i)+1 WHERE id < 100;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySql57Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySql57Test.java index bcebf0d62e..7d89865015 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySql57Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySql57Test.java @@ -16,13 +16,13 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + assertEquals("ALTER TABLE t1" // + "\n\tALGORITHM = INPLACE," // + "\n\tCHANGE COLUMN c1 c1 VARCHAR(255);", SQLUtils.toMySqlString(stmt)); - + assertEquals("alter table t1" // - + "\n\tALGORITHM = INPLACE," // - + "\n\tchange column c1 c1 VARCHAR(255);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\n\tALGORITHM = INPLACE," // + + "\n\tchange column c1 c1 VARCHAR(255);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java index 2792f6cff6..1bc6844f42 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java @@ -16,7 +16,6 @@ import junit.framework.TestCase; public class MySqlASTVisitorAdapterTest extends TestCase { - public void test_adapter() throws Exception { MySqlASTVisitorAdapter adapter = new MySqlASTVisitorAdapter(); new SQLBooleanExpr().accept(adapter); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAnalyzeTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAnalyzeTest_1.java index 7454585b1a..6e43be14ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAnalyzeTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAnalyzeTest_1.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlAnalyzeTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "ANALYZE TABLE t1,t2"; @@ -39,23 +38,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ANALYZE TABLE t1, t2", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlBeginTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlBeginTest.java index cd16d8b205..1eee90f78c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlBeginTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlBeginTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class MySqlBeginTest extends MysqlTest { - public void test_0() throws Exception { String sql = "START TRANSACTION;" + "\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;" @@ -35,7 +34,7 @@ public void test_0() throws Exception { + "\nCOMMIT;" + "\n"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); // print(statementList); @@ -51,44 +50,43 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(4, visitor.getColumns().size()); Assert.assertEquals(2, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toSQLString(statementList, JdbcConstants.MYSQL); assertEquals("START TRANSACTION;" - + "\n" - + "\nSELECT @A := SUM(salary)" - + "\nFROM table1" - + "\nWHERE type = 1;" - + "\n" - + "\nUPDATE table2" - + "\nSET summary = @A" - + "\nWHERE type = 1;" - + "\n" - + "\nCOMMIT;", // - output); + + "\n" + + "\nSELECT @A := SUM(salary)" + + "\nFROM table1" + + "\nWHERE type = 1;" + + "\n" + + "\nUPDATE table2" + + "\nSET summary = @A" + + "\nWHERE type = 1;" + + "\n" + + "\nCOMMIT;", // + output); } { String output = SQLUtils.toSQLString(statementList, JdbcConstants.MYSQL, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("start transaction;" - + "\n" - + "\nselect @A := sum(salary)" - + "\nfrom table1" - + "\nwhere type = 1;" - + "\n" - + "\nupdate table2" - + "\nset summary = @A" - + "\nwhere type = 1;" - + "\n" - + "\ncommit;", // - output); + + "\n" + + "\nselect @A := sum(salary)" + + "\nfrom table1" + + "\nwhere type = 1;" + + "\n" + + "\nupdate table2" + + "\nset summary = @A" + + "\nwhere type = 1;" + + "\n" + + "\ncommit;", // + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlChecksumTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlChecksumTableTest.java index e4d4f3ea5e..b257b75949 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlChecksumTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlChecksumTableTest.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlChecksumTableTest extends MysqlTest { - public void test_0() throws Exception { String sql = "CHECKSUM TABLE tbl_name"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_0.java index 9e59be47e4..ba342016bd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_0.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlDeleteTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "DELETE a1, a2 FROM t1 AS a1 INNER JOIN t2 AS a2 WHERE a1.id=a2.id;"; @@ -47,14 +46,14 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(2, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t1"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + Assert.assertTrue(visitor.getColumns().contains(new Column("t1", "id"))); Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java index d463a16dbf..4f49d3474c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java @@ -28,14 +28,13 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlDeleteTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "DELETE FROM a1, a2 USING t1 AS a1 INNER JOIN t2 AS a2 WHERE a1.id=a2.id;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + Assert.assertEquals("DELETE FROM a1, a2\n" + "USING t1 a1\n" + "\tINNER JOIN t2 a2\n" + @@ -56,14 +55,14 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(2, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t1"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + Assert.assertTrue(visitor.getColumns().contains(new Column("t1", "id"))); Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java index da006e6fd3..d253a69dd8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java @@ -28,7 +28,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlDeleteTest_2 extends MysqlTest { - public void test_0() throws Exception { String sql = "DELETE t1 FROM t1 LEFT JOIN t2 ON t1.id=t2.id WHERE t2.id IS NULL;"; @@ -53,14 +52,14 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(3, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t1"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + Assert.assertTrue(visitor.getColumns().contains(new Column("t1", "id"))); Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_3.java index 3ed92140cc..df795f2b90 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_3.java @@ -28,16 +28,15 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlDeleteTest_3 extends MysqlTest { - public void test_0() throws Exception { String sql = "DELETE FROM t1 " // - + "WHERE s11 > ANY"// - + "(SELECT COUNT(*) /* no hint */ FROM t2"// - + " WHERE NOT EXISTS"// - + " (SELECT * FROM t3"// - + " WHERE ROW(5*t2.s1,77)="// - + " (SELECT 50,11*s1 FROM t4 UNION SELECT 50,77 FROM"// - + " (SELECT * FROM t5) AS t5)));"; + + "WHERE s11 > ANY"// + + "(SELECT COUNT(*) /* no hint */ FROM t2"// + + " WHERE NOT EXISTS"// + + " (SELECT * FROM t3"// + + " WHERE ROW(5*t2.s1,77)="// + + " (SELECT 50,11*s1 FROM t4 UNION SELECT 50,77 FROM"// + + " (SELECT * FROM t5) AS t5)));"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_4_force_partition.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_4_force_partition.java index 3a8e016fa4..9732e543f5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_4_force_partition.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_4_force_partition.java @@ -27,14 +27,13 @@ import java.util.List; public class MySqlDeleteTest_4_force_partition extends MysqlTest { - public void test_0() throws Exception { String sql = "DELETE force all partitions car_tt FROM runoob_tbl WHERE runoob_id=3;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + Assert.assertEquals("DELETE FORCE ALL PARTITIONS car_tt\n" + "FROM runoob_tbl\n" + "WHERE runoob_id = 3;", SQLUtils.toMySqlString(stmt)); @@ -53,7 +52,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_5_force_partition.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_5_force_partition.java index d237bd59a2..859caccb6c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_5_force_partition.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_5_force_partition.java @@ -27,14 +27,13 @@ import java.util.List; public class MySqlDeleteTest_5_force_partition extends MysqlTest { - public void test_0() throws Exception { String sql = "DELETE force partition 'pt001' car_tt FROM runoob_tbl WHERE runoob_id=3;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + Assert.assertEquals("DELETE FORCE PARTITION 'pt001' car_tt\n" + "FROM runoob_tbl\n" + "WHERE runoob_id = 3;", SQLUtils.toMySqlString(stmt)); @@ -53,7 +52,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_6.java index f24e2b83fa..d7b89ded93 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_6.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlDeleteTest_6 extends MysqlTest { - public void test_0() throws Exception { String sql = "delete a.* from teacher_1 a join teacher_2 b on a.teacher_id = b.teacher_id where a.day < b.day"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescTest_0.java index b3a8c97b9e..731a920769 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescTest_0.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class MySqlDescTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = " Desc City"; @@ -44,14 +43,14 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescribteTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescribteTest.java index b440648c71..752f5d6201 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescribteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescribteTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlDescribteTest extends MysqlTest { - public void test_0() throws Exception { String sql = " DESCRIBE City"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDumpTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDumpTest.java index d151892209..4a235ddfa9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDumpTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDumpTest.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlDumpTest extends MysqlTest { - public void test_0() throws Exception { String sql = "dump data into 'odps://ktv_market_analyzing/bohan_test_001/ds=20171233/seller_bucket=9727' " + "select '6225607' as crowd_snapshot_id, a.seller_id as seller_id, a.buyer_id as buyer_id " + @@ -45,7 +44,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(2, visitor.getTables().size()); assertEquals(6, visitor.getColumns().size()); assertEquals(7, visitor.getConditions().size()); @@ -53,7 +52,7 @@ public void test_0() throws Exception { assertTrue(visitor.containsTable("amp.otp_user_base_info")); assertTrue(visitor.containsTable("amp.otpx_buyer_seller_relation_detail_to_garuda")); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + assertTrue(visitor.containsColumn("amp.otp_user_base_info", "user_id")); assertTrue(visitor.containsColumn("amp.otpx_buyer_seller_relation_detail_to_garuda", "buyer_id")); assertTrue(visitor.containsColumn("amp.otpx_buyer_seller_relation_detail_to_garuda", "seller_id")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDumpTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDumpTest_1.java index d87546884a..4dafe3ba1a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDumpTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDumpTest_1.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlDumpTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "DUMP DATA OVERWRITE INTO 'odps://cod_garuda/wenyu_meta_person' select cid, cname, dept, gender, pid from wenyu_meta_person limit 10;"; @@ -41,14 +40,14 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(5, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); assertTrue(visitor.containsTable("wenyu_meta_person")); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + assertTrue(visitor.containsColumn("wenyu_meta_person", "cid")); assertTrue(visitor.containsColumn("wenyu_meta_person", "cname")); assertTrue(visitor.containsColumn("wenyu_meta_person", "dept")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test.java index ccd1e2d31f..06bb840365 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test.java @@ -22,10 +22,9 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; public class MySqlError_test extends MysqlTest { - public void test_0() throws Exception { String sql = "insert into userdetectitem26 (nick,volume) values(?,?) " + // - "ON DUPLICATE KEY UPDATE title = ?,picURL = ?,scoreExceed = ?,score="; + "ON DUPLICATE KEY UPDATE title = ?,picURL = ?,scoreExceed = ?,score="; Exception error = null; @@ -35,7 +34,7 @@ public void test_0() throws Exception { } catch (Exception e) { error = e; } - + Assert.assertNotNull(error); Assert.assertEquals("EOF, score=", error.getMessage()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_1.java index e011bb5126..0537692294 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_1.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; public class MySqlError_test_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM pp_items WHERE uid= ORDER BY id DESC LIMIT ?,?"; Exception error = null; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_2.java index af659ba3cc..6e97978df0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_2.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; public class MySqlError_test_2 extends MysqlTest { - public void test_0() { String sql = "Describe sdb_goods free_postage"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_3.java index 900c37c982..687fbbce89 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_3.java @@ -20,7 +20,6 @@ import org.junit.Assert; public class MySqlError_test_3 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT count(*) AS num FROM sdb_products AS P" + // " LEFT JOIN sdb_goods AS G ON G.goods_id = P.goods_id" + // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest.java index e8a15beb5f..dfa9577c06 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest.java @@ -29,7 +29,6 @@ * See https://dev.mysql.com/doc/refman/5.7/en/explain.html for test cases. */ public class MySqlExplainTest extends MysqlTest { - public void testExplainTable() throws Exception { String sql = " EXPLAIN City"; SQLStatement statement = testParseFormat(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_0.java index 1e076b8445..388e0c5030 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_0.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class MySqlExplainTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "explain SELECT * FROM sonar.groups where id = 1"; @@ -44,14 +43,14 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("sonar.groups"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_1.java index 06b4cdda3c..770983faf0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_1.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlExplainTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "explain extended select * from foo"; @@ -43,14 +42,14 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("foo"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java index 5458ebc422..15fc214270 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java @@ -22,13 +22,12 @@ import com.alibaba.druid.util.JdbcUtils; public class MySqlFormatTest extends TestCase { - public void test_0() throws Exception { String text = "CREATE TABLE customer (a INT, b CHAR (20), INDEX (a));"; Assert.assertEquals("CREATE TABLE customer (\n" + // - "\ta INT,\n" + // - "\tb CHAR(20),\n" + // - "\tINDEX(a)\n" + // - ");", SQLUtils.format(text, JdbcUtils.MYSQL)); + "\ta INT,\n" + // + "\tb CHAR(20),\n" + // + "\tINDEX(a)\n" + // + ");", SQLUtils.format(text, JdbcUtils.MYSQL)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest2.java index b11189df56..aeb3733fbb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest2.java @@ -22,7 +22,6 @@ import com.alibaba.druid.util.JdbcUtils; public class MySqlFormatTest2 extends TestCase { - public void test_0() throws Exception { String text = "SELECT cq.uuid FROM ce_queue cq " + "WHERE cq.status = ? AND NOT EXISTS (SELECT ? FROM ce_queue cq2 WHERE cq.component_uuid = cq2.component_uuid AND cq2.status <> ?) " diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest3.java index 2bcbf0fdbf..6d540ca23a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest3.java @@ -21,7 +21,6 @@ import org.junit.Assert; public class MySqlFormatTest3 extends TestCase { - public void test_0() throws Exception { String text = "select * from db_00.t_00_00 where id > 1;"; Assert.assertEquals("SELECT *\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHelpTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHelpTest_0.java index d9f51bd513..82eefd6401 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHelpTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHelpTest_0.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlHelpTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "HELP 'search_string'"; @@ -39,23 +38,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("HELP 'search_string'", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHintStatementTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHintStatementTest.java index d112de96ed..1c286409f1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHintStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHintStatementTest.java @@ -19,7 +19,6 @@ import junit.framework.TestCase; public class MySqlHintStatementTest extends TestCase { - public void test() { String sql = "DROP TABLE IF EXISTS `item_similarity`;"// + "\n/*!40101 SET @saved_cs_client = @@character_set_client */;"// diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlOptimizeTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlOptimizeTest_1.java index 5c9520cc8b..9d273aef60 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlOptimizeTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlOptimizeTest_1.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlOptimizeTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "OPTIMIZE TABLE t1,t2"; @@ -39,23 +38,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("OPTIMIZE TABLE t1, t2", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest.java index b016384e0e..f666164522 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlReplaceTest extends MysqlTest { - public void test_0() throws Exception { String sql = "replace into t1 (id,name) values('1','aa'),('2','bb')"; @@ -48,7 +47,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(2, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest_1.java index 832f3ef4e3..1c8e7c1fe8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest_1.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlReplaceTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "REPLACE INTO `tb_001` (`gmt_create`, `theday`, `pt`, `song_id`, `song_name`, `play_num_1d`) (SELECT now(), '20170820', case a.pt\n" + " when 'android' then '安卓'\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRevokeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRevokeTest.java index a4b92956b5..0161d4acd9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRevokeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRevokeTest.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlRevokeTest extends MysqlTest { - public void test_0() throws Exception { String sql = "REVOKE INSERT ON *.* FROM 'jeffrey'@'localhost';"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); // print(statementList); @@ -46,24 +45,23 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toSQLString(statementList, JdbcConstants.MYSQL); assertEquals("REVOKE INSERT ON *.* FROM 'jeffrey'@'localhost';", // - output); + output); } { String output = SQLUtils.toSQLString(statementList, JdbcConstants.MYSQL, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("revoke INSERT on *.* from 'jeffrey'@'localhost';", // - output); + output); } } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetPasswordTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetPasswordTest.java index e958a8549b..de8360aa47 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetPasswordTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetPasswordTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlSetPasswordTest extends MysqlTest { - public void test_0() throws Exception { String sql = "SET PASSWORD FOR 'bob'@'%.example.org' = PASSWORD('cleartext password');"; @@ -39,23 +38,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SET PASSWORD FOR 'bob'@'%.example.org' = PASSWORD('cleartext password');", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_0.java index 6d5c0b6cf4..90469f54b6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_0.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlSetTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_1.java index 44b8e35c17..6503a57aa3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_1.java @@ -27,7 +27,6 @@ import junit.framework.TestCase; public class MySqlSetTest_1 extends TestCase { - public void test_0() throws Exception { String sql = "SET @@session.autocommit = ON;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_2.java index b4bc98cf1b..b9539de7cc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_2.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSetTest_2 extends TestCase { - public void test_0() throws Exception { String sql = "set character set utf8, names utf8mb4;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_3.java index 92e9c81fb3..00f4ccd2f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_3.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlSetTest_3 extends TestCase { - public void test_0() throws Exception { String sql = "SET sql_mode=?,NAMES ?,CHARACTER SET utf8,CHARACTER_SET_RESULTS=utf8,COLLATION_CONNECTION=?"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlTest_Char.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlTest_Char.java index 3ca21863d7..75f4d68a2b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlTest_Char.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlTest_Char.java @@ -20,24 +20,25 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; + /** -*测试char() CHAR(N,... [USING charset_name]) -*/ + * 测试char() CHAR(N,... [USING charset_name]) + */ public class MySqlTest_Char extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT char(888 using utf8)"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); // print(statementList); - assertEquals(output(statementList),"SELECT char(888 USING utf8)"); + assertEquals(output(statementList), "SELECT char(888 USING utf8)"); } + public void test_1() throws Exception { String sql = "SELECT char('abc8a9b10c' using utf8)"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); // print(statementList); - assertEquals(output(statementList),"SELECT char('abc8a9b10c' USING utf8)"); + assertEquals(output(statementList), "SELECT char('abc8a9b10c' USING utf8)"); } public void test_2() throws Exception { @@ -45,7 +46,7 @@ public void test_2() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); // print(statementList); - assertEquals(output(statementList),"SELECT char(12, 321, 'lq9s9f', 'abc8a9b10c' USING utf8)"); + assertEquals(output(statementList), "SELECT char(12, 321, 'lq9s9f', 'abc8a9b10c' USING utf8)"); } public void test_3() throws Exception { @@ -53,7 +54,7 @@ public void test_3() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); // print(statementList); - assertEquals(output(statementList),"SELECT char(12, 321, 'lq9s9f', 'abc8a9b10c')"); + assertEquals(output(statementList), "SELECT char(12, 321, 'lq9s9f', 'abc8a9b10c')"); } public void test_4() throws Exception { @@ -61,6 +62,6 @@ public void test_4() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); // print(statementList); - assertEquals(output(statementList),"SELECT CHAR(77, 121, 83, 81, '76' USING utf8)"); + assertEquals(output(statementList), "SELECT CHAR(77, 121, 83, 81, '76' USING utf8)"); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlTruncateTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlTruncateTest_1.java index 5cdfbdf01a..3ad77a1718 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlTruncateTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlTruncateTest_1.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlTruncateTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "truncate table city_list-- test"; @@ -63,5 +62,4 @@ public void test_0() throws Exception { } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUpdateStatementLimitTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUpdateStatementLimitTest.java index 9b78daf328..e5e1350410 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUpdateStatementLimitTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUpdateStatementLimitTest.java @@ -21,13 +21,13 @@ import com.alibaba.druid.sql.SQLUtils; -public class MySqlUpdateStatementLimitTest extends TestCase{ - public void test_limit(){ - String sql = "update t set name = 'x' where id < 100 limit 10"; - String rs = SQLUtils.formatMySql(sql); - Assert.assertEquals("UPDATE t" - + "\nSET name = 'x'" - + "\nWHERE id < 100" - + "\nLIMIT 10", rs); - } +public class MySqlUpdateStatementLimitTest extends TestCase { + public void test_limit() { + String sql = "update t set name = 'x' where id < 100 limit 10"; + String rs = SQLUtils.formatMySql(sql); + Assert.assertEquals("UPDATE t" + + "\nSET name = 'x'" + + "\nWHERE id < 100" + + "\nLIMIT 10", rs); + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUseTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUseTest_0.java index 4ce89194d9..50bf161174 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUseTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUseTest_0.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlUseTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "use db;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MysqlCheckTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MysqlCheckTest.java index 80d1767e6e..3bfb000a7f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MysqlCheckTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MysqlCheckTest.java @@ -13,8 +13,7 @@ import java.util.List; public class MysqlCheckTest extends MysqlTest { - - public void test_create1() { + public void test_create1() { String sql = "CREATE TABLE `t12` (\n" + " `c1` int DEFAULT NULL,\n" + " `c2` int DEFAULT NULL,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java index 8ea91e8ea7..3f82bdd4d9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java @@ -29,7 +29,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class NumberTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT -32032.6809e+10;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java index 0b57d546a6..3d6db58b7b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class REPLACE_Syntax_Test extends TestCase { - public void test_0() throws Exception { String sql = "REPLACE INTO T SELECT * FROM T;"; @@ -49,9 +48,9 @@ public void test_1() throws Exception { String text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("REPLACE DELAYED INTO `online_users` (`session_id`, `user_id`, `page`, `lastview`)\nVALUES ('3580cc4e61117c0785372c426eddd11c', 'XXX', '/', NOW());", - text); + text); } - + public void test_2() throws Exception { String sql = " replace into t(col1,col2)values(?,?)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java index 986f37659b..c011fe09fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class RegularExpressionsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT 'Monty!' REGEXP '.*'"; @@ -45,7 +44,7 @@ public void test_1() throws Exception { List stmtList = parser.parseStatementList(); String text = output(stmtList); - + String e = "SELECT 'new*\n*line' REGEXP 'new\\*.\\*line';"; Assert.assertEquals("SELECT 'new*\n*line' REGEXP 'new\\\\*.\\\\*line';", text); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/Reset_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/Reset_Test.java index ec0d4dc4e2..0c283a59f7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/Reset_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/Reset_Test.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; public class Reset_Test extends TestCase { - public void test_0() throws Exception { String sql = "binlog 'str'"; @@ -36,7 +35,6 @@ public void test_0() throws Exception { Assert.assertEquals("BINLOG 'str';", text); } - private String output(List stmtList) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java index 9b37d4f75f..bfbaa12587 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java @@ -29,7 +29,6 @@ import junit.framework.TestCase; public class SELECT_Syntax_Test extends TestCase { - public void test_0() throws Exception { String sql = "SELECT year, SUM(profit) FROM sales GROUP BY year WITH ROLLUP;"; @@ -52,7 +51,7 @@ public void test_1() throws Exception { Assert.assertEquals("SELECT *\nFROM T\nFOR UPDATE;", text); } - + public void test_with_cube() throws Exception { String sql = "SELECT year, SUM(profit) FROM sales GROUP BY year WITH CUBE;"; @@ -85,7 +84,7 @@ public void test_3() throws Exception { String text = output(stmtList); Assert.assertEquals("SELECT a, b, a + b\nINTO OUTFILE '/tmp/result.txt' COLUMNS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"' LINES TERMINATED BY '\n'\nFROM test_table;", - text); + text); } public void test_4() throws Exception { @@ -151,13 +150,13 @@ public void test_8() throws Exception { String text = output(stmtList); Assert.assertEquals("SELECT DISTINCT store_type" // - + "\nFROM stores" // - + "\nWHERE NOT EXISTS (" // - + "\n\tSELECT *" - + "\n\tFROM cities_stores" - + "\n\tWHERE cities_stores.store_type = stores.store_type" - + "\n);", - text); + + "\nFROM stores" // + + "\nWHERE NOT EXISTS (" // + + "\n\tSELECT *" + + "\n\tFROM cities_stores" + + "\n\tWHERE cities_stores.store_type = stores.store_type" + + "\n);", + text); } public void test_9() throws Exception { @@ -228,7 +227,7 @@ public void test_12() throws Exception { "\tfrom t2\n" + ");", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - + public void test_13() throws Exception { String sql = "SELECT s1 FROM t1 WHERE s1 IN (SELECT s1 FROM t2);"; @@ -249,7 +248,7 @@ public void test_13() throws Exception { "\tfrom t2\n" + ");", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - + public void test_14() throws Exception { String sql = "SELECT s1 FROM t1 WHERE s1 IN (?, ?, ?);"; @@ -260,7 +259,7 @@ public void test_14() throws Exception { Assert.assertEquals("SELECT s1\nFROM t1\nWHERE s1 IN (?, ?, ?);", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("select s1\nfrom t1\nwhere s1 in (?, ?, ?);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - + public void test_15() throws Exception { String sql = "SELECT s1 FROM t1 WHERE s1 NOT IN (?, ?, ?);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java index f3b6180a8c..52d4734544 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class SHOW_COLUMNS_Syntax_Test extends TestCase { - public void test_0() throws Exception { String sql = "SHOW COLUMNS FROM City;"; @@ -61,7 +60,7 @@ public void test_2() throws Exception { Assert.assertEquals("SHOW COLUMNS FROM mydb.mytable;", text); } - + public void test_3() throws Exception { String sql = "SHOW COLUMNS FROM mytable IN mydb;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java index 523cd831cd..d39443e7b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class SHOW_DATABASES_Syntax_Test extends TestCase { - public void test_0() throws Exception { String sql = "SHOW DATABASES;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_STATUS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_STATUS_Syntax_Test.java index ebb3eb8c2f..417a19d759 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_STATUS_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_STATUS_Syntax_Test.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class SHOW_STATUS_Syntax_Test extends TestCase { - public void test_0() throws Exception { String sql = "SHOW STATUS LIKE 'Key%'"; @@ -38,7 +37,7 @@ public void test_0() throws Exception { Assert.assertEquals("SHOW STATUS LIKE 'Key%';", text); } - + public void test_where() throws Exception { String sql = "SHOW STATUS WHERE X LIKE 'Key%'"; @@ -49,7 +48,7 @@ public void test_where() throws Exception { Assert.assertEquals("SHOW STATUS WHERE X LIKE 'Key%';", text); } - + public void test_corba() throws Exception { String sql = "SHOW COBAR_STATUS"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java index 35738b9d85..0fe16f3361 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java @@ -27,9 +27,7 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class SHOW_TABLES_Syntax_Test extends TestCase { - public void test_0() throws Exception { - String sql = "SHOW TABLES FROM SUNTEST "; SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java index c330653e03..5d390fba67 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class SHOW_WARNINGS_Syntax_Test extends TestCase { - public void test_0() throws Exception { String sql = "SHOW WARNINGS;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLSelectTest.java index dd9b9f5659..3231222c79 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLSelectTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class SQLSelectTest extends TestCase { - public void test_select() throws Exception { String sql = "SELECT ALL FID FROM T1;SELECT DISTINCT FID FROM T1;SELECT DISTINCTROW FID FROM T1;"; @@ -88,7 +87,7 @@ public void test_select_6() throws Exception { output(stmtList); } - + public void test_select_7() throws Exception { String sql = "select * from ((select * from test1) UNION (select * from test2) UNION (select * from test3)) where t1='温高铁';"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddColumnTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddColumnTest.java index f2e5094e5c..b9154b69d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddColumnTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddColumnTest.java @@ -7,20 +7,19 @@ import com.alibaba.druid.sql.SQLUtils; public class SQLUtilsAddColumnTest extends TestCase { - public void test_select() throws Exception { Assert.assertEquals("SELECT id, name" // - + "\nFROM t", SQLUtils.addSelectItem("select id from t", "name", null, null)); + + "\nFROM t", SQLUtils.addSelectItem("select id from t", "name", null, null)); } public void test_select_1() throws Exception { Assert.assertEquals("SELECT id, name AS XX" // - + "\nFROM t", SQLUtils.addSelectItem("select id from t", "name", "XX", null)); + + "\nFROM t", SQLUtils.addSelectItem("select id from t", "name", "XX", null)); } - + public void test_select_2() throws Exception { Assert.assertEquals("SELECT id, name AS \"XX W\"" // - + "\nFROM t", SQLUtils.addSelectItem("select id from t", "name", "XX W", null)); + + "\nFROM t", SQLUtils.addSelectItem("select id from t", "name", "XX W", null)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest.java index a271f0067c..1b09efa99e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest.java @@ -13,32 +13,32 @@ public void test_select() throws Exception { + "\nFROM t" // + "\nWHERE id = 0", SQLUtils.addCondition("select * from t", "id = 0", null)); } - + public void test_select_1() throws Exception { Assert.assertEquals("SELECT *" // + "\nFROM t" // + "\nWHERE id = 0" // + "\n\tAND name = 'aaa'", SQLUtils.addCondition("select * from t where id = 0", "name = 'aaa'", null)); } - + public void test_delete() throws Exception { Assert.assertEquals("DELETE FROM t" // + "\nWHERE id = 0", SQLUtils.addCondition("delete from t", "id = 0", null)); } - + public void test_delete_1() throws Exception { Assert.assertEquals("DELETE FROM t" // + "\nWHERE id = 0" // + "\n\tAND name = 'aaa'", SQLUtils.addCondition("delete from t where id = 0", "name = 'aaa'", null)); } - - + + public void test_update() throws Exception { Assert.assertEquals("UPDATE t"// + "\nSET f1 = ?" // + "\nWHERE id = 0", SQLUtils.addCondition("update t set f1 = ?", "id = 0", null)); } - + public void test_update_1() throws Exception { Assert.assertEquals("UPDATE t"// + "\nSET f1 = ?" // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsTest.java index 65a8371045..4c930da00e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsTest.java @@ -10,13 +10,12 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLUtilsTest extends TestCase { - public void test_format() throws Exception { String formattedSql = SQLUtils.format("select * from t where id = ?", JdbcConstants.MYSQL, - Arrays. asList("abc")); + Arrays.asList("abc")); Assert.assertEquals("SELECT *" + // - "\nFROM t" + // - "\nWHERE id = 'abc'", formattedSql); + "\nFROM t" + // + "\nWHERE id = 'abc'", formattedSql); } public void test_format_0() throws Exception { @@ -25,7 +24,7 @@ public void test_format_0() throws Exception { Assert.assertEquals("SELECT '%温%'\n" + "FROM dual;", formattedSql); } - + public void test_format_1() throws Exception { String sql = "select * from t where tname LIKE \"%\"'温'\"%\""; String formattedSql = SQLUtils.formatMySql(sql); @@ -33,10 +32,10 @@ public void test_format_1() throws Exception { "FROM t\n" + "WHERE tname LIKE '%温%'", formattedSql); } - + public void test_format_2() throws Exception { String sql = "begin\n"// - + " if (a=10) then\n" + " null;\n" + " else\n" + " null;\n" + " end if;\n" + "end;"; + + " if (a=10) then\n" + " null;\n" + " else\n" + " null;\n" + " end if;\n" + "end;"; Assert.assertEquals("BEGIN" + "\n\tIF a = 10 THEN" + "\n\t\tNULL;" @@ -45,7 +44,7 @@ public void test_format_2() throws Exception { + "\n\tEND IF;" + "\nEND;", SQLUtils.formatOracle(sql)); } - + public void test_format_3() throws Exception { String sql = "select lottery_notice_issue,lottery_notice_date,lottery_notice_result from tb_lottery_notice where lottery_type_id=8 and lottery_notice_issue<=2014066 UNION ALL SELECT NULL, NULL, NULL, NULL, NULL, NULL# and lottery_notice_issue>=2014062 order by lottery_notice_issue desc"; String formattedSql = SQLUtils.formatMySql(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java index 8cf1ce4582..3895b1d813 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class START_TRANSACTION_Test extends TestCase { - public void test_0() throws Exception { String sql = "START TRANSACTION;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java index a04452fb95..7d31ad8d5e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java @@ -26,7 +26,6 @@ import java.util.List; public class StringComparisonFunctionsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT '?' LIKE 'ae' COLLATE latin1_german2_ci;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java index e9616f5c08..8b72686272 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class StringFunctionsTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT ASCII('2');"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java index 7db8114b3a..c919b4a437 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class StringTest extends TestCase { - public void test_latin() throws Exception { String sql = "SELECT _latin1'string' COLLATE latin1_danish_ci;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java index fc27744faf..cbcdced02a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class XMLFunctionsTest extends TestCase { - public void test_0() throws Exception { String sql = "SET @xml = 'XY';"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest0.java index f7c29de453..b6288e1abe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest0.java @@ -22,13 +22,12 @@ import junit.framework.TestCase; public class MySqlAlterDbTest0 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + assertEquals("ALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME;", SQLUtils.toMySqlString(stmt)); assertEquals("alter database `#mysql50#a-b-c` upgrade data directory name;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest1.java index 240c9f6013..db2837a46d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest1.java @@ -22,13 +22,12 @@ import junit.framework.TestCase; public class MySqlAlterDbTest1 extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter database test CHARACTER SET='big5' COLLATE='big5_chinese_ci'"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + assertEquals("ALTER DATABASE test CHARACTER SET = 'big5' COLLATE big5_chinese_ci", SQLUtils.toMySqlString(stmt)); assertEquals("alter database test character set = 'big5' collate big5_chinese_ci", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest2.java index f1d91b670d..864cf98a9d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterDbTest2.java @@ -21,11 +21,10 @@ import junit.framework.TestCase; public class MySqlAlterDbTest2 extends TestCase { - public void test_0() throws Exception { String sql = "ALTER DATABASE logical_db SET read_only=1"; SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.mysql); - + assertEquals("ALTER DATABASE logical_db SET read_only = 1", stmt.toString()); assertEquals("alter database logical_db set read_only = 1", stmt.toLowerCaseString()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterMaterializedViewTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterMaterializedViewTest_0.java index eb6623f27f..022af89167 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterMaterializedViewTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterMaterializedViewTest_0.java @@ -22,7 +22,6 @@ import junit.framework.TestCase; public class MySqlAlterMaterializedViewTest_0 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER MATERIALIZED VIEW view_name\n" + "REFRESH COMPLETE ON DEMAND\n" + @@ -30,7 +29,7 @@ public void test_alter_first() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + assertEquals("ALTER MATERIALIZED VIEW view_name\n" + "REFRESH COMPLETE ON DEMAND\n" + "ENABLE QUERY REWRITE", SQLUtils.toMySqlString(stmt)); @@ -132,8 +131,8 @@ public void test_alter_7() throws Exception { public void test_alter_all() { ok("ALTER MATERIALIZED VIEW mymv \n" + - "REFRESH NEXT current_date() + INTERVAL 15 DAY\n" + - "DISABLE QUERY REWRITE;", + "REFRESH NEXT current_date() + INTERVAL 15 DAY\n" + + "DISABLE QUERY REWRITE;", "ALTER MATERIALIZED VIEW mymv\n" + "REFRESH NEXT current_date() + INTERVAL 15 DAY\n" + "DISABLE QUERY REWRITE;"); @@ -214,5 +213,4 @@ public void ok(String sql, String expectedSql) { assertEquals(expectedSql, stmt.toString()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSequence_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSequence_0.java index 7036b009af..1187081ea1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSequence_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSequence_0.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class MySqlAlterSequence_0 extends TestCase { - public void test_alter_seq_0() throws Exception { String sql = "ALTER SEQUENCE SEQ_XXX INCREMENT BY 2"; SQLStatement stmt = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL).get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSequence_1_change_to.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSequence_1_change_to.java index c5e58d6773..7f4a8e8c5a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSequence_1_change_to.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSequence_1_change_to.java @@ -21,7 +21,6 @@ import junit.framework.TestCase; public class MySqlAlterSequence_1_change_to extends TestCase { - public void test_alter_seq_0() throws Exception { String sql = "ALTER SEQUENCE seq1 CHANGE TO SIMPLE WITH CACHE START WITH 1000000;"; SQLStatement stmt = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL).get(0); @@ -43,8 +42,6 @@ public void test_alter_seq_1() throws Exception { assertEquals("ALTER SEQUENCE seq1 CHANGE TO GROUP START WITH 1000000;", output); } - - public void test_alter_seq_3() throws Exception { String sql = "ALTER SEQUENCE seq1 CHANGE TO TIME START WITH 1000000;"; SQLStatement stmt = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL).get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSequence_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSequence_2.java index 57b7100ade..82c3da042f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSequence_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSequence_2.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class MySqlAlterSequence_2 extends TestCase { - public void test_alter_seq_0() throws Exception { String sql = "ALTER SEQUENCE SEQ_XXX INCREMENT BY 2"; SQLStatement stmt = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL).get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSystemTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSystemTest_0.java index 76ef9fec6e..f35863ddae 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSystemTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterSystemTest_0.java @@ -22,13 +22,12 @@ import junit.framework.TestCase; public class MySqlAlterSystemTest_0 extends TestCase { - public void test_alter1() throws Exception { String sql = "ALTER SYSTEM SET CONFIG useAuth=true"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + assertEquals("ALTER SYSTEM SET COFNIG useAuth = true", SQLUtils.toMySqlString(stmt)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableGroupTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableGroupTest_0.java index dbea3cde18..adccb8b71a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableGroupTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableGroupTest_0.java @@ -22,15 +22,15 @@ import junit.framework.TestCase; public class MySqlAlterTableGroupTest_0 extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter tablegroup new_ddl.ddl_test_1 k1=v1"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + assertEquals("ALTER TABLEGROUP new_ddl.ddl_test_1 k1 = v1", SQLUtils.toMySqlString(stmt)); } + public void test_alter_2() throws Exception { String sql = "alter tablegroup new_ddl.ddl_test_1 k1=123"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTable_refactor_test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTable_refactor_test.java index 9b8ea109bf..b4465e41db 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTable_refactor_test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTable_refactor_test.java @@ -16,7 +16,6 @@ * @Date 2019-07-02 15:27 */ public class MySqlAlterTable_refactor_test extends MysqlTest { - public void test_0() throws Exception { String sql = "alter table test001\n" + "add column x int first," + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterUserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterUserTest.java index 0f2758be44..3a6ee12c02 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterUserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterUserTest.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlAlterUserTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER USER 'jeffrey'@'localhost' PASSWORD EXPIRE;"; @@ -37,10 +36,10 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER USER 'jeffrey'@'localhost' PASSWORD EXPIRE;", // - output); + output); Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterViewTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterViewTest_0.java index c43f3836d0..d28f67abd1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterViewTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterViewTest_0.java @@ -22,13 +22,12 @@ import junit.framework.TestCase; public class MySqlAlterViewTest_0 extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter definer = 'ivan'@'%' view my_view3 as select count(*) from t3;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + assertEquals("ALTER DEFINER = 'ivan'@'%'\n" + "\tVIEW my_view3\n" + "AS\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_0.java index 91226833da..15e39633f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_0.java @@ -25,16 +25,15 @@ import junit.framework.TestCase; public class MySqlAlterTableAddIndex_0 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE `test`.`tb1` ADD INDEX `ix` (`f2` ASC) ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tADD INDEX `ix` (`f2` ASC);", SQLUtils.toMySqlString(stmt)); - + "\n\tADD INDEX `ix` (`f2` ASC);", SQLUtils.toMySqlString(stmt)); + assertEquals("alter table `test`.`tb1`" + // "\n\tadd index `ix` (`f2` asc);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); @@ -54,7 +53,7 @@ public void test_alter_fulltext() throws Exception { parser.match(Token.EOF); assertEquals("ALTER TABLE `test`.`tb1`\n" - + "\t ALTER INDEX `ix` FULLTEXT ANALYZER = 'sfewfw';", SQLUtils.toMySqlString(stmt)); + + "\t ALTER INDEX `ix` FULLTEXT ANALYZER = 'sfewfw';", SQLUtils.toMySqlString(stmt)); } @@ -65,7 +64,7 @@ public void test_alter_fulltext2() throws Exception { parser.match(Token.EOF); assertEquals("ALTER TABLE `test`.`tb1`\n" - + "\t ALTER INDEX `ix` FULLTEXT INDEX ANALYZER = 'sfewfw';", SQLUtils.toMySqlString(stmt)); + + "\t ALTER INDEX `ix` FULLTEXT INDEX ANALYZER = 'sfewfw';", SQLUtils.toMySqlString(stmt)); } @@ -76,7 +75,7 @@ public void test_alter_fulltext3() throws Exception { parser.match(Token.EOF); assertEquals("ALTER TABLE `test`.`tb1`\n" - + "\t ALTER INDEX `ix` FULLTEXT QUERY ANALYZER = 'sfewfw';", SQLUtils.toMySqlString(stmt)); + + "\t ALTER INDEX `ix` FULLTEXT QUERY ANALYZER = 'sfewfw';", SQLUtils.toMySqlString(stmt)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_1.java index ba1d286785..2e75f66373 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_1.java @@ -26,16 +26,15 @@ import org.junit.Assert; public class MySqlAlterTableAddIndex_1 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE `test`.`tb1` ADD UNIQUE INDEX `ix2` (`fid` ASC) ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tADD UNIQUE INDEX `ix2` (`fid` ASC);", SQLUtils.toMySqlString(stmt)); - + "\n\tADD UNIQUE INDEX `ix2` (`fid` ASC);", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("alter table `test`.`tb1`" + // "\n\tadd unique index `ix2` (`fid` asc);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_10.java index 1479ba7db8..7571a39eff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_10.java @@ -18,7 +18,6 @@ * @Date 2019-05-06 15:45 */ public class MySqlAlterTableAddIndex_10 extends TestCase { - public void test_alter_table_add_index_with_options() throws Exception { String sql = "ALTER TABLE test001 ADD INDEX `i` using btree (`b`) key_block_size=32 comment 'hehe';"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_11.java index 0b5ff83912..f7db031b36 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_11.java @@ -18,7 +18,6 @@ * @Date 2019-05-06 15:45 */ public class MySqlAlterTableAddIndex_11 extends TestCase { - public void test_alter_table_add_index_with_options() throws Exception { String sql = "ALTER TABLE aliyun_poc_db.tbl_custom_analyzer2 ADD FULLTEXT INDEX title_fulltext_idx (title) WITH INDEX ANALYZER index_analyzer2 WITH QUERY ANALYZER query_analyzer2 WITH DICT user_dict;"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_2.java index fdd1b77654..eb5501fe2f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_2.java @@ -26,16 +26,15 @@ import org.junit.Assert; public class MySqlAlterTableAddIndex_2 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE geom ADD SPATIAL INDEX(g);"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE geom\n" + "\tADD SPATIAL INDEX (g);", SQLUtils.toMySqlString(stmt)); - + Assert.assertEquals("alter table geom\n" + "\tadd spatial index (g);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_3.java index bcbfd048f7..5ae04d6b94 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_3.java @@ -26,16 +26,15 @@ import org.junit.Assert; public class MySqlAlterTableAddIndex_3 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE t_order ADD UNIQUE GLOBAL INDEX `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) dbpartition by hash(`buyer_id`);"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE t_order\n" + "\tADD UNIQUE GLOBAL INDEX `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) DBPARTITION BY hash(`buyer_id`);", SQLUtils.toMySqlString(stmt)); - + Assert.assertEquals("alter table t_order\n" + "\tadd unique global index `g_i_buyer` (`buyer_id`) covering (order_snapshot) dbpartition by hash(`buyer_id`);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_4.java index 8e24bedcf2..77e5027026 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_4.java @@ -26,16 +26,15 @@ import org.junit.Assert; public class MySqlAlterTableAddIndex_4 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE t_order ADD INDEX `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) dbpartition by hash(`buyer_id`);"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE t_order\n" + "\tADD INDEX `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) DBPARTITION BY hash(`buyer_id`);", SQLUtils.toMySqlString(stmt)); - + Assert.assertEquals("alter table t_order\n" + "\tadd index `g_i_buyer` (`buyer_id`) covering (order_snapshot) dbpartition by hash(`buyer_id`);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_5.java index f6f135a78e..23c59a253c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_5.java @@ -28,16 +28,15 @@ import com.alibaba.druid.util.JdbcConstants; public class MySqlAlterTableAddIndex_5 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE t_order ADD UNIQUE GLOBAL INDEX `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) dbpartition by hash(`buyer_id`) tbpartition by hash(`buyer_id`);"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE t_order\n" + "\tADD UNIQUE GLOBAL INDEX `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) DBPARTITION BY hash(`buyer_id`) TBPARTITION BY hash(`buyer_id`);", SQLUtils.toMySqlString(stmt)); - + Assert.assertEquals("alter table t_order\n" + "\tadd unique global index `g_i_buyer` (`buyer_id`) covering (order_snapshot) dbpartition by hash(`buyer_id`) tbpartition by hash(`buyer_id`);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_6.java index 3cd8a60ce9..b4b7bd8fa3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_6.java @@ -28,17 +28,16 @@ import com.alibaba.druid.util.JdbcConstants; public class MySqlAlterTableAddIndex_6 extends TestCase { - public void test_alter_first() throws Exception { String sql = - "ALTER TABLE t_order ADD UNIQUE GLOBAL INDEX `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) dbpartition by hash(`buyer_id`) tbpartition by hash(`buyer_id`) COMMENT \"CREATE GSI TEST\";"; + "ALTER TABLE t_order ADD UNIQUE GLOBAL INDEX `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) dbpartition by hash(`buyer_id`) tbpartition by hash(`buyer_id`) COMMENT \"CREATE GSI TEST\";"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE t_order\n" + "\tADD UNIQUE GLOBAL INDEX `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) DBPARTITION BY hash(`buyer_id`) TBPARTITION BY hash(`buyer_id`) COMMENT 'CREATE GSI TEST';", SQLUtils.toMySqlString(stmt)); - + Assert.assertEquals("alter table t_order\n" + "\tadd unique global index `g_i_buyer` (`buyer_id`) covering (order_snapshot) dbpartition by hash(`buyer_id`) tbpartition by hash(`buyer_id`) comment 'CREATE GSI TEST';", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_7.java index 7eb04fc41f..1a831f4883 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_7.java @@ -28,17 +28,16 @@ import com.alibaba.druid.util.JdbcConstants; public class MySqlAlterTableAddIndex_7 extends TestCase { - public void test_alter_first() throws Exception { String sql = - "ALTER TABLE t_order ADD UNIQUE GLOBAL INDEX `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) dbpartition by hash(`buyer_id`) tbpartition by UNI_HASH(`buyer_id`) COMMENT \"CREATE GSI TEST\";"; + "ALTER TABLE t_order ADD UNIQUE GLOBAL INDEX `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) dbpartition by hash(`buyer_id`) tbpartition by UNI_HASH(`buyer_id`) COMMENT \"CREATE GSI TEST\";"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE t_order\n" + "\tADD UNIQUE GLOBAL INDEX `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) DBPARTITION BY hash(`buyer_id`) TBPARTITION BY UNI_HASH(`buyer_id`) COMMENT 'CREATE GSI TEST';", SQLUtils.toMySqlString(stmt)); - + Assert.assertEquals("alter table t_order\n" + "\tadd unique global index `g_i_buyer` (`buyer_id`) covering (order_snapshot) dbpartition by hash(`buyer_id`) tbpartition by UNI_HASH(`buyer_id`) comment 'CREATE GSI TEST';", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_8.java index 8f08456428..6590743e5d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_8.java @@ -26,18 +26,17 @@ import org.junit.Assert; public class MySqlAlterTableAddIndex_8 extends TestCase { - public void test_alter_first() throws Exception { String sql = - "alter table `seller_table2` rename `seller_table3` , add key `idx_create`(`gmt_create`)"; + "alter table `seller_table2` rename `seller_table3` , add key `idx_create`(`gmt_create`)"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE `seller_table2`\n" + "\tRENAME TO `seller_table3`,\n" + "\tADD KEY `idx_create` (`gmt_create`)", SQLUtils.toMySqlString(stmt)); - + Assert.assertEquals("alter table `seller_table2`\n" + "\trename to `seller_table3`,\n" + "\tadd key `idx_create` (`gmt_create`)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_9.java index c04d3455a8..05b723a9e8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_9.java @@ -26,17 +26,16 @@ import org.junit.Assert; public class MySqlAlterTableAddIndex_9 extends TestCase { - public void test_0() throws Exception { String sql = - "ALTER TABLE t_order ADD FULLTEXT INDEX `g_i_buyer` (`buyer_id`);"; + "ALTER TABLE t_order ADD FULLTEXT INDEX `g_i_buyer` (`buyer_id`);"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE t_order\n" + "\tADD FULLTEXT INDEX `g_i_buyer` (`buyer_id`);", SQLUtils.toMySqlString(stmt)); - + Assert.assertEquals("alter table t_order\n" + "\tadd fulltext index `g_i_buyer` (`buyer_id`);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); @@ -50,7 +49,7 @@ public void test_0() throws Exception { public void test_1() throws Exception { String sql = - "ALTER TABLE t_order ADD CLUSTERED INDEX `g_i_buyer` (`buyer_id`);"; + "ALTER TABLE t_order ADD CLUSTERED INDEX `g_i_buyer` (`buyer_id`);"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); @@ -71,7 +70,7 @@ public void test_1() throws Exception { public void test_2() throws Exception { String sql = - "ALTER TABLE t_order ADD CLUSTERED KEY `g_i_buyer` (`buyer_id`);"; + "ALTER TABLE t_order ADD CLUSTERED KEY `g_i_buyer` (`buyer_id`);"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); @@ -92,7 +91,7 @@ public void test_2() throws Exception { public void test_3() throws Exception { String sql = - "alter table xxx add key `idx_001`(`col1`,`current_date`,`col2`)"; + "alter table xxx add key `idx_001`(`col1`,`current_date`,`col2`)"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); @@ -113,7 +112,7 @@ public void test_3() throws Exception { public void test_4() throws Exception { String sql = - "alter table xxx add key `idx_001`(`col1`,`current_time`,`col2`)"; + "alter table xxx add key `idx_001`(`col1`,`current_time`,`col2`)"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); @@ -134,7 +133,7 @@ public void test_4() throws Exception { public void test_5() throws Exception { String sql = - "alter table xxx add key `idx_001`(`current_timestamp`,`curdate`,`LOCALTIME`, `LOCALTIMESTAMP`)"; + "alter table xxx add key `idx_001`(`current_timestamp`,`curdate`,`LOCALTIME`, `LOCALTIMESTAMP`)"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey.java index 61797a82b4..6e7c2848af 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey.java @@ -26,17 +26,16 @@ import org.junit.Assert; public class MySqlAlterTableAddPrimaryKey extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE `test`.`tb1` CHANGE COLUMN `fid` `fid` INT(11) NOT NULL DEFAULT NULL, ADD PRIMARY KEY (`fid`) ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tCHANGE COLUMN `fid` `fid` INT(11) NOT NULL DEFAULT NULL,\n\t" + // - "ADD PRIMARY KEY (`fid`);", SQLUtils.toMySqlString(stmt)); - + "\n\tCHANGE COLUMN `fid` `fid` INT(11) NOT NULL DEFAULT NULL,\n\t" + // + "ADD PRIMARY KEY (`fid`);", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("alter table `test`.`tb1`" + // "\n\tchange column `fid` `fid` INT(11) not null default null,\n\t" + // "add primary key (`fid`);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey_1.java index 26e69419b5..5249c94bd7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey_1.java @@ -26,16 +26,15 @@ import org.junit.Assert; public class MySqlAlterTableAddPrimaryKey_1 extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table tabelname add constraint mYconstraint primary key(id)"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE tabelname" + // - "\n\tADD PRIMARY KEY (id)", SQLUtils.toMySqlString(stmt)); - + "\n\tADD PRIMARY KEY (id)", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("alter table tabelname" + // "\n\tadd primary key (id)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddUniqueTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddUniqueTest.java index 346266840b..ab80931dd9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddUniqueTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddUniqueTest.java @@ -26,16 +26,15 @@ import org.junit.Assert; public class MySqlAlterTableAddUniqueTest extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE icp.wx_msg ADD CONSTRAINT idx_msgId_msgType_event_eventKey UNIQUE (msgId, msgType, event, eventKey)"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE icp.wx_msg" + "\n\tADD UNIQUE (msgId, msgType, event, eventKey)", SQLUtils.toMySqlString(stmt)); - + Assert.assertEquals("alter table icp.wx_msg" + "\n\tadd unique (msgId, msgType, event, eventKey)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnDropDefaultTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnDropDefaultTest.java index bf41df024a..d9d2f60156 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnDropDefaultTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnDropDefaultTest.java @@ -23,16 +23,15 @@ import org.junit.Assert; public class MySqlAlterTableAlterColumnDropDefaultTest extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table tabelname alter column operateVersion drop default"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE tabelname" + // - "\n\tALTER COLUMN operateVersion DROP DEFAULT", SQLUtils.toMySqlString(stmt)); - + "\n\tALTER COLUMN operateVersion DROP DEFAULT", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("alter table tabelname" + // "\n\talter column operateVersion drop default", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnSetDefaultTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnSetDefaultTest.java index 99404d696f..fc95a8fa92 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnSetDefaultTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnSetDefaultTest.java @@ -23,16 +23,15 @@ import org.junit.Assert; public class MySqlAlterTableAlterColumnSetDefaultTest extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table tabelname alter column operateVersion set default 0"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE tabelname" + // - "\n\tALTER COLUMN operateVersion SET DEFAULT 0", SQLUtils.toMySqlString(stmt)); - + "\n\tALTER COLUMN operateVersion SET DEFAULT 0", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("alter table tabelname" + // "\n\talter column operateVersion set default 0", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnTest.java index 85e9d4ec66..51a35c0423 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnTest.java @@ -22,16 +22,15 @@ import junit.framework.TestCase; public class MySqlAlterTableAlterColumnTest extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE `cube_template` ADD `stat_report_json` VARCHAR(256) CHARSET utf8 COLLATE utf8_general_ci DEFAULT '' NOT NULL COMMENT '模板的统计报表json数组';"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + assertEquals("ALTER TABLE `cube_template`\n" + "\tADD COLUMN `stat_report_json` VARCHAR(256) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '模板的统计报表json数组';", SQLUtils.toMySqlString(stmt)); - + assertEquals("alter table `cube_template`\n" + "\tadd column `stat_report_json` VARCHAR(256) character set utf8 collate utf8_general_ci not null default '' comment '模板的统计报表json数组';", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDisableKeys.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDisableKeys.java index 65d1b69df9..3352d1b8d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDisableKeys.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDisableKeys.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableDisableKeys extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table tableName DISABLE KEYS"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -40,11 +39,11 @@ public void test_alter_first() throws Exception { // System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals("ALTER TABLE tableName" + // - "\n\tDISABLE KEYS", SQLUtils.toMySqlString(stmt)); + "\n\tDISABLE KEYS", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("alter table tableName" + // "\n\tdisable keys", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_0.java index 2236ac6df5..7837aa7c1a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_0.java @@ -25,16 +25,15 @@ import junit.framework.TestCase; public class MySqlAlterTableDropIndex_0 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE `test`.`tb1` DROP INDEX `ix` ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tDROP INDEX `ix`;", SQLUtils.toMySqlString(stmt)); - + "\n\tDROP INDEX `ix`;", SQLUtils.toMySqlString(stmt)); + assertEquals("alter table `test`.`tb1`" + // "\n\tdrop index `ix`;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_1.java index afcf642bd3..359ff4dce6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_1.java @@ -25,17 +25,16 @@ import org.junit.Assert; public class MySqlAlterTableDropIndex_1 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE `test`.`tb1` DROP INDEX `ix`, DROP INDEX `ix2` ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tDROP INDEX `ix`," + // - "\n\tDROP INDEX `ix2`;", SQLUtils.toMySqlString(stmt)); - + "\n\tDROP INDEX `ix`," + // + "\n\tDROP INDEX `ix2`;", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("alter table `test`.`tb1`" + // "\n\tdrop index `ix`," + // "\n\tdrop index `ix2`;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropKey.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropKey.java index dca864acc6..c3059abaa1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropKey.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropKey.java @@ -26,16 +26,15 @@ import org.junit.Assert; public class MySqlAlterTableDropKey extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table t6 drop key v"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE t6" + // - "\n\tDROP KEY v", SQLUtils.toMySqlString(stmt)); - + "\n\tDROP KEY v", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("alter table t6" + // "\n\tdrop key v", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropPrimaryKey.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropPrimaryKey.java index 1f48d664b2..4627369101 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropPrimaryKey.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropPrimaryKey.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableDropPrimaryKey extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table tableName DROP PRIMARY KEY"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -40,8 +39,8 @@ public void test_alter_first() throws Exception { // System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals("ALTER TABLE tableName" + // - "\n\tDROP PRIMARY KEY", SQLUtils.toMySqlString(stmt)); - + "\n\tDROP PRIMARY KEY", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("alter table tableName" + // "\n\tdrop primary key", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test.java index 006bb80052..039249654d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test.java @@ -23,18 +23,17 @@ import org.junit.Assert; public class MySqlAlterTableDrop_Test extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE `rules` DROP `enabled`"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE `rules`" // - + "\n\tDROP COLUMN `enabled`", SQLUtils.toMySqlString(stmt)); - + + "\n\tDROP COLUMN `enabled`", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("alter table `rules`" // - + "\n\tdrop column `enabled`", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\n\tdrop column `enabled`", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_1.java index a8ab6c4401..c7ff170a0e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_1.java @@ -23,17 +23,16 @@ import org.junit.Assert; public class MySqlAlterTableDrop_Test_1 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE test.student DROP Column9, DROP Column10;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE test.student\n" + "\tDROP COLUMN Column9,\n" + "\tDROP COLUMN Column10;", SQLUtils.toMySqlString(stmt)); - + Assert.assertEquals("alter table test.student\n" + "\tdrop column Column9,\n" + "\tdrop column Column10;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_2.java index 947222f2e9..f63dccd93f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_2.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableDrop_Test_2 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE test_ddl \n" + "DROP COLUMN display_name, \n" + @@ -32,12 +31,12 @@ public void test_alter_first() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE test_ddl\n" + "\tDROP COLUMN display_name,\n" + "\tMODIFY COLUMN id bigint(20) UNSIGNED NOT NULL,\n" + "\tCHANGE COLUMN content content VARCHAR(3000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '未填写' COMMENT '默认'", SQLUtils.toMySqlString(stmt)); - + Assert.assertEquals("alter table test_ddl\n" + "\tdrop column display_name,\n" + "\tmodify column id bigint(20) unsigned not null,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableEnableKeys.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableEnableKeys.java index eb9d94da28..a13f22655f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableEnableKeys.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableEnableKeys.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableEnableKeys extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table tableName ENABLE KEYS"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -40,8 +39,8 @@ public void test_alter_first() throws Exception { // System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals("ALTER TABLE tableName" + // - "\n\tENABLE KEYS", SQLUtils.toMySqlString(stmt)); - + "\n\tENABLE KEYS", SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("alter table tableName" + // "\n\tenable keys", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest.java index f557883ecc..48b56a122b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest.java @@ -32,17 +32,17 @@ public void test_alter_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tCHANGE COLUMN `fname` `fname1` VARCHAR(45) NULL DEFAULT NULL;", output); } - + public void test_alter_1() throws Exception { String sql = "ALTER TABLE `test`.`tb1` CHARACTER SET = utf8 , COLLATE = utf8_general_ci ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tCHARACTER SET = utf8 COLLATE = utf8_general_ci;", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("alter table `test`.`tb1`\n\tcharacter set = utf8 collate = utf8_general_ci;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - + public void test_alter_2() throws Exception { String sql = "ALTER TABLE `test`.`tb1` ADD INDEX `f` (`fname` ASC) ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -51,7 +51,7 @@ public void test_alter_2() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD INDEX `f` (`fname` ASC);", output); } - + public void test_alter_3() throws Exception { String sql = "ALTER TABLE `test`.`tb1` ENGINE = InnoDB ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -60,7 +60,7 @@ public void test_alter_3() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tENGINE = InnoDB;", output); } - + public void test_alter_4() throws Exception { String sql = "ALTER TABLE `test`.`tb1` COLLATE = utf8_general_ci , PACK_KEYS = Pack All , ENGINE = InnoDB ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -69,7 +69,7 @@ public void test_alter_4() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tCOLLATE = utf8_general_ci PACK_KEYS = PACK ALL ENGINE = InnoDB;", output); } - + public void test_alter_5() throws Exception { String sql = "ALTER TABLE t1 COMMENT '表的注释';"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest1.java index ffa3213285..521c2572be 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest1.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest1 extends TestCase { - public void test_alter_0() throws Exception { String sql = "ALTER TABLE t1 RENAME t2;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -32,7 +31,7 @@ public void test_alter_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("RENAME TABLE t1 TO t2;", output); } - + public void test_alter_1() throws Exception { String sql = "ALTER TABLE t2 ADD d TIMESTAMP;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_1() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE t2\n\tADD COLUMN d TIMESTAMP;", output); } - + public void test_alter_2() throws Exception { String sql = "ALTER TABLE t2 ADD INDEX (d), ADD UNIQUE (a);"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -50,7 +49,7 @@ public void test_alter_2() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE t2\n\tADD INDEX (d),\n\tADD UNIQUE (a);", output); } - + public void test_alter_3() throws Exception { String sql = "ALTER TABLE t1 RENAME TO t2;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -59,7 +58,7 @@ public void test_alter_3() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("RENAME TABLE t1 TO t2;", output); } - + public void test_alter_4() throws Exception { String sql = "ALTER TABLE t1 RENAME AS t2;"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest10.java index 9d73a30992..b3ba9b6bfe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest10.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest10 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE t1 CHANGE a b INTEGER;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE t1" + // - "\n\tCHANGE COLUMN a b INTEGER;", output); + "\n\tCHANGE COLUMN a b INTEGER;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest11.java index 0f08a49a25..40441d58a1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest11.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest11 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE t1 MODIFY b BIGINT NOT NULL;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE t1" + - "\n\tMODIFY COLUMN b BIGINT NOT NULL;", output); + "\n\tMODIFY COLUMN b BIGINT NOT NULL;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest12.java index 6274272db9..48599ea8e9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest12.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest12 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE tbl_name DROP FOREIGN KEY fk_symbol;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tbl_name" + // - "\n\tDROP FOREIGN KEY fk_symbol;", output); + "\n\tDROP FOREIGN KEY fk_symbol;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest13.java index 73637218d6..365e1da827 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest13.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest13 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE tbl_name DISCARD TABLESPACE;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tbl_name" + // - "\n\tDISCARD TABLESPACE;", output); + "\n\tDISCARD TABLESPACE;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest14.java index 1391d25c4e..4d58e74725 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest14.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest14 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE tbl_name IMPORT TABLESPACE;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tbl_name" + // - "\n\tIMPORT TABLESPACE;", output); + "\n\tIMPORT TABLESPACE;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest15.java index 53dd52511c..80e67750c8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest15.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest15 extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table st_jklsxxb disable constraint FK_ST_xxx_REFERENCE_ST_xxx"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE st_jklsxxb" + // - "\n\tDISABLE CONSTRAINT FK_ST_xxx_REFERENCE_ST_xxx", output); + "\n\tDISABLE CONSTRAINT FK_ST_xxx_REFERENCE_ST_xxx", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest16.java index d949f34562..aa4158ab58 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest16.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest16 extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table st_jklsxxb enable constraint FK_ST_xxx_REFERENCE_ST_xxx"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE st_jklsxxb" + // - "\n\tENABLE CONSTRAINT FK_ST_xxx_REFERENCE_ST_xxx", output); + "\n\tENABLE CONSTRAINT FK_ST_xxx_REFERENCE_ST_xxx", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest17.java index 7ca4774592..54859d43fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest17.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest17 extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table rms.rms_Person_Event drop foreign key FKA382487726D72F65"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE rms.rms_Person_Event\n" + // - "\tDROP FOREIGN KEY FKA382487726D72F65", output); + "\tDROP FOREIGN KEY FKA382487726D72F65", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest18.java index 921424f6bf..0116a7b163 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest18.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest18 extends TestCase { - public void test_alter_charset() throws Exception { String sql = "ALTER TABLE `test`.`tb1` ADD COLUMN `f2` VARCHAR(45) CHARACTER SET gbk NULL FIRST ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_collate() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD COLUMN `f2` VARCHAR(45) COLLATE utf8_bin NULL FIRST;", output); } - + public void test_alter_charset_collate() throws Exception { String sql = "ALTER TABLE `test`.`tb1` ADD COLUMN `f2` VARCHAR(45) CHARACTER SET utf8 COLLATE utf8_bin NULL FIRST ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest19.java index 3135e4331e..fa0e5f02bd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest19.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest19 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "ALTER TABLE `test`.`tb1` ADD KEY `idx_parent_id` (`parent_id`)"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -32,7 +31,7 @@ public void test_alter_add_key() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE `test`.`tb1`\n\tADD KEY `idx_parent_id` (`parent_id`)", output); } - + public void test_alter_add_index() throws Exception { String sql = "ALTER TABLE `test`.`tb1` ADD INDEX `idx_parent_id` (`parent_id`)"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest2.java index c5bc2c2e12..3fd3923b9b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest2.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest2 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE `test`.`tb1` ADD COLUMN `f2` VARCHAR(45) NULL FIRST ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -40,8 +39,8 @@ public void test_alter_add_column() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tADD COLUMN `f2` VARCHAR(45) NULL AFTER `fid`," + // - "\n\tADD COLUMN `f3` VARCHAR(45) NULL FIRST `f2`", output); + "\n\tADD COLUMN `f2` VARCHAR(45) NULL AFTER `fid`," + // + "\n\tADD COLUMN `f3` VARCHAR(45) NULL FIRST `f2`", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest20.java index 942c0dc9eb..a627c8cada 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest20.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest20 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "ALTER TABLE score1 ADD ( test3 int(11),test4 int(11))"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -31,7 +30,7 @@ public void test_alter_add_key() throws Exception { parser.match(Token.EOF); Assert.assertEquals("ALTER TABLE score1" + "\n\tADD COLUMN (test3 int(11), test4 int(11))", SQLUtils.toMySqlString(stmt)); - + Assert.assertEquals("alter table score1" + "\n\tadd column (test3 int(11), test4 int(11))", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest21.java index 71994a2170..d448565904 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest21.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest21 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "ALTER TABLE tbl_name CONVERT TO CHARACTER SET charset_name"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest22.java index 0b0266e682..dbf3d5712e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest22.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest22 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "alter table pj_usr_auth add constraint FK_Reference_8 foreign key (usr) references usr (usr) on delete restrict on update restrict;"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest23.java index b34dc4ffde..64bc32695c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest23.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest23 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "alter table xxxxx modify (xxx default '0');"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -31,6 +30,6 @@ public void test_alter_add_key() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE xxxxx" - + "\n\tMODIFY COLUMN xxx DEFAULT '0';", output); + + "\n\tMODIFY COLUMN xxx DEFAULT '0';", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest24.java index b354bfc5fb..59e771788e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest24.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest24 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "alter table xxxxx modify (f0 default '0',f1 default '0');"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -31,7 +30,7 @@ public void test_alter_add_key() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE xxxxx" - + "\n\tMODIFY COLUMN f0 DEFAULT '0'," - + "\n\tMODIFY COLUMN f1 DEFAULT '0';", output); + + "\n\tMODIFY COLUMN f0 DEFAULT '0'," + + "\n\tMODIFY COLUMN f1 DEFAULT '0';", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest25.java index b097204d13..f642250647 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest25.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest25 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "alter table xxxx add over bigint unsigned comment 'xxxx';"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest26.java index 5da4b91d5a..fa4d2576d8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest26.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest26 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "alter table xxxx UNION = (t1, t2);"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest27.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest27.java index 375921d45d..928c44103a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest27.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest27 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "ALTER TABLE app_key ROW_FORMAT = DEFAULT"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest28.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest28.java index 85de2ba41a..74b7c8e14a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest28.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest28 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "ALTER TABLE project_measures MODIFY COLUMN value DECIMAL (38,20) NULL, MODIFY COLUMN variation_value_1 DECIMAL (38,20) NULL, MODIFY COLUMN variation_value_2 DECIMAL (38,20) NULL, MODIFY COLUMN variation_value_3 DECIMAL (38,20) NULL, MODIFY COLUMN variation_value_4 DECIMAL (38,20) NULL, MODIFY COLUMN variation_value_5 DECIMAL (38,20) NULL"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest29.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest29.java index 1b595abb30..e886ec80bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest29.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest29 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "alter TABLE project_measures\n" + " DROP COLUMN diff_value_1,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest3.java index c4a299e67c..dd7528d50b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest3.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest3 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE `test`.`tb1` DROP COLUMN `f3` , CHANGE COLUMN `fname` `fname` VARCHAR(45) CHARACTER SET 'latin1' NULL DEFAULT NULL AFTER `fid`"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -31,9 +30,9 @@ public void test_alter_first() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tDROP COLUMN `f3`," + // - "\n\tCHANGE COLUMN `fname` `fname` VARCHAR(45) CHARACTER SET latin1 NULL DEFAULT NULL AFTER `fid`", - output); + "\n\tDROP COLUMN `f3`," + // + "\n\tCHANGE COLUMN `fname` `fname` VARCHAR(45) CHARACTER SET latin1 NULL DEFAULT NULL AFTER `fid`", + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest30.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest30.java index c32f6cac96..f1b44436cd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest30.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest30 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "ALTER TABLE test_table_normal\n" + "ADD FOREIGN KEY (stuID)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest31_renameIndex.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest31_renameIndex.java index c03edcfe2d..de9ce0cbf6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest31_renameIndex.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest31_renameIndex.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest31_renameIndex extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "ALTER TABLE test_table_normal\n" + "RENAME INDEX old_index_name TO new_index_name"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest32.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest32.java index 2ab8d53bf5..ac45dfbe0b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest32.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest32 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "ALTER TABLE src.`part_tab` DISCARD PARTITION p10 TABLESPACE"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest33.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest33.java index 06a34a0004..d55b874a67 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest33.java @@ -22,7 +22,6 @@ import junit.framework.TestCase; public class MySqlAlterTableTest33 extends TestCase { - public void test_exchange_0() throws Exception { String sql = "ALTER TABLE src.`part_tab` EXCHANGE PARTITION p9 WITH TABLE test_create_table without validation"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest34_renameIndex.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest34_renameIndex.java index 0842c53c08..b9537ac031 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest34_renameIndex.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest34_renameIndex.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class MySqlAlterTableTest34_renameIndex extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "alter table test.table rename index idx_status to idx_status_2"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest35_multi.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest35_multi.java index ef2c3d00a2..3cfed57b5b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest35_multi.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest35_multi.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlAlterTableTest35_multi extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "ALTER TABLE `datacompute`.`users_quan` \n" + "DROP COLUMN `address`,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest36.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest36.java index c75c07ab64..a6e68f485e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest36.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlAlterTableTest36 extends TestCase { - public void test_alter_add_key() throws Exception { String sql = "ALTER TABLE t1 ADD INDEX idx_order_id(first_name) USING BTREE"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest37.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest37.java index e5d6a1fc14..046dbfc3f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest37.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest37.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlAlterTableTest37 extends TestCase { - public void test_alter_modify_clustered_by() throws Exception { String sql = "alter table new_ddl.ddl_test_1 clustered by (col1, col2)"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); @@ -31,6 +30,6 @@ public void test_alter_modify_clustered_by() throws Exception { SQLStatement stmt = stmtList.get(0); String output = SQLUtils.toMySqlString(stmt); assertEquals("ALTER TABLE new_ddl.ddl_test_1\n" - + "\tCLUSTERED BY col1, col2", output); + + "\tCLUSTERED BY col1, col2", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest38.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest38.java index e7fb2b8ba5..9a47e1b484 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest38.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest38.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlAlterTableTest38 extends TestCase { - public void test_alter_modify_clustered_by() throws Exception { String sql = "ALTER TABLE `result` ADD INDEX `index_code` (`code`) USING BTREE;"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest39_ann.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest39_ann.java index 8168e75a2b..a4d90627b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest39_ann.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest39_ann.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlAlterTableTest39_ann extends TestCase { - public void test_alter_modify_clustered_by() throws Exception { String sql = "ALTER TABLE face_feature ADD ANN INDEX facefea_index2 (facefea) DistanceMeasure = DotProduct ALGORITHM = IVF;"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest4.java index 6f628b6f4e..d6189c1e59 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest4.java @@ -25,7 +25,6 @@ import org.junit.Assert; public class MySqlAlterTableTest4 extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table test add dspcode char(200)"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -42,8 +41,8 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE test" + // - "\n\tADD COLUMN dspcode char(200)", output); - + "\n\tADD COLUMN dspcode char(200)", output); + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertTrue(visitor.getColumns().contains(new Column("test", "dspcode"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest41.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest41.java index d0254ca025..3286e599dc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest41.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest41.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlAlterTableTest41 extends TestCase { - public void test_alter_1() throws Exception { String sql = "alter table test COLLATE utf8mb4_unicode_ci"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest42.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest42.java index 2f12e400fc..8e3454ecfd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest42.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest42.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlAlterTableTest42 extends TestCase { - public void test_alter_modify_clustered_by() throws Exception { String sql = "alter table task AUTO_INCREMENT = 20000000 COMMENT ='自增起始值'"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest43.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest43.java index 97aa6eabeb..71a5d1cf1e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest43.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest43.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlAlterTableTest43 extends TestCase { - public void test_0() throws Exception { String sql = "ALTER TABLE logical_db.logical_tb SET TBLPROPERTIES ('read_only'=1)"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest44.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest44.java index d54ac16955..39c3fc0473 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest44.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest44.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlAlterTableTest44 extends TestCase { - public void test_0() throws Exception { String sql = "ALTER TABLE logical_db.logical_tb SET TBLPROPERTIES ('read_only'=1)"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest45.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest45.java index be42175bce..16935f528c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest45.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest45.java @@ -15,45 +15,45 @@ public class MySqlAlterTableTest45 extends TestCase { public void test_0() throws Exception { String sql = "ALTER TABLE xx\n" + - "ADD \n" + - "EXTPARTITION (\n" + - "DBPARTITION xxx BY KEY('abc') TBPARTITION yyy BY KEY('abc'), \n" + - "DBPARTITION yyy BY KEY('def') TBPARTITION yyy BY KEY('def'), \n" + - "DBPARTITION yyy BY KEY('gpk')\n" + - ")"; + "ADD \n" + + "EXTPARTITION (\n" + + "DBPARTITION xxx BY KEY('abc') TBPARTITION yyy BY KEY('abc'), \n" + + "DBPARTITION yyy BY KEY('def') TBPARTITION yyy BY KEY('def'), \n" + + "DBPARTITION yyy BY KEY('gpk')\n" + + ")"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); assertEquals(1, stmtList.size()); SQLStatement stmt = stmtList.get(0); String output = stmt.toString(); assertEquals("ALTER TABLE xx\n\t" + - "ADD \n\t" + - "EXTPARTITION (\n\t" + - "\tDBPARTITION xxx BY KEY('abc') TBPARTITION yyy BY KEY('abc'), \n\t" + - "\tDBPARTITION yyy BY KEY('def') TBPARTITION yyy BY KEY('def'), \n\t" + - "\tDBPARTITION yyy BY KEY('gpk')\n\t" + - ")", output); + "ADD \n\t" + + "EXTPARTITION (\n\t" + + "\tDBPARTITION xxx BY KEY('abc') TBPARTITION yyy BY KEY('abc'), \n\t" + + "\tDBPARTITION yyy BY KEY('def') TBPARTITION yyy BY KEY('def'), \n\t" + + "\tDBPARTITION yyy BY KEY('gpk')\n\t" + + ")", output); } public void test_1() throws Exception { String sql = "ALTER TABLE xx\n" + - "DROP \n" + - "EXTPARTITION (\n" + - "DBPARTITION xxx BY KEY('abc') TBPARTITION yyy BY KEY('abc'), \n" + - "DBPARTITION yyy BY KEY('def') TBPARTITION yyy BY KEY('def'), \n" + - "DBPARTITION yyy BY KEY('gpk')\n" + - ")"; + "DROP \n" + + "EXTPARTITION (\n" + + "DBPARTITION xxx BY KEY('abc') TBPARTITION yyy BY KEY('abc'), \n" + + "DBPARTITION yyy BY KEY('def') TBPARTITION yyy BY KEY('def'), \n" + + "DBPARTITION yyy BY KEY('gpk')\n" + + ")"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); assertEquals(1, stmtList.size()); SQLStatement stmt = stmtList.get(0); String output = stmt.toString(); assertEquals("ALTER TABLE xx\n\t" + - "DROP \n\t" + - "EXTPARTITION (\n\t" + - "\tDBPARTITION xxx BY KEY('abc') TBPARTITION yyy BY KEY('abc'), \n\t" + - "\tDBPARTITION yyy BY KEY('def') TBPARTITION yyy BY KEY('def'), \n\t" + - "\tDBPARTITION yyy BY KEY('gpk')\n\t" + - ")", output); + "DROP \n\t" + + "EXTPARTITION (\n\t" + + "\tDBPARTITION xxx BY KEY('abc') TBPARTITION yyy BY KEY('abc'), \n\t" + + "\tDBPARTITION yyy BY KEY('def') TBPARTITION yyy BY KEY('def'), \n\t" + + "\tDBPARTITION yyy BY KEY('gpk')\n\t" + + ")", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest5.java index 2584883775..edfd308fd6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest5.java @@ -25,7 +25,6 @@ import org.junit.Assert; public class MySqlAlterTableTest5 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE table_name change COLUMN column_name column_newname char(50)"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -42,7 +41,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE table_name" + // - "\n\tCHANGE COLUMN column_name column_newname char(50)", output); + "\n\tCHANGE COLUMN column_name column_newname char(50)", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest51_table_options.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest51_table_options.java index 0a69945e7e..d18f06db57 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest51_table_options.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest51_table_options.java @@ -8,7 +8,6 @@ import org.junit.Assert; public class MySqlAlterTableTest51_table_options extends TestCase { - public void test_0_options_no_comma_no_eq() { String sql = "alter table test001\n" + "auto_increment 1\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest52_primary_prefix_key.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest52_primary_prefix_key.java index 724e11ff6b..7b2f08d1bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest52_primary_prefix_key.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest52_primary_prefix_key.java @@ -15,7 +15,6 @@ * @Date 2019-05-15 14:37 */ public class MySqlAlterTableTest52_primary_prefix_key extends TestCase { - public void test_0() { String sql = "alter table test001 add primary key (b (4) asc, c (8) desc);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest54.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest54.java index 2684c8472a..fcd8dc11f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest54.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest54.java @@ -30,7 +30,7 @@ public void test_1() throws Exception { public void test_2() throws Exception { String sql = "alter table event_log storage_policy = 'MIXED' hot_partition_count = 10;"; MySqlStatementParser parser = new MySqlStatementParser(sql); - SQLAlterTableStatement stmt = (SQLAlterTableStatement)parser.parseStatementList().get(0); + SQLAlterTableStatement stmt = (SQLAlterTableStatement) parser.parseStatementList().get(0); assertEquals(2, stmt.getTableOptions().size()); String formatSql = SQLUtils.toSQLString(stmt); assertEquals("ALTER TABLE event_log\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest6.java index b5d96d984a..bf1300d9f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest6.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest6 extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table tableName DROP FOREIGN KEY fk_symbol"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tableName" + // - "\n\tDROP FOREIGN KEY fk_symbol", output); + "\n\tDROP FOREIGN KEY fk_symbol", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest7.java index 4aebab1d1b..544b857ee3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest7.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest7 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE t1 ENGINE = InnoDB;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE t1" + // - "\n\tENGINE = InnoDB;", output); + "\n\tENGINE = InnoDB;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest8.java index 64746e2919..921e67f0ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest8.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest8 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE t2 AUTO_INCREMENT = 3"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,7 +40,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE t2" + // - "\n\tAUTO_INCREMENT = 3", output); + "\n\tAUTO_INCREMENT = 3", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest9.java index 195b8302bf..baa163e5d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest9.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest9 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE t2 DROP COLUMN c, DROP COLUMN d;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,8 +40,8 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE t2" + // - "\n\tDROP COLUMN c," + // - "\n\tDROP COLUMN d;", output); + "\n\tDROP COLUMN c," + // + "\n\tDROP COLUMN d;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_40_change.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_40_change.java index 73850abecd..a2da137384 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_40_change.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_40_change.java @@ -30,7 +30,6 @@ import org.junit.Assert; public class MySqlAlterTableTest_40_change extends TestCase { - public void test_alter_constraint() throws Exception { String sql = "alter table sdfwef change column a c int"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -50,7 +49,7 @@ public void test_alter_constraint() throws Exception { Assert.assertEquals("alter table sdfwef\n" + "\tchange column a c int", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_addFk.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_addFk.java index 6f63f908fa..33b8ca16df 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_addFk.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_addFk.java @@ -26,10 +26,9 @@ import org.junit.Assert; public class MySqlAlterTableTest_addFk extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table Test2 add index FK4CF5DC0F5DD7C31 (test1_name), " + // - "add constraint FK4CF5DC0F5DD7C31 foreign key (test1_name) references Test1 (name)"; + "add constraint FK4CF5DC0F5DD7C31 foreign key (test1_name) references Test1 (name)"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); @@ -43,13 +42,13 @@ public void test_alter_first() throws Exception { // System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals("ALTER TABLE Test2" + // - "\n\tADD INDEX FK4CF5DC0F5DD7C31 (test1_name)," + // - "\n\tADD CONSTRAINT FK4CF5DC0F5DD7C31 FOREIGN KEY (test1_name) REFERENCES Test1 (name)", - SQLUtils.toMySqlString(stmt)); - + "\n\tADD INDEX FK4CF5DC0F5DD7C31 (test1_name)," + // + "\n\tADD CONSTRAINT FK4CF5DC0F5DD7C31 FOREIGN KEY (test1_name) REFERENCES Test1 (name)", + SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("alter table Test2" + // - "\n\tadd index FK4CF5DC0F5DD7C31 (test1_name)," + // - "\n\tadd constraint FK4CF5DC0F5DD7C31 foreign key (test1_name) references Test1 (name)", + "\n\tadd index FK4CF5DC0F5DD7C31 (test1_name)," + // + "\n\tadd constraint FK4CF5DC0F5DD7C31 foreign key (test1_name) references Test1 (name)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(2, visitor.getTables().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_addPk.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_addPk.java index b06b6523ff..278aea5f51 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_addPk.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_addPk.java @@ -25,7 +25,6 @@ import junit.framework.TestCase; public class MySqlAlterTableTest_addPk extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE test.table ADD PRIMARY KEY test_pk(id);"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -42,8 +41,8 @@ public void test_alter_first() throws Exception { assertEquals("ALTER TABLE test.table\n" + "\tADD PRIMARY KEY (id);", - SQLUtils.toMySqlString(stmt)); - + SQLUtils.toMySqlString(stmt)); + assertEquals("alter table test.table\n" + "\tadd primary key (id);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_ads.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_ads.java index a0d1131886..74a70f5359 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_ads.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_ads.java @@ -23,7 +23,6 @@ import junit.framework.TestCase; public class MySqlAlterTableTest_ads extends TestCase { - public void test_alter_1() throws Exception { String sql = "ALTER TABLE grant_db.grant_table ADD INDEX user_id_index HashMap (grant_c1)\n"; @@ -94,7 +93,7 @@ public void test_alter_8() throws Exception { String output = SQLUtils.toMySqlString(stmt); assertEquals("ALTER TABLE grant_db.grant_table\n" - + "\tADD COLUMN col2 varchar NOT NULL PRIMARY KEY DEFAULT '10'", output); + + "\tADD COLUMN col2 varchar NOT NULL PRIMARY KEY DEFAULT '10'", output); } public void test_alter_9() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_drop_constraint.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_drop_constraint.java index dbae98c615..c461e65267 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_drop_constraint.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_drop_constraint.java @@ -24,7 +24,6 @@ import org.junit.Assert; public class MySqlAlterTableTest_drop_constraint extends TestCase { - public void test_alter_constraint() throws Exception { String sql = "alter table TUSER drop constraint UK_084c17821a8f47e8b31fbb126b6"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -40,11 +39,11 @@ public void test_alter_constraint() throws Exception { // System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals("ALTER TABLE TUSER" + // - "\n\tDROP CONSTRAINT UK_084c17821a8f47e8b31fbb126b6", SQLUtils.toMySqlString(stmt)); + "\n\tDROP CONSTRAINT UK_084c17821a8f47e8b31fbb126b6", SQLUtils.toMySqlString(stmt)); Assert.assertEquals("alter table TUSER" + // "\n\tdrop constraint UK_084c17821a8f47e8b31fbb126b6", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest0.java index b9108986ef..52049212f1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest0.java @@ -24,17 +24,16 @@ import com.alibaba.druid.stat.TableStat; public class MySQLCreateMaterializedViewTest0 extends MysqlTest { - public void test_types() throws Exception { String sql = // - "CREATE MATERIALIZED VIEW mymv (\n" + - " default_col varchar,\n" + - " PRIMARY KEY(id)\n" + - ")\n" + - "DISTRIBUTED BY HASH (id)\n" + - "REFRESH FAST ON DEMAND\n" + - "ENABLE QUERY REWRITE\n" + - "AS SELECT id FROM base;"; + "CREATE MATERIALIZED VIEW mymv (\n" + + " default_col varchar,\n" + + " PRIMARY KEY(id)\n" + + ")\n" + + "DISTRIBUTED BY HASH (id)\n" + + "REFRESH FAST ON DEMAND\n" + + "ENABLE QUERY REWRITE\n" + + "AS SELECT id FROM base;"; SQLStatement stmt = SQLUtils.parseSingleMysqlStatement(sql); @@ -48,7 +47,7 @@ public void test_types() throws Exception { "AS\n" + "SELECT id\n" + "FROM base;",// - SQLUtils.toSQLString(stmt, DbType.mysql, null, VisitorFeature.OutputDistributedLiteralInCreateTableStmt)); + SQLUtils.toSQLString(stmt, DbType.mysql, null, VisitorFeature.OutputDistributedLiteralInCreateTableStmt)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest1.java index 594a51dd60..d2a430582b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest1.java @@ -24,18 +24,17 @@ import com.alibaba.druid.stat.TableStat; public class MySQLCreateMaterializedViewTest1 extends MysqlTest { - public void test_types() throws Exception { String sql = // - "CREATE MATERIALIZED VIEW mymv (\n" + - " PRIMARY KEY(id)\n" + - ")\n" + - "DISTRIBUTED BY HASH (id)\n" + - "REFRESH COMPLETE ON DEMAND\n" + - "START WITH now()\n" + - "NEXT DATE_ADD(now(), INTERVAL 1 MINUTE)\n" + - "ENABLE QUERY REWRITE\n" + - "AS SELECT id FROM base;"; + "CREATE MATERIALIZED VIEW mymv (\n" + + " PRIMARY KEY(id)\n" + + ")\n" + + "DISTRIBUTED BY HASH (id)\n" + + "REFRESH COMPLETE ON DEMAND\n" + + "START WITH now()\n" + + "NEXT DATE_ADD(now(), INTERVAL 1 MINUTE)\n" + + "ENABLE QUERY REWRITE\n" + + "AS SELECT id FROM base;"; SQLStatement stmt = SQLUtils.parseSingleMysqlStatement(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest2.java index b8eb169fa0..7942a82aef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest2.java @@ -23,12 +23,11 @@ import com.alibaba.druid.stat.TableStat; public class MySQLCreateMaterializedViewTest2 extends MysqlTest { - public void test_types() throws Exception { String sql = // - "CREATE MATERIALIZED VIEW mymv\n" + - "ENABLE QUERY REWRITE\n" + - "AS SELECT id FROM base;"; + "CREATE MATERIALIZED VIEW mymv\n" + + "ENABLE QUERY REWRITE\n" + + "AS SELECT id FROM base;"; SQLStatement stmt = SQLUtils.parseSingleMysqlStatement(sql); @@ -37,7 +36,7 @@ public void test_types() throws Exception { "AS\n" + "SELECT id\n" + "FROM base;",// - SQLUtils.toSQLString(stmt, DbType.mysql)); + SQLUtils.toSQLString(stmt, DbType.mysql)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest3.java index 0179c38d50..16141fd03f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest3.java @@ -23,13 +23,12 @@ import com.alibaba.druid.stat.TableStat; public class MySQLCreateMaterializedViewTest3 extends MysqlTest { - public void test_types() throws Exception { String sql = // - "CREATE MATERIALIZED VIEW mymv\n" + - "REFRESH COMPLETE\n" + - "ENABLE QUERY REWRITE\n" + - "AS SELECT id FROM base;"; + "CREATE MATERIALIZED VIEW mymv\n" + + "REFRESH COMPLETE\n" + + "ENABLE QUERY REWRITE\n" + + "AS SELECT id FROM base;"; SQLStatement stmt = SQLUtils.parseSingleMysqlStatement(sql); @@ -39,7 +38,7 @@ public void test_types() throws Exception { "AS\n" + "SELECT id\n" + "FROM base;",// - SQLUtils.toSQLString(stmt, DbType.mysql)); + SQLUtils.toSQLString(stmt, DbType.mysql)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest4.java index bf78f6602c..60870fd8ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest4.java @@ -24,16 +24,15 @@ import com.alibaba.druid.stat.TableStat; public class MySQLCreateMaterializedViewTest4 extends MysqlTest { - public void test_types() throws Exception { String sql = // - "CREATE MATERIALIZED VIEW mymv (\n" + - " PRIMARY KEY(id)\n" + - ")\n" + - "DISTRIBUTED BY HASH (id)\n" + - "REFRESH COMPLETE ON DEMAND\n" + - "ENABLE QUERY REWRITE\n" + - "AS SELECT id FROM base;"; + "CREATE MATERIALIZED VIEW mymv (\n" + + " PRIMARY KEY(id)\n" + + ")\n" + + "DISTRIBUTED BY HASH (id)\n" + + "REFRESH COMPLETE ON DEMAND\n" + + "ENABLE QUERY REWRITE\n" + + "AS SELECT id FROM base;"; SQLStatement stmt = SQLUtils.parseSingleMysqlStatement(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest5.java index 411270082f..741fafb891 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest5.java @@ -24,18 +24,17 @@ import com.alibaba.druid.stat.TableStat; public class MySQLCreateMaterializedViewTest5 extends MysqlTest { - public void test_types() throws Exception { String sql = // - "CREATE MATERIALIZED VIEW mymv (\n" + - " PRIMARY KEY(id)\n" + - ")\n" + - "DISTRIBUTED BY HASH (id)\n" + - "REFRESH COMPLETE ON DEMAND\n" + - "START WITH '2020-08-20 14:50:00'\n" + - "NEXT current_date() + INTERVAL 15 DAY\n" + - "ENABLE QUERY REWRITE\n" + - "AS SELECT id FROM base;"; + "CREATE MATERIALIZED VIEW mymv (\n" + + " PRIMARY KEY(id)\n" + + ")\n" + + "DISTRIBUTED BY HASH (id)\n" + + "REFRESH COMPLETE ON DEMAND\n" + + "START WITH '2020-08-20 14:50:00'\n" + + "NEXT current_date() + INTERVAL 15 DAY\n" + + "ENABLE QUERY REWRITE\n" + + "AS SELECT id FROM base;"; SQLStatement stmt = SQLUtils.parseSingleMysqlStatement(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest6.java index b512eb0e52..3ecb349cbf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest6.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.visitor.VisitorFeature; public class MySQLCreateMaterializedViewTest6 extends MysqlTest { - public void test1() throws Exception { String sql = "CREATE MATERIALIZED VIEW mymv (\n" + " PRIMARY KEY(id)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest7.java index 5239050d3e..06201c15f6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest7.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.VisitorFeature; public class MySQLCreateMaterializedViewTest7 extends MysqlTest { - public void test1() throws Exception { String sql = "create materialized view `a` (\n" + " `__adb_auto_id__` bigint AUTO_INCREMENT,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest_fail.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest_fail.java index e64c0abe87..b435affbbe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest_fail.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest_fail.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.SQLUtils; public class MySQLCreateMaterializedViewTest_fail extends OracleTest { - public void test1() throws Exception { String sql = "CREATE MATERIALIZED VIEW mymv (\n" + " PRIMARY KEY(id)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateAddLogFileGroupTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateAddLogFileGroupTest.java index a1607c3b05..22154e4631 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateAddLogFileGroupTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateAddLogFileGroupTest.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateAddLogFileGroupTest extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE LOGFILE GROUP lg1 ADD UNDOFILE 'undo.dat' INITIAL_SIZE = 10M ENGINE = InnoDB;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest.java index a1c215fbc0..ad5877ba09 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateDatabaseTest extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create database if not exists a"; @@ -55,19 +54,19 @@ public void test_2() throws Exception { @Test public void test_3() throws Exception { String sql = "CREATE EXTERNAL TABLE IF NOT EXISTS ots_0.ots_table_0 (pk VARCHAR, a BIGINT, b BIGINT) " - + "STORED BY 'OTS' WITH (column_mapping = 'pk:pk,a:col1,b:col2', serializer = 'default') " - + "COMMENT 'test_ots_table_0'"; + + "STORED BY 'OTS' WITH (column_mapping = 'pk:pk,a:col1,b:col2', serializer = 'default') " + + "COMMENT 'test_ots_table_0'"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatement(); String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE EXTERNAL TABLE IF NOT EXISTS ots_0.ots_table_0 (\n" - + "\tpk VARCHAR,\n" - + "\ta BIGINT,\n" - + "\tb BIGINT\n" - + ") COMMENT 'test_ots_table_0'\n" - + " STORED BY 'OTS'\n" - + " WITH (column_mapping = 'pk:pk,a:col1,b:col2', serializer = 'default')", output); + + "\tpk VARCHAR,\n" + + "\ta BIGINT,\n" + + "\tb BIGINT\n" + + ") COMMENT 'test_ots_table_0'\n" + + " STORED BY 'OTS'\n" + + " WITH (column_mapping = 'pk:pk,a:col1,b:col2', serializer = 'default')", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest2.java index b1f0aad0c3..347b2c44f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest2.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateDatabaseTest2 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE DATABASE testRep CHARACTER SET utf8 COLLATE utf8_general_ci"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest3.java index 7a3784ee8a..d7b23a5108 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest3.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateDatabaseTest3 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create database user default charset=utf8 default collate=utf8_general_ci;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest4.java index 1087af0893..2523e4f432 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest4.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateDatabaseTest4 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create database super default character set utf8 collate = utf8_bin character set utf8 collate utf8_bin;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest5.java index 961f8c34eb..97d7dd1ee3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest5.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlCreateDatabaseTest5 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE SCHEMA IF NOT EXISTS schema_name with (property_name = 'expression')\n"; @@ -44,7 +43,6 @@ public void test_0() throws Exception { ")", output); } - public void test_1() throws Exception { String sql = "CREATE SCHEMA IF NOT EXISTS `schema_name` with (property_name = 'expression')\n"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest6_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest6_drds.java index 08811e8288..e1c95cd885 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest6_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest6_drds.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateDatabaseTest6_drds extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE DATABASE d2 DEFAULT CHARACTER SET = gbk PASSWORD = 'd2_pwd' \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest7_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest7_drds.java index 1d56fa0fd5..0d63babffd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest7_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest7_drds.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateDatabaseTest7_drds extends MysqlTest { - @Test public void test_1() throws Exception { String sql = "CREATE DATABASE d1 DEFAULT CHARACTER SET = utf8mb4 PASSWORD = 'd1_pwd' \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest8_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest8_drds.java index ea6c3c8600..08504882b2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest8_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest8_drds.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateDatabaseTest8_drds extends MysqlTest { - @Test public void test_0() throws Exception { String sql = "CREATE DATABASE IF NOT EXISTS d1 DEFAULT CHARACTER SET = utf8mb4 \n" + @@ -45,5 +44,4 @@ public void test_0() throws Exception { "\t(IP = '127.0.0.1', PORT = 3307, USER = 'root', PASSWORD = '123456');", output); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest9_issue_3975.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest9_issue_3975.java index d880d28d5c..898bb37d55 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest9_issue_3975.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest9_issue_3975.java @@ -7,7 +7,6 @@ public class MySqlCreateDatabaseTest9_issue_3975 extends MysqlTest { - public void test_0() throws Exception { String sql = "create database user default charset=utf8 collate=utf8_general_ci;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest.java index e6c49d8f37..9c9119b8f7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateEventTest extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create definer = current_user event if not exists someevent on schedule at current_timestamp + interval 30 minute\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest1.java index f14e8ebb8b..0658f30716 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest1.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateEventTest1 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create definer = 'ivan'@'%' event testevent1 on schedule every 1 hour ends '2016-11-05 23:59:00'\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest1.java index a38229374e..cb7eab913b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest1.java @@ -22,11 +22,10 @@ import java.util.List; public class MySqlCreateExternalCatalogTest1 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE EXTERNAL CATALOG IF NOT EXISTS kafka_1 PROPERTIES (" - + "'connector.name'='kafka' " + "'kafka.table-names'='table1,table2' " - + "'kafka.nodes'='1.1.1.1:10000,1.1.1.2:10000') COMMENT 'this is a kafka connector test.'"; + + "'connector.name'='kafka' " + "'kafka.table-names'='table1,table2' " + + "'kafka.nodes'='1.1.1.1:10000,1.1.1.2:10000') COMMENT 'this is a kafka connector test.'"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -36,17 +35,18 @@ public void test_0() throws Exception { SQLStatement stmt = stmtList.get(0); assertEquals("CREATE EXTERNAL CATALOG IF NOT EXISTS kafka_1 PROPERTIES (\n" - + "'connector.name'='kafka'\n" - + "'kafka.nodes'='1.1.1.1:10000,1.1.1.2:10000'\n" - + "'kafka.table-names'='table1,table2')\n" - + "COMMENT 'this is a kafka connector test.'", stmt.toString()); + + "'connector.name'='kafka'\n" + + "'kafka.nodes'='1.1.1.1:10000,1.1.1.2:10000'\n" + + "'kafka.table-names'='table1,table2')\n" + + "COMMENT 'this is a kafka connector test.'", stmt.toString()); } + public void test_1() throws Exception { - String sql = "CREATE EXTERNAL CATALOG user_db.mysql_1 PROPERTIES (" - + "'connector.name'='mysql' " - + "'connection-url'='jdbc:mysql://1.1.1.1:3306' " - + "'connection-user'=\"x'!xx\" " - + "'connection-password'=\"x'xx\")"; + String sql = "CREATE EXTERNAL CATALOG user_db.mysql_1 PROPERTIES (" + + "'connector.name'='mysql' " + + "'connection-url'='jdbc:mysql://1.1.1.1:3306' " + + "'connection-user'=\"x'!xx\" " + + "'connection-password'=\"x'xx\")"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -56,11 +56,10 @@ public void test_1() throws Exception { SQLStatement stmt = stmtList.get(0); assertEquals("CREATE EXTERNAL CATALOG user_db.mysql_1 PROPERTIES (\n" - + "'connector.name'='mysql'\n" - + "'connection-url'='jdbc:mysql://1.1.1.1:3306'\n" - + "'connection-user'=\"x'!xx\"\n" - + "'connection-password'=\"x'xx\")", stmt.toString()); + + "'connector.name'='mysql'\n" + + "'connection-url'='jdbc:mysql://1.1.1.1:3306'\n" + + "'connection-user'=\"x'!xx\"\n" + + "'connection-password'=\"x'xx\")", stmt.toString()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest2.java index 6d015bc14a..1b454c29da 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest2.java @@ -22,7 +22,6 @@ import java.util.List; public class MySqlCreateExternalCatalogTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE EXTERNAL CATALOG shanghao_test.oss_catalog_0\n" + "PROPERTIES\n" + @@ -51,6 +50,4 @@ public void test_0() throws Exception { "COMMENT 'This is a sample to create an oss connector catalog';", stmt.toString()); } - - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextAnalyzerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextAnalyzerTest.java index a74ceed31f..be6205abb5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextAnalyzerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextAnalyzerTest.java @@ -25,14 +25,13 @@ import java.util.List; public class MySqlCreateFullTextAnalyzerTest extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create fulltext ANALYZER test1 (" - + "'tokenizer' = 'dictionary-name'," - + "\"charfilter\" = ['name1','name2']," - + "'tokenfilter'=['name1', 'name2']" - + ")"; + + "'tokenizer' = 'dictionary-name'," + + "\"charfilter\" = ['name1','name2']," + + "'tokenfilter'=['name1', 'name2']" + + ")"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -40,18 +39,18 @@ public void test_one() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE FULLTEXT ANALYZER test1(\n" - + "\"TOKENIZER\" = dictionary-name,\n" - + "\"CHARFILTER\" = [\"name1\", \"name2\"],\n" - + "\"TOKENFILTER\" = [\"name1\", \"name2\"]\n" + ")", output); + + "\"TOKENIZER\" = dictionary-name,\n" + + "\"CHARFILTER\" = [\"name1\", \"name2\"],\n" + + "\"TOKENFILTER\" = [\"name1\", \"name2\"]\n" + ")", output); } @Test public void test_create() throws Exception { String sql = "create fulltext ANALYZER test1 (" - + "\"tokenizer\" = \"dictionary-name\"," - + "\"charfilter\" = [\"name1\",\"name2\"]," - + "\"tokenfilter\"=[\"name1\",\"name2\"]" - + ")"; + + "\"tokenizer\" = \"dictionary-name\"," + + "\"charfilter\" = [\"name1\",\"name2\"]," + + "\"tokenfilter\"=[\"name1\",\"name2\"]" + + ")"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -59,10 +58,10 @@ public void test_create() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE FULLTEXT ANALYZER test1(\n" - + "\"TOKENIZER\" = dictionary-name,\n" - + "\"CHARFILTER\" = [\"name1\", \"name2\"],\n" - + "\"TOKENFILTER\" = [\"name1\", \"name2\"]\n" - + ")", output); + + "\"TOKENIZER\" = dictionary-name,\n" + + "\"CHARFILTER\" = [\"name1\", \"name2\"],\n" + + "\"TOKENFILTER\" = [\"name1\", \"name2\"]\n" + + ")", output); } @Test @@ -75,10 +74,10 @@ public void test_create2() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE FULLTEXT ANALYZER test_analyzer(\n" - + "\"TOKENIZER\" = test_alinlp,\n" - + "\"CHARFILTER\" = [\"test_stconv\"],\n" - + "\"TOKENFILTER\" = [\"test_pinyin\"]\n" - + ");", output); + + "\"TOKENIZER\" = test_alinlp,\n" + + "\"CHARFILTER\" = [\"test_stconv\"],\n" + + "\"TOKENFILTER\" = [\"test_pinyin\"]\n" + + ");", output); } @Test diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextCharFilterTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextCharFilterTest.java index b91d3f81c9..7dd19db128 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextCharFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextCharFilterTest.java @@ -25,14 +25,13 @@ import java.util.List; public class MySqlCreateFullTextCharFilterTest extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create fulltext charfilter test1 (" - + "'type' = 'typename'," - + "'key'='name'," - + "'key2'='name2'" - + ")"; + + "'type' = 'typename'," + + "'key'='name'," + + "'key2'='name2'" + + ")"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -40,15 +39,15 @@ public void test_one() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE FULLTEXT CHARFILTER test1(\n" + "\"type\" = 'typename',\n" - + "'key' = 'name','key2' = 'name2'\n" + ")", output); + + "'key' = 'name','key2' = 'name2'\n" + ")", output); } @Test public void test_crate() throws Exception { String sql = "create fulltext charfilter test1 (" - + "\"type\" = \"typename\"," - + "\"key\"=\"name\"" - + ")"; + + "\"type\" = \"typename\"," + + "\"key\"=\"name\"" + + ")"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -56,9 +55,9 @@ public void test_crate() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE FULLTEXT CHARFILTER test1(\n" - + "\"type\" = 'typename',\n" - + "'key' = 'name'\n" - + ")", output); + + "\"type\" = 'typename',\n" + + "'key' = 'name'\n" + + ")", output); } @Test diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextDictTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextDictTest.java index 7b72cf623a..cc60f9f61c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextDictTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextDictTest.java @@ -25,12 +25,11 @@ import java.util.List; public class MySqlCreateFullTextDictTest extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create fulltext dictionary test1 (" - + " word varchar comment 'comment1' " - + ") comment 'comment1'"; + + " word varchar comment 'comment1' " + + ") comment 'comment1'"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -38,11 +37,12 @@ public void test_one() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE FULLTEXT DICTIONARY test1(\n" - + "word varchar COMMENT 'comment1'\n" - + ") COMMENT 'comment1'", output); + + "word varchar COMMENT 'comment1'\n" + + ") COMMENT 'comment1'", output); } - @Test public void test_1() throws Exception { + @Test + public void test_1() throws Exception { String sql = "show fulltext dictionaries"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -53,7 +53,8 @@ public void test_one() throws Exception { Assert.assertEquals("SHOW FULLTEXT DICTIONARIES", output); } - @Test public void test_2() throws Exception { + @Test + public void test_2() throws Exception { String sql = "show fulltext dictionaries"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -64,7 +65,8 @@ public void test_one() throws Exception { Assert.assertEquals("SHOW FULLTEXT DICTIONARIES", output); } - @Test public void test_3() throws Exception { + @Test + public void test_3() throws Exception { String sql = "drop fulltext dictionary dic_name"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenFilterTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenFilterTest.java index af70e5ae7a..decff91d78 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenFilterTest.java @@ -25,13 +25,12 @@ import java.util.List; public class MySqlCreateFullTextTokenFilterTest extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create fulltext tokenfilter test1 (" - + "'type' = 'typename'," - + "'key'='name'" - + ")"; + + "'type' = 'typename'," + + "'key'='name'" + + ")"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -39,9 +38,9 @@ public void test_one() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE FULLTEXT TOKENFILTER test1(\n" - + "\"type\" = 'typename',\n" - + "'key' = 'name'\n" - + ")", output); + + "\"type\" = 'typename',\n" + + "'key' = 'name'\n" + + ")", output); } @Test diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenizeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenizeTest.java index 6911490b73..7d36477a7a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenizeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenizeTest.java @@ -25,14 +25,13 @@ import java.util.List; public class MySqlCreateFullTextTokenizeTest extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create fulltext tokenizer test1 (" - + "'type' = 'typename'," - + "'user_defined_dict' = 'dictionary-name'," - + "'key'='name'" - + ")"; + + "'type' = 'typename'," + + "'user_defined_dict' = 'dictionary-name'," + + "'key'='name'" + + ")"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -40,10 +39,10 @@ public void test_one() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE FULLTEXT TOKENIZER test1(\n" - + "\"type\" = 'typename',\n" - + "\"user_defined_dict\" = 'dictionary-name',\n" - + "'key' = 'name'\n" - + ")", output); + + "\"type\" = 'typename',\n" + + "\"user_defined_dict\" = 'dictionary-name',\n" + + "'key' = 'name'\n" + + ")", output); } @Test diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFunctionTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFunctionTest_1.java index 9a599f7701..372574dcb6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFunctionTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFunctionTest_1.java @@ -24,9 +24,8 @@ import java.util.List; public class MySqlCreateFunctionTest_1 extends MysqlTest { - public void test_0() throws Exception { - String sql = "sql : \n" + + String sql = "sql : \n" + " create function `test1`.`proc1`(`a` enum('1','2') charset utf8)\n" + " returns int(10)\n" + " DETERMINISTIC \n" + @@ -34,8 +33,8 @@ public void test_0() throws Exception { " return 0;\n" + " END "; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLStatement stmt = statementList.get(0); + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); + SQLStatement stmt = statementList.get(0); // print(statementList); assertEquals(1, statementList.size()); @@ -56,12 +55,11 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndex2Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndex2Test.java index 3defa8d1da..f66062d251 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndex2Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndex2Test.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateIndex2Test extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create index index1 on t1(col1) comment 'test index' comment 'some test' using btree;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest.java index 620f343148..e1235c86ae 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateIndexTest extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create index index1 on t1(col1) comment 'test index' comment 'some test' using btree;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_1.java index 6cbaa04b48..4c3e8c0453 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_1.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateIndexTest_1 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE SPATIAL INDEX g ON geom (g);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_10_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_10_drds.java index 77f5fd0716..9457105416 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_10_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_10_drds.java @@ -14,11 +14,10 @@ * @date 2018/12/12 10:01 AM */ public class MySqlCreateIndexTest_10_drds extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE UNIQUE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) \n" - + "dbpartition by hash(`seller_id`) \n" + + + "dbpartition by hash(`seller_id`) \n" + "tbpartition by hash(`seller_id`) \n" + "tbpartitions 3;"; @@ -30,14 +29,14 @@ public void test_one() throws Exception { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE UNIQUE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) " - + "DBPARTITION BY hash(`seller_id`) TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3;", output); + + "DBPARTITION BY hash(`seller_id`) TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3;", output); } @Test public void test_two() throws Exception { String sql = "CREATE UNIQUE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) " - + "dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3 " - + "COMMENT 'CREATE GSI TEST';"; + + "dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3 " + + "COMMENT 'CREATE GSI TEST';"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -47,15 +46,15 @@ public void test_two() throws Exception { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE UNIQUE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) " - + "DBPARTITION BY hash(`seller_id`) TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3 " - + "COMMENT 'CREATE GSI TEST';", output); + + "DBPARTITION BY hash(`seller_id`) TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3 " + + "COMMENT 'CREATE GSI TEST';", output); } @Test public void test_three() throws Exception { String sql = "CREATE UNIQUE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) " - + "dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3 " - + "USING BTREE KEY_BLOCK_SIZE=20 COMMENT 'CREATE GSI TEST' ALGORITHM=DEFAULT LOCK=DEFAULT;"; + + "dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3 " + + "USING BTREE KEY_BLOCK_SIZE=20 COMMENT 'CREATE GSI TEST' ALGORITHM=DEFAULT LOCK=DEFAULT;"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -65,7 +64,7 @@ public void test_three() throws Exception { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE UNIQUE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) DBPARTITION BY hash(`seller_id`) TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3 USING BTREE KEY_BLOCK_SIZE = 20 COMMENT 'CREATE GSI TEST' ALGORITHM = DEFAULT LOCK = DEFAULT;", - output); + output); } @Test diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_11_adb.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_11_adb.java index e86c4e99f1..f72bef2665 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_11_adb.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_11_adb.java @@ -14,7 +14,6 @@ * @date 2018/12/12 10:01 AM */ public class MySqlCreateIndexTest_11_adb extends MysqlTest { - @Test public void test_0() throws Exception { String sql = "CREATE FULLTEXT INDEX `g_i_seller` ON t_order (`seller_id`)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_2_ann.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_2_ann.java index 8c4f337d46..324ef233e5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_2_ann.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_2_ann.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateIndexTest_2_ann extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE ANN INDEX facefea_index3 ON face_feature (facefea) DistanceMeasure = DotProduct ALGORITHM = IVF;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_3.java index 7e18da2e7e..d55d70c038 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_3.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateIndexTest_3 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create unique index index_1_id USING btree on index_1 (id) KEY_BLOCK_SIZE=10 comment '分表index'"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_4.java index 98af7da4d4..0f85dc41d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_4.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateIndexTest_4 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE INDEX idx_t_uid on stu_score (uid) COMMENT '' ALGORITHM DEFAULT LOCK DEFAULT"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_5.java index c3c6f7a04a..a741d2fae8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_5.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateIndexTest_5 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE TABLE app_info (id bigint(20) NOT NULL, app_name varchar(255) NOT NULL ,PRIMARY KEY (id),INDEX idx USING BTREE (app_name) comment '') "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_6.java index 28cbca7a04..91ca501ab3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_6.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateIndexTest_6 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) dbpartition by hash(`seller_id`);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_7_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_7_drds.java index be7dd2f44f..e81b7c5526 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_7_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_7_drds.java @@ -14,11 +14,10 @@ * @date 2018/12/12 10:01 AM */ public class MySqlCreateIndexTest_7_drds extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) " - + "dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3;"; + + "dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3;"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -28,15 +27,15 @@ public void test_one() throws Exception { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) " - + "DBPARTITION BY hash(`seller_id`) TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3;", - output); + + "DBPARTITION BY hash(`seller_id`) TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3;", + output); } @Test public void test_two() throws Exception { String sql = "CREATE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) " - + "dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3 " - + "COMMENT 'CREATE GSI TEST';"; + + "dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3 " + + "COMMENT 'CREATE GSI TEST';"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -46,16 +45,16 @@ public void test_two() throws Exception { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) " - + "DBPARTITION BY hash(`seller_id`) TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3 " - + "COMMENT 'CREATE GSI TEST';", - output); + + "DBPARTITION BY hash(`seller_id`) TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3 " + + "COMMENT 'CREATE GSI TEST';", + output); } @Test public void test_three() throws Exception { String sql = "CREATE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) " - + "dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3 " - + "USING BTREE KEY_BLOCK_SIZE=20 COMMENT 'CREATE GSI TEST' ALGORITHM=DEFAULT LOCK=DEFAULT;"; + + "dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3 " + + "USING BTREE KEY_BLOCK_SIZE=20 COMMENT 'CREATE GSI TEST' ALGORITHM=DEFAULT LOCK=DEFAULT;"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -65,6 +64,6 @@ public void test_three() throws Exception { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) DBPARTITION BY hash(`seller_id`) TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3 USING BTREE KEY_BLOCK_SIZE = 20 COMMENT 'CREATE GSI TEST' ALGORITHM = DEFAULT LOCK = DEFAULT;", - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_8_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_8_drds.java index 905d57cdc4..bb6959ed3a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_8_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_8_drds.java @@ -14,11 +14,10 @@ * @date 2018/12/12 2:03 PM */ public class MySqlCreateIndexTest_8_drds extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) " - + "DBPARTITION BY HASH(seller_id) TBPARTITION BY UNI_HASH(seller_id) TBPARTITIONS 12;"; + + "DBPARTITION BY HASH(seller_id) TBPARTITION BY UNI_HASH(seller_id) TBPARTITIONS 12;"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -33,8 +32,8 @@ public void test_one() throws Exception { @Test public void test_two() throws Exception { String sql = "CREATE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) " - + "DBPARTITION BY HASH(SELLER_ID) TBPARTITION BY uni_hash(SELLER_ID) TBPARTITIONS 12 " - + "COMMENT 'CREATE GSI TEST';"; + + "DBPARTITION BY HASH(SELLER_ID) TBPARTITION BY uni_hash(SELLER_ID) TBPARTITIONS 12 " + + "COMMENT 'CREATE GSI TEST';"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -49,8 +48,8 @@ public void test_two() throws Exception { @Test public void test_three() throws Exception { String sql = "CREATE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) " - + "DBPARTITION BY HASH(SELLER_ID) TBPARTITION BY UNI_HASH(SELLER_ID) TBPARTITIONS 12 " - + "USING BTREE KEY_BLOCK_SIZE=20 COMMENT 'CREATE GSI TEST' ALGORITHM=DEFAULT LOCK=DEFAULT;"; + + "DBPARTITION BY HASH(SELLER_ID) TBPARTITION BY UNI_HASH(SELLER_ID) TBPARTITIONS 12 " + + "USING BTREE KEY_BLOCK_SIZE=20 COMMENT 'CREATE GSI TEST' ALGORITHM=DEFAULT LOCK=DEFAULT;"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -60,6 +59,6 @@ public void test_three() throws Exception { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE GLOBAL INDEX `g_i_seller` ON t_order (`seller_id`) COVERING (order_snapshot) DBPARTITION BY HASH(SELLER_ID) TBPARTITION BY UNI_HASH(SELLER_ID) TBPARTITIONS 12 USING BTREE KEY_BLOCK_SIZE = 20 COMMENT 'CREATE GSI TEST' ALGORITHM = DEFAULT LOCK = DEFAULT;", - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_9_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_9_drds.java index 8b11165220..a89db7649e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_9_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_9_drds.java @@ -14,12 +14,11 @@ * @date 2018/12/12 2:23 PM */ public class MySqlCreateIndexTest_9_drds extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE GLOBAL INDEX `g_i_seller` ON t_order (`create_time`) COVERING (order_snapshot) " - + "dbpartition BY YYYYMM_NOLOOP (create_time) tbpartition BY YYYYMM_NOLOOP (create_time) " - + "STARTWITH 20160108 ENDWITH 20170108;"; + + "dbpartition BY YYYYMM_NOLOOP (create_time) tbpartition BY YYYYMM_NOLOOP (create_time) " + + "STARTWITH 20160108 ENDWITH 20170108;"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -34,8 +33,8 @@ public void test_one() throws Exception { @Test public void test_two() throws Exception { String sql = "CREATE GLOBAL INDEX `g_i_seller` ON t_order (`create_time`) COVERING (order_snapshot) " - + "dbpartition BY YYYYMM_NOLOOP (create_time) tbpartition BY YYYYMM_NOLOOP (create_time) " - + "STARTWITH 20160108 ENDWITH 20170108 " + "COMMENT 'CREATE GSI TEST';"; + + "dbpartition BY YYYYMM_NOLOOP (create_time) tbpartition BY YYYYMM_NOLOOP (create_time) " + + "STARTWITH 20160108 ENDWITH 20170108 " + "COMMENT 'CREATE GSI TEST';"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -50,9 +49,9 @@ public void test_two() throws Exception { @Test public void test_three() throws Exception { String sql = "CREATE GLOBAL INDEX `g_i_seller` ON t_order (`create_time`) COVERING (order_snapshot) " - + "dbpartition BY YYYYMM_NOLOOP (create_time) tbpartition BY YYYYMM_NOLOOP (create_time) " - + "STARTWITH 20160108 ENDWITH 20170108 " - + "USING BTREE KEY_BLOCK_SIZE=20 COMMENT 'CREATE GSI TEST' ALGORITHM=DEFAULT LOCK=DEFAULT;"; + + "dbpartition BY YYYYMM_NOLOOP (create_time) tbpartition BY YYYYMM_NOLOOP (create_time) " + + "STARTWITH 20160108 ENDWITH 20170108 " + + "USING BTREE KEY_BLOCK_SIZE=20 COMMENT 'CREATE GSI TEST' ALGORITHM=DEFAULT LOCK=DEFAULT;"; List stmtList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); @@ -62,6 +61,6 @@ public void test_three() throws Exception { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE GLOBAL INDEX `g_i_seller` ON t_order (`create_time`) COVERING (order_snapshot) DBPARTITION BY YYYYMM_NOLOOP(create_time) TBPARTITION BY YYYYMM_NOLOOP(create_time) BETWEEN 20160108 AND 20170108 USING BTREE KEY_BLOCK_SIZE = 20 COMMENT 'CREATE GSI TEST' ALGORITHM = DEFAULT LOCK = DEFAULT;", - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateOutlineTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateOutlineTest_0.java index 9c18b6c5aa..e28aa9ec83 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateOutlineTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateOutlineTest_0.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateOutlineTest_0 extends TestCase { - public void test_0() throws Exception { String sql = "create outline t2 on select ? to select /*+TDDL:slave()*/ * from ms10 where c1=?;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest.java index a690ead775..8465699d00 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest.java @@ -27,61 +27,60 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlCreateProcedureTest extends MysqlTest { - public void test_0() throws Exception { - String sql="create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare x,y,z int;"+ - " select id into x,y,z from test;"+ - " insert into test values(id,age);"+ - " while x do"+ - " insert into test values(id,age);"+ - " end while;"+ - " if x then"+ - " insert into test values(id,age);"+ - " insert into test values(id,age);"+ - " else if y then"+ - " insert into test values(id,age);"+ - " while x do"+ - " insert into test values(id,age);"+ - " end while;"+ - " else"+ - " insert into test values(id,age);"+ - " end if;"+ - " case x"+ - " when x>10 then"+ - " insert into test values(id,age);"+ - " insert into test values(id,age);"+ - " when x>20 then"+ - " insert into test values(id,age);"+ - " insert into test values(id,age);"+ - " else"+ - " insert into test values(id,age);"+ - " end case;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare x,y,z int;" + + " select id into x,y,z from test;" + + " insert into test values(id,age);" + + " while x do" + + " insert into test values(id,age);" + + " end while;" + + " if x then" + + " insert into test values(id,age);" + + " insert into test values(id,age);" + + " else if y then" + + " insert into test values(id,age);" + + " while x do" + + " insert into test values(id,age);" + + " end while;" + + " else" + + " insert into test values(id,age);" + + " end if;" + + " case x" + + " when x>10 then" + + " insert into test values(id,age);" + + " insert into test values(id,age);" + + " when x>20 then" + + " insert into test values(id,age);" + + " insert into test values(id,age);" + + " else" + + " insert into test values(id,age);" + + " end case;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); - System.out.println(stmt); + System.out.println(stmt); MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); - stmt.accept(visitor); + stmt.accept(visitor); System.out.println("Tables : " + visitor.getTables()); System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest1.java index 80ce466d5c..27526acbbe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest1.java @@ -27,26 +27,24 @@ import com.alibaba.druid.stat.TableStat.Column; /** - * - * @Description: begin-end within begin-end * @author zz email:455910092@qq.com - * @date 2015-9-14 * @version V1.0 + * @Description: begin-end within begin-end + * @date 2015-9-14 */ public class MySqlCreateProcedureTest1 extends MysqlTest { - public void test_0() throws Exception { - String sql="create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare x,y,z int;"+ - " begin"+ - " insert into test values(id,age);"+ - " end"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare x,y,z int;" + + " begin" + + " insert into test values(id,age);" + + " end" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -57,13 +55,13 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest10.java index a5fa8e0964..05205a9a42 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest10.java @@ -24,12 +24,11 @@ import java.util.List; public class MySqlCreateProcedureTest10 extends MysqlTest { - public void test_0() throws Exception { - String sql = "CREATE PROCEDURE p2(p INT) SET @x = p ;"; + String sql = "CREATE PROCEDURE p2(p INT) SET @x = p ;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLStatement statemen = statementList.get(0); + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); + SQLStatement statemen = statementList.get(0); // print(statementList); assertEquals(1, statementList.size()); @@ -40,11 +39,10 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest11.java index 067d49cb31..c7679dfee7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest11.java @@ -24,9 +24,8 @@ import java.util.List; public class MySqlCreateProcedureTest11 extends MysqlTest { - public void test_0() throws Exception { - String sql = "CREATE PROCEDURE curdemo()\n" + + String sql = "CREATE PROCEDURE curdemo()\n" + "BEGIN\n" + " DECLARE done INT DEFAULT FALSE;\n" + " DECLARE a CHAR(16);\n" + @@ -55,8 +54,8 @@ public void test_0() throws Exception { " CLOSE cur2;\n" + "END;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLStatement stmt = statementList.get(0); + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); + SQLStatement stmt = statementList.get(0); // print(statementList); // assertEquals(1, statementList.size()); @@ -69,11 +68,10 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(3, visitor.getTables().size()); assertEquals(3, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest12.java index 8338fbaeb2..66e89c903f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest12.java @@ -26,9 +26,8 @@ import java.util.List; public class MySqlCreateProcedureTest12 extends MysqlTest { - public void test_0() throws Exception { - String sql = "CREATE PROCEDURE find_parts (\n" + + String sql = "CREATE PROCEDURE find_parts (\n" + "\tseed INT\n" + ")\n" + "BEGIN\n" + @@ -56,8 +55,8 @@ public void test_0() throws Exception { "\tFROM _result;\n" + "END;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLStatement stmt = statementList.get(0); + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); + SQLStatement stmt = statementList.get(0); // print(statementList); // assertEquals(1, statementList.size()); @@ -70,7 +69,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(3, visitor.getTables().size()); assertEquals(4, visitor.getColumns().size()); assertEquals(2, visitor.getConditions().size()); @@ -81,5 +80,4 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.containsColumn("_tmp", "node")); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest13.java index 0abce0f2d5..aaffc5fd56 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest13.java @@ -25,12 +25,11 @@ import java.util.List; public class MySqlCreateProcedureTest13 extends MysqlTest { - public void test_0() throws Exception { - String sql = "create procedure foo(param1 int unsigned) contains sql begin select param1; end"; + String sql = "create procedure foo(param1 int unsigned) contains sql begin select param1; end"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLStatement stmt = statementList.get(0); + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); + SQLStatement stmt = statementList.get(0); // print(statementList); assertEquals(1, statementList.size()); @@ -51,11 +50,10 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest14.java index fd9cf019f8..ef747a78e5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest14.java @@ -25,16 +25,15 @@ import java.util.List; public class MySqlCreateProcedureTest14 extends MysqlTest { - public void test_0() throws Exception { - String sql = "CREATE DEFINER = 'admin'@'localhost' PROCEDURE account_count()\n" + + String sql = "CREATE DEFINER = 'admin'@'localhost' PROCEDURE account_count()\n" + "SQL SECURITY INVOKER\n" + "BEGIN\n" + " SELECT 'Number of accounts:', COUNT(*) FROM mysql.user;\n" + "END;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLStatement stmt = statementList.get(0); + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); + SQLStatement stmt = statementList.get(0); // print(statementList); assertEquals(1, statementList.size()); @@ -54,7 +53,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); @@ -62,5 +61,4 @@ public void test_0() throws Exception { assertTrue(visitor.containsColumn("mysql.user", "*")); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest15.java index 379374e872..65222fcfd0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest15.java @@ -30,9 +30,8 @@ import java.util.List; public class MySqlCreateProcedureTest15 extends MysqlTest { - public void test_0() throws Exception { - String sql = " create function `test1`.`proc1`(`a` enum('1','2') charset utf8)\n" + + String sql = " create function `test1`.`proc1`(`a` enum('1','2') charset utf8)\n" + " returns int(10)\n" + " DETERMINISTIC \n" + " BEGIN\n" + @@ -52,5 +51,4 @@ public void test_0() throws Exception { "END", stmt.toString()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest2.java index d1460b1d62..faad675d20 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest2.java @@ -27,26 +27,24 @@ import com.alibaba.druid.stat.TableStat.Column; /** - * - * @Description: procedure begin-end, loop, while use label * @author zz email:455910092@qq.com - * @date 2015-9-14 * @version V1.0 + * @Description: procedure begin-end, loop, while use label + * @date 2015-9-14 */ public class MySqlCreateProcedureTest2 extends MysqlTest { - public void test_0() throws Exception { - String sql="create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare x,y,z int;"+ - " lable_1: while x do"+ - " insert into test values(id,age);"+ - " end while lable_1;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare x,y,z int;" + + " lable_1: while x do" + + " insert into test values(id,age);" + + " end while lable_1;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -57,28 +55,28 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } public void test_1() throws Exception { - String sql="create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare x,y,z int;"+ - " lable_1: begin"+ - " insert into test values(id,age);"+ - " end lable_1;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare x,y,z int;" + + " lable_1: begin" + + " insert into test values(id,age);" + + " end lable_1;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -91,28 +89,28 @@ public void test_1() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } - + public void test_2() throws Exception { - String sql="create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare x,y,z int;"+ - " lable_1: loop"+ - " insert into test values(id,age);"+ - " end loop lable_1;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare x,y,z int;" + + " lable_1: loop" + + " insert into test values(id,age);" + + " end loop lable_1;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -123,13 +121,13 @@ public void test_2() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest3.java index 2ef7462d84..e78c0880bf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest3.java @@ -27,27 +27,25 @@ import com.alibaba.druid.stat.TableStat.Column; /** - * - * @Description: procedure begin-end, loop, while use label * @author zz email:455910092@qq.com - * @date 2015-9-14 * @version V1.0 + * @Description: procedure begin-end, loop, while use label + * @date 2015-9-14 */ public class MySqlCreateProcedureTest3 extends MysqlTest { - public void test_0() throws Exception { - String sql="create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare x,y,z int;"+ - " lable_1: while x do"+ - " insert into test values(id,age);"+ - " leave lable_1;"+ - " end while lable_1;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare x,y,z int;" + + " lable_1: while x do" + + " insert into test values(id,age);" + + " leave lable_1;" + + " end while lable_1;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -60,29 +58,29 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } public void test_1() throws Exception { - String sql="create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare x,y,z int;"+ - " lable_1: begin"+ - " insert into test values(id,age);"+ - " leave lable_1;"+ - " end lable_1;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare x,y,z int;" + + " lable_1: begin" + + " insert into test values(id,age);" + + " leave lable_1;" + + " end lable_1;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -93,29 +91,29 @@ public void test_1() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } - + public void test_2() throws Exception { - String sql="create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare x,y,z int;"+ - " lable_1: loop"+ - " insert into test values(id,age);"+ - " leave lable_1;"+ - " end loop lable_1;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare x,y,z int;" + + " lable_1: loop" + + " insert into test values(id,age);" + + " leave lable_1;" + + " end loop lable_1;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -126,13 +124,13 @@ public void test_2() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest4.java index 5c3576c9bb..37e0c9bd9f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest4.java @@ -27,27 +27,25 @@ import com.alibaba.druid.stat.TableStat.Column; /** - * - * @Description: procedure begin-end, loop, while use label * @author zz email:455910092@qq.com - * @date 2015-9-14 * @version V1.0 + * @Description: procedure begin-end, loop, while use label + * @date 2015-9-14 */ public class MySqlCreateProcedureTest4 extends MysqlTest { - public void test_0() throws Exception { - String sql="create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare x,y,z int;"+ - " repeat"+ - " insert into test values(id,age);"+ - " until x>10"+ - " end repeat;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare x,y,z int;" + + " repeat" + + " insert into test values(id,age);" + + " until x>10" + + " end repeat;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -60,28 +58,29 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } + public void test_1() throws Exception { - String sql="create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare x,y,z int;"+ - " lable_1: repeat"+ - " insert into test values(id,age);"+ - " until x>10"+ - " end repeat lable_1;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare x,y,z int;" + + " lable_1: repeat" + + " insert into test values(id,age);" + + " until x>10" + + " end repeat lable_1;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -92,14 +91,14 @@ public void test_1() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest5.java index d9da2b07ac..6331ed0a8d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest5.java @@ -27,26 +27,24 @@ import com.alibaba.druid.stat.TableStat.Column; /** - * * Description: procedure begin-end, loop, while use label * author zz email:455910092@qq.com * date 2015-9-14 * version V1.0 */ public class MySqlCreateProcedureTest5 extends MysqlTest { - public void test_0() throws Exception { - String sql="create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare c1 cursor for select id,age from test;"+ - " open c1;"+ - " fetch c1 into x;"+ - " close c1;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare c1 cursor for select id,age from test;" + + " open c1;" + + " fetch c1 into x;" + + " close c1;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); // print(statementList); assertEquals(1, statementList.size()); @@ -59,15 +57,15 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + assertTrue(visitor.containsColumn("test", "id")); // assertTrue(visitor.containsColumn("test", "age"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest6.java index 573cda922a..faefaca6b3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest6.java @@ -27,23 +27,21 @@ import com.alibaba.druid.stat.TableStat.Column; /** - * - * @Description: create procedure parameter type support * @author zz email:455910092@qq.com - * @date 2015-9-14 * @version V1.0 + * @Description: create procedure parameter type support + * @date 2015-9-14 */ public class MySqlCreateProcedureTest6 extends MysqlTest { - public void test_0() throws Exception { - String sql="create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " insert into test values(id,age);"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " insert into test values(id,age);" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -54,24 +52,25 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } + public void test_1() throws Exception { - String sql="create or replace procedure sp_name(in level int,in age int)"+ - " begin"+ - " insert into test values(id,age);"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(in level int,in age int)" + + " begin" + + " insert into test values(id,age);" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -82,24 +81,25 @@ public void test_1() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } + public void test_2() throws Exception { - String sql="create or replace procedure sp_name(out level int,out age int)"+ - " begin"+ - " insert into test values(id,age);"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(out level int,out age int)" + + " begin" + + " insert into test values(id,age);" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -110,25 +110,25 @@ public void test_2() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } public void test_3() throws Exception { - String sql="create or replace procedure sp_name(inout level int,inout age int)"+ - " begin"+ - " insert into test values(id,age);"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(inout level int,inout age int)" + + " begin" + + " insert into test values(id,age);" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -139,14 +139,14 @@ public void test_3() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - + Assert.assertTrue(visitor.containsColumn("test", "id")); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest7.java index ea60cfb4b6..48bb353e7b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest7.java @@ -25,25 +25,23 @@ import java.util.List; /** - * - * @Description: create procedure parameter type support * @author zz email:455910092@qq.com - * @date 2015-9-14 * @version V1.0 + * @Description: create procedure parameter type support + * @date 2015-9-14 */ public class MySqlCreateProcedureTest7 extends MysqlTest { - public void test_0() throws Exception { - String sql="CREATE DEFINER=test@% PROCEDURE test11111()" - + "\nBEGIN" - + "\ndeclare v_a date default '2007-4-10';" - + "\ndeclare v_b date default '2007-4-11';" - + "\ndeclare v_c datetime default '2004-4-9 0:0:0';" - + "\nEND"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + String sql = "CREATE DEFINER=test@% PROCEDURE test11111()" + + "\nBEGIN" + + "\ndeclare v_a date default '2007-4-10';" + + "\ndeclare v_b date default '2007-4-11';" + + "\ndeclare v_c datetime default '2004-4-9 0:0:0';" + + "\nEND"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -54,7 +52,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE PROCEDURE test11111 ()" + "\nBEGIN" @@ -62,7 +60,7 @@ public void test_0() throws Exception { + "\n\tDECLARE v_b date DEFAULT '2007-4-11';" + "\n\tDECLARE v_c datetime DEFAULT '2004-4-9 0:0:0';" + "\nEND", output); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java index c830ed8cbe..879bee6792 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java @@ -27,45 +27,44 @@ import java.util.List; /** - * - * @Description: begin-end within begin-end * @author zhujun [455910092@qq.com] - * @date 2016-4-14 * @version V1.0 + * @Description: begin-end within begin-end + * @date 2016-4-14 */ public class MySqlCreateProcedureTest8 extends MysqlTest { - - /** - * DECLARE handler_type HANDLER FOR condition_value[,...] sp_statement handler_type: CONTINUE | EXIT condition_value: SQLSTATE [VALUE] sqlstate_value | condition_name | SQLWARNING | NOT FOUND | SQLEXCEPTION | mysql_error_code - * @throws Exception - */ + /** + * DECLARE handler_type HANDLER FOR condition_value[,...] sp_statement handler_type: CONTINUE | EXIT condition_value: SQLSTATE [VALUE] sqlstate_value | condition_name | SQLWARNING | NOT FOUND | SQLEXCEPTION | mysql_error_code + * + * @throws Exception + */ public void test_0() throws Exception { - String sql="create or replace procedure test_cursor (in param int(10),out result varchar(90)) " - +" begin" - +" declare name varchar(20);" - +" declare pass varchar(20);" - +" declare done int;" - +" declare cur_test CURSOR for select user_name,user_pass from test;" - +" declare continue handler FOR SQLSTATE '02000' SET done = 1;" - +" if param then" - +" select concat_ws(',',user_name,user_pass) into result from test.users where id=param;" - +" else" - +" open cur_test;" - +" repeat" - +" fetch cur_test into name, pass;" - +" select concat_ws(',',result,name,pass) into result;" - +" until done end repeat;" - +" close cur_test;" - +" end if;" - +" end;"; - - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLStatement stmt = statementList.get(0); - System.out.println(SQLUtils.toSQLString(stmt, JdbcConstants.MYSQL)); + String sql = "create or replace procedure test_cursor (in param int(10),out result varchar(90)) " + + " begin" + + " declare name varchar(20);" + + " declare pass varchar(20);" + + " declare done int;" + + " declare cur_test CURSOR for select user_name,user_pass from test;" + + " declare continue handler FOR SQLSTATE '02000' SET done = 1;" + + " if param then" + + " select concat_ws(',',user_name,user_pass) into result from test.users where id=param;" + + " else" + + " open cur_test;" + + " repeat" + + " fetch cur_test into name, pass;" + + " select concat_ws(',',result,name,pass) into result;" + + " until done end repeat;" + + " close cur_test;" + + " end if;" + + " end;"; + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); + SQLStatement stmt = statementList.get(0); + System.out.println(SQLUtils.toSQLString(stmt, JdbcConstants.MYSQL)); // print(statementList); assertEquals(1, statementList.size()); - System.out.println(stmt); + System.out.println(stmt); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); stmt.accept(visitor); @@ -74,21 +73,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(2, visitor.getTables().size()); assertEquals(5, visitor.getColumns().size()); assertEquals(1, visitor.getConditions().size()); } - + public void test_1() throws Exception { - String sql = "create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare continue handler FOR SQLSTATE '02000' SET done = 1;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare continue handler FOR SQLSTATE '02000' SET done = 1;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -99,21 +98,21 @@ public void test_1() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); } - + public void test_2() throws Exception { - String sql = "create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare continue handler FOR SQLEXCEPTION,SQLWARNING SET done = 1;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare continue handler FOR SQLEXCEPTION,SQLWARNING SET done = 1;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -124,21 +123,21 @@ public void test_2() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); } - + public void test_3() throws Exception { - String sql = "create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare continue handler FOR 1002 SET done = 1;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare continue handler FOR 1002 SET done = 1;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -149,21 +148,21 @@ public void test_3() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); } - + public void test_4() throws Exception { - String sql = "create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare continue handler FOR SQLWARNING begin set done = 1; end"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare continue handler FOR SQLWARNING begin set done = 1; end" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -174,21 +173,21 @@ public void test_4() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); } - + public void test_5() throws Exception { - String sql = "create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare continue handler FOR SQLWARNING begin set done = 1; end;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare continue handler FOR SQLWARNING begin set done = 1; end;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -199,7 +198,7 @@ public void test_5() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java index 20e430836a..c76d04190a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java @@ -26,23 +26,21 @@ import java.util.List; /** - * * Description: 测试异常声明 * author zhujun [455910092@qq.com] * date 2016-4-17 * version V1.0 */ public class MySqlCreateProcedureTest9 extends MysqlTest { - public void test_0() throws Exception { - String sql = "create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare test1 CONDITION FOR SQLSTATE '02000';"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare test1 CONDITION FOR SQLSTATE '02000';" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -53,21 +51,21 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); } - + public void test_2() throws Exception { - String sql = "create or replace procedure sp_name(level int,age int)"+ - " begin"+ - " declare condition_name CONDITION FOR 1002;"+ - " end"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "create or replace procedure sp_name(level int,age int)" + + " begin" + + " declare condition_name CONDITION FOR 1002;" + + " end"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -78,38 +76,38 @@ public void test_2() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); } - + public void test_3() throws Exception { - String sql="create or replace procedure test_cursor (in param int(10),out result varchar(90)) " - +" begin" - +" declare name varchar(20);" - +" declare pass varchar(20);" - +" declare done int;" - +" declare cur_test CURSOR for select user_name,user_pass from test;" - +" declare condition_name CONDITION FOR 1002;" - +" declare continue handler FOR condition_name SET done = 1;" - +" if param then" - +" select concat_ws(',',user_name,user_pass) into result from test.users where id=param;" - +" else" - +" open cur_test;" - +" repeat" - +" fetch cur_test into name, pass;" - +" select concat_ws(',',result,name,pass) into result;" - +" until done end repeat;" - +" close cur_test;" - +" end if;" - +" end;"; - - MySqlStatementParser parser=new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); - System.out.println(SQLUtils.toSQLString(statementList, JdbcConstants.MYSQL)); - Assert.assertEquals(1, statementList.size()); + String sql = "create or replace procedure test_cursor (in param int(10),out result varchar(90)) " + + " begin" + + " declare name varchar(20);" + + " declare pass varchar(20);" + + " declare done int;" + + " declare cur_test CURSOR for select user_name,user_pass from test;" + + " declare condition_name CONDITION FOR 1002;" + + " declare continue handler FOR condition_name SET done = 1;" + + " if param then" + + " select concat_ws(',',user_name,user_pass) into result from test.users where id=param;" + + " else" + + " open cur_test;" + + " repeat" + + " fetch cur_test into name, pass;" + + " select concat_ws(',',result,name,pass) into result;" + + " until done end repeat;" + + " close cur_test;" + + " end if;" + + " end;"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + System.out.println(SQLUtils.toSQLString(statementList, JdbcConstants.MYSQL)); + Assert.assertEquals(1, statementList.size()); MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); statemen.accept(visitor); @@ -118,10 +116,10 @@ public void test_3() throws Exception { System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(5, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getConditions().size()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest.java index 4fde5c7078..e9dfc8b560 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest.java @@ -27,7 +27,6 @@ public class MySqlCreateResourceGroupTest extends MysqlTest { - @Test public void test_create() throws Exception { String sql = "CREATE RESOURCE GROUP sql_thread TYPE = USER VCPU = 1,3 THREAD_PRIORITY = -20"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest_hive.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest_hive.java index e0d73a45e1..3b715443e5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest_hive.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest_hive.java @@ -27,7 +27,6 @@ public class MySqlCreateResourceGroupTest_hive extends MysqlTest { - @Test public void test_create() throws Exception { String sql = "CREATE RESOURCE GROUP sql_thread TYPE = USER VCPU = 1,3 THREAD_PRIORITY = -20"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest.java index 37650489a8..2d59bda09e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateSequenceTest extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE SEQUENCE seq1;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest1.java index 30e95a5a62..f0b36e803a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest1.java @@ -24,14 +24,13 @@ import java.util.List; public class MySqlCreateSequenceTest1 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE SEQUENCE customers_seq" + // - " START WITH 1000" + // - " INCREMENT BY 1" + // - " NOCACHE" + // - " NOCYCLE;"; + "CREATE SEQUENCE customers_seq" + // + " START WITH 1000" + // + " INCREMENT BY 1" + // + " NOCACHE" + // + " NOCYCLE;"; List statementList = SQLUtils.parseStatements(sql, DbType.mysql); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest2.java index 43c538d80b..d7db0cccda 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest2.java @@ -24,10 +24,9 @@ import java.util.List; public class MySqlCreateSequenceTest2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE GROUP SEQUENCE seq1;"; + "CREATE GROUP SEQUENCE seq1;"; List statementList = SQLUtils.parseStatements(sql, DbType.mysql); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest3.java index aa1a5753fb..ccc0ec9e35 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest3.java @@ -24,10 +24,9 @@ import java.util.List; public class MySqlCreateSequenceTest3 extends TestCase { - public void test_0() throws Exception { String sql = // - "CREATE GROUP SEQUENCE seq1 START WITH 123 UNIT COUNT 1 INDEX 0"; + "CREATE GROUP SEQUENCE seq1 START WITH 123 UNIT COUNT 1 INDEX 0"; System.out.println(sql); List statementList = SQLUtils.parseStatements(sql, DbType.mysql); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateServerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateServerTest.java index cd14df3e54..ca436519d8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateServerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateServerTest.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateServerTest extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "-- Create server\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableSpaceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableSpaceTest.java index 488544c7a3..9a845bbf1f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableSpaceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableSpaceTest.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateTableSpaceTest extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create tablespace tblsp1 add datafile 'tblsp_work1' use logfile group lg_1 initial_size = 4G engine MYISAM;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableUnitTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableUnitTest.java index 513a9c37e7..2e3c50f606 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableUnitTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableUnitTest.java @@ -16,7 +16,6 @@ * @Date 2019-05-31 17:39 */ public class MySqlCreateTableUnitTest extends MysqlTest { - public void test_0_table_options() throws Exception { String sql = "auto_increment 1\n" + "avg_row_length 1\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_like_test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_like_test.java index adf7f13eee..7d9d5d0247 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_like_test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_like_test.java @@ -11,7 +11,6 @@ import java.util.List; public class MySqlCreateTable_like_test extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE like_test (LIKE t1)"; @@ -30,7 +29,6 @@ public void test_0() throws Exception { ")", stmt.toString()); } - public void test_1() throws Exception { String sql = "CREATE TABLE like_test (`LIKE` t1)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_refactor_test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_refactor_test.java index 42dcf5a693..942627dafb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_refactor_test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_refactor_test.java @@ -16,7 +16,6 @@ * @Date 2019-07-02 15:18 */ public class MySqlCreateTable_refactor_test extends MysqlTest { - public void test_0() throws Exception { String sql = "create table test001\n" + "(" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_repository_test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_repository_test.java index a545976850..8e87547c01 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_repository_test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_repository_test.java @@ -483,25 +483,25 @@ public void test_0() throws Exception { assertEquals("\n", repository.console("show tables from sc01")); assertEquals("CREATE TABLE `test1` (\n" + - "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_tinyint` tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_tinyint`, `c_int`)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + + "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\t`c_tinyint` tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + + "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + + "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + + "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + + "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\t`c_blob` blob COMMENT 'blob',\n" + + "\t`c_text` text COMMENT 'text',\n" + + "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + + "\t`c_longblob` longblob COMMENT 'longblob',\n" + + "\tKEY `k_c` (`c_tinyint`, `c_int`)\n" + + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" , repository.console("show create table test1")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test.java index cb45bb36c8..0ec1cbd9cd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlCreateTable_showColumns_test extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `test1` (\n" + " `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test_2.java index ffb47a8a8d..238c0a49bf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test_2.java @@ -21,7 +21,6 @@ import com.alibaba.druid.util.JdbcConstants; public class MySqlCreateTable_showColumns_test_2 extends MysqlTest { - public void test_0() throws Exception { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test_3.java index b5e08e59ce..10d2793a63 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test_3.java @@ -21,7 +21,6 @@ import com.alibaba.druid.util.JdbcConstants; public class MySqlCreateTable_showColumns_test_3 extends MysqlTest { - public void test_0() throws Exception { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test_4.java index 82c107a89d..892088df0c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test_4.java @@ -22,9 +22,7 @@ import com.alibaba.druid.util.JdbcConstants; public class MySqlCreateTable_showColumns_test_4 extends MysqlTest { - public void test_0() throws Exception { - SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); String sql = "create table tmp_eric (pk int key, ia int unique);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_storage_type_test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_storage_type_test.java index c5242ec4e7..610427171c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_storage_type_test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_storage_type_test.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlCreateTable_storage_type_test extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `test1` (\n" + " `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest.java index 2b8a1be3bf..026fa66e5a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlCreateTriggerTest extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TRIGGER ins_sum BEFORE INSERT ON account FOR EACH ROW SET @sum = @sum + NEW.amount;"; @@ -36,8 +35,8 @@ public void test_0() throws Exception { public void test_1() throws Exception { String sql = "CREATE TRIGGER testref BEFORE INSERT ON test1" + " FOR EACH ROW" + " BEGIN" - + " INSERT INTO test2 SET a2 = NEW.a1;" + " DELETE FROM test3 WHERE a3 = NEW.a1;" - + " UPDATE test4 SET b4 = b4 + 1 WHERE a4 = NEW.a1;" + " END;"; + + " INSERT INTO test2 SET a2 = NEW.a1;" + " DELETE FROM test3 WHERE a3 = NEW.a1;" + + " UPDATE test4 SET b4 = b4 + 1 WHERE a4 = NEW.a1;" + " END;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest2.java index 41f45fa7fd..e20d9cf535 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest2.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlCreateTriggerTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "create trigger employee_trigger after insert,update,delete on employee for each row call \"test.redisson.h2cluster.trigger.ClusterTrigger\""; @@ -36,8 +35,8 @@ public void test_0() throws Exception { public void test_1() throws Exception { String sql = "CREATE TRIGGER testref BEFORE INSERT ON test1" + " FOR EACH ROW" + " BEGIN" - + " INSERT INTO test2 SET a2 = NEW.a1;" + " DELETE FROM test3 WHERE a3 = NEW.a1;" - + " UPDATE test4 SET b4 = b4 + 1 WHERE a4 = NEW.a1;" + " END;"; + + " INSERT INTO test2 SET a2 = NEW.a1;" + " DELETE FROM test3 WHERE a3 = NEW.a1;" + + " UPDATE test4 SET b4 = b4 + 1 WHERE a4 = NEW.a1;" + " END;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest3.java index 41b362d513..7a5f1e9bcd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest3.java @@ -22,7 +22,6 @@ import java.util.List; public class MySqlCreateTriggerTest3 extends MysqlTest { - public void test_0() throws Exception { String sql = "-- Create trigger 1\n" + "-- delimiter //\n" + @@ -48,5 +47,4 @@ public void test_0() throws Exception { "END;", stmt.toString()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest4.java index e76c855dcb..ddcb02bc5e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest4.java @@ -22,7 +22,6 @@ import java.util.List; public class MySqlCreateTriggerTest4 extends MysqlTest { - public void test_0() throws Exception { String sql = "create definer = current_user() trigger trg_my2 after insert on test.t2 for each row insert into log_table values (concat(\"inserted into table test.t2 values: (1c, _) = (\", cast(NEW.col1 as char(100)), \", \", convertToSqlNode(new.`_`, char(100)), \")\"));"; @@ -42,5 +41,4 @@ public void test_0() throws Exception { "VALUES (concat('inserted into table test.t2 values: (1c, _) = (', CAST(NEW.col1 AS char(100)), ', ', convertToSqlNode(new.`_`, char(100)), ')'));", stmt.toString()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest5.java index ded12b66b5..650a9cc269 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest5.java @@ -22,7 +22,6 @@ import java.util.List; public class MySqlCreateTriggerTest5 extends MysqlTest { - public void test_0() throws Exception { String sql = " CREATE DEFINER=`test_app`@`%` TRIGGER `trg_xxx_update` AFTER UPDATE ON `txxx` FOR EACH ROW begin" + "\ninsert into record_history_log (object, identity, action) values('txxx', new.object_id, 'UPDATE');" @@ -48,5 +47,4 @@ public void test_0() throws Exception { "END", stmt.toString()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_1.java index 5bb30b69e9..9d5d70653d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_1.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateUserTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE USER 'jeffrey'@'localhost';"; @@ -38,24 +37,24 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Assert.assertEquals("CREATE USER 'jeffrey'@'localhost';", // - SQLUtils.toMySqlString(stmt)); + SQLUtils.toMySqlString(stmt)); Assert.assertEquals("create user 'jeffrey'@'localhost';", // - SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_2.java index fd2ef90e31..5f6a063dca 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_2.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateUserTest_2 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';"; @@ -38,24 +37,24 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Assert.assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';", // - SQLUtils.toMySqlString(stmt)); + SQLUtils.toMySqlString(stmt)); Assert.assertEquals("create user 'jeffrey'@'localhost' identified by 'mypass';", // - SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_3.java index 4afa744905..8a546ba7c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_3.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateUserTest_3 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE USER 'jeffrey'@'localhost'" + " IDENTIFIED BY PASSWORD '*90E462C37378CED12064BB3388827D2BA3A9B689';"; @@ -39,25 +38,25 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Assert.assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY PASSWORD '*90E462C37378CED12064BB3388827D2BA3A9B689';", // - SQLUtils.toMySqlString(stmt)); - + SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("create user 'jeffrey'@'localhost' identified by password '*90E462C37378CED12064BB3388827D2BA3A9B689';", // - SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_4.java index b7102b1190..a37048aeac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_4.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateUserTest_4 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE USER 'jeffrey'@'localhost'" + " IDENTIFIED WITH my_auth_plugin;"; @@ -39,25 +38,25 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Assert.assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED WITH my_auth_plugin;", // - SQLUtils.toMySqlString(stmt)); - + SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("create user 'jeffrey'@'localhost' identified with my_auth_plugin;", // - SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_5.java index 172ddd2cad..fb1b349169 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_5.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateUserTest_5 extends MysqlTest { - public void test_0() throws Exception { String sql = "create user 'user5301new'@'%' IDENTIFIED BY '123456'"; @@ -39,10 +38,10 @@ public void test_0() throws Exception { stmt.accept(visitor); Assert.assertEquals("CREATE USER 'user5301new'@'%' IDENTIFIED BY '123456'", // - SQLUtils.toMySqlString(stmt)); - + SQLUtils.toMySqlString(stmt)); + Assert.assertEquals("create user 'user5301new'@'%' identified by '123456'", // - SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_6.java index 9a9cb7cc5d..84af07f420 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_6.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateUserStatement; public class MySqlCreateUserTest_6 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'password';"; MySqlCreateUserStatement stmt = (MySqlCreateUserStatement) SQLUtils.parseSingleMysqlStatement(sql); assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'password';", // - SQLUtils.toMySqlString(stmt)); + SQLUtils.toMySqlString(stmt)); } @@ -37,7 +36,7 @@ public void test_1() throws Exception { MySqlCreateUserStatement stmt = (MySqlCreateUserStatement) SQLUtils.parseSingleMysqlStatement(sql); assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'password';", // - SQLUtils.toMySqlString(stmt)); + SQLUtils.toMySqlString(stmt)); } @@ -47,7 +46,7 @@ public void test_2() throws Exception { MySqlCreateUserStatement stmt = (MySqlCreateUserStatement) SQLUtils.parseSingleMysqlStatement(sql); assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'password';", // - SQLUtils.toMySqlString(stmt)); + SQLUtils.toMySqlString(stmt)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_7.java index 7a393e2898..9d03bad9b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_7.java @@ -17,7 +17,6 @@ * @Date 2019-05-22 09:43 */ public class MySqlCreateUserTest_7 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE USER 'seomdbyu'@'%'\n" + "IDENTIFIED BY PASSWORD '*E31E2E4B771597DE2FDECB4E0EC00BE9E87D39D2'"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest.java index 10f573b46c..da9b672598 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest.java @@ -27,12 +27,11 @@ import java.util.List; public class MySqlCreateViewTest extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE OR REPLACE VIEW view_name AS\n" + // - "SELECT fname\n" + // - "FROM table_name\n" + // - "WHERE fid = ?"; + "SELECT fname\n" + // + "FROM table_name\n" + // + "WHERE fid = ?"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest1.java index ded756fa86..60ebd8f42d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest1.java @@ -28,7 +28,6 @@ import java.util.List; public class MySqlCreateViewTest1 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE ALGORITHM=UNDEFINED DEFINER=root@localhost SQL SECURITY DEFINER VIEW view_audit_enroll AS " + "SELECT a.enroll_id AS 'enrollId', case when ((SELECT audit FROM actvty_audit WHERE enroll_id = a.enroll_id AND rankjurisdiction = 1) > 0) then \"县站已审核\" else NULL end AS 'countyAudit', case when ((SELECT audit FROM actvty_audit WHERE enroll_id = a.enroll_id AND rankjurisdiction = 2) > 0) then \"市馆已审核\" else NULL end AS 'cityAudit', case when ((SELECT audit FROM actvty_audit WHERE enroll_id = a.enroll_id AND rankjurisdiction = 3) > 0) then \"省馆已审核\" else NULL end AS 'provinceAudit' FROM actvty_audit a GROUP BY a.enroll_id"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest2.java index 686876d5d8..7a0b2f5883 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest2.java @@ -28,7 +28,6 @@ import java.util.List; public class MySqlCreateViewTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "create view revenue0 as \n" + "select l_suppkey as supplier_no, sum(l_extendedprice * (1 - l_discount)) as total_revenue \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest3.java index 7a43344502..cfc9d8e48f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest3.java @@ -28,7 +28,6 @@ import java.util.List; public class MySqlCreateViewTest3 extends MysqlTest { - public void test_0() throws Exception { String sql = "create algorithm = merge view my_view2(col1, col2) as select * from t2 with check option;\n"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest4.java index 28a3b2095f..87cda775c0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest4.java @@ -28,7 +28,6 @@ import java.util.List; public class MySqlCreateViewTest4 extends MysqlTest { - public void test_0() throws Exception { String sql = "create or replace definer = 'ivan'@'%' view my_view3 as select count(*) from t3;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest5.java index 9b74d300f0..c2b1b4fadd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest5.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlCreateViewTest5 extends TestCase { - public void test_0() throws Exception { String sql = "create or replace definer = current_user sql security invoker view my_view4(c1, 1c, _, c1_2) \n" + "\tas select * from (t1 as tt1, t2 as tt2) inner join t1 on t1.col1 = tt1.col1;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest.java index d7c6983419..afef6328ac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateTableTest extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE t (c CHAR(20) CHARACTER SET utf8 COLLATE utf8_bin);"; @@ -43,7 +42,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); @@ -52,8 +51,8 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "last_name"))); } - - + + public void test_1() throws Exception { String sql = "CREATE TABLE `ins_ebay_auth` (" + " `auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," @@ -80,13 +79,13 @@ public void test_1() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(7, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); } - - + + public void test_2() throws Exception { String sql = "create table t2 as select * from t1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest1.java index da4219d876..1406b25be6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest1.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest1 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " ENGINE = MEMORY;"; + " (id INT, INDEX USING BTREE (id))" + // + " ENGINE = MEMORY;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,6 +52,6 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("lookup", "id"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("lookup", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest10.java index 51f18bad6f..bc1cec5c1d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest10.java @@ -27,16 +27,15 @@ import java.util.List; public class MySqlCreateTableTest10 extends MysqlTest { - public void test_0() throws Exception { String sql = "create table TACCOUNT (" + // - " ID varchar(36) not null," + // - " ACCOUNT varchar(100) not null," + // - " account_money double precision," + // - " NAME varchar(100) not null," + // - " TYPE integer," + // - " primary key (ID)" + // - " )"; + " ID varchar(36) not null," + // + " ACCOUNT varchar(100) not null," + // + " account_money double precision," + // + " NAME varchar(100) not null," + // + " TYPE integer," + // + " primary key (ID)" + // + " )"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest100.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest100.java index 7f6b49b5a1..790bf13c45 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest100.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest100.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlCreateTableTest100 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE IF NOT EXISTS ttable\n" + "(\n" + @@ -26,7 +25,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(9, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest101_geometry.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest101_geometry.java index ea8458beb8..e043793678 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest101_geometry.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest101_geometry.java @@ -8,13 +8,12 @@ import java.util.List; public class MySqlCreateTableTest101_geometry extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE geom (g GEOMETRY NOT NULL);"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(1, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest102.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest102.java index ca53c7e27a..96c29241ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest102.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest102.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest102 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `xktv_perf_6519` (\n" + "  `kd` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',\n" + @@ -78,7 +77,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(63, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest103.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest103.java index c7dc24c8fe..35fdcba562 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest103.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest103.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest103 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `procs_priv` (\n" + " `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',\n" + @@ -25,7 +24,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(10, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest104.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest104.java index a42b2d3292..dabf701e53 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest104.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest104.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest104 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE db1.table_0 (\n" + " column_0 VARCHAR NOT NULL DEFAULT default_varchar COMMENT '',\n" + @@ -22,19 +21,19 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(4, stmt.getTableElementList().size()); assertEquals("CREATE TABLE db1.table_0 (\n" - + "\tcolumn_0 VARCHAR NOT NULL DEFAULT default_varchar COMMENT '',\n" - + "\tcolumn_1 BIGINT COMMENT 'BIGINT_comment',\n" - + "\tcolumn_2 DOUBLE NOT NULL DEFAULT default_double COMMENT '',\n" - + "\tcolumn_3 VARCHAR DELIMITER ',' COMMENT ''\n" - + ")\n" - + "OPTIONS (UPDATETYPE = 'realtime')\n" - + "PARTITION BY KEY (column_0) PARTITION NUM 0\n" - + "TABLEGROUP gg", stmt.toString()); + + "\tcolumn_0 VARCHAR NOT NULL DEFAULT default_varchar COMMENT '',\n" + + "\tcolumn_1 BIGINT COMMENT 'BIGINT_comment',\n" + + "\tcolumn_2 DOUBLE NOT NULL DEFAULT default_double COMMENT '',\n" + + "\tcolumn_3 VARCHAR DELIMITER ',' COMMENT ''\n" + + ")\n" + + "OPTIONS (UPDATETYPE = 'realtime')\n" + + "PARTITION BY KEY (column_0) PARTITION NUM 0\n" + + "TABLEGROUP gg", stmt.toString()); } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest105.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest105.java index a09aa13d8f..58210f8205 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest105.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest105.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest105 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE DIMENSION TABLE tpch_junlan.nation (\n" + " n_nationkey int NOT NULL COMMENT '',\n" + @@ -22,18 +21,18 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(5, stmt.getTableElementList().size()); assertEquals("CREATE DIMENSION TABLE tpch_junlan.nation (\n" - + "\tn_nationkey int NOT NULL COMMENT '',\n" - + "\tn_name varchar NOT NULL COMMENT '',\n" - + "\tn_regionkey int NOT NULL COMMENT '',\n" - + "\tn_comment varchar COMMENT '',\n" - + "\tPRIMARY KEY (N_NATIONKEY)\n" - + ")\n" - + "OPTIONS (UPDATETYPE = 'realtime') COMMENT ''", stmt.toString()); + + "\tn_nationkey int NOT NULL COMMENT '',\n" + + "\tn_name varchar NOT NULL COMMENT '',\n" + + "\tn_regionkey int NOT NULL COMMENT '',\n" + + "\tn_comment varchar COMMENT '',\n" + + "\tPRIMARY KEY (N_NATIONKEY)\n" + + ")\n" + + "OPTIONS (UPDATETYPE = 'realtime') COMMENT ''", stmt.toString()); } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest106.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest106.java index b6c784d44e..9e65be76fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest106.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest106.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest106 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `procs_priv` (\n" + " `Routine_type` enum('FUNCTION','PROCEDURE') COLLATE utf8_bin NOT NULL,\n" + @@ -18,7 +17,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(3, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest107.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest107.java index 63d02ec958..4df66b3fe2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest107.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest107.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest107 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE \n" + "aliolap152578dbopt.aliolap152578dbopt_tbl1 (\n" + @@ -36,27 +35,27 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(14, stmt.getTableElementList().size()); assertEquals("CREATE TABLE aliolap152578dbopt.aliolap152578dbopt_tbl1 (\n" - + "\tcol_id_int int NOT NULL,\n" - + "\tcol2_tinyint tinyint,\n" + "\tcol3_boolean boolean,\n" - + "\tcol4_smallint smallint,\n" - + "\tcol5_int int,\n" + "\tcol6_bigint bigint,\n" - + "\tcol7_float float,\n" - + "\tcol8_double double,\n" + "\tcol9_date date,\n" - + "\tcol10_time time,\n" - + "\tcol11_timestamp timestamp,\n" + "\tcol12_varchar varchar(1000),\n" - + "\tcol13_multivalue multivalue DELIMITER ',',\n" - + "\tPRIMARY KEY (col_id_int, col6_bigint)\n" - + ")\n" - + "OPTIONS (UPDATETYPE = 'realtime')\n" - + "PARTITION BY HASH KEY(col_id_int) PARTITION NUM 100\n" - + "SUBPARTITION BY LIST (col6_bigint BIGINT)\n" - + "SUBPARTITION OPTIONS (available_Partition_Num = 100)\n" - + "TABLEGROUP aliolap152578dbopt_tg1;", stmt.toString()); + + "\tcol_id_int int NOT NULL,\n" + + "\tcol2_tinyint tinyint,\n" + "\tcol3_boolean boolean,\n" + + "\tcol4_smallint smallint,\n" + + "\tcol5_int int,\n" + "\tcol6_bigint bigint,\n" + + "\tcol7_float float,\n" + + "\tcol8_double double,\n" + "\tcol9_date date,\n" + + "\tcol10_time time,\n" + + "\tcol11_timestamp timestamp,\n" + "\tcol12_varchar varchar(1000),\n" + + "\tcol13_multivalue multivalue DELIMITER ',',\n" + + "\tPRIMARY KEY (col_id_int, col6_bigint)\n" + + ")\n" + + "OPTIONS (UPDATETYPE = 'realtime')\n" + + "PARTITION BY HASH KEY(col_id_int) PARTITION NUM 100\n" + + "SUBPARTITION BY LIST (col6_bigint BIGINT)\n" + + "SUBPARTITION OPTIONS (available_Partition_Num = 100)\n" + + "TABLEGROUP aliolap152578dbopt_tg1;", stmt.toString()); } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_drds.java index 5b4ee85361..f458f1f356 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_drds.java @@ -11,7 +11,6 @@ import java.util.List; public class MySqlCreateTableTest108_drds extends MysqlTest { - public void test_0() throws Exception { String sql = "create table ARCHIVE_ERR_RECORD\n" + "(\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_error.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_error.java index 2cf5f749b4..c8d681deeb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_error.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_error.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.parser.ParserException; public class MySqlCreateTableTest108_error extends MysqlTest { - public void test_0() throws Exception { String sql = "create table t (\n" + "f0 int,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest11.java index 9b3da78ff7..37dfebe95b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest11.java @@ -26,15 +26,14 @@ import java.util.List; public class MySqlCreateTableTest11 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `tmall_campaign` (" + // - "`id` int(11) NOT NULL AUTO_INCREMENT," + // - "`campaign_name` varchar(200) NOT NULL COMMENT '活动名称'," + // - "`create_date` datetime DEFAULT NULL COMMENT '活动创建时间'," + // - "`delete_flag` int(11) DEFAULT '0' COMMENT '活动删除标识'," + // - "PRIMARY KEY (`id`)" + // - ") ENGINE=InnoDB DEFAULT CHARSET=gbk;"; + "`id` int(11) NOT NULL AUTO_INCREMENT," + // + "`campaign_name` varchar(200) NOT NULL COMMENT '活动名称'," + // + "`create_date` datetime DEFAULT NULL COMMENT '活动创建时间'," + // + "`delete_flag` int(11) DEFAULT '0' COMMENT '活动删除标识'," + // + "PRIMARY KEY (`id`)" + // + ") ENGINE=InnoDB DEFAULT CHARSET=gbk;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest110_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest110_drds.java index 821470de54..a67137d079 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest110_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest110_drds.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlCreateTableTest110_drds extends MysqlTest { - public void test_0() throws Exception { String sql = "create table a (id int(10)) dbpartition by hash(id) dbpartitionS 2 tbpartition by hash(id) tbpartitions 2 "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest111_ann.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest111_ann.java index be2cd5dcb0..5910c89a15 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest111_ann.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest111_ann.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlCreateTableTest111_ann extends MysqlTest { - public void test_0() throws Exception { String sql = "create table t1 (\n" + "fid bigint, \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest112.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest112.java index 7f4e86f743..22e690b49d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest112.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest112.java @@ -13,7 +13,6 @@ import java.util.List; public class MySqlCreateTableTest112 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE opening_lines ( " + "id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY" + @@ -25,7 +24,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(5, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest113_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest113_drds.java index f1b97575fc..b14d5df8b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest113_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest113_drds.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlCreateTableTest113_drds extends MysqlTest { - public void test_0() throws Exception { String sql = "create table if not exists test_table(\n" + " id INT,name VARCHAR(30) DEFAULT NULL,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest114.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest114.java index d47ca33e38..97a7f174a9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest114.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest114.java @@ -13,7 +13,6 @@ import java.util.List; public class MySqlCreateTableTest114 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE best_sign_cont_task ( \n" + " sys_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL COMMENT '系统时间' \n" + @@ -21,7 +20,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(1, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest115.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest115.java index edab78dd15..4cfd5b6288 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest115.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest115.java @@ -15,7 +15,6 @@ import java.util.List; public class MySqlCreateTableTest115 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE IF NOT EXISTS `schema`.`Employee` (\n" + " id int(10),\n" + @@ -33,7 +32,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(7, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest116.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest116.java index 9194001563..10b56f957f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest116.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest116.java @@ -14,7 +14,6 @@ import java.util.List; public class MySqlCreateTableTest116 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE IF NOT EXISTS `Employee` (\n" + " id int(10)" + @@ -22,7 +21,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -52,7 +51,7 @@ public void test_1() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest117.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest117.java index 2735f25030..07cf00bcfa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest117.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest117.java @@ -8,14 +8,13 @@ import java.util.List; public class MySqlCreateTableTest117 extends MysqlTest { - public void test() throws Exception { String sql = "CREATE TABLE IF NOT EXISTS `Employee` (id int(10) auto_increment" + " ) ENGINE = InnoDB DEFAULT CHARACTER SET = utf8 COLLATE = utf8_bin"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -33,7 +32,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -51,7 +50,7 @@ public void test_1() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -69,7 +68,7 @@ public void test_2() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -87,7 +86,7 @@ public void test_3() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest118.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest118.java index 2c87187699..58596e4fa4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest118.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest118.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest118 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE sal_emp (\n" + " name int,\n" + @@ -18,7 +17,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -40,7 +39,7 @@ public void test_1() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest119_ann.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest119_ann.java index f5c635bee6..2bbdfa4ba1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest119_ann.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest119_ann.java @@ -11,7 +11,6 @@ import java.util.List; public class MySqlCreateTableTest119_ann extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE face_feature (\n" + " id varchar COMMENT 'id',\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest12.java index e19275f5b7..7ed5d51788 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest12.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateTableTest12 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE 'test' ('blob_col' BLOB, INDEX(blob_col(10)));"; @@ -50,6 +49,6 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - Assert.assertTrue(visitor.containsColumn("test", "blob_col")); + Assert.assertTrue(visitor.containsColumn("test", "blob_col")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest120.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest120.java index e8bc4f990d..cb0053af50 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest120.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest120.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlCreateTableTest120 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE sal_emp (\n" + " name int auto_increment unit count 2 index 1 step 0,\n" + @@ -19,7 +18,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -41,7 +40,7 @@ public void test_1() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -64,7 +63,7 @@ public void test_2() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -88,7 +87,7 @@ public void test_3() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql, SQLParserFeature.IgnoreNameQuotes); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest121_fulltext.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest121_fulltext.java index 6f3ac8c24c..a19dda4adc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest121_fulltext.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest121_fulltext.java @@ -13,7 +13,6 @@ import java.util.List; public class MySqlCreateTableTest121_fulltext extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE IF NOT EXISTS ddd ( pk int NOT NULL PRIMARY KEY AUTO_INCREMENT" + ", tint tinyint(10) UNSIGNED ZEROFILL, sint smallint DEFAULT 1000, mint mediumint UNIQUE, bint bigint(20) COMMENT 'bigint'" + @@ -27,7 +26,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(34, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest122_ads.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest122_ads.java index 8a5bed2619..087f6e1c75 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest122_ads.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest122_ads.java @@ -8,13 +8,12 @@ import java.util.List; public class MySqlCreateTableTest122_ads extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE cache_table_1 OPTIONS(cache=true) AS /*+ engine=MPP */ SELECT * FROM test_realtime1 LIMIT 200;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -30,5 +29,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest125_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest125_drds.java index da1555f5ba..c049239137 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest125_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest125_drds.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; public class MySqlCreateTableTest125_drds extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE t_order (\n" + " `id` bigint(11) NOT NULL AUTO_INCREMENT,\n" + @@ -26,7 +25,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -49,85 +48,85 @@ public void test_0() throws Exception { public void test_1() throws Exception { String sql = "CREATE TABLE t_order (\n" + - " `id` bigint(11) NOT NULL AUTO_INCREMENT,\n" + - " `order_id` varchar(20) DEFAULT NULL,\n" + - " `buyer_id` varchar(20) DEFAULT NULL,\n" + - " `seller_id` varchar(20) DEFAULT NULL,\n" + - " `order_snapshot` longtext DEFAULT NULL,\n" + - " `order_detail` longtext DEFAULT NULL,\n" + - " PRIMARY KEY (`id`),\n" + - " KEY `l_i_order` (`order_id`),\n" + - " GLOBAL INDEX `g_i_seller` (`seller_id`) covering(`order_snapshot`) dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3\n" + - ") ENGINE=InnoDB DEFAULT CHARSET=utf8 dbpartition by hash(`order_id`);"; + " `id` bigint(11) NOT NULL AUTO_INCREMENT,\n" + + " `order_id` varchar(20) DEFAULT NULL,\n" + + " `buyer_id` varchar(20) DEFAULT NULL,\n" + + " `seller_id` varchar(20) DEFAULT NULL,\n" + + " `order_snapshot` longtext DEFAULT NULL,\n" + + " `order_detail` longtext DEFAULT NULL,\n" + + " PRIMARY KEY (`id`),\n" + + " KEY `l_i_order` (`order_id`),\n" + + " GLOBAL INDEX `g_i_seller` (`seller_id`) covering(`order_snapshot`) dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3\n" + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 dbpartition by hash(`order_id`);"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals("CREATE TABLE t_order (\n" - + "\t`id` bigint(11) NOT NULL AUTO_INCREMENT,\n" - + "\t`order_id` varchar(20) DEFAULT NULL,\n" - + "\t`buyer_id` varchar(20) DEFAULT NULL,\n" - + "\t`seller_id` varchar(20) DEFAULT NULL,\n" - + "\t`order_snapshot` longtext DEFAULT NULL,\n" - + "\t`order_detail` longtext DEFAULT NULL,\n" - + "\tPRIMARY KEY (`id`),\n" - + "\tKEY `l_i_order` (`order_id`),\n" - + "\tGLOBAL INDEX `g_i_seller`(`seller_id`) COVERING (`order_snapshot`) DBPARTITION BY hash(`seller_id`) TBPARTITION BY hash" - + "(`seller_id`) TBPARTITIONS 3\n" - + ") ENGINE = InnoDB CHARSET = utf8\n" - + "DBPARTITION BY hash(`order_id`);", stmt.toString()); + + "\t`id` bigint(11) NOT NULL AUTO_INCREMENT,\n" + + "\t`order_id` varchar(20) DEFAULT NULL,\n" + + "\t`buyer_id` varchar(20) DEFAULT NULL,\n" + + "\t`seller_id` varchar(20) DEFAULT NULL,\n" + + "\t`order_snapshot` longtext DEFAULT NULL,\n" + + "\t`order_detail` longtext DEFAULT NULL,\n" + + "\tPRIMARY KEY (`id`),\n" + + "\tKEY `l_i_order` (`order_id`),\n" + + "\tGLOBAL INDEX `g_i_seller`(`seller_id`) COVERING (`order_snapshot`) DBPARTITION BY hash(`seller_id`) TBPARTITION BY hash" + + "(`seller_id`) TBPARTITIONS 3\n" + + ") ENGINE = InnoDB CHARSET = utf8\n" + + "DBPARTITION BY hash(`order_id`);", stmt.toString()); } public void test_2() throws Exception { String sql = "CREATE TABLE t_order (\n" + - " `id` bigint(11) NOT NULL AUTO_INCREMENT,\n" + - " `order_id` varchar(20) DEFAULT NULL,\n" + - " `buyer_id` varchar(20) DEFAULT NULL,\n" + - " `seller_id` varchar(20) DEFAULT NULL,\n" + - " `order_snapshot` longtext DEFAULT NULL,\n" + - " `order_detail` longtext DEFAULT NULL,\n" + - " PRIMARY KEY (`id`),\n" + - " KEY `l_i_order` (`order_id`),\n" + - " UNIQUE GLOBAL INDEX `g_i_seller` (`seller_id`) covering (order_snapshot) dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3\n" + - ") ENGINE=InnoDB DEFAULT CHARSET=utf8 dbpartition by hash(`order_id`);"; + " `id` bigint(11) NOT NULL AUTO_INCREMENT,\n" + + " `order_id` varchar(20) DEFAULT NULL,\n" + + " `buyer_id` varchar(20) DEFAULT NULL,\n" + + " `seller_id` varchar(20) DEFAULT NULL,\n" + + " `order_snapshot` longtext DEFAULT NULL,\n" + + " `order_detail` longtext DEFAULT NULL,\n" + + " PRIMARY KEY (`id`),\n" + + " KEY `l_i_order` (`order_id`),\n" + + " UNIQUE GLOBAL INDEX `g_i_seller` (`seller_id`) covering (order_snapshot) dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3\n" + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 dbpartition by hash(`order_id`);"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals("CREATE TABLE t_order (\n" - + "\t`id` bigint(11) NOT NULL AUTO_INCREMENT,\n" - + "\t`order_id` varchar(20) DEFAULT NULL,\n" - + "\t`buyer_id` varchar(20) DEFAULT NULL,\n" - + "\t`seller_id` varchar(20) DEFAULT NULL,\n" - + "\t`order_snapshot` longtext DEFAULT NULL,\n" - + "\t`order_detail` longtext DEFAULT NULL,\n" - + "\tPRIMARY KEY (`id`),\n" - + "\tKEY `l_i_order` (`order_id`),\n" - + "\tUNIQUE GLOBAL INDEX `g_i_seller` (`seller_id`) COVERING (order_snapshot) DBPARTITION BY hash(`seller_id`)" - + " TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3\n" - + ") ENGINE = InnoDB CHARSET = utf8\n" - + "DBPARTITION BY hash(`order_id`);", stmt.toString()); + + "\t`id` bigint(11) NOT NULL AUTO_INCREMENT,\n" + + "\t`order_id` varchar(20) DEFAULT NULL,\n" + + "\t`buyer_id` varchar(20) DEFAULT NULL,\n" + + "\t`seller_id` varchar(20) DEFAULT NULL,\n" + + "\t`order_snapshot` longtext DEFAULT NULL,\n" + + "\t`order_detail` longtext DEFAULT NULL,\n" + + "\tPRIMARY KEY (`id`),\n" + + "\tKEY `l_i_order` (`order_id`),\n" + + "\tUNIQUE GLOBAL INDEX `g_i_seller` (`seller_id`) COVERING (order_snapshot) DBPARTITION BY hash(`seller_id`)" + + " TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3\n" + + ") ENGINE = InnoDB CHARSET = utf8\n" + + "DBPARTITION BY hash(`order_id`);", stmt.toString()); } public void test_3() throws Exception { String sql = "CREATE TABLE t_order (\n" + " `id` bigint(11) NOT NULL AUTO_INCREMENT,\n" - + " `order_id` varchar(20) DEFAULT NULL,\n" + " `buyer_id` varchar(20) DEFAULT NULL,\n" - + " `seller_id` varchar(20) DEFAULT NULL,\n" + " `order_snapshot` longtext DEFAULT NULL,\n" - + " `order_detail` longtext DEFAULT NULL,\n" + " PRIMARY KEY (`id`),\n" - + " KEY `l_i_order` (`order_id`),\n" - + " UNIQUE GLOBAL `g_i_seller` (`seller_id`) covering (order_snapshot) " - + "DBPARTITION BY HASH(SELLER_ID) TBPARTITION BY UNI_HASH(SELLER_ID) TBPARTITIONS 12" - + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 dbpartition by hash(`order_id`);"; + + " `order_id` varchar(20) DEFAULT NULL,\n" + " `buyer_id` varchar(20) DEFAULT NULL,\n" + + " `seller_id` varchar(20) DEFAULT NULL,\n" + " `order_snapshot` longtext DEFAULT NULL,\n" + + " `order_detail` longtext DEFAULT NULL,\n" + " PRIMARY KEY (`id`),\n" + + " KEY `l_i_order` (`order_id`),\n" + + " UNIQUE GLOBAL `g_i_seller` (`seller_id`) covering (order_snapshot) " + + "DBPARTITION BY HASH(SELLER_ID) TBPARTITION BY UNI_HASH(SELLER_ID) TBPARTITIONS 12" + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 dbpartition by hash(`order_id`);"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -136,29 +135,29 @@ public void test_3() throws Exception { assertEquals(1, statementList.size()); assertEquals("CREATE TABLE t_order (\n" + "\t`id` bigint(11) NOT NULL AUTO_INCREMENT,\n" - + "\t`order_id` varchar(20) DEFAULT NULL,\n" + "\t`buyer_id` varchar(20) DEFAULT NULL,\n" - + "\t`seller_id` varchar(20) DEFAULT NULL,\n" + "\t`order_snapshot` longtext DEFAULT NULL,\n" - + "\t`order_detail` longtext DEFAULT NULL,\n" + "\tPRIMARY KEY (`id`),\n" - + "\tKEY `l_i_order` (`order_id`),\n" - + "\tUNIQUE GLOBAL `g_i_seller` (`seller_id`) COVERING (order_snapshot) " - + "DBPARTITION BY HASH(SELLER_ID) TBPARTITION BY UNI_HASH(SELLER_ID) TBPARTITIONS 12\n" - + ") ENGINE = InnoDB CHARSET = utf8\n" + "DBPARTITION BY hash(`order_id`);", - stmt.toString()); + + "\t`order_id` varchar(20) DEFAULT NULL,\n" + "\t`buyer_id` varchar(20) DEFAULT NULL,\n" + + "\t`seller_id` varchar(20) DEFAULT NULL,\n" + "\t`order_snapshot` longtext DEFAULT NULL,\n" + + "\t`order_detail` longtext DEFAULT NULL,\n" + "\tPRIMARY KEY (`id`),\n" + + "\tKEY `l_i_order` (`order_id`),\n" + + "\tUNIQUE GLOBAL `g_i_seller` (`seller_id`) COVERING (order_snapshot) " + + "DBPARTITION BY HASH(SELLER_ID) TBPARTITION BY UNI_HASH(SELLER_ID) TBPARTITIONS 12\n" + + ") ENGINE = InnoDB CHARSET = utf8\n" + "DBPARTITION BY hash(`order_id`);", + stmt.toString()); } public void test_4() throws Exception { String sql = "CREATE TABLE t_order (\n" - + " `id` bigint(11) NOT NULL AUTO_INCREMENT,\n" - + " `order_id` varchar(20) DEFAULT NULL,\n" - + " `buyer_id` varchar(20) DEFAULT NULL,\n" - + " `seller_id` varchar(20) DEFAULT NULL,\n" - + " `order_snapshot` longtext DEFAULT NULL,\n" - + " `order_detail` longtext DEFAULT NULL,\n" - + " PRIMARY KEY (`id`),\n" - + " KEY `l_i_order` (`order_id`),\n" - + " UNIQUE GLOBAL `g_i_seller` (`seller_id`) covering (order_snapshot) dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3 COMMENT \"CREATE GSI TEST\"\n" - + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 dbpartition by hash(`order_id`);"; + + " `id` bigint(11) NOT NULL AUTO_INCREMENT,\n" + + " `order_id` varchar(20) DEFAULT NULL,\n" + + " `buyer_id` varchar(20) DEFAULT NULL,\n" + + " `seller_id` varchar(20) DEFAULT NULL,\n" + + " `order_snapshot` longtext DEFAULT NULL,\n" + + " `order_detail` longtext DEFAULT NULL,\n" + + " PRIMARY KEY (`id`),\n" + + " KEY `l_i_order` (`order_id`),\n" + + " UNIQUE GLOBAL `g_i_seller` (`seller_id`) covering (order_snapshot) dbpartition by hash(`seller_id`) tbpartition by hash(`seller_id`) tbpartitions 3 COMMENT \"CREATE GSI TEST\"\n" + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 dbpartition by hash(`order_id`);"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -167,18 +166,18 @@ public void test_4() throws Exception { assertEquals(1, statementList.size()); assertEquals("CREATE TABLE t_order (\n" - + "\t`id` bigint(11) NOT NULL AUTO_INCREMENT,\n" - + "\t`order_id` varchar(20) DEFAULT NULL,\n" - + "\t`buyer_id` varchar(20) DEFAULT NULL,\n" - + "\t`seller_id` varchar(20) DEFAULT NULL,\n" - + "\t`order_snapshot` longtext DEFAULT NULL,\n" - + "\t`order_detail` longtext DEFAULT NULL,\n" - + "\tPRIMARY KEY (`id`),\n" - + "\tKEY `l_i_order` (`order_id`),\n" - + "\tUNIQUE GLOBAL `g_i_seller` (`seller_id`) COVERING (order_snapshot) DBPARTITION BY hash(`seller_id`)" - + " TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3 COMMENT 'CREATE GSI TEST'\n" - + ") ENGINE = InnoDB CHARSET = utf8\n" + "DBPARTITION BY hash(`order_id`);", - stmt.toString()); + + "\t`id` bigint(11) NOT NULL AUTO_INCREMENT,\n" + + "\t`order_id` varchar(20) DEFAULT NULL,\n" + + "\t`buyer_id` varchar(20) DEFAULT NULL,\n" + + "\t`seller_id` varchar(20) DEFAULT NULL,\n" + + "\t`order_snapshot` longtext DEFAULT NULL,\n" + + "\t`order_detail` longtext DEFAULT NULL,\n" + + "\tPRIMARY KEY (`id`),\n" + + "\tKEY `l_i_order` (`order_id`),\n" + + "\tUNIQUE GLOBAL `g_i_seller` (`seller_id`) COVERING (order_snapshot) DBPARTITION BY hash(`seller_id`)" + + " TBPARTITION BY hash(`seller_id`) TBPARTITIONS 3 COMMENT 'CREATE GSI TEST'\n" + + ") ENGINE = InnoDB CHARSET = utf8\n" + "DBPARTITION BY hash(`order_id`);", + stmt.toString()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126.java index af3c6f33da..feaea4c3af 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126.java @@ -8,38 +8,36 @@ import java.util.List; public class MySqlCreateTableTest126 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE tablename1 (\n" - + " id INT,\n" - + " title clob,\n" - + " body clob,\n" - + " comment clob,\n" - + " author clob,\n" - + " FULLTEXT INDEX f_idx1(title) WITH INDEX ANALYZER 'analyzer_name1' WITH QUERY ANALYZER 'analyzer_name2',\n" - + " FULLTEXT INDEX f_idx2(body) WITH ANALYZER 'analyzer_name3', " - + " FULLTEXT INDEX f_idx3(comment) WITH INDEX ANALYZER 'analyzer_name4', " - + " FULLTEXT INDEX f_idx4(author) WITH QUERY ANALYZER 'analyzer_name5'," - + " FULLTEXT INDEX f_idx5(author)\n" - + ");"; + + " id INT,\n" + + " title clob,\n" + + " body clob,\n" + + " comment clob,\n" + + " author clob,\n" + + " FULLTEXT INDEX f_idx1(title) WITH INDEX ANALYZER 'analyzer_name1' WITH QUERY ANALYZER 'analyzer_name2',\n" + + " FULLTEXT INDEX f_idx2(body) WITH ANALYZER 'analyzer_name3', " + + " FULLTEXT INDEX f_idx3(comment) WITH INDEX ANALYZER 'analyzer_name4', " + + " FULLTEXT INDEX f_idx4(author) WITH QUERY ANALYZER 'analyzer_name5'," + + " FULLTEXT INDEX f_idx5(author)\n" + + ");"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals("CREATE TABLE tablename1 (\n" + "\tid INT,\n" + "\ttitle clob,\n" + "\tbody clob,\n" - + "\tcomment clob,\n" + "\tauthor clob,\n" - + "\tFULLTEXT INDEX f_idx1(title) WITH INDEX ANALYZER 'analyzer_name1' WITH QUERY ANALYZER 'analyzer_name2',\n" - + "\tFULLTEXT INDEX f_idx2(body) WITH ANALYZER 'analyzer_name3',\n" - + "\tFULLTEXT INDEX f_idx3(comment) WITH INDEX ANALYZER 'analyzer_name4',\n" - + "\tFULLTEXT INDEX f_idx4(author) WITH QUERY ANALYZER 'analyzer_name5',\n" - + "\tFULLTEXT INDEX f_idx5(author)\n" + ");", stmt.toString()); + + "\tcomment clob,\n" + "\tauthor clob,\n" + + "\tFULLTEXT INDEX f_idx1(title) WITH INDEX ANALYZER 'analyzer_name1' WITH QUERY ANALYZER 'analyzer_name2',\n" + + "\tFULLTEXT INDEX f_idx2(body) WITH ANALYZER 'analyzer_name3',\n" + + "\tFULLTEXT INDEX f_idx3(comment) WITH INDEX ANALYZER 'analyzer_name4',\n" + + "\tFULLTEXT INDEX f_idx4(author) WITH QUERY ANALYZER 'analyzer_name5',\n" + + "\tFULLTEXT INDEX f_idx5(author)\n" + ");", stmt.toString()); } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126_drds.java index 133a8236dc..04b2569116 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126_drds.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest126_drds extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE xx\n" + "DBPARTITION BY hash(name1) TBPARTITION BY hash(name2) TBPARTITIONS 4\n" + @@ -21,7 +20,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -38,5 +37,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest127_ads_ann.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest127_ads_ann.java index b7c10ad37a..ab744cd6d8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest127_ads_ann.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest127_ads_ann.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest127_ads_ann extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE adl_new_retail.adl_sec_verify_face ( \n" + " id varchar NOT NULL COMMENT '', \n" + @@ -22,7 +21,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -47,5 +46,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest128_quote.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest128_quote.java index 199ed676b2..b233d92906 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest128_quote.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest128_quote.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest128_quote extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE \"linxi_test\".\"linxi_subpart11\" (\n" + " \"id\" BIGINT NOT NULL\n" + @@ -26,7 +25,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -46,5 +45,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest129_ads.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest129_ads.java index 5dfa025ead..cdee05dd91 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest129_ads.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest129_ads.java @@ -9,13 +9,12 @@ import java.util.List; public class MySqlCreateTableTest129_ads extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE cache_table_1 OPTIONS(cache=true) AS /*+ engine=MPP */ SELECT * FROM test_realtime1 LIMIT 200;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -46,7 +45,7 @@ public void test_1() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -88,7 +87,7 @@ public void test_2() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -137,7 +136,7 @@ public void test_3() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -186,7 +185,7 @@ public void test_4() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -239,5 +238,4 @@ public void test_create_table_new() { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest13.java index cdcceb653f..308e625024 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest13.java @@ -25,19 +25,18 @@ import java.util.List; public class MySqlCreateTableTest13 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `xx_video` (" + // - "`id` int(11) NOT NULL AUTO_INCREMENT," + // - "`video_url` varchar(500) DEFAULT NULL," + // - "`video_title` varchar(200) DEFAULT NULL," + // - "`video_des` varchar(500) DEFAULT NULL," + // - "`video_type` varchar(11) NOT NULL," + // - "`delete_flag` int(11) DEFAULT '0'," + // - "`create_date` datetime DEFAULT NULL," + // - "`last_update` datetime DEFAULT NULL," + // - "PRIMARY KEY (`id`)" + // - ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=gbk;"; + "`id` int(11) NOT NULL AUTO_INCREMENT," + // + "`video_url` varchar(500) DEFAULT NULL," + // + "`video_title` varchar(200) DEFAULT NULL," + // + "`video_des` varchar(500) DEFAULT NULL," + // + "`video_type` varchar(11) NOT NULL," + // + "`delete_flag` int(11) DEFAULT '0'," + // + "`create_date` datetime DEFAULT NULL," + // + "`last_update` datetime DEFAULT NULL," + // + "PRIMARY KEY (`id`)" + // + ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=gbk;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest130_ads.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest130_ads.java index ffab6b3f2b..7540f61ebb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest130_ads.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest130_ads.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlCreateTableTest130_ads extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE IF NOT EXISTS hm_crm.crm_wdk_hm_store_poi_di\n" + "(\n" + @@ -27,7 +26,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -47,6 +46,4 @@ public void test_0() throws Exception { } - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest131_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest131_drds.java index e5d482dba5..c727f64ae4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest131_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest131_drds.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlCreateTableTest131_drds extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE shard_hot_test_table (\n" + " id int(11) NOT NULL AUTO_INCREMENT BY GROUP,\n" + @@ -19,7 +18,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -44,6 +43,4 @@ public void test_0() throws Exception { } - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest132_drds_primaryKey.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest132_drds_primaryKey.java index 3fbada22c4..cc46906b51 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest132_drds_primaryKey.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest132_drds_primaryKey.java @@ -8,13 +8,12 @@ import java.util.List; public class MySqlCreateTableTest132_drds_primaryKey extends MysqlTest { - public void test_0() throws Exception { String sql = "create table gxw_test_87 (id int, name varchar(20), primary key(id, name)) dbpartition by hash(id);"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -27,10 +26,7 @@ public void test_0() throws Exception { "DBPARTITION BY hash(id);", stmt.toString()); - } - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest133_drds_gsi.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest133_drds_gsi.java index e76e7c4f11..1b981de83a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest133_drds_gsi.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest133_drds_gsi.java @@ -13,34 +13,32 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; public class MySqlCreateTableTest133_drds_gsi extends MysqlTest { - // Constraint XXX may not show in parsed sql, so removed it. - private static final String CREATE_TABLE_BASE = "CREATE TABLE IF NOT EXISTS `full_type_table` (\n" - + "\tpk INT NOT NULL PRIMARY KEY AUTO_INCREMENT,\n" - + "\tid1 INT,\n" + "\tid2 INT,\n" - + "\tid3 VARCHAR(100),\n" + "\tvc1 VARCHAR(100),\n" - + "\tvc3 VARCHAR(100),\n" - + "\tINDEX idx1 USING HASH(id1),\n" - + "\tKEY idx2 USING HASH (id2),\n" - + "\tFULLTEXT KEY idx4 (id3(20)),\n" - + "\tUNIQUE idx3 USING BTREE (vc1(20))"; - private static final String CREATE_TABLE_TAIL = "\n) ENGINE = INNODB AUTO_INCREMENT = 2 AVG_ROW_LENGTH = 100 " - + "CHARACTER SET = utf8 COLLATE = utf8_bin CHECKSUM = 0 COMMENT 'abcd'\n" - + "DBPARTITION BY HASH(id1);"; - - private static final String FULL_TYPE_TABLE = CREATE_TABLE_BASE + CREATE_TABLE_TAIL; - - private static final List GSI_DEFINITIONS = new ArrayList(); - - private static final List GSI_DEF_HEAD = new ArrayList(); - private static final List GSI_DEF_COLUMN_DB = new ArrayList(); - private static final List GSI_DEF_COLUMN_TB = new ArrayList(); - private static final List GSI_DEF_SHARDING_DB = new ArrayList(); - private static final List GSI_DEF_SHARDING_TB = new ArrayList(); + private static final String CREATE_TABLE_BASE = "CREATE TABLE IF NOT EXISTS `full_type_table` (\n" + + "\tpk INT NOT NULL PRIMARY KEY AUTO_INCREMENT,\n" + + "\tid1 INT,\n" + "\tid2 INT,\n" + + "\tid3 VARCHAR(100),\n" + "\tvc1 VARCHAR(100),\n" + + "\tvc3 VARCHAR(100),\n" + + "\tINDEX idx1 USING HASH(id1),\n" + + "\tKEY idx2 USING HASH (id2),\n" + + "\tFULLTEXT KEY idx4 (id3(20)),\n" + + "\tUNIQUE idx3 USING BTREE (vc1(20))"; + private static final String CREATE_TABLE_TAIL = "\n) ENGINE = INNODB AUTO_INCREMENT = 2 AVG_ROW_LENGTH = 100 " + + "CHARACTER SET = utf8 COLLATE = utf8_bin CHECKSUM = 0 COMMENT 'abcd'\n" + + "DBPARTITION BY HASH(id1);"; + + private static final String FULL_TYPE_TABLE = CREATE_TABLE_BASE + CREATE_TABLE_TAIL; + + private static final List GSI_DEFINITIONS = new ArrayList(); + + private static final List GSI_DEF_HEAD = new ArrayList(); + private static final List GSI_DEF_COLUMN_DB = new ArrayList(); + private static final List GSI_DEF_COLUMN_TB = new ArrayList(); + private static final List GSI_DEF_SHARDING_DB = new ArrayList(); + private static final List GSI_DEF_SHARDING_TB = new ArrayList(); private static final List GSI_DEF_INDEX_OPTION = new ArrayList(); static { - GSI_DEF_HEAD.add("GLOBAL INDEX"); GSI_DEF_HEAD.add("UNIQUE GLOBAL"); // GSI_DEF_HEAD.add("GLOBAL UNIQUE INDEX"); @@ -86,7 +84,7 @@ public class MySqlCreateTableTest133_drds_gsi extends MysqlTest { private static void buildGsiDef(String head, String option, String column, List gsiDefShardingDb) { for (String sharding : gsiDefShardingDb) { GSI_DEFINITIONS.add("\t" + head + " " + column + " " + sharding + (StringUtils.isBlank(option) ? "" : " ") - + option); + + option); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest134.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest134.java index 259db6f755..1fb26949e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest134.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest134.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest134 extends MysqlTest { - public void test_0() throws Exception { String sql = "create table xuhan3(\n" + "id int not null AUTO_INCREMENT primary key, \n" + @@ -18,7 +17,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -42,6 +41,4 @@ public void test_0() throws Exception { } - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest135_isString.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest135_isString.java index c22b9a1a25..8424182a8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest135_isString.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest135_isString.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlCreateTableTest135_isString extends MysqlTest { - public void test_0() throws Exception { String sql = "create table t(\n" + "f1 varchar(50), \n" + @@ -22,7 +21,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -34,6 +33,4 @@ public void test_0() throws Exception { } - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest136.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest136.java index 6c78f4b373..8869a42eaa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest136.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest136.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest136 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `c1` (\n" + " `id` bigint NOT NULL AUTO_INCREMENT,\n" + @@ -20,7 +19,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -44,6 +43,4 @@ public void test_0() throws Exception { } - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest137.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest137.java index 1d9d9a686d..4965b81763 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest137.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest137.java @@ -10,14 +10,13 @@ import java.util.List; public class MySqlCreateTableTest137 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `c1` (\n" + " order bigint);"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -46,6 +45,4 @@ public void test_1() throws Exception { } - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest138.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest138.java index fa77d6626e..602dcf7026 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest138.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest138.java @@ -10,7 +10,6 @@ import java.util.List; public class MySqlCreateTableTest138 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `t_push_branch3` (\n" + " `id` varchar(50) NOT NULL COMMENT '主键id',\n" + @@ -39,7 +38,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -127,7 +126,4 @@ public void test_0() throws Exception { } - - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest139.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest139.java index 79cd99c07c..c1078aa436 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest139.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest139.java @@ -8,13 +8,12 @@ import java.util.List; public class MySqlCreateTableTest139 extends MysqlTest { - public void test_0() throws Exception { String sql = " CREATE TABLE IF NOT EXISTS simiao_alter_partition2 (id int, id2 int, name varchar(30), time timestamp NOT NULL, PRIMARY KEY (id, time), KEY idx_id_time USING BTREE (id, time)) PARTITION BY RANGE (UNIX_TIMESTAMP(time))( PARTITION p0 VALUES LESS THAN (UNIX_TIMESTAMP('2013-01-01 00:00:00')), PARTITION p1 VALUES LESS THAN (UNIX_TIMESTAMP('2013-02-01 00:00:00')), PARTITION p2 VALUES LESS THAN (UNIX_TIMESTAMP('2013-03-01 00:00:00')), PARTITION p3 VALUES LESS THAN (UNIX_TIMESTAMP('2013-04-01 00:00:00')), PARTITION p4 VALUES LESS THAN (UNIX_TIMESTAMP('2013-05-01 00:00:00')), PARTITION p5 VALUES LESS THAN (UNIX_TIMESTAMP('2013-06-01 00:00:00')), PARTITION p6 VALUES LESS THAN (UNIX_TIMESTAMP('2013-07-01 00:00:00')), PARTITION p7 VALUES LESS THAN (UNIX_TIMESTAMP('2013-08-01 00:00:00')), PARTITION p8 VALUES LESS THAN (UNIX_TIMESTAMP('2013-09-01 00:00:00')), PARTITION p10 VALUES LESS THAN (UNIX_TIMESTAMP('2013-10-01 00:00:00')), PARTITION p11 VALUES LESS THAN (UNIX_TIMESTAMP('2013-11-01 00:00:00')), PARTITION p12 VALUES LESS THAN (UNIX_TIMESTAMP('2013-12-01 00:00:00')), PARTITION p13 VALUES LESS THAN (MAXVALUE) ) dbpartition by hash(id) dbpartitions 4;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -72,7 +71,4 @@ public void test_0() throws Exception { } - - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest14.java index 17de32231e..f43d75b88c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest14.java @@ -26,44 +26,43 @@ import java.util.List; public class MySqlCreateTableTest14 extends MysqlTest { - public void test_0() throws Exception { String sql = " CREATE TABLE `OptionList` ( " + // - "`ID` int(11) NOT NULL AUTO_INCREMENT, " + // - "`OptionID` int(11) DEFAULT NULL COMMENT '选项ID', " + // - "`QuizID` int(11) DEFAULT NULL COMMENT '竞猜题目ID', " + // - "`OptionName` varchar(500) DEFAULT NULL COMMENT '选项名称', " + // - "`OptionCount` int(11) DEFAULT NULL COMMENT '选择的人数', " + // - "PRIMARY KEY (`ID`), KEY `quizId` (`QuizID`) USING BTREE, " + // - "KEY `optionId` (`OptionID`) USING BTREE" + // - ") ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT=''"; + "`ID` int(11) NOT NULL AUTO_INCREMENT, " + // + "`OptionID` int(11) DEFAULT NULL COMMENT '选项ID', " + // + "`QuizID` int(11) DEFAULT NULL COMMENT '竞猜题目ID', " + // + "`OptionName` varchar(500) DEFAULT NULL COMMENT '选项名称', " + // + "`OptionCount` int(11) DEFAULT NULL COMMENT '选择的人数', " + // + "PRIMARY KEY (`ID`), KEY `quizId` (`QuizID`) USING BTREE, " + // + "KEY `optionId` (`OptionID`) USING BTREE" + // + ") ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT=''"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + Assert.assertEquals("CREATE TABLE `OptionList` (" - + "\n\t`ID` int(11) NOT NULL AUTO_INCREMENT," - + "\n\t`OptionID` int(11) DEFAULT NULL COMMENT '选项ID'," - + "\n\t`QuizID` int(11) DEFAULT NULL COMMENT '竞猜题目ID'," - + "\n\t`OptionName` varchar(500) DEFAULT NULL COMMENT '选项名称'," - + "\n\t`OptionCount` int(11) DEFAULT NULL COMMENT '选择的人数'," - + "\n\tPRIMARY KEY (`ID`)," - + "\n\tKEY `quizId` USING BTREE (`QuizID`)," - + "\n\tKEY `optionId` USING BTREE (`OptionID`)" - + "\n) ENGINE = InnoDB CHARSET = gbk COMMENT ''", // - SQLUtils.toMySqlString(stmt)); + + "\n\t`ID` int(11) NOT NULL AUTO_INCREMENT," + + "\n\t`OptionID` int(11) DEFAULT NULL COMMENT '选项ID'," + + "\n\t`QuizID` int(11) DEFAULT NULL COMMENT '竞猜题目ID'," + + "\n\t`OptionName` varchar(500) DEFAULT NULL COMMENT '选项名称'," + + "\n\t`OptionCount` int(11) DEFAULT NULL COMMENT '选择的人数'," + + "\n\tPRIMARY KEY (`ID`)," + + "\n\tKEY `quizId` USING BTREE (`QuizID`)," + + "\n\tKEY `optionId` USING BTREE (`OptionID`)" + + "\n) ENGINE = InnoDB CHARSET = gbk COMMENT ''", // + SQLUtils.toMySqlString(stmt)); Assert.assertEquals("create table `OptionList` (" - + "\n\t`ID` int(11) not null auto_increment," - + "\n\t`OptionID` int(11) default null comment '选项ID'," - + "\n\t`QuizID` int(11) default null comment '竞猜题目ID'," - + "\n\t`OptionName` varchar(500) default null comment '选项名称'," - + "\n\t`OptionCount` int(11) default null comment '选择的人数'," - + "\n\tprimary key (`ID`)," - + "\n\tkey `quizId` using BTREE (`QuizID`)," - + "\n\tkey `optionId` using BTREE (`OptionID`)" - + "\n) engine = InnoDB charset = gbk comment ''", // - SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\n\t`ID` int(11) not null auto_increment," + + "\n\t`OptionID` int(11) default null comment '选项ID'," + + "\n\t`QuizID` int(11) default null comment '竞猜题目ID'," + + "\n\t`OptionName` varchar(500) default null comment '选项名称'," + + "\n\t`OptionCount` int(11) default null comment '选择的人数'," + + "\n\tprimary key (`ID`)," + + "\n\tkey `quizId` using BTREE (`QuizID`)," + + "\n\tkey `optionId` using BTREE (`OptionID`)" + + "\n) engine = InnoDB charset = gbk comment ''", // + SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest140.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest140.java index b37f46623a..be82e15f49 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest140.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest140.java @@ -8,13 +8,12 @@ import java.util.List; public class MySqlCreateTableTest140 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE foo AS SELECT * FROM t WITH NO DATA"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -34,7 +33,4 @@ public void test_0() throws Exception { } - - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest141.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest141.java index 19c51ecbb2..21f4e2d968 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest141.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest141.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest141 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE sbtest1 (\n" + "id INTEGER UNSIGNED NOT NULL ,\n" + @@ -20,7 +19,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -48,7 +47,4 @@ public void test_0() throws Exception { } - - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest142.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest142.java index f32317cfc3..7449c8af12 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest142.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest142.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest142 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `think_member_discount` (\n" + " `id`  bigint , \n" + @@ -33,7 +32,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -87,7 +86,4 @@ public void test_0() throws Exception { } - - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest143_position.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest143_position.java index bae4c94e1f..93d84af2f2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest143_position.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest143_position.java @@ -15,9 +15,7 @@ * @Date 2019-05-09 10:45 */ public class MySqlCreateTableTest143_position extends MysqlTest { - public void test_0() throws Exception { - String sql = "CREATE TABLE `resume_position_portrait` (\n" + " `resume_id` varchar(36) NOT NULL,\n" + " `method` varchar(50) NOT NULL,\n" + @@ -38,7 +36,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest144_three_backtick.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest144_three_backtick.java index 338c110d7c..d84b52f20b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest144_three_backtick.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest144_three_backtick.java @@ -15,9 +15,7 @@ * @Date 2019-05-09 14:51 */ public class MySqlCreateTableTest144_three_backtick extends MysqlTest { - public void test_0() throws Exception { - String sql = "CREATE TABLE `dbn_product_album_info` (\n" + " `id` bigint(20) NOT NULL AUTO_INCREMENT,\n" + " `position` int(11) DEFAULT '9999',\n" + @@ -34,7 +32,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest145_tail_hint.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest145_tail_hint.java index 53dd4b4a48..1f2fdc56ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest145_tail_hint.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest145_tail_hint.java @@ -15,9 +15,7 @@ * @Date 2019-05-09 20:08 */ public class MySqlCreateTableTest145_tail_hint extends MysqlTest { - public void test_0() throws Exception { - String sql = "CREATE TABLE `log_fake` (\n" + " `id` varchar(37) NOT NULL COMMENT 'uuid',\n" + " `merchant_id` varchar(37) DEFAULT NULL COMMENT '商户id',\n" + @@ -50,7 +48,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest146_col_def.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest146_col_def.java index 1e20a6d3fc..0aa43755d5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest146_col_def.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest146_col_def.java @@ -10,38 +10,33 @@ /** * @version 1.0 * @ClassName MySqlCreateTableTest146_col_def - * @description - * - * column_definition: - * data_type [NOT NULL | NULL] [DEFAULT default_value] - * [AUTO_INCREMENT] [UNIQUE [KEY]] [[PRIMARY] KEY] - * [COMMENT 'string'] - * [COLLATE collation_name] - * [COLUMN_FORMAT {FIXED|DYNAMIC|DEFAULT}] - * [STORAGE {DISK|MEMORY}] - * [reference_definition] - * | data_type - * [COLLATE collation_name] - * [GENERATED ALWAYS] AS (expr) - * [VIRTUAL | STORED] [NOT NULL | NULL] - * [UNIQUE [KEY]] [[PRIMARY] KEY] - * [COMMENT 'string'] - * [reference_definition] - * + * @description column_definition: + * data_type [NOT NULL | NULL] [DEFAULT default_value] + * [AUTO_INCREMENT] [UNIQUE [KEY]] [[PRIMARY] KEY] + * [COMMENT 'string'] + * [COLLATE collation_name] + * [COLUMN_FORMAT {FIXED|DYNAMIC|DEFAULT}] + * [STORAGE {DISK|MEMORY}] + * [reference_definition] + * | data_type + * [COLLATE collation_name] + * [GENERATED ALWAYS] AS (expr) + * [VIRTUAL | STORED] [NOT NULL | NULL] + * [UNIQUE [KEY]] [[PRIMARY] KEY] + * [COMMENT 'string'] + * [reference_definition] * @Author zzy * @Date 2019-05-14 10:14 */ public class MySqlCreateTableTest146_col_def extends TestCase { - public void test_0() throws Exception { - String sql = "create table tb_dxdd (" + "`a` varchar(10) not null default 'val' comment 'hehe' collate utf8_unicode_ci column_format default storage disk references tb_ref (a) match full on delete cascade on update cascade" + ");"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -69,7 +64,7 @@ public void test_1() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -87,7 +82,7 @@ public void test_2() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext.java index b9caa3110d..4469b8e8bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext.java @@ -10,23 +10,19 @@ /** * @version 1.0 * @ClassName MySqlCreateTableTest147_fulltext - * @description - * - * | {FULLTEXT|SPATIAL} [INDEX|KEY] [index_name] (key_part,...) - * [index_option] ... + * @description | {FULLTEXT|SPATIAL} [INDEX|KEY] [index_name] (key_part,...) + * [index_option] ... * [INDEX|KEY] [index_name]都可以省略 - * * @Author zzy * @Date 2019-05-14 16:19 */ public class MySqlCreateTableTest147_fulltext extends TestCase { - public void test_0() throws Exception { String sql = "create table tt (b varchar(128), fulltext (b));"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext2.java index affc1b83cf..a4bc2ad193 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext2.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest147_fulltext2 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE aliyun_poc_db.tbl_custom_analyzer2 (\n" + " `id` int COMMENT '',\n" + @@ -19,7 +18,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext3.java index af705a3139..a1fe56fce8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext3.java @@ -8,9 +8,7 @@ import java.util.List; public class MySqlCreateTableTest147_fulltext3 extends TestCase { - public void test_0() throws Exception { - String sql = "CREATE TABLE tbl_custom_analyzer2 (\n" + " `id` int COMMENT '', \n" + " `title` varchar COMMENT '', \n" + @@ -34,7 +32,6 @@ public void test_0() throws Exception { } public void test_1() throws Exception { - String sql = "CREATE TABLE tbl_custom_analyzer2 (\n" + " `id` int COMMENT '', \n" + " `title` varchar COMMENT '', \n" + @@ -59,7 +56,6 @@ public void test_1() throws Exception { } public void test_2() throws Exception { - String sql = "CREATE TABLE tbl_custom_analyzer2 (\n" + " `id` int COMMENT '', \n" + " `title` varchar COMMENT '', \n" + @@ -84,7 +80,6 @@ public void test_2() throws Exception { } public void test_3() throws Exception { - String sql = "CREATE TABLE tbl_custom_analyzer2 (\n" + " `id` int COMMENT '', \n" + " `title` varchar COMMENT '', \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest148_national_char.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest148_national_char.java index 355415ed1a..d369716bbf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest148_national_char.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest148_national_char.java @@ -10,16 +10,12 @@ /** * @version 1.0 * @ClassName MySqlCreateTableTest148_national_char - * @description - * - * [NATIONAL] CHAR[(M)] [CHARACTER SET charset_name] [COLLATE collation_name] + * @description [NATIONAL] CHAR[(M)] [CHARACTER SET charset_name] [COLLATE collation_name] * [NATIONAL] VARCHAR(M) [CHARACTER SET charset_name] [COLLATE collation_name] - * * @Author zzy * @Date 2019-05-14 17:25 */ public class MySqlCreateTableTest148_national_char extends TestCase { - public void test_0() throws Exception { String sql = "create temporary table if not exists `tb_kxipe` (\n" + "\t col_vttevt national char(128),\n" + @@ -28,7 +24,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest149_collate_before_generated.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest149_collate_before_generated.java index 3b67cb1b00..f4a9126bcb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest149_collate_before_generated.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest149_collate_before_generated.java @@ -10,27 +10,23 @@ /** * @version 1.0 * @ClassName MySqlCreateTableTest149_collate_before_generated - * @description - * - * | data_type - * [COLLATE collation_name] - * [GENERATED ALWAYS] AS (expr) - * [VIRTUAL | STORED] [NOT NULL | NULL] - * [UNIQUE [KEY]] [[PRIMARY] KEY] - * [COMMENT 'string'] - * [reference_definition] - * + * @description | data_type + * [COLLATE collation_name] + * [GENERATED ALWAYS] AS (expr) + * [VIRTUAL | STORED] [NOT NULL | NULL] + * [UNIQUE [KEY]] [[PRIMARY] KEY] + * [COMMENT 'string'] + * [reference_definition] * @Author zzy * @Date 2019-05-14 17:41 */ public class MySqlCreateTableTest149_collate_before_generated extends TestCase { - public void test_0() { String sql = "create temporary table `tb_dhma` (col_oxqagw int collate utf8_unicode_ci generated always as ( 1+2 ))"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest15.java index 3fd9527ec5..202dffe49e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest15.java @@ -25,21 +25,20 @@ import java.util.List; public class MySqlCreateTableTest15 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `xxx` (" + // - " `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID'," + // - " `create_date` datetime DEFAULT NULL," + // - " `update_date` datetime DEFAULT NULL," + // - " `product_id` int(11) NOT NULL COMMENT '产品ID'," + // - " `memeber_id` int(11) NOT NULL COMMENT '用户ID'," + // - " `name` varchar(50) DEFAULT NULL COMMENT '姓名'," + // - " `address` varchar(500) DEFAULT NULL COMMENT '地址'," + // - " `mobile` varchar(50) DEFAULT NULL COMMENT '手机'," + // - " `amount` int(11) DEFAULT NULL COMMENT '兑换数量'," + // - " PRIMARY KEY (`id`)" + // - " ) ENGINE=InnoDB DEFAULT CHARSET=gbk;" + // - ""; + " `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID'," + // + " `create_date` datetime DEFAULT NULL," + // + " `update_date` datetime DEFAULT NULL," + // + " `product_id` int(11) NOT NULL COMMENT '产品ID'," + // + " `memeber_id` int(11) NOT NULL COMMENT '用户ID'," + // + " `name` varchar(50) DEFAULT NULL COMMENT '姓名'," + // + " `address` varchar(500) DEFAULT NULL COMMENT '地址'," + // + " `mobile` varchar(50) DEFAULT NULL COMMENT '手机'," + // + " `amount` int(11) DEFAULT NULL COMMENT '兑换数量'," + // + " PRIMARY KEY (`id`)" + // + " ) ENGINE=InnoDB DEFAULT CHARSET=gbk;" + // + ""; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest150_eunm_set_with_charset.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest150_eunm_set_with_charset.java index ee44f8c288..92d0ef4dd9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest150_eunm_set_with_charset.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest150_eunm_set_with_charset.java @@ -15,7 +15,6 @@ * @Date 2019-05-15 10:30 */ public class MySqlCreateTableTest150_eunm_set_with_charset extends TestCase { - public void test_0() { String sql = "create temporary table `tb_xx` (\n" + "`col_ttuap` enum('value1','value2') character set utf8 collate utf8_unicode_ci generated always as ( 1+2 ) virtual unique comment 'comment' references tb_fn ( `col_qzqnqrrfyv` ) match partial\n" + @@ -23,7 +22,7 @@ public void test_0() { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -43,7 +42,7 @@ public void test_1() { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest151_double_precision.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest151_double_precision.java index 6dac549512..6577fb1b53 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest151_double_precision.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest151_double_precision.java @@ -15,7 +15,6 @@ * @Date 2019-05-15 14:07 */ public class MySqlCreateTableTest151_double_precision extends TestCase { - public void test_0() { String sql = "create temporary table tb_etaqf (\n" + "\t `col_mcdw` double precision(10,2)\n" + @@ -23,7 +22,7 @@ public void test_0() { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest152_table_options.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest152_table_options.java index 87217304a8..7198fe287c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest152_table_options.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest152_table_options.java @@ -10,39 +10,35 @@ /** * @version 1.0 * @ClassName MySqlCreateTableTest152_table_options - * @description - * - * table_option: - * AUTO_INCREMENT [=] value - * | AVG_ROW_LENGTH [=] value - * | [DEFAULT] CHARACTER SET [=] charset_name - * | CHECKSUM [=] {0 | 1} - * | [DEFAULT] COLLATE [=] collation_name - * | COMMENT [=] 'string' - * | COMPRESSION [=] {'ZLIB'|'LZ4'|'NONE'} - * | CONNECTION [=] 'connect_string' - * | {DATA|INDEX} DIRECTORY [=] 'absolute path to directory' - * | DELAY_KEY_WRITE [=] {0 | 1} - * | ENCRYPTION [=] {'Y' | 'N'} - * | ENGINE [=] engine_name - * | INSERT_METHOD [=] { NO | FIRST | LAST } - * | KEY_BLOCK_SIZE [=] value - * | MAX_ROWS [=] value - * | MIN_ROWS [=] value - * | PACK_KEYS [=] {0 | 1 | DEFAULT} - * | PASSWORD [=] 'string' - * | ROW_FORMAT [=] {DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT} - * | STATS_AUTO_RECALC [=] {DEFAULT|0|1} - * | STATS_PERSISTENT [=] {DEFAULT|0|1} - * | STATS_SAMPLE_PAGES [=] value - * | TABLESPACE tablespace_name [STORAGE {DISK|MEMORY}] - * | UNION [=] (tbl_name[,tbl_name]...) - * + * @description table_option: + * AUTO_INCREMENT [=] value + * | AVG_ROW_LENGTH [=] value + * | [DEFAULT] CHARACTER SET [=] charset_name + * | CHECKSUM [=] {0 | 1} + * | [DEFAULT] COLLATE [=] collation_name + * | COMMENT [=] 'string' + * | COMPRESSION [=] {'ZLIB'|'LZ4'|'NONE'} + * | CONNECTION [=] 'connect_string' + * | {DATA|INDEX} DIRECTORY [=] 'absolute path to directory' + * | DELAY_KEY_WRITE [=] {0 | 1} + * | ENCRYPTION [=] {'Y' | 'N'} + * | ENGINE [=] engine_name + * | INSERT_METHOD [=] { NO | FIRST | LAST } + * | KEY_BLOCK_SIZE [=] value + * | MAX_ROWS [=] value + * | MIN_ROWS [=] value + * | PACK_KEYS [=] {0 | 1 | DEFAULT} + * | PASSWORD [=] 'string' + * | ROW_FORMAT [=] {DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT} + * | STATS_AUTO_RECALC [=] {DEFAULT|0|1} + * | STATS_PERSISTENT [=] {DEFAULT|0|1} + * | STATS_SAMPLE_PAGES [=] value + * | TABLESPACE tablespace_name [STORAGE {DISK|MEMORY}] + * | UNION [=] (tbl_name[,tbl_name]...) * @Author zzy * @Date 2019-05-15 16:26 */ public class MySqlCreateTableTest152_table_options extends TestCase { - public void test_no_comma_no_eq() { String sql = "create table tb (a int)" + "auto_increment 1\n" + @@ -73,7 +69,7 @@ public void test_no_comma_no_eq() { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -115,7 +111,7 @@ public void test_options_comma_eq() { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest153_collate.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest153_collate.java index 6bd5ac7947..1d57962d9c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest153_collate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest153_collate.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest153_collate extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `t_file` (\n" + "`id` BIGINT(20) NOT NULL AUTO_INCREMENT,\n" + @@ -39,7 +38,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -99,7 +98,4 @@ public void test_0() throws Exception { } - - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest154_hint.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest154_hint.java index 1bf19efc6f..702b40b06e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest154_hint.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest154_hint.java @@ -9,7 +9,6 @@ public class MySqlCreateTableTest154_hint extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `ngram_2_t1_1` (\n" + " `id` int(10) unsigned NOT NULL AUTO_INCREMENT,\n" + @@ -22,7 +21,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -48,7 +47,4 @@ public void test_0() throws Exception { } - - - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest155.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest155.java index ada4f2c417..82db43534f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest155.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest155.java @@ -9,7 +9,6 @@ public class MySqlCreateTableTest155 extends MysqlTest { - public void test_0() throws Exception { String sql = "create table pk(id int primary key , name varchar)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest156_ob.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest156_ob.java index b45f057e07..744abd7123 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest156_ob.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest156_ob.java @@ -6,7 +6,6 @@ public class MySqlCreateTableTest156_ob extends MysqlTest { - public void test_0() throws Exception { String sql = "create table `ar_ranking_001_t` (\n" + " `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest157_shadow.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest157_shadow.java index ba5ef616ed..60dfd20b89 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest157_shadow.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest157_shadow.java @@ -12,7 +12,6 @@ * @Date 2019/10/8 19:25 */ public class MySqlCreateTableTest157_shadow extends MysqlTest { - public void test_0() throws Exception { String sql = "create shadow table `ar_ranking_001_t` (\n" + " `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest158_asselect.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest158_asselect.java index f7bd166111..2abd34f9f0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest158_asselect.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest158_asselect.java @@ -7,7 +7,6 @@ public class MySqlCreateTableTest158_asselect extends MysqlTest { - public void test_0() throws Exception { String sql = "create table tmp_eric (pk int key, ia int unique) replace as select * from t;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest159.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest159.java index 65a1032195..11c994a75b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest159.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest159.java @@ -6,7 +6,6 @@ public class MySqlCreateTableTest159 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `articles` (\n" + " `article_id` bigint NOT NULL AUTO_INCREMENT COMMENT '文章id',\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest16.java index 6235b36a36..4bfa7ebbc8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest16.java @@ -26,21 +26,20 @@ import java.util.List; public class MySqlCreateTableTest16 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `xxx` (" + // - " `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID'," + // - " `create_date` datetime DEFAULT NULL," + // - " `update_date` datetime DEFAULT NULL," + // - " `product_id` int(11) NOT NULL COMMENT '产品ID'," + // - " `memeber_id` int(11) NOT NULL COMMENT '用户ID'," + // - " `name` varchar(50) DEFAULT NULL COMMENT '姓名'," + // - " `address` varchar(500) DEFAULT NULL COMMENT '地址'," + // - " `mobile` varchar(50) DEFAULT NULL COMMENT '手机'," + // - " `amount` int(11) DEFAULT NULL COMMENT '兑换数量'," + // - " PRIMARY KEY (`id`)" + // - " ) ENGINE=InnoDB DEFAULT CHARSET=gbk;" + // - ""; + " `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID'," + // + " `create_date` datetime DEFAULT NULL," + // + " `update_date` datetime DEFAULT NULL," + // + " `product_id` int(11) NOT NULL COMMENT '产品ID'," + // + " `memeber_id` int(11) NOT NULL COMMENT '用户ID'," + // + " `name` varchar(50) DEFAULT NULL COMMENT '姓名'," + // + " `address` varchar(500) DEFAULT NULL COMMENT '地址'," + // + " `mobile` varchar(50) DEFAULT NULL COMMENT '手机'," + // + " `amount` int(11) DEFAULT NULL COMMENT '兑换数量'," + // + " PRIMARY KEY (`id`)" + // + " ) ENGINE=InnoDB DEFAULT CHARSET=gbk;" + // + ""; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest160.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest160.java index bfa82afa97..42147b5c67 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest160.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest160.java @@ -7,7 +7,6 @@ public class MySqlCreateTableTest160 extends MysqlTest { - public void test_0() throws Exception { //for ADB String sql = "CREATE TABLE IF NOT EXISTS bar (LIKE a INCLUDING PROPERTIES)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest161_storage_policy.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest161_storage_policy.java index 30627f404e..ee925b7ee4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest161_storage_policy.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest161_storage_policy.java @@ -7,7 +7,6 @@ public class MySqlCreateTableTest161_storage_policy extends MysqlTest { - public void test_0() throws Exception { //for ADB String sql = "create table event_log(log_id bigint, log_time datetime)\n" + @@ -70,7 +69,6 @@ public void test_3() throws Exception { SQLUtils.parseSingleMysqlStatement(sql); fail(); } catch (ParserException e) { - } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest17.java index e6a2328da4..2ba88f9145 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest17.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest17 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE t1 (" + // - " ts TIMESTAMP(6) DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6)" + // - ");"; + " ts TIMESTAMP(6) DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6)" + // + ");"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest18.java index d24999143b..7859cb02dc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest18.java @@ -25,48 +25,47 @@ import java.util.List; public class MySqlCreateTableTest18 extends MysqlTest { + public void test_0() throws Exception { + String sql = "CREATE TABLE IF NOT EXISTS `t_awards` (" + // + " `id` int(11) NOT NULL AUTO_INCREMENT," + // + " `seller_id` int(11) NOT NULL," + // + " `shop_id` int(11) DEFAULT NULL," + // + " `mode` int(4) NOT NULL," + // + " `draw_rate_1` int(11) NOT NULL," + // + " `draw_rate_2` int(11) NOT NULL," + // + " `amount` int(11) NOT NULL," + // + " `position_code` int(11) NOT NULL," + // + " `f_denomination` int(11) DEFAULT NULL," + // + " `f_description` text," + // + " `f_url` text," + // + " `f_type` int(4) DEFAULT NULL," + // + " PRIMARY KEY (`id`)," + // + " UNIQUE KEY `id` (`id`)" + // + ") ENGINE=InnoDB DEFAULT CHARSET=gbk" + // + ";"; - public void test_0() throws Exception { - String sql = "CREATE TABLE IF NOT EXISTS `t_awards` (" + // - " `id` int(11) NOT NULL AUTO_INCREMENT," + // - " `seller_id` int(11) NOT NULL," + // - " `shop_id` int(11) DEFAULT NULL," + // - " `mode` int(4) NOT NULL," + // - " `draw_rate_1` int(11) NOT NULL," + // - " `draw_rate_2` int(11) NOT NULL," + // - " `amount` int(11) NOT NULL," + // - " `position_code` int(11) NOT NULL," + // - " `f_denomination` int(11) DEFAULT NULL," + // - " `f_description` text," + // - " `f_url` text," + // - " `f_type` int(4) DEFAULT NULL," + // - " PRIMARY KEY (`id`)," + // - " UNIQUE KEY `id` (`id`)" + // - ") ENGINE=InnoDB DEFAULT CHARSET=gbk" + // - ";"; - - MySqlStatementParser parser = new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); - Assert.assertEquals(1, statementList.size()); + Assert.assertEquals(1, statementList.size()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); - statemen.accept(visitor); + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + statemen.accept(visitor); // System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(12, visitor.getColumns().size()); - Assert.assertEquals(0, visitor.getConditions().size()); + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(12, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); - Assert.assertTrue(visitor.getTables().containsKey( - new TableStat.Name("t_awards"))); + Assert.assertTrue(visitor.getTables().containsKey( + new TableStat.Name("t_awards"))); - Assert.assertTrue(visitor.containsColumn("t_awards", "f_type")); - } + Assert.assertTrue(visitor.containsColumn("t_awards", "f_type")); + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest19.java index 9560504889..5c79ce7b0c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest19.java @@ -26,18 +26,17 @@ import java.util.List; public class MySqlCreateTableTest19 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE new_tbl LIKE orig_tbl;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + Assert.assertEquals("CREATE TABLE new_tbl LIKE orig_tbl;", // - SQLUtils.toMySqlString(stmt)); + SQLUtils.toMySqlString(stmt)); Assert.assertEquals("create table new_tbl like orig_tbl;", // - SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest2.java index 7b03de8998..9edd166b3d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest2.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateTableTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE test (blob_col BLOB, INDEX(blob_col(10)));"; @@ -51,6 +50,6 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); - Assert.assertTrue(visitor.getColumns().contains(new Column("test", "blob_col"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("test", "blob_col"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest20.java index 481efbef19..23fafbe5b0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest20.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateTableTest20 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE new_tbl (LIKE orig_tbl);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest21.java index 2166b6d6a6..5cc2652734 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest21.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlCreateTableTest21 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE new_tbl (LIKE orig_tbl);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest22.java index 9d51502e80..c1446bd6dc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest22.java @@ -26,12 +26,11 @@ import java.util.List; public class MySqlCreateTableTest22 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE t1 (" + // - "c1 INT STORAGE DISK," + // - "c2 INT STORAGE MEMORY " + // - ") TABLESPACE ts_1 ENGINE NDB;"; + "c1 INT STORAGE DISK," + // + "c2 INT STORAGE MEMORY " + // + ") TABLESPACE ts_1 ENGINE NDB;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -56,9 +55,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE t1 (" + // - "\n\tc1 INT STORAGE DISK," + // - "\n\tc2 INT STORAGE MEMORY" + // - "\n) TABLESPACE ts_1 ENGINE = NDB;", output); + "\n\tc1 INT STORAGE DISK," + // + "\n\tc2 INT STORAGE MEMORY" + // + "\n) TABLESPACE ts_1 ENGINE = NDB;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest23.java index a29438e732..0e33a72ad1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest23.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest23 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " ENGINE = MEMORY;"; // + " (id INT, INDEX USING BTREE (id))" + // + " ENGINE = MEMORY;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) ENGINE = MEMORY;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) ENGINE = MEMORY;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest24.java index c14656c7a8..3cee060153 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest24.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest24 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " AVG_ROW_LENGTH = 1024;"; // + " (id INT, INDEX USING BTREE (id))" + // + " AVG_ROW_LENGTH = 1024;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) AVG_ROW_LENGTH = 1024;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) AVG_ROW_LENGTH = 1024;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest25.java index 3ab489483e..efb9b137e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest25.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest25 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " AVG_ROW_LENGTH 1024;"; // + " (id INT, INDEX USING BTREE (id))" + // + " AVG_ROW_LENGTH 1024;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) AVG_ROW_LENGTH = 1024;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) AVG_ROW_LENGTH = 1024;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest26.java index c785f9e067..5b2d0b6d4b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest26.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest26 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " MAX_ROWS 1024;"; // + " (id INT, INDEX USING BTREE (id))" + // + " MAX_ROWS 1024;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) MAX_ROWS = 1024;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) MAX_ROWS = 1024;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest27.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest27.java index c94918a703..09aef2c9a4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest27.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest27 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " MAX_ROWS = 1024;"; // + " (id INT, INDEX USING BTREE (id))" + // + " MAX_ROWS = 1024;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) MAX_ROWS = 1024;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) MAX_ROWS = 1024;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest28.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest28.java index 92df44d431..92d7723b95 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest28.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest28 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " MIN_ROWS = 1024;"; // + " (id INT, INDEX USING BTREE (id))" + // + " MIN_ROWS = 1024;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) MIN_ROWS = 1024;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) MIN_ROWS = 1024;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest29.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest29.java index 4c1686bd19..a5c7927f13 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest29.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest29 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE user" + // - " (id INT, INDEX USING BTREE (id))" + // - " MIN_ROWS 1024;"; // + " (id INT, INDEX USING BTREE (id))" + // + " MIN_ROWS 1024;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE user (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) MIN_ROWS = 1024;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) MIN_ROWS = 1024;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest3.java index 37856311dc..9a4ff24229 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest3.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlCreateTableTest3 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE tk (col1 INT, col2 CHAR(5), col3 DATE) PARTITION BY KEY(col3) PARTITIONS 4;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest30.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest30.java index 969cf845fa..a5e9c4dd97 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest30.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest30 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " DELAY_KEY_WRITE 0;"; // + " (id INT, INDEX USING BTREE (id))" + // + " DELAY_KEY_WRITE 0;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) DELAY_KEY_WRITE = 0;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) DELAY_KEY_WRITE = 0;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest31.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest31.java index a3b206b274..fe69bdad8d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest31.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest31 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " DELAY_KEY_WRITE = 1;"; // + " (id INT, INDEX USING BTREE (id))" + // + " DELAY_KEY_WRITE = 1;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) DELAY_KEY_WRITE = 1;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) DELAY_KEY_WRITE = 1;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest32.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest32.java index 86dc4b9b82..cf47855dd9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest32.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest32 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " DATA DIRECTORY = 'aaa';"; // + " (id INT, INDEX USING BTREE (id))" + // + " DATA DIRECTORY = 'aaa';"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) DATA DIRECTORY = 'aaa';", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) DATA DIRECTORY = 'aaa';", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest33.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest33.java index 6e82039c25..9795c486ac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest33.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest33 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " CONNECTION = 'aaa';"; // + " (id INT, INDEX USING BTREE (id))" + // + " CONNECTION = 'aaa';"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) CONNECTION = 'aaa';", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) CONNECTION = 'aaa';", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest34.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest34.java index e2bd1f33b8..b5ee02b42c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest34.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest34 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " CHECKSUM = 1;"; // + " (id INT, INDEX USING BTREE (id))" + // + " CHECKSUM = 1;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) CHECKSUM = 1;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) CHECKSUM = 1;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest35.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest35.java index 60d5924621..44fea434f5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest35.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest35.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest35 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " AUTO_INCREMENT = 1;"; // + " (id INT, INDEX USING BTREE (id))" + // + " AUTO_INCREMENT = 1;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) AUTO_INCREMENT = 1;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) AUTO_INCREMENT = 1;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest36.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest36.java index 0ffc2592cd..25edd61f2a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest36.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest36 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " STATS_AUTO_RECALC = 1;"; // + " (id INT, INDEX USING BTREE (id))" + // + " STATS_AUTO_RECALC = 1;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) STATS_AUTO_RECALC = 1;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) STATS_AUTO_RECALC = 1;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest37.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest37.java index 502d2816a8..4ca864ab69 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest37.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest37.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest37 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " STATS_AUTO_RECALC DEFAULT;"; // + " (id INT, INDEX USING BTREE (id))" + // + " STATS_AUTO_RECALC DEFAULT;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) STATS_AUTO_RECALC = DEFAULT;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) STATS_AUTO_RECALC = DEFAULT;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest38.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest38.java index 77c20142a3..fa6e3d2ee7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest38.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest38.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest38 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " STATS_PERSISTENT DEFAULT;"; // + " (id INT, INDEX USING BTREE (id))" + // + " STATS_PERSISTENT DEFAULT;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) STATS_PERSISTENT = DEFAULT;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) STATS_PERSISTENT = DEFAULT;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest39.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest39.java index 31e32ea4a1..f02486734e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest39.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest39.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest39 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " STATS_PERSISTENT 1;"; // + " (id INT, INDEX USING BTREE (id))" + // + " STATS_PERSISTENT 1;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) STATS_PERSISTENT = 1;", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) STATS_PERSISTENT = 1;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest4.java index 6fb96580bc..c385a953f5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest4.java @@ -26,15 +26,14 @@ import java.util.List; public class MySqlCreateTableTest4 extends MysqlTest { - public void test_0() throws Exception { String sql = "create table t_temp_11593685fc3244cf81468209484078a0 (" + // - "id int not null auto_increment, " + // - "score float not null, " + // - "student bigint not null, " + // - "primary key(id)," + // - "key score(score), " + // - "key student(student))"; + "id int not null auto_increment, " + // + "score float not null, " + // + "student bigint not null, " + // + "primary key(id)," + // + "key score(score), " + // + "key student(student))"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest40.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest40.java index 3cb9b5245d..8885428632 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest40.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest40.java @@ -26,10 +26,9 @@ import java.util.List; public class MySqlCreateTableTest40 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE t1 (col1 INT, col2 CHAR(5))" + // - " PARTITION BY HASH(col1);"; // + " PARTITION BY HASH(col1);"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -54,10 +53,10 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE t1 (" + // - "\n\tcol1 INT," + // - "\n\tcol2 CHAR(5)" + // - "\n)" - + "\nPARTITION BY HASH (col1);", output); + "\n\tcol1 INT," + // + "\n\tcol2 CHAR(5)" + // + "\n)" + + "\nPARTITION BY HASH (col1);", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest41.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest41.java index 33a9f5879c..2702b46062 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest41.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest41.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlCreateTableTest41 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE tk (col1 INT, col2 CHAR(5), col3 DATE)" + // - " PARTITION BY LINEAR KEY(col3)" + // - " PARTITIONS 5;"; // + " PARTITION BY LINEAR KEY(col3)" + // + " PARTITIONS 5;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,11 +54,11 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE tk (" + // - "\n\tcol1 INT," + // - "\n\tcol2 CHAR(5)," + // - "\n\tcol3 DATE" + // - "\n)" - + "\nPARTITION BY LINEAR KEY (col3) PARTITIONS 5;", output); + "\n\tcol1 INT," + // + "\n\tcol2 CHAR(5)," + // + "\n\tcol3 DATE" + // + "\n)" + + "\nPARTITION BY LINEAR KEY (col3) PARTITIONS 5;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest42.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest42.java index 47158cccd9..e2050b031b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest42.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest42.java @@ -26,18 +26,17 @@ import java.util.List; public class MySqlCreateTableTest42 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE rc (" + // - " a INT NOT NULL, " + // - " b INT NOT NULL" + // - ")" + // - "PARTITION BY RANGE COLUMNS(a,b) (" + // - " PARTITION p0 VALUES LESS THAN (10,5)," + // - " PARTITION p1 VALUES LESS THAN (20,10)," + // - " PARTITION p2 VALUES LESS THAN (MAXVALUE,15)," + // - " PARTITION p3 VALUES LESS THAN (MAXVALUE,MAXVALUE)" + // - ");"; // + " a INT NOT NULL, " + // + " b INT NOT NULL" + // + ")" + // + "PARTITION BY RANGE COLUMNS(a,b) (" + // + " PARTITION p0 VALUES LESS THAN (10,5)," + // + " PARTITION p1 VALUES LESS THAN (20,10)," + // + " PARTITION p2 VALUES LESS THAN (MAXVALUE,15)," + // + " PARTITION p3 VALUES LESS THAN (MAXVALUE,MAXVALUE)" + // + ");"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest43.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest43.java index e65ee5b067..4ea290d11e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest43.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest43.java @@ -26,18 +26,17 @@ import java.util.List; public class MySqlCreateTableTest43 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE client_firms (" + // - " id INT," + // - " name VARCHAR(35)" + // - ")" + // - "PARTITION BY LIST (id) (" + // - " PARTITION r0 VALUES IN (1, 5, 9, 13, 17, 21)," + // - " PARTITION r1 VALUES IN (2, 6, 10, 14, 18, 22)," + // - " PARTITION r2 VALUES IN (3, 7, 11, 15, 19, 23)," + // - " PARTITION r3 VALUES IN (4, 8, 12, 16, 20, 24)" + // - ");"; // + " id INT," + // + " name VARCHAR(35)" + // + ")" + // + "PARTITION BY LIST (id) (" + // + " PARTITION r0 VALUES IN (1, 5, 9, 13, 17, 21)," + // + " PARTITION r1 VALUES IN (2, 6, 10, 14, 18, 22)," + // + " PARTITION r2 VALUES IN (3, 7, 11, 15, 19, 23)," + // + " PARTITION r3 VALUES IN (4, 8, 12, 16, 20, 24)" + // + ");"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest44.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest44.java index 96f42a7d51..6f7ee9cfff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest44.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest44.java @@ -26,18 +26,17 @@ import java.util.List; public class MySqlCreateTableTest44 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lc (" + // - " a INT NULL, " + // - " b INT NULL" + // - ")" + // - "PARTITION BY LIST COLUMNS(a,b) (" + // - " PARTITION p0 VALUES IN( (0,0), (NULL,NULL) )," + // - " PARTITION p1 VALUES IN( (0,1), (0,2), (0,3), (1,1), (1,2) )," + // - " PARTITION p2 VALUES IN( (1,0), (2,0), (2,1), (3,0), (3,1) )," + // - " PARTITION p3 VALUES IN( (1,3), (2,2), (2,3), (3,2), (3,3) )" + // - ");"; // + " a INT NULL, " + // + " b INT NULL" + // + ")" + // + "PARTITION BY LIST COLUMNS(a,b) (" + // + " PARTITION p0 VALUES IN( (0,0), (NULL,NULL) )," + // + " PARTITION p1 VALUES IN( (0,1), (0,2), (0,3), (1,1), (1,2) )," + // + " PARTITION p2 VALUES IN( (1,0), (2,0), (2,1), (3,0), (3,1) )," + // + " PARTITION p3 VALUES IN( (1,3), (2,2), (2,3), (3,2), (3,3) )" + // + ");"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest45.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest45.java index 4e59c0d4cd..0f4d38d097 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest45.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest45.java @@ -26,24 +26,23 @@ import java.util.List; public class MySqlCreateTableTest45 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE th (id INT, name VARCHAR(30), adate DATE)" + // - "PARTITION BY LIST(YEAR(adate))" + // - "(" + // - " PARTITION p1999 VALUES IN (1995, 1999, 2003)" + // - " DATA DIRECTORY = '/var/appdata/95/data'" + // - " INDEX DIRECTORY = '/var/appdata/95/idx'," + // - " PARTITION p2000 VALUES IN (1996, 2000, 2004)" + // - " DATA DIRECTORY = '/var/appdata/96/data'" + // - " INDEX DIRECTORY = '/var/appdata/96/idx'," + // - " PARTITION p2001 VALUES IN (1997, 2001, 2005)" + // - " DATA DIRECTORY = '/var/appdata/97/data'" + // - " INDEX DIRECTORY = '/var/appdata/97/idx'," + // - " PARTITION p2002 VALUES IN (1998, 2002, 2006)" + // - " DATA DIRECTORY = '/var/appdata/98/data'" + // - " INDEX DIRECTORY = '/var/appdata/98/idx'" + // - ");"; // + "PARTITION BY LIST(YEAR(adate))" + // + "(" + // + " PARTITION p1999 VALUES IN (1995, 1999, 2003)" + // + " DATA DIRECTORY = '/var/appdata/95/data'" + // + " INDEX DIRECTORY = '/var/appdata/95/idx'," + // + " PARTITION p2000 VALUES IN (1996, 2000, 2004)" + // + " DATA DIRECTORY = '/var/appdata/96/data'" + // + " INDEX DIRECTORY = '/var/appdata/96/idx'," + // + " PARTITION p2001 VALUES IN (1997, 2001, 2005)" + // + " DATA DIRECTORY = '/var/appdata/97/data'" + // + " INDEX DIRECTORY = '/var/appdata/97/idx'," + // + " PARTITION p2002 VALUES IN (1998, 2002, 2006)" + // + " DATA DIRECTORY = '/var/appdata/98/data'" + // + " INDEX DIRECTORY = '/var/appdata/98/idx'" + // + ");"; // MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest46.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest46.java index e3039cc763..1f8e96342d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest46.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest46.java @@ -24,11 +24,10 @@ import org.junit.Assert; public class MySqlCreateTableTest46 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE lookup" + // - " (id INT, INDEX USING BTREE (id))" + // - " STATS_PERSISTENT 1;"; // + " (id INT, INDEX USING BTREE (id))" + // + " STATS_PERSISTENT 1;"; // MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -49,9 +48,9 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // - "\n) STATS_PERSISTENT = 1", output); + "\n\tid INT," + // + "\n\tINDEX USING BTREE(id)" + // + "\n) STATS_PERSISTENT = 1", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest47.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest47.java index 35505be932..71549d9f13 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest47.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest47.java @@ -24,15 +24,14 @@ import org.junit.Assert; public class MySqlCreateTableTest47 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE issuestatus ("// - + "ID VARCHAR(60) NOT NULL, " // - + "SEQUENCE DECIMAL(18,0), " // - + "pname VARCHAR(60), " // - + "DESCRIPTION TEXT, " // - + "ICONURL VARCHAR(255), " // - + "CONSTRAINT PK_issuestatus PRIMARY KEY (ID))"; // + + "ID VARCHAR(60) NOT NULL, " // + + "SEQUENCE DECIMAL(18,0), " // + + "pname VARCHAR(60), " // + + "DESCRIPTION TEXT, " // + + "ICONURL VARCHAR(255), " // + + "CONSTRAINT PK_issuestatus PRIMARY KEY (ID))"; // MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -53,13 +52,13 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE issuestatus ("// - + "\n\tID VARCHAR(60) NOT NULL,"// - + "\n\tSEQUENCE DECIMAL(18, 0),"// - + "\n\tpname VARCHAR(60),"// - + "\n\tDESCRIPTION TEXT,"// - + "\n\tICONURL VARCHAR(255),"// - + "\n\tPRIMARY KEY (ID)"// - + "\n)", output); + + "\n\tID VARCHAR(60) NOT NULL,"// + + "\n\tSEQUENCE DECIMAL(18, 0),"// + + "\n\tpname VARCHAR(60),"// + + "\n\tDESCRIPTION TEXT,"// + + "\n\tICONURL VARCHAR(255),"// + + "\n\tPRIMARY KEY (ID)"// + + "\n)", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest48.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest48.java index 245ebb7f34..6dd119dc69 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest48.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest48.java @@ -24,16 +24,15 @@ import org.junit.Assert; public class MySqlCreateTableTest48 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE AO_E8B6CC_REPO_TO_CHANGESET (" // - + " CHANGESET_ID INTEGER,"// - + " ID INTEGER AUTO_INCREMENT NOT NULL,"// - + " REPOSITORY_ID INTEGER,"// - + " CONSTRAINT fk_ao_e8b6cc_repo_to_changeset_repository_id FOREIGN KEY (REPOSITORY_ID) REFERENCES AO_E8B6CC_REPOSITORY_MAPPING(ID),"// - + " CONSTRAINT fk_ao_e8b6cc_repo_to_changeset_changeset_id FOREIGN KEY (CHANGESET_ID) REFERENCES AO_E8B6CC_CHANGESET_MAPPING(ID),"// - + " PRIMARY KEY(ID)"// - + ") ENGINE=InnoDB"; // + + " CHANGESET_ID INTEGER,"// + + " ID INTEGER AUTO_INCREMENT NOT NULL,"// + + " REPOSITORY_ID INTEGER,"// + + " CONSTRAINT fk_ao_e8b6cc_repo_to_changeset_repository_id FOREIGN KEY (REPOSITORY_ID) REFERENCES AO_E8B6CC_REPOSITORY_MAPPING(ID),"// + + " CONSTRAINT fk_ao_e8b6cc_repo_to_changeset_changeset_id FOREIGN KEY (CHANGESET_ID) REFERENCES AO_E8B6CC_CHANGESET_MAPPING(ID),"// + + " PRIMARY KEY(ID)"// + + ") ENGINE=InnoDB"; // MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -56,14 +55,14 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE AO_E8B6CC_REPO_TO_CHANGESET ("// - + "\n\tCHANGESET_ID INTEGER,"// - + "\n\tID INTEGER NOT NULL AUTO_INCREMENT,"// - + "\n\tREPOSITORY_ID INTEGER,"// - + "\n\tCONSTRAINT fk_ao_e8b6cc_repo_to_changeset_repository_id FOREIGN KEY (REPOSITORY_ID) REFERENCES AO_E8B6CC_REPOSITORY_MAPPING (ID),"// - + "\n\tCONSTRAINT fk_ao_e8b6cc_repo_to_changeset_changeset_id FOREIGN KEY (CHANGESET_ID) REFERENCES AO_E8B6CC_CHANGESET_MAPPING (ID),"// - + "\n\tPRIMARY KEY (ID)"// - + "\n) ENGINE = InnoDB",// - output); + + "\n\tCHANGESET_ID INTEGER,"// + + "\n\tID INTEGER NOT NULL AUTO_INCREMENT,"// + + "\n\tREPOSITORY_ID INTEGER,"// + + "\n\tCONSTRAINT fk_ao_e8b6cc_repo_to_changeset_repository_id FOREIGN KEY (REPOSITORY_ID) REFERENCES AO_E8B6CC_REPOSITORY_MAPPING (ID),"// + + "\n\tCONSTRAINT fk_ao_e8b6cc_repo_to_changeset_changeset_id FOREIGN KEY (CHANGESET_ID) REFERENCES AO_E8B6CC_CHANGESET_MAPPING (ID),"// + + "\n\tPRIMARY KEY (ID)"// + + "\n) ENGINE = InnoDB",// + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest49.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest49.java index 7c7d5cb48a..ca93732b68 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest49.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest49.java @@ -24,17 +24,16 @@ import org.junit.Assert; public class MySqlCreateTableTest49 extends MysqlTest { - public void test_0() throws Exception { String sql = " create table tauth (" // - + " cid varchar(36) not null unique,"// - + " cdesc varchar(200),"// - + " cname varchar(100) not null,"// - + " cseq decimal(22,0),"// - + " curl varchar(200),"// - + " cpid varchar(36),"// - + " primary key (cid)"// - + " )"; // + + " cid varchar(36) not null unique,"// + + " cdesc varchar(200),"// + + " cname varchar(100) not null,"// + + " cseq decimal(22,0),"// + + " curl varchar(200),"// + + " cpid varchar(36),"// + + " primary key (cid)"// + + " )"; // MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -55,15 +54,15 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE tauth (" // - + "\n\tcid varchar(36) NOT NULL UNIQUE,"// - + "\n\tcdesc varchar(200),"// - + "\n\tcname varchar(100) NOT NULL,"// - + "\n\tcseq decimal(22, 0),"// - + "\n\tcurl varchar(200),"// - + "\n\tcpid varchar(36),"// - + "\n\tPRIMARY KEY (cid)"// - + "\n)",// - output); + + "\n\tcid varchar(36) NOT NULL UNIQUE,"// + + "\n\tcdesc varchar(200),"// + + "\n\tcname varchar(100) NOT NULL,"// + + "\n\tcseq decimal(22, 0),"// + + "\n\tcurl varchar(200),"// + + "\n\tcpid varchar(36),"// + + "\n\tPRIMARY KEY (cid)"// + + "\n)",// + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest5.java index 06c989e09f..748f13fe5f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest5.java @@ -26,14 +26,13 @@ import java.util.List; public class MySqlCreateTableTest5 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `test` (" + // - " `id` bigint(20) NOT NULL AUTO_INCREMENT," + // - " `dspcode` char(200) DEFAULT NULL," + // - " PRIMARY KEY (`id`)," + // - " KEY `index_name` (`dspcode`)" + // - ") ENGINE=InnoDB DEFAULT CHARSET=utf8;"; + " `id` bigint(20) NOT NULL AUTO_INCREMENT," + // + " `dspcode` char(200) DEFAULT NULL," + // + " PRIMARY KEY (`id`)," + // + " KEY `index_name` (`dspcode`)" + // + ") ENGINE=InnoDB DEFAULT CHARSET=utf8;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -44,7 +43,7 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Assert.assertEquals("utf8", stmt.getOption("CHARSET").toString()); // System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest50.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest50.java index 6c8286881d..1d673861e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest50.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest50.java @@ -24,12 +24,11 @@ import org.junit.Assert; public class MySqlCreateTableTest50 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `test`.`a` (" // - + " `ida` INT NOT NULL COMMENT 'aaa' ,"// - + " PRIMARY KEY (`ida`) )"// - + " COMMENT = 'bb';"; // + + " `ida` INT NOT NULL COMMENT 'aaa' ,"// + + " PRIMARY KEY (`ida`) )"// + + " COMMENT = 'bb';"; // MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -50,10 +49,10 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE `test`.`a` (" // - + "\n\t`ida` INT NOT NULL COMMENT 'aaa',"// - + "\n\tPRIMARY KEY (`ida`)"// - + "\n) COMMENT 'bb'",// - output); + + "\n\t`ida` INT NOT NULL COMMENT 'aaa',"// + + "\n\tPRIMARY KEY (`ida`)"// + + "\n) COMMENT 'bb'",// + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest51.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest51.java index f2b1a77ca3..5f829428a0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest51.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest51.java @@ -24,12 +24,11 @@ import org.junit.Assert; public class MySqlCreateTableTest51 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `test` (" // - + "`Id` int(11) NOT NULL," // - + "`text` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"// - + ") ENGINE=InnoDB DEFAULT CHARSET=gbk"; + + "`Id` int(11) NOT NULL," // + + "`text` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"// + + ") ENGINE=InnoDB DEFAULT CHARSET=gbk"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -51,10 +50,10 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); // System.out.println(output); Assert.assertEquals("CREATE TABLE `test` (" // - + "\n\t`Id` int(11) NOT NULL,"// - + "\n\t`text` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"// - + "\n) ENGINE = InnoDB CHARSET = gbk",// - output); + + "\n\t`Id` int(11) NOT NULL,"// + + "\n\t`text` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"// + + "\n) ENGINE = InnoDB CHARSET = gbk",// + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest52.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest52.java index 1c0e32f47d..4c1952032d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest52.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest52.java @@ -24,17 +24,16 @@ import org.junit.Assert; public class MySqlCreateTableTest52 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `ins_ebay_auth` ("// - + "`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id',"// - + "`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// - + "`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// - + "`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// - + "`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// - + "`create_time` datetime NOT NULL COMMENT '授权时间',"// - + "`invalid_time` datetime NOT NULL COMMENT '授权失效时间'," + "PRIMARY KEY (`auth_id`)"// - + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='INS_EBAY_AUTH';"; + + "`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id',"// + + "`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// + + "`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// + + "`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// + + "`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// + + "`create_time` datetime NOT NULL COMMENT '授权时间',"// + + "`invalid_time` datetime NOT NULL COMMENT '授权失效时间'," + "PRIMARY KEY (`auth_id`)"// + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='INS_EBAY_AUTH';"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -55,14 +54,14 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE `ins_ebay_auth` ("// - +"\n\t`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," // - +"\n\t`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// - +"\n\t`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// - +"\n\t`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// - +"\n\t`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// - +"\n\t`create_time` datetime NOT NULL COMMENT '授权时间',"// - +"\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间',"// - +"\n\tPRIMARY KEY (`auth_id`)" - +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE = utf8_bin COMMENT 'INS_EBAY_AUTH'", output); + + "\n\t`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," // + + "\n\t`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// + + "\n\t`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// + + "\n\t`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// + + "\n\t`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// + + "\n\t`create_time` datetime NOT NULL COMMENT '授权时间',"// + + "\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间',"// + + "\n\tPRIMARY KEY (`auth_id`)" + + "\n) ENGINE = InnoDB CHARSET = utf8 COLLATE = utf8_bin COMMENT 'INS_EBAY_AUTH'", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest53.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest53.java index 812f7cbc9f..9540504ad7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest53.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest53.java @@ -25,18 +25,17 @@ import org.junit.Test; public class MySqlCreateTableTest53 extends MysqlTest { - @Test public void test_primary_key_using_btree() throws Exception { String sql = "CREATE TABLE `ins_ebay_auth` ("// - + "`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id',"// - + "`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// - + "`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// - + "`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// - + "`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// - + "`create_time` datetime NOT NULL COMMENT '授权时间',"// - + "`invalid_time` datetime NOT NULL COMMENT '授权失效时间'," + "PRIMARY KEY USING BTREE (`auth_id`)"// - + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='INS_EBAY_AUTH';"; + + "`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id',"// + + "`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// + + "`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// + + "`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// + + "`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// + + "`create_time` datetime NOT NULL COMMENT '授权时间',"// + + "`invalid_time` datetime NOT NULL COMMENT '授权失效时间'," + "PRIMARY KEY USING BTREE (`auth_id`)"// + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='INS_EBAY_AUTH';"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -57,28 +56,28 @@ public void test_primary_key_using_btree() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE `ins_ebay_auth` ("// - +"\n\t`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," // - +"\n\t`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// - +"\n\t`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// - +"\n\t`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// - +"\n\t`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// - +"\n\t`create_time` datetime NOT NULL COMMENT '授权时间',"// - +"\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间',"// - +"\n\tPRIMARY KEY USING BTREE (`auth_id`)" - +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE = utf8_bin COMMENT 'INS_EBAY_AUTH'", output); + + "\n\t`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," // + + "\n\t`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// + + "\n\t`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// + + "\n\t`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// + + "\n\t`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// + + "\n\t`create_time` datetime NOT NULL COMMENT '授权时间',"// + + "\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间',"// + + "\n\tPRIMARY KEY USING BTREE (`auth_id`)" + + "\n) ENGINE = InnoDB CHARSET = utf8 COLLATE = utf8_bin COMMENT 'INS_EBAY_AUTH'", output); } - + @Test public void test_index_using_btree() throws Exception { String sql = "CREATE TABLE `ins_ebay_auth` ("// - + "`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id',"// - + "`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// - + "`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// - + "`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// - + "`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// - + "`create_time` datetime NOT NULL COMMENT '授权时间',"// - + "`invalid_time` datetime NOT NULL COMMENT '授权失效时间'," + "PRIMARY KEY USING BTREE (`auth_id`), INDEX `ind_usr_id` USING BTREE(`usr_id`)"// - + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='INS_EBAY_AUTH';"; + + "`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id',"// + + "`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// + + "`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// + + "`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// + + "`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// + + "`create_time` datetime NOT NULL COMMENT '授权时间',"// + + "`invalid_time` datetime NOT NULL COMMENT '授权失效时间'," + "PRIMARY KEY USING BTREE (`auth_id`), INDEX `ind_usr_id` USING BTREE(`usr_id`)"// + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='INS_EBAY_AUTH';"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -99,29 +98,29 @@ public void test_index_using_btree() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE `ins_ebay_auth` ("// - +"\n\t`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," // - +"\n\t`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// - +"\n\t`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// - +"\n\t`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// - +"\n\t`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// - +"\n\t`create_time` datetime NOT NULL COMMENT '授权时间',"// - +"\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间',"// - +"\n\tPRIMARY KEY USING BTREE (`auth_id`)," - +"\n\tINDEX `ind_usr_id` USING BTREE(`usr_id`)" - +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE = utf8_bin COMMENT 'INS_EBAY_AUTH'", output); + + "\n\t`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," // + + "\n\t`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// + + "\n\t`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// + + "\n\t`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// + + "\n\t`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// + + "\n\t`create_time` datetime NOT NULL COMMENT '授权时间',"// + + "\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间',"// + + "\n\tPRIMARY KEY USING BTREE (`auth_id`)," + + "\n\tINDEX `ind_usr_id` USING BTREE(`usr_id`)" + + "\n) ENGINE = InnoDB CHARSET = utf8 COLLATE = utf8_bin COMMENT 'INS_EBAY_AUTH'", output); } - + @Test public void test_key_using_btree() throws Exception { String sql = "CREATE TABLE `ins_ebay_auth` ("// - + "`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id',"// - + "`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// - + "`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// - + "`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// - + "`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// - + "`create_time` datetime NOT NULL COMMENT '授权时间',"// - + "`invalid_time` datetime NOT NULL COMMENT '授权失效时间'," + "PRIMARY KEY USING BTREE (`auth_id`), KEY `ind_usr_id` USING BTREE (`usr_id`)"// - + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='INS_EBAY_AUTH';"; + + "`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id',"// + + "`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// + + "`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// + + "`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// + + "`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// + + "`create_time` datetime NOT NULL COMMENT '授权时间',"// + + "`invalid_time` datetime NOT NULL COMMENT '授权失效时间'," + "PRIMARY KEY USING BTREE (`auth_id`), KEY `ind_usr_id` USING BTREE (`usr_id`)"// + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='INS_EBAY_AUTH';"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -142,15 +141,15 @@ public void test_key_using_btree() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE `ins_ebay_auth` ("// - +"\n\t`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," // - +"\n\t`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// - +"\n\t`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// - +"\n\t`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// - +"\n\t`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// - +"\n\t`create_time` datetime NOT NULL COMMENT '授权时间',"// - +"\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间',"// - +"\n\tPRIMARY KEY USING BTREE (`auth_id`)," - +"\n\tKEY `ind_usr_id` USING BTREE (`usr_id`)" - +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE = utf8_bin COMMENT 'INS_EBAY_AUTH'", output); + + "\n\t`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," // + + "\n\t`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// + + "\n\t`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// + + "\n\t`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// + + "\n\t`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// + + "\n\t`create_time` datetime NOT NULL COMMENT '授权时间',"// + + "\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间',"// + + "\n\tPRIMARY KEY USING BTREE (`auth_id`)," + + "\n\tKEY `ind_usr_id` USING BTREE (`usr_id`)" + + "\n) ENGINE = InnoDB CHARSET = utf8 COLLATE = utf8_bin COMMENT 'INS_EBAY_AUTH'", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest54.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest54.java index dbbf138ca8..3000634d44 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest54.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest54.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest54 extends MysqlTest { - @Test public void test_UNSIGNED_ZEROFILL() throws Exception { String sql = "CREATE TABLE t1 (year YEAR(4), month INT(2) UNSIGNED ZEROFILL, day INT(2) UNSIGNED ZEROFILL);"; @@ -45,41 +44,41 @@ public void test_UNSIGNED_ZEROFILL() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE t1 (" + "\n\tyear YEAR(4)," + "\n\tmonth INT(2) UNSIGNED ZEROFILL," - + "\n\tday INT(2) UNSIGNED ZEROFILL" + "\n)", output); + + "\n\tday INT(2) UNSIGNED ZEROFILL" + "\n)", output); } @Test public void test_FOREIGN_KEY() throws Exception { String sql = "CREATE TABLE `t_activity_node` (" - + "\n`id` bigint(20) NOT NULL," - + "\n`sellerId` bigint(20) DEFAULT NULL," - + "\n`canvas_id` bigint(20) NOT NULL COMMENT '画布ID'," - + "\n`view_node_id` bigint(20) NOT NULL COMMENT '对应显示的节点id'," - + "\n`activity_type` int(11) NOT NULL COMMENT '活动类型'," - + "\n`node_type` int(11) NOT NULL COMMENT '节点类型'," - + "\n`node_title` varchar(200) NOT NULL COMMENT '节点标题'," - + "\n`status` int(11) NOT NULL DEFAULT '0' COMMENT '页面的显示状态'," - + "\n`update_status` int(11) DEFAULT NULL COMMENT '节点创建后的修改状态'," - + "\n`execute_status` int(11) DEFAULT NULL COMMENT '节点当前的执行状态'," - + "\n`start_time` datetime DEFAULT NULL COMMENT '该节点活动的开始时间'," - + "\n`end_time` datetime DEFAULT NULL COMMENT '该节点活动的结束时间'," - + "\n`activity_start_time` datetime DEFAULT NULL COMMENT '营销活动的开始时间'," - + "\n`activity_end_time` datetime DEFAULT NULL COMMENT '营销活动的结束时间'," - + "\n`report_start_time` datetime DEFAULT NULL COMMENT '该节点活动效果报告的开始时间'," - + "\n`report_end_time` datetime DEFAULT NULL COMMENT '该节点活动效果报告的结束时间'," - + "\n`cron_rule` varchar(100) DEFAULT NULL COMMENT '周期性营销的时间表达式'," - + "\n`split_rule` varchar(1000) DEFAULT NULL COMMENT '节点拆分规则'," - + "\n`search_json` varchar(5000) DEFAULT NULL COMMENT '索引查找的条件字符串'," - + "\n`filter_json` varchar(1000) DEFAULT NULL COMMENT '各种过滤条件的设置'," - + "\n`buyer_count` int(11) DEFAULT NULL COMMENT '营销的会员数量'," - + "\n`gmt_modified` datetime NOT NULL COMMENT '活动最后修改时间'," - + "\n`gmt_create` datetime NOT NULL COMMENT '活动创建时间'," - + "\nPRIMARY KEY (`id`)," - + "\nKEY `canvas_id` (`canvas_id`)," - + "\nKEY `sid_ty_time` (`sellerId`,`node_type`,`start_time`)," - + "\nCONSTRAINT `t_activity_node_ibfk_1` FOREIGN KEY (`canvas_id`) REFERENCES `t_activity_canvas` (`id`) ON DELETE CASCADE" - + "\n) ENGINE=InnoDB DEFAULT CHARSET=utf8;"; + + "\n`id` bigint(20) NOT NULL," + + "\n`sellerId` bigint(20) DEFAULT NULL," + + "\n`canvas_id` bigint(20) NOT NULL COMMENT '画布ID'," + + "\n`view_node_id` bigint(20) NOT NULL COMMENT '对应显示的节点id'," + + "\n`activity_type` int(11) NOT NULL COMMENT '活动类型'," + + "\n`node_type` int(11) NOT NULL COMMENT '节点类型'," + + "\n`node_title` varchar(200) NOT NULL COMMENT '节点标题'," + + "\n`status` int(11) NOT NULL DEFAULT '0' COMMENT '页面的显示状态'," + + "\n`update_status` int(11) DEFAULT NULL COMMENT '节点创建后的修改状态'," + + "\n`execute_status` int(11) DEFAULT NULL COMMENT '节点当前的执行状态'," + + "\n`start_time` datetime DEFAULT NULL COMMENT '该节点活动的开始时间'," + + "\n`end_time` datetime DEFAULT NULL COMMENT '该节点活动的结束时间'," + + "\n`activity_start_time` datetime DEFAULT NULL COMMENT '营销活动的开始时间'," + + "\n`activity_end_time` datetime DEFAULT NULL COMMENT '营销活动的结束时间'," + + "\n`report_start_time` datetime DEFAULT NULL COMMENT '该节点活动效果报告的开始时间'," + + "\n`report_end_time` datetime DEFAULT NULL COMMENT '该节点活动效果报告的结束时间'," + + "\n`cron_rule` varchar(100) DEFAULT NULL COMMENT '周期性营销的时间表达式'," + + "\n`split_rule` varchar(1000) DEFAULT NULL COMMENT '节点拆分规则'," + + "\n`search_json` varchar(5000) DEFAULT NULL COMMENT '索引查找的条件字符串'," + + "\n`filter_json` varchar(1000) DEFAULT NULL COMMENT '各种过滤条件的设置'," + + "\n`buyer_count` int(11) DEFAULT NULL COMMENT '营销的会员数量'," + + "\n`gmt_modified` datetime NOT NULL COMMENT '活动最后修改时间'," + + "\n`gmt_create` datetime NOT NULL COMMENT '活动创建时间'," + + "\nPRIMARY KEY (`id`)," + + "\nKEY `canvas_id` (`canvas_id`)," + + "\nKEY `sid_ty_time` (`sellerId`,`node_type`,`start_time`)," + + "\nCONSTRAINT `t_activity_node_ibfk_1` FOREIGN KEY (`canvas_id`) REFERENCES `t_activity_canvas` (`id`) ON DELETE CASCADE" + + "\n) ENGINE=InnoDB DEFAULT CHARSET=utf8;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -98,66 +97,66 @@ public void test_FOREIGN_KEY() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE `t_activity_node` (" - + "\n\t`id` bigint(20) NOT NULL," - + "\n\t`sellerId` bigint(20) DEFAULT NULL," - + "\n\t`canvas_id` bigint(20) NOT NULL COMMENT '画布ID'," - + "\n\t`view_node_id` bigint(20) NOT NULL COMMENT '对应显示的节点id'," - + "\n\t`activity_type` int(11) NOT NULL COMMENT '活动类型'," - + "\n\t`node_type` int(11) NOT NULL COMMENT '节点类型'," - + "\n\t`node_title` varchar(200) NOT NULL COMMENT '节点标题'," - + "\n\t`status` int(11) NOT NULL DEFAULT '0' COMMENT '页面的显示状态'," - + "\n\t`update_status` int(11) DEFAULT NULL COMMENT '节点创建后的修改状态'," - + "\n\t`execute_status` int(11) DEFAULT NULL COMMENT '节点当前的执行状态'," - + "\n\t`start_time` datetime DEFAULT NULL COMMENT '该节点活动的开始时间'," - + "\n\t`end_time` datetime DEFAULT NULL COMMENT '该节点活动的结束时间'," - + "\n\t`activity_start_time` datetime DEFAULT NULL COMMENT '营销活动的开始时间'," - + "\n\t`activity_end_time` datetime DEFAULT NULL COMMENT '营销活动的结束时间'," - + "\n\t`report_start_time` datetime DEFAULT NULL COMMENT '该节点活动效果报告的开始时间'," - + "\n\t`report_end_time` datetime DEFAULT NULL COMMENT '该节点活动效果报告的结束时间'," - + "\n\t`cron_rule` varchar(100) DEFAULT NULL COMMENT '周期性营销的时间表达式'," - + "\n\t`split_rule` varchar(1000) DEFAULT NULL COMMENT '节点拆分规则'," - + "\n\t`search_json` varchar(5000) DEFAULT NULL COMMENT '索引查找的条件字符串'," - + "\n\t`filter_json` varchar(1000) DEFAULT NULL COMMENT '各种过滤条件的设置'," - + "\n\t`buyer_count` int(11) DEFAULT NULL COMMENT '营销的会员数量'," - + "\n\t`gmt_modified` datetime NOT NULL COMMENT '活动最后修改时间'," - + "\n\t`gmt_create` datetime NOT NULL COMMENT '活动创建时间'," - + "\n\tPRIMARY KEY (`id`)," - + "\n\tKEY `canvas_id` (`canvas_id`)," - + "\n\tKEY `sid_ty_time` (`sellerId`, `node_type`, `start_time`)," - + "\n\tCONSTRAINT `t_activity_node_ibfk_1` FOREIGN KEY (`canvas_id`) REFERENCES `t_activity_canvas` (`id`) ON DELETE CASCADE" - + "\n) ENGINE = InnoDB CHARSET = utf8", output); + + "\n\t`id` bigint(20) NOT NULL," + + "\n\t`sellerId` bigint(20) DEFAULT NULL," + + "\n\t`canvas_id` bigint(20) NOT NULL COMMENT '画布ID'," + + "\n\t`view_node_id` bigint(20) NOT NULL COMMENT '对应显示的节点id'," + + "\n\t`activity_type` int(11) NOT NULL COMMENT '活动类型'," + + "\n\t`node_type` int(11) NOT NULL COMMENT '节点类型'," + + "\n\t`node_title` varchar(200) NOT NULL COMMENT '节点标题'," + + "\n\t`status` int(11) NOT NULL DEFAULT '0' COMMENT '页面的显示状态'," + + "\n\t`update_status` int(11) DEFAULT NULL COMMENT '节点创建后的修改状态'," + + "\n\t`execute_status` int(11) DEFAULT NULL COMMENT '节点当前的执行状态'," + + "\n\t`start_time` datetime DEFAULT NULL COMMENT '该节点活动的开始时间'," + + "\n\t`end_time` datetime DEFAULT NULL COMMENT '该节点活动的结束时间'," + + "\n\t`activity_start_time` datetime DEFAULT NULL COMMENT '营销活动的开始时间'," + + "\n\t`activity_end_time` datetime DEFAULT NULL COMMENT '营销活动的结束时间'," + + "\n\t`report_start_time` datetime DEFAULT NULL COMMENT '该节点活动效果报告的开始时间'," + + "\n\t`report_end_time` datetime DEFAULT NULL COMMENT '该节点活动效果报告的结束时间'," + + "\n\t`cron_rule` varchar(100) DEFAULT NULL COMMENT '周期性营销的时间表达式'," + + "\n\t`split_rule` varchar(1000) DEFAULT NULL COMMENT '节点拆分规则'," + + "\n\t`search_json` varchar(5000) DEFAULT NULL COMMENT '索引查找的条件字符串'," + + "\n\t`filter_json` varchar(1000) DEFAULT NULL COMMENT '各种过滤条件的设置'," + + "\n\t`buyer_count` int(11) DEFAULT NULL COMMENT '营销的会员数量'," + + "\n\t`gmt_modified` datetime NOT NULL COMMENT '活动最后修改时间'," + + "\n\t`gmt_create` datetime NOT NULL COMMENT '活动创建时间'," + + "\n\tPRIMARY KEY (`id`)," + + "\n\tKEY `canvas_id` (`canvas_id`)," + + "\n\tKEY `sid_ty_time` (`sellerId`, `node_type`, `start_time`)," + + "\n\tCONSTRAINT `t_activity_node_ibfk_1` FOREIGN KEY (`canvas_id`) REFERENCES `t_activity_canvas` (`id`) ON DELETE CASCADE" + + "\n) ENGINE = InnoDB CHARSET = utf8", output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table `t_activity_node` (" - + "\n\t`id` bigint(20) not null," - + "\n\t`sellerId` bigint(20) default null," - + "\n\t`canvas_id` bigint(20) not null comment '画布ID'," - + "\n\t`view_node_id` bigint(20) not null comment '对应显示的节点id'," - + "\n\t`activity_type` int(11) not null comment '活动类型'," - + "\n\t`node_type` int(11) not null comment '节点类型'," - + "\n\t`node_title` varchar(200) not null comment '节点标题'," - + "\n\t`status` int(11) not null default '0' comment '页面的显示状态'," - + "\n\t`update_status` int(11) default null comment '节点创建后的修改状态'," - + "\n\t`execute_status` int(11) default null comment '节点当前的执行状态'," - + "\n\t`start_time` datetime default null comment '该节点活动的开始时间'," - + "\n\t`end_time` datetime default null comment '该节点活动的结束时间'," - + "\n\t`activity_start_time` datetime default null comment '营销活动的开始时间'," - + "\n\t`activity_end_time` datetime default null comment '营销活动的结束时间'," - + "\n\t`report_start_time` datetime default null comment '该节点活动效果报告的开始时间'," - + "\n\t`report_end_time` datetime default null comment '该节点活动效果报告的结束时间'," - + "\n\t`cron_rule` varchar(100) default null comment '周期性营销的时间表达式'," - + "\n\t`split_rule` varchar(1000) default null comment '节点拆分规则'," - + "\n\t`search_json` varchar(5000) default null comment '索引查找的条件字符串'," - + "\n\t`filter_json` varchar(1000) default null comment '各种过滤条件的设置'," - + "\n\t`buyer_count` int(11) default null comment '营销的会员数量'," - + "\n\t`gmt_modified` datetime not null comment '活动最后修改时间'," - + "\n\t`gmt_create` datetime not null comment '活动创建时间'," - + "\n\tprimary key (`id`)," - + "\n\tkey `canvas_id` (`canvas_id`)," - + "\n\tkey `sid_ty_time` (`sellerId`, `node_type`, `start_time`)," - + "\n\tconstraint `t_activity_node_ibfk_1` foreign key (`canvas_id`) references `t_activity_canvas` (`id`) on delete cascade" - + "\n) engine = InnoDB charset = utf8", output); + + "\n\t`id` bigint(20) not null," + + "\n\t`sellerId` bigint(20) default null," + + "\n\t`canvas_id` bigint(20) not null comment '画布ID'," + + "\n\t`view_node_id` bigint(20) not null comment '对应显示的节点id'," + + "\n\t`activity_type` int(11) not null comment '活动类型'," + + "\n\t`node_type` int(11) not null comment '节点类型'," + + "\n\t`node_title` varchar(200) not null comment '节点标题'," + + "\n\t`status` int(11) not null default '0' comment '页面的显示状态'," + + "\n\t`update_status` int(11) default null comment '节点创建后的修改状态'," + + "\n\t`execute_status` int(11) default null comment '节点当前的执行状态'," + + "\n\t`start_time` datetime default null comment '该节点活动的开始时间'," + + "\n\t`end_time` datetime default null comment '该节点活动的结束时间'," + + "\n\t`activity_start_time` datetime default null comment '营销活动的开始时间'," + + "\n\t`activity_end_time` datetime default null comment '营销活动的结束时间'," + + "\n\t`report_start_time` datetime default null comment '该节点活动效果报告的开始时间'," + + "\n\t`report_end_time` datetime default null comment '该节点活动效果报告的结束时间'," + + "\n\t`cron_rule` varchar(100) default null comment '周期性营销的时间表达式'," + + "\n\t`split_rule` varchar(1000) default null comment '节点拆分规则'," + + "\n\t`search_json` varchar(5000) default null comment '索引查找的条件字符串'," + + "\n\t`filter_json` varchar(1000) default null comment '各种过滤条件的设置'," + + "\n\t`buyer_count` int(11) default null comment '营销的会员数量'," + + "\n\t`gmt_modified` datetime not null comment '活动最后修改时间'," + + "\n\t`gmt_create` datetime not null comment '活动创建时间'," + + "\n\tprimary key (`id`)," + + "\n\tkey `canvas_id` (`canvas_id`)," + + "\n\tkey `sid_ty_time` (`sellerId`, `node_type`, `start_time`)," + + "\n\tconstraint `t_activity_node_ibfk_1` foreign key (`canvas_id`) references `t_activity_canvas` (`id`) on delete cascade" + + "\n) engine = InnoDB charset = utf8", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest55.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest55.java index 953aa30db9..9503547e0a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest55.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest55.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest55 extends MysqlTest { - @Test public void test_union() throws Exception { String sql = "CREATE TABLE tableA (datasn varchar(100) NOT NULL,PRIMARY KEY(datasn)) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=(tableB)"; @@ -45,9 +44,9 @@ public void test_union() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE tableA (" // - + "\n\tdatasn varchar(100) NOT NULL," // - + "\n\tPRIMARY KEY (datasn)" // - + "\n) ENGINE = MRG_MyISAM CHARSET = utf8 UNION = (tableB)", output); + + "\n\tdatasn varchar(100) NOT NULL," // + + "\n\tPRIMARY KEY (datasn)" // + + "\n) ENGINE = MRG_MyISAM CHARSET = utf8 UNION = (tableB)", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest56.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest56.java index 1e338a6d9d..5ea22eb7f7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest56.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest56.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest56 extends MysqlTest { - @Test public void test_union() throws Exception { String sql = "CREATE TABLE tableA (datasn varchar(100) NOT NULL,PRIMARY KEY(datasn)) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=(tableB,tableC)"; @@ -46,16 +45,16 @@ public void test_union() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE tableA (" // - + "\n\tdatasn varchar(100) NOT NULL," // - + "\n\tPRIMARY KEY (datasn)" // - + "\n) ENGINE = MRG_MyISAM CHARSET = utf8 UNION = (tableB, tableC)", output); + + "\n\tdatasn varchar(100) NOT NULL," // + + "\n\tPRIMARY KEY (datasn)" // + + "\n) ENGINE = MRG_MyISAM CHARSET = utf8 UNION = (tableB, tableC)", output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table tableA (" // - + "\n\tdatasn varchar(100) not null," // - + "\n\tprimary key (datasn)" // - + "\n) engine = MRG_MyISAM charset = utf8 union = (tableB, tableC)", output); + + "\n\tdatasn varchar(100) not null," // + + "\n\tprimary key (datasn)" // + + "\n) engine = MRG_MyISAM charset = utf8 union = (tableB, tableC)", output); } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest57.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest57.java index ba8732246d..db42eab642 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest57.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest57.java @@ -24,15 +24,14 @@ import org.junit.Test; public class MySqlCreateTableTest57 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE TABLE `t_cpi_driskconfig_bak` (" + "`Sequence` bigint(20) NOT NULL AUTO_INCREMENT," - + "`comcode` varchar(20) binary NOT NULL," + "`riskcode` varchar(10) binary NOT NULL," - + "`configcodehead` varchar(30) binary NOT NULL," + "`configcodebody` varchar(100) binary," - + "`configvalue` varchar(200) binary ," + "`inputdate` datetime NOT NULL," - + "`validstatus` char(1) NOT NULL," + "`remark` varchar(3000)," + "`flag` varchar(10) ," - + "PRIMARY KEY (`Sequence`)" + ") ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=utf8;"; + + "`comcode` varchar(20) binary NOT NULL," + "`riskcode` varchar(10) binary NOT NULL," + + "`configcodehead` varchar(30) binary NOT NULL," + "`configcodebody` varchar(100) binary," + + "`configvalue` varchar(200) binary ," + "`inputdate` datetime NOT NULL," + + "`validstatus` char(1) NOT NULL," + "`remark` varchar(3000)," + "`flag` varchar(10) ," + + "PRIMARY KEY (`Sequence`)" + ") ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=utf8;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -54,18 +53,18 @@ public void test_one() throws Exception { + "\n\t`configcodehead` varchar(30) BINARY NOT NULL," + "\n\t`configcodebody` varchar(100) BINARY ," + "\n\t`configvalue` varchar(200) BINARY ," + "\n\t`inputdate` datetime NOT NULL," + "\n\t`validstatus` char(1) NOT NULL," + "\n\t`remark` varchar(3000)," + "\n\t`flag` varchar(10)," - + "\n\tPRIMARY KEY (`Sequence`)" + "\n) ENGINE = InnoDB AUTO_INCREMENT = 49 CHARSET = utf8",output); + + "\n\tPRIMARY KEY (`Sequence`)" + "\n) ENGINE = InnoDB AUTO_INCREMENT = 49 CHARSET = utf8", output); } - + @Test public void test_two() throws Exception { String sql = "CREATE TABLE `t_cpi_driskconfig_bak` (" + "`Sequence` bigint(20) NOT NULL AUTO_INCREMENT," - + "`comcode` binary(20) NOT NULL," + "`riskcode` varchar(10) binary NOT NULL," - + "`configcodehead` varchar(30) binary NOT NULL," + "`configcodebody` varchar(100) binary," - + "`configvalue` varchar(200) binary ," + "`inputdate` datetime NOT NULL," - + "`validstatus` char(1) NOT NULL," + "`remark` varchar(3000)," + "`flag` varchar(10) ," - + "PRIMARY KEY (`Sequence`)" + ") ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=utf8;"; + + "`comcode` binary(20) NOT NULL," + "`riskcode` varchar(10) binary NOT NULL," + + "`configcodehead` varchar(30) binary NOT NULL," + "`configcodebody` varchar(100) binary," + + "`configvalue` varchar(200) binary ," + "`inputdate` datetime NOT NULL," + + "`validstatus` char(1) NOT NULL," + "`remark` varchar(3000)," + "`flag` varchar(10) ," + + "PRIMARY KEY (`Sequence`)" + ") ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=utf8;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -87,7 +86,7 @@ public void test_two() throws Exception { + "\n\t`configcodehead` varchar(30) BINARY NOT NULL," + "\n\t`configcodebody` varchar(100) BINARY ," + "\n\t`configvalue` varchar(200) BINARY ," + "\n\t`inputdate` datetime NOT NULL," + "\n\t`validstatus` char(1) NOT NULL," + "\n\t`remark` varchar(3000)," + "\n\t`flag` varchar(10)," - + "\n\tPRIMARY KEY (`Sequence`)" + "\n) ENGINE = InnoDB AUTO_INCREMENT = 49 CHARSET = utf8",output); + + "\n\tPRIMARY KEY (`Sequence`)" + "\n) ENGINE = InnoDB AUTO_INCREMENT = 49 CHARSET = utf8", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest58.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest58.java index fca5df37a5..9db5ef5b27 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest58.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest58.java @@ -24,20 +24,19 @@ import org.junit.Test; public class MySqlCreateTableTest58 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE TABLE `appservice_account` (" + "`id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY," - + "`password` varchar(128) NOT NULL," + "`last_login` datetime NOT NULL," - + "`username` varchar(40) NOT NULL UNIQUE," + "`date_of_birth` date NOT NULL," - + "`head` varchar(100) NOT NULL," + "`headThumb` varchar(100) NOT NULL," - + "`name` varchar(50) NOT NULL," + "`gender` integer," + "`uploadVideoCount` integer NOT NULL," - + "`fansCount` integer NOT NULL," + "`balance` numeric(19, 2) NOT NULL," - + "`brick` integer NOT NULL," + "`reward` integer NOT NULL," + "`token` varchar(500) NOT NULL," - + "`weiboUserid` varchar(50) NOT NULL," + "`weiboAccesstoken` varchar(500) NOT NULL," - + "`qqUserid` varchar(50) NOT NULL," + "`qqAccesstoken` varchar(500) NOT NULL," - + "`wechatUserid` varchar(50) NOT NULL," + "`wechatAccesstoken` varchar(500) NOT NULL," - + "`is_active` bool NOT NULL," + "`is_admin` bool NOT NULL" + ")"; + + "`password` varchar(128) NOT NULL," + "`last_login` datetime NOT NULL," + + "`username` varchar(40) NOT NULL UNIQUE," + "`date_of_birth` date NOT NULL," + + "`head` varchar(100) NOT NULL," + "`headThumb` varchar(100) NOT NULL," + + "`name` varchar(50) NOT NULL," + "`gender` integer," + "`uploadVideoCount` integer NOT NULL," + + "`fansCount` integer NOT NULL," + "`balance` numeric(19, 2) NOT NULL," + + "`brick` integer NOT NULL," + "`reward` integer NOT NULL," + "`token` varchar(500) NOT NULL," + + "`weiboUserid` varchar(50) NOT NULL," + "`weiboAccesstoken` varchar(500) NOT NULL," + + "`qqUserid` varchar(50) NOT NULL," + "`qqAccesstoken` varchar(500) NOT NULL," + + "`wechatUserid` varchar(50) NOT NULL," + "`wechatAccesstoken` varchar(500) NOT NULL," + + "`is_active` bool NOT NULL," + "`is_admin` bool NOT NULL" + ")"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -48,58 +47,58 @@ public void test_one() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE `appservice_account` (" + // - "\n\t`id` integer NOT NULL PRIMARY KEY AUTO_INCREMENT," + // - "\n\t`password` varchar(128) NOT NULL," + // - "\n\t`last_login` datetime NOT NULL," + // - "\n\t`username` varchar(40) NOT NULL UNIQUE," + // - "\n\t`date_of_birth` date NOT NULL," + // - "\n\t`head` varchar(100) NOT NULL," + // - "\n\t`headThumb` varchar(100) NOT NULL," + // - "\n\t`name` varchar(50) NOT NULL," + // - "\n\t`gender` integer," + // - "\n\t`uploadVideoCount` integer NOT NULL," + // - "\n\t`fansCount` integer NOT NULL," + // - "\n\t`balance` numeric(19, 2) NOT NULL," + // - "\n\t`brick` integer NOT NULL," + // - "\n\t`reward` integer NOT NULL," + // - "\n\t`token` varchar(500) NOT NULL," + // - "\n\t`weiboUserid` varchar(50) NOT NULL," + // - "\n\t`weiboAccesstoken` varchar(500) NOT NULL," + // - "\n\t`qqUserid` varchar(50) NOT NULL," + // - "\n\t`qqAccesstoken` varchar(500) NOT NULL," + // - "\n\t`wechatUserid` varchar(50) NOT NULL," + // - "\n\t`wechatAccesstoken` varchar(500) NOT NULL," + // - "\n\t`is_active` bool NOT NULL," + // - "\n\t`is_admin` bool NOT NULL" + // - "\n)", output); + "\n\t`id` integer NOT NULL PRIMARY KEY AUTO_INCREMENT," + // + "\n\t`password` varchar(128) NOT NULL," + // + "\n\t`last_login` datetime NOT NULL," + // + "\n\t`username` varchar(40) NOT NULL UNIQUE," + // + "\n\t`date_of_birth` date NOT NULL," + // + "\n\t`head` varchar(100) NOT NULL," + // + "\n\t`headThumb` varchar(100) NOT NULL," + // + "\n\t`name` varchar(50) NOT NULL," + // + "\n\t`gender` integer," + // + "\n\t`uploadVideoCount` integer NOT NULL," + // + "\n\t`fansCount` integer NOT NULL," + // + "\n\t`balance` numeric(19, 2) NOT NULL," + // + "\n\t`brick` integer NOT NULL," + // + "\n\t`reward` integer NOT NULL," + // + "\n\t`token` varchar(500) NOT NULL," + // + "\n\t`weiboUserid` varchar(50) NOT NULL," + // + "\n\t`weiboAccesstoken` varchar(500) NOT NULL," + // + "\n\t`qqUserid` varchar(50) NOT NULL," + // + "\n\t`qqAccesstoken` varchar(500) NOT NULL," + // + "\n\t`wechatUserid` varchar(50) NOT NULL," + // + "\n\t`wechatAccesstoken` varchar(500) NOT NULL," + // + "\n\t`is_active` bool NOT NULL," + // + "\n\t`is_admin` bool NOT NULL" + // + "\n)", output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table `appservice_account` (" + // - "\n\t`id` integer not null primary key auto_increment," + // - "\n\t`password` varchar(128) not null," + // - "\n\t`last_login` datetime not null," + // - "\n\t`username` varchar(40) not null unique," + // - "\n\t`date_of_birth` date not null," + // - "\n\t`head` varchar(100) not null," + // - "\n\t`headThumb` varchar(100) not null," + // - "\n\t`name` varchar(50) not null," + // - "\n\t`gender` integer," + // - "\n\t`uploadVideoCount` integer not null," + // - "\n\t`fansCount` integer not null," + // - "\n\t`balance` numeric(19, 2) not null," + // - "\n\t`brick` integer not null," + // - "\n\t`reward` integer not null," + // - "\n\t`token` varchar(500) not null," + // - "\n\t`weiboUserid` varchar(50) not null," + // - "\n\t`weiboAccesstoken` varchar(500) not null," + // - "\n\t`qqUserid` varchar(50) not null," + // - "\n\t`qqAccesstoken` varchar(500) not null," + // - "\n\t`wechatUserid` varchar(50) not null," + // - "\n\t`wechatAccesstoken` varchar(500) not null," + // - "\n\t`is_active` bool not null," + // - "\n\t`is_admin` bool not null" + // - "\n)", output); + "\n\t`id` integer not null primary key auto_increment," + // + "\n\t`password` varchar(128) not null," + // + "\n\t`last_login` datetime not null," + // + "\n\t`username` varchar(40) not null unique," + // + "\n\t`date_of_birth` date not null," + // + "\n\t`head` varchar(100) not null," + // + "\n\t`headThumb` varchar(100) not null," + // + "\n\t`name` varchar(50) not null," + // + "\n\t`gender` integer," + // + "\n\t`uploadVideoCount` integer not null," + // + "\n\t`fansCount` integer not null," + // + "\n\t`balance` numeric(19, 2) not null," + // + "\n\t`brick` integer not null," + // + "\n\t`reward` integer not null," + // + "\n\t`token` varchar(500) not null," + // + "\n\t`weiboUserid` varchar(50) not null," + // + "\n\t`weiboAccesstoken` varchar(500) not null," + // + "\n\t`qqUserid` varchar(50) not null," + // + "\n\t`qqAccesstoken` varchar(500) not null," + // + "\n\t`wechatUserid` varchar(50) not null," + // + "\n\t`wechatAccesstoken` varchar(500) not null," + // + "\n\t`is_active` bool not null," + // + "\n\t`is_admin` bool not null" + // + "\n)", output); } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest59.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest59.java index c595cbc302..9bd6e02b75 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest59.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest59.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest59 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create table t3 (a long, b long byte);"; @@ -37,9 +36,9 @@ public void test_one() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE t3 (" // - + "\n\ta long," // - + "\n\tb long byte" // - + "\n)", output); + + "\n\ta long," // + + "\n\tb long byte" // + + "\n)", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest6.java index e39a80fe97..359212e0b2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest6.java @@ -27,17 +27,16 @@ import java.util.List; public class MySqlCreateTableTest6 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE Persons\n" + // - "(\n" + // - "Id_P int NOT NULL,\n" + // - "LastName varchar(255) NOT NULL,\n" + // - "FirstName varchar(255),\n" + // - "Address varchar(255),\n" + // - "City varchar(255),\n" + // - "UNIQUE (Id_P)\n" + // - ")"; + "(\n" + // + "Id_P int NOT NULL,\n" + // + "LastName varchar(255) NOT NULL,\n" + // + "FirstName varchar(255),\n" + // + "Address varchar(255),\n" + // + "City varchar(255),\n" + // + "UNIQUE (Id_P)\n" + // + ")"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest60.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest60.java index 027397f18b..cbe4bafb5d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest60.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest60.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest60 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create table t10 (pk int auto_increment primary key,f1 varchar(65500) charset latin1);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest61.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest61.java index 2ce16c1f1b..23256611d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest61.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest61.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest61 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create table t (pk int auto_increment primary key,a timestamp null default current_timestamp on update current_timestamp, b timestamp null)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest62.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest62.java index 4122019b9e..cce10c5ce1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest62.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest62.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest62 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create table a ( b varchar(15) CHARACTER SET latin1 DEFAULT NULL)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest63.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest63.java index c0afec4f69..26168416a1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest63.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest63.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest63 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE TABLE t (pk int auto_increment primary key, a TIMESTAMP, KEY ( a DESC ) );"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest64.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest64.java index 086b574263..ba75040d32 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest64.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest64.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest64 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create table t (c char(10) ,unique key a using hash (c(1))) charset = utf8mb4 engine=heap;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest65.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest65.java index 9188440735..4d556871b6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest65.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest65.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest65 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create table t (c char(10) ,unique key a using btree (c(1))) charset = utf8mb4 engine=heap;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest66.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest66.java index e4119d5f6e..0daaea48ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest66.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest66.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest66 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create table hp_db.g20_relationship_communication_daily( " @@ -51,7 +50,7 @@ public void test_one() throws Exception { + "\n\tb_iden_string varchar," + "\n\tcounter bigint," + "\n\tdurationtime bigint" - + "\n)" + + "\n)" + "\nPARTITION BY HASH KEY(a_iden_string) PARTITION NUM 100" + "\nSUBPARTITION BY LIST (bdt bigint)" + "\nSUBPARTITION OPTIONS (available_Partition_Num = 90)" @@ -64,7 +63,7 @@ public void test_one() throws Exception { + "\n\tb_iden_string varchar," + "\n\tcounter bigint," + "\n\tdurationtime bigint" - + "\n)" + + "\n)" + "\npartition by hash key(a_iden_string) partition num 100" + "\nsubpartition by list (bdt bigint)" + "\nsubpartition options (available_Partition_Num = 90)" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest67.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest67.java index 15d40222df..17f32185b8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest67.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest67.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest67 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE TABLE t1 ( a INT NOT NULL, PRIMARY KEY (a))" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest68.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest68.java index 2e0d9008d2..efa14f8341 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest68.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest68.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest68 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE TABLE t1 (" @@ -61,7 +60,7 @@ public void test_one() throws Exception { + "\n\tPARTITION p5 VALUES LESS THAN MAXVALUE" + "\n)", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table t1 (" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest69.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest69.java index 642495bdf3..6f41e23455 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest69.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest69.java @@ -24,7 +24,6 @@ import org.junit.Test; public class MySqlCreateTableTest69 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE TABLE t1 (" @@ -51,7 +50,7 @@ public void test_one() throws Exception { "\tPARTITION p1 VALUES IN (1)\n" + ")", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table t1 (\n" + @@ -61,6 +60,6 @@ public void test_one() throws Exception { "partition by list (s2) (\n" + "\tpartition p1 values in (1)\n" + ")", output); - } + } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest7.java index dc8b9a138d..73c31bbb9f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest7.java @@ -27,16 +27,15 @@ import java.util.List; public class MySqlCreateTableTest7 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE Orders\n" + // - "(\n" + // - "O_Id int NOT NULL,\n" + // - "OrderNo int NOT NULL,\n" + // - "Id_P int,\n" + // - "PRIMARY KEY (O_Id),\n" + // - "FOREIGN KEY (Id_P) REFERENCES Persons(Id_P)\n" + // - ")"; + "(\n" + // + "O_Id int NOT NULL,\n" + // + "OrderNo int NOT NULL,\n" + // + "Id_P int,\n" + // + "PRIMARY KEY (O_Id),\n" + // + "FOREIGN KEY (Id_P) REFERENCES Persons(Id_P)\n" + // + ")"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest70.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest70.java index 87d88ed77e..60749b24fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest70.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest70.java @@ -25,7 +25,6 @@ import org.junit.Test; public class MySqlCreateTableTest70 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE TABLE `app_customer_license` (" @@ -53,7 +52,7 @@ public void test_one() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Column column = visitor.getColumn("app_customer_license", "version"); Assert.assertNotNull(column); Assert.assertEquals("bigint", column.getDataType()); @@ -75,7 +74,7 @@ public void test_one() throws Exception { + "\n\tUNIQUE `idx_app_customer_license_deviceId` USING BTREE (`device_id`)" + "\n) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci AUTO_INCREMENT = 1 ROW_FORMAT = DYNAMIC", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table `app_customer_license` (" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest71.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest71.java index 36658f543b..188dd9ec53 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest71.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest71.java @@ -25,7 +25,6 @@ import org.junit.Test; public class MySqlCreateTableTest71 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create table xx (id bigint unsigned not null comment 'aa' auto_increment," // @@ -38,7 +37,7 @@ public void test_one() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Column column = visitor.getColumn("xx", "id"); Assert.assertNotNull(column); Assert.assertEquals("bigint", column.getDataType()); @@ -52,7 +51,7 @@ public void test_one() throws Exception { + "\n\tPRIMARY KEY (id)" + "\n) COMMENT 're'", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table xx (" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest72.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest72.java index 401afe5add..aef66063fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest72.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest72.java @@ -25,7 +25,6 @@ import org.junit.Test; public class MySqlCreateTableTest72 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE TABLE \"MessageInstance\" (" @@ -40,7 +39,7 @@ public void test_one() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Column column = visitor.getColumn("MessageInstance", "id"); Assert.assertNotNull(column); Assert.assertEquals("int", column.getDataType()); @@ -54,7 +53,7 @@ public void test_one() throws Exception { + "\n\tKEY \"ix_messageId\" (\"messageId\")" + "\n)", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table \"MessageInstance\" (" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest73.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest73.java index fa281ed434..bc185748d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest73.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest73.java @@ -25,7 +25,6 @@ import org.junit.Test; public class MySqlCreateTableTest73 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE TABLE total (" @@ -38,7 +37,7 @@ public void test_one() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Column column = visitor.getColumn("total", "id"); Assert.assertNotNull(column); Assert.assertEquals("INT", column.getDataType()); @@ -51,7 +50,7 @@ public void test_one() throws Exception { + "\n\tINDEX(a)" + "\n) ENGINE = MERGE UNION = (t1, t2) INSERT_METHOD = LAST", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table total (" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest74.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest74.java index ecd5c34e10..bce92124c4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest74.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest74.java @@ -25,7 +25,6 @@ import org.junit.Test; public class MySqlCreateTableTest74 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "create table test.simple_test (\n" + @@ -42,8 +41,8 @@ public void test_one() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - - Column column = visitor.getColumn("test.simple_test","col_key"); + + Column column = visitor.getColumn("test.simple_test", "col_key"); Assert.assertNotNull(column); Assert.assertEquals("bigint", column.getDataType()); @@ -59,7 +58,7 @@ public void test_one() throws Exception { "\tUNIQUE INDEX v1_unique (col_key ASC)\n" + ")", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table test.simple_test (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest75.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest75.java index 1f31656efd..370d8d4292 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest75.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest75.java @@ -25,7 +25,6 @@ import org.junit.Test; public class MySqlCreateTableTest75 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE TABLE `sys_msg_entry_0320` (\n" + @@ -54,7 +53,7 @@ public void test_one() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Column column = visitor.getColumn("sys_msg_entry_0320", "provider_dsp_name"); Assert.assertNotNull(column); Assert.assertEquals("varchar", column.getDataType()); @@ -82,7 +81,7 @@ public void test_one() throws Exception { "\tKEY `k_tid` (`tag_id`)\n" + ") ENGINE = InnoDB AUTO_INCREMENT = 167279613030 CHARSET = gbk COMMENT '消息实体表'", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table `sys_msg_entry_0320` (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest76.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest76.java index 1be751f93d..cdb030e8f7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest76.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest76.java @@ -25,7 +25,6 @@ import org.junit.Test; public class MySqlCreateTableTest76 extends MysqlTest { - @Test public void test_one() throws Exception { String sql = "CREATE TABLE `sys_msg_entry_0320` (\n" + @@ -54,7 +53,7 @@ public void test_one() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Column column = visitor.getColumn("sys_msg_entry_0320", "provider_dsp_name"); Assert.assertNotNull(column); Assert.assertEquals("varchar", column.getDataType()); @@ -82,7 +81,7 @@ public void test_one() throws Exception { "\tKEY `k_tid` (`tag_id`)\n" + ") ENGINE = InnoDB AUTO_INCREMENT = 167279613030 CHARSET = gbk COMMENT '消息实体表'", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table `sys_msg_entry_0320` (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest77.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest77.java index 6aee1f3b36..a63a40339e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest77.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest77.java @@ -23,7 +23,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlCreateTableTest77 extends MysqlTest { - public void test_one() throws Exception { String sql = "-- table-name-bean-name:some --\n" + "CREATE TABLE `some_table` (\n" + @@ -35,7 +34,7 @@ public void test_one() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Column column = visitor.getColumn("some_table", "id"); assertNotNull(column); assertEquals("bigint", column.getDataType()); @@ -47,7 +46,7 @@ public void test_one() throws Exception { "\t`id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键'\n" + ")", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("-- table-name-bean-name:some --\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest78_json.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest78_json.java index 1571a3a389..56bab027e1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest78_json.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest78_json.java @@ -23,7 +23,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlCreateTableTest78_json extends MysqlTest { - public void test_one() throws Exception { String sql = "CREATE TABLE t1 (jdoc JSON);"; @@ -32,7 +31,7 @@ public void test_one() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Column column = visitor.getColumn("t1", "jdoc"); assertNotNull(column); assertEquals("JSON", column.getDataType()); @@ -43,7 +42,7 @@ public void test_one() throws Exception { "\tjdoc JSON\n" + ")", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table t1 (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest79_collate.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest79_collate.java index ffe9f729d3..db965fa780 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest79_collate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest79_collate.java @@ -23,7 +23,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlCreateTableTest79_collate extends MysqlTest { - public void test_one() throws Exception { String sql = "CREATE TABLE tb_custom_vip_show_message (custom_vip_show_message_seq INT(11) NOT NULL AUTO_INCREMENT,show_channel_type TINYINT(4) NOT NULL COMMENT '通道类型',PRIMARY KEY (custom_vip_show_message_seq))COMMENT='自定VIP显示表' COLLATE='utf8_general_ci' ENGINE=InnoDB;"; @@ -32,7 +31,7 @@ public void test_one() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Column column = visitor.getColumn("tb_custom_vip_show_message", "custom_vip_show_message_seq"); assertNotNull(column); assertEquals("INT", column.getDataType()); @@ -45,7 +44,7 @@ public void test_one() throws Exception { "\tPRIMARY KEY (custom_vip_show_message_seq)\n" + ") ENGINE = InnoDB COMMENT '自定VIP显示表' COLLATE utf8_general_ci", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table tb_custom_vip_show_message (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest8.java index b1bd4d97cb..526d25466e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest8.java @@ -27,17 +27,16 @@ import java.util.List; public class MySqlCreateTableTest8 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE Persons\n" + // - "(\n" + // - "Id_P int NOT NULL,\n" + // - "LastName varchar(255) NOT NULL,\n" + // - "FirstName varchar(255),\n" + // - "Address varchar(255),\n" + // - "City varchar(255),\n" + // - "CHECK (Id_P>0)\n" + // - ")"; + "(\n" + // + "Id_P int NOT NULL,\n" + // + "LastName varchar(255) NOT NULL,\n" + // + "FirstName varchar(255),\n" + // + "Address varchar(255),\n" + // + "City varchar(255),\n" + // + "CHECK (Id_P>0)\n" + // + ")"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest80.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest80.java index d1020b515f..bb8bb351d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest80.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest80.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlCreateTableTest80 extends MysqlTest { - public void test_one() throws Exception { String sql = "create table tb1(select * from tb2)"; @@ -43,7 +42,7 @@ public void test_one() throws Exception { "SELECT *\n" + "FROM tb2", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table tb1\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest81.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest81.java index a4a71b7d41..cadd2b9c39 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest81.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest81.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlCreateTableTest81 extends MysqlTest { - public void test_one() throws Exception { String sql = "CREATE TABLE `admin` (\n" + " `id` char(20) NOT NULL,\n" + @@ -53,7 +52,7 @@ public void test_one() throws Exception { "\tPRIMARY KEY USING BTREE (`id`)\n" + ") ENGINE = InnoDB CHARSET = utf8 COMMENT '管理员'", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table `admin` (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest82.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest82.java index 0676e9094f..054e7fa854 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest82.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest82.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlCreateTableTest82 extends MysqlTest { - public void test_one() throws Exception { String sql = "CREATE TABLE t1 (\n" + " ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\n" + @@ -47,7 +46,7 @@ public void test_one() throws Exception { "\tdt DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\n" + ")", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table t1 (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest83.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest83.java index d2ab584e7d..5bdadfc39a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest83.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest83.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; public class MySqlCreateTableTest83 extends MysqlTest { - public void test_one() throws Exception { String sql = "CREATE TABLE t1 (\n" + " ts1 TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- default 0\n" + @@ -48,7 +47,7 @@ public void test_one() throws Exception { "\tts2 TIMESTAMP NULL ON UPDATE CURRENT_TIMESTAMP -- default NULL\n" + ")", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table t1 (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest84.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest84.java index b20ecaf3ad..d2cfdaa296 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest84.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest84.java @@ -25,7 +25,6 @@ import com.alibaba.druid.util.JdbcConstants; public class MySqlCreateTableTest84 extends MysqlTest { - public void test_one() throws Exception { String sql = "CREATE TABLE `test` (\n" + " `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + @@ -88,7 +87,7 @@ public void test_one() throws Exception { "\tKEY `k_c` (`c_mediumint`, `c_int`)\n" + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table `test` (\n" + @@ -119,28 +118,28 @@ public void test_one() throws Exception { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); repository.console(sql); assertEquals("CREATE TABLE `test` (\n" + - "\t`id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_tinyint` tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_decimal` decimal(10, 3) DEFAULT NULL COMMENT 'decimal',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tPRIMARY KEY (`id`),\n" + - "\tUNIQUE KEY `uk_a` (`c_tinyint`),\n" + - "\tKEY `k_b` (`c_smallint`),\n" + - "\tKEY `k_c` (`c_mediumint`, `c_int`)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" + "\t`id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\t`c_tinyint` tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + + "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + + "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\t`c_decimal` decimal(10, 3) DEFAULT NULL COMMENT 'decimal',\n" + + "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\t`c_timestamp` timestamp NULL DEFAULT NULL COMMENT 'timestamp',\n" + + "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + + "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + + "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\t`c_blob` blob COMMENT 'blob',\n" + + "\t`c_text` text COMMENT 'text',\n" + + "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + + "\t`c_longblob` longblob COMMENT 'longblob',\n" + + "\tPRIMARY KEY (`id`),\n" + + "\tUNIQUE KEY `uk_a` (`c_tinyint`),\n" + + "\tKEY `k_b` (`c_smallint`),\n" + + "\tKEY `k_c` (`c_mediumint`, `c_int`)\n" + + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" , repository.console("show create table test")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest85.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest85.java index 007595e594..53519f5d9c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest85.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest85.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; public class MySqlCreateTableTest85 extends MysqlTest { - public void test_one() throws Exception { String sql = "create table `some table $$`(id int auto_increment key, class varchar(10), data binary) engine=MYISAM;"; @@ -46,7 +45,7 @@ public void test_one() throws Exception { "\tdata binary\n" + ") ENGINE = MYISAM", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table `some table $$` (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest86.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest86.java index be7caa97d5..9da7ab2d56 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest86.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest86.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; public class MySqlCreateTableTest86 extends MysqlTest { - public void test_one() throws Exception { String sql = "create table child_table(id int unsigned auto_increment primary key, id_parent int references parent_table(id) match full on update cascade on delete set null) engine=InnoDB;"; @@ -45,7 +44,7 @@ public void test_one() throws Exception { "\tid_parent int REFERENCES parent_table (id) MATCH FULL ON DELETE SET NULL ON UPDATE CASCADE\n" + ") ENGINE = InnoDB", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table child_table (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest87.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest87.java index dbfddf5eed..c92642f518 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest87.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest87.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; public class MySqlCreateTableTest87 extends MysqlTest { - public void test_one() throws Exception { String sql = "CREATE TABLE `test_4` (\n" + " `id` bigint(20) zerofill unsigNed NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + @@ -50,7 +49,7 @@ public void test_one() throws Exception { "\tPRIMARY KEY (`id`)\n" + ") ENGINE = InnoDB AUTO_INCREMENT = 1769531 CHARSET = utf8mb4 COMMENT '10000000'", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table `test_4` (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest88.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest88.java index a6a74a7a4f..5d6f15989d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest88.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest88.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; public class MySqlCreateTableTest88 extends MysqlTest { - public void test_one() throws Exception { String sql = "CREATE TABLE `t_share_like_info` (\n" + " `id` bigint(20) NOT NULL AUTO_INCREMENT,\n" + @@ -55,7 +54,7 @@ public void test_one() throws Exception { "\tPRIMARY KEY (`id`)\n" + ") ENGINE = InnoDB CHARSET = utf8", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table `t_share_like_info` (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest89.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest89.java index 406c7f38a0..af0b547353 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest89.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest89.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; public class MySqlCreateTableTest89 extends MysqlTest { - public void test_one() throws Exception { String sql = "CREATE TABLE IF NOT EXISTS `test_table_normal`( \n" + "scoreID INTEGER NOT NULL PRIMARY KEY, \n" + @@ -59,7 +58,7 @@ public void test_one() throws Exception { "\tCONSTRAINT CHK_SCORE_ZIP CHECK (SCORE > 0)\n" + ")", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table if not exists `test_table_normal` (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest9.java index 1a05109f21..7b872f8fde 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest9.java @@ -27,12 +27,11 @@ import java.util.List; public class MySqlCreateTableTest9 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE VIEW v AS\n" + // - "SELECT ProductID,ProductName\n" + // - "FROM Products\n" + // - "WHERE Discontinued=No"; + "SELECT ProductID,ProductName\n" + // + "FROM Products\n" + // + "WHERE Discontinued=No"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest90.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest90.java index 0368ebcd56..c319b3832b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest90.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest90.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; public class MySqlCreateTableTest90 extends MysqlTest { - public void test_one() throws Exception { String sql = "CREATE TABLE `g_platform_payway` (\n" + "\t`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id', \n" + @@ -57,7 +56,7 @@ public void test_one() throws Exception { "\tUNIQUE `uniq_playform_payway` USING BTREE (`platform_code`, `pay_way`) COMMENT '平台code和支付方式应该唯一'\n" + ") ENGINE = InnoDB CHARSET = utf8 COMMENT '配置表'", output); } - + { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("create table `g_platform_payway` (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest91.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest91.java index e1d1292416..01eac52908 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest91.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest91.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest91 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE tbl_name(id int, sid int, name varchar(8)) " + // "PARTITION BY LINEAR KEY ALGORITHM=2 (id, sid) PARTITIONS 4 (PARTITION p0, PARTITION p1, PARTITION p2, PARTITION p3)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest92.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest92.java index 1a28870d56..ebf081c7d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest92.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest92.java @@ -10,16 +10,15 @@ import java.util.List; public class MySqlCreateTableTest92 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `test` (\n" - + " `id` bigint(20) unsigned zerofill NOT NULL AUTO_INCREMENT COMMENT 'id',\n" - + " `c_set` set('a','b','c') COMMENT 'set',\n" + " PRIMARY KEY (`id`)\n" - + ") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='10000000';"; + + " `id` bigint(20) unsigned zerofill NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + " `c_set` set('a','b','c') COMMENT 'set',\n" + " PRIMARY KEY (`id`)\n" + + ") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='10000000';"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement statemen = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement statemen = (MySqlCreateTableStatement) statementList.get(0); Assert.assertEquals(1, statementList.size()); Assert.assertEquals(3, statemen.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest93.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest93.java index 8f7db7049f..12e3a07806 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest93.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest93.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlCreateTableTest93 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `dc_job_instance` (\n" + " `id` int(11) NOT NULL AUTO_INCREMENT,\n" + @@ -60,7 +59,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(44, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest94.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest94.java index db19d180de..aa2e1af3cb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest94.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest94.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest94 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE IF NOT EXISTS testTable\n" + "(\n" + @@ -23,7 +22,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(4, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest95.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest95.java index 416c41fa09..0e690a7572 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest95.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest95.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest95 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `f_product` (\n" + " `id` int(200) NOT NULL AUTO_INCREMENT,\n" + @@ -18,7 +17,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(3, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest96_set.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest96_set.java index faa9d414ca..b7d4690ede 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest96_set.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest96_set.java @@ -8,13 +8,12 @@ import java.util.List; public class MySqlCreateTableTest96_set extends MysqlTest { - public void test_0() throws Exception { String sql = "create table test1(id int, name set('a', 'b', 'c') not null default 'a');"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(2, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest97.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest97.java index 7f82b599a2..0da4eee232 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest97.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest97.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest97 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE `gsp_order` (\n" + " `id` int(11) NOT NULL AUTO_INCREMENT,\n" + @@ -31,7 +30,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(14, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest98_keyword.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest98_keyword.java index e95d0d4589..62ba1d2af5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest98_keyword.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest98_keyword.java @@ -10,7 +10,6 @@ import java.util.List; public class MySqlCreateTableTest98_keyword extends MysqlTest { - public void test_0() throws Exception { String sql = " CREATE TABLE IF NOT EXISTS meta.view (\n" + " cluster_name varchar(16) ,\n" + @@ -21,7 +20,7 @@ public void test_0() throws Exception { " )"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(5, stmt.getTableElementList().size()); @@ -46,7 +45,7 @@ public void test_1() throws Exception { " )"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(5, stmt.getTableElementList().size()); @@ -71,7 +70,7 @@ public void test_2() throws Exception { " )"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(5, stmt.getTableElementList().size()); @@ -101,7 +100,7 @@ public void test_3() throws Exception { + ")"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(10, stmt.getTableElementList().size()); @@ -131,7 +130,7 @@ public void test_4() throws Exception { ") ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Database privileges'"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(5, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest99.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest99.java index 5df5667e2a..dc5a86d61c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest99.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest99.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlCreateTableTest99 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE IF NOT EXISTS srcTable\n" + "(\n" + @@ -25,7 +24,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals(4, stmt.getTableElementList().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_0.java index b933429f24..64ab742f4f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_0.java @@ -24,7 +24,6 @@ import java.util.List; public class MySql_Create_Function_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE FUNCTION hello (s CHAR(20))\n" + " RETURNS CHAR(50) DETERMINISTIC\n" + @@ -37,33 +36,33 @@ public void test_0() throws Exception { SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); stmt.accept(visitor); - + assertEquals("CREATE FUNCTION hello (\n" + "\ts CHAR(20)\n" + ")\n" + "RETURNS CHAR(50) DETERMINISTIC\n" + "RETURN CONCAT('Hello, ', s, '!');", // - SQLUtils.toMySqlString(stmt)); - + SQLUtils.toMySqlString(stmt)); + assertEquals("create function hello (\n" + "\ts CHAR(20)\n" + ")\n" + "returns CHAR(50) deterministic\n" + "return CONCAT('Hello, ', s, '!');", // - SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(0, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_1.java index 2a0857c7a8..7c18910665 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_1.java @@ -24,7 +24,6 @@ import java.util.List; public class MySql_Create_Function_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE DEFINER=`root`@`%` FUNCTION `hello`(s CHAR(20)) RETURNS char(50) CHARSET big5\n" + " DETERMINISTIC\n" + @@ -37,33 +36,33 @@ public void test_0() throws Exception { SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); stmt.accept(visitor); - + assertEquals("CREATE FUNCTION `hello` (\n" + "\ts CHAR(20)\n" + ")\n" + "RETURNS char(50) CHARACTER SET big5 DETERMINISTIC\n" + "RETURN CONCAT('Hello, ', s, '!')", // - SQLUtils.toMySqlString(stmt)); - + SQLUtils.toMySqlString(stmt)); + assertEquals("create function `hello` (\n" + "\ts CHAR(20)\n" + ")\n" + "returns char(50) character set big5 deterministic\n" + "return CONCAT('Hello, ', s, '!')", // - SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(0, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest.java index a9fe7c97b5..ef6c89d493 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlDropDatabaseTest extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP DATABASE sonar"; @@ -39,23 +38,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DROP DATABASE sonar", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest2.java index 5fba87ff72..db76b92a90 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest2.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlDropDatabaseTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP DATABASE IF EXISTS sonar"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); assertEquals("DROP DATABASE IF EXISTS sonar", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropFunctionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropFunctionTest.java index e7dfe0588a..083a5defc0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropFunctionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropFunctionTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlDropFunctionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP FUNCTION function_name"; @@ -43,12 +42,11 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "last_name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest.java index 45a6d251c0..5f28645f41 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat; public class MySqlDropIndexTest extends MysqlTest { - public void test_0() throws Exception { String sql = "drop index index_name on table_name "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest1.java index fdc66a4a2d..2fcb5c121c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest1.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlDropIndexTest1 extends MysqlTest { - public void test_0() throws Exception { String sql = "drop index index1 on t1 algorithm=default;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest2.java index 9fbdcf07fb..6b2c79cbe8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest2.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlDropIndexTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "drop index index2 on t2 algorithm=default lock none;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropProcedureTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropProcedureTest.java index aa5faa1c91..ad2a170686 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropProcedureTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropProcedureTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlDropProcedureTest extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP PROCEDURE IF EXISTS sp_name"; @@ -43,12 +42,11 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "last_name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest.java index dd95897aa4..41e28f86c6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class MySqlDropTableTest extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP TABLE IF EXISTS B,C,A;"; @@ -44,7 +43,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(3, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest_1_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest_1_hints.java index 9ddd618c03..3988c47d32 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest_1_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest_1_hints.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlDropTableTest_1_hints extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `temp_bond_keys`.`temp_bond_key_id`;"; @@ -43,7 +42,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespace.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespace.java index 2c74b1b628..d42b753844 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespace.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespace.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlDropTablespace extends MysqlTest { - public void test_0() throws Exception { String sql = "drop tablespace tblsp1 engine = NDB;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespaceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespaceTest.java index c46f2861a0..6f711e4f0d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespaceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespaceTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlDropTablespaceTest extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP TABLESPACE tablespace_name"; @@ -43,12 +42,11 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "last_name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTriggerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTriggerTest.java index b267016d7b..766ec1dd68 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTriggerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTriggerTest.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlDropTriggerTest extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP TRIGGER hr.salary_check; "; @@ -42,12 +41,11 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "last_name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropUserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropUserTest.java index 2749040152..2b1b232678 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropUserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropUserTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlDropUserTest extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP USER 'jeffrey'@'localhost';"; @@ -39,23 +38,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DROP USER 'jeffrey'@'localhost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropViewTest.java index c4f1a35324..c1b4bf1c54 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropViewTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat; public class MySqlDropViewTest extends MysqlTest { - public void test_0() throws Exception { String sql = "DROP VIEW view_name"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest.java index d4f2b5792c..11b9f2fe0f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT ALL ON db1.* TO 'jeffrey'@'localhost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT ALL ON db1.* TO 'jeffrey'@'localhost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_1.java index a8d9871130..2e2d1a0788 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_1.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT SELECT ON db2.invoice TO 'jeffrey'@'localhost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT SELECT ON db2.invoice TO 'jeffrey'@'localhost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_10.java index 5deddb422a..9a7abeaf23 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_10.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_10 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT PROXY ON 'localuser'@'localhost' TO 'externaluser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT PROXY ON 'localuser'@'localhost' TO 'externaluser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_11.java index d924486aeb..6d0be8c299 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_11.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_11 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT CREATE TABLESPACE ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT CREATE TABLESPACE ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_12.java index 7c692f880e..ee84c02206 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_12.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_12 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT CREATE TEMPORARY TABLES ON mydb.* TO 'someuser'@'somehost';"; @@ -38,24 +37,24 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + Assert.assertEquals("GRANT CREATE TEMPORARY TABLES ON mydb.* TO 'someuser'@'somehost';", // - SQLUtils.toMySqlString(stmt)); + SQLUtils.toMySqlString(stmt)); Assert.assertEquals("grant CREATE TEMPORARY TABLES on mydb.* to 'someuser'@'somehost';", // - SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_13.java index c58f713679..0e12fe37c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_13.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_13 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT CREATE USER ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT CREATE USER ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_14.java index 73db9fe4ec..116096e182 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_14.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_14 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT CREATE VIEW ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT CREATE VIEW ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_15.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_15.java index a305eb2dfe..d511ecf6d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_15.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_15 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT DELETE ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT DELETE ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_16.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_16.java index d2bc2c2829..d4378e5e2b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_16.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_16 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT DROP ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT DROP ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_17.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_17.java index 1024a26800..507b360f29 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_17.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_17 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT EVENT ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT EVENT ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_18.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_18.java index 29e5e62ca9..5379ee9d46 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_18.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_18 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT EXECUTE ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT EXECUTE ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_19.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_19.java index 9a78763743..25323fb79f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_19.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_19 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT FILE ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT FILE ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_2.java index 937096c4f1..b56c2c1765 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_2.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_2 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT USAGE ON *.* TO 'jeffrey'@'localhost' WITH MAX_QUERIES_PER_HOUR 90"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT USAGE ON *.* TO 'jeffrey'@'localhost' WITH MAX_QUERIES_PER_HOUR 90", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_20.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_20.java index 2024868812..79d0429da8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_20.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_20 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT GRANT OPTION ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT GRANT OPTION ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_21.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_21.java index 72d053207e..ff0015c28c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_21.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_21 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT INDEX ON mydb.* TO 'someuser'@'somehost';"; @@ -38,10 +37,10 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT INDEX ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); @@ -54,7 +53,7 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_22.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_22.java index 5eeaf60b74..c511a3ce63 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_22.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_22 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT LOCK TABLES ON mydb.* TO 'someuser'@'somehost';"; @@ -38,10 +37,10 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT LOCK TABLES ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); @@ -54,7 +53,7 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_23.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_23.java index 468c558afa..97e5494ff8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_23.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_23 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT PROXY ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT PROXY ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_24.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_24.java index 160183ab58..7b671bf5d7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_24.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_24 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT PROCESS ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT PROCESS ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_25.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_25.java index c542b65717..e5d9b2532b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_25.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_25 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT REFERENCES ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT REFERENCES ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_26.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_26.java index caee2db6e9..3dce2e9cb4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_26.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_26 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT RELOAD ON mydb.* TO 'someuser'@'somehost';"; @@ -38,11 +37,10 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT RELOAD ON mydb.* TO 'someuser'@'somehost';", // - output); - + output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); @@ -60,8 +58,7 @@ public void test_1() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT ALL ON sysdb.* TO '%'@'192.168.1/20'", // - output); - + output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_27.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_27.java index 9faf9f261f..3675c74d9d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_27.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_27 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT REPLICATION CLIENT ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT REPLICATION CLIENT ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_28.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_28.java index b07b76f0cc..e229a95c94 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_28.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_28 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT REPLICATION SLAVE ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT REPLICATION SLAVE ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_29.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_29.java index 8c311c8985..87acba511d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_29.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_29 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT SHOW DATABASES ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT SHOW DATABASES ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_3.java index f268e02af9..89c1293716 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_3.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_3 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT ALL ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT ALL ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_30.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_30.java index 3766ed9720..438335d3ed 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_30.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_30 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT SHOW VIEW ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT SHOW VIEW ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_31.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_31.java index a037ec83aa..542bb4683d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_31.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_31 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT SHUTDOWN ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT SHUTDOWN ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_32.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_32.java index 0092fe140b..f8442b1a69 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_32.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_32 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT SUPER ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT SUPER ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_33.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_33.java index ce126b335f..8f1ad501c8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_33.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_33 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT TRIGGER ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); assertEquals("GRANT TRIGGER ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_34.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_34.java index 2a7a197802..1ad5b5132f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_34.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlGrantTest_34 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT USAGE ON *.* TO 'bob'@'%.example.org' IDENTIFIED BY 'cleartext password';"; @@ -41,25 +40,25 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - SQLExprTableSource resource = (SQLExprTableSource)stmt.getResource(); - Assert.assertEquals("*",resource.getSchema()); - + SQLExprTableSource resource = (SQLExprTableSource) stmt.getResource(); + Assert.assertEquals("*", resource.getSchema()); + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT USAGE ON *.* TO 'bob'@'%.example.org' IDENTIFIED BY 'cleartext password';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_35.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_35.java index b06aed10c3..e3b60e847e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_35.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_35.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_35 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT CREATE ON . TO hello@'%'; "; @@ -37,10 +36,10 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); assertEquals("GRANT CREATE ON * TO 'hello'@'%';", // - output); + output); assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_36.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_36.java index f00eff1846..9e4a2cbf54 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_36.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_36 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT DELETE, CREATE, DROP ON *.* TO 'oa_2'@'localhost' with grant option"; @@ -37,10 +36,10 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); assertEquals("GRANT DELETE, CREATE, DROP ON *.* TO 'oa_2'@'localhost' WITH GRANT OPTION", // - output); + output); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_37.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_37.java index 5ee8f54503..6d86862415 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_37.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_37.java @@ -17,7 +17,6 @@ * @Date 2019-05-22 11:11 */ public class MySqlGrantTest_37 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `db\\_seszadjx\\_guej\\_0005`.* TO 'woaga4ym'@'%'"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_4.java index 03491015df..04060ca03b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_4.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_4 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT SELECT, INSERT ON mydb.* TO 'someuser'@'somehost'"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT SELECT, INSERT ON mydb.* TO 'someuser'@'somehost'", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_5.java index 272d6d4e6a..0359d8e8c1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_5.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_5 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT ALL ON mydb.mytbl TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT ALL ON mydb.mytbl TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_6.java index 41b9d9f841..c09050277d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_6.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_6 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT SELECT, INSERT ON mydb.mytbl TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT SELECT, INSERT ON mydb.mytbl TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_7.java index 06e3f6fb46..403227c180 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_7.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_7 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT SELECT (col1), INSERT (col1,col2) ON mydb.mytbl TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT SELECT(col1), INSERT(col1, col2) ON mydb.mytbl TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_8.java index 38742097d7..81395df0b3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_8.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_8 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT CREATE ROUTINE ON mydb.* TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT CREATE ROUTINE ON mydb.* TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_9.java index 33dfef5ff7..21d07d2c4f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_9.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlGrantTest_9 extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT EXECUTE ON PROCEDURE mydb.myproc TO 'someuser'@'somehost';"; @@ -38,23 +37,23 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("GRANT EXECUTE ON PROCEDURE mydb.myproc TO 'someuser'@'somehost';", // - output); + output); // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_ads.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_ads.java index 9cb762aad9..d811beb65a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_ads.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_ads.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlGrantTest_ads extends MysqlTest { - public void test_0() throws Exception { String sql = "GRANT SELECT ON TABLE * TO 'ALIYUN$ads_user1@aliyun.com'"; @@ -38,10 +37,10 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + String output = SQLUtils.toMySqlString(stmt); assertEquals("GRANT SELECT ON TABLE * TO 'ALIYUN$ads_user1@aliyun.com'", // - output); + output); assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); @@ -175,8 +174,6 @@ public void test_6() throws Exception { assertEquals(0, visitor.getConditions().size()); } - - public void test_7() throws Exception { String sql = "GRANT ALL ON sysdb.* TO '%'@'192.168.1.2'"; @@ -198,7 +195,6 @@ public void test_7() throws Exception { assertEquals(0, visitor.getConditions().size()); } - public void test_8() throws Exception { String sql = "GRANT ALL ON sysdb.* TO '%'@'192.168.1.2'"; @@ -250,9 +246,8 @@ public void test_10() throws Exception { assertEquals(1, statementList.size()); - SQLExpr user0 = stmt.getUsers().get(0); - assertEquals(user0.toString().split("'@'")[0].replaceAll("'",""), "%"); + assertEquals(user0.toString().split("'@'")[0].replaceAll("'", ""), "%"); assertEquals(user0.toString().split("'@'")[1].replaceAll("'", ""), "192.168.1/20"); assertEquals("ALIYUN$ads_user1@aliyun.com", stmt.getUsers().get(1).toString().split("'@'")[0].replaceAll("'", "")); @@ -279,7 +274,6 @@ public void test_11() throws Exception { assertEquals(1, statementList.size()); - assertEquals("ALIYUN$ads_user1@aliyun.com", stmt.getUsers().get(0).toString().split("'@'")[0].replaceAll("'", "")); assertEquals(1, stmt.getUsers().get(0).toString().split("'@'").length); @@ -296,7 +290,6 @@ public void test_11() throws Exception { } - public void test_doc_0() throws Exception { String sql = "GRANT describe, select ON db_name.table_group_name TO 'ALIYUN$account_name'@'%';"; @@ -349,5 +342,4 @@ public void test_doc_3() throws Exception { stmt.toString()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlRevokeTest_ads_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlRevokeTest_ads_1.java index ccacc14c0b..89a37868c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlRevokeTest_ads_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlRevokeTest_ads_1.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlRevokeTest_ads_1 extends MysqlTest { - public void test_doc_0() throws Exception { String sql = "REVOKE describe, select ON db_name.table_group_name FROM 'ALIYUN$account_name'@'%';"; @@ -122,7 +121,6 @@ public void test_show_2() throws Exception { assertEquals("show grants for 'user'@''", // stmt.toLowerCaseString()); - MySqlUserName userName = new MySqlUserName(); userName.setUserName(""); userName.setHost(""); @@ -132,7 +130,6 @@ public void test_show_2() throws Exception { userName.toString(); } - public void test_show_3() throws Exception { String sql = "show grants for 'user'@'localhost' "; @@ -149,5 +146,4 @@ public void test_show_3() throws Exception { } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_0.java index 58a8dca97d..1265ef36b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_0.java @@ -27,26 +27,25 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "INSERT INTO t1 (name) VALUES (" + // - "'eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // - "eeeeeeeeeeeeeeeeee\\\\1')"; + "'eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + // + "eeeeeeeeeeeeeeeeee\\\\1')"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_1.java index 162fef4a20..f31eb638e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_1.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "INSERT INTO tbl_name () VALUES();"; @@ -45,6 +44,6 @@ public void test_0() throws Exception { stmt.accept(visitor); Assert.assertEquals("INSERT INTO tbl_name" + // - "\nVALUES ();", SQLUtils.toMySqlString(insertStmt)); + "\nVALUES ();", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_10.java index 99c7a65cdb..c472cf0433 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_10.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_10 extends MysqlTest { - public void test_parseCompleteValues_false() throws Exception { String sql = "insert into t(a,b) values ('a1','b1'),('a2','b2'),('a3','b3'),('a4','b4');"; @@ -48,9 +47,9 @@ public void test_parseCompleteValues_false() throws Exception { stmt.accept(visitor); String formatSql = "INSERT INTO t (a, b)"// - + "\nVALUES ('a1', 'b1'),"// - + "\n\t('a2', 'b2'),"// - + "\n\t('a3', 'b3')"; + + "\nVALUES ('a1', 'b1'),"// + + "\n\t('a2', 'b2'),"// + + "\n\t('a3', 'b3')"; Assert.assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } @@ -73,10 +72,10 @@ public void test_parseCompleteValues_true() throws Exception { stmt.accept(visitor); String formatSql = "INSERT INTO t (a, b)"// - + "\nVALUES ('a1', 'b1'),"// - + "\n\t('a2', 'b2'),"// - + "\n\t('a3', 'b3'),"// - + "\n\t('a4', 'b4');"; + + "\nVALUES ('a1', 'b1'),"// + + "\n\t('a2', 'b2'),"// + + "\n\t('a3', 'b3'),"// + + "\n\t('a4', 'b4');"; Assert.assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_11.java index ddda501619..02a38d7efb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_11.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_11 extends MysqlTest { - public void test_insert_rollback_on_fail() throws Exception { String sql = "insert ROLLBACK_ON_FAIL into t(a,b) values ('a1','b1')"; @@ -48,7 +47,7 @@ public void test_insert_rollback_on_fail() throws Exception { stmt.accept(visitor); String formatSql = "INSERT ROLLBACK_ON_FAIL INTO t (a, b)"// - + "\nVALUES ('a1', 'b1')"; + + "\nVALUES ('a1', 'b1')"; Assert.assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_12.java index 8d41dc0d60..57e87e787e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_12.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_12 extends MysqlTest { - public void test_insert_rollback_on_fail() throws Exception { String sql = "insert into t1 values('A\\0\\0\\0B')"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_13.java index 44638c7f39..95ad9cbf82 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_13.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlInsertTest_13 extends MysqlTest { - public void test_insert_rollback_on_fail() throws Exception { String sql = "insert into order (id, name) values (?, ?)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_14.java index 7844184409..582983acf8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_14.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlInsertTest_14 extends MysqlTest { - public void test_insert_rollback_on_fail() throws Exception { String sql = "insert into test.heartbeat (id ,ts)" + " values ( 1, UNIX_TIMESTAMP())" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_15.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_15.java index 5ced5e9b9f..5b89e77e2d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_15.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlInsertTest_15 extends MysqlTest { - public void test_insert_rollback_on_fail() throws Exception { String sql = "insert into t.t1 (id,id2) values (1,2);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_16_hint.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_16_hint.java index 6f2a5b5ce8..6a9c40e968 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_16_hint.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_16_hint.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlInsertTest_16_hint extends MysqlTest { - public void test_insert_rollback_on_fail() throws Exception { String sql = "insert into mytable /*!(col2, col3, col1) */ values (load_file('sompath'), 'str1', 2);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java index 22e4879dbd..1d10b8b6d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java @@ -10,29 +10,28 @@ import java.util.List; public class MySqlInsertTest_17 extends MysqlTest { - public void test_insert_rollback_on_fail() throws Exception { String sql = "/*+engine=MPP, mppNativeInsertFromSelect=true*/\n" - + "INSERT INTO dashboard_crowd_analysis(cname,cvalue,orders,users,dt,tagid)\n" - + "SELECT x.cname as cname,\n" + " x.cvalue as cvalue,\n" + " x.orders as orders,\n" - + " x.users as users,\n" + " 20171211 as dt,\n" + " 91 as tagid\n" - + "FROM (WITH h AS\n" + " (SELECT a.userid,\n" + " a.col_1,\n" - + " a.col_2,\n" + " a.col_3,\n" + " a.col_4,\n" - + " a.col_5,\n" + " a.col_6,\n" + " c.orders_week\n" - + " FROM\n" + " (SELECT userid,\n" + " col_1,\n" - + " col_2,\n" + " col_3,\n" + " col_4,\n" - + " col_5,\n" + " col_6\n" - + " FROM ofo_personas_dimensions\n" + " WHERE dt=20171211)a\n" - + " JOIN\n" + " (SELECT userid\n" + " FROM personas_user_tag\n" - + " WHERE tagid=91)b ON a.userid=b.userid\n" + " JOIN\n" - + " (SELECT userid,\n" + " orders_week\n" - + " FROM ofo_personas_metrics\n" - + " WHERE dt=20171211)c ON a.userid=c.userid)\n" + " SELECT 'col_1' as cname,\n" - + " col_1 as cvalue,\n" + " sum(orders_week) AS orders,\n" - + " count(userid) AS users\n" + " FROM h\n" + " GROUP BY col_1\n" - + " UNION ALL\n" + " SELECT 'col_2' as cname,\n" + " col_2 as cvalue,\n" - + " sum(orders_week) AS orders,\n" + " count(userid) AS users\n" - + " FROM h\n" + " GROUP BY col_2)x"; + + "INSERT INTO dashboard_crowd_analysis(cname,cvalue,orders,users,dt,tagid)\n" + + "SELECT x.cname as cname,\n" + " x.cvalue as cvalue,\n" + " x.orders as orders,\n" + + " x.users as users,\n" + " 20171211 as dt,\n" + " 91 as tagid\n" + + "FROM (WITH h AS\n" + " (SELECT a.userid,\n" + " a.col_1,\n" + + " a.col_2,\n" + " a.col_3,\n" + " a.col_4,\n" + + " a.col_5,\n" + " a.col_6,\n" + " c.orders_week\n" + + " FROM\n" + " (SELECT userid,\n" + " col_1,\n" + + " col_2,\n" + " col_3,\n" + " col_4,\n" + + " col_5,\n" + " col_6\n" + + " FROM ofo_personas_dimensions\n" + " WHERE dt=20171211)a\n" + + " JOIN\n" + " (SELECT userid\n" + " FROM personas_user_tag\n" + + " WHERE tagid=91)b ON a.userid=b.userid\n" + " JOIN\n" + + " (SELECT userid,\n" + " orders_week\n" + + " FROM ofo_personas_metrics\n" + + " WHERE dt=20171211)c ON a.userid=c.userid)\n" + " SELECT 'col_1' as cname,\n" + + " col_1 as cvalue,\n" + " sum(orders_week) AS orders,\n" + + " count(userid) AS users\n" + " FROM h\n" + " GROUP BY col_1\n" + + " UNION ALL\n" + " SELECT 'col_2' as cname,\n" + " col_2 as cvalue,\n" + + " sum(orders_week) AS orders,\n" + " count(userid) AS users\n" + + " FROM h\n" + " GROUP BY col_2)x"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_18_alias.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_18_alias.java index f5e6d28472..2749189096 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_18_alias.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_18_alias.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlInsertTest_18_alias extends MysqlTest { - public void test_insert_rollback_on_fail() throws Exception { String sql = "INSERT INTO t1 (fval) values (\"abc\")"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_2.java index dfaa0267e4..98311e0355 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_2.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_2 extends MysqlTest { - public void test_0() throws Exception { String sql = "INSERT INTO tbl_name (col1,col2) VALUES(15,col1*2);"; @@ -45,6 +44,6 @@ public void test_0() throws Exception { stmt.accept(visitor); Assert.assertEquals("INSERT INTO tbl_name (col1, col2)" + // - "\nVALUES (15, col1 * 2);", SQLUtils.toMySqlString(insertStmt)); + "\nVALUES (15, col1 * 2);", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_25_time.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_25_time.java index 1f298ee869..4288fe741c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_25_time.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_25_time.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlInsertTest_25_time extends MysqlTest { - public void test_insert() throws Exception { String sql = "INSERT INTO DB1.TB2 (col1, col2, col3) VALUES(1, Timestamp '2019-01-01:12:12:21', '3')"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_26_special.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_26_special.java index c0cf7a842c..8ffb23a0e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_26_special.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_26_special.java @@ -28,7 +28,6 @@ import java.util.List; public class MySqlInsertTest_26_special extends MysqlTest { - public void test_insert_timestamp() throws Exception { String sql = "INSERT INTO SUNTEST(ID,NAME) VALUES(1,'\\_ASDFASDF')"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_27_str_concat.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_27_str_concat.java index 054b30419e..794b0d864a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_27_str_concat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_27_str_concat.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlInsertTest_27_str_concat extends MysqlTest { - public void test_insert_concat() throws Exception { String sql = "insert ignore into ktv_sms_test (cp) values ('a' 'b')"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_3.java index dd7f01bee7..ecd8b3c287 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_3.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_3 extends MysqlTest { - public void test_0() throws Exception { String sql = "INSERT INTO tbl_name (col1,col2) VALUES(col2*2,15);"; @@ -45,6 +44,6 @@ public void test_0() throws Exception { stmt.accept(visitor); Assert.assertEquals("INSERT INTO tbl_name (col1, col2)" + // - "\nVALUES (col2 * 2, 15);", SQLUtils.toMySqlString(insertStmt)); + "\nVALUES (col2 * 2, 15);", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_36.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_36.java index c4acea1925..b4356c6243 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_36.java @@ -29,7 +29,6 @@ import java.util.List; public class MySqlInsertTest_36 extends TestCase { - public void test_insert_0() throws Exception { String sql = "insert into -- @@@\n" + " tablex(id, value) -- @@@\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_4.java index 3e61b58f6e..4c3dee1fc7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_4.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_4 extends MysqlTest { - public void test_0() throws Exception { String sql = "INSERT INTO tbl_name (a,b,c) VALUES(1,2,3),(4,5,6),(7,8,9);"; @@ -49,8 +48,8 @@ public void test_0() throws Exception { stmt.accept(visitor); Assert.assertEquals("INSERT INTO tbl_name (a, b, c)" + // - "\nVALUES (1, 2, 3)," + - "\n\t(4, 5, 6)," + - "\n\t(7, 8, 9);", SQLUtils.toMySqlString(insertStmt)); + "\nVALUES (1, 2, 3)," + + "\n\t(4, 5, 6)," + + "\n\t(7, 8, 9);", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java index 944d8f6300..aa22809db7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlInsertTest_43 extends TestCase { - public void test_insert_0() throws Exception { String sql = "/*+engine=MPP, mppNativeInsertFromSelect=true*/\n" + "insert into adl_indication_ums_warehouse_ebax_a (sys_pk,sys_ds,sys_biztime,sys_gmt_modified,business_type,parcelled_order_num,warehouse_id)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_5.java index 8e16b51c12..a305e5009d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_5.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_5 extends MysqlTest { - public void test_0() throws Exception { String sql = "INSERT INTO tbl_name (a,b,c) VALUES(1,2,3,4,5,6,7,8,9);"; @@ -47,7 +46,7 @@ public void test_0() throws Exception { stmt.accept(visitor); Assert.assertEquals("INSERT INTO tbl_name (a, b, c)" + // - "\nVALUES (1, 2, 3, 4, 5" + // - "\n\t, 6, 7, 8, 9);", SQLUtils.toMySqlString(insertStmt)); + "\nVALUES (1, 2, 3, 4, 5" + // + "\n\t, 6, 7, 8, 9);", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_6.java index 90139b348c..4b895b0080 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_6.java @@ -27,11 +27,10 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_6 extends MysqlTest { - public void test_0() throws Exception { String sql = "insert into document(the_key,the_namespace,Gmt_create,Gmt_modify,Expired_time,the_value) " + // - "values (?,?,now(),now(),date_add(now(),interval ? second),?) " + // - "on duplicate key update Gmt_modify = values(Gmt_modify),Expired_time = values(Expired_time),the_value = values(the_value)"; + "values (?,?,now(),now(),date_add(now(),interval ? second),?) " + // + "on duplicate key update Gmt_modify = values(Gmt_modify),Expired_time = values(Expired_time),the_value = values(the_value)"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -49,18 +48,18 @@ public void test_0() throws Exception { stmt.accept(visitor); Assert.assertEquals("INSERT INTO document (the_key, the_namespace, Gmt_create, Gmt_modify, Expired_time" + // - "\n\t, the_value)" + // - "\nVALUES (?, ?, now(), now(), date_add(now(), INTERVAL ? SECOND)" + // - "\n\t, ?)" + // - "\nON DUPLICATE KEY UPDATE Gmt_modify = VALUES(Gmt_modify), Expired_time = VALUES(Expired_time), the_value = VALUES(the_value)", - SQLUtils.toMySqlString(insertStmt)); - + "\n\t, the_value)" + // + "\nVALUES (?, ?, now(), now(), date_add(now(), INTERVAL ? SECOND)" + // + "\n\t, ?)" + // + "\nON DUPLICATE KEY UPDATE Gmt_modify = VALUES(Gmt_modify), Expired_time = VALUES(Expired_time), the_value = VALUES(the_value)", + SQLUtils.toMySqlString(insertStmt)); + Assert.assertEquals("insert into document (the_key, the_namespace, Gmt_create, Gmt_modify, Expired_time" + // - "\n\t, the_value)" + // - "\nvalues (?, ?, now(), now(), date_add(now(), interval ? second)" + // - "\n\t, ?)" + // - "\non duplicate key update Gmt_modify = VALUES(Gmt_modify), Expired_time = VALUES(Expired_time), the_value = VALUES(the_value)", - SQLUtils.toMySqlString(insertStmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + "\n\t, the_value)" + // + "\nvalues (?, ?, now(), now(), date_add(now(), interval ? second)" + // + "\n\t, ?)" + // + "\non duplicate key update Gmt_modify = VALUES(Gmt_modify), Expired_time = VALUES(Expired_time), the_value = VALUES(the_value)", + SQLUtils.toMySqlString(insertStmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_7.java index 3f29a83eca..5e54a3ac4e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_7.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_7 extends MysqlTest { - public void test_0() throws Exception { String sql = "insert into Apply (applicant_id, applytime, applytype, approver_id, end, process, start) values (?, ?, ?, ?, ?, ?, ?)"; @@ -47,9 +46,9 @@ public void test_0() throws Exception { stmt.accept(visitor); Assert.assertEquals("INSERT INTO Apply (applicant_id, applytime, applytype, approver_id, end" + // - "\n\t, process, start)" + // - "\nVALUES (?, ?, ?, ?, ?" + // - "\n\t, ?, ?)", // - SQLUtils.toMySqlString(insertStmt)); + "\n\t, process, start)" + // + "\nVALUES (?, ?, ?, ?, ?" + // + "\n\t, ?, ?)", // + SQLUtils.toMySqlString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_8.java index 9d73b943c0..59b5448283 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_8.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_8 extends MysqlTest { - public void test_0() throws Exception { String sql = "insert into dd.table1(d,e) select * from bb.table3"; @@ -44,20 +43,20 @@ public void test_0() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals("INSERT INTO dd.table1 (d, e)" // - + "\nSELECT *" // - + "\nFROM bb.table3", // - SQLUtils.toMySqlString(insertStmt)); - + + "\nSELECT *" // + + "\nFROM bb.table3", // + SQLUtils.toMySqlString(insertStmt)); + Assert.assertEquals("insert into dd.table1 (d, e)" // - + "\nselect *" // - + "\nfrom bb.table3", // - SQLUtils.toMySqlString(insertStmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\nselect *" // + + "\nfrom bb.table3", // + SQLUtils.toMySqlString(insertStmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_9.java index 72ec8be47b..76b11bd88a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_9.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlInsertTest_9 extends MysqlTest { - public void test_0() throws Exception { String sql = "insert into sequence values('seq_wlb_order_log',268234128+10000000,now());"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_0.java index 6423d24515..cfec6c2e89 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_0.java @@ -24,18 +24,17 @@ import java.util.List; public class mysql_block_0 extends OracleTest { - public void test_0() throws Exception { String sql = "BEGIN;\n" + - "DELETE t0 FROM ktv_ind_columns t0 WHERE t0.dbid=?;\n" + - " INSERT INTO ktv_ind_columns(index_owner,index_name,table_owner,TABLE_NAME,COLUMN_NAME,column_position,column_length,descend,dbId,collection_time)\n" + - " SELECT DISTINCT index_owner,index_name,table_owner,TABLE_NAME,COLUMN_NAME,column_position,column_length,descend,dbId,now()\n" + - " FROM ktv_tmp_ind_columns WHERE dbid=?;\n" + - " COMMIT;"; // + "DELETE t0 FROM ktv_ind_columns t0 WHERE t0.dbid=?;\n" + + " INSERT INTO ktv_ind_columns(index_owner,index_name,table_owner,TABLE_NAME,COLUMN_NAME,column_position,column_length,descend,dbId,collection_time)\n" + + " SELECT DISTINCT index_owner,index_name,table_owner,TABLE_NAME,COLUMN_NAME,column_position,column_length,descend,dbId,now()\n" + + " FROM ktv_tmp_ind_columns WHERE dbid=?;\n" + + " COMMIT;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - assertEquals(1, statementList.size()); - SQLStatement stmt = statementList.get(0); + assertEquals(1, statementList.size()); + SQLStatement stmt = statementList.get(0); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); for (SQLStatement statement : statementList) { @@ -59,35 +58,35 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toMySqlString(stmt); - assertEquals("BEGIN;\n" + - "DELETE t0\n" + - "FROM ktv_ind_columns t0\n" + - "WHERE t0.dbid = ?;\n" + - "INSERT INTO ktv_ind_columns (index_owner, index_name, table_owner, TABLE_NAME, COLUMN_NAME\n" + - "\t, column_position, column_length, descend, dbId, collection_time)\n" + - "SELECT DISTINCT index_owner, index_name, table_owner, TABLE_NAME, COLUMN_NAME\n" + - "\t, column_position, column_length, descend, dbId, now()\n" + - "FROM ktv_tmp_ind_columns\n" + - "WHERE dbid = ?;\n" + - "COMMIT;", // - output); - } - { - String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("begin;\n" + - "delete t0\n" + - "from ktv_ind_columns t0\n" + - "where t0.dbid = ?;\n" + - "insert into ktv_ind_columns (index_owner, index_name, table_owner, TABLE_NAME, COLUMN_NAME\n" + - "\t, column_position, column_length, descend, dbId, collection_time)\n" + - "select distinct index_owner, index_name, table_owner, TABLE_NAME, COLUMN_NAME\n" + - "\t, column_position, column_length, descend, dbId, now()\n" + - "from ktv_tmp_ind_columns\n" + - "where dbid = ?;\n" + - "commit;", // - output); - } - } + { + String output = SQLUtils.toMySqlString(stmt); + assertEquals("BEGIN;\n" + + "DELETE t0\n" + + "FROM ktv_ind_columns t0\n" + + "WHERE t0.dbid = ?;\n" + + "INSERT INTO ktv_ind_columns (index_owner, index_name, table_owner, TABLE_NAME, COLUMN_NAME\n" + + "\t, column_position, column_length, descend, dbId, collection_time)\n" + + "SELECT DISTINCT index_owner, index_name, table_owner, TABLE_NAME, COLUMN_NAME\n" + + "\t, column_position, column_length, descend, dbId, now()\n" + + "FROM ktv_tmp_ind_columns\n" + + "WHERE dbid = ?;\n" + + "COMMIT;", // + output); + } + { + String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("begin;\n" + + "delete t0\n" + + "from ktv_ind_columns t0\n" + + "where t0.dbid = ?;\n" + + "insert into ktv_ind_columns (index_owner, index_name, table_owner, TABLE_NAME, COLUMN_NAME\n" + + "\t, column_position, column_length, descend, dbId, collection_time)\n" + + "select distinct index_owner, index_name, table_owner, TABLE_NAME, COLUMN_NAME\n" + + "\t, column_position, column_length, descend, dbId, now()\n" + + "from ktv_tmp_ind_columns\n" + + "where dbid = ?;\n" + + "commit;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_1.java index 6eedb36b3b..6cef85938d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_1.java @@ -24,31 +24,30 @@ import java.util.List; public class mysql_block_1 extends OracleTest { - public void test_0() throws Exception { String sql = "BEGIN;\n" + - " DELETE t0 FROM ktv_tmp_sqlarea t0 WHERE t0.dbid=?;\n" + - " INSERT INTO ktv_tmp_sqlarea(`dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,`cpu_time`,`buffer_gets`,`executions`,`command_name`,`sharable_mem`,`persiste\n" + - "nt_mem`,`users_opening`,`fetches`,`loads`,`disk_reads`,`direct_writes`,`command_type`,`plan_hash_value`,`action`,`remote`,`is_obsolete`,`physical_read_requests`,`\n" + - "physical_write_requests`,`elapsed_time`,`user_io_wait_time`,`collection_time`)\n" + - " SELECT `dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,sum(`cpu_time`),sum(`buffer_gets`),sum(`executions`),max(`command_name`),sum(`sharable_mem`),sum(`\n" + - "persistent_mem`),sum(`users_opening`),sum(`fetches`),sum(`loads`),sum(`disk_reads`),sum(`direct_writes`),max(`command_type`),max(`plan_hash_value`),max(`action`),\n" + - "max(`remote`),max(`is_obsolete`),sum(`physical_read_requests`),sum(`physical_write_requests`),sum(`elapsed_time`),sum(`user_io_wait_time`),max(`collection_time`)\n" + - " FROM ktv_sqlarea WHERE dbid=? GROUP BY sql_fulltext;\n" + - " DELETE FROM ktv_sqlarea WHERE dbid=?;\n" + - " INSERT INTO ktv_sqlarea(`dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,`cpu_time`,`buffer_gets`,`executions`,`command_name`,`sharable_mem`,`persistent_m\n" + - "em`,`users_opening`,`fetches`,`loads`,`disk_reads`,`direct_writes`,`command_type`,`plan_hash_value`,`action`,`remote`,`is_obsolete`,`physical_read_requests`,`phys\n" + - "ical_write_requests`,`elapsed_time`,`user_io_wait_time`,`collection_time`)\n" + - " SELECT `dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,`cpu_time`,`buffer_gets`,`executions`,`command_name`,`sharable_mem`,`persistent_mem`,`users_openin\n" + - "g`,`fetches`,`loads`,`disk_reads`,`direct_writes`,`command_type`,`plan_hash_value`,`action`,`remote`,`is_obsolete`,`physical_read_requests`,`physical_write_reques\n" + - "ts`,`elapsed_time`,`user_io_wait_time`,`collection_time`\n" + - " FROM ktv_tmp_sqlarea WHERE dbid=? and sql_fulltext is not null;\n" + - " COMMIT;\n" + - " DELETE FROM ktv_tmp_sqlarea WHERE dbid=?;"; // + " DELETE t0 FROM ktv_tmp_sqlarea t0 WHERE t0.dbid=?;\n" + + " INSERT INTO ktv_tmp_sqlarea(`dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,`cpu_time`,`buffer_gets`,`executions`,`command_name`,`sharable_mem`,`persiste\n" + + "nt_mem`,`users_opening`,`fetches`,`loads`,`disk_reads`,`direct_writes`,`command_type`,`plan_hash_value`,`action`,`remote`,`is_obsolete`,`physical_read_requests`,`\n" + + "physical_write_requests`,`elapsed_time`,`user_io_wait_time`,`collection_time`)\n" + + " SELECT `dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,sum(`cpu_time`),sum(`buffer_gets`),sum(`executions`),max(`command_name`),sum(`sharable_mem`),sum(`\n" + + "persistent_mem`),sum(`users_opening`),sum(`fetches`),sum(`loads`),sum(`disk_reads`),sum(`direct_writes`),max(`command_type`),max(`plan_hash_value`),max(`action`),\n" + + "max(`remote`),max(`is_obsolete`),sum(`physical_read_requests`),sum(`physical_write_requests`),sum(`elapsed_time`),sum(`user_io_wait_time`),max(`collection_time`)\n" + + " FROM ktv_sqlarea WHERE dbid=? GROUP BY sql_fulltext;\n" + + " DELETE FROM ktv_sqlarea WHERE dbid=?;\n" + + " INSERT INTO ktv_sqlarea(`dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,`cpu_time`,`buffer_gets`,`executions`,`command_name`,`sharable_mem`,`persistent_m\n" + + "em`,`users_opening`,`fetches`,`loads`,`disk_reads`,`direct_writes`,`command_type`,`plan_hash_value`,`action`,`remote`,`is_obsolete`,`physical_read_requests`,`phys\n" + + "ical_write_requests`,`elapsed_time`,`user_io_wait_time`,`collection_time`)\n" + + " SELECT `dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,`cpu_time`,`buffer_gets`,`executions`,`command_name`,`sharable_mem`,`persistent_mem`,`users_openin\n" + + "g`,`fetches`,`loads`,`disk_reads`,`direct_writes`,`command_type`,`plan_hash_value`,`action`,`remote`,`is_obsolete`,`physical_read_requests`,`physical_write_reques\n" + + "ts`,`elapsed_time`,`user_io_wait_time`,`collection_time`\n" + + " FROM ktv_tmp_sqlarea WHERE dbid=? and sql_fulltext is not null;\n" + + " COMMIT;\n" + + " DELETE FROM ktv_tmp_sqlarea WHERE dbid=?;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - assertEquals(2, statementList.size()); - SQLStatement stmt = statementList.get(0); + assertEquals(2, statementList.size()); + SQLStatement stmt = statementList.get(0); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); for (SQLStatement statement : statementList) { @@ -72,107 +71,107 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toMySqlString(stmt); - assertEquals("BEGIN;\n" + - "DELETE t0\n" + - "FROM ktv_tmp_sqlarea t0\n" + - "WHERE t0.dbid = ?;\n" + - "INSERT INTO ktv_tmp_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + - "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persiste\n" + - "nt_mem`\n" + - "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + - "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + - "\t, `physical_read_requests`, `\n" + - "physical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + - "SELECT `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`\n" + - "\t, sum(`cpu_time`), sum(`buffer_gets`)\n" + - "\t, sum(`executions`), max(`command_name`)\n" + - "\t, sum(`sharable_mem`), sum(`\n" + - "persistent_mem`)\n" + - "\t, sum(`users_opening`), sum(`fetches`)\n" + - "\t, sum(`loads`), sum(`disk_reads`)\n" + - "\t, sum(`direct_writes`), max(`command_type`)\n" + - "\t, max(`plan_hash_value`), max(`action`)\n" + - "\t, max(`remote`), max(`is_obsolete`)\n" + - "\t, sum(`physical_read_requests`), sum(`physical_write_requests`)\n" + - "\t, sum(`elapsed_time`), sum(`user_io_wait_time`)\n" + - "\t, max(`collection_time`)\n" + - "FROM ktv_sqlarea\n" + - "WHERE dbid = ?\n" + - "GROUP BY sql_fulltext;\n" + - "DELETE FROM ktv_sqlarea\n" + - "WHERE dbid = ?;\n" + - "INSERT INTO ktv_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + - "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_m\n" + - "em`\n" + - "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + - "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + - "\t, `physical_read_requests`, `phys\n" + - "ical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + - "SELECT `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + - "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_mem`\n" + - "\t, `users_openin\n" + - "g`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + - "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + - "\t, `physical_read_requests`, `physical_write_reques\n" + - "ts`, `elapsed_time`, `user_io_wait_time`, `collection_time`\n" + - "FROM ktv_tmp_sqlarea\n" + - "WHERE dbid = ?\n" + - "\tAND sql_fulltext IS NOT NULL;\n" + - "COMMIT;", // - output); - } - { - String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("begin;\n" + - "delete t0\n" + - "from ktv_tmp_sqlarea t0\n" + - "where t0.dbid = ?;\n" + - "insert into ktv_tmp_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + - "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persiste\n" + - "nt_mem`\n" + - "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + - "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + - "\t, `physical_read_requests`, `\n" + - "physical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + - "select `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`\n" + - "\t, sum(`cpu_time`), sum(`buffer_gets`)\n" + - "\t, sum(`executions`), max(`command_name`)\n" + - "\t, sum(`sharable_mem`), sum(`\n" + - "persistent_mem`)\n" + - "\t, sum(`users_opening`), sum(`fetches`)\n" + - "\t, sum(`loads`), sum(`disk_reads`)\n" + - "\t, sum(`direct_writes`), max(`command_type`)\n" + - "\t, max(`plan_hash_value`), max(`action`)\n" + - "\t, max(`remote`), max(`is_obsolete`)\n" + - "\t, sum(`physical_read_requests`), sum(`physical_write_requests`)\n" + - "\t, sum(`elapsed_time`), sum(`user_io_wait_time`)\n" + - "\t, max(`collection_time`)\n" + - "from ktv_sqlarea\n" + - "where dbid = ?\n" + - "group by sql_fulltext;\n" + - "delete from ktv_sqlarea\n" + - "where dbid = ?;\n" + - "insert into ktv_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + - "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_m\n" + - "em`\n" + - "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + - "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + - "\t, `physical_read_requests`, `phys\n" + - "ical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + - "select `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + - "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_mem`\n" + - "\t, `users_openin\n" + - "g`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + - "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + - "\t, `physical_read_requests`, `physical_write_reques\n" + - "ts`, `elapsed_time`, `user_io_wait_time`, `collection_time`\n" + - "from ktv_tmp_sqlarea\n" + - "where dbid = ?\n" + - "\tand sql_fulltext is not null;\n" + - "commit;", // - output); - } - } + { + String output = SQLUtils.toMySqlString(stmt); + assertEquals("BEGIN;\n" + + "DELETE t0\n" + + "FROM ktv_tmp_sqlarea t0\n" + + "WHERE t0.dbid = ?;\n" + + "INSERT INTO ktv_tmp_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + + "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persiste\n" + + "nt_mem`\n" + + "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + + "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + + "\t, `physical_read_requests`, `\n" + + "physical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + + "SELECT `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`\n" + + "\t, sum(`cpu_time`), sum(`buffer_gets`)\n" + + "\t, sum(`executions`), max(`command_name`)\n" + + "\t, sum(`sharable_mem`), sum(`\n" + + "persistent_mem`)\n" + + "\t, sum(`users_opening`), sum(`fetches`)\n" + + "\t, sum(`loads`), sum(`disk_reads`)\n" + + "\t, sum(`direct_writes`), max(`command_type`)\n" + + "\t, max(`plan_hash_value`), max(`action`)\n" + + "\t, max(`remote`), max(`is_obsolete`)\n" + + "\t, sum(`physical_read_requests`), sum(`physical_write_requests`)\n" + + "\t, sum(`elapsed_time`), sum(`user_io_wait_time`)\n" + + "\t, max(`collection_time`)\n" + + "FROM ktv_sqlarea\n" + + "WHERE dbid = ?\n" + + "GROUP BY sql_fulltext;\n" + + "DELETE FROM ktv_sqlarea\n" + + "WHERE dbid = ?;\n" + + "INSERT INTO ktv_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + + "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_m\n" + + "em`\n" + + "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + + "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + + "\t, `physical_read_requests`, `phys\n" + + "ical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + + "SELECT `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + + "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_mem`\n" + + "\t, `users_openin\n" + + "g`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + + "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + + "\t, `physical_read_requests`, `physical_write_reques\n" + + "ts`, `elapsed_time`, `user_io_wait_time`, `collection_time`\n" + + "FROM ktv_tmp_sqlarea\n" + + "WHERE dbid = ?\n" + + "\tAND sql_fulltext IS NOT NULL;\n" + + "COMMIT;", // + output); + } + { + String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("begin;\n" + + "delete t0\n" + + "from ktv_tmp_sqlarea t0\n" + + "where t0.dbid = ?;\n" + + "insert into ktv_tmp_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + + "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persiste\n" + + "nt_mem`\n" + + "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + + "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + + "\t, `physical_read_requests`, `\n" + + "physical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + + "select `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`\n" + + "\t, sum(`cpu_time`), sum(`buffer_gets`)\n" + + "\t, sum(`executions`), max(`command_name`)\n" + + "\t, sum(`sharable_mem`), sum(`\n" + + "persistent_mem`)\n" + + "\t, sum(`users_opening`), sum(`fetches`)\n" + + "\t, sum(`loads`), sum(`disk_reads`)\n" + + "\t, sum(`direct_writes`), max(`command_type`)\n" + + "\t, max(`plan_hash_value`), max(`action`)\n" + + "\t, max(`remote`), max(`is_obsolete`)\n" + + "\t, sum(`physical_read_requests`), sum(`physical_write_requests`)\n" + + "\t, sum(`elapsed_time`), sum(`user_io_wait_time`)\n" + + "\t, max(`collection_time`)\n" + + "from ktv_sqlarea\n" + + "where dbid = ?\n" + + "group by sql_fulltext;\n" + + "delete from ktv_sqlarea\n" + + "where dbid = ?;\n" + + "insert into ktv_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + + "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_m\n" + + "em`\n" + + "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + + "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + + "\t, `physical_read_requests`, `phys\n" + + "ical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + + "select `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + + "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_mem`\n" + + "\t, `users_openin\n" + + "g`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + + "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + + "\t, `physical_read_requests`, `physical_write_reques\n" + + "ts`, `elapsed_time`, `user_io_wait_time`, `collection_time`\n" + + "from ktv_tmp_sqlarea\n" + + "where dbid = ?\n" + + "\tand sql_fulltext is not null;\n" + + "commit;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_2.java index b69cd1cacc..2c98f0e948 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_2.java @@ -24,31 +24,30 @@ import java.util.List; public class mysql_block_2 extends OracleTest { - public void test_0() throws Exception { String sql = "BEGIN;\n" + - " DELETE t0 FROM ktv_tmp_sqlarea t0 WHERE t0.dbid=?;\n" + - " INSERT INTO ktv_tmp_sqlarea(`dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,`cpu_time`,`buffer_gets`,`executions`,`command_name`,`sharable_mem`,`persiste\n" + - "nt_mem`,`users_opening`,`fetches`,`loads`,`disk_reads`,`direct_writes`,`command_type`,`plan_hash_value`,`action`,`remote`,`is_obsolete`,`physical_read_requests`,`\n" + - "physical_write_requests`,`elapsed_time`,`user_io_wait_time`,`collection_time`)\n" + - " SELECT `dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,sum(`cpu_time`),sum(`buffer_gets`),sum(`executions`),max(`command_name`),sum(`sharable_mem`),sum(`\n" + - "persistent_mem`),sum(`users_opening`),sum(`fetches`),sum(`loads`),sum(`disk_reads`),sum(`direct_writes`),max(`command_type`),max(`plan_hash_value`),max(`action`),\n" + - "max(`remote`),max(`is_obsolete`),sum(`physical_read_requests`),sum(`physical_write_requests`),sum(`elapsed_time`),sum(`user_io_wait_time`),max(`collection_time`)\n" + - " FROM ktv_sqlarea WHERE dbid=? GROUP BY sql_fulltext;\n" + - " DELETE FROM ktv_sqlarea WHERE dbid=?;\n" + - " INSERT INTO ktv_sqlarea(`dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,`cpu_time`,`buffer_gets`,`executions`,`command_name`,`sharable_mem`,`persistent_m\n" + - "em`,`users_opening`,`fetches`,`loads`,`disk_reads`,`direct_writes`,`command_type`,`plan_hash_value`,`action`,`remote`,`is_obsolete`,`physical_read_requests`,`phys\n" + - "ical_write_requests`,`elapsed_time`,`user_io_wait_time`,`collection_time`)\n" + - " SELECT `dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,`cpu_time`,`buffer_gets`,`executions`,`command_name`,`sharable_mem`,`persistent_mem`,`users_openin\n" + - "g`,`fetches`,`loads`,`disk_reads`,`direct_writes`,`command_type`,`plan_hash_value`,`action`,`remote`,`is_obsolete`,`physical_read_requests`,`physical_write_reques\n" + - "ts`,`elapsed_time`,`user_io_wait_time`,`collection_time`\n" + - " FROM ktv_tmp_sqlarea WHERE dbid=? and sql_fulltext is not null;\n" + - " ROLLBACK;\n" + - " DELETE FROM ktv_tmp_sqlarea WHERE dbid=?;"; // + " DELETE t0 FROM ktv_tmp_sqlarea t0 WHERE t0.dbid=?;\n" + + " INSERT INTO ktv_tmp_sqlarea(`dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,`cpu_time`,`buffer_gets`,`executions`,`command_name`,`sharable_mem`,`persiste\n" + + "nt_mem`,`users_opening`,`fetches`,`loads`,`disk_reads`,`direct_writes`,`command_type`,`plan_hash_value`,`action`,`remote`,`is_obsolete`,`physical_read_requests`,`\n" + + "physical_write_requests`,`elapsed_time`,`user_io_wait_time`,`collection_time`)\n" + + " SELECT `dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,sum(`cpu_time`),sum(`buffer_gets`),sum(`executions`),max(`command_name`),sum(`sharable_mem`),sum(`\n" + + "persistent_mem`),sum(`users_opening`),sum(`fetches`),sum(`loads`),sum(`disk_reads`),sum(`direct_writes`),max(`command_type`),max(`plan_hash_value`),max(`action`),\n" + + "max(`remote`),max(`is_obsolete`),sum(`physical_read_requests`),sum(`physical_write_requests`),sum(`elapsed_time`),sum(`user_io_wait_time`),max(`collection_time`)\n" + + " FROM ktv_sqlarea WHERE dbid=? GROUP BY sql_fulltext;\n" + + " DELETE FROM ktv_sqlarea WHERE dbid=?;\n" + + " INSERT INTO ktv_sqlarea(`dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,`cpu_time`,`buffer_gets`,`executions`,`command_name`,`sharable_mem`,`persistent_m\n" + + "em`,`users_opening`,`fetches`,`loads`,`disk_reads`,`direct_writes`,`command_type`,`plan_hash_value`,`action`,`remote`,`is_obsolete`,`physical_read_requests`,`phys\n" + + "ical_write_requests`,`elapsed_time`,`user_io_wait_time`,`collection_time`)\n" + + " SELECT `dbid`,`sql_id`,`parsing_schema_name`,`sql_fulltext`,`cpu_time`,`buffer_gets`,`executions`,`command_name`,`sharable_mem`,`persistent_mem`,`users_openin\n" + + "g`,`fetches`,`loads`,`disk_reads`,`direct_writes`,`command_type`,`plan_hash_value`,`action`,`remote`,`is_obsolete`,`physical_read_requests`,`physical_write_reques\n" + + "ts`,`elapsed_time`,`user_io_wait_time`,`collection_time`\n" + + " FROM ktv_tmp_sqlarea WHERE dbid=? and sql_fulltext is not null;\n" + + " ROLLBACK;\n" + + " DELETE FROM ktv_tmp_sqlarea WHERE dbid=?;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - assertEquals(2, statementList.size()); - SQLStatement stmt = statementList.get(0); + assertEquals(2, statementList.size()); + SQLStatement stmt = statementList.get(0); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); for (SQLStatement statement : statementList) { @@ -72,107 +71,107 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toMySqlString(stmt); - assertEquals("BEGIN;\n" + - "DELETE t0\n" + - "FROM ktv_tmp_sqlarea t0\n" + - "WHERE t0.dbid = ?;\n" + - "INSERT INTO ktv_tmp_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + - "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persiste\n" + - "nt_mem`\n" + - "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + - "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + - "\t, `physical_read_requests`, `\n" + - "physical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + - "SELECT `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`\n" + - "\t, sum(`cpu_time`), sum(`buffer_gets`)\n" + - "\t, sum(`executions`), max(`command_name`)\n" + - "\t, sum(`sharable_mem`), sum(`\n" + - "persistent_mem`)\n" + - "\t, sum(`users_opening`), sum(`fetches`)\n" + - "\t, sum(`loads`), sum(`disk_reads`)\n" + - "\t, sum(`direct_writes`), max(`command_type`)\n" + - "\t, max(`plan_hash_value`), max(`action`)\n" + - "\t, max(`remote`), max(`is_obsolete`)\n" + - "\t, sum(`physical_read_requests`), sum(`physical_write_requests`)\n" + - "\t, sum(`elapsed_time`), sum(`user_io_wait_time`)\n" + - "\t, max(`collection_time`)\n" + - "FROM ktv_sqlarea\n" + - "WHERE dbid = ?\n" + - "GROUP BY sql_fulltext;\n" + - "DELETE FROM ktv_sqlarea\n" + - "WHERE dbid = ?;\n" + - "INSERT INTO ktv_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + - "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_m\n" + - "em`\n" + - "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + - "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + - "\t, `physical_read_requests`, `phys\n" + - "ical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + - "SELECT `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + - "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_mem`\n" + - "\t, `users_openin\n" + - "g`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + - "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + - "\t, `physical_read_requests`, `physical_write_reques\n" + - "ts`, `elapsed_time`, `user_io_wait_time`, `collection_time`\n" + - "FROM ktv_tmp_sqlarea\n" + - "WHERE dbid = ?\n" + - "\tAND sql_fulltext IS NOT NULL;\n" + - "ROLLBACK;", // - output); - } - { - String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("begin;\n" + - "delete t0\n" + - "from ktv_tmp_sqlarea t0\n" + - "where t0.dbid = ?;\n" + - "insert into ktv_tmp_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + - "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persiste\n" + - "nt_mem`\n" + - "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + - "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + - "\t, `physical_read_requests`, `\n" + - "physical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + - "select `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`\n" + - "\t, sum(`cpu_time`), sum(`buffer_gets`)\n" + - "\t, sum(`executions`), max(`command_name`)\n" + - "\t, sum(`sharable_mem`), sum(`\n" + - "persistent_mem`)\n" + - "\t, sum(`users_opening`), sum(`fetches`)\n" + - "\t, sum(`loads`), sum(`disk_reads`)\n" + - "\t, sum(`direct_writes`), max(`command_type`)\n" + - "\t, max(`plan_hash_value`), max(`action`)\n" + - "\t, max(`remote`), max(`is_obsolete`)\n" + - "\t, sum(`physical_read_requests`), sum(`physical_write_requests`)\n" + - "\t, sum(`elapsed_time`), sum(`user_io_wait_time`)\n" + - "\t, max(`collection_time`)\n" + - "from ktv_sqlarea\n" + - "where dbid = ?\n" + - "group by sql_fulltext;\n" + - "delete from ktv_sqlarea\n" + - "where dbid = ?;\n" + - "insert into ktv_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + - "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_m\n" + - "em`\n" + - "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + - "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + - "\t, `physical_read_requests`, `phys\n" + - "ical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + - "select `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + - "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_mem`\n" + - "\t, `users_openin\n" + - "g`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + - "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + - "\t, `physical_read_requests`, `physical_write_reques\n" + - "ts`, `elapsed_time`, `user_io_wait_time`, `collection_time`\n" + - "from ktv_tmp_sqlarea\n" + - "where dbid = ?\n" + - "\tand sql_fulltext is not null;\n" + - "rollback;", // - output); - } - } + { + String output = SQLUtils.toMySqlString(stmt); + assertEquals("BEGIN;\n" + + "DELETE t0\n" + + "FROM ktv_tmp_sqlarea t0\n" + + "WHERE t0.dbid = ?;\n" + + "INSERT INTO ktv_tmp_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + + "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persiste\n" + + "nt_mem`\n" + + "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + + "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + + "\t, `physical_read_requests`, `\n" + + "physical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + + "SELECT `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`\n" + + "\t, sum(`cpu_time`), sum(`buffer_gets`)\n" + + "\t, sum(`executions`), max(`command_name`)\n" + + "\t, sum(`sharable_mem`), sum(`\n" + + "persistent_mem`)\n" + + "\t, sum(`users_opening`), sum(`fetches`)\n" + + "\t, sum(`loads`), sum(`disk_reads`)\n" + + "\t, sum(`direct_writes`), max(`command_type`)\n" + + "\t, max(`plan_hash_value`), max(`action`)\n" + + "\t, max(`remote`), max(`is_obsolete`)\n" + + "\t, sum(`physical_read_requests`), sum(`physical_write_requests`)\n" + + "\t, sum(`elapsed_time`), sum(`user_io_wait_time`)\n" + + "\t, max(`collection_time`)\n" + + "FROM ktv_sqlarea\n" + + "WHERE dbid = ?\n" + + "GROUP BY sql_fulltext;\n" + + "DELETE FROM ktv_sqlarea\n" + + "WHERE dbid = ?;\n" + + "INSERT INTO ktv_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + + "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_m\n" + + "em`\n" + + "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + + "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + + "\t, `physical_read_requests`, `phys\n" + + "ical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + + "SELECT `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + + "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_mem`\n" + + "\t, `users_openin\n" + + "g`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + + "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + + "\t, `physical_read_requests`, `physical_write_reques\n" + + "ts`, `elapsed_time`, `user_io_wait_time`, `collection_time`\n" + + "FROM ktv_tmp_sqlarea\n" + + "WHERE dbid = ?\n" + + "\tAND sql_fulltext IS NOT NULL;\n" + + "ROLLBACK;", // + output); + } + { + String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("begin;\n" + + "delete t0\n" + + "from ktv_tmp_sqlarea t0\n" + + "where t0.dbid = ?;\n" + + "insert into ktv_tmp_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + + "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persiste\n" + + "nt_mem`\n" + + "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + + "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + + "\t, `physical_read_requests`, `\n" + + "physical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + + "select `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`\n" + + "\t, sum(`cpu_time`), sum(`buffer_gets`)\n" + + "\t, sum(`executions`), max(`command_name`)\n" + + "\t, sum(`sharable_mem`), sum(`\n" + + "persistent_mem`)\n" + + "\t, sum(`users_opening`), sum(`fetches`)\n" + + "\t, sum(`loads`), sum(`disk_reads`)\n" + + "\t, sum(`direct_writes`), max(`command_type`)\n" + + "\t, max(`plan_hash_value`), max(`action`)\n" + + "\t, max(`remote`), max(`is_obsolete`)\n" + + "\t, sum(`physical_read_requests`), sum(`physical_write_requests`)\n" + + "\t, sum(`elapsed_time`), sum(`user_io_wait_time`)\n" + + "\t, max(`collection_time`)\n" + + "from ktv_sqlarea\n" + + "where dbid = ?\n" + + "group by sql_fulltext;\n" + + "delete from ktv_sqlarea\n" + + "where dbid = ?;\n" + + "insert into ktv_sqlarea (`dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + + "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_m\n" + + "em`\n" + + "\t, `users_opening`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + + "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + + "\t, `physical_read_requests`, `phys\n" + + "ical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + + "select `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`, `cpu_time`\n" + + "\t, `buffer_gets`, `executions`, `command_name`, `sharable_mem`, `persistent_mem`\n" + + "\t, `users_openin\n" + + "g`, `fetches`, `loads`, `disk_reads`, `direct_writes`\n" + + "\t, `command_type`, `plan_hash_value`, `action`, `remote`, `is_obsolete`\n" + + "\t, `physical_read_requests`, `physical_write_reques\n" + + "ts`, `elapsed_time`, `user_io_wait_time`, `collection_time`\n" + + "from ktv_tmp_sqlarea\n" + + "where dbid = ?\n" + + "\tand sql_fulltext is not null;\n" + + "rollback;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySQLParameterizedTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySQLParameterizedTest.java index 41a20d7cb7..913b64b450 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySQLParameterizedTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySQLParameterizedTest.java @@ -31,9 +31,7 @@ import java.util.List; public class MySQLParameterizedTest extends TestCase { - public void test() { - } void paramaterizeAST(String sql, String expected) { @@ -43,7 +41,6 @@ void paramaterizeAST(String sql, String expected) { } void validate(String sql, String expect) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -60,7 +57,6 @@ void validate(String sql, String expect) { } void validateOracle(String sql, String expect) { - OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParamTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParamTest.java index f19f6ab474..c790a70fd7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParamTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParamTest.java @@ -11,7 +11,7 @@ import java.util.List; public class MySqlParamTest extends TestCase { - public final static DbType dbType = JdbcConstants.MYSQL; + public static final DbType dbType = JdbcConstants.MYSQL; public void test_for_mysql_param() throws Exception { String sql = "/* 0b853c4a26094480140194289e3d24/0.1.1.2.1//2e3b9cf7/ */select `miller_cart`.`CART_ID`,`miller_cart`.`SKU_ID`,`miller_cart`.`ITEM_ID`,`miller_cart`.`QUANTITY`,`miller_cart`.`USER_ID`,`miller_cart`.`SELLER_ID`,`miller_cart`.`STATUS`,`miller_cart`.`EXT_STATUS`,`miller_cart`.`TYPE`,`miller_cart`.`SUB_TYPE`,`miller_cart`.`GMT_CREATE`,`miller_cart`.`GMT_MODIFIED`,`miller_cart`.`ATTRIBUTE`,`miller_cart`.`ATTRIBUTE_CC`,`miller_cart`.`EX2` from `miller_cart_0304` `miller_cart` where ((`miller_cart`.`USER_ID` = 2732851504) AND ((`miller_cart`.`STATUS` = 1) AND (`miller_cart`.`TYPE` IN (0,5,10)))) limit 0,200"; @@ -19,7 +19,6 @@ public void test_for_mysql_param() throws Exception { long hash2 = FnvHash.fnv1a_64_lower(ParameterizedOutputVisitorUtils.parameterize(sql, dbType)); assertEquals(hash1, hash2); - SQLSelectListCache cache = new SQLSelectListCache(dbType); cache.add("select `miller_cart`.`CART_ID`,`miller_cart`.`SKU_ID`,`miller_cart`.`ITEM_ID`,`miller_cart`.`QUANTITY`,`miller_cart`.`USER_ID`,`miller_cart`.`SELLER_ID`,`miller_cart`.`STATUS`,`miller_cart`.`EXT_STATUS`,`miller_cart`.`TYPE`,`miller_cart`.`SUB_TYPE`,`miller_cart`.`GMT_CREATE`,`miller_cart`.`GMT_MODIFIED`,`miller_cart`.`ATTRIBUTE`,`miller_cart`.`ATTRIBUTE_CC`,`miller_cart`.`EX2` from"); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest.java index 0c62f2be28..4aa0a67d5b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest.java @@ -35,14 +35,13 @@ public void test_3() throws Exception { validate("SELECT * FROM T WHERE ID = ? OR ID = ?", "SELECT *\nFROM T\nWHERE ID = ?"); validate("SELECT * FROM T WHERE A.ID = ? OR A.ID = ?", "SELECT *\nFROM T\nWHERE A.ID = ?"); validate("SELECT * FROM T WHERE 1 = 0 OR a.id = ? OR a.id = ? OR a.id = ? OR a.id = ?", - "SELECT *\nFROM T\nWHERE 1 = 0\n\tOR a.id = ?"); + "SELECT *\nFROM T\nWHERE 1 = 0\n\tOR a.id = ?"); validateOracle("SELECT * FROM T WHERE 1 = 0 OR a.id = ? OR a.id = ? OR a.id = ? OR a.id = ?", - "SELECT *\nFROM T\nWHERE 1 = 0\n\tOR a.id = ?"); + "SELECT *\nFROM T\nWHERE 1 = 0\n\tOR a.id = ?"); validateOracle("SELECT * FROM T WHERE A.ID = ? OR A.ID = ?", "SELECT *\nFROM T\nWHERE A.ID = ?"); validate("INSERT INTO T (F1, F2) VALUES(?, ?), (?, ?), (?, ?)", "INSERT INTO T (F1, F2)\nVALUES (?, ?)"); validate("update net_device d, sys_user u set d.resp_user_id=u.id where d.resp_user_login_name=u.username and d.id in (42354)", // - "UPDATE net_device d, sys_user u\nSET d.resp_user_id = u.id\nWHERE d.resp_user_login_name = u.username\n\tAND d.id IN (?)"); - + "UPDATE net_device d, sys_user u\nSET d.resp_user_id = u.id\nWHERE d.resp_user_login_name = u.username\n\tAND d.id IN (?)"); paramaterizeAST("SELECT * FROM T WHERE ID = ? OR ID = ?", "SELECT *\n" + "FROM T\n" + @@ -55,13 +54,13 @@ public void test_3() throws Exception { "\tOR A.ID = ?"); paramaterizeAST("SELECT * FROM T WHERE 1 = 0 OR a.id = ? OR a.id = ? OR a.id = ? OR a.id = ?", - "SELECT *\n" + - "FROM T\n" + - "WHERE ? = ?\n" + - "\tOR a.id = ?\n" + - "\tOR a.id = ?\n" + - "\tOR a.id = ?\n" + - "\tOR a.id = ?"); + "SELECT *\n" + + "FROM T\n" + + "WHERE ? = ?\n" + + "\tOR a.id = ?\n" + + "\tOR a.id = ?\n" + + "\tOR a.id = ?\n" + + "\tOR a.id = ?"); paramaterizeAST("INSERT INTO T (F1, F2) VALUES(?, ?), (?, ?), (?, ?)", "INSERT INTO T (F1, F2)\n" + "VALUES (?, ?),\n" + @@ -69,6 +68,6 @@ public void test_3() throws Exception { "\t(?, ?)"); paramaterizeAST("update net_device d, sys_user u set d.resp_user_id=u.id where d.resp_user_login_name=u.username and d.id in (42354)", // - "UPDATE net_device d, sys_user u\nSET d.resp_user_id = u.id\nWHERE d.resp_user_login_name = u.username\n\tAND d.id IN (?)"); + "UPDATE net_device d, sys_user u\nSET d.resp_user_id = u.id\nWHERE d.resp_user_login_name = u.username\n\tAND d.id IN (?)"); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest2.java index f7bc09d3a0..dda5cdde40 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest2.java @@ -16,7 +16,6 @@ package com.alibaba.druid.bvt.sql.mysql.param; public class MySqlParameterizedOutputVisitorTest2 extends MySQLParameterizedTest { - public void test_0() throws Exception { String sql = "SELECT * FROM T WHERE ID = ?"; for (int i = 0; i < 100; ++i) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_1.java index e675f28171..49a4c17f47 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_1.java @@ -21,7 +21,6 @@ import org.junit.Assert; public class MySqlParameterizedOutputVisitorTest_1 extends MySQLParameterizedTest { - public void test_0() throws Exception { String sql = "SELECT * FROM T WHERE ID IN (?)"; Assert.assertSame(ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL), sql); @@ -53,7 +52,7 @@ public void test_1() throws Exception { "FROM T\n" + "WHERE ID = ?"); } - + public void test_2() throws Exception { String sql = "SELECT * FROM T WHERE ID = ? AND Name = ?"; Assert.assertSame(ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL), sql); @@ -70,7 +69,7 @@ public void test_2() throws Exception { "WHERE ID = ?\n" + "\tAND Name = ?"); } - + public void test_3() throws Exception { String sql = "SELECT * FROM T WHERE ID IS NULL"; Assert.assertSame(ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL), sql); @@ -86,7 +85,7 @@ public void test_3() throws Exception { "FROM T\n" + "WHERE ID IS NULL"); } - + public void test_4() throws Exception { String sql = "INSERT INTO T (FID, FNAME) VALUES(?, ?)"; Assert.assertSame(ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL), sql); @@ -101,7 +100,7 @@ public void test_4() throws Exception { paramaterizeAST(sql, "INSERT INTO T (FID, FNAME)\n" + "VALUES (?, ?)"); } - + public void test_mysql() throws Exception { String sql = "INSERT INTO T (FID, FNAME) VALUES(?, ?), (?, ?)"; Assert.assertNotSame(ParameterizedOutputVisitorUtils.parameterize(sql, DbType.mysql), sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_16.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_16.java index 438ffd1aa1..282eb3559f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_16.java @@ -40,8 +40,6 @@ public void test_for_parameterize() throws Exception { "\t, ?, ?, ?, ?, ?\n" + "\t, ?, ?, ?, ?, ?)", psql); - - StringBuilder out = new StringBuilder(); ExportParameterVisitor visitor = new MySqlExportParameterVisitor(out); for (SQLStatement stmt : stmtList) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_3.java index d5ba2b8802..d5089aca66 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_3.java @@ -23,7 +23,7 @@ public class MySqlParameterizedOutputVisitorTest_3 extends com.alibaba.druid.bvt protected void setUp() throws Exception { System.setProperty("fastsql.parameterized.shardingSupport", "false"); } - + protected void tearDown() throws Exception { System.clearProperty("fastsql.parameterized.shardingSupport"); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_30.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_30.java index 954267cbbd..524a8d533e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_30.java @@ -20,7 +20,6 @@ public class MySqlParameterizedOutputVisitorTest_30 extends TestCase { public void test_for_parameterize() throws Exception { final DbType dbType = JdbcConstants.MYSQL; - String sql = "/* 0a67bca314863468702364451e/0.3// */select `udata`.`id` as `id`,`udata`.`gmt_create` as `gmtCreate`,`udata`.`gmt_modified` as `gmtModified`,`udata`.`uid` as `userId`,`udata`.`user_nick` as `userNick`,`udata`.`user_type` as `userType`,`udata`.`aps` as `acPeSe`,`udata`.`rn` as `rn`,`udata`.`start_period_time` as `startPeriodTime`,`udata`.`ept` as `adTm`,`udata`.`status` as `status`,`udata`.`charging_period` as `chargingPeriod`,`udata`.`sn` as `sn`,`udata`.`cpd` as `chargingPeriodDesc`,`udata`.`task_total_num` as `taskTotalNum`,`udata`.`tcn` as `taCoNu`,`udata`.`task_type` as `taskType`,`udata`.`ilbu` as `isLaBiUs`" + " from `udata_0888` `udata` where ((`udata`.`id` IN (" + " (select MAX(`udata`.`id`) " + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_31.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_31.java index 510f16b3a4..fb15e0eff3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_31.java @@ -20,7 +20,6 @@ public class MySqlParameterizedOutputVisitorTest_31 extends TestCase { public void test_for_parameterize() throws Exception { final DbType dbType = JdbcConstants.MYSQL; - String sql = "/* 0a67bca314863468702364451e/0.3// */select `udata`.`id` as `id`,`udata`.`gmt_create` as `gmtCreate`,`udata`.`gmt_modified` as `gmtModified`,`udata`.`uid` as `userId`,`udata`.`user_nick` as `userNick`,`udata`.`user_type` as `userType`,`udata`.`aps` as `acPeSe`,`udata`.`rn` as `rn`,`udata`.`start_period_time` as `startPeriodTime`,`udata`.`ept` as `adTm`,`udata`.`status` as `status`,`udata`.`charging_period` as `chargingPeriod`,`udata`.`sn` as `sn`,`udata`.`cpd` as `chargingPeriodDesc`,`udata`.`task_total_num` as `taskTotalNum`,`udata`.`tcn` as `taCoNu`,`udata`.`task_type` as `taskType`,`udata`.`ilbu` as `isLaBiUs`" + " from `udata_0888` `udata` where ((`udata`.`id` IN ((select MAX(`udata`.`id`) from `udata_0888` `udata` where ((`udata`.`uid` = 1039100792) AND (`udata`.`user_type` = 2) AND (`udata`.`start_period_time` <= '2017-01-01 00:00:00') AND (`udata`.`status` = 10) AND (`udata`.`charging_period` = 1) AND (`udata`.`task_type` = 1) AND (`udata`.`task_total_num` <= `udata`.`tcn`)) group by `udata`.`charging_period`,`udata`.`start_period_time`,`udata`.`ept`))) AND ((`udata`.`uid` = '1039100792') AND (`udata`.`user_type` = 2))) order by `udata`.`start_period_time` desc limit 0,6"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_33.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_33.java index b9ff539622..9dcb1c8998 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_33.java @@ -20,7 +20,6 @@ public class MySqlParameterizedOutputVisitorTest_33 extends TestCase { public void test_for_parameterize() throws Exception { final DbType dbType = JdbcConstants.MYSQL; - String sql = "select * from t where id = 1 or id = 2"; String psql = ParameterizedOutputVisitorUtils.parameterize(sql, dbType); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_34.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_34.java index a4510c56e1..550531b922 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_34.java @@ -20,7 +20,6 @@ public class MySqlParameterizedOutputVisitorTest_34 extends TestCase { public void test_for_parameterize() throws Exception { final DbType dbType = JdbcConstants.MYSQL; - String sql = "select * from t where id = 1 or id = 2 or id = 3"; String psql = ParameterizedOutputVisitorUtils.parameterize(sql, dbType); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_35.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_35.java index a3ba8189ed..edb2482c2b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_35.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_35.java @@ -18,7 +18,6 @@ public class MySqlParameterizedOutputVisitorTest_35 extends TestCase { public void test_for_parameterize() throws Exception { final DbType dbType = JdbcConstants.MYSQL; - String sql = "/*+TDDL({'extra':{'SOCKET_TIMEOUT':'3600000'}})*/\n" + "select sample_table_schema, \n" + "sample_table_name,\n" + @@ -54,8 +53,6 @@ public void test_for_parameterize() throws Exception { " ORDER BY id DESC LIMIT 1 \n" + " order by type, quantileno)"; - - SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); List stmtList = parser.parseStatementList(); SQLStatement statement = stmtList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_36.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_36.java index 0a19d3221a..68b1ae4371 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_36.java @@ -18,11 +18,8 @@ public class MySqlParameterizedOutputVisitorTest_36 extends TestCase { public void test_for_parameterize() throws Exception { final DbType dbType = JdbcConstants.MYSQL; - String sql = "INSERT INTO v_j (jb) VALUES (0x7801848fbd6ec23014465f057986c4ffc69150972e0c1dd9bc5cdbd7c56d8028762221c4bbd72addbb1e9def48df832c399281ecb9a4865345c996ac39e2ed743abe376e434cda0a8b7b26920908c6701e64a45a29c3c137bdde272403fbdbb5cdc391922b1ea323c3866d37ee55fc88aa01f76fd29167ab0618470fe1fb348f2d79ae751afafe8cf7dcc11273dd4108584a1731c132d60ec6ecc1c32e5f43b7e6a9e0bce2dcafac87a5de7e0fcd589af856f3054b85cb7460d20a6194e4ca2d9472fd75f3391e446c3c498d7b11a5e7009c098d946a4941614a2fb7e4cfeb01020fe0ad899602a34c09ce2c9388497903d26bf2fc090000ffff01196b1f)"; - - SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); List stmtList = parser.parseStatementList(); SQLStatement statement = stmtList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_4.java index a718c2e3f9..6b724160c4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_4.java @@ -20,13 +20,12 @@ import org.junit.Assert; public class MySqlParameterizedOutputVisitorTest_4 extends MySQLParameterizedTest { - public void test_0() throws Exception { String sql = "select user0_.id as id0_, user0_.email as email0_, " // - + "user0_.login_name as login3_0_, user0_.name as name0_, "// - + "user0_.password as password0_ " // - + "from acct_user user0_ "// - + "where user0_.login_name=? limit ?"; + + "user0_.login_name as login3_0_, user0_.name as name0_, "// + + "user0_.password as password0_ " // + + "from acct_user user0_ "// + + "where user0_.login_name=? limit ?"; Assert.assertSame(ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL), sql); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_42.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_42.java index 66481589b7..d976d98490 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_42.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_42.java @@ -46,7 +46,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("UPDATE offline_file_user\n" + "SET sended_file_num = sended_file_num - ?, sended_flie_total_size = sended_flie_total_size - ?\n" + "WHERE login_id = ?", psql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_43.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_43.java index 7b70b731fc..3549dfe67e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_43.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_43.java @@ -26,7 +26,7 @@ public void test_for_parameterize() throws Exception { String sql = "UPDATE `feel_07`.feed_item_receive SET `attributes` = ?, `gmt_modified` = ?, `lock_version` = ? WHERE `feed_id` = ?"; String params = "[\"enableTime:1498682416713,src:top,importFrom:0\",\"2017-06-29 04:40:20\",1,313825887478]"; String table = "[\"`feel_07`.`feed_item_receive_0502`\"]"; - String restoredSql = restore(sql,table,params); + String restoredSql = restore(sql, table, params); assertEquals("UPDATE `feel_07`.`feed_item_receive_0502`\n" + "SET `attributes` = 'enableTime:1498682416713,src:top,importFrom:0', `gmt_modified` = '2017-06-29 04:40:20', `lock_version` = 1\n" + @@ -36,7 +36,7 @@ public void test_for_parameterize() throws Exception { public static String restore(String sql, String table, String params/*JSONArray paramsArray, JSONArray destArray*/) { JSONArray destArray = JSON.parseArray(table.replaceAll("''", "'")); - params = StringUtils.replace(params.replaceAll("''", "'"), "\\\"","\""); + params = StringUtils.replace(params.replaceAll("''", "'"), "\\\"", "\""); JSONArray paramsArray = JSON.parseArray(params); DbType dbType = JdbcConstants.MYSQL; List stmtList = SQLUtils.parseStatements(sql, dbType); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_44.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_44.java index f45ea4e737..ed2029d56d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_44.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_44.java @@ -44,7 +44,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("SELECT ?\n" + "FROM a\n" + "WHERE c1 IN (date_format(date_add(curdate(), INTERVAL ? DAY), '%Y%m%d'))", psql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_45.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_45.java index 003a7c6338..c24db2550a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_45.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_45.java @@ -41,7 +41,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("(SELECT `t_like_count`.`id`, `t_like_count`.`target_id`, `t_like_count`.`target_type`, `t_like_count`.`like_type`, `t_like_count`.`like_count`\n" + "\t, `t_like_count`.`like_optimalize_count`, `t_like_count`.`create_time`, `t_like_count`.`update_time`\n" + "FROM t_like_count `t_like_count`\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_46.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_46.java index 6f30e3cd9a..c92f68a5e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_46.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_46.java @@ -41,7 +41,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("SELECT COUNT(*) AS count, `ipv_uv_1d_001` AS col\n" + "FROM (\n" + "\t(SELECT ipv_uv_1d_001\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_47_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_47_hints.java index 35595a9c99..13c433925b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_47_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_47_hints.java @@ -48,7 +48,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("/*+TDDL({'extra':{'SOCKET_TIMEOUT':'0'}})*/\n" + "DELETE FROM page_scores\n" + "WHERE createdat <= ?;", psql); @@ -70,11 +69,11 @@ public void test_headHint_2() throws Exception { SqlNodeList hints = ((TDDLSqlSelect) sqlNode).getHints(); Assert.assertEquals(hints.size(), 1); - Assert.assertEquals(((SqlNodeList)hints.get(0)).size(), 4); + Assert.assertEquals(((SqlNodeList) hints.get(0)).size(), 4); SqlNodeList headHints = ((TDDLSqlSelect) sqlNode).getHeadHints(); Assert.assertEquals(headHints.size(), 1); - Assert.assertEquals(((SqlNodeList)headHints.get(0)).size(), 1); + Assert.assertEquals(((SqlNodeList) headHints.get(0)).size(), 1); } public void test_headHint_3() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_48_aggregate.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_48_aggregate.java index 75f7eaf06e..aad833f67d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_48_aggregate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_48_aggregate.java @@ -41,7 +41,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("SELECT count(1)\n" + "FROM t", psql); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_49_createTable.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_49_createTable.java index 6366b2f840..488ad3304c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_49_createTable.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_49_createTable.java @@ -43,7 +43,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("CREATE TABLE projects (\n" + "\tlong_name int(3) NOT NULL DEFAULT 1 + 2\n" + ")", psql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_5.java index a4855b7153..279034d2ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_5.java @@ -19,7 +19,6 @@ import com.alibaba.druid.util.JdbcConstants; public class MySqlParameterizedOutputVisitorTest_5 extends MySQLParameterizedTest { - public void test_0() throws Exception { String sql = "ALTER TABLE `action_plans` ADD `kee` varchar(100)"; assertEquals("ALTER TABLE `action_plans`\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_50_orderby.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_50_orderby.java index 9f4720678e..19de18d901 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_50_orderby.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_50_orderby.java @@ -41,7 +41,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("SELECT *\n" + "FROM t\n" + "ORDER BY 1", psql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_51_schema.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_51_schema.java index aa8ed14487..f057757364 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_51_schema.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_51_schema.java @@ -41,7 +41,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("UPDATE galicdb.auction_auctions\n" + "SET `starts` = ?, `pict_url` = ?, `category` = ?, `minimum_bid` = ?, `reserve_price` = ?, `city` = ?, `prov` = ?, `ends` = ?, `current_bid` = NULL, `quantity` = ?, `zoo` = ?, `secure_trade_ordinary_post_fee` = ?, `secure_trade_fast_post_fee` = ?, `old_quantity` = ?, `options` = ?, `secure_trade_ems_post_fee` = ?, `property` = ?, `last_modified` = ?, `desc_path` = ?, `postage_id` = ?, `shop_categories_id_lists` = ?, `spu_id` = ?, `sync_version` = ?, `auction_status` = ?, `features` = ?, `feature_cc` = ?, `main_color` = ?, `outer_id` = ?, `auction_sub_status` = ?, `commodity_id` = ?\n" + "WHERE `auction_id` = ?", psql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_52_schema.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_52_schema.java index 21567c4eca..ecbb46ec0b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_52_schema.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_52_schema.java @@ -43,7 +43,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("UPDATE buyer.xc_yy_order\n" + "SET `ALIPAY_BUYER_ID` = ?, `GMT_MODIFIED` = ?\n" + "WHERE `PAY_ORDER_ID` = ?", psql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_53_or.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_53_or.java index 58f8c1d008..90c5788538 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_53_or.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_53_or.java @@ -41,7 +41,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("SELECT p.id AS \"id\", p.rule_id AS \"ruleId\", p.name AS \"name\", p.param_type AS \"type\", p.default_value AS \"defaultValue\"\n" + "\t, p.description AS \"description\"\n" + "FROM rules_parameters p\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_54_or.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_54_or.java index 39035025c0..e054ce2077 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_54_or.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_54_or.java @@ -41,7 +41,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("SELECT r.id, r.plugin_rule_key AS \"ruleKey\", r.plugin_name AS \"repositoryKey\", r.description, r.description_format AS \"descriptionFormat\"\n" + "\t, r.status, r.name, r.plugin_config_key AS \"configKey\", r.priority AS \"severity\", r.is_template AS \"isTemplate\"\n" + "\t, r.language AS \"language\", r.template_id AS \"templateId\", r.note_data AS \"noteData\", r.note_user_login AS \"noteUserLogin\", r.note_created_at AS \"noteCreatedAt\"\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_55.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_55.java index b45c2808a0..dc3deff7c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_55.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_55.java @@ -41,7 +41,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("SELECT fck1.fck_order_id, fck1.out_order_id, fck1.seller_nick, fck1.buyer_nick, fck1.seller_id\n" + "\t, fck1.buyer_id, fck1.auction_id, fck1.auction_title, fck1.auction_price, fck1.buy_amount\n" + "\t, fck1.fck_type, fck1.sub_fck_type, fck1.fail_reason, fck1.pay_status, fck1.logistics_status\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_56.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_56.java index d2f3ff4a88..dcbcef6eae 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_56.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_56.java @@ -44,7 +44,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - assertEquals("SELECT `ktv_resource`.`RESOURCE_ID`, `ktv_resource`.`RESOURCE_PROVIDER`, `ktv_resource`.`KTV_ID`, `ktv_resource`.`RESOURCE_TYPE`, `ktv_resource`.`SUB_RESOURCE_TYPE`\n" + "\t, `ktv_resource`.`STATUS`, `ktv_resource`.`START_TIME`, `ktv_resource`.`END_TIME`, `ktv_resource`.`FEATURE`, `ktv_resource`.`GMT_CREATED`\n" + "\t, `ktv_resource`.`GMT_MODIFIED`, `ktv_resource`.`source`, `ktv_resource`.`seller_id`, `ktv_resource`.`original_Resource_Id`, `ktv_resource`.`business_unit`\n" + @@ -67,7 +66,6 @@ public void test_for_parameterize() throws Exception { } public void test_for_parameter_char() throws Exception { - String sql = "insert into t values(?,?,?)"; List sqlStatements = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_57.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_57.java index 23349564d3..ea1cf84aa7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_57.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_57.java @@ -51,9 +51,6 @@ public void test_for_parameterize() throws Exception { System.out.println(psql); - - - assertEquals("SELECT `ktv_resource`.`VERSION`\n" + "FROM ktv_resource `ktv_resource`\n" + "WHERE `ktv_resource`.`BUYER_ID` = ?\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_58.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_58.java index 47f025e2e5..7329b2631d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_58.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_58.java @@ -13,8 +13,8 @@ */ public class MySqlParameterizedOutputVisitorTest_58 extends TestCase { final DbType dbType = JdbcConstants.MYSQL; - public void test_for_parameterize() throws Exception { + public void test_for_parameterize() throws Exception { String sql = "select * from t where id = 101"; List params = new ArrayList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_59_multiupdate.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_59_multiupdate.java index d33c0f16d8..e49d49cb30 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_59_multiupdate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_59_multiupdate.java @@ -13,8 +13,8 @@ */ public class MySqlParameterizedOutputVisitorTest_59_multiupdate extends TestCase { final DbType dbType = JdbcConstants.MYSQL; - public void test_for_parameterize() throws Exception { + public void test_for_parameterize() throws Exception { String sql = "update t_order set salary = 101 where id = 101;update t_order set salary = 102 where id = 102"; List params = new ArrayList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_6.java index f833743535..a480ab93f7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_6.java @@ -20,7 +20,6 @@ import org.junit.Assert; public class MySqlParameterizedOutputVisitorTest_6 extends com.alibaba.druid.bvt.sql.mysql.param.MySQLParameterizedTest { - public void test_0() throws Exception { String sql = "SET autocommit=1"; String paramSql = "SET autocommit = ?"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_60_in.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_60_in.java index 052024c0c4..0a1852bd5c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_60_in.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_60_in.java @@ -14,7 +14,6 @@ */ public class MySqlParameterizedOutputVisitorTest_60_in extends TestCase { public void test_for_parameterize() throws Exception { - String sql = "select * from a where id in (1, 2,3)"; List params = new ArrayList(); @@ -29,7 +28,6 @@ public void test_for_parameterize() throws Exception { } public void test_for_parameterize_1() throws Exception { - String sql = "select * from a where (id,userId) in ((1,2), (2,3),(3,4))"; List params = new ArrayList(); @@ -44,7 +42,6 @@ public void test_for_parameterize_1() throws Exception { } public void test_for_parameterize_2() throws Exception { - String sql = "select * from a where (id,userId) in ((1,2), (2,3),(3,4))"; List params = new ArrayList(); @@ -63,14 +60,13 @@ public void test_for_parameterize_2() throws Exception { } public void test_for_parameterize_3() throws Exception { - String sql = "select * from a where (id,userId) in ((1,2))"; List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, OutputParameterizedQuesUnMergeInList); assertEquals("SELECT *\n" + - "FROM a\n" + - "WHERE (id, userId) IN ((?, ?))", psql); + "FROM a\n" + + "WHERE (id, userId) IN ((?, ?))", psql); assertEquals(2, params.size()); assertEquals("1", params.get(0).toString()); assertEquals("2", params.get(1).toString()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_61.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_61.java index 2f948f270c..f92ad9d1bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_61.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_61.java @@ -13,14 +13,13 @@ */ public class MySqlParameterizedOutputVisitorTest_61 extends TestCase { public void test_for_parameterize() throws Exception { - String sql = "insert ignore into ktv_ibx_1690 (id, msg_id, cid, openid, gmt_create, gmt_modified, read_status, reach_status, create_at, type, tag, sender_id, extension, domain, at_me) " + "VALUES " + "(399644333, 49099001633, \"543351210\", 306202, now(), now(), 2, 2, 1515051603113, 51, 0, 26659032, '', 'mingguo', 0), " + "(399644599334, 49399311994, \"543351210\", 306202, now(), now(), 2, 2, 1515045263923, 51, 0, 55235569, '', 'mingguo', 0), " + "(399644599335, 49352513493, \"543351210\", 306202, now(), now(), 2, 2, 1515032652532, 51, 0, 91605449, '', 'mingguo', 0)"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params); assertEquals("INSERT IGNORE INTO ktv_ibx (id, msg_id, cid, openid, gmt_create\n" + "\t, gmt_modified, read_status, reach_status, create_at, type\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_62.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_62.java index eefc32d1e4..30de5bd61a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_62.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_62.java @@ -14,10 +14,9 @@ */ public class MySqlParameterizedOutputVisitorTest_62 extends TestCase { public void test_for_parameterize() throws Exception { - String sql = "select abc.* from abc join t_1 on abc.name = t_1.id2 where t_1.fname like 'hz.%'"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedUnMergeShardingTable); assertEquals("SELECT abc.*\n" + "FROM abc\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_63.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_63.java index a242a33ec0..5418f4c39e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_63.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_63.java @@ -14,10 +14,9 @@ */ public class MySqlParameterizedOutputVisitorTest_63 extends TestCase { public void test_for_parameterize() throws Exception { - String sql = "select * from abc where id in (null)"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedUnMergeShardingTable); assertEquals("SELECT *\n" + "FROM abc\n" + @@ -32,10 +31,9 @@ public void test_for_parameterize() throws Exception { } public void test_for_parameterize_1() throws Exception { - String sql = "select * from abc where id in (1)"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedUnMergeShardingTable); assertEquals("SELECT *\n" + "FROM abc\n" + @@ -50,10 +48,9 @@ public void test_for_parameterize_1() throws Exception { } public void test_for_parameterize_2() throws Exception { - String sql = "select * from abc where id in (null, null)"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedUnMergeShardingTable); assertEquals("SELECT *\n" + "FROM abc\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_64.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_64.java index 3407a54bc0..e312744361 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_64.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_64.java @@ -14,10 +14,9 @@ */ public class MySqlParameterizedOutputVisitorTest_64 extends TestCase { public void test_for_parameterize() throws Exception { - String sql = "select * from abc where id = trim(' abc ')"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedUnMergeShardingTable); assertEquals("SELECT *\n" + "FROM abc\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_65.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_65.java index db95616f1a..9c760ad73b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_65.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_65.java @@ -13,7 +13,7 @@ */ public class MySqlParameterizedOutputVisitorTest_65 extends TestCase { public void test_for_parameterize() throws Exception { - List outParams = new ArrayList(); + List outParams = new ArrayList(); String sql = "select * from abc"; assertEquals("select * from abc", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_66.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_66.java index c2f38ac06e..f7c5d26a12 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_66.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_66.java @@ -11,10 +11,9 @@ public class MySqlParameterizedOutputVisitorTest_66 extends TestCase { public void test_for_parameterize() throws Exception { - String sql = "select * from abc where 1=1 and id = trim(' abc ')"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedUnMergeShardingTable); assertEquals("SELECT *\n" + "FROM abc\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_67.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_67.java index 03137ce8e1..9645844f54 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_67.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_67.java @@ -11,10 +11,9 @@ public class MySqlParameterizedOutputVisitorTest_67 extends TestCase { public void test_for_parameterize() throws Exception { - String sql = "select dep_id, dep_name, count(1) from t where dep_tpe = 'aa' group by dep_id having count(1) > 10"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql); assertEquals("SELECT dep_id, dep_name, count(1)\n" + "FROM t\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_68.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_68.java index 9d944f79d8..7615824737 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_68.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_68.java @@ -10,10 +10,9 @@ public class MySqlParameterizedOutputVisitorTest_68 extends TestCase { public void test_for_parameterize() throws Exception { - String sql = "select id , name from xxx group by 1,2 order by 1;"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql); assertEquals("SELECT id, name\n" + "FROM xxx\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_69.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_69.java index db8986c4e1..5d05d251a3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_69.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_69.java @@ -11,10 +11,9 @@ public class MySqlParameterizedOutputVisitorTest_69 extends TestCase { public void test_in() throws Exception { - String sql = "select ((0='x6') & 31) ^ (ROW(76, 4) NOT IN (ROW(1, 2 ),ROW(3, 4)) );"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedUnMergeShardingTable); assertEquals("SELECT ((? = ?) & ?) ^ (ROW(?, ?) NOT IN (ROW(?, ?), ROW(?, ?)));", psql); assertEquals(9, params.size()); @@ -25,10 +24,9 @@ public void test_in() throws Exception { } public void test_between() throws Exception { - String sql = "select ((0='x6') & 31) ^ (76 NOT BETWEEN 3 AND 4) ;"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedUnMergeShardingTable); assertEquals("SELECT ((? = ?) & ?) ^ (? NOT BETWEEN ? AND ?);", psql); assertEquals(6, params.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_7.java index daf2c30403..04c19faf61 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_7.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class MySqlParameterizedOutputVisitorTest_7 extends com.alibaba.druid.bvt.sql.mysql.param.MySQLParameterizedTest { - public void test_hints() throws Exception { String sql = "select id from t where id = 3 /*!30000union all select 2*/"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_70.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_70.java index c92115268a..7def4ee09d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_70.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_70.java @@ -11,13 +11,12 @@ public class MySqlParameterizedOutputVisitorTest_70 extends TestCase { public void test_in() throws Exception { - String sql = "select ((0='x6') & 31) ^ (ROW(76, 4) NOT IN (ROW(1, 2 ),ROW(3, 4)) );"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params , VisitorFeature.OutputParameterizedUnMergeShardingTable - ,VisitorFeature.OutputParameterizedQuesUnMergeInList + , VisitorFeature.OutputParameterizedQuesUnMergeInList ); assertEquals("SELECT ((? = ?) & ?) ^ (ROW(?, ?) NOT IN (ROW(?, ?), ROW(?, ?)));", psql); assertEquals(9, params.size()); @@ -29,5 +28,4 @@ public void test_in() throws Exception { assertEquals("SELECT ((0 = 'x6') & 31) ^ (ROW(76, 4) NOT IN (ROW(1, 2), ROW(3, 4)));", rsql); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_71.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_71.java index 1bc4e27779..acf0a69576 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_71.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_71.java @@ -11,23 +11,20 @@ public class MySqlParameterizedOutputVisitorTest_71 extends TestCase { public void test_in() throws Exception { - String sql = "SELECT (3, 4) IN ((1, 2), (3, 4)) FROM dual"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params , VisitorFeature.OutputParameterizedUnMergeShardingTable - ,VisitorFeature.OutputParameterizedQuesUnMergeInList + , VisitorFeature.OutputParameterizedQuesUnMergeInList ); assertEquals("SELECT (?, ?) IN ((?, ?), (?, ?))\n" + "FROM dual", psql); assertEquals("[3,4,1,2,3,4]", JSON.toJSONString(params)); - String rsql = ParameterizedOutputVisitorUtils.restore(psql, JdbcConstants.MYSQL, params); assertEquals("SELECT (3, 4) IN ((1, 2), (3, 4))\n" + "FROM dual", rsql); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_72.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_72.java index f39e62a40e..475e33d2c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_72.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_72.java @@ -11,13 +11,12 @@ public class MySqlParameterizedOutputVisitorTest_72 extends TestCase { public void test_in() throws Exception { - String sql = "create table t1(pk bigint(20) primary key, integer_test int, varchar_test varchar(20));\n"; - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params , VisitorFeature.OutputParameterizedUnMergeShardingTable - ,VisitorFeature.OutputParameterizedQuesUnMergeInList + , VisitorFeature.OutputParameterizedQuesUnMergeInList ); assertEquals("CREATE TABLE t1 (\n" + "\tpk bigint(20) PRIMARY KEY,\n" + @@ -26,7 +25,6 @@ public void test_in() throws Exception { ");", psql); assertEquals("[]", JSON.toJSONString(params)); - String rsql = ParameterizedOutputVisitorUtils.restore(psql, JdbcConstants.MYSQL, params); assertEquals("CREATE TABLE t1 (\n" + "\tpk bigint(20) PRIMARY KEY,\n" + @@ -35,5 +33,4 @@ public void test_in() throws Exception { ");", rsql); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_73.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_73.java index 081445556c..da1a78d6e2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_73.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_73.java @@ -10,7 +10,6 @@ public class MySqlParameterizedOutputVisitorTest_73 extends TestCase { public void test_in() throws Exception { - String sql = "replace into t1(pk, integer_test, varchar_test) values(9223372036854775808,-1,'feed32feed')"; List outParameters = new ArrayList(0); @@ -19,11 +18,10 @@ public void test_in() throws Exception { // VisitorFeature.OutputParameterizedQuesUnMergeInList, // VisitorFeature.OutputParameterizedUnMergeShardingTable); - List params = new ArrayList(); + List params = new ArrayList(); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, outParameters, VisitorFeature.OutputParameterizedQuesUnMergeInList, - VisitorFeature.OutputParameterizedUnMergeShardingTable); + VisitorFeature.OutputParameterizedUnMergeShardingTable); assertEquals("REPLACE INTO t1 (pk, integer_test, varchar_test)\n" + "VALUES (?, ?, ?)", psql); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_74.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_74.java index cddf6d21a3..f16246ec63 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_74.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_74.java @@ -11,13 +11,12 @@ public class MySqlParameterizedOutputVisitorTest_74 extends TestCase { public void test_in() throws Exception { - String sql = "select 0 from corona_select_multi_db_one_tb where( 9 =( (3,4) not in ((1,2 ),( 3,5)) ) ) =bigint_test"; List outParameters = new ArrayList(0); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, outParameters, VisitorFeature.OutputParameterizedQuesUnMergeInList, - VisitorFeature.OutputParameterizedUnMergeShardingTable); + VisitorFeature.OutputParameterizedUnMergeShardingTable); assertEquals("SELECT ?\n" + "FROM corona_select_multi_db_one_tb\n" + "WHERE ? = ((?, ?) NOT IN ((?, ?), (?, ?))) = bigint_test", psql); @@ -26,7 +25,6 @@ public void test_in() throws Exception { } public void test_between() throws Exception { - String sql = "select 0 from corona_select_multi_db_one_tb where( 9 =( 3 not between 1 and 5 ) ) =bigint_test"; List outParameters = new ArrayList(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_75_or.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_75_or.java index 81fae9d0a6..5aa2d447fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_75_or.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_75_or.java @@ -15,7 +15,6 @@ public class MySqlParameterizedOutputVisitorTest_75_or extends TestCase { public void test_or() throws Exception { - String sql = "select * from t1 where id = 1 or id = 2 or id = 3"; List outParameters = new ArrayList(0); @@ -31,7 +30,6 @@ public void test_or() throws Exception { } public void test_or_2() throws Exception { - String sql = "select * from t1 where id = 1 or id = 2 or id = 3"; List outParameters = new ArrayList(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_76.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_76.java index 79c47e0bf9..7780d119d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_76.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_76.java @@ -11,7 +11,6 @@ public class MySqlParameterizedOutputVisitorTest_76 extends TestCase { public void test_or() throws Exception { - String sql = "select * from select_base_one_one_db_multi_tb where pk>=7 and pk>4 and pk <=49 and pk<18 order by pk limit 1"; List outParameters = new ArrayList(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_77.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_77.java index 5cb848b660..6fdf4b8cfd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_77.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_77.java @@ -9,7 +9,6 @@ public class MySqlParameterizedOutputVisitorTest_77 extends TestCase { public void test_restore() throws Exception { - String sql = "select\n" + " cbm_name as cbm_name,\n" + " team_name as team,\n" + @@ -93,15 +92,15 @@ public void test_restore() throws Exception { " ) t_2\n" + "on t_1.cbm_id = t_2.cbm_id and t_1.team_path = t_2.team_path"; - Map parameters = new HashMap(); - parameters.put("month_kpi",1); - parameters.put("thedate","20181115"); - parameters.put("sys_is_cbm","true"); - parameters.put("sys_emp_id",80882); - parameters.put("sys_team_path","0.7940.227.7936."); - parameters.put("thismonth","201811"); - parameters.put("nextmonth","201812"); - parameters.put("fiscalyear","2019"); + Map parameters = new HashMap(); + parameters.put("month_kpi", 1); + parameters.put("thedate", "20181115"); + parameters.put("sys_is_cbm", "true"); + parameters.put("sys_emp_id", 80882); + parameters.put("sys_team_path", "0.7940.227.7936."); + parameters.put("thismonth", "201811"); + parameters.put("nextmonth", "201812"); + parameters.put("fiscalyear", "2019"); String rsql = ParameterizedOutputVisitorUtils.restore(sql, DbType.mysql, parameters); assertEquals("SELECT cbm_name AS cbm_name, team_name AS team, month_earn AS month_gaap, month_kpi AS month_kpi\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_78_nchar.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_78_nchar.java index 90663e7476..35c96c7a5c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_78_nchar.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_78_nchar.java @@ -14,7 +14,6 @@ * Created by wenshao on 16/8/23. */ public class MySqlParameterizedOutputVisitorTest_78_nchar extends TestCase { - public void test_for_parameterize() throws Exception { String sql = "select N'1' as `customerid`,N'5004' as `ordersourceid`,'2018-12-13 21:15:30.879' as `creationtime`"; List outParameters = new ArrayList(0); @@ -26,6 +25,6 @@ public void test_for_parameterize() throws Exception { String rsql = ParameterizedOutputVisitorUtils.restore(sql, DbType.mysql, outParameters); assertEquals("SELECT N'1' AS `customerid`, N'5004' AS `ordersourceid`\n" - + "\t, '2018-12-13 21:15:30.879' AS `creationtime`", rsql); + + "\t, '2018-12-13 21:15:30.879' AS `creationtime`", rsql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_79_group_asc_desc.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_79_group_asc_desc.java index 00d308ee2b..bc9a49c8bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_79_group_asc_desc.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_79_group_asc_desc.java @@ -18,7 +18,6 @@ * @Date 2019/9/2 13:57 */ public class MySqlParameterizedOutputVisitorTest_79_group_asc_desc extends TestCase { - public void test_group_asc_desc() throws Exception { String sql = "select date_test+1 , int_test, id ,sum(double_test) from test_datatype_list group by 1 desc ,2,3 asc order by 4 desc,3 asc;"; List outParameters = new ArrayList(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_8.java index 69073edc09..3200e1203c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_8.java @@ -16,7 +16,6 @@ * Created by wenshao on 16/8/22. */ public class MySqlParameterizedOutputVisitorTest_8 extends com.alibaba.druid.bvt.sql.mysql.param.MySQLParameterizedTest { - public void test_parameterize() throws Exception { final DbType dbType = JdbcConstants.MYSQL; @@ -29,7 +28,6 @@ public void test_parameterize() throws Exception { paramaterizeAST(sql, expected); - SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); List stmtList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_80.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_80.java index 9e1fb278a5..96bb51fb34 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_80.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_80.java @@ -9,15 +9,12 @@ import java.util.List; public class MySqlParameterizedOutputVisitorTest_80 extends TestCase { - public void test1() { - + public void test1() { String sql = "select ((0='x6') & 31) ^ (ROW(76, 4) NOT IN (ROW(1, 2 ),ROW(3, 4)) );"; - SQLStatement stmt = ParameterizedOutputVisitorUtils.parameterizeOf(sql, DbType.mysql); assertEquals("SELECT ((? = ?) & ?) ^ (ROW(?, ?) NOT IN (ROW(?, ?), ROW(?, ?)));", stmt.toString()); - List outParameters = new ArrayList(); SQLStatement stmt2 = ParameterizedOutputVisitorUtils.parameterizeOf(sql, outParameters, DbType.mysql); @@ -36,8 +33,7 @@ public void test1() { assertEquals(4, outParameters.get(8)); } - public void test2() { - + public void test2() { String sql = "select a from t group by 1 order by 1;"; SQLStatement stmt = ParameterizedOutputVisitorUtils.parameterizeOf(sql, DbType.mysql); @@ -47,8 +43,7 @@ public void test2() { "ORDER BY 1;", stmt.toString()); } - public void test3() { - + public void test3() { String sql = "/*test*/ select * from test ;"; assertEquals("/*test*/\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_9.java index 8b3d983111..bfa9ee4f40 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_9.java @@ -16,7 +16,6 @@ * Created by wenshao on 16/8/22. */ public class MySqlParameterizedOutputVisitorTest_9 extends com.alibaba.druid.bvt.sql.mysql.param.MySQLParameterizedTest { - public void test_parameterize() throws Exception { final DbType dbType = JdbcConstants.MYSQL; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/ParseUtil.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/ParseUtil.java index f63a546af4..03edb38148 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/ParseUtil.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/ParseUtil.java @@ -1,6 +1,5 @@ package com.alibaba.druid.bvt.sql.mysql.param; - import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.druid.DbType; @@ -22,11 +21,10 @@ * Created by yunning on 16/6/3. */ public class ParseUtil { - - private final static String DML_REGEX = "^(\\s)*(SELECT|INSERT|UPDATE|DELETE)"; - private final static Pattern DML_PATTERN = Pattern.compile(DML_REGEX, Pattern.CASE_INSENSITIVE); //忽略大小写 - private final static String IP_REGEX = "^(?:(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$"; - private final static Pattern IP_PATTERN = Pattern.compile(IP_REGEX, Pattern.CASE_INSENSITIVE); + private static final String DML_REGEX = "^(\\s)*(SELECT|INSERT|UPDATE|DELETE)"; + private static final Pattern DML_PATTERN = Pattern.compile(DML_REGEX, Pattern.CASE_INSENSITIVE); //忽略大小写 + private static final String IP_REGEX = "^(?:(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$"; + private static final Pattern IP_PATTERN = Pattern.compile(IP_REGEX, Pattern.CASE_INSENSITIVE); private static Logger logger = Logger.getLogger(ParseUtil.class); public static boolean isDmlSQL(String querySql) { @@ -76,15 +74,13 @@ public static void main(String[] args) { String sqlTempalte = parseSQL(sql); JSONArray array = new JSONArray(); array.add("VFS_DENTRY_001"); - System.out.println(restore(sqlTempalte,array.toJSONString(),new JSONArray().toJSONString())); + System.out.println(restore(sqlTempalte, array.toJSONString(), new JSONArray().toJSONString())); } - public static boolean isIp(String host){ + public static boolean isIp(String host) { return IP_PATTERN.matcher(host).find(); } - - private static String filterChar(String name) { if (StringUtils.isNotBlank(name)) { String[] names = name.split("\\."); @@ -164,7 +160,7 @@ private static JSONArray getSrcArray(String sql) { visitor.setExportTables(true); stmt.accept(visitor); String srcStr = JSON.toJSONString(visitor.getTables()); - return JSON.parseArray(srcStr); + return JSON.parseArray(srcStr); } public static SQLStatement getStatement(String sql) { @@ -183,10 +179,8 @@ public static String getSqlHash(String sql) { return getSqlHash(statement); } - public static String getSqlHash(SQLStatement statement) { try { - StringBuilder out = new StringBuilder(); List parameters = new ArrayList(); SQLASTOutputVisitor visitor = SQLUtils.createOutputVisitor(out, JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/parser/MySqlParserResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/parser/MySqlParserResourceTest.java index b97df2146c..26178b2744 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/parser/MySqlParserResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/parser/MySqlParserResourceTest.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class MySqlParserResourceTest extends TestCase { - public void test_0() throws Exception { // exec_test("bvt/parser/mysql-0.txt"); // exec_test("bvt/parser/mysql-1.txt"); @@ -69,7 +68,7 @@ public void exec_test(String resource) throws Exception { String text = output(statementList); // System.out.println(text); // System.out.println(); - + expect = expect.replaceAll("\\r\\n", "\n"); Assert.assertEquals("errror resource " + resource, expect, text.trim()); @@ -83,7 +82,6 @@ public void exec_test(String resource) throws Exception { } void mergValidate(String sql, String expect) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/Resolve_AllColumn_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/Resolve_AllColumn_Test.java index 85e575d875..0995553d12 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/Resolve_AllColumn_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/Resolve_AllColumn_Test.java @@ -34,20 +34,18 @@ public void test_resolve() throws Exception { assertNotNull(expr.getResolvedColumn()); new SQLASTVisitorAdapter() { - public boolean visit(SQLSelectQueryBlock queryBlock) { - final List selectList = queryBlock.getSelectList(); - for (int i = 0; i < selectList.size(); i++) { - final SQLSelectItem selectItem = selectList.get(i); - final SQLExpr expr = selectItem.getExpr(); - if (expr instanceof SQLAllColumnExpr) { - - } else if (expr instanceof SQLPropertyExpr && ((SQLPropertyExpr) expr).getName().equals("*")) { - - } - - } - return true; - } + public boolean visit(SQLSelectQueryBlock queryBlock) { + final List selectList = queryBlock.getSelectList(); + for (int i = 0; i < selectList.size(); i++) { + final SQLSelectItem selectItem = selectList.get(i); + final SQLExpr expr = selectItem.getExpr(); + if (expr instanceof SQLAllColumnExpr) { + } else if (expr instanceof SQLPropertyExpr && ((SQLPropertyExpr) expr).getName().equals("*")) { + } + + } + return true; + } }; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/TPCDS_ALL_Resolve.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/TPCDS_ALL_Resolve.java index 2d1500c642..0f2cfd2bb4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/TPCDS_ALL_Resolve.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/TPCDS_ALL_Resolve.java @@ -28,7 +28,7 @@ public void test_q01() throws Exception { System.out.println("-----------------------------------------------------"); String sql = TPCDS.getQuery(q); - final List statements = SQLUtils.parseStatements(sql, DbType.mysql); + final List statements = SQLUtils.parseStatements(sql, DbType.mysql); for (SQLStatement stmt : statements) { repository.resolve(stmt); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/AdsDumpTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/AdsDumpTest_0.java index 17afcc0518..2a787d0d8b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/AdsDumpTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/AdsDumpTest_0.java @@ -10,12 +10,11 @@ import java.util.List; public class AdsDumpTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "/*+dump-merge=true*/DUMP DATA SELECT amp.buyer_add_cart_info.buyer_id,amp.buyer_add_cart_info.pre_score,amp.buyer_add_cart_info.cart_price FROM amp.buyer_add_cart_info JOIN amp.crm_user_base_info ON amp.crm_user_base_info.user_id = amp.buyer_add_cart_info.buyer_id where (((amp.buyer_add_cart_info.seller_id=1921906956)) AND ((amp.buyer_add_cart_info.auction_id=562769960283)) AND ((amp.buyer_add_cart_info.show_price>=13300))) LIMIT 144800 "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLDumpStatement stmt = (SQLDumpStatement)statementList.get(0); + SQLDumpStatement stmt = (SQLDumpStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_0.java index 18040b1914..4bba15efe0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_0.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush tables with read lock"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH TABLES WITH READ LOCK", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush tables with read lock", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_1.java index 153ee3aaf7..ea4b80d0fd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_1.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush privileges"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH PRIVILEGES", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush privileges", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_10.java index 6e78170eed..5fe26efff0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_10.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_10 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush slow logs"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH SLOW LOGS", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush slow logs", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_11.java index 073a2025ba..172e253d41 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_11.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_11 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush status"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH STATUS", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush status", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_12.java index a0e92f22f3..6a191065ac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_12.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_12 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush user_resources"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH USER_RESOURCES", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush user_resources", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_13.java index e17b48b111..4554616b0d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_13.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_13 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush RELAY LOGS"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH RELAY LOGS", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush relay logs", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_14.java index 0662cd8650..8033749d8a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_14.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_14 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush RELAY LOGS FOR CHANNEL c1"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH RELAY LOGS c1", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush relay logs c1", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_2.java index fcc98a23bd..1a3b42a351 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_2.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_2 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush binary logs"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH BINARY LOGS", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush binary logs", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_3.java index d439ac2ed9..e15a9cb562 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_3.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_3 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush DES_KEY_FILE"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH DES_KEY_FILE", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush des_key_file", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_4.java index 6ff79014c7..b3ffe0e67f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_4.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_4 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush error logs"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH ERROR LOGS", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush error logs", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_5.java index b3afba7324..61d35b0e65 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_5.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_5 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush general logs"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH GENERAL LOGS", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush general logs", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_6.java index 203752f0cb..887cd7a4a4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_6.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_6 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush logs"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH LOGS", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush logs", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_7.java index 4a73721194..d809f4c060 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_7.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_7 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush optimizer_costs"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH OPTIMIZER_COSTS", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush optimizer_costs", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_8.java index 2da13fb41d..3c3d3b9060 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_8.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_8 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush hosts"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH HOSTS", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush hosts", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_9.java index a90423d5db..5f505c6d5f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlFlushTest_9.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlFlushTest_9 extends MysqlTest { - public void test_0() throws Exception { String sql = "flush query cache"; @@ -41,21 +40,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("FLUSH QUERY CACHE", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("flush query cache", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_0.java index 2979579b30..fb237c424e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_0.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlSelectTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT CONCAT(last_name,', ',first_name) AS full_name FROM mytable ORDER BY full_name;"; @@ -44,7 +43,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_1.java index 61ed2164b7..30e438c131 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_1.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlSelectTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT t1.name, t2.salary FROM employee t1, info t2 WHERE t1.name = t2.name;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_10.java index d5ab74c00d..3b2405c6e8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_10.java @@ -30,21 +30,20 @@ import java.util.List; public class MySqlSelectTest_10 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM t_department WHERE name IN ('0000','4444') ORDER BY name ASC"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + SQLSelectStatement selectStmt = (SQLSelectStatement) stmt; - + SQLSelect select = selectStmt.getSelect(); Assert.assertNotNull(select.getQuery()); MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) select.getQuery(); Assert.assertNotNull(queryBlock.getOrderBy()); - + // print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_100_alias.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_100_alias.java index 67ab72aa1c..b02650315a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_100_alias.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_100_alias.java @@ -26,7 +26,6 @@ public class MySqlSelectTest_100_alias extends MysqlTest { - public void test_2() throws Exception { String sql = "\n" + "select id as \"id\", name as \"\\\"abc\\\"\" from test_hash_tb"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_11.java index 94e483ac24..d081444e78 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_11.java @@ -29,7 +29,6 @@ import java.util.List; public class MySqlSelectTest_11 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from users where uid = :uid"; @@ -60,8 +59,8 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *" + // - "\nFROM users" + // - "\nWHERE uid = :uid", // - output); + "\nFROM users" + // + "\nWHERE uid = :uid", // + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_110.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_110.java index ef3faae76e..0b0c221d74 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_110.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_110.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlSelectTest_110 extends TestCase { - public void test_0() throws Exception { String sql = "/*+engine=MPP*/select id \n" + "  from ads_service_buyer_task\n" + @@ -50,7 +49,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(2, visitor.getTables().size()); assertEquals(5, visitor.getColumns().size()); assertEquals(3, visitor.getConditions().size()); @@ -68,7 +67,6 @@ public void test_0() throws Exception { "\t)\n" + "LIMIT 0, 1;", stmt.toString()); } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_111_sequence.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_111_sequence.java index adafac468b..5cc50b9ca8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_111_sequence.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_111_sequence.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_111_sequence extends TestCase { - public void test_0() throws Exception { String sql = "SELECT *\n" + "FROM users TABLESAMPLE BERNOULLI (50);\n"; @@ -42,7 +41,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); @@ -51,7 +50,6 @@ public void test_0() throws Exception { assertEquals("SELECT *\n" + "FROM users TABLESAMPLE BERNOULLI (50);", stmt.toString()); } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_112_orderBy.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_112_orderBy.java index 81038c9db9..9cbea03cff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_112_orderBy.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_112_orderBy.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_112_orderBy extends TestCase { - public void test_0() throws Exception { String sql = "select coach_id, tournament_name ,tournament_id, season_id, season, count(1) as num,\n" + "sum(case when wdl = 0 then 1 else 0 end) as loss,\n" + @@ -58,7 +57,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(2, visitor.getTables().size()); assertEquals(14, visitor.getColumns().size()); assertEquals(10, visitor.getConditions().size()); @@ -107,7 +106,6 @@ public void test_0() throws Exception { "GROUP BY coach_id, tournament_name, tournament_id, season_id, season\n" + "ORDER BY season_id DESC", stmt.toString()); } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_113_time.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_113_time.java index 4a71d3c454..2846866396 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_113_time.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_113_time.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_113_time extends TestCase { - public void test_0() throws Exception { String sql = "select time '10:09:06', timestamp '2017-11-15 10:09:06', date '2017-11-15'"; @@ -41,7 +40,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); @@ -49,7 +48,6 @@ public void test_0() throws Exception { assertEquals("SELECT TIME '10:09:06', TIMESTAMP '2017-11-15 10:09:06', DATE '2017-11-15'", stmt.toString()); } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_114.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_114.java index 57e52574a3..7b17ca61cb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_114.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_114.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlSelectTest_114 extends TestCase { - public void test_0() throws Exception { String sql = "select count(0) from (select id from auth WHERE 1=1 AND/**/b=2 ORDER BY create_time DESC) as total"; @@ -43,7 +42,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(3, visitor.getColumns().size()); assertEquals(1, visitor.getConditions().size()); @@ -69,7 +68,6 @@ public void test_0() throws Exception { "\tORDER BY create_time DESC\n" + ") total", psql); } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_115_collate.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_115_collate.java index b8e1428357..bfb919dc85 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_115_collate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_115_collate.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlSelectTest_115_collate extends MysqlTest { - public void test_0() throws Exception { String sql = "select name collate utf8_danish_ci as userName from test_hash_tb"; @@ -17,7 +16,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_116_with_cube.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_116_with_cube.java index 881fddbd3e..8dda5057d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_116_with_cube.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_116_with_cube.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_116_with_cube extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT string_test, time_test, sum(int_test2) as sum_int FROM test_realtime1 GROUP BY ROLLUP (string_test, time_test) ORDER BY sum_int, string_test, time_test"; @@ -16,7 +15,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_117.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_117.java index 12bc2fc37c..5fe51c05cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_117.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_117.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_117 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * \n" + "FROM\n" + @@ -33,7 +32,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_118_timestamp.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_118_timestamp.java index 66d0c9bc7e..0316bf7c4f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_118_timestamp.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_118_timestamp.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_118_timestamp extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from test1 where TIMESTAMP '2019-1-1 00:00:00' = timestamp_test"; @@ -16,7 +15,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_date.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_date.java index 1385fc635a..5155165990 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_date.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_date.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_119_date extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from test1 where DATE '2019-1-1' = testcol"; @@ -16,7 +15,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_real.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_real.java index f68c9fe673..6b579f03ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_real.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_real.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_119_real extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from test1 where REAL '2019.3' = testcol"; @@ -16,7 +15,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_12.java index df443e438f..6b4efc3e88 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_12.java @@ -29,7 +29,6 @@ import java.util.List; public class MySqlSelectTest_12 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT COUNT(*) a FROM (select nickname,mobile,comment,createdate from ub_userdiscuss order by discuss_id desc) b "; @@ -65,6 +64,6 @@ public void test_0() throws Exception { "\tFROM ub_userdiscuss\n" + "\tORDER BY discuss_id DESC\n" + ") b", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_120_not.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_120_not.java index 785d2db266..85e7b71b82 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_120_not.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_120_not.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_120_not extends MysqlTest { - public void test_0() throws Exception { String sql = "sELECT pk FROM corona_broadcast WHERE !(decimal_test BETWEEN double_test AND 62); "; @@ -16,7 +15,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_121.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_121.java index 571d00e373..90bb9857cb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_121.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_121.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_121 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT DISTINCT o_orderkey\n" + "FROM simple_query1.orders__0\n" + @@ -30,7 +29,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_122.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_122.java index 801e995bef..ac76a2d8ee 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_122.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_122.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_122 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 'test1123' from dual WHERE 'test1123' like \"%\"'test'\"%\""; @@ -16,7 +15,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_123_mod.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_123_mod.java index 0b42ac8dd1..2fc4c0bac1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_123_mod.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_123_mod.java @@ -12,12 +12,11 @@ import java.util.List; public class MySqlSelectTest_123_mod extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 3 mod"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -28,7 +27,7 @@ public void test_1() throws Exception { String sql = "SELECT 3 `mod`"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -39,7 +38,7 @@ public void test_2() throws Exception { String sql = "SELECT n mod m from t"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -51,7 +50,7 @@ public void test_3() throws Exception { String sql = "select 2.1 mod 2 = 2"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_124_contains.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_124_contains.java index 1ca6294f55..941842ac79 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_124_contains.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_124_contains.java @@ -9,13 +9,12 @@ import java.util.List; public class MySqlSelectTest_124_contains extends MysqlTest { - public void test_0() throws Exception { String sql = "select shid from alitrip_htl_realtime.hotel_real_time_inventory where rate_sale_status = 1 and rate_tags contains ('520') " + "group by shid,start_time_daily,end_time_daily"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -31,7 +30,7 @@ public void test_1() throws Exception { "group by shid,start_time_daily,end_time_daily"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_125_eq.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_125_eq.java index 4aaba9effd..69c91922fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_125_eq.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_125_eq.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_125_eq extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from test3 where id/cnt = id = id;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_126_ads_minus.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_126_ads_minus.java index 980aaaf72b..7602f49a8b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_126_ads_minus.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_126_ads_minus.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlSelectTest_126_ads_minus extends MysqlTest { - public void test_0() throws Exception { String sql = "select q.case_id as case_id\n" + "from (\n" + @@ -27,7 +26,7 @@ public void test_0() throws Exception { "\t\twhere q.case_id in ((select case_id from tpp_action_case where action_code=999990 ) MINUS (select case_id from tpp_action_case where action_code=999997))"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_127.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_127.java index 9f15f860e0..0b1d96335f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_127.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_127.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_127 extends MysqlTest { - public void test_0() throws Exception { String sql = "/*+engine=mpp*/SELECT min(pay_byr_rate_90d) FROM (/*+engine=mpp*/SELECT pay_byr_rate_90d FROM caspian.ads_itm_hpcj_all_df WHERE item_pools_tags = '1116' AND pay_byr_rate_90d >= 0 ORDER BY pay_byr_rate_90d DESC LIMIT 49) LIMIT 500"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_128_ads_count_as.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_128_ads_count_as.java index 99d797a3bc..021b6403d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_128_ads_count_as.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_128_ads_count_as.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_128_ads_count_as extends MysqlTest { - public void test_0() throws Exception { String sql = "/*+qt=30000*/SELECT COUNT( DISTINCT brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump.__aid AS __aid ) FROM brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump WHERE brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump.label_list_crowd1 IN ('20324_35_0', '20324_35_1', '20324_35_2', '20324_35_3', '20324_35_4', '20324_35_5', '20324_35_6', '20324_35_7', '20324_35_8', '20324_35_9', '20324_35_10', '20324_35_11', '20324_35_12', '20324_35_13', '20324_35_14', '20324_35_15', '20324_35_16', '20324_35_17', '20324_35_18', '20324_35_19')"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_129_ads.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_129_ads.java index ac60ea11aa..57e53cea1a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_129_ads.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_129_ads.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlSelectTest_129_ads extends MysqlTest { - public void test_0() throws Exception { String sql = "/*+ engine= mpp*/ \n" + "with \n" + @@ -33,7 +32,7 @@ public void test_0() throws Exception { "from history_table left join avg_table using (minute_id) order by history_table.hour_id\n"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_13.java index aefd605af7..d4f327c971 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_13.java @@ -29,7 +29,6 @@ import java.util.List; public class MySqlSelectTest_13 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from test /*!40101fff*/"; @@ -60,7 +59,7 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *" // - + "\nFROM test/*!40101fff*/", // - output); + + "\nFROM test/*!40101fff*/", // + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_130_ads.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_130_ads.java index 4c0a2bc264..fd618f3961 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_130_ads.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_130_ads.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlSelectTest_130_ads extends MysqlTest { - public void test_0() throws Exception { String sql = "/*+ engine= mpp*/ \n" + "with base_table as ( \n" + @@ -51,7 +50,7 @@ public void test_0() throws Exception { "order by comm_date\n"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_131_div.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_131_div.java index 08ba30e5a6..40924ae0a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_131_div.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_131_div.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_131_div extends MysqlTest { - public void test_0() throws Exception { String sql = "select id mod id mod id % id /id from t"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_132_not_in.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_132_not_in.java index 8e4fdedfbf..4804233de3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_132_not_in.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_132_not_in.java @@ -10,12 +10,11 @@ import java.util.List; public class MySqlSelectTest_132_not_in extends MysqlTest { - public void test_0() throws Exception { String sql = "select abc.* from abc where id not in (1,2,3)"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_133.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_133.java index c828685fcb..c66ed8a605 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_133.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_133.java @@ -10,12 +10,11 @@ import java.util.List; public class MySqlSelectTest_133 extends MysqlTest { - public void test_0() throws Exception { String sql = "select (~(43) ),( (tinyint_1bit_test MOD integer_test MOD bigint_test) not in (1,2,'a',(binary 'a'='a ')) )from select_base_two_one_db_multi_tb "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_134.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_134.java index 36b56a1831..4847d0dd13 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_134.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_134.java @@ -10,7 +10,6 @@ import java.util.List; public class MySqlSelectTest_134 extends MysqlTest { - public void test_0() throws Exception { String sql = "/*TDDL:RETRY_ERROR_SQL_ON_OLD_SERVER=FALSE*/\n" + "select (('b')not between('a')AND ('x-3') )\n" + @@ -18,7 +17,7 @@ public void test_0() throws Exception { "from select_base_two_one_db_one_tb"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -34,7 +33,7 @@ public void test_1() throws Exception { String sql = "SELECT HEX(WEIGHT_STRING(0x007fff LEVEL 1));"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -47,7 +46,7 @@ public void test_2() throws Exception { String sql = "SELECT HEX(WEIGHT_STRING(0x007fff LEVEL 1 DESC));"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -60,7 +59,7 @@ public void test_3() throws Exception { String sql = "SELECT HEX(WEIGHT_STRING(0x007fff LEVEL 2, 3, 5));"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -73,7 +72,7 @@ public void test_4() throws Exception { String sql = "SELECT HEX(WEIGHT_STRING(0x007fff LEVEL 1 DESC REVERSE));"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_135.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_135.java index afee280633..7b35f89004 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_135.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_135.java @@ -10,12 +10,11 @@ import java.util.List; public class MySqlSelectTest_135 extends MysqlTest { - public void test_0() throws Exception { String sql = "select (~(oct(mediumint_test )) ),( (( 'b')AND (date_test )) in(smallint_test, bigint_test,tinyint_1bit_test,( WEIGHT_STRING( 0x007fff LEVEL 1 DESC ))) )from select_base_two_multi_db_multi_tb"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_136.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_136.java index fe71eb1541..1d4f4eff0c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_136.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_136.java @@ -10,13 +10,12 @@ import java.util.List; public class MySqlSelectTest_136 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT `tinyint_test` / `tinyint_1bit_test` = `mediumint_test` = `decimal_test` / `double_test`\n" + "FROM `corona_one_db_one_tb`"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_137.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_137.java index a87b0a8834..8824ec91e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_137.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_137.java @@ -10,12 +10,11 @@ import java.util.List; public class MySqlSelectTest_137 extends MysqlTest { - public void test_0() throws Exception { String sql = "select ((decimal_test =87 / bigint_test =bigint_test) >(second(timestamp_test )) )from select_base_two_multi_db_one_tb"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_138_ads_minus.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_138_ads_minus.java index 55d7089fce..e798bb5f54 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_138_ads_minus.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_138_ads_minus.java @@ -11,7 +11,6 @@ import java.util.List; public class MySqlSelectTest_138_ads_minus extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT DISTINCT o_orderkey\n" + "FROM simple_query2.orders__0\n" + @@ -30,7 +29,7 @@ public void test_0() throws Exception { "WHERE o_orderdate > '1994-09-31'\n"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_139.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_139.java index aef7e883e8..5069b5f9bb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_139.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_139.java @@ -11,7 +11,6 @@ import java.util.List; public class MySqlSelectTest_139 extends MysqlTest { - public void test_0() throws Exception { String sql = "select (tinyint_test/tinyint_1bit_test)\n" + "=mediumint_test=decimal_test \n" + @@ -19,7 +18,7 @@ public void test_0() throws Exception { "FROM corona_one_db_one_tb"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_14.java index 2eee99f4d5..b3b9256ba7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_14.java @@ -29,7 +29,6 @@ import java.util.List; public class MySqlSelectTest_14 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM t1 WHERE column1 = (SELECT column1 FROM t2);"; @@ -66,15 +65,15 @@ public void test_0() throws Exception { "\tSELECT column1\n" + "\tFROM t2\n" + ");", // - output); - + output); + String output_lcase = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select *" // - + "\nfrom t1"// - + "\nwhere column1 = ("// - + "\n\tselect column1"// - + "\n\tfrom t2"// - + "\n);", // - output_lcase); + + "\nfrom t1"// + + "\nwhere column1 = ("// + + "\n\tselect column1"// + + "\n\tfrom t2"// + + "\n);", // + output_lcase); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_140_union.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_140_union.java index 4800e6be06..5d30d6189c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_140_union.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_140_union.java @@ -11,7 +11,6 @@ import java.util.List; public class MySqlSelectTest_140_union extends MysqlTest { - public void test_0() throws Exception { String sql = "select count(1) from\n" + "(\n" + @@ -25,7 +24,7 @@ public void test_0() throws Exception { ")d;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_141_bigunion.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_141_bigunion.java index 489f6d8d6b..587aa54ab9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_141_bigunion.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_141_bigunion.java @@ -12,7 +12,6 @@ import java.util.List; public class MySqlSelectTest_141_bigunion extends MysqlTest { - public void test_small_10() throws Exception { StringBuilder buf = new StringBuilder(); { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_142.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_142.java index 523267d921..f74afdad3d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_142.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_142.java @@ -11,12 +11,11 @@ import java.util.List; public class MySqlSelectTest_142 extends MysqlTest { - public void test_0() throws Exception { String sql = "select count(1) from ( select aid from ysf_saas_test.abc_user_behavior_search_d where aid is not null and ds = 20180111 and bhv_obj_type = 4 and bhv_obj in ('衣服') INTERSECT select a0.aid from ( select distinct t0.aid as aid from ( select aid, sum(frequency) from ysf_saas_test.abc_user_behavior_pay_d_002 where aid is not null and ds=20180111 and bhv_obj_type = 1 and brand_id in (29493) and ext_field_7 in ('4') group by aid having sum(frequency) >1) t0 ) a0 join ( select distinct t0.aid as aid from ( select aid, sum(ext_field_9) from ysf_saas_test.abc_user_behavior_pay_d_002 where aid is not null and ds=20180111 and bhv_obj_type = 1 and brand_id in (29493) and ext_field_7 in ('4') group by aid having sum(ext_field_9) >1) t0 ) b0 on a0.aid = b0.aid INTERSECT select aid from ysf_saas_test.abc_user_behavior_collect_item_d_002 where aid is not null and ds=20180111 and bhv_obj_type = 1 and brand_id in (29493) )d;\n"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_143.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_143.java index 2a4bb100c2..8228d3a560 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_143.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_143.java @@ -11,7 +11,6 @@ import java.util.List; public class MySqlSelectTest_143 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE OS_TEST_COMPARE_test008 AS\n" + "SELECT *\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_144_ads_values.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_144_ads_values.java index 33dbe5f0ff..883ca71cff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_144_ads_values.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_144_ads_values.java @@ -10,7 +10,6 @@ import java.util.List; public class MySqlSelectTest_144_ads_values extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM (\n" + "VALUES\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_146.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_146.java index d76120aec8..4225649ed4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_146.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_146.java @@ -13,12 +13,11 @@ import java.util.List; public class MySqlSelectTest_146 extends MysqlTest { - public void test_0() throws Exception { String sql = "select '18015376320243458'=18015376320243459 is not NULL from select_base_two_multi_db_multi_tb limit 1;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_147_huizhi.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_147_huizhi.java index 7287df6541..7c2a4d2fa5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_147_huizhi.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_147_huizhi.java @@ -13,7 +13,6 @@ import java.util.List; public class MySqlSelectTest_147_huizhi extends MysqlTest { - public void test_0() throws Exception { String sql = "INSERT INTO hz_dev_hb.tb_tmp_cda_opera_281c (target, appeartimes, source_id) SELECT\n" + " VARCHAR20,\n" + @@ -26,7 +25,7 @@ public void test_0() throws Exception { " GROUP BY VARCHAR20"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLInsertStatement stmt = (SQLInsertStatement)statementList.get(0); + SQLInsertStatement stmt = (SQLInsertStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_148_extract.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_148_extract.java index a3b4e9a99a..b97d60b2b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_148_extract.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_148_extract.java @@ -14,12 +14,11 @@ import java.util.List; public class MySqlSelectTest_148_extract extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT EXTRACT(YEAR FROM '2008-01-02') >> 3 FROM corona_select_one_db_one_tb"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_149.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_149.java index 80d7386f12..f30776d6f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_149.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_149.java @@ -13,12 +13,11 @@ import java.util.List; public class MySqlSelectTest_149 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT length('aaa' collate utf8_general_ci) FROM corona_select_one_db_one_tb"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -35,11 +34,12 @@ public void test_0() throws Exception { , queryBlock.getSelectList().get(0).getExpr().toString() ); } + public void test_1() throws Exception { String sql = "SELECT count(1), length('aaa' collate utf8_general_ci) FROM corona_select_one_db_one_tb"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -54,12 +54,13 @@ public void test_1() throws Exception { , queryBlock.getSelectList().get(1).getExpr().toString() ); } + public void test_2() throws Exception { String sql = "select i `table` from ttt `table`"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint, - SQLParserFeature.IgnoreNameQuotes); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLParserFeature.IgnoreNameQuotes); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); System.out.println(stmt.toString()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_15.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_15.java index e4ecdbd6ff..f1e88bbefa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_15.java @@ -29,7 +29,6 @@ import java.util.List; public class MySqlSelectTest_15 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 1--1 from t where id = 1"; @@ -60,8 +59,8 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT 1 - -1" // - + "\nFROM t" // - + "\nWHERE id = 1", // - output); + + "\nFROM t" // + + "\nWHERE id = 1", // + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_150.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_150.java index ae2e4446a8..d81477b569 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_150.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_150.java @@ -12,7 +12,6 @@ import java.util.List; public class MySqlSelectTest_150 extends MysqlTest { - public void test_0() throws Exception { String sql = "(select __aid\n" + " from unidesk_ads.dmj_ex_1_unidesk_tag_all\n" + @@ -32,7 +31,7 @@ public void test_0() throws Exception { " )"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_151.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_151.java index 6ace9047a0..798846c8f4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_151.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_151.java @@ -12,12 +12,11 @@ import java.util.List; public class MySqlSelectTest_151 extends MysqlTest { - public void test_0() throws Exception { String sql = "select !!1, ! ! 1"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_152.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_152.java index 3afd3dece2..3e989d5e54 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_152.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_152.java @@ -12,12 +12,11 @@ import java.util.List; public class MySqlSelectTest_152 extends MysqlTest { - public void test_0() throws Exception { String sql = "select (3,4) in ((1,2),(3,4)) from dual"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -35,7 +34,7 @@ public void test_1() throws Exception { String sql = "select (3,4) in ((1,2),(3,4)) from dual"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_153.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_153.java index eec581e0b0..3923709142 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_153.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_153.java @@ -12,12 +12,11 @@ import java.util.List; public class MySqlSelectTest_153 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT ((layer_1_column_0)|(NULLIF(NULL,null )))FROM (SELECT NULL is NULL AS layer_1_column_0 FROM corona_select_multi_db_one_tb WHERE 'a' AND 'b') AS layer_0_table WHERE ! ~ 25 IS NULL;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_154.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_154.java index b1a3615dea..a913af9d3a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_154.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_154.java @@ -12,7 +12,6 @@ import java.util.List; public class MySqlSelectTest_154 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 1 is NULL,(~(NULLIF(1,1 ))) \n" + "FROM corona_select_one_db_one_tb AS layer_0_left_tb \n" + @@ -22,7 +21,7 @@ public void test_0() throws Exception { " NOT IN (layer_0_left_tb.decimal_test,layer_0_right_tb.tinyint_test,layer_0_left_tb.integer_test, RPAD(NULL,0,layer_0_left_tb.year_test))"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_155.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_155.java index ab8ea8c29b..a7876df39e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_155.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_155.java @@ -12,12 +12,11 @@ import java.util.List; public class MySqlSelectTest_155 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT SQL_NO_CACHE ((layer_0_right_tb.integer_test) is TRUE)FROM corona_select_multi_db_multi_tb AS layer_0_left_tb LEFT JOIN corona_select_one_db_one_tb AS layer_0_right_tb ON layer_0_right_tb.decimal_test=layer_0_left_tb.varchar_test WHERE '18015376320243458'=18015376320243458 NOT BETWEEN layer_0_right_tb.tinyint_1bit_test AND 'x-3'"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_156.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_156.java index 8fec8d3f21..a887f6d54e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_156.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_156.java @@ -12,7 +12,6 @@ import java.util.List; public class MySqlSelectTest_156 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT SQL_SMALL_RESULT ((NULL) is not FALSE) \n" + "FROM corona_select_multi_db_one_tb AS layer_0_left_tb \n" + @@ -21,7 +20,7 @@ public void test_0() throws Exception { "WHERE layer_0_right_tb.time_test='x6' NOT BETWEEN 96 AND layer_0_right_tb.bigint_test;\n"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_157.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_157.java index 9ff3b823a8..ff7f298301 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_157.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_157.java @@ -15,7 +15,6 @@ import java.util.List; public class MySqlSelectTest_157 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 1 " + "FROM corona_select_one_db_one_tb AS layer_0_left_tb " + @@ -24,7 +23,7 @@ public void test_0() throws Exception { "WHERE (layer_0_right_tb.timestamp_test BETWEEN 'x-3' AND ROW(3, 4) NOT IN (ROW(1, 2 ),ROW(3, 4)))"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_158.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_158.java index a2d6d50f0c..92d6ca161c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_158.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_158.java @@ -16,12 +16,11 @@ import java.util.List; public class MySqlSelectTest_158 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT f1 rlike '\\n+b' from t;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_159.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_159.java index 060321014d..b67b5049fd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_159.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_159.java @@ -14,7 +14,6 @@ import java.util.List; public class MySqlSelectTest_159 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT COUNT(*) AS COUNT \n" + "FROM ( \n" + @@ -30,7 +29,7 @@ public void test_0() throws Exception { "FROM dws_ascm_cost_di WHERE 1 = 1 AND 1 = 1 AND 1 = 1 AND 1 = 1 AND 1 = 1 AND brand_id = '119079' AND stat_date >= '20170401' AND stat_date <= '20180228' GROUP BY 1, CASE WHEN '0' <> '0' THEN channel ELSE CAST(-1 AS bigint) END, CASE WHEN '0' <> '0' THEN group_name ELSE '-' END, CASE WHEN '0' <> '0' THEN city ELSE '-1' END, CASE WHEN '0' <> '0' THEN supplier_code ELSE '-' END, CASE WHEN '0' <> '0' THEN supplier_name ELSE '-' END, CASE WHEN '0' <> '0' THEN CAST(brand_id AS bigint) ELSE CAST(-1 AS bigint) END, CASE WHEN '0' <> '0' THEN brand_name ELSE '-' END ) 成本汇总 LEFT JOIN dim_channel_maochao dcm ON 成本汇总.渠道 = dcm.id LEFT JOIN dim_city_maochao dcm1 ON CAST(成本汇总.城市 AS bigint) = dcm1.id ) quark_t1"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_16.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_16.java index 18cc84379e..82b6e1e497 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_16.java @@ -33,7 +33,6 @@ import java.util.List; public class MySqlSelectTest_16 extends MysqlTest { - public void test_0() throws Exception { String sql = "select a from t where not a>1 and not b<1"; @@ -81,6 +80,6 @@ public void test_0() throws Exception { "FROM t\n" + "WHERE (NOT a > 1)\n" + "\tAND NOT b < 1", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_160.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_160.java index 5ac903603f..fbc1c2be4d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_160.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_160.java @@ -14,12 +14,11 @@ import java.util.List; public class MySqlSelectTest_160 extends MysqlTest { - public void test_0() throws Exception { String sql = "select quote(\"'abc'\")"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_161.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_161.java index aaf226f170..ab76f23a60 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_161.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_161.java @@ -14,7 +14,6 @@ import java.util.List; public class MySqlSelectTest_161 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT\n" + "DATE_FORMAT(FROM_UNIXTIME(`time` / 1000), '%Y-%m-%d %H:%i:%s'), `time`\n" + @@ -23,7 +22,7 @@ public void test_0() throws Exception { "\n"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_162.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_162.java index 82eaf5c7ee..d582ddaa4c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_162.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_162.java @@ -14,7 +14,6 @@ import java.util.List; public class MySqlSelectTest_162 extends MysqlTest { - public void test_0() throws Exception { String sql = "WITH RECURSIVE cte (n) AS\n" + "(\n" + @@ -25,7 +24,7 @@ public void test_0() throws Exception { "SELECT /*+ MAX_EXECUTION_TIME(1000) */ * FROM cte;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_163.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_163.java index b9ee726363..0fdb1ab08f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_163.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_163.java @@ -12,7 +12,6 @@ import java.util.List; public class MySqlSelectTest_163 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT\n" + " val,\n" + @@ -22,7 +21,7 @@ public void test_0() throws Exception { "FROM numbers;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_164_window.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_164_window.java index 0d8c1c86c9..3fc50d6b08 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_164_window.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_164_window.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlSelectTest_164_window extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT\n" + " val,\n" + @@ -20,7 +19,7 @@ public void test_0() throws Exception { "WINDOW w AS (ORDER BY val);"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_165_json.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_165_json.java index b55970b5b6..e9bc3ff7b9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_165_json.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_165_json.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_165_json extends MysqlTest { - public void test_0() throws Exception { String sql = "select concat(l_shipdate,'10') from lineitem join orders on l_orderkey = o_orderkey where l_shipdate between '1997-01-27' and '1997-02-20' and json_extract(l_comment,'$.id') = json '1997-01-2810' limit 3"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_166_xor.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_166_xor.java index 2d07d27285..9704cf6978 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_166_xor.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_166_xor.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_166_xor extends MysqlTest { - public void test_0() throws Exception { String sql = "select 1 from corona_select_multi_db_multi_tb where (1 XOR 2 ) between 3 and 4"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -27,7 +26,7 @@ public void test_1() throws Exception { String sql = "select * from t where id != 4 or id = 4 xor (id = 4 or id < 4)"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -42,7 +41,7 @@ public void test_2() throws Exception { String sql = "SELECT ((10)!=(( (HEX ('abc' )) is FALSE )) ),( (( (( (( 'a')&& (null )) not in(layer_1_left_tb.bigint_test, layer_0_right_tb.smallint_test,layer_1_left_tb.datetime_test,( EXPORT_SET (6, layer_1_left_tb.year_test,'0', ':', 66 ))) )) <(layer_1_left_tb.decimal_test) )) not in(layer_1_left_tb.mediumint_test, layer_1_left_tb.double_test,layer_1_left_tb.year_test,( 1+'1')) )FROM corona_select_one_db_multi_tb AS layer_1_left_tb RIGHT JOIN corona_select_multi_db_one_tb AS layer_1_right_tb ON layer_1_right_tb.datetime_test=layer_1_left_tb.datetime_test RIGHT JOIN corona_select_one_db_multi_tb AS layer_0_right_tb ON layer_0_right_tb.tinyint_1bit_test=layer_1_left_tb.tinyint_1bit_test;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_167.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_167.java index fa886c6771..c8070bb341 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_167.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_167.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_167 extends MysqlTest { - public void test_0() throws Exception { String sql = "select 1 30days"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_decimal.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_decimal.java index 98e5562a3b..3d97a3f8b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_decimal.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_decimal.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_168_decimal extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT ceiling(DECIMAL '123456789012345678');"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_int.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_int.java index ce5b9ab887..124e91fbaa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_int.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_int.java @@ -11,12 +11,11 @@ import java.util.List; public class MySqlSelectTest_168_int extends MysqlTest { - public void test_1() throws Exception { String sql = "/*+engine=MPP*/ SELECT ceil(SMALLINT'123')"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -27,7 +26,7 @@ public void test_2() throws Exception { String sql = "/*+engine=MPP*/ SELECT floor(SMALLINT'123')"; // List statementList = SQLUtils.parseStatements(sql, DbType.mysql, SQLParserFeature.PipesAsConcat); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -38,7 +37,7 @@ public void test_tiny_1() throws Exception { String sql = "/*+engine=MPP*/ SELECT ceil(TINYINT'123')"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -49,7 +48,7 @@ public void test_tiny_2() throws Exception { String sql = "/*+engine=MPP*/ SELECT floor(TINYINT'123')"; // List statementList = SQLUtils.parseStatements(sql, DbType.mysql, SQLParserFeature.PipesAsConcat); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -60,7 +59,7 @@ public void test_big_1() throws Exception { String sql = "/*+engine=MPP*/ SELECT ceil(BIGINT'123')"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -71,47 +70,51 @@ public void test_big_2() throws Exception { String sql = "/*+engine=MPP*/ SELECT floor(BIGINT'123')"; // List statementList = SQLUtils.parseStatements(sql, DbType.mysql, SQLParserFeature.PipesAsConcat); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals("/*+engine=MPP*/\n" + "SELECT floor(BIGINT '123')", stmt.toString()); } + public void test_real_1() throws Exception { String sql = "/*+engine=MPP*/ SELECT floor(REAL '-123.0')"; // List statementList = SQLUtils.parseStatements(sql, DbType.mysql, SQLParserFeature.PipesAsConcat); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals("/*+engine=MPP*/\n" + "SELECT floor(REAL '-123.0')", stmt.toString()); } + public void test_real_2() throws Exception { String sql = "/*+engine=MPP*/ SELECT ceil(REAL '-123.0')"; // List statementList = SQLUtils.parseStatements(sql, DbType.mysql, SQLParserFeature.PipesAsConcat); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals("/*+engine=MPP*/\n" + "SELECT ceil(REAL '-123.0')", stmt.toString()); } + public void test_double_3() throws Exception { String sql = "/*+engine=MPP*/ SELECT floor(CAST(NULL as DOUBLE))"; // List statementList = SQLUtils.parseStatements(sql, DbType.mysql, SQLParserFeature.PipesAsConcat); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals("/*+engine=MPP*/\n" + "SELECT floor(CAST(NULL AS DOUBLE))", stmt.toString()); } + public void test_double_4() throws Exception { String sql = "/*+engine=MPP*/ SELECT floor(CAST(NULL as DECIMAL(25,5)))"; // List statementList = SQLUtils.parseStatements(sql, DbType.mysql, SQLParserFeature.PipesAsConcat); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_union.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_union.java index 8cc613d290..f5a409e79a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_union.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_union.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_168_union extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from tb2 union all(select * from tb2 order by id1);"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_between.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_between.java index 3bc812ad73..a5257699a1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_between.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_between.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_169_not_between extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from t where (a && b) not between 1 and 2;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -28,7 +27,7 @@ public void test_1() throws Exception { String sql = "select (a && b) not between 1 and 2;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_in.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_in.java index 04c6cae5d0..71e40ad8ba 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_in.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_in.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_169_not_in extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT ((10)!=(( (HEX ('abc' )) is FALSE )) ),( (( (( (( 'a')&& (null )) not in(layer_1_left_tb.bigint_test, layer_0_right_tb.smallint_test,layer_1_left_tb.datetime_test,( EXPORT_SET (6, layer_1_left_tb.year_test,'0', ':', 66 ))) )) <(layer_1_left_tb.decimal_test) )) not in(layer_1_left_tb.mediumint_test, layer_1_left_tb.double_test,layer_1_left_tb.year_test,( 1+'1')) )FROM corona_select_one_db_multi_tb AS layer_1_left_tb RIGHT JOIN corona_select_multi_db_one_tb AS layer_1_right_tb ON layer_1_right_tb.datetime_test=layer_1_left_tb.datetime_test RIGHT JOIN corona_select_one_db_multi_tb AS layer_0_right_tb ON layer_0_right_tb.tinyint_1bit_test=layer_1_left_tb.tinyint_1bit_test;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_values.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_values.java index 6d8684bf27..ad6be4d88d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_values.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_values.java @@ -9,30 +9,29 @@ import java.util.List; public class MySqlSelectTest_169_values extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM (VALUES (89), (35), (77)) EXCEPT SELECT * FROM (VALUES (33), (35), (60))"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals("SELECT *\n" + "FROM (\n" + "\tVALUES (89), \n" + "\t(35), \n" + "\t(77)\n" + ")\n" - + "EXCEPT\n" + "SELECT *\n" + "FROM (\n" + "\tVALUES (33), \n" + "\t(35), \n" + "\t(60)\n" - + ")", stmt.toString()); + + "EXCEPT\n" + "SELECT *\n" + "FROM (\n" + "\tVALUES (33), \n" + "\t(35), \n" + "\t(60)\n" + + ")", stmt.toString()); } public void test_2() throws Exception { String sql = "SELECT * FROM (VALUES 89, 35, 77) EXCEPT SELECT * FROM (VALUES 33, 35, 60)"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); assertEquals("SELECT *\n" + "FROM (\n" + "\tVALUES (89), \n" + "\t(35), \n" + "\t(77)\n" + ")\n" + "EXCEPT\n" - + "SELECT *\n" + "FROM (\n" + "\tVALUES (33), \n" + "\t(35), \n" + "\t(60)\n" + ")", stmt.toString()); + + "SELECT *\n" + "FROM (\n" + "\tVALUES (33), \n" + "\t(35), \n" + "\t(60)\n" + ")", stmt.toString()); } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_17.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_17.java index 70bac49519..4b939f8d15 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_17.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_17 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM t1 STRAIGHT_JOIN t2 ON t2.a=t1.a;"; @@ -42,10 +41,10 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); } - + public void test_1() throws Exception { String sql = "SELECT * FROM t1 CROSS JOIN t2"; @@ -63,7 +62,7 @@ public void test_1() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_170_tddl_hint.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_170_tddl_hint.java index 558210dd3f..63ac4f2c45 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_170_tddl_hint.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_170_tddl_hint.java @@ -11,12 +11,11 @@ import java.util.List; public class MySqlSelectTest_170_tddl_hint extends MysqlTest { - public void test_0() throws Exception { String sql = "/*+TDDL({'type':'direct','dbid':'xxx_group'})*/select * from real_table_0;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -33,7 +32,7 @@ public void test_1() throws Exception { String sql = "/*TDDL:DEFER*/select * from real_table_0;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -50,7 +49,7 @@ public void test_2() throws Exception { String sql = "/*TDDL:UNDO_LOG_LIMIT=2000*/select * from real_table_0;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_171_multi_error.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_171_multi_error.java index d626d96733..6de3792f3f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_171_multi_error.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_171_multi_error.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; public class MySqlSelectTest_171_multi_error extends MysqlTest { - public void test_0() throws Exception { String sql = "select 1 select 2"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_172_trim.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_172_trim.java index 73a532dffe..5132654cde 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_172_trim.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_172_trim.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_172_trim extends MysqlTest { - public void test_0() throws Exception { String sql = "select 1 as '\\\"f\\\"a';"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -25,7 +24,7 @@ public void test_1() throws Exception { String sql = "select 1 as \"\\\"f\\\"\";"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -38,7 +37,7 @@ public void test_2() throws Exception { String sql = "select 1 as \"\\\"f\\\"\";"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -51,7 +50,7 @@ public void test_3() throws Exception { String sql = "select 1 as '\\'f\\'';"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -66,7 +65,7 @@ public void test_3x() throws Exception { // System.out.println(sql); // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -79,7 +78,7 @@ public void test_4() throws Exception { // System.out.println(sql); // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -93,7 +92,7 @@ public void test_5() throws Exception { String sql = "select 1 as \"\\\"f\\\"\";"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -107,7 +106,7 @@ public void test_6() throws Exception { String sql = "select 1 as '\n'"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -123,7 +122,7 @@ public void test_7() throws Exception { System.out.println(sql); // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -136,7 +135,7 @@ public void test_8() throws Exception { System.out.println(sql); // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -149,7 +148,7 @@ public void test_9() throws Exception { System.out.println(sql); // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_173.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_173.java index 9adcd471a7..62dd70ad9a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_173.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_173.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlSelectTest_173 extends MysqlTest { - public void test_0() throws Exception { String sql = "/*+engine=MPP*/\n" + " \n" + @@ -87,7 +86,7 @@ public void test_0() throws Exception { " \n"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_174_union.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_174_union.java index b0f1fade4c..892c10856b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_174_union.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_174_union.java @@ -12,12 +12,11 @@ import java.util.List; public class MySqlSelectTest_174_union extends MysqlTest { - public void test_0() throws Exception { String sql = "select id from a where a.id < 10 union select id from b where a.id < 10 limit 10"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_175_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_175_hints.java index 176cd3ae2e..a0106aa036 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_175_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_175_hints.java @@ -12,12 +12,11 @@ import java.util.List; public class MySqlSelectTest_175_hints extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT/!TDDL:t1.id=1 and t2.id=1*/ * FROM t1 INNER JOIN SELECT val FROM t2 WHERE id=1"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_176_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_176_hints.java index e23b810392..971e7e5d1b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_176_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_176_hints.java @@ -12,13 +12,12 @@ import java.util.List; public class MySqlSelectTest_176_hints extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT a.*,b.start_time,b.end_time,b.user_limit,b.member_limit,b.attributes,b.merchant_code,b.terminal FROM wdk_buygift_item a, wdk_online_activity b WHERE a.act_id=b.act_id and a.status =1 and b.status=1 and a.buy_item_id = '564779304647' /* ignore * 107074005 */ and a.shop_id=160039352 and b.start_time <=now() and b.end_time>now() order by act_id desc limit 1"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.EnableSQLBinaryOpExprGroup, SQLParserFeature.OptimizedForParameterized); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_177_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_177_hints.java index 23eb05bcc2..80d83c353d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_177_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_177_hints.java @@ -23,10 +23,9 @@ import java.util.List; public class MySqlSelectTest_177_hints extends MysqlTest { - @Test public void testHintAll() throws Exception { - String [] hintHead = {"/*+TDDL:node('node_name1')*/", + String[] hintHead = {"/*+TDDL:node('node_name1')*/", // "/*+ TDDL({ 'extra' :{ 'MERGE_UNION' : 'false' }, 'type' : 'direct', 'vtab' : 'drds_shard', 'dbid' : 'corona_qatest_1', 'realtabs' :[ 'drds_shard_04', 'drds_shard_05', 'drds_shard_06' ]}) */", // "/!+TDDL: node('node_name1')*/", // "/!TDDL: MASTER()*/", @@ -40,10 +39,10 @@ public void testHintAll() throws Exception { String sql5 = "explain " + hintHead[i] + "insert" + hintHead[i] + " into table_1 values('id < 10');"; String sql6 = "explain " + hintHead[i] + "update" + hintHead[i] + " table_1 set id = 1 where id < 10;"; String sql7 = hintHead[i] + "replace" + hintHead[i] + " into table_1 values('id < 10');"; - String sql[] = {sql1,sql2,sql7,sql3,sql4,sql5,sql6}; + String sql[] = {sql1, sql2, sql7, sql3, sql4, sql5, sql6}; for (int j = 0; j < sql.length; j++) { System.out.println(sql[j]); - String parameterizedSql = ParameterizedOutputVisitorUtils.parameterizeForTDDL(sql[j], DbType.mysql,new ArrayList(),VisitorFeature.OutputParameterizedQuesUnMergeInList, + String parameterizedSql = ParameterizedOutputVisitorUtils.parameterizeForTDDL(sql[j], DbType.mysql, new ArrayList(), VisitorFeature.OutputParameterizedQuesUnMergeInList, VisitorFeature.OutputParameterizedUnMergeShardingTable, VisitorFeature.OutputParameterizedQuesUnMergeValuesList, VisitorFeature.OutputParameterizedQuesUnMergeOr); @@ -68,12 +67,12 @@ public void testHintAll() throws Exception { Assert.assertNotNull(((MySqlDeleteStatement) statement).getHints().size() > 0); System.out.println(((MySqlDeleteStatement) statement).getHeadHintsDirect()); System.out.println(((MySqlDeleteStatement) statement).getHints()); - } else if(statement instanceof MySqlUpdateStatement) { + } else if (statement instanceof MySqlUpdateStatement) { Assert.assertNotNull(((MySqlUpdateStatement) statement).getHeadHintsDirect().size() > 0); Assert.assertNotNull(((MySqlUpdateStatement) statement).getHints().size() > 0); System.out.println(((MySqlUpdateStatement) statement).getHeadHintsDirect()); System.out.println(((MySqlUpdateStatement) statement).getHints()); - } else if(statement instanceof MySqlExplainStatement) { + } else if (statement instanceof MySqlExplainStatement) { SQLStatement statement1 = ((MySqlExplainStatement) statement).getStatement(); if (statement1 instanceof MySqlInsertStatement) { Assert.assertNotNull(((MySqlInsertStatement) statement1).getHint() != null); @@ -83,7 +82,7 @@ public void testHintAll() throws Exception { Assert.assertNotNull(((MySqlDeleteStatement) statement1).getHints().size() > 0); System.out.println(((MySqlDeleteStatement) statement1).getHeadHintsDirect()); System.out.println(((MySqlDeleteStatement) statement1).getHints()); - } else if(statement1 instanceof MySqlUpdateStatement) { + } else if (statement1 instanceof MySqlUpdateStatement) { Assert.assertNotNull(((MySqlUpdateStatement) statement1).getHints().size() > 0); System.out.println(((MySqlUpdateStatement) statement1).getHeadHintsDirect()); System.out.println(((MySqlUpdateStatement) statement1).getHints()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_178.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_178.java index f299fc78e9..5870d7feb7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_178.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_178.java @@ -11,13 +11,12 @@ import java.util.List; public class MySqlSelectTest_178 extends MysqlTest { - public void test_0() throws Exception { String sql = "select rt_dws_csn_sta_lgt_ord_ri.metrics_id as yujiu from rt_dws_csn_sta_lgt_ord_ri CROSS JOIN rt_dws_csn_sta_lgt_ord_mi ;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.EnableSQLBinaryOpExprGroup, SQLParserFeature.OptimizedForParameterized); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_179.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_179.java index 0839fe9ea2..6a840819e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_179.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_179.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_179 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT zip(ARRAY[1, 2], ARRAY['1b', null, '3b'])"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -27,7 +26,7 @@ public void test_1() throws Exception { String sql = "SELECT transform(ARRAY [], x -> x + 1);"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -40,7 +39,7 @@ public void test_2() throws Exception { String sql = "SELECT reduce(ARRAY [5, 20, NULL, 50], 0, (s, x) -> IF(x IS NULL, s, s + x), s -> s);"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_18.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_18.java index e3adb64b66..29bf64512e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_18.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_18 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT host.id as id" // + ", host.item_id as itemId" // @@ -57,7 +56,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(14, visitor.getColumns().size()); Assert.assertEquals(2, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_180_extract.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_180_extract.java index 90e8742349..a273432074 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_180_extract.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_180_extract.java @@ -9,12 +9,11 @@ import java.util.List; public class MySqlSelectTest_180_extract extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT extract(day_of_week FROM '2001-08-22 03:04:05.321');"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -25,7 +24,7 @@ public void test_1() throws Exception { String sql = "SELECT extract(dow FROM '2001-08-22 03:04:05.321');"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -36,7 +35,7 @@ public void test_2() throws Exception { String sql = "SELECT extract(day_of_month FROM '2001-08-22 03:04:05.321');"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -47,7 +46,7 @@ public void test_3() throws Exception { String sql = "SELECT extract(day_of_year FROM '2001-08-22 03:04:05.321');"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -58,7 +57,7 @@ public void test_4() throws Exception { String sql = "SELECT extract(year_of_week FROM '2001-08-22 03:04:05.321');"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -69,7 +68,7 @@ public void test_5() throws Exception { String sql = "SELECT extract(doy FROM '2001-08-22 03:04:05.321');"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -80,7 +79,7 @@ public void test_6() throws Exception { String sql = "SELECT extract(yow FROM '2001-08-22 03:04:05.321');"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_181_limit.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_181_limit.java index 6ede6a72e4..2ffc285b12 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_181_limit.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_181_limit.java @@ -28,7 +28,6 @@ import java.util.List; public class MySqlSelectTest_181_limit extends MysqlTest { - public void test_0() throws Exception { String sql = "(select 1) limit 1;"; @@ -60,7 +59,7 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); assertEquals("(SELECT 1\n" + "LIMIT 1);", // - output); + output); } public void test_1() throws Exception { @@ -100,6 +99,6 @@ public void test_1() throws Exception { ") A\n" + "ORDER BY A.int_test, A.string_test)\n" + "LIMIT 1000", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_182.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_182.java index 77ce333100..22aeda40ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_182.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_182.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlSelectTest_182 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT cid FROM \"wenyu_meta_test\".\"WENYU_META_TEST_02\" LIMIT 4"; @@ -66,6 +65,6 @@ public void test_0() throws Exception { assertEquals("SELECT cid\n" + "FROM \"wenyu_meta_test\".\"WENYU_META_TEST_02\"\n" + "LIMIT 4", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_183_mpp.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_183_mpp.java index bf45c6c36c..7a07896c59 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_183_mpp.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_183_mpp.java @@ -30,7 +30,6 @@ import java.util.List; public class MySqlSelectTest_183_mpp extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT \"cid\", 3 + \"f2\" FROM \"wenyu_meta_test\".\"WENYU_META_TEST_02\" LIMIT 4"; @@ -71,7 +70,7 @@ public void test_0() throws Exception { assertEquals("SELECT \"cid\", 3 + \"f2\"\n" + "FROM \"wenyu_meta_test\".\"WENYU_META_TEST_02\"\n" + "LIMIT 4", // - output); + output); assertEquals("wenyu_meta_test.WENYU_META_TEST_02", visitor.getTables().entrySet().iterator().next().getKey().getName()); assertEquals("cid", visitor.getColumns().iterator().next().getName()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_184.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_184.java index 308bc00963..15d13b2d93 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_184.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_184.java @@ -28,7 +28,6 @@ import java.util.List; public class MySqlSelectTest_184 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT \"B\".\"col_new\" FROM \"wenyu_meta_test\".\"WENBO6_CONFIG_TEST\" AS \"a\", \"wenyu_meta_test\".\"WENYU_CONFIG_TEST\" AS \"b\" WHERE \"A\".\"cid\" = \"B\".\"cid\" AND \"A\".\"cname\" = \"B\".\"cname\" LIMIT 4"; @@ -70,7 +69,7 @@ public void test_0() throws Exception { "WHERE A.\"cid\" = B.\"cid\"\n" + "\tAND A.\"cname\" = B.\"cname\"\n" + "LIMIT 4", // - output); + output); } public void test_1() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_185.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_185.java index 44a68181fb..b85e5fa30c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_185.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_185.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlSelectTest_185 extends MysqlTest { - public void test_0() throws Exception { String sql = "select\n" + "product.brand_id,\n" + @@ -88,7 +87,7 @@ public void test_0() throws Exception { "\t\tAND 1)\n" + "\tAND (product.master_color = 1)\n" + "ORDER BY product.sort ASC", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_186.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_186.java index d975d5b504..2eba2cb759 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_186.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_186.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlSelectTest_186 extends MysqlTest { - public void test_0() throws Exception { String sql = "select count(0) from (SELECT * FROM auth_tenant WHERE type = 'tenant' AND name LIKE ?\"%\") tmp_count"; @@ -63,7 +62,7 @@ public void test_0() throws Exception { "\tWHERE type = 'tenant'\n" + "\t\tAND name LIKE CONCAT(?, '%')\n" + ") tmp_count", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_187.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_187.java index d59ff2d57e..1ccbf93931 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_187.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_187.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_187 extends MysqlTest { - public void test_0() throws Exception { String sql = "select coach_id, tournament_name ,tournament_id, season_id, season, count(1) as num,\n" + "sum(case when wdl = 0 then 1 else 0 end) as loss,\n" + @@ -113,7 +112,7 @@ public void test_0() throws Exception { "\tAND coach_id = 5075\n" + "GROUP BY coach_id, tournament_name, tournament_id, season_id, season\n" + "ORDER BY season_id DESC", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_188.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_188.java index 43f465dedb..f4373f84b7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_188.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_188.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_188 extends MysqlTest { - public void test_0() throws Exception { String sql = "( ( SELECT user_id FROM (select user_id, havana_id, create_time, reg_days, own, reg_own_group, reg_src_group, reg_channel, src, global_city_name, locale, cid, cid_name, account_certify_type, certified_from, certified_time, certify_type, is_certified, account_type, address, age, sex, birthday, global_province_name, group_phone_area_no, group_phone_zone_no, l_level, crm_label, account_structure, account_frozen, hid_b2b, hid_taobao, is_aliyun_test_user, is_aliyun_user, is_enterprise, is_enterprise_account, is_global_user, is_net_test_user, is_oversea_user, is_valid_reg_user, is_net_user, parent_pk, taobao_account, update_time, user_region, fenxiao_create_time, fenxiao_label, fenxiao_parent_uid, fenxiao_region, crm_customer_priority, crm_customer_rank, order_cnt, cloud_order_cnt, cloud_market_order_cnt, count_ecs_paid_order, count_rds_paid_order, count_oss_paid_order, count_cdn_paid_order, count_slb_paid_order, count_nas_paid_order, count_mongodb_paid_order, count_eip_paid_order, count_redis_paid_order, count_communicate_paid_order, is_paid_retain, count_1_all_visit, count_7_all_visit, count_15_all_visit, count_30_all_visit, is_retain_d,count_1_yq_visit,count_7_yq_visit,count_15_yq_visit,count_30_yq_visit,count_1_promotion_visit,count_7_promotion_visit,count_15_promotion_visit,count_30_promotion_visit,count_1_market_visit,count_7_market_visit,count_15_market_visit,count_30_market_visit,count_1_search_visit,count_7_search_visit,count_15_search_visit,count_30_search_visit,count_1_help_visit,count_7_help_visit,count_15_help_visit,count_30_help_visit,count_7_domain_visit,count_15_domain_visit,count_30_domain_visit,count_1_beian_visit,count_7_beian_visit,count_15_beian_visit,count_30_beian_visit,count_1_wanwang_visit,count_7_wanwang_visit,count_15_wanwang_visit,count_30_wanwang_visit,count_1_domain_visit,crm_biz_category,cloud_pay_greater_zero_order_cnt, retain_cnt_d, retain_cnt_ecs_d, retain_cnt_rds_d, retain_cnt_oss_d, retain_cnt_cdn_d, retain_cnt_slb_d, retain_cnt_nas_d, retain_cnt_mangodb_d, retain_cnt_eip_d, retain_cnt_redis_d, retain_cnt_communication_d, retain_cnt_domain_d, retain_cnt_email_d, retain_cnt_dns_d from user_info_offline where user_id = 1953401122571952) WHERE create_time>'2018-01-01 00:00:00' EXCEPT SELECT user_id FROM (select user_id, create_time, reg_channel, src, certified_from, certified_time, account_certify_type, is_certified, crm_label, order_cnt, cloud_order_cnt, cloud_market_order_cnt, count_ecs_paid_order, count_rds_paid_order, count_oss_paid_order, count_cdn_paid_order, count_slb_paid_order, count_nas_paid_order, count_mongodb_paid_order, count_eip_paid_order, count_redis_paid_order, count_communicate_paid_order from user_info_online where user_id = 1953401122571952) ) UNION SELECT coalesce(a.user_id, b.user_id) as user_id FROM (select user_id, create_time, reg_channel, src, certified_from, certified_time, account_certify_type, is_certified, crm_label, order_cnt, cloud_order_cnt, cloud_market_order_cnt, count_ecs_paid_order, count_rds_paid_order, count_oss_paid_order, count_cdn_paid_order, count_slb_paid_order, count_nas_paid_order, count_mongodb_paid_order, count_eip_paid_order, count_redis_paid_order, count_communicate_paid_order from user_info_online where user_id = 1953401122571952) a LEFT JOIN (select user_id, havana_id, create_time, reg_days, own, reg_own_group, reg_src_group, reg_channel, src, global_city_name, locale, cid, cid_name, account_certify_type, certified_from, certified_time, certify_type, is_certified, account_type, address, age, sex, birthday, global_province_name, group_phone_area_no, group_phone_zone_no, l_level, crm_label,account_structure, account_frozen, hid_b2b, hid_taobao, is_aliyun_test_user, is_aliyun_user, is_enterprise, is_enterprise_account, is_global_user, is_net_test_user, is_oversea_user, is_valid_reg_user, is_net_user, parent_pk, taobao_account, update_time, user_region, fenxiao_create_time, fenxiao_label, fenxiao_parent_uid, fenxiao_region, crm_customer_priority, crm_customer_rank,order_cnt, cloud_order_cnt, cloud_market_order_cnt, count_ecs_paid_order, count_rds_paid_order, count_oss_paid_order, count_cdn_paid_order, count_slb_paid_order, count_nas_paid_order, count_mongodb_paid_order, count_eip_paid_order, count_redis_paid_order, count_communicate_paid_order, is_paid_retain, count_1_all_visit, count_7_all_visit, count_15_all_visit, count_30_all_visit, is_retain_d,count_1_yq_visit,count_7_yq_visit,count_15_yq_visit,count_30_yq_visit,count_1_promotion_visit,count_7_promotion_visit,count_15_promotion_visit,count_30_promotion_visit,count_1_market_visit,count_7_market_visit,count_15_market_visit,count_30_market_visit,count_1_search_visit,count_7_search_visit,count_15_search_visit,count_30_search_visit,count_1_help_visit,count_7_help_visit,count_15_help_visit,count_30_help_visit,count_7_domain_visit,count_15_domain_visit,count_30_domain_visit,count_1_beian_visit,count_7_beian_visit,count_15_beian_visit,count_30_beian_visit,count_1_wanwang_visit,count_7_wanwang_visit,count_15_wanwang_visit,count_30_wanwang_visit,count_1_domain_visit,crm_biz_category,cloud_pay_greater_zero_order_cnt, retain_cnt_d, retain_cnt_ecs_d, retain_cnt_rds_d, retain_cnt_oss_d, retain_cnt_cdn_d, retain_cnt_slb_d, retain_cnt_nas_d, retain_cnt_mangodb_d, retain_cnt_eip_d, retain_cnt_redis_d, retain_cnt_communication_d, retain_cnt_domain_d, retain_cnt_email_d, retain_cnt_dns_d from user_info_offline where user_id = 1953401122571952) b ON a.user_id = b.user_id WHERE ( (a.create_time>'2018-01-01 00:00:00') or (a.create_time is null and b.create_time>'2018-01-01 00:00:00') ) ) INTERSECT ( SELECT coalesce(a.user_id, b.user_id) as user_id FROM (select user_id, create_time, reg_channel, src, certified_from, certified_time, account_certify_type, is_certified, crm_label, order_cnt, cloud_order_cnt, cloud_market_order_cnt, count_ecs_paid_order, count_rds_paid_order, count_oss_paid_order, count_cdn_paid_order, count_slb_paid_order, count_nas_paid_order, count_mongodb_paid_order, count_eip_paid_order, count_redis_paid_order, count_communicate_paid_order from user_info_online where user_id = 1953401122571952) a FULL JOIN (select user_id, havana_id, create_time, reg_days, own, reg_own_group, reg_src_group, reg_channel, src, global_city_name, locale, cid, cid_name, account_certify_type, certified_from, certified_time, certify_type, is_certified, account_type, address, age, sex, birthday, global_province_name, group_phone_area_no, group_phone_zone_no, l_level, crm_label,account_structure, account_frozen, hid_b2b, hid_taobao, is_aliyun_test_user, is_aliyun_user, is_enterprise, is_enterprise_account, is_global_user, is_net_test_user, is_oversea_user, is_valid_reg_user, is_net_user, parent_pk, taobao_account, update_time, user_region, fenxiao_create_time, fenxiao_label, fenxiao_parent_uid, fenxiao_region, crm_customer_priority, crm_customer_rank,order_cnt, cloud_order_cnt, cloud_market_order_cnt, count_ecs_paid_order, count_rds_paid_order, count_oss_paid_order, count_cdn_paid_order, count_slb_paid_order, count_nas_paid_order, count_mongodb_paid_order, count_eip_paid_order, count_redis_paid_order, count_communicate_paid_order, is_paid_retain, count_1_all_visit, count_7_all_visit, count_15_all_visit, count_30_all_visit, is_retain_d,count_1_yq_visit,count_7_yq_visit,count_15_yq_visit,count_30_yq_visit,count_1_promotion_visit,count_7_promotion_visit,count_15_promotion_visit,count_30_promotion_visit,count_1_market_visit,count_7_market_visit,count_15_market_visit,count_30_market_visit,count_1_search_visit,count_7_search_visit,count_15_search_visit,count_30_search_visit,count_1_help_visit,count_7_help_visit,count_15_help_visit,count_30_help_visit,count_7_domain_visit,count_15_domain_visit,count_30_domain_visit,count_1_beian_visit,count_7_beian_visit,count_15_beian_visit,count_30_beian_visit,count_1_wanwang_visit,count_7_wanwang_visit,count_15_wanwang_visit,count_30_wanwang_visit,count_1_domain_visit,crm_biz_category,cloud_pay_greater_zero_order_cnt, retain_cnt_d, retain_cnt_ecs_d, retain_cnt_rds_d, retain_cnt_oss_d, retain_cnt_cdn_d, retain_cnt_slb_d, retain_cnt_nas_d, retain_cnt_mangodb_d, retain_cnt_eip_d, retain_cnt_redis_d, retain_cnt_communication_d, retain_cnt_domain_d, retain_cnt_email_d, retain_cnt_dns_d from user_info_offline where user_id = 1953401122571952) b ON a.user_id = b.user_id WHERE ( (a.account_certify_type='personal') or (a.account_certify_type is null and b.account_certify_type='personal') ) )"; @@ -16,7 +15,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_189.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_189.java index 76b165d98f..12d19f2def 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_189.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_189.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_189 extends MysqlTest { - public void test_0() throws Exception { String sql = "select 10 / ( 2 * 2) / 2;"; @@ -16,7 +15,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_19.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_19.java index 917623d08c..7a1024ec6c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_19.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_19 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM mj_list WHERE ( uid = 1 ) AND ( status = 1 ) ORDER BY view DESC LIMIT 10"; @@ -42,7 +41,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(4, visitor.getColumns().size()); Assert.assertEquals(2, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_190_drds.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_190_drds.java index 490e413d94..84158b6605 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_190_drds.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_190_drds.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_190_drds extends MysqlTest { - public void test_0() throws Exception { String sql = "/*TDDL:SOCKET_TIMEOUT=0*/\n" + "/*+TDDL({\"extra\":{\"ALLOW_FULL_TABLE_SCAN\":\"TRUE\"}})*/ \n" + @@ -19,7 +18,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_191_specialName.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_191_specialName.java index 5f605e3b87..f3b5e28121 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_191_specialName.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_191_specialName.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_191_specialName extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from t$c t"; @@ -16,7 +15,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_192_ibatis.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_192_ibatis.java index 4d19f8a087..c24c7e522b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_192_ibatis.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_192_ibatis.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_192_ibatis extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from ${table_name} \n" + "where ${column_name} in ( #{valueList} )"; @@ -17,7 +16,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_193_ibatis.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_193_ibatis.java index e0975f1423..b1f92c5000 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_193_ibatis.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_193_ibatis.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_193_ibatis extends MysqlTest { - public void test_0() throws Exception { String sql = "select a from x where a in (${x})"; @@ -16,7 +15,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_194_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_194_dla.java index ad3b474878..a075f5fd2f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_194_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_194_dla.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_194_dla extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT id, bool_col FROM\n" + "TABLE temp_2\n" + @@ -36,7 +35,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_195_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_195_dla.java index d5912dd920..e9521746ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_195_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_195_dla.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_195_dla extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT $1, $2, $3 FROM\n" + "TABLE temp_1\n" + @@ -18,7 +17,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_196_wall.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_196_wall.java index d99dc93b06..3ac5bfe7b6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_196_wall.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_196_wall.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlSelectTest_196_wall extends MysqlTest { - public void test_0() throws Exception { String sql = "update task_info set priority = 1, content = 'x渓螼h\u0013[\u0014\u0006饆蜭�)漉=灔�\u000B\u0011\u0011u�\uE06A圥Z[\u0017殞c怈﹝櫃&c摍0\u007Fj璟\u0004]JWRb峌膮埜\u0014譢\"瓺\\\\塼!.D牡玕\"邥\t� 佥篼緖.W=Rw4�\u001E3\t玭YF螭�\u0004�);\u0011�I\u0017�%\u0017谦漜f*\bm梄恀拒t)/�I�\"uSP蟉�\u0006I3\\\"�\u0016敐\f\\Z殷觀n\\\"餭讖;祵Y換g\uE5B7&柋\u0017�\u0011﹗A欍媞(I=\u0010�x鐹�\u000B!蜿\u0006\u0013�lQw�(33毳圳倀!\uE324=&释烃襲�&b\uE1EF�\u0013mm孺L\u0014嚍_MS7湏痘笫滴;y鶲\b爱骤求秩G-\u001By~殿揀\uE222�\u0003鮝[�Dqo:蟎'~=裼�\u001F垴蟵\\rY�\u0013.\uE3F9R\u000E�\u0012滂燶n鑲�\u0002贛龎=\u0010ミ�\u0007/%�\u001C癳c�\u000E\\Z旊\u001B�\u000B2栣玄岜�#cc吜\uE6C5�\u001B嚮醽nx�\u001B巘肅輕4E鎊\u0018E\u0018跴欱貯i\u0007蘉渚秘\u0007c\u00129狓\u0004F\u001F\f\u0013�觠3\u000B��-XS8�\u0010�\u0019V\u001E諭餸�\u000Fk\\r|\u0014V\u0005躒_A彙?E�*�\u0015琔�\u001Ep共\u000B�\u0006Z\u001F�%楳�\u001D\u001C玾郳\"\uE26B\u0011�\u0006Jｊ\u0016h\u0005�\u001C�\u0002�\u0002�\u0004j貌`.�\u0001�\u0005韁\"�\u0006z佉\u0012�\u001CxQ�\u0007\u0017@呃-斵曼\\0k砛0k\u0003鬨Z\uE5E9\u007F\u0006^�\u000Es\u0005欳B�\f\\0\\0��+僜'�', attribute = 0, create_time = from_unixtime(1531714297) where id = 2726633030"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_197.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_197.java index 922f616a47..96010902b9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_197.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_197.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_197 extends MysqlTest { - public void test_0() throws Exception { String sql = "select \"\"\"1\"\"\"\"\" as a;"; @@ -16,7 +15,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -32,7 +31,7 @@ public void test_1() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -48,7 +47,7 @@ public void test_2() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -64,7 +63,7 @@ public void test_3() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -73,13 +72,13 @@ public void test_3() throws Exception { } public void test_4() throws Exception { - String sql = "select '\\'1\\'\\'' as a;"; + String sql = "select '\\'1\\'\\'' as a;"; System.out.println(sql); MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_198.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_198.java index d4655e612c..030ea46472 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_198.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_198.java @@ -9,7 +9,6 @@ import java.util.List; public class MySqlSelectTest_198 extends MysqlTest { - public void test_0() throws Exception { String sql = "select `orders_text_date`.`o_clerk` as o_clerk, `orders_text_date`.`o_comment` as o_comment, `orders_text_date`.`o_custkey` as o_custkey, `orders_text_date`.`o_orderdate` as o_orderdate, `orders_text_date`.`o_orderkey` as o_orderkey , `orders_text_date`.`o_orderpriority` as o_orderpriority, `orders_text_date`.`o_orderstatus` as o_orderstatus, `orders_text_date`.`o_shippriority` as o_shippriority, `orders_text_date`.`o_totalprice` as o_totalprice from hive.oa1013022312866336_bj_tpch_10x_oss.orders_text_date limit 1000"; @@ -17,7 +16,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql, SQLParserFeature.IgnoreNameQuotes); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_199_hint.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_199_hint.java index 4aec967442..931a6ae076 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_199_hint.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_199_hint.java @@ -27,10 +27,9 @@ import java.util.List; public class MySqlSelectTest_199_hint extends MysqlTest { - public void test_0() throws Exception { String sql = " SELECT NAME \n" + " FROM CUSTOMER \n" + " INNER JOIN ORDERS ON\n" - + " CUSTOMER.CUSTKEY = ORDERS.CUSTKEY /*+ dynamicFilter = true */\n"; + + " CUSTOMER.CUSTKEY = ORDERS.CUSTKEY /*+ dynamicFilter = true */\n"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -41,14 +40,14 @@ public void test_0() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT NAME\n" + "FROM CUSTOMER\n" - + "\tINNER JOIN ORDERS ON CUSTOMER.CUSTKEY = ORDERS.CUSTKEY/*+ dynamicFilter = true*/", // - output); + + "\tINNER JOIN ORDERS ON CUSTOMER.CUSTKEY = ORDERS.CUSTKEY/*+ dynamicFilter = true*/", // + output); } } public void test_1() throws Exception { String sql = "SELECT NAME\n" + " FROM CUSTOMER, ORDERS\n" - + " WHERE CUSTOMER.CUSTKEY = ORDERS.CUSTKEY /*+ dynamicFilter = true*/ \n"; + + " WHERE CUSTOMER.CUSTKEY = ORDERS.CUSTKEY /*+ dynamicFilter = true*/ \n"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -62,17 +61,17 @@ public void test_1() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT NAME\n" + "FROM CUSTOMER, ORDERS\n" - + "WHERE CUSTOMER.CUSTKEY = ORDERS.CUSTKEY/*+ dynamicFilter = true*/", // - output); + + "WHERE CUSTOMER.CUSTKEY = ORDERS.CUSTKEY/*+ dynamicFilter = true*/", // + output); } } public void test_2() throws Exception { String sql = "SELECT NAME \n" - + " FROM CUSTOMER \n" - + " WHERE CUSTOMER.CUSTKEY IN ( \n" - + " SELECT CUSTKEY FROM ORDERS\n" - + " ) /*+ DYNAMICFILTER = TRUE*/"; + + " FROM CUSTOMER \n" + + " WHERE CUSTOMER.CUSTKEY IN ( \n" + + " SELECT CUSTKEY FROM ORDERS\n" + + " ) /*+ DYNAMICFILTER = TRUE*/"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -86,15 +85,15 @@ public void test_2() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT NAME\n" + "FROM CUSTOMER\n" + "WHERE CUSTOMER.CUSTKEY IN (\n" - + "\tSELECT CUSTKEY\n" + "\tFROM ORDERS\n" + ")/*+ DYNAMICFILTER = TRUE*/", // - output); + + "\tSELECT CUSTKEY\n" + "\tFROM ORDERS\n" + ")/*+ DYNAMICFILTER = TRUE*/", // + output); } } public void test_3() throws Exception { String sql = "\n EXPLAIN SELECT name \n" + " FROM customer \n" + " INNER JOIN orders \n" - + " ON customer.custkey=orders.custkey/*+ dynamicFilter=true */ \n" - + " AND customer.nationkey = orders.orderkey/*+ dynamicFilter=true */\n"; + + " ON customer.custkey=orders.custkey/*+ dynamicFilter=true */ \n" + + " AND customer.nationkey = orders.orderkey/*+ dynamicFilter=true */\n"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -108,16 +107,16 @@ public void test_3() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("EXPLAIN SELECT name\n" + "FROM customer\n" + "\tINNER JOIN orders\n" - + "\tON customer.custkey = orders.custkey/*+ dynamicFilter=true*/\n" - + "\t\tAND customer.nationkey = orders.orderkey/*+ dynamicFilter=true*/", // - output); + + "\tON customer.custkey = orders.custkey/*+ dynamicFilter=true*/\n" + + "\t\tAND customer.nationkey = orders.orderkey/*+ dynamicFilter=true*/", // + output); } } public void test_4() throws Exception { String sql = "EXPLAIN SELECT name \n" + " FROM customer \n" + " INNER JOIN orders \n" - + " ON customer.custkey=orders.custkey/*+ dynamicFilter=fdseoi */ \n" - + " AND customer.nationkey = orders.orderkey/*+ dynamicFilter=we */\n"; + + " ON customer.custkey=orders.custkey/*+ dynamicFilter=fdseoi */ \n" + + " AND customer.nationkey = orders.orderkey/*+ dynamicFilter=we */\n"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -135,14 +134,14 @@ public void test_4() throws Exception { "\tINNER JOIN orders\n" + "\tON customer.custkey = orders.custkey/*+ dynamicFilter=fdseoi*/\n" + "\t\tAND customer.nationkey = orders.orderkey/*+ dynamicFilter=we*/", // - output); + output); } } public void test_5() throws Exception { String sql = "EXPLAIN SELECT name \n" + " FROM customer \n" + " INNER JOIN orders \n" - + " ON customer.custkey=orders.custkey/*+ wefwe=true */ \n" - + " AND customer.nationkey = orders.orderkey/* wef=false */\n"; + + " ON customer.custkey=orders.custkey/*+ wefwe=true */ \n" + + " AND customer.nationkey = orders.orderkey/* wef=false */\n"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -160,35 +159,35 @@ public void test_5() throws Exception { "\tINNER JOIN orders\n" + "\tON customer.custkey = orders.custkey/*+ wefwe=true*/\n" + "\t\tAND customer.nationkey = orders.orderkey", // - output); + output); } } public void test_6() throws Exception { String sql = "explain (format text)\n" - + "SELECT c_name,\n" - + " c_custkey,\n" - + " o_orderkey,\n" - + " o_orderdate,\n" - + " o_totalprice,\n" - + " Sum(l_quantity)\n" - + "FROM customer,\n" - + " orders,\n" - + " lineitem\n" - + "WHERE o_orderkey IN (SELECT l_orderkey\n" - + " FROM lineitem\n" - + " GROUP BY l_orderkey\n" - + " HAVING Sum(l_quantity) > 314) /*+dynamicFilter=true*/\n" - + " AND c_custkey = o_custkey\n" - + " AND o_orderkey = l_orderkey\n" - + "GROUP BY c_name,\n" - + " c_custkey,\n" - + " o_orderkey,\n" - + " o_orderdate,\n" - + " o_totalprice\n" - + "ORDER BY o_totalprice DESC,\n" - + " o_orderdate\n" - + "LIMIT 100;"; + + "SELECT c_name,\n" + + " c_custkey,\n" + + " o_orderkey,\n" + + " o_orderdate,\n" + + " o_totalprice,\n" + + " Sum(l_quantity)\n" + + "FROM customer,\n" + + " orders,\n" + + " lineitem\n" + + "WHERE o_orderkey IN (SELECT l_orderkey\n" + + " FROM lineitem\n" + + " GROUP BY l_orderkey\n" + + " HAVING Sum(l_quantity) > 314) /*+dynamicFilter=true*/\n" + + " AND c_custkey = o_custkey\n" + + " AND o_orderkey = l_orderkey\n" + + "GROUP BY c_name,\n" + + " c_custkey,\n" + + " o_orderkey,\n" + + " o_orderdate,\n" + + " o_totalprice\n" + + "ORDER BY o_totalprice DESC,\n" + + " o_orderdate\n" + + "LIMIT 100;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -202,27 +201,27 @@ public void test_6() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("EXPLAIN (FORMAT text) SELECT c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice\n" - + "\t, Sum(l_quantity)\n" + "FROM customer, orders, lineitem\n" - + "WHERE o_orderkey IN (\n" + "\t\tSELECT l_orderkey\n" + "\t\tFROM lineitem\n" - + "\t\tGROUP BY l_orderkey\n" + "\t\tHAVING Sum(l_quantity) > 314\n" - + "\t)/*+dynamicFilter=true*/\n" + "\tAND c_custkey = o_custkey\n" - + "\tAND o_orderkey = l_orderkey\n" - + "GROUP BY c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice\n" - + "ORDER BY o_totalprice DESC, o_orderdate\n" + "LIMIT 100;", // - output); + + "\t, Sum(l_quantity)\n" + "FROM customer, orders, lineitem\n" + + "WHERE o_orderkey IN (\n" + "\t\tSELECT l_orderkey\n" + "\t\tFROM lineitem\n" + + "\t\tGROUP BY l_orderkey\n" + "\t\tHAVING Sum(l_quantity) > 314\n" + + "\t)/*+dynamicFilter=true*/\n" + "\tAND c_custkey = o_custkey\n" + + "\tAND o_orderkey = l_orderkey\n" + + "GROUP BY c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice\n" + + "ORDER BY o_totalprice DESC, o_orderdate\n" + "LIMIT 100;", // + output); } } public void test_7() throws Exception { String sql = "SELECT ss_store_sk, sum(ss_ext_sales_price) ext_price \n" - + "FROM item, store_sales \n" - + "WHERE store_sales.ss_sold_date_sk IN \n" - + " (SELECT d_date_sk FROM date_dim WHERE (d_moy = 11) AND (d_year = 2000)) /*+ dynamicFilter = true*/\n" - + " AND store_sales.ss_item_sk = item.i_item_sk /*+ dynamicFilter = true*/\n" - + " AND item.i_manager_id = 1 \n" - + "GROUP BY ss_store_sk \n" - + "ORDER BY ext_price DESC \n" - + "LIMIT 100\n"; + + "FROM item, store_sales \n" + + "WHERE store_sales.ss_sold_date_sk IN \n" + + " (SELECT d_date_sk FROM date_dim WHERE (d_moy = 11) AND (d_year = 2000)) /*+ dynamicFilter = true*/\n" + + " AND store_sales.ss_item_sk = item.i_item_sk /*+ dynamicFilter = true*/\n" + + " AND item.i_manager_id = 1 \n" + + "GROUP BY ss_store_sk \n" + + "ORDER BY ext_price DESC \n" + + "LIMIT 100\n"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -237,42 +236,42 @@ public void test_7() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals( "SELECT ss_store_sk, sum(ss_ext_sales_price) AS ext_price\n" - + "FROM item, store_sales\n" - + "WHERE store_sales.ss_sold_date_sk IN (\n" - + "\t\tSELECT d_date_sk\n" - + "\t\tFROM date_dim\n" - + "\t\tWHERE d_moy = 11\n" - + "\t\t\tAND d_year = 2000\n" - + "\t)/*+ dynamicFilter = true*/\n" - + "\tAND store_sales.ss_item_sk = item.i_item_sk/*+ dynamicFilter = true*/\n" - + "\tAND item.i_manager_id = 1\n" + "GROUP BY ss_store_sk\n" - + "ORDER BY ext_price DESC\n" - + "LIMIT 100", // + + "FROM item, store_sales\n" + + "WHERE store_sales.ss_sold_date_sk IN (\n" + + "\t\tSELECT d_date_sk\n" + + "\t\tFROM date_dim\n" + + "\t\tWHERE d_moy = 11\n" + + "\t\t\tAND d_year = 2000\n" + + "\t)/*+ dynamicFilter = true*/\n" + + "\tAND store_sales.ss_item_sk = item.i_item_sk/*+ dynamicFilter = true*/\n" + + "\tAND item.i_manager_id = 1\n" + "GROUP BY ss_store_sk\n" + + "ORDER BY ext_price DESC\n" + + "LIMIT 100", // output); } } public void test_8() throws Exception { String sql = "SELECT\n" - + " w_state\n" - + ", i_item_id\n" - + ", sum((CASE WHEN (CAST(d_date AS DATE) < CAST('2000-03-11' AS DATE)) THEN (cs_sales_price - COALESCE(cr_refunded_cash, 0)) ELSE 0 END)) sales_before\n" - + ", sum((CASE WHEN (CAST(d_date AS DATE) >= CAST('2000-03-11' AS DATE)) THEN (cs_sales_price - COALESCE(cr_refunded_cash, 0)) ELSE 0 END)) sales_after\n" - + "FROM\n" - + " ( catalog_sales\n" - + "LEFT JOIN catalog_returns ON (cs_order_number = cr_order_number)\n" - + " AND (cs_item_sk = cr_item_sk))\n" - + ", warehouse\n" - + ", item\n" - + ", date_dim\n" - + "WHERE (i_current_price BETWEEN DECIMAL '0.99' AND DECIMAL '1.49')\n" - + " AND (i_item_sk = cs_item_sk) /*+ dynamicFilter = true*/\n" - + " AND (cs_warehouse_sk = w_warehouse_sk)\n" - + " AND (cs_sold_date_sk = d_date_sk) /*+ dynamicFilter = true*/\n" - + " AND (CAST(d_date AS DATE) BETWEEN (CAST('2000-03-11' AS DATE) - INTERVAL '30' DAY) AND (CAST('2000-03-11' AS DATE) + INTERVAL '30' DAY))\n" - + "GROUP BY w_state, i_item_id\n" - + "ORDER BY w_state ASC, i_item_id ASC\n" - + "LIMIT 100"; + + " w_state\n" + + ", i_item_id\n" + + ", sum((CASE WHEN (CAST(d_date AS DATE) < CAST('2000-03-11' AS DATE)) THEN (cs_sales_price - COALESCE(cr_refunded_cash, 0)) ELSE 0 END)) sales_before\n" + + ", sum((CASE WHEN (CAST(d_date AS DATE) >= CAST('2000-03-11' AS DATE)) THEN (cs_sales_price - COALESCE(cr_refunded_cash, 0)) ELSE 0 END)) sales_after\n" + + "FROM\n" + + " ( catalog_sales\n" + + "LEFT JOIN catalog_returns ON (cs_order_number = cr_order_number)\n" + + " AND (cs_item_sk = cr_item_sk))\n" + + ", warehouse\n" + + ", item\n" + + ", date_dim\n" + + "WHERE (i_current_price BETWEEN DECIMAL '0.99' AND DECIMAL '1.49')\n" + + " AND (i_item_sk = cs_item_sk) /*+ dynamicFilter = true*/\n" + + " AND (cs_warehouse_sk = w_warehouse_sk)\n" + + " AND (cs_sold_date_sk = d_date_sk) /*+ dynamicFilter = true*/\n" + + " AND (CAST(d_date AS DATE) BETWEEN (CAST('2000-03-11' AS DATE) - INTERVAL '30' DAY) AND (CAST('2000-03-11' AS DATE) + INTERVAL '30' DAY))\n" + + "GROUP BY w_state, i_item_id\n" + + "ORDER BY w_state ASC, i_item_id ASC\n" + + "LIMIT 100"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -286,42 +285,42 @@ public void test_8() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT w_state, i_item_id\n" + - "\t, sum(CASE \n" - + "\t\tWHEN CAST(d_date AS DATE) < CAST('2000-03-11' AS DATE) THEN cs_sales_price - COALESCE(cr_refunded_cash, 0)\n" - + "\t\tELSE 0\n" - + "\tEND) AS sales_before\n" - + "\t, sum(CASE \n" - + "\t\tWHEN CAST(d_date AS DATE) >= CAST('2000-03-11' AS DATE) THEN cs_sales_price - COALESCE(cr_refunded_cash, 0)\n" - + "\t\tELSE 0\n" - + "\tEND) AS sales_after\n" - + "FROM catalog_sales\n" - + "\tLEFT JOIN catalog_returns\n" - + "\tON cs_order_number = cr_order_number\n" - + "\t\tAND cs_item_sk = cr_item_sk, warehouse, item, date_dim\n" - + "WHERE i_current_price BETWEEN DECIMAL '0.99' AND DECIMAL '1.49'\n" - + "\tAND i_item_sk = cs_item_sk/*+ dynamicFilter = true*/\n" - + "\tAND cs_warehouse_sk = w_warehouse_sk\n" - + "\tAND cs_sold_date_sk = d_date_sk/*+ dynamicFilter = true*/\n" - + "\tAND CAST(d_date AS DATE) BETWEEN (CAST('2000-03-11' AS DATE) - INTERVAL '30' DAY) AND (CAST('2000-03-11' AS DATE) + INTERVAL '30' DAY)\n" - + "GROUP BY w_state, i_item_id\n" - + "ORDER BY w_state ASC, i_item_id ASC\n" - + "LIMIT 100", // - output); + "\t, sum(CASE \n" + + "\t\tWHEN CAST(d_date AS DATE) < CAST('2000-03-11' AS DATE) THEN cs_sales_price - COALESCE(cr_refunded_cash, 0)\n" + + "\t\tELSE 0\n" + + "\tEND) AS sales_before\n" + + "\t, sum(CASE \n" + + "\t\tWHEN CAST(d_date AS DATE) >= CAST('2000-03-11' AS DATE) THEN cs_sales_price - COALESCE(cr_refunded_cash, 0)\n" + + "\t\tELSE 0\n" + + "\tEND) AS sales_after\n" + + "FROM catalog_sales\n" + + "\tLEFT JOIN catalog_returns\n" + + "\tON cs_order_number = cr_order_number\n" + + "\t\tAND cs_item_sk = cr_item_sk, warehouse, item, date_dim\n" + + "WHERE i_current_price BETWEEN DECIMAL '0.99' AND DECIMAL '1.49'\n" + + "\tAND i_item_sk = cs_item_sk/*+ dynamicFilter = true*/\n" + + "\tAND cs_warehouse_sk = w_warehouse_sk\n" + + "\tAND cs_sold_date_sk = d_date_sk/*+ dynamicFilter = true*/\n" + + "\tAND CAST(d_date AS DATE) BETWEEN (CAST('2000-03-11' AS DATE) - INTERVAL '30' DAY) AND (CAST('2000-03-11' AS DATE) + INTERVAL '30' DAY)\n" + + "GROUP BY w_state, i_item_id\n" + + "ORDER BY w_state ASC, i_item_id ASC\n" + + "LIMIT 100", // + output); } } public void test_9() throws Exception { String sql = "SELECT ss_store_sk, sum(ss_ext_sales_price) ext_price \n" - + "FROM item, store_sales \n" - + "WHERE \n" - + "\tstore_sales.ss_item_sk = item.i_item_sk /*+ dynamicFilter = true*/\n" - + "\tAND store_sales.ss_sold_date_sk IN \n" - + " (SELECT d_date_sk FROM date_dim WHERE (d_moy = 11) AND (d_year = 2000)) /*+ dynamicFilter = true*/\n" - + " \n" - + " AND item.i_manager_id = 1 \n" - + "GROUP BY ss_store_sk \n" - + "ORDER BY ext_price DESC \n" - + "LIMIT 100"; + + "FROM item, store_sales \n" + + "WHERE \n" + + "\tstore_sales.ss_item_sk = item.i_item_sk /*+ dynamicFilter = true*/\n" + + "\tAND store_sales.ss_sold_date_sk IN \n" + + " (SELECT d_date_sk FROM date_dim WHERE (d_moy = 11) AND (d_year = 2000)) /*+ dynamicFilter = true*/\n" + + " \n" + + " AND item.i_manager_id = 1 \n" + + "GROUP BY ss_store_sk \n" + + "ORDER BY ext_price DESC \n" + + "LIMIT 100"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -335,21 +334,22 @@ public void test_9() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT ss_store_sk, sum(ss_ext_sales_price) AS ext_price\n" - + "FROM item, store_sales\n" - + "WHERE store_sales.ss_item_sk = item.i_item_sk/*+ dynamicFilter = true*/\n" - + "\tAND store_sales.ss_sold_date_sk IN (\n" - + "\t\tSELECT d_date_sk\n" - + "\t\tFROM date_dim\n" - + "\t\tWHERE d_moy = 11\n" - + "\t\t\tAND d_year = 2000\n" - + "\t)/*+ dynamicFilter = true*/\n" - + "\tAND item.i_manager_id = 1\n" - + "GROUP BY ss_store_sk\n" - + "ORDER BY ext_price DESC\n" - + "LIMIT 100", // - output); + + "FROM item, store_sales\n" + + "WHERE store_sales.ss_item_sk = item.i_item_sk/*+ dynamicFilter = true*/\n" + + "\tAND store_sales.ss_sold_date_sk IN (\n" + + "\t\tSELECT d_date_sk\n" + + "\t\tFROM date_dim\n" + + "\t\tWHERE d_moy = 11\n" + + "\t\t\tAND d_year = 2000\n" + + "\t)/*+ dynamicFilter = true*/\n" + + "\tAND item.i_manager_id = 1\n" + + "GROUP BY ss_store_sk\n" + + "ORDER BY ext_price DESC\n" + + "LIMIT 100", // + output); } } + public void test_10() throws Exception { String sql = "SELECT count(*)\n" + "FROM orders\n" + @@ -371,9 +371,10 @@ public void test_10() throws Exception { "FROM orders\n" + "\tJOIN lineitem ON o_orderkey = l_orderkey/*+joinMethod=hash,distributionType=partitioned*/\n" + "LIMIT 1", // - output); + output); } } + public void test_11() throws Exception { String sql = "SELECT count(*)\n" + "FROM orders\n" + @@ -395,7 +396,7 @@ public void test_11() throws Exception { "FROM orders\n" + "\tJOIN lineitem ON o_orderkey = l_orderkey/*+joinMethod=hash*/\n" + "LIMIT 1", // - output); + output); } } @@ -472,15 +473,16 @@ public void test_14() throws Exception { "FROM orders o " + "JOIN lineitem l " + "ON o.orderkey = l.orderkey /*+distributionType=partition*/" + - "LIMIT 100";; + "LIMIT 100"; + ; SQLStatement stmt = SQLUtils.parseSingleStatement( - sql, - DbType.mysql, - SQLParserFeature.PipesAsConcat, - SQLParserFeature.EnableSQLBinaryOpExprGroup, - SQLParserFeature.SelectItemGenerateAlias, - SQLParserFeature.EnableMultiUnion); + sql, + DbType.mysql, + SQLParserFeature.PipesAsConcat, + SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.SelectItemGenerateAlias, + SQLParserFeature.EnableMultiUnion); { String output = SQLUtils.toMySqlString(stmt); @@ -497,15 +499,16 @@ public void test_15() throws Exception { "FROM orders o " + "JOIN lineitem l " + "ON o.orderkey = l.orderkey /*+distributionType=repartition*/" + - "LIMIT 100";; + "LIMIT 100"; + ; SQLStatement stmt = SQLUtils.parseSingleStatement( - sql, - DbType.mysql, - SQLParserFeature.PipesAsConcat, - SQLParserFeature.EnableSQLBinaryOpExprGroup, - SQLParserFeature.SelectItemGenerateAlias, - SQLParserFeature.EnableMultiUnion); + sql, + DbType.mysql, + SQLParserFeature.PipesAsConcat, + SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.SelectItemGenerateAlias, + SQLParserFeature.EnableMultiUnion); { String output = SQLUtils.toMySqlString(stmt); @@ -522,15 +525,16 @@ public void test_16() throws Exception { "FROM orders o " + "JOIN lineitem l " + "ON o.orderkey = l.orderkey /*+distributionType=broadcast*/" + - "LIMIT 100";; + "LIMIT 100"; + ; SQLStatement stmt = SQLUtils.parseSingleStatement( - sql, - DbType.mysql, - SQLParserFeature.PipesAsConcat, - SQLParserFeature.EnableSQLBinaryOpExprGroup, - SQLParserFeature.SelectItemGenerateAlias, - SQLParserFeature.EnableMultiUnion); + sql, + DbType.mysql, + SQLParserFeature.PipesAsConcat, + SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.SelectItemGenerateAlias, + SQLParserFeature.EnableMultiUnion); { String output = SQLUtils.toMySqlString(stmt); @@ -547,15 +551,16 @@ public void test_17() throws Exception { "FROM orders o " + "JOIN lineitem l " + "ON o.orderkey = l.orderkey /*+distribution_type=broadcast*/" + - "LIMIT 100";; + "LIMIT 100"; + ; SQLStatement stmt = SQLUtils.parseSingleStatement( - sql, - DbType.mysql, - SQLParserFeature.PipesAsConcat, - SQLParserFeature.EnableSQLBinaryOpExprGroup, - SQLParserFeature.SelectItemGenerateAlias, - SQLParserFeature.EnableMultiUnion); + sql, + DbType.mysql, + SQLParserFeature.PipesAsConcat, + SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.SelectItemGenerateAlias, + SQLParserFeature.EnableMultiUnion); { String output = SQLUtils.toMySqlString(stmt); @@ -575,12 +580,12 @@ public void test_18() throws Exception { "LIMIT 100"; SQLStatement stmt = SQLUtils.parseSingleStatement( - sql, - DbType.mysql, - SQLParserFeature.PipesAsConcat, - SQLParserFeature.EnableSQLBinaryOpExprGroup, - SQLParserFeature.SelectItemGenerateAlias, - SQLParserFeature.EnableMultiUnion); + sql, + DbType.mysql, + SQLParserFeature.PipesAsConcat, + SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.SelectItemGenerateAlias, + SQLParserFeature.EnableMultiUnion); { String output = SQLUtils.toMySqlString(stmt); @@ -596,12 +601,12 @@ public void test_19() throws Exception { String sql = "select count(*) from t1 inner join t2 on t1.col1=t2.col1 and t1.col2=t2.col2 /*+join_criteria=2*/;"; SQLStatement stmt = SQLUtils.parseSingleStatement( - sql, - DbType.mysql, - SQLParserFeature.PipesAsConcat, - SQLParserFeature.EnableSQLBinaryOpExprGroup, - SQLParserFeature.SelectItemGenerateAlias, - SQLParserFeature.EnableMultiUnion); + sql, + DbType.mysql, + SQLParserFeature.PipesAsConcat, + SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.SelectItemGenerateAlias, + SQLParserFeature.EnableMultiUnion); { String output = SQLUtils.toMySqlString(stmt); @@ -618,12 +623,12 @@ public void test_20() throws Exception { String sql = "select count(*) from t1, t2 where t1.col1=t2.col1 and t1.col2=t2.col2 /*+join_criteria=2*/;"; SQLStatement stmt = SQLUtils.parseSingleStatement( - sql, - DbType.mysql, - SQLParserFeature.PipesAsConcat, - SQLParserFeature.EnableSQLBinaryOpExprGroup, - SQLParserFeature.SelectItemGenerateAlias, - SQLParserFeature.EnableMultiUnion); + sql, + DbType.mysql, + SQLParserFeature.PipesAsConcat, + SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.SelectItemGenerateAlias, + SQLParserFeature.EnableMultiUnion); { String output = SQLUtils.toMySqlString(stmt); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_2.java index d4df8fc581..d34aa4f8af 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_2.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlSelectTest_2 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT college, region, seed FROM tournament ORDER BY 2, 3;"; @@ -44,7 +43,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(3, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); @@ -64,8 +63,8 @@ public void test_1() throws Exception { SQLStatement statemen = statementList.get(0); assertEquals("SELECT *\n" - + "FROM tournament\n" - + "ORDER BY 2, 3\n" - + "LIMIT 10;", statemen.toString()); + + "FROM tournament\n" + + "ORDER BY 2, 3\n" + + "LIMIT 10;", statemen.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java index 4d13d3b6ad..f37c528514 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java @@ -26,14 +26,13 @@ import java.util.List; public class MySqlSelectTest_20 extends MysqlTest { - public void test_0() throws Exception { String sql = "select bsvariety, max(bsh) as bsh, min(bsl) as bsl " + " from exchange_market_info " + " where bsdate>date_sub(now(),interval 1 day)" + " group by bsvariety desc;"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -48,19 +47,19 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertTrue(visitor.getColumns().contains(new Column("exchange_market_info", "bsvariety"))); Assert.assertTrue(visitor.getColumns().contains(new Column("exchange_market_info", "bsh"))); Assert.assertTrue(visitor.getColumns().contains(new Column("exchange_market_info", "bsl"))); Assert.assertTrue(visitor.getColumns().contains(new Column("exchange_market_info", "bsdate"))); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(4, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + String output = SQLUtils.toMySqlString(stmt); - + Assert.assertEquals("SELECT bsvariety, max(bsh) AS bsh, min(bsl) AS bsl" + "\nFROM exchange_market_info" + "\nWHERE bsdate > date_sub(now(), INTERVAL 1 DAY)" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_200_presto.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_200_presto.java index 2d538d7768..74f1735ffc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_200_presto.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_200_presto.java @@ -25,11 +25,10 @@ import java.util.List; public class MySqlSelectTest_200_presto extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT TINYINT '1', SMALLINT '1', FLOAT '1.0', DOUBLE '2.0'"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -43,11 +42,11 @@ public void test_0() throws Exception { Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT TINYINT '1', SMALLINT '1', FLOAT '1.0', DOUBLE '2.0'", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_201.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_201.java index cdf8a6d889..6c2491e781 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_201.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_201.java @@ -25,11 +25,10 @@ import java.util.List; public class MySqlSelectTest_201 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from test_type2 inner join (values (1, 'a'), (2, 'b'), (3, 'c')) as t (id, name) on v_int = t.id;"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -43,7 +42,7 @@ public void test_0() throws Exception { Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *\n" + @@ -53,7 +52,7 @@ public void test_0() throws Exception { "\t\t(2, 'b'), \n" + "\t\t(3, 'c')\n" + "\t) AS t (id, name) ON v_int = t.id;", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20190424_01.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20190424_01.java index 6c6823ee4e..2eebc5bec7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20190424_01.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20190424_01.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_20190424_01 extends MysqlTest { - public void test_0() throws Exception { String sql = "/*+ engine= MPP, dump-header= [DUMP DATA]*/\n" + "SELECT t3.sim_aid AS __aid\n" + @@ -101,5 +100,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_202.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_202.java index 84e30071f1..ce7f776c16 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_202.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_202.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlSelectTest_202 extends TestCase { - public void test_0() throws Exception { String sql = "SELECT CURRENT_DATE, CURRENT_TIMESTAMP, CURRENT_TIME, CURDATE, LOCALTIME, LOCALTIMESTAMP;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_203_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_203_dla.java index 12dad75b36..ceab6d3456 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_203_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_203_dla.java @@ -19,7 +19,6 @@ import java.util.List; public class MySqlSelectTest_203_dla extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT $1, $2 FROM\n" + "TABLE temp_1\n" + @@ -38,7 +37,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_204_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_204_dla.java index 46221c3862..e6259839af 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_204_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_204_dla.java @@ -22,7 +22,6 @@ import java.util.List; public class MySqlSelectTest_204_dla extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT temp_1.$1, temp_2.smallint_col\n" + "FROM \n" + @@ -69,7 +68,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_205_drds_group_concat.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_205_drds_group_concat.java index dcb8d0dbe8..cf6ab5542f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_205_drds_group_concat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_205_drds_group_concat.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_205_drds_group_concat extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT student_name,\n" + " GROUP_CONCAT(DISTINCT test_score\n" + @@ -33,7 +32,7 @@ public void test_0() throws Exception { " FROM student\n" + " GROUP BY student_name;"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -47,13 +46,13 @@ public void test_0() throws Exception { Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertEquals(1, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT student_name, GROUP_CONCAT(DISTINCT test_score ORDER BY test_score DESC SEPARATOR ' ')\n" + "FROM student\n" + "GROUP BY student_name;", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_206_union.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_206_union.java index 84ad2c76cc..b58abd9d94 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_206_union.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_206_union.java @@ -24,12 +24,11 @@ import java.util.List; public class MySqlSelectTest_206_union extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT uid FROM (select uid, cid, category, empid from comb_opportunity_sales_relation_online where uid = 1723876714657374) \n" + "union SELECT uid FROM (select uid, cid, category, empid from comb_opportunity_sales_relation_offline where uid = 1723876714657374) "; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_207_cast.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_207_cast.java index 96c1e24b61..5d14978769 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_207_cast.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_207_cast.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlSelectTest_207_cast extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT a.key_label as keyLabel,\n" + " a.key_type_cd as keyType,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_209_not.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_209_not.java index 197d0e58da..58d889afeb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_209_not.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_209_not.java @@ -26,11 +26,10 @@ import java.util.List; public class MySqlSelectTest_209_not extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from a where not id > 50"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_21.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_21.java index add87f06f6..3699369388 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_21.java @@ -24,11 +24,10 @@ import java.util.List; public class MySqlSelectTest_21 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from order where a=1 order by b"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); @@ -43,18 +42,18 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(3, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getConditions().size()); Assert.assertEquals(1, visitor.getOrderByColumns().size()); } - - + + public void test_1() throws Exception { String sql = "select order from t where a=1 order by b"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); @@ -69,7 +68,7 @@ public void test_1() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(3, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_210_union.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_210_union.java index 9b6e9db1b8..f9c4aaa668 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_210_union.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_210_union.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_210_union extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT count(*)\n" + "FROM (\n" + @@ -45,7 +44,7 @@ public void test_0() throws Exception { " )\n" + ")"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_211_union.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_211_union.java index 22cbc7b1d5..dc582b2c42 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_211_union.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_211_union.java @@ -23,11 +23,10 @@ import java.util.List; public class MySqlSelectTest_211_union extends MysqlTest { - public void test_0() throws Exception { String sql = "select count(*) from ((select k from linxi3 except select id from linxi1 where id =1) union select k from linxi50);"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_212_alias.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_212_alias.java index 086db0564c..7f324819ec 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_212_alias.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_212_alias.java @@ -24,7 +24,6 @@ public class MySqlSelectTest_212_alias extends MysqlTest { - public void test_2() throws Exception { String sql = "SELECT count(1) from information_schema.tables;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_213.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_213.java index f23ac78e1f..b00caf3024 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_213.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_213.java @@ -24,7 +24,6 @@ public class MySqlSelectTest_213 extends MysqlTest { - public void test_0() throws Exception { String sql = "select 'a\\'b\\'c\\'d\\'e' from t"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_214.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_214.java index c642600e7b..aa084eac3a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_214.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_214.java @@ -26,7 +26,6 @@ public class MySqlSelectTest_214 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT numbers, animals, n, a\n" + "FROM (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_215.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_215.java index 6280479891..1f7dc130a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_215.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_215.java @@ -26,7 +26,6 @@ public class MySqlSelectTest_215 extends MysqlTest { - public void test_0() throws Exception { String sql = "select 7777777777777777777777777777777777777 * 10 from t1;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_216.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_216.java index f03d128f93..c201fc3aff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_216.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_216.java @@ -24,7 +24,6 @@ public class MySqlSelectTest_216 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT t2.id, t2.sellerId, t2.buyer_id, t2.balance, t2.parent_accountId, t2.used, t2.freeze, t2.useless, t2.status, t2.remark, t2.gmt_create, t2.create_by, t2.period_amount, t2.buyer_nick, t2.buyer_mobile, t2.buyer_level, t2.total_amount, t2.account_type_id, t2.pre_effect, t2.gmt_modified, t2.modified_by, t2.last_statistic_time, t2.period_amount, t2.buyer_level_time, t2.encrypt_mobile, t2.encrypt_nick, t2.fixed_phone, t2.latest_expire_cal_time, t2.pre_expire FROM ( SELECT id FROM t_jifen_account WHERE sellerId = 15142801667171005 AND parent_accountId > 0 AND balance >= '100' AND balance <= '100000' AND total_amount >= '50' AND total_amount <= '10000000' LIMIT 500, 500 ORDER BY id )t1, t_jifen_account t2 WHERE t1.id = t2.id AND t2.sellerId = 15142801667171005"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_217_unnest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_217_unnest.java index 41bb95d654..8c6dca75a9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_217_unnest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_217_unnest.java @@ -24,7 +24,6 @@ public class MySqlSelectTest_217_unnest extends MysqlTest { - public void test_0() throws Exception { String sql = "select x from unnest(array[1, 2, 3]) t(x)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_218_jdbc.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_218_jdbc.java index 0afe8b9b9d..cc2eb985b7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_218_jdbc.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_218_jdbc.java @@ -24,7 +24,6 @@ public class MySqlSelectTest_218_jdbc extends MysqlTest { - public void test_0() throws Exception { String sql = "select {d '2018-07-24'}, {t '12:34:56'}, {ts '2018-07-24 12:34:56'}"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_219_jdbc_fn.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_219_jdbc_fn.java index b3465daded..2bccb79da2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_219_jdbc_fn.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_219_jdbc_fn.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_219_jdbc_fn extends MysqlTest { - public void test_0() throws Exception { String sql = "select {fn POWER(2,2)}"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_22.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_22.java index 65091fbd27..7a4850e991 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_22.java @@ -24,11 +24,10 @@ import java.util.List; public class MySqlSelectTest_22 extends MysqlTest { - public void test_0() throws Exception { String sql = "select CONSTRAINT constraint from t where id = 1 order by constraint desc"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); @@ -43,13 +42,12 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getConditions().size()); Assert.assertEquals(1, visitor.getOrderByColumns().size()); } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_220_jdbc_fn.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_220_jdbc_fn.java index 05e883600d..9828000831 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_220_jdbc_fn.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_220_jdbc_fn.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_220_jdbc_fn extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT TRIM(BOTH ' ' FROM {fn CONCAT({fn CONCAT(' ', `calcs`.`str2`)}, ' ')}) AS `TEMP(Test)(1903992131)(0)`\n" + "\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_221.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_221.java index ac13ececc0..455dde186f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_221.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_221.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_221 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT\n" + "    (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_222.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_222.java index 59edc6eeb1..1ff72e26e7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_222.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_222.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_222 extends MysqlTest { - public void test_0() throws Exception { String sql = "/*+engine=mpp*/ (select close from linxi1 where id = 3)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_223_jdbc_fn.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_223_jdbc_fn.java index a6c2018eb2..cf1802643c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_223_jdbc_fn.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_223_jdbc_fn.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_223_jdbc_fn extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT CAST({fn TRUNCATE(EXTRACT(YEAR FROM (`calcs`.`date0` + ((-{fn DAYOFWEEK(`calcs`.`date0`)}) + 1) * INTERVAL '1' DAY)),0)} AS INTEGER) AS `TEMP(Test)(1308221269)(0)`\n" + "\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_224.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_224.java index 71dd1ab218..8be8ef171a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_224.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_224.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_224 extends MysqlTest { - public void test_0() throws Exception { String sql = "select userid, order, unionid from t"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_225_reg.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_225_reg.java index 755cc28e68..087be25f61 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_225_reg.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_225_reg.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_225_reg extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT regexp_extract_all('1a 2b 14m', '\\\\d+')"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_226.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_226.java index c8928585f7..727e14a9ec 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_226.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_226.java @@ -26,7 +26,6 @@ public class MySqlSelectTest_226 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT sum(`price`) AS aggregate, `aa` \n" + "FROM `na_orders`\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_227.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_227.java index e82105c8fc..e47371c968 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_227.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_227.java @@ -25,7 +25,6 @@ public class MySqlSelectTest_227 extends MysqlTest { - public void test_0() throws Exception { String sql = "select id, distinct name from a"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_228.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_228.java index 07da348b05..89e0ee54f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_228.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_228.java @@ -29,7 +29,6 @@ public class MySqlSelectTest_228 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT *\n" + "FROM (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_229_interval.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_229_interval.java index fed48cfa9d..a7420a6b08 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_229_interval.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_229_interval.java @@ -26,7 +26,6 @@ public class MySqlSelectTest_229_interval extends MysqlTest { - public void test_0() throws Exception { String sql = "select DATE_ADD(utc_date(), INTERVAL -'5' DAY)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_23.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_23.java index ef7e607416..e94d9323ca 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_23.java @@ -27,20 +27,18 @@ import java.util.List; public class MySqlSelectTest_23 extends MysqlTest { - public void test_0() throws Exception { - SchemaRepository repository = new SchemaRepository(DbType.ads); repository.acceptDDL("CREATE TABLE linxi_test.test_realtime1 (\n" + " id bigint NOT NULL COMMENT '',\n" - + " int_test1 bigint NOT NULL COMMENT '',\n" + " boolean_test boolean COMMENT '',\n" - + " byte_test tinyint COMMENT '',\n" + " short_test smallint COMMENT '',\n" - + " int_test2 int COMMENT '',\n" + " float_test float COMMENT '',\n" - + " string_test varchar COMMENT '',\n" + " date_test date COMMENT '',\n" - + " time_test time COMMENT '',\n" + " timestamp_test timestamp COMMENT '',\n" - + " double_test double COMMENT '',\n" + " INDEX id_index HASH (string_test),\n" - + " PRIMARY KEY (id,int_test1,int_test2)\n" + ")\n" - + "PARTITION BY HASH KEY (id) PARTITION NUM 10\n" + "TABLEGROUP group2\n" - + "OPTIONS (UPDATETYPE='realtime')\n" + "COMMENT ''"); + + " int_test1 bigint NOT NULL COMMENT '',\n" + " boolean_test boolean COMMENT '',\n" + + " byte_test tinyint COMMENT '',\n" + " short_test smallint COMMENT '',\n" + + " int_test2 int COMMENT '',\n" + " float_test float COMMENT '',\n" + + " string_test varchar COMMENT '',\n" + " date_test date COMMENT '',\n" + + " time_test time COMMENT '',\n" + " timestamp_test timestamp COMMENT '',\n" + + " double_test double COMMENT '',\n" + " INDEX id_index HASH (string_test),\n" + + " PRIMARY KEY (id,int_test1,int_test2)\n" + ")\n" + + "PARTITION BY HASH KEY (id) PARTITION NUM 10\n" + "TABLEGROUP group2\n" + + "OPTIONS (UPDATETYPE='realtime')\n" + "COMMENT ''"); // String sql = "INSERT INTO test_realtime1(id, int_test1, int_test2, string_test, date_test, time_test, timestamp_test)\n" @@ -59,18 +57,16 @@ public void test_0() throws Exception { statemen.accept(visitor); - // System.out.println("Tables : " + visitor.getTables()); System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(3, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_230.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_230.java index 92981a01d7..a960d82a7d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_230.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_230.java @@ -26,7 +26,6 @@ public class MySqlSelectTest_230 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT CAST('test collated returns' AS CHAR CHARACTER SET utf8) COLLATE utf8_bin AS anon_1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_231_keywords.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_231_keywords.java index 86cfba8fa3..296f9540bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_231_keywords.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_231_keywords.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_231_keywords extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT CONDITION, LOCK, MODE, OUT, REPEAT, SECOND, MICROSECOND, USE from t"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_232.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_232.java index 61e9190348..109c4cade5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_232.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_232.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_232 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from tb where id = '1'-1;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_233.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_233.java index 277a9b823a..c789edf65e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_233.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_233.java @@ -28,7 +28,6 @@ public class MySqlSelectTest_233 extends MysqlTest { - public void test_0() throws Exception { String sql = "select f1 \n" + "from t1\n" + @@ -56,5 +55,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_234.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_234.java index eff0fca574..5dfd52f3c1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_234.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_234.java @@ -24,7 +24,6 @@ public class MySqlSelectTest_234 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT ema_user_id\n" + " FROM(\n" @@ -53,5 +52,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_235.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_235.java index f7ab9a28cb..32551bd9f6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_235.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_235.java @@ -21,7 +21,6 @@ public class MySqlSelectTest_235 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT ema_user_id\n" + " FROM(\n" @@ -51,5 +50,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_236.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_236.java index ed50ba1535..c6325bb8e9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_236.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_236.java @@ -21,7 +21,6 @@ public class MySqlSelectTest_236 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT count(1) AS userCount,count(t.telephone) AS userWithPhoneCount,count(t.email) AS userWithEmailCount FROM (SELECT t.user_id , dw.telephone,dw.email FROM (SELECT dw.userid AS user_id FROM dw_user_property_wide_table_merged_v2 dw WHERE ((dw.is_sub = true))) t INNER JOIN dw_user_property_wide_table_merged_v2 dw ON t.user_id = dw.userid) t /*+META({\"s\": \"com.qunhe.logcomplex.userinformation.mapper.ads.UserPropertyMapper.countUser\"})*/"; @@ -42,5 +41,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_237.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_237.java index 3ab2515a75..c395080251 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_237.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_237.java @@ -21,7 +21,6 @@ public class MySqlSelectTest_237 extends MysqlTest { - public void test_0() throws Exception { String sql = "select distinct (f1) from t3;"; @@ -33,5 +32,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_238.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_238.java index 51fa6023b7..bfc88afcb6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_238.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_238.java @@ -21,7 +21,6 @@ public class MySqlSelectTest_238 extends MysqlTest { - public void test_0() throws Exception { String sql = "select a.cat_id1,a.cat_name1,a.cat_id2,a.cat_name2,a.cat_id3,a.cat_name3,a.leaf_cat_id,a.leaf_cat_name,\n" + " concat(case when cat_name1 is not null then concat(cat_name1,'>>') else '' end,\n" + @@ -77,5 +76,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_239.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_239.java index fc13d421cc..f9b359dad5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_239.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_239.java @@ -21,7 +21,6 @@ public class MySqlSelectTest_239 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT group_concat(\"\\\"\",NODE_IP,\"\\\"\") FROM `tiansuan_node` WHERE `GROUP_ID` =4\n"; @@ -34,5 +33,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_24.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_24.java index 871e9cdf19..47503fa788 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_24.java @@ -25,11 +25,10 @@ import java.util.List; public class MySqlSelectTest_24 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from company where id=1 and not (name='e') and addr='a'"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -44,12 +43,12 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(4, visitor.getColumns().size()); Assert.assertEquals(3, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *\n" + @@ -57,7 +56,7 @@ public void test_0() throws Exception { "WHERE id = 1\n" + "\tAND (NOT name = 'e')\n" + "\tAND addr = 'a'", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -66,10 +65,9 @@ public void test_0() throws Exception { "where id = 1\n" + "\tand (not name = 'e')\n" + "\tand addr = 'a'", // - output); + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_240.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_240.java index 4143327786..9f84bfef40 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_240.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_240.java @@ -21,7 +21,6 @@ public class MySqlSelectTest_240 extends MysqlTest { - public void test_0() throws Exception { String sql = "select sum(file_size / 1024. / 1024.) / 1024.\n" + "from mssql_oss_download_list"; @@ -34,5 +33,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_241.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_241.java index 7748cd014c..6c7e1bd019 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_241.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_241.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_241 extends MysqlTest { - public void test_0() throws Exception { String sql = "select job_names.job_name from cover_rage_job_org as org RIGHT JOIN (\n" + " select job_names.job_name as job_name\n" + @@ -49,5 +48,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_242.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_242.java index 983cd15596..12206ab398 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_242.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_242.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_242 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT ip.*\n" + "FROM ba_customer_connect connect, ba_customer_connect_ip ip\n" + @@ -43,5 +42,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_243.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_243.java index cd3e75a5a9..57ac98d046 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_243.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_243.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_243 extends MysqlTest { - public void test_0() throws Exception { String sql = "Select DISTINCT buyer_id,\n" + " DISTINCT buyer_full_name\n" + @@ -57,5 +56,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_244.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_244.java index a011a4fbfd..78ac168271 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_244.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_244.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_244 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT concat(\"if((order.logisticsCompanyID!=null && order.logisticsCompanyID==\\\"\",substring_index(name, '诚信通促销打折', 1)) as a FROM `alc_promotion` WHERE id = 1000000000129"; @@ -40,5 +39,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_245.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_245.java index de0615df2b..39b5ad92fc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_245.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_245.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_245 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM tt ORDER BY c1 NULLS LAST"; @@ -40,5 +39,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_246.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_246.java index 10f8127347..2f4675c16b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_246.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_246.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_246 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT -CAST(10 AS decimal(10, 2)), +CAST(10 AS decimal(10, 2))"; @@ -38,5 +37,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_247.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_247.java index 0b3a970dfe..1daee6ec30 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_247.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_247.java @@ -27,7 +27,6 @@ public class MySqlSelectTest_247 extends MysqlTest { - public void test_0() throws Exception { String sql = "select CONVERT(id, char(20))"; @@ -42,5 +41,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_248.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_248.java index db1fa41718..a78cbbc883 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_248.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_248.java @@ -25,7 +25,6 @@ public class MySqlSelectTest_248 extends MysqlTest { - public void test_0() throws Exception { String sql = "select top.* from t1 top"; @@ -37,5 +36,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_249.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_249.java index a3b487a7e4..0f5979f663 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_249.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_249.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_249 extends MysqlTest { - public void test_0() throws Exception { String sql = "select CAST(t.a AS ROW(v1 varchar, v2 varchar)) from ( select t.a from ( select cast(json_extract('{\"x\":[{\"a\":1,\"b\":2},{\"a\":3,\"b\":4}]}', '$.x') as array) as package_array ) CROSS JOIN unnest(package_array) AS t(a) )"; @@ -40,5 +39,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_25.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_25.java index d4f7a9778e..2759c2a680 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_25.java @@ -25,11 +25,10 @@ import java.util.List; public class MySqlSelectTest_25 extends MysqlTest { - public void test_0() throws Exception { String sql = "select truncate(AVG(mark),2) from tabName where spu = ? and is_delete=0 and is_check = '2'"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -44,32 +43,31 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(4, visitor.getColumns().size()); Assert.assertEquals(3, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT truncate(AVG(mark), 2)" - + "\nFROM tabName" - + "\nWHERE spu = ?" - + "\n\tAND is_delete = 0" - + "\n\tAND is_check = '2'", // - output); + + "\nFROM tabName" + + "\nWHERE spu = ?" + + "\n\tAND is_delete = 0" + + "\n\tAND is_check = '2'", // + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select truncate(avg(mark), 2)" - + "\nfrom tabName" - + "\nwhere spu = ?" - + "\n\tand is_delete = 0" - + "\n\tand is_check = '2'", // - output); + + "\nfrom tabName" + + "\nwhere spu = ?" + + "\n\tand is_delete = 0" + + "\n\tand is_check = '2'", // + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_250.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_250.java index cb61c540d8..b8081b04c8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_250.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_250.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_250 extends MysqlTest { - public void test_0() throws Exception { String sql = "select concat(@@version, ' ', @@version_comment)"; @@ -33,5 +32,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_251.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_251.java index c2105a4f86..330b39f06f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_251.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_251.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_251 extends MysqlTest { - public void test_0() throws Exception { String sql = "select tinyint '--127', smallint '--127', INTEGER '--128', bigint '--127'"; @@ -33,5 +32,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_252.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_252.java index cc667b3eee..08014994e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_252.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_252.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_252 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM (VALUES (1)) a (x) JOIN (VALUES (2)) b ON IF(a.x = 1, true, false)"; @@ -39,5 +38,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_253.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_253.java index 3d7e8b8fde..32d9340bce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_253.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_253.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_253 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT a FROM t1 GROUP BY ()"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_254.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_254.java index 7f40e3233f..df24f09799 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_254.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_254.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_254 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 'a', (VALUES 1) GROUP BY 1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_255.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_255.java index 4f79fa5434..b433295a98 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_255.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_255.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_255 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM t1 WHERE t1.a <= ALL (VALUES 10, 20)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_256.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_256.java index e65282ed7f..6f13eb539b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_256.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_256.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_256 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT count(*) over (ORDER BY count(*) ROWS BETWEEN b PRECEDING AND a PRECEDING) FROM t1 GROUP BY b"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_257.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_257.java index 97264d07c8..70613f7f75 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_257.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_257.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_257 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT rank() OVER (ROWS 0.5 PRECEDING)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_258.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_258.java index 337d52f499..d3fe1db96d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_258.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_258.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_258 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT rank() OVER (ROWS 'foo' PRECEDING)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_259.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_259.java index f045c74ee7..7dcf2a6aff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_259.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_259.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_259 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT rank() OVER (ROWS BETWEEN CURRENT ROW AND 'foo' FOLLOWING)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_26.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_26.java index c9acc3cce7..1316a2c972 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_26.java @@ -25,11 +25,10 @@ import java.util.List; public class MySqlSelectTest_26 extends MysqlTest { - public void test_0() throws Exception { String sql = "select truncate(12.0123,2);"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -44,24 +43,23 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT truncate(12.0123, 2);", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select truncate(12.0123, 2);", // - output); + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_260.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_260.java index 1075bc0b9e..a76d4958b7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_260.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_260.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_260 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT x.c as x\n" + "FROM (VALUES 1) x(c)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_261.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_261.java index 7047f09ed0..7b8d1c076d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_261.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_261.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_261 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM t CROSS JOIN UNNEST(a) WITH ORDINALITY"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_262.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_262.java index 2974269660..4b991c9efa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_262.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_262.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_262 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT s.acctbal,\n" + " s.name,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_263.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_263.java index 0d064b0ad1..37d28a5b17 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_263.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_263.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_263 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 0<18446744073709551500"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_264.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_264.java index 9379acb1ff..81530956bb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_264.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_264.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_264 extends MysqlTest { - public void test_0() throws Exception { String sql = "select json from t1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_265.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_265.java index 712b1cf695..276be977d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_265.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_265.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_265 extends MysqlTest { - public void test_0() throws Exception { String sql = "select timediff(\"12:00:00\", a) from test_booleancheck\n"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_266.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_266.java index 3bcb47311b..60f797f5ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_266.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_266.java @@ -24,7 +24,6 @@ public class MySqlSelectTest_266 extends MysqlTest { - public void test_0() throws Exception { String sql = "EXPLAIN (FORMAT DETAIL)\n" + "SELECT\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_267.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_267.java index baed0b57f5..e1e4f1d356 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_267.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_267.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_267 extends MysqlTest { - public void test_0() throws Exception { String sql = "select TABLE_SCHEMA dbName,TABLE_NAME tableName,ENGINE engine,ROW_FORMAT rowFormat,TABLE_COLLATION `collate`,CREATE_OPTIONS createOption,TABLE_COMMENT `comment`\n" + "from information_schema.tables\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_268.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_268.java index ade10124f2..383592581a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_268.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_268.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_268 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from (select * from mm union select * from mm) a,(select * from mm union select * from mm) b;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_269.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_269.java index 4c90b7c2d7..ab2153aa70 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_269.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_269.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_269 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT `IDENTIFIED`, `PRIMARY`, `TABLEGROUP`, `MATCH`, `ROWS`, `OUT`, `ANY`, `CASE`, `DECIMAL`, `REFERENCES`, `RLIKE` FROM SQL_TEST_NEW_20181016_1.THEN__1 WHERE 1=1 LIMIT 65"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_27.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_27.java index 998c3fa9a4..1cf1394c27 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_27.java @@ -25,11 +25,10 @@ import java.util.List; public class MySqlSelectTest_27 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT /*+ READ_CONSISTENCY(WEAK) */ NOW() AS db_time FROM DUAL"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -44,26 +43,25 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT /*+ READ_CONSISTENCY(WEAK) */ NOW() AS db_time" - + "\nFROM DUAL", // - output); + + "\nFROM DUAL", // + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select /*+ READ_CONSISTENCY(WEAK) */ NOW() as db_time" - + "\nfrom DUAL", // - output); + + "\nfrom DUAL", // + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_270.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_270.java index 63cb9a7339..f79e2217e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_270.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_270.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_270 extends MysqlTest { - public void test_0() throws Exception { String sql = "select '\\0', \"\\0\""; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_271.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_271.java index f38cf4de53..3661abb291 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_271.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_271.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_271 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT `EXTRACT` AS id, `OVER` AS order_id, `DECIMAL` AS user_id, `INDEX` AS car_id, `ADD` AS plate_number\n" + "\t, `CURSOR` AS from_op_point_id, `INSERT` AS to_op_point_id, `INNER` AS amount, `REFERENCES` AS status, `TIMESTAMP` AS distance\n" + @@ -59,5 +58,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_272.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_272.java index f61ca5c014..91f1217537 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_272.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_272.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_272 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from (select product from mysql_olap_t1 \n" + "where exists (\n" + @@ -50,5 +49,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_273.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_273.java index 143f4312c9..88e4b8d453 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_273.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_273.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_273 extends MysqlTest { - public void test_0() throws Exception { String sql = "/*+ engine= MPP, dump-header= [DUMP DATA]*/\n" + "SELECT t3.sim_aid AS __aid\n" + @@ -101,5 +100,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_274.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_274.java index f9cd9e1d68..8227cb5801 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_274.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_274.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_274 extends MysqlTest { - public void test_0() throws Exception { String sql = "/*+ run_async=true,mq-notify-by=ons,mq-delayed-by=10 */ /*+ orc-bloomfilters-enabled=true */ insert into t1( x,y) select * from t2"; @@ -37,5 +36,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_275.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_275.java index bf289116fc..99e90f6cdd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_275.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_275.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_275 extends MysqlTest { - public void test_0() throws Exception { String sql = "(select id from test4dmp.test_odps where id >100 order by id) order by id2 limit 10\n" + "\n"; @@ -54,5 +53,4 @@ public void test_1() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_276.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_276.java index 831e2639cc..bb2ab0f000 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_276.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_276.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_276 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT x '日期' from t"; @@ -34,5 +33,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_277.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_277.java index e10b828f97..41627f2cf8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_277.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_277.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_277 extends MysqlTest { - public void test_0() throws Exception { String sql = "select int_test,double_test,position(int_test-25 in double_test) from test_datatype_list order by 1,2,3"; @@ -36,5 +35,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_278.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_278.java index aa3daad1f2..d8cc61faa5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_278.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_278.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_278 extends MysqlTest { - public void test_0() throws Exception { String sql = "select GROUP_CONCAT(\"\\\"\" + code + \"\\\"\") from district_t\n" + "where code LIKE '98%'"; @@ -36,5 +35,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_279.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_279.java index 34210a9048..863c48e1de 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_279.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_279.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_279 extends MysqlTest { - public void test_0() throws Exception { String sql = "select l.*\n" + "from (select\n" + @@ -81,5 +80,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_28.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_28.java index 6d43869aca..121f8f5eac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_28.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_28 extends MysqlTest { - public void test_0() throws Exception { String sql = "/* 0a7d0d8614637128401131809d4d9d/9// */" + "SELECT id, name " @@ -32,7 +31,7 @@ public void test_0() throws Exception { + "WHERE `gmt_create` < DATE_ADD(NOW(), INTERVAL (- 7) DAY) " + "LIMIT 0, 1000"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -47,12 +46,12 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(3, visitor.getColumns().size()); assertEquals(1, visitor.getConditions().size()); assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("/* 0a7d0d8614637128401131809d4d9d/9// */\n" + @@ -60,7 +59,7 @@ public void test_0() throws Exception { "FROM `t_0248` `i_trash`\n" + "WHERE `gmt_create` < DATE_ADD(NOW(), INTERVAL -7 DAY)\n" + "LIMIT 0, 1000", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -69,10 +68,9 @@ public void test_0() throws Exception { "from `t_0248` `i_trash`\n" + "where `gmt_create` < DATE_ADD(NOW(), interval -7 day)\n" + "limit 0, 1000", // - output); + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_280.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_280.java index 5fca524616..cd8ea8fb2b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_280.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_280.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_280 extends MysqlTest { - public void test_0() throws Exception { String sql = "select date(created_at)创建日期,\n" + "count(distinct task_id)整体维修创建量,\n" + @@ -76,5 +75,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_281.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_281.java index e4e192df16..41e448a209 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_281.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_281.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_281 extends MysqlTest { - public void test_0() throws Exception { String sql = "select decode_unicode('\\u304a\\u306f\\u3088\\u3046\\u3054\\u3056\\u3044\\u307e\\u3059') as a;"; @@ -34,5 +33,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_282.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_282.java index 7d6ee17e06..85b71a1152 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_282.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_282.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_282 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 1.0E10"; @@ -34,5 +33,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_282_hint_in_where.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_282_hint_in_where.java index 9e0465cf67..5f71be8663 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_282_hint_in_where.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_282_hint_in_where.java @@ -14,7 +14,6 @@ * @Date 2019-05-23 15:28 */ public class MySqlSelectTest_282_hint_in_where extends MysqlTest { - public void test_0() throws Exception { String sql = "select `api_menu_groups`.* from `api_menu_groups` where 1 = 1 /*TDDL:MASTER*/ and `api_menu_groups`.`project_id` = 3 order by `api_menu_groups`.`sort` asc limit 10000\n"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_283_current_user.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_283_current_user.java index c2812a0330..bfb8f1baa2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_283_current_user.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_283_current_user.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_283_current_user extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT current_user from t where u = CURRENT_USER"; @@ -55,5 +54,4 @@ public void test_1() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_284.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_284.java index a113544cf5..4dd5037105 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_284.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_284.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_284 extends MysqlTest { - public void test_0() throws Exception { String sql = "select count(*) t_router_device_info;"; @@ -34,5 +33,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_285.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_285.java index 92a979c245..fb20af7f41 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_285.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_285.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_285 extends MysqlTest { - public void test_0() throws Exception { String sql = "select 'a', \"a rrr122\" , avg(`id`) as 'x Y Z' from test4dmp.test where string_test = \"abdfeed\" and date_test > \"1991-01-10 00:12:11\" group by id having `x Y Z` > 10 order by 3 limit 5;"; @@ -41,5 +40,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_286.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_286.java index 845c02e36b..50bc0c83f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_286.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_286.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_286 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT a " + "FROM (VALUES 1) t(a) " + @@ -41,5 +40,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_287.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_287.java index c81fcd917d..8d1a621670 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_287.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_287.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_287 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT abs(x) FILTER (where y = 1) FROM (VALUES (1, 1)) t(x, y)"; @@ -37,5 +36,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_288.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_288.java index b0b04afc37..f2a4112781 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_288.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_288.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_288 extends MysqlTest { - public void test_0() throws Exception { String sql = "INSERT INTO hive.oa1878750739446285_stat_meiyan_parquet.meiyan_odz_daily_user\n" + "(SELECT 'android', server_id, imei, app_version\n" + @@ -245,5 +244,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_289.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_289.java index 22609e7c57..e75193af51 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_289.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_289.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_289 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT supplier AS 'supplier', offline_num AS 'offlineCount', online_num AS 'onlineCount', current_all_num AS 'currentAllCount'\n" + "\t, (\n" + @@ -109,5 +108,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_29.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_29.java index 27c7c20c77..1205ae3e9a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_29.java @@ -25,13 +25,12 @@ import java.util.List; public class MySqlSelectTest_29 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from Function " + "where Id in (select FunctionId from RoleFunction " + "where RoleId = '001' and LogicalDel = 0) and LogicalDel = 0"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -48,12 +47,12 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(6, visitor.getColumns().size()); Assert.assertEquals(4, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT *\n" + @@ -65,7 +64,7 @@ public void test_0() throws Exception { "\t\t\tAND LogicalDel = 0\n" + "\t)\n" + "\tAND LogicalDel = 0", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -78,10 +77,9 @@ public void test_0() throws Exception { "\t\t\tand LogicalDel = 0\n" + "\t)\n" + "\tand LogicalDel = 0", // - output); + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_290.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_290.java index c64badb6e1..5dbbe61578 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_290.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_290.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_290 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT\n" + " houseInfo.id\n" + @@ -683,5 +682,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_292_lateral.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_292_lateral.java index ddaa179554..df68ab5f22 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_292_lateral.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_292_lateral.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_292_lateral extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM t CROSS JOIN LATERAL (VALUES 1) "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_group_concat_clone.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_group_concat_clone.java index f7960fea2a..a939a85541 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_group_concat_clone.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_group_concat_clone.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_293_group_concat_clone extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT student_name,\n" + " GROUP_CONCAT(DISTINCT test_score\n" + @@ -44,5 +43,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_operator_precedence.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_operator_precedence.java index 4f9e712afd..12503e1140 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_operator_precedence.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_operator_precedence.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_293_operator_precedence extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT ALL + + ( + col1 ) \n" + "FROM random_aggregates_23_tab2 AS cor0 \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_294_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_294_dla.java index 980af63bed..828845908a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_294_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_294_dla.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_294_dla extends MysqlTest { - public void test_1() throws Exception { String sql = "/*+engine=spark*/\n" + "select date_p,os_p,nvl(channel,'新增') as channel,\n" + @@ -100,7 +99,6 @@ public void test_1() throws Exception { } - public void testRemoveBackQuoteFromSql() { String ret = SQLUtils.parseSingleStatement("select * from `hello`.`world`", DbType.mysql, SQLParserFeature.IgnoreNameQuotes).toString(); assertEquals( diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_295.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_295.java index 1bf3882e41..46bd2142c0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_295.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_295.java @@ -24,7 +24,6 @@ public class MySqlSelectTest_295 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from teacher_text a join teacher b on a.id=b.id  where row(a.id,'B') not in (select a.id,a.coid from community a where coid ='B') order by 1;"; @@ -74,5 +73,4 @@ public void test_3() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_296.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_296.java index 711bae95a4..cfcf3fea07 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_296.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_296.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_296 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT x, array_agg(y ORDER BY y), array_agg(y ORDER BY y) FILTER (WHERE y > 1), count(*) \n" + "FROM (VALUES (1, 3), (1, 1), (2, 3), (2, 4)) t(x, y) \n" + @@ -44,5 +43,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_297.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_297.java index 5ea339e8f0..96cc7453cc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_297.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_297.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_297 extends MysqlTest { - public void test_0() throws Exception { String sql = "select sn,properties->'$.zoneId',properties->'$.regionId',ip,owner,gmt_create \n" + "from resource_instance where type=16 and (properties->'$.idkp'='1647796581073291')"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_298.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_298.java index ea3970f715..30c883052e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_298.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_298.java @@ -27,7 +27,6 @@ public class MySqlSelectTest_298 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 1 FROM ((SELECT 2) ORDER BY 1) AS res"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_299_mtr.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_299_mtr.java index b238c2c7c6..062cc509ba 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_299_mtr.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_299_mtr.java @@ -27,7 +27,6 @@ public class MySqlSelectTest_299_mtr extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT HEX(_ucs2 0x0123456789A), _ucs2 0x0123456789A;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_3.java index 85ec497220..34fba8cbee 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_3.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_3 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 'Monty!' REGEXP '.*'"; @@ -42,7 +41,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_30.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_30.java index 998578ec4b..a58a6c2d94 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_30.java @@ -25,11 +25,10 @@ import java.util.List; public class MySqlSelectTest_30 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT name from tab1 for update no_wait"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -44,28 +43,27 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT name" - + "\nFROM tab1" - + "\nFOR UPDATE NOWAIT", // - output); + + "\nFROM tab1" + + "\nFOR UPDATE NOWAIT", // + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select name" - + "\nfrom tab1" - + "\nfor update nowait", // - output); + + "\nfrom tab1" + + "\nfor update nowait", // + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_300_genAlias.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_300_genAlias.java index e22a14e782..a7b0e3038f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_300_genAlias.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_300_genAlias.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_300_genAlias extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT `current_date`(), `current_timestamp`(), `current_time`(), `localtime`(), `localtimestamp`()"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_301_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_301_dla.java index 3155d7d646..7233fbfcaf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_301_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_301_dla.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_301_dla extends MysqlTest { - public void test_0() throws Exception { String sql = "WITH `contextual_log` AS (\n" + "        SELECT\n" + @@ -224,5 +223,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_302_agg.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_302_agg.java index 0c53a52168..bb94db6ef9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_302_agg.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_302_agg.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_302_agg extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT (CASE WHEN (`test4dmp`.`sum`(1) OVER (PARTITION BY 1) = 1) THEN 1 END) `case when sum(1) OVER (PARTITION BY 1 ) =1 then 1 end`\n" + "FROM\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_304_adb_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_304_adb_hints.java index 4b8eb54e2d..e023ccb283 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_304_adb_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_304_adb_hints.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_304_adb_hints extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT COUNT(*)\n" + "FROM t1, t2\n" + @@ -69,23 +68,23 @@ public void test_1() throws Exception { public void test_2() throws Exception { String sql = "SELECT count(distinct c1.custkey) " + - " from customer c1, customer c2 " + - " where c1.custkey=c2.custkey /*+output_rows=2*/" + - " and c1.custkey=1 /*+filter_factor=0.5*/"; + " from customer c1, customer c2 " + + " where c1.custkey=c2.custkey /*+output_rows=2*/" + + " and c1.custkey=1 /*+filter_factor=0.5*/"; SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.mysql); assertEquals("SELECT count(DISTINCT c1.custkey)\n" + - "FROM customer c1, customer c2\n" + - "WHERE c1.custkey = c2.custkey/*+output_rows=2*/\n" + - "\tAND c1.custkey = 1/*+filter_factor=0.5*/", stmt.toString()); + "FROM customer c1, customer c2\n" + + "WHERE c1.custkey = c2.custkey/*+output_rows=2*/\n" + + "\tAND c1.custkey = 1/*+filter_factor=0.5*/", stmt.toString()); } public void test_3() throws Exception { String sql = "SELECT COUNT(*) \n" + - "FROM t1 , t2 \n" + - "WHERE t1.c1 = t2.c1 /*+output_Rows=100*/\n" + - " AND t1.c1 < 10 "; + "FROM t1 , t2 \n" + + "WHERE t1.c1 = t2.c1 /*+output_Rows=100*/\n" + + " AND t1.c1 < 10 "; SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.mysql); @@ -326,11 +325,11 @@ public void test_exists() throws Exception { public void test_exists2() throws Exception { String sql = "SELECT count(1) " + - " from customer c1 " + - " where exists (" + - " select c2.custkey from customer c2 " + - " where c2.custkey=1 " + - " ) /*+output_rows=10*/"; + " from customer c1 " + + " where exists (" + + " select c2.custkey from customer c2 " + + " where c2.custkey=1 " + + " ) /*+output_rows=10*/"; SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.mysql); @@ -345,11 +344,11 @@ public void test_exists2() throws Exception { public void test_not() throws Exception { String sql = "SELECT count(1) " + - " from customer c1 " + - " where not exists (" + - " select c2.custkey from customer c2 " + - " where c2.custkey=1 " + - " ) /*+output_rows=10*/"; + " from customer c1 " + + " where not exists (" + + " select c2.custkey from customer c2 " + + " where c2.custkey=1 " + + " ) /*+output_rows=10*/"; SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.mysql); @@ -364,8 +363,8 @@ public void test_not() throws Exception { public void test_not2() throws Exception { String sql = "SELECT count(1) " + - " from customer c1 " + - " where not(c1.a > 1 && a < 10) /*+output_rows=10*/"; + " from customer c1 " + + " where not(c1.a > 1 && a < 10) /*+output_rows=10*/"; SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.mysql); @@ -403,21 +402,21 @@ public void test_groupby() throws Exception { public void test_groupby2() throws Exception { String sql = " SELECT\n" + - " * "+ - " FROM\n" + - " supplier AS s,\n" + - " lineitem AS l,\n" + - " orders AS o,\n" + - " customer AS c,\n" + - " nation AS n1,\n" + - " nation AS n2\n" + - " WHERE\n" + - " s.suppkey = l.suppkey\n" + - " AND (\n" + - " (n1.name = 'CANADA' AND n2.name = 'BRAZIL')\n" + - " OR (n1.name = 'BRAZIL' AND n2.name = 'CANADA')\n" + - " )/*+output_rows=1000*/" + - " AND l.shipdate BETWEEN DATE '1995-01-01' AND DATE '1996-12-31' /*+output_rows=1*/"; + " * " + + " FROM\n" + + " supplier AS s,\n" + + " lineitem AS l,\n" + + " orders AS o,\n" + + " customer AS c,\n" + + " nation AS n1,\n" + + " nation AS n2\n" + + " WHERE\n" + + " s.suppkey = l.suppkey\n" + + " AND (\n" + + " (n1.name = 'CANADA' AND n2.name = 'BRAZIL')\n" + + " OR (n1.name = 'BRAZIL' AND n2.name = 'CANADA')\n" + + " )/*+output_rows=1000*/" + + " AND l.shipdate BETWEEN DATE '1995-01-01' AND DATE '1996-12-31' /*+output_rows=1*/"; SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.mysql); @@ -572,20 +571,20 @@ public void test_tpch_q8() throws Exception { public void test_between_and() throws Exception { String sql = " SELECT\n" + - " n1.name AS supp_nation,\n" + - " n2.name AS cust_nation,\n" + - " extract(YEAR FROM l.shipdate) AS l_year,\n" + - " l.extendedprice * (1 - l.discount) AS volume\n" + - " FROM\n" + - " supplier AS s,\n" + - " lineitem AS l,\n" + - " orders AS o,\n" + - " customer AS c,\n" + - " nation AS n1,\n" + - " nation AS n2\n" + - " WHERE\n" + - " l.shipdate BETWEEN DATE '1995-01-01' AND DATE '1996-12-31' /*+output_rows=1*/ \n" + - " AND c.custkey = o.custkey"; + " n1.name AS supp_nation,\n" + + " n2.name AS cust_nation,\n" + + " extract(YEAR FROM l.shipdate) AS l_year,\n" + + " l.extendedprice * (1 - l.discount) AS volume\n" + + " FROM\n" + + " supplier AS s,\n" + + " lineitem AS l,\n" + + " orders AS o,\n" + + " customer AS c,\n" + + " nation AS n1,\n" + + " nation AS n2\n" + + " WHERE\n" + + " l.shipdate BETWEEN DATE '1995-01-01' AND DATE '1996-12-31' /*+output_rows=1*/ \n" + + " AND c.custkey = o.custkey"; SQLStatement stmt = SQLUtils.parseSingleStatement( sql, diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_305_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_305_dla.java index 8ecdd647b1..cc99a8fba3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_305_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_305_dla.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_305_dla extends MysqlTest { - public void test_0() throws Exception { String sql = "select count(0) from (select * from person) limit 1;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_306_outer_orderby.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_306_outer_orderby.java index 6c0d43d8dd..4ddb230869 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_306_outer_orderby.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_306_outer_orderby.java @@ -25,7 +25,6 @@ public class MySqlSelectTest_306_outer_orderby extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * \n" + "FROM (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_307_lateralview.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_307_lateralview.java index 6e876c4c27..7efd91d980 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_307_lateralview.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_307_lateralview.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_307_lateralview extends MysqlTest { - public void test_1() throws Exception { String sql = "select tf.* from (select 0) t lateral view explode(array('A','B','C')) tf;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_308_mtr.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_308_mtr.java index b1e8fb7951..dadc6102d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_308_mtr.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_308_mtr.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_308_mtr extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from t1 join t2 STRAIGHT_JOIN t3 on (t1.a=t3.c);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_309.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_309.java index 5bb1e42947..044fc84e22 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_309.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_309.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_309 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT *\n" + "FROM `yeahmobi`.`new_eagle_log_parquet`\n" + @@ -35,7 +34,6 @@ public void test_0() throws Exception { .parseSingleStatement(sql, DbType.mysql); fail(); } catch (Exception e) { - } } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_31.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_31.java index 64d502dba0..9db050968b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_31.java @@ -25,11 +25,10 @@ import java.util.List; public class MySqlSelectTest_31 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT name from tab1 for update wait 3"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -44,28 +43,27 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT name" - + "\nFROM tab1" - + "\nFOR UPDATE WAIT 3", // - output); + + "\nFROM tab1" + + "\nFOR UPDATE WAIT 3", // + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select name" - + "\nfrom tab1" - + "\nfor update wait 3", // - output); + + "\nfrom tab1" + + "\nfor update wait 3", // + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_310.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_310.java index dff84c8b90..0dd37cf186 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_310.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_310.java @@ -22,12 +22,11 @@ public class MySqlSelectTest_310 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT orders.extras->\"$.case_no\""; SQLStatement stmt = SQLUtils - .parseSingleStatement(sql, DbType.mysql); + .parseSingleStatement(sql, DbType.mysql); assertEquals("SELECT orders.extras -> '$.case_no'", stmt.toString()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_311_issue.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_311_issue.java index 39127b0ce8..c5ba0d369f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_311_issue.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_311_issue.java @@ -19,7 +19,6 @@ public class MySqlSelectTest_311_issue extends MysqlTest { - public void test_join() throws Exception { String sql = "create view 054839e135a0be669145f2b90c4e8fcf5af46b as select 1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_313.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_313.java index 08ea02adc9..a951185623 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_313.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_313.java @@ -24,7 +24,6 @@ public class MySqlSelectTest_313 extends MysqlTest { - public void test1() { String sql = "SELECT 1 FROM t1, t3 RIGHT JOIN t2 ON t2.b=t3.b "; List stmtList = SQLUtils.parseStatements(sql, DbType.mysql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_314.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_314.java index ac035b4017..ae9a550b44 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_314.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_314.java @@ -25,7 +25,6 @@ public class MySqlSelectTest_314 extends MysqlTest { - public void test1() throws Exception { String sql = Utils.readFromResource("bvt/parser/mysql_select_long_text.txt"); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_32.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_32.java index ef406f60ae..7b27b1696c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_32.java @@ -25,11 +25,10 @@ import java.util.List; public class MySqlSelectTest_32 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT t.id-t.id from system_conn t"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -44,26 +43,25 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT t.id - t.id\n" + "FROM system_conn t", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select t.id - t.id\n" + "from system_conn t", // - output); + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_33.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_33.java index 84f48a1a18..8832e002f1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_33.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_33 extends MysqlTest { - public void test_0() throws Exception { String sql = "select COUNT() AS count,\n" + "DATE_FORMAT(DATE(reg_time), '%Y-%m-%d') AS date,\n" + @@ -35,7 +34,7 @@ public void test_0() throws Exception { "and reg_time <='2016-12-01 23:59:59'\n" + "group by DATE(reg_time),HOUR(reg_time) DIV 2"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -50,12 +49,12 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT COUNT() AS count, DATE_FORMAT(DATE(reg_time), '%Y-%m-%d') AS date\n" + @@ -65,7 +64,7 @@ public void test_0() throws Exception { "\tAND reg_time >= '2016-12-01 00:00:00'\n" + "\tAND reg_time <= '2016-12-01 23:59:59'\n" + "GROUP BY DATE(reg_time), HOUR(reg_time) DIV 2", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -76,10 +75,9 @@ public void test_0() throws Exception { "\tand reg_time >= '2016-12-01 00:00:00'\n" + "\tand reg_time <= '2016-12-01 23:59:59'\n" + "group by DATE(reg_time), HOUR(reg_time) div 2", // - output); + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_34.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_34.java index 5ada559693..edfb937145 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_34.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_34 extends MysqlTest { - public void test_0() throws Exception { String sql = "select *\n" + "from table1\n" + @@ -33,7 +32,7 @@ public void test_0() throws Exception { "order by -ABS(10 - level) desc\n" + "limit 0,100"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -48,12 +47,12 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *\n" + @@ -61,7 +60,7 @@ public void test_0() throws Exception { "WHERE level BETWEEN 10 - 5 AND 10 + 5\n" + "ORDER BY -ABS(10 - level) DESC\n" + "LIMIT 0, 100", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -70,10 +69,9 @@ public void test_0() throws Exception { "where level between 10 - 5 and 10 + 5\n" + "order by -ABS(10 - level) desc\n" + "limit 0, 100", // - output); + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_35.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_35.java index 501326215b..4ea6c1c550 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_35.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_35.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_35 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM t1 natural LEFT JOIN t2;"; @@ -42,28 +41,27 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *\n" + "FROM t1\n" + "\tNATURAL LEFT JOIN t2;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select *\n" + "from t1\n" + "\tnatural left join t2;", // - output); + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_36.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_36.java index c8c9459344..a09fc64918 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_36.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_36 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM mytable t1 natural LEFT JOIN t2;"; @@ -42,28 +41,27 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *\n" + "FROM mytable t1\n" + "\tNATURAL LEFT JOIN t2;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select *\n" + "from mytable t1\n" + "\tnatural left join t2;", // - output); + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_37.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_37.java index 4b90914434..f9720f1c4d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_37.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_37.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_37 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM mytable where md5=x'AD9133D47CEB2222A68662BD7600D890'"; @@ -42,25 +41,25 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *\n" + "FROM mytable\n" + "WHERE md5 = 0xAD9133D47CEB2222A68662BD7600D890", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select *\n" + "from mytable\n" + "where md5 = 0xAD9133D47CEB2222A68662BD7600D890", // - output); + output); } { @@ -79,7 +78,6 @@ public void test_0() throws Exception { output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_38.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_38.java index ade39e717b..8c89a80dcb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_38.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_38.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_38 extends MysqlTest { - public void test_0() throws Exception { String sql = "select full full from t1"; @@ -42,27 +41,26 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT full AS full\n" + "FROM t1", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select full as full\n" + "from t1", // - output); + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_39.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_39.java index bfa3bd974a..db2ba711e5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_39.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_39.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_39 extends MysqlTest { - public void test_0() throws Exception { String sql = "select DATE_ADD(now(),INTERVAL -1 day);"; @@ -42,25 +41,24 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT DATE_ADD(now(), INTERVAL -1 DAY);", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select DATE_ADD(now(), interval -1 day);", // - output); + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_4.java index e2fa188573..5048b0fda8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_4.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_4 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 'Monty!' NOT REGEXP '.*'"; @@ -42,7 +41,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_40.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_40.java index 319fd3e6fd..d3efb801e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_40.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_40.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_40 extends MysqlTest { - public void test_0() throws Exception { String sql = "/*0abcde*/select max(id) from base_request_log"; @@ -42,24 +41,24 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("/*0abcde*/\n" + "SELECT max(id)\n" + "FROM base_request_log", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("/*0abcde*/\nselect max(id)\n" + "from base_request_log", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_41.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_41.java index d8e45bc5f5..4f0cd77ba7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_41.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_41.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_41 extends MysqlTest { - public void test_0() throws Exception { String sql = "/*0abcde*/select max(id) from base_request_log"; @@ -42,24 +41,24 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("/*0abcde*/\nSELECT max(id)\n" + "FROM base_request_log", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("/*0abcde*/\n" + "select max(id)\n" + "from base_request_log", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_42_with_cte.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_42_with_cte.java index 795fb2954e..c0d57c9437 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_42_with_cte.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_42_with_cte.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_42_with_cte extends MysqlTest { - public void test_0() throws Exception { String sql = "WITH\n" + " cte1 AS (SELECT a, b FROM table1),\n" + @@ -48,7 +47,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(4, visitor.getColumns().size()); Assert.assertEquals(2, visitor.getConditions().size()); @@ -75,7 +74,7 @@ public void test_0() throws Exception { "FROM cte1\n" + "\tJOIN cte2\n" + "WHERE cte1.a = cte2.c;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -91,7 +90,7 @@ public void test_0() throws Exception { "from cte1\n" + "\tjoin cte2\n" + "where cte1.a = cte2.c;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_43_with_cte.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_43_with_cte.java index a8d9b0e2e7..39a42536da 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_43_with_cte.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_43_with_cte.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_43_with_cte extends MysqlTest { - public void test_0() throws Exception { String sql = "WITH\n" + " cte1 AS (SELECT a, b FROM table1),\n" + @@ -46,12 +45,12 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("WITH cte1 AS (\n" + @@ -66,7 +65,7 @@ public void test_0() throws Exception { "FROM cte1\n" + "\tJOIN cte2\n" + "WHERE cte1.a = cte2.c;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -82,7 +81,7 @@ public void test_0() throws Exception { "from cte1\n" + "\tjoin cte2\n" + "where cte1.a = cte2.c;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_44_with_cte.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_44_with_cte.java index 33c161ab24..59bbc0f66b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_44_with_cte.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_44_with_cte.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_44_with_cte extends MysqlTest { - public void test_0() throws Exception { String sql = "WITH RECURSIVE cte AS\n" + "(\n" + @@ -47,12 +46,12 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("WITH RECURSIVE cte AS (\n" + @@ -65,7 +64,7 @@ public void test_0() throws Exception { "\t)\n" + "SELECT *\n" + "FROM cte;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -79,7 +78,7 @@ public void test_0() throws Exception { "\t)\n" + "select *\n" + "from cte;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_45_subquery_scalar_operand.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_45_subquery_scalar_operand.java index 4d1d963dd5..fb5c234a86 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_45_subquery_scalar_operand.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_45_subquery_scalar_operand.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_45_subquery_scalar_operand extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT (SELECT s1 FROM t2) FROM t1;"; @@ -42,12 +41,12 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT (\n" + @@ -55,7 +54,7 @@ public void test_0() throws Exception { "\t\tFROM t2\n" + "\t)\n" + "FROM t1;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -64,7 +63,7 @@ public void test_0() throws Exception { "\t\tfrom t2\n" + "\t)\n" + "from t1;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_46_group_concat.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_46_group_concat.java index 7aae278b82..ec317451fd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_46_group_concat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_46_group_concat.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_46_group_concat extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT student_name,\n" + " GROUP_CONCAT(test_score)\n" + @@ -45,25 +44,25 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT student_name, GROUP_CONCAT(test_score)\n" + "FROM student\n" + "GROUP BY student_name;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select student_name, group_concat(test_score)\n" + "from student\n" + "group by student_name;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_47_group_concat.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_47_group_concat.java index b10dca99d9..7926fe9a4a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_47_group_concat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_47_group_concat.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_47_group_concat extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT student_name,\n" + " GROUP_CONCAT(DISTINCT test_score\n" + @@ -46,25 +45,25 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT student_name, GROUP_CONCAT(DISTINCT test_score ORDER BY test_score DESC SEPARATOR ' ')\n" + "FROM student\n" + "GROUP BY student_name;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select student_name, group_concat(DISTINCT test_score order by test_score desc separator ' ')\n" + "from student\n" + "group by student_name;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_48_union.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_48_union.java index 3eaf620c89..c3d306dae4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_48_union.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_48_union.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_48_union extends MysqlTest { - public void test_0() throws Exception { String sql = "select sum(hd.paid_amount) from\n" + "(\n" + @@ -58,12 +57,12 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT sum(hd.paid_amount)\n" + @@ -105,7 +104,7 @@ public void test_0() throws Exception { "\t\tAND b.state = 1\n" + "\t\tAND a.acct_day = '03'\n" + ") hd", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -148,7 +147,7 @@ public void test_0() throws Exception { "\t\tand b.state = 1\n" + "\t\tand a.acct_day = '03'\n" + ") hd", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_49_for_update_no_wait.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_49_for_update_no_wait.java index cd3aadd56e..b96cb0dabd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_49_for_update_no_wait.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_49_for_update_no_wait.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_49_for_update_no_wait extends MysqlTest { - public void test_0() throws Exception { String sql = "select /*MS-ARCORE-AR-II-M-QUERY-IN-LOCK-BY-AR-NOS*/ /*+INDEX(AR_II_M_004 PRIMARY) */ tnt_inst_id, ar_no, ar_nm, ar_tp_code, ar_entity_type " + "from tb_001 " + @@ -44,12 +43,12 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT /*MS-ARCORE-AR-II-M-QUERY-IN-LOCK-BY-AR-NOS*/\n" + @@ -58,7 +57,7 @@ public void test_0() throws Exception { "WHERE tnt_inst_id = ?\n" + "\tAND ar_no IN (?)\n" + "FOR UPDATE NOWAIT", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -68,7 +67,7 @@ public void test_0() throws Exception { "where tnt_inst_id = ?\n" + "\tand ar_no in (?)\n" + "for update nowait", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_5.java index 2fa2db1d14..24d3476c98 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_5.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_5 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 'Monty!' RLIKE '.*'"; @@ -42,7 +41,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_50_union.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_50_union.java index 91434d2be8..e6f788778c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_50_union.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_50_union.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_50_union extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from (\n" + "select seller_name from a where id < 100\n" + @@ -45,12 +44,12 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT *\n" + @@ -64,7 +63,7 @@ public void test_0() throws Exception { "\tWHERE id < 100\n" + ") temp\n" + "LIMIT 10", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -79,7 +78,7 @@ public void test_0() throws Exception { "\twhere id < 100\n" + ") temp\n" + "limit 10", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_51_open.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_51_open.java index f7be99990e..dce041726f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_51_open.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_51_open.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_51_open extends MysqlTest { - public void test_0() throws Exception { String sql = "select id as id, gmt_create as gmtCreate, gmt_modified as gmtModified, name as name, owner as owner, type as type, statement as statement, datasource as datasource, meta as meta, param_file as paramFile, sharable as sharable, data_type as dataType, status as status, config as config, project_id as projectId, plugins as plugins, field_compare as fieldCompare, field_ext as fieldExt, open as open from tb_001 where id = 12569434"; @@ -41,12 +40,12 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT id AS id, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, owner AS owner\n" + @@ -55,7 +54,7 @@ public void test_0() throws Exception { "\t, plugins AS plugins, field_compare AS fieldCompare, field_ext AS fieldExt, open AS open\n" + "FROM tb_001\n" + "WHERE id = 12569434", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -65,7 +64,7 @@ public void test_0() throws Exception { "\t, plugins as plugins, field_compare as fieldCompare, field_ext as fieldExt, open as open\n" + "from tb_001\n" + "where id = 12569434", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_52_comment.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_52_comment.java index b80533a4b9..4ab4281e13 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_52_comment.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_52_comment.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_52_comment extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT comment.id,user.id AS user_id,user.username,user.avatar,comment.created_at,\n" + " getDistance('31.860968', '117.252579', user.latitude, user.longitude) AS distance,\n" + @@ -57,12 +56,12 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT comment.id, user.id AS user_id, user.username, user.avatar, comment.created_at\n" + @@ -82,7 +81,7 @@ public void test_0() throws Exception { "\tAND getDistance('31.860968', '117.252579', user.latitude, user.longitude) <= 10000\n" + "ORDER BY created_at DESC\n" + "LIMIT 10, 10", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -103,7 +102,7 @@ public void test_0() throws Exception { "\tand getDistance('31.860968', '117.252579', user.latitude, user.longitude) <= 10000\n" + "order by created_at desc\n" + "limit 10, 10", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_53_match.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_53_match.java index 489fd1eee8..a628ee75e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_53_match.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_53_match.java @@ -24,9 +24,8 @@ import java.util.List; public class MySqlSelectTest_53_match extends MysqlTest { - public void test_0() throws Exception { - String sql = "SELECT *, `MATCH`(question_content_fulltext) " + // + String sql = "SELECT *, `MATCH`(question_content_fulltext) " + // "`AGAINST`('2015431867 2636826089 3807520117 2796321160 2615920174' IN BOOLEAN MODE) AS score " + // "FROM aws_question " + // "WHERE MATCH(question_content_fulltext) " + // @@ -48,35 +47,35 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT *, MATCH (question_content_fulltext) AGAINST ('2015431867 2636826089 3807520117 2796321160 2615920174' IN BOOLEAN MODE) AS score\n" - + "FROM aws_question\n" - + "WHERE MATCH (question_content_fulltext) AGAINST ('2015431867 2636826089 3807520117 2796321160 2615920174') > 1\n" - + "ORDER BY score DESC, agree_count DESC\n" + "LIMIT 10", // - output); + + "FROM aws_question\n" + + "WHERE MATCH (question_content_fulltext) AGAINST ('2015431867 2636826089 3807520117 2796321160 2615920174') > 1\n" + + "ORDER BY score DESC, agree_count DESC\n" + "LIMIT 10", // + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select *, match (question_content_fulltext) against ('2015431867 2636826089 3807520117 2796321160 2615920174' in boolean mode) as score\n" - + "from aws_question\n" - + "where match (question_content_fulltext) against ('2015431867 2636826089 3807520117 2796321160 2615920174') > 1\n" - + "order by score desc, agree_count desc\n" + "limit 10", // - output); + + "from aws_question\n" + + "where match (question_content_fulltext) against ('2015431867 2636826089 3807520117 2796321160 2615920174') > 1\n" + + "order by score desc, agree_count desc\n" + "limit 10", // + output); } { String output = SQLUtils.toMySqlString(stmt, new SQLUtils.FormatOption(true, true, true)); assertEquals("SELECT *, MATCH (question_content_fulltext) AGAINST (? IN BOOLEAN MODE) AS score\n" - + "FROM aws_question\n" + "WHERE MATCH (question_content_fulltext) AGAINST (?) > ?\n" - + "ORDER BY score DESC, agree_count DESC\n" + "LIMIT ?", // - output); + + "FROM aws_question\n" + "WHERE MATCH (question_content_fulltext) AGAINST (?) > ?\n" + + "ORDER BY score DESC, agree_count DESC\n" + "LIMIT ?", // + output); } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_54.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_54.java index cb9d8fd701..dadd88a25e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_54.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_54.java @@ -24,9 +24,8 @@ import java.util.List; public class MySqlSelectTest_54 extends MysqlTest { - public void test_0() throws Exception { - String sql = "SELECT t.*,a.param_id FROM lhwtag AS t RIGHT JOIN lhwtag_relation AS a USING(`tag_id`) WHERE a.`type_id`=1 AND a.`param_id` IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9') ORDER BY t.`content_count`"; + String sql = "SELECT t.*,a.param_id FROM lhwtag AS t RIGHT JOIN lhwtag_relation AS a USING(`tag_id`) WHERE a.`type_id`=1 AND a.`param_id` IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9') ORDER BY t.`content_count`"; System.out.println(sql); @@ -43,12 +42,12 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT t.*, a.param_id\n" + @@ -68,7 +67,7 @@ public void test_0() throws Exception { "\t\t'9'\n" + "\t)\n" + "ORDER BY t.`content_count`", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -89,7 +88,7 @@ public void test_0() throws Exception { "\t\t'9'\n" + "\t)\n" + "order by t.`content_count`", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_55.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_55.java index adf825664c..6782d6d1b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_55.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_55.java @@ -25,14 +25,13 @@ import java.util.List; public class MySqlSelectTest_55 extends MysqlTest { - public void test_date() throws Exception { System.out.println(new SimpleDateFormat("yyyyMMdd").parse("19050101").getTime()); System.out.println(new SimpleDateFormat("yyyyMMdd").parse("10010101").toString()); } public void test_0() throws Exception { - String sql = "select count(0)\n" + + String sql = "select count(0)\n" + "from tb_user\n" + "where\n" + "(login_name like '%j%' and v_sort between 1 and 10 )\n" + @@ -54,12 +53,12 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT count(0)\n" + @@ -68,7 +67,7 @@ public void test_0() throws Exception { "\t\tAND v_sort BETWEEN 1 AND 10)\n" + "\tOR (display_name LIKE '%j%'\n" + "\t\tAND v_sort BETWEEN 1 AND 10)", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -78,7 +77,7 @@ public void test_0() throws Exception { "\t\tand v_sort between 1 and 10)\n" + "\tor (display_name like '%j%'\n" + "\t\tand v_sort between 1 and 10)", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_56.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_56.java index 8424ce8e0e..cb085949bb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_56.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_56.java @@ -24,9 +24,8 @@ import java.util.List; public class MySqlSelectTest_56 extends MysqlTest { - public void test_0() throws Exception { - String sql = "select * from (\n" + + String sql = "select * from (\n" + "select seller_name from a where id < 100\n" + "UNION\n" + "select seller_name from a where id < 100\n" + @@ -47,12 +46,12 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT *\n" + @@ -66,7 +65,7 @@ public void test_0() throws Exception { "\tWHERE id < 100\n" + ") temp\n" + "LIMIT 10", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -81,7 +80,7 @@ public void test_0() throws Exception { "\twhere id < 100\n" + ") temp\n" + "limit 10", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_57.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_57.java index 520d1efa6d..d317139cb8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_57.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_57.java @@ -24,9 +24,8 @@ import java.util.List; public class MySqlSelectTest_57 extends MysqlTest { - public void test_0() throws Exception { - String sql = "SELECT SUBSTR('12345678' FROM 2 FOR 4)"; + String sql = "SELECT SUBSTR('12345678' FROM 2 FOR 4)"; System.out.println(sql); @@ -43,21 +42,21 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT SUBSTR('12345678' FROM 2 FOR 4)", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select SUBSTR('12345678' from 2 for 4)", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_58_alias_dot.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_58_alias_dot.java index b77d6a47c9..1c8bfb8f28 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_58_alias_dot.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_58_alias_dot.java @@ -24,9 +24,8 @@ import java.util.List; public class MySqlSelectTest_58_alias_dot extends MysqlTest { - public void test_0() throws Exception { - String sql = "SELECT m.*, m.icon AS micon, md.uid as md.uid, md.lastmsg,md.postnum,md.rvrc,md.money,md.credit,md.currency,md.lastvisit,md.thisvisit,md.onlinetime,md.lastpost,md.todaypost, md.monthpost,md.onlineip,md.uploadtime,md.uploadnum,md.starttime,md.pwdctime,md.monoltime,md.digests,md.f_num,md.creditpop, md.jobnum,md.lastgrab,md.follows,md.fans,md.newfans,md.newreferto,md.newcomment,md.postcheck,md.punch, mi.customdata " + + String sql = "SELECT m.*, m.icon AS micon, md.uid as md.uid, md.lastmsg,md.postnum,md.rvrc,md.money,md.credit,md.currency,md.lastvisit,md.thisvisit,md.onlinetime,md.lastpost,md.todaypost, md.monthpost,md.onlineip,md.uploadtime,md.uploadnum,md.starttime,md.pwdctime,md.monoltime,md.digests,md.f_num,md.creditpop, md.jobnum,md.lastgrab,md.follows,md.fans,md.newfans,md.newreferto,md.newcomment,md.postcheck,md.punch, mi.customdata " + "FROM pw_members m LEFT JOIN pw_memberdata md ON m.uid=md.uid LEFT JOIN pw_memberinfo mi ON mi.uid=m.uid WHERE m.uid IN (?)"; System.out.println(sql); @@ -44,12 +43,12 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT m.*, m.icon AS micon, md.uid AS `md.uid`, md.lastmsg, md.postnum\n" + @@ -63,7 +62,7 @@ public void test_0() throws Exception { "\tLEFT JOIN pw_memberdata md ON m.uid = md.uid\n" + "\tLEFT JOIN pw_memberinfo mi ON mi.uid = m.uid\n" + "WHERE m.uid IN (?)", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -78,7 +77,7 @@ public void test_0() throws Exception { "\tleft join pw_memberdata md on m.uid = md.uid\n" + "\tleft join pw_memberinfo mi on mi.uid = m.uid\n" + "where m.uid in (?)", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_59_neq.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_59_neq.java index 2925a4a7cf..e1617797a0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_59_neq.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_59_neq.java @@ -24,9 +24,8 @@ import java.util.List; public class MySqlSelectTest_59_neq extends MysqlTest { - public void test_0() throws Exception { - String sql = "SELECT * from t where t ! = 1"; + String sql = "SELECT * from t where t ! = 1"; System.out.println(sql); @@ -43,25 +42,25 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT *\n" + "FROM t\n" + "WHERE t != 1", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select *\n" + "from t\n" + "where t != 1", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_6.java index b3c8d90965..92b2159df2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_6.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_6 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 'Monty!' NOT RLIKE '.*'"; @@ -42,7 +41,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_60_firstComment.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_60_firstComment.java index 1189c3524e..565389ab1c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_60_firstComment.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_60_firstComment.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_60_firstComment extends MysqlTest { - public void test_0() throws Exception { - String sql = "/* xxx * xxxx */SELECT * from t where t ! = 1"; + String sql = "/* xxx * xxxx */SELECT * from t where t ! = 1"; System.out.println(sql); @@ -46,14 +45,14 @@ public void test_0() throws Exception { assertEquals("SELECT *\n" + "FROM t\n" + "WHERE t != 1", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select *\n" + "from t\n" + "where t != 1", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_61_firstComment_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_61_firstComment_2.java index d9bc3a9e77..6e8c13978f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_61_firstComment_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_61_firstComment_2.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_61_firstComment_2 extends MysqlTest { - public void test_0() throws Exception { - String sql = "/* xxx * xxxx */ SELECT * from t where t ! = 1"; + String sql = "/* xxx * xxxx */ SELECT * from t where t ! = 1"; System.out.println(sql); @@ -46,14 +45,14 @@ public void test_0() throws Exception { assertEquals("SELECT *\n" + "FROM t\n" + "WHERE t != 1", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select *\n" + "from t\n" + "where t != 1", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_62_optimized.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_62_optimized.java index 2d92692e29..eea20aefef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_62_optimized.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_62_optimized.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_62_optimized extends MysqlTest { - public void test_0() throws Exception { - String sql = "SELECT * from t where t ! = 1"; + String sql = "SELECT * from t where t ! = 1"; System.out.println(sql); @@ -46,14 +45,14 @@ public void test_0() throws Exception { assertEquals("SELECT *\n" + "FROM t\n" + "WHERE t != 1", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select *\n" + "from t\n" + "where t != 1", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_63_alias.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_63_alias.java index 1ab94361b1..0d8e1f6d0a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_63_alias.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_63_alias.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_63_alias extends MysqlTest { - public void test_0() throws Exception { - String sql = " SELECT totalNumber, concat(\"\",? , round(memberNumber, 0) , \"\") AS totalDisplay FROM (\n" + + String sql = " SELECT totalNumber, concat(\"\",? , round(memberNumber, 0) , \"\") AS totalDisplay FROM (\n" + "SELECT count(1) AS totalNumber, sum(memberNumber) AS memberNumber FROM(\n" + "SELECT mmd.office_id AS departID,st.no AS staffNO,st.name AS staffName,count(mmd.id) memberNumber FROM ms_member_def mmd\n" + "LEFT JOIN sys_user st ON mmd.salesman_id=st.id AND st.del_flag='0'\n" + @@ -71,7 +70,7 @@ public void test_0() throws Exception { "\t\tGROUP BY mmd.office_id, st.no\n" + "\t) gg\n" + ") temp", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -94,7 +93,7 @@ public void test_0() throws Exception { "\t\tgroup by mmd.office_id, st.no\n" + "\t) gg\n" + ") temp", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_64_negative.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_64_negative.java index 59c077f1b8..231d04c2f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_64_negative.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_64_negative.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_64_negative extends MysqlTest { - public void test_0() throws Exception { - String sql = "select -4.7,3.5"; + String sql = "select -4.7,3.5"; System.out.println(sql); @@ -44,12 +43,12 @@ public void test_0() throws Exception { { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT -4.7, 3.5", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select -4.7, 3.5", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_65_orderby.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_65_orderby.java index 9e3e80f6e3..a1cf8491c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_65_orderby.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_65_orderby.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_65_orderby extends MysqlTest { - public void test_0() throws Exception { - String sql = "SELECT number,event_cnt,country_code,area_code,carrier,country,province,city,type,subtype,displayname,slogan,logo,source,state,priority,is_change FROM ktv_number_20170921 WHERE day_modify > 20170921 AND priority >= 4499000 ORDER BY priority DESC LIMIT 500000"; + String sql = "SELECT number,event_cnt,country_code,area_code,carrier,country,province,city,type,subtype,displayname,slogan,logo,source,state,priority,is_change FROM ktv_number_20170921 WHERE day_modify > 20170921 AND priority >= 4499000 ORDER BY priority DESC LIMIT 500000"; System.out.println(sql); @@ -52,7 +51,7 @@ public void test_0() throws Exception { "\tAND priority >= 4499000\n" + "ORDER BY priority DESC\n" + "LIMIT 500000", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -65,7 +64,7 @@ public void test_0() throws Exception { "\tand priority >= 4499000\n" + "order by priority desc\n" + "limit 500000", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_66.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_66.java index 17e165b406..d62b121731 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_66.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_66.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_66 extends MysqlTest { - public void test_0() throws Exception { - String sql = "SELECT * FROM (SELECT number_ios,type,subtype,displayname,source FROM hot_number_20170921 WHERE day_modify > 20170921 AND priority >= 4499000 ORDER BY priority DESC LIMIT 500000) ORDER BY number_ios ASC"; + String sql = "SELECT * FROM (SELECT number_ios,type,subtype,displayname,source FROM hot_number_20170921 WHERE day_modify > 20170921 AND priority >= 4499000 ORDER BY priority DESC LIMIT 500000) ORDER BY number_ios ASC"; System.out.println(sql); @@ -53,7 +52,7 @@ public void test_0() throws Exception { "\tLIMIT 500000\n" + ")\n" + "ORDER BY number_ios ASC", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -67,7 +66,7 @@ public void test_0() throws Exception { "\tlimit 500000\n" + ")\n" + "order by number_ios asc", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_67.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_67.java index db50e5d0d1..83999eed17 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_67.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_67.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_67 extends MysqlTest { - public void test_0() throws Exception { - String sql = "SELECT\n" + + String sql = "SELECT\n" + "t_aid,t_title,t_path,t_datetime,t_total\n" + "FROM t_article WHERE t_state =\n" + "? ORDER BY t_total DESC limit ?,?"; @@ -51,7 +50,7 @@ public void test_0() throws Exception { "WHERE t_state = ?\n" + "ORDER BY t_total DESC\n" + "LIMIT ?, ?", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -60,7 +59,7 @@ public void test_0() throws Exception { "where t_state = ?\n" + "order by t_total desc\n" + "limit ?, ?", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_68_mariadb_cte.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_68_mariadb_cte.java index d5fffeb36f..69e322808e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_68_mariadb_cte.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_68_mariadb_cte.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_68_mariadb_cte extends MysqlTest { - public void test_0() throws Exception { - String sql = "WITH RECURSIVE ancestors AS (\n" + + String sql = "WITH RECURSIVE ancestors AS (\n" + " SELECT *\n" + " FROM org\n" + " WHERE 1=1\n" + @@ -67,7 +66,7 @@ public void test_0() throws Exception { "\t)\n" + "SELECT *\n" + "FROM ancestors;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -83,7 +82,7 @@ public void test_0() throws Exception { "\t)\n" + "select *\n" + "from ancestors;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_7.java index bab402c896..ccb4da44c1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_7.java @@ -27,21 +27,20 @@ import java.util.List; public class MySqlSelectTest_7 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from tb order by id asc,name desc"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + SQLSelectStatement selectStmt = (SQLSelectStatement) stmt; - + SQLSelect select = selectStmt.getSelect(); Assert.assertNotNull(select.getQuery()); MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) select.getQuery(); Assert.assertNotNull(queryBlock.getOrderBy()); - + // print(statementList); Assert.assertEquals(1, statementList.size()); @@ -53,7 +52,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(3, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_70_nchar.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_70_nchar.java index c55b830e60..06994cbb4a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_70_nchar.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_70_nchar.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_70_nchar extends MysqlTest { - public void test_0() throws Exception { - String sql = "select n'abc' as tstConstrN;"; + String sql = "select n'abc' as tstConstrN;"; System.out.println(sql); @@ -44,12 +43,12 @@ public void test_0() throws Exception { { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT N'abc' AS tstConstrN;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select n'abc' as tstConstrN;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_71_concat.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_71_concat.java index 2b9f331b8b..f0585208c1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_71_concat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_71_concat.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_71_concat extends MysqlTest { - public void test_0() throws Exception { - String sql = "select 'afdf' \"erwhg\" \"ads\" 'dgs' \"rter\" as tstDiffQuoteConcat;"; + String sql = "select 'afdf' \"erwhg\" \"ads\" 'dgs' \"rter\" as tstDiffQuoteConcat;"; System.out.println(sql); @@ -44,12 +43,12 @@ public void test_0() throws Exception { { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT 'afdferwhgadsdgsrter' AS tstDiffQuoteConcat;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select 'afdferwhgadsdgsrter' as tstDiffQuoteConcat;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_72_nchar.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_72_nchar.java index 056e1dd7bc..43f2b428d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_72_nchar.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_72_nchar.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_72_nchar extends MysqlTest { - public void test_0() throws Exception { - String sql = "select N'abc' \"bcd\" 'asdfasdf' as tstConstNAndConcat;"; + String sql = "select N'abc' \"bcd\" 'asdfasdf' as tstConstNAndConcat;"; System.out.println(sql); @@ -44,12 +43,12 @@ public void test_0() throws Exception { { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT CONCAT(N'abc', 'bcd', 'asdfasdf') AS tstConstNAndConcat;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select CONCAT(n'abc', 'bcd', 'asdfasdf') as tstConstNAndConcat;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_73_null.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_73_null.java index f977909100..374d1cb77c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_73_null.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_73_null.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_73_null extends MysqlTest { - public void test_0() throws Exception { - String sql = "select \\N;"; + String sql = "select \\N;"; System.out.println(sql); @@ -44,12 +43,12 @@ public void test_0() throws Exception { { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT NULL;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select null;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_74_latin.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_74_latin.java index 54cb020954..202df700ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_74_latin.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_74_latin.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_74_latin extends MysqlTest { - public void test_0() throws Exception { - String sql = "select * from t1 inner join (t1 as tt1, t2 as tt2) on t1.col1 = tt1.col1;"; + String sql = "select * from t1 inner join (t1 as tt1, t2 as tt2) on t1.col1 = tt1.col1;"; System.out.println(sql); @@ -46,14 +45,14 @@ public void test_0() throws Exception { assertEquals("SELECT *\n" + "FROM t1\n" + "\tINNER JOIN (t1 tt1, t2 tt2) ON t1.col1 = tt1.col1;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select *\n" + "from t1\n" + "\tinner join (t1 tt1, t2 tt2) on t1.col1 = tt1.col1;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_75_select.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_75_select.java index ffd9d66f66..a49680a4b5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_75_select.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_75_select.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_75_select extends MysqlTest { - public void test_0() throws Exception { - String sql = "select CONVERT( LEFT( CONVERT( '自動下書き' USING binary ), 100 ) USING utf8 ) AS x_0;"; + String sql = "select CONVERT( LEFT( CONVERT( '自動下書き' USING binary ), 100 ) USING utf8 ) AS x_0;"; System.out.println(sql); @@ -44,12 +43,12 @@ public void test_0() throws Exception { { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT CONVERT(LEFT(CONVERT('自動下書き' USING binary), 100) USING utf8) AS x_0;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select CONVERT(LEFT(CONVERT('自動下書き' using binary), 100) using utf8) as x_0;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_76_union.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_76_union.java index 171b656c8f..66d3226ca2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_76_union.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_76_union.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_76_union extends MysqlTest { - public void test_0() throws Exception { - String sql = "((select 1 as a1, 10 as a2)) union all (((select 2, 20))) union distinct (select 3, 30);"; + String sql = "((select 1 as a1, 10 as a2)) union all (((select 2, 20))) union distinct (select 3, 30);"; System.out.println(sql); @@ -48,7 +47,7 @@ public void test_0() throws Exception { "(SELECT 2, 20)\n" + "UNION DISTINCT\n" + "(SELECT 3, 30);", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -57,7 +56,7 @@ public void test_0() throws Exception { "(select 2, 20)\n" + "union distinct\n" + "(select 3, 30);", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_77_is_unkown.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_77_is_unkown.java index 5a432f40b5..a01fa6e770 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_77_is_unkown.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_77_is_unkown.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_77_is_unkown extends MysqlTest { - public void test_0() throws Exception { - String sql = "select 0 in (20 = any (select col1 from t1)) is not null is not unknown as t;"; + String sql = "select 0 in (20 = any (select col1 from t1)) is not null is not unknown as t;"; System.out.println(sql); @@ -47,7 +46,7 @@ public void test_0() throws Exception { "\t\tSELECT col1\n" + "\t\tFROM t1\n" + "\t)) IS NOT NULL) IS NOT unknown AS t;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -55,7 +54,7 @@ public void test_0() throws Exception { "\t\tselect col1\n" + "\t\tfrom t1\n" + "\t)) is not null) is not unknown as t;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_78_is_unkown.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_78_is_unkown.java index f8dff0f74e..086bf0da15 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_78_is_unkown.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_78_is_unkown.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_78_is_unkown extends MysqlTest { - public void test_0() throws Exception { - String sql = "select 20 = any (select col1 from t1) is not unknown as t;"; + String sql = "select 20 = any (select col1 from t1) is not unknown as t;"; System.out.println(sql); @@ -47,7 +46,7 @@ public void test_0() throws Exception { "\t\tSELECT col1\n" + "\t\tFROM t1\n" + "\t) IS NOT unknown AS t;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -55,7 +54,7 @@ public void test_0() throws Exception { "\t\tselect col1\n" + "\t\tfrom t1\n" + "\t) is not unknown as t;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_79_between.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_79_between.java index c4e203f89b..0d9184c375 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_79_between.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_79_between.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_79_between extends MysqlTest { - public void test_0() throws Exception { - String sql = "select 1 = 16/4 between 3 and 5 as c;"; + String sql = "select 1 = 16/4 between 3 and 5 as c;"; System.out.println(sql); @@ -44,12 +43,12 @@ public void test_0() throws Exception { { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT 1 = 16 / 4 BETWEEN 3 AND 5 AS c;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select 1 = 16 / 4 between 3 and 5 as c;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_8.java index 79d38b1683..ffcf530ead 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_8.java @@ -27,21 +27,20 @@ import java.util.List; public class MySqlSelectTest_8 extends MysqlTest { - public void test_0() throws Exception { String sql = "select 1"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + SQLSelectStatement selectStmt = (SQLSelectStatement) stmt; - + SQLSelect select = selectStmt.getSelect(); Assert.assertNotNull(select.getQuery()); MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) select.getQuery(); Assert.assertNull(queryBlock.getOrderBy()); - + // print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_80_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_80_hints.java index 04e4ec06d1..21f05276ec 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_80_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_80_hints.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_80_hints extends MysqlTest { - public void test_0() throws Exception { - String sql = "select 1 /*!, ' hello' */, 2 /*! union select 5, ' world', 10 */;"; + String sql = "select 1 /*!, ' hello' */, 2 /*! union select 5, ' world', 10 */;"; System.out.println(sql); @@ -45,13 +44,13 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT 1 /*!, ' hello' */\n" + "\t, 2 /*! union select 5, ' world', 10 */;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select 1 /*!, ' hello' */\n" + "\t, 2 /*! union select 5, ' world', 10 */;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_81_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_81_hints.java index d8f93fa18d..69c4f82312 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_81_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_81_hints.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_81_hints extends MysqlTest { - public void test_0() throws Exception { - String sql = "select * from t /*! where col = somefunc(col2) order by sortcol */;"; + String sql = "select * from t /*! where col = somefunc(col2) order by sortcol */;"; System.out.println(sql); @@ -45,13 +44,13 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT *\n" + "FROM t/*! where col = somefunc(col2) order by sortcol */;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("select *\n" + "from t/*! where col = somefunc(col2) order by sortcol */;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_82_force_partition.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_82_force_partition.java index 328d97f7d0..d9c7feded7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_82_force_partition.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_82_force_partition.java @@ -27,9 +27,8 @@ import java.util.List; public class MySqlSelectTest_82_force_partition extends MysqlTest { - public void test_0() throws Exception { - String sql = "select\n" + + String sql = "select\n" + " app_key,device_id,brand \n" + " \n" + " force partition 'MASSDEVICE40'\n" + @@ -76,7 +75,7 @@ public void test_0() throws Exception { "\tAND package_name = ?\n" + "\tAND app_version IN (?)\n" + "ORDER BY gmt_modified DESC", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -87,7 +86,7 @@ public void test_0() throws Exception { "\tand package_name = ?\n" + "\tand app_version in (?)\n" + "order by gmt_modified desc", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_9.java index bfdc713bef..7430b57ade 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_9.java @@ -28,21 +28,20 @@ import java.util.List; public class MySqlSelectTest_9 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT `group`.* FROM `group` WHERE (group.group_id=159754)"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + SQLSelectStatement selectStmt = (SQLSelectStatement) stmt; - + SQLSelect select = selectStmt.getSelect(); Assert.assertNotNull(select.getQuery()); MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) select.getQuery(); Assert.assertNull(queryBlock.getOrderBy()); - + // print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_90.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_90.java index 2b249269e8..0d0ede5ea0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_90.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_90.java @@ -25,7 +25,6 @@ public class MySqlSelectTest_90 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM tbl_name use INDEX (idx1) use INDEX (idx2)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_91_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_91_hints.java index cb893e004c..b4f7041050 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_91_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_91_hints.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_91_hints extends MysqlTest { - public void test_0() throws Exception { String sql = "select id from a /*+ xxx */ "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_92.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_92.java index acfc948eb4..ef99e53c83 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_92.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_92.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_92 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from TABLENAME cfgdatasou0_ where cfgdatasou0_.type=? and cfgdatasou0_.module_name=? and cfgdatasou0_.node_type=? or cfgdatasou0_.type=? and cfgdatasou0_.module_name=? and cfgdatasou0_.node_type=? or cfgdatasou0_.type=? and cfgdatasou0_.module_name=? and cfgdatasou0_.node_type=?"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_93.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_93.java index f7eb014b6e..8befbbf7f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_93.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_93.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_93 extends MysqlTest { - public void test_0() throws Exception { String sql = "select a as `a`, b `b`, c 'c', d \"d\" from t1"; @@ -77,21 +76,21 @@ public void test_3() throws Exception { public void test_5() throws Exception { String sql = "INSERT INTO brand_crm_ship.imp_order_lock \n" + " (tid, \n" + " pid, \n" - + " __aid, \n" + " pv) SELECT 121, \n" + " 48868196, \n" - + " t2.__aid, \n" + " t3.pv \n" + "FROM (SELECT DISTINCT __aid \n" - + " FROM (SELECT DISTINCT \n" - + " brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump.__aid \n" - + " AS __aid \n" - + " FROM brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump \n" - + " WHERE \n" + "( \n" + "( \n" - + "brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump.label_list_interest IN ( '1142' )\n" - + "AND brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump.user_age IN \n" + "( \n" - + "'4', '3', '2', '1' ) \n" + "AND \n" - + "brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump.label_list_basic IN ( '1605', '1603', '1604', '1563' ) )\n" - + "AND NOT (brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump.label_list_industry IN ( '1140' )) )) t1) t2\n" - + "JOIN (SELECT __aid, \n" + " pv \n" - + " FROM brand_crm_ship.palgo_o2o_imp_px_log_sample_adzone_aid_merge \n" - + " WHERE adzone_id = 48868196) t3 \n" + " ON t3.__aid = t2.__aid "; + + " __aid, \n" + " pv) SELECT 121, \n" + " 48868196, \n" + + " t2.__aid, \n" + " t3.pv \n" + "FROM (SELECT DISTINCT __aid \n" + + " FROM (SELECT DISTINCT \n" + + " brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump.__aid \n" + + " AS __aid \n" + + " FROM brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump \n" + + " WHERE \n" + "( \n" + "( \n" + + "brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump.label_list_interest IN ( '1142' )\n" + + "AND brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump.user_age IN \n" + "( \n" + + "'4', '3', '2', '1' ) \n" + "AND \n" + + "brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump.label_list_basic IN ( '1605', '1603', '1604', '1563' ) )\n" + + "AND NOT (brand_crm_ship.alimama_ecpm_algo_brand_display_ad_label_out_dump.label_list_industry IN ( '1140' )) )) t1) t2\n" + + "JOIN (SELECT __aid, \n" + " pv \n" + + " FROM brand_crm_ship.palgo_o2o_imp_px_log_sample_adzone_aid_merge \n" + + " WHERE adzone_id = 48868196) t3 \n" + " ON t3.__aid = t2.__aid "; MySqlStatementParser parser = new MySqlStatementParser(sql, SQLParserFeature.IgnoreNameQuotes); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94.java index 5f10b4b794..291b4e6e4d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlSelectTest_94 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from test where name = 'cail\\1';"; @@ -124,6 +123,7 @@ public void test_7() throws Exception { SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals("/*+ a=1,b=2*/\n" + "SELECT count(DISTINCT a)\n" + "FROM test\n" + "WHERE name = 'cai\t';", stmt.toString()); } + public void test_8() throws Exception { String sql = "/*+engine=MPP*/ with tmp1 as ( select uid, ugroups_str from dw.test_multivalue1 where uid = 101 ) select tmp1.uid, tmp1.ugroups_str from tmp1"; @@ -134,13 +134,13 @@ public void test_8() throws Exception { SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals("/*+engine=MPP*/\n" - + "WITH tmp1 AS (\n" - + "\t\tSELECT uid, ugroups_str\n" - + "\t\tFROM dw.test_multivalue1\n" - + "\t\tWHERE uid = 101\n" - + "\t)\n" - + "SELECT tmp1.uid, tmp1.ugroups_str\n" - + "FROM tmp1", stmt.toString()); + + "WITH tmp1 AS (\n" + + "\t\tSELECT uid, ugroups_str\n" + + "\t\tFROM dw.test_multivalue1\n" + + "\t\tWHERE uid = 101\n" + + "\t)\n" + + "SELECT tmp1.uid, tmp1.ugroups_str\n" + + "FROM tmp1", stmt.toString()); } public void test_9() throws Exception { @@ -153,10 +153,10 @@ public void test_9() throws Exception { SQLCreateTableStatement stmt = (SQLCreateTableStatement) statementList.get(0); assertEquals("CREATE TABLE testkey3 (\n" - + "\tkey varchar(4),\n" - + "\tid int,\n" - + "\tPRIMARY KEY (key)\n" - + ");", stmt.toString()); + + "\tkey varchar(4),\n" + + "\tid int,\n" + + "\tPRIMARY KEY (key)\n" + + ");", stmt.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94_error.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94_error.java index 207341093b..8f75b876d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94_error.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94_error.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_94_error extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from ttt where exist (select max(id) from ttt);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_95_error_orderBy.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_95_error_orderBy.java index 755392507e..81d8806669 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_95_error_orderBy.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_95_error_orderBy.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlSelectTest_95_error_orderBy extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from xx ordor by name desc"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_95_soundsLike.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_95_soundsLike.java index bfdb0b8722..eac069ccb6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_95_soundsLike.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_95_soundsLike.java @@ -24,7 +24,6 @@ public class MySqlSelectTest_95_soundsLike extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM student \n" + "WHERE first_name SOUNDS LIKE 'sudipto' ;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_96_istrue.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_96_istrue.java index 8e5a81af1d..db26cc3c50 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_96_istrue.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_96_istrue.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_96_istrue extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM student \n" + "where id > 123 is true"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_97_alias.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_97_alias.java index e16ac621d8..843050625d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_97_alias.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_97_alias.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_97_alias extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM student \n" + "where id = \"123\""; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_98.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_98.java index 1ef90229c3..29b8fe8b24 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_98.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_98.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_98 extends MysqlTest { - public void test_0() throws Exception { String sql = "INSERT INTO brand_crm_ship.imp_order_lock (tid, pid, __aid, pv) \n" + "          SELECT 121, \n" + @@ -56,7 +55,7 @@ public void test_0() throws Exception { "               WHERE  adzone_id = 48868196) t3 \n" + "            ON t3.__aid = t2.__aid \n"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -72,12 +71,12 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(3, visitor.getTables().size()); Assert.assertEquals(12, visitor.getColumns().size()); Assert.assertEquals(6, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("INSERT INTO brand_crm_ship.imp_order_lock (tid, pid, __aid, pv)\n" + @@ -99,7 +98,7 @@ public void test_0() throws Exception { "\t\tWHERE adzone_id = 48868196\n" + "\t) t3\n" + "\tON t3.__aid = t2.__aid", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -122,10 +121,9 @@ public void test_0() throws Exception { "\t\twhere adzone_id = 48868196\n" + "\t) t3\n" + "\ton t3.__aid = t2.__aid", // - output); + output); } } - - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_99_union_order.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_99_union_order.java index 6020946ec6..e556155945 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_99_union_order.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_99_union_order.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_99_union_order extends MysqlTest { - public void test_0() throws Exception { String sql = "select id as id1 from ll union select id as id1 from rr order by id desc;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_BinaryConcat.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_BinaryConcat.java index 507f47478c..6a66912ba6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_BinaryConcat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_BinaryConcat.java @@ -27,12 +27,11 @@ import java.util.List; public class MySqlSelectTest_BinaryConcat extends MysqlTest { - public void test_0() throws Exception { String sql = "select campaignId from Campaign" + // - " where advertiserId = ?" + // - " and deleteStatus = false" + // - " and campaignName like binary CONCAT('%',?,'%')"; + " where advertiserId = ?" + // + " and deleteStatus = false" + // + " and campaignName like binary CONCAT('%',?,'%')"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_POSITION.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_POSITION.java index 4dc03af106..5f14fd3bd9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_POSITION.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_POSITION.java @@ -28,16 +28,15 @@ import java.util.List; public class MySqlSelectTest_POSITION extends MysqlTest { - public void test_0() throws Exception { String sql = "select a.rule_id, " + // - "b.object_id, " + // - "a.user_nick, " + // - "SUBSTRING(b.content, POSITION('bizOrderId' IN b.content), 30) as dingdanhao, " + // - "SUBSTRING(b.content, POSITION('loginIn7Days' IN b.content), 88) as shengdajieguo, " + // - "a.action_time " + // - "from ctu_scheme_0025 a, " + // - "ctu_scheme_detail_0025 b"; + "b.object_id, " + // + "a.user_nick, " + // + "SUBSTRING(b.content, POSITION('bizOrderId' IN b.content), 30) as dingdanhao, " + // + "SUBSTRING(b.content, POSITION('loginIn7Days' IN b.content), 88) as shengdajieguo, " + // + "a.action_time " + // + "from ctu_scheme_0025 a, " + // + "ctu_scheme_detail_0025 b"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_adsHintAndTypeConvert.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_adsHintAndTypeConvert.java index 618379c5d9..2e041f5e91 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_adsHintAndTypeConvert.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_adsHintAndTypeConvert.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; public class MySqlSelectTest_adsHintAndTypeConvert extends MysqlTest { - public void test_1() throws Exception { String sql = "/*+engine=mpp*/ select timestamp '2017-01-01 11:11:11'"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords.java index 2dbb789d24..b3d5ea82d5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords.java @@ -25,11 +25,10 @@ import java.util.List; public class MySqlSelectTest_ads_keywords extends MysqlTest { - public void test_0() throws Exception { String sql = "select label from a where not id > 50"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_0.java index 1322dacc46..89d7873c47 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_0.java @@ -29,7 +29,6 @@ import java.util.List; public class MySqlSelectTest_ads_keywords_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "select lable, status, begin, option from t where label = 1"; @@ -61,6 +60,6 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT lable, status, begin, option\n" + "FROM t\n" + "WHERE label = 1", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_1.java index 392b1e5d13..ba53aceea3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_1.java @@ -27,7 +27,7 @@ import com.alibaba.druid.stat.TableStat; public class MySqlSelectTest_ads_keywords_1 extends MysqlTest { - String[] keywords = new String[] { + String[] keywords = new String[]{ "any", "begin", "cast", diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_clearLimit.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_clearLimit.java index 22f4fd84c5..afa8a0350f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_clearLimit.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_clearLimit.java @@ -26,48 +26,48 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; public class MySqlSelectTest_clearLimit extends MysqlTest { - public void test_0() throws Exception { String sql = "select a from t limit 1,2"; Object[] result = SQLUtils.clearLimit(sql, DbType.mysql); assertEquals("SELECT a\n" - + "FROM t", result[0]); + + "FROM t", result[0]); assertEquals("LIMIT 1, 2", result[1].toString()); } public void test_3() throws Exception { String sql = "SELECT id from test1" - + " where id BETWEEN 1 and 100" - + " intersect" - + " select sid from grade1" - + " where sid in(SELECT sid from grade1 where sid is null or sid between 10 and 100 ) limit 1,10"; + + " where id BETWEEN 1 and 100" + + " intersect" + + " select sid from grade1" + + " where sid in(SELECT sid from grade1 where sid is null or sid between 10 and 100 ) limit 1,10"; Object[] result = SQLUtils.clearLimit(sql, DbType.mysql); assertEquals("SELECT id\n" + "FROM test1\n" + "WHERE id BETWEEN 1 AND 100\n" + "INTERSECT\n" + "SELECT sid\n" - + "FROM grade1\n" + "WHERE sid IN (\n" + "\tSELECT sid\n" + "\tFROM grade1\n" - + "\tWHERE sid IS NULL\n" + "\t\tOR sid BETWEEN 10 AND 100\n" + ")\n" + "LIMIT 1, 10", result[0]); + + "FROM grade1\n" + "WHERE sid IN (\n" + "\tSELECT sid\n" + "\tFROM grade1\n" + + "\tWHERE sid IS NULL\n" + "\t\tOR sid BETWEEN 10 AND 100\n" + ")\n" + "LIMIT 1, 10", result[0]); assertNull(result[1]); } + public void test_4() throws Exception { String sql = "SELECT id from test1 where id BETWEEN 1 and 100 intersect select sid from grade1 where sid in(SELECT sid from grade1 where sid is null or sid between 10 and 100 )"; Object[] result = SQLUtils.clearLimit(sql, DbType.mysql); assertEquals("SELECT id\n" - + "FROM test1\n" - + "WHERE id BETWEEN 1 AND 100\n" - + "INTERSECT\n" - + "SELECT sid\n" - + "FROM grade1\n" - + "WHERE sid IN (\n" - + "\tSELECT sid\n" - + "\tFROM grade1\n" - + "\tWHERE sid IS NULL\n" - + "\t\tOR sid BETWEEN 10 AND 100\n" - + ")", result[0]); + + "FROM test1\n" + + "WHERE id BETWEEN 1 AND 100\n" + + "INTERSECT\n" + + "SELECT sid\n" + + "FROM grade1\n" + + "WHERE sid IN (\n" + + "\tSELECT sid\n" + + "\tFROM grade1\n" + + "\tWHERE sid IS NULL\n" + + "\t\tOR sid BETWEEN 10 AND 100\n" + + ")", result[0]); assertNull(result[1]); } @@ -81,8 +81,8 @@ public void test_1() throws Exception { public void test_2() { String sql = " /*+ dump-oss-accesskey-id=xx,dump-oss-accesskey-secret=xx*/ \n" - + " DUMP DATA OVERWRITE INTO 'oss://oss-cn-hangzhou.aliyuncs.com/barca-platform/c'\n" - + " SELECT item_id,item_title FROM tyx.r_hjc_yun_item_info limit 1"; + + " DUMP DATA OVERWRITE INTO 'oss://oss-cn-hangzhou.aliyuncs.com/barca-platform/c'\n" + + " SELECT item_id,item_title FROM tyx.r_hjc_yun_item_info limit 1"; Object[] objects = SQLUtils.clearLimit(sql, DbType.mysql); assertEquals("LIMIT 1", objects[1].toString()); @@ -106,7 +106,7 @@ public void test_getLimit() { assertEquals("LIMIT 1, 2", limit.toString()); limit = SQLUtils.getLimit("DUMP DATA OVERWRITE INTO 'oss://oss-cn-hangzhou.aliyuncs.com/barca-platform/c' " - + " SELECT item_id,item_title FROM tyx.r_hjc_yun_item_info limit 1", DbType.mysql); + + " SELECT item_id,item_title FROM tyx.r_hjc_yun_item_info limit 1", DbType.mysql); assertEquals("LIMIT 1", limit.toString()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comma_src.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comma_src.java index bced66631e..8690677608 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comma_src.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comma_src.java @@ -29,7 +29,6 @@ import java.util.List; public class MySqlSelectTest_comma_src extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from t1, t2, t3"; @@ -39,8 +38,8 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); - SQLSelect select = ((SQLSelectStatement)stmt).getSelect(); - SQLTableSource tableSource = ((SQLSelectQueryBlock)select.getQuery()).getFrom(); + SQLSelect select = ((SQLSelectStatement) stmt).getSelect(); + SQLTableSource tableSource = ((SQLSelectQueryBlock) select.getQuery()).getFrom(); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); stmt.accept(visitor); @@ -49,17 +48,17 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + // Assert.assertEquals(1, visitor.getTables().size()); // Assert.assertEquals(1, visitor.getColumns().size()); // Assert.assertEquals(0, visitor.getConditions().size()); // Assert.assertEquals(0, visitor.getOrderByColumns().size()); - + { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *\n" + "FROM t1, t2, t3", // - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comment.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comment.java index 4b5f667f89..3509b99224 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comment.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comment.java @@ -22,7 +22,6 @@ public class MySqlSelectTest_comment extends MysqlTest { - public void test_0() throws Exception { String sql = "select xxx comment, xxx as comment from t"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_crossjoin.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_crossjoin.java index 79a41b626c..f15cb7a9a1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_crossjoin.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_crossjoin.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlSelectTest_crossjoin extends MysqlTest { - public void test_0() throws Exception { String sql = "select resource0_.resource_id as resource1_13_, resource0_.asMenu as asMenu13_, resource0_.resource_description as resource3_13_, resource0_.menu_name as menu4_13_, resource0_.resource_name as resource5_13_, resource0_.rg_id as rg7_13_, resource0_.rt_id as rt8_13_, resource0_.resource_serial as resource6_13_ from hnisitc.hnisitc_resource resource0_ cross join hnisitc.hnisitc_resource_type resourcety1_ where resource0_.rt_id=resourcety1_.rt_id and resourcety1_.rt_name='METHOD'"; @@ -36,14 +35,14 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); System.out.println(stmt); - + SQLSelectStatement selectStmt = (SQLSelectStatement) stmt; - + SQLSelect select = selectStmt.getSelect(); Assert.assertNotNull(select.getQuery()); MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) select.getQuery(); Assert.assertNull(queryBlock.getOrderBy()); - + // print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_eq_null_parameterized.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_eq_null_parameterized.java index 7b515cffd9..1b90030305 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_eq_null_parameterized.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_eq_null_parameterized.java @@ -17,7 +17,6 @@ * @Date 2019-07-16 17:28 */ public class MySqlSelectTest_eq_null_parameterized extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from test_null_shard where id = null;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_equals.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_equals.java index 8269eeee11..db0df2495c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_equals.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_equals.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlSelectTest_equals extends MysqlTest { - public void test_0() throws Exception { String sql = "select a from t where not a>1 and not b<1"; @@ -36,6 +35,7 @@ public void test_0() throws Exception { assertNotSame(queryBlock, queryBlock2); } + public void test_1() throws Exception { String sql = "select a from t where not a>1 and not b<1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_exportTables.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_exportTables.java index 63b16726bb..d7f73ec435 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_exportTables.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_exportTables.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_exportTables extends MysqlTest { - public void test_0() throws Exception { String sql = "select *\n" + "from my_table\n" + @@ -33,7 +32,7 @@ public void test_0() throws Exception { "order by -ABS(10 - level) desc\n" + "limit 0,100"; - + MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -53,7 +52,7 @@ public void test_0() throws Exception { "WHERE level BETWEEN 10 - 5 AND 10 + 5\n" + "ORDER BY -ABS(10 - level) DESC\n" + "LIMIT 0, 100", // - out.toString()); + out.toString()); assertNotNull(visitor.getTables()); assertEquals(1, visitor.getTables().size()); @@ -87,5 +86,5 @@ public void test_1() throws Exception { assertEquals(2, visitor.getTables().size()); assertEquals("[table1, table2]", visitor.getTables().toString()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_forADB.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_forADB.java index df13e97648..207ab1c406 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_forADB.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_forADB.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlSelectTest_forADB extends MysqlTest { - public void test_0() throws Exception { parseTrue("select distinct timediff(time \"11:25:00\" , time_test) as col5 from test order by 1 limit 9,6", "SELECT DISTINCT timediff(TIME '11:25:00', time_test) AS col5\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_func_in_order_by.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_func_in_order_by.java index c74e5ef760..1cd85718d7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_func_in_order_by.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_func_in_order_by.java @@ -16,7 +16,6 @@ * Date 2019-07-17 10:00 */ public class MySqlSelectTest_func_in_order_by extends MysqlTest { - public void test_0() { String sql = "select * from tb order by convert(ifnull(y,'999'),signed);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat.java index 5c14fe5935..89a4f372b7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat.java @@ -29,13 +29,12 @@ import java.util.List; public class MySqlSelectTest_group_concat extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT GROUP_CONCAT(ext_customer_id Separator '.') " // - + "from ad_texts " // - + "where customer_id=13001 " // - + "and description1 like '%爱丽%' " // - + "order by id asc;"; + + "from ad_texts " // + + "where customer_id=13001 " // + + "and description1 like '%爱丽%' " // + + "order by id asc;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -56,7 +55,6 @@ public void test_0() throws Exception { stmt.accept(visitor); - System.out.println("Tables : " + visitor.getTables()); System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); @@ -71,10 +69,10 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT GROUP_CONCAT(ext_customer_id SEPARATOR '.')" // - + "\nFROM ad_texts" // - + "\nWHERE customer_id = 13001" // - + "\n\tAND description1 LIKE '%爱丽%'" // - + "\nORDER BY id ASC;", // - output); + + "\nFROM ad_texts" // + + "\nWHERE customer_id = 13001" // + + "\n\tAND description1 LIKE '%爱丽%'" // + + "\nORDER BY id ASC;", // + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat_2.java index 40ee988f4b..a65ba7ba33 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat_2.java @@ -29,13 +29,12 @@ import java.util.List; public class MySqlSelectTest_group_concat_2 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT student_name, " // - + "GROUP_CONCAT(DISTINCT test_score " // - + " ORDER BY test_score DESC SEPARATOR ' ') " // - + "FROM student " // - + "GROUP BY student_name"; + + "GROUP_CONCAT(DISTINCT test_score " // + + " ORDER BY test_score DESC SEPARATOR ' ') " // + + "FROM student " // + + "GROUP BY student_name"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -64,8 +63,8 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT student_name, GROUP_CONCAT(DISTINCT test_score ORDER BY test_score DESC SEPARATOR ' ')" // - + "\nFROM student" // - + "\nGROUP BY student_name", // - output); + + "\nFROM student" // + + "\nGROUP BY student_name", // + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_jinyuan.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_jinyuan.java index bb676edbee..080d3603fc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_jinyuan.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_jinyuan.java @@ -8,7 +8,6 @@ import java.util.List; public class MySqlSelectTest_jinyuan extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT CATE1,PAY_ORD_BYR_CNT_DTR_004,CATE2,DDD,CRT_ORD_BYR_CNT_DTR_010,PAY_ORD_BYR_CNT_DTR_010,CRT_ORD_BYR_CNT_DTR_001,CRT_ORD_BYR_CNT_DTR_004,PAY_ORD_BYR_CNT_DTR_011,PAY_ORD_BYR_CNT_DTR_001,BIZ,PAY_ORD_AMT_DTR_011,PAY_ORD_AMT_DTR_010,CRT_ORD_VLD_AMT_DTR_001,PAY_ORD_AMT_DTR_001,CRT_ORD_VLD_AMT_DTR_004,PAY_ORD_AMT_DTR_004,CRT_ORD_VLD_AMT_DTR_010 FROM DWI_PUB_HBD_CATE_DTR \n" + "WHERE cate1=? and ddd=? and biz=? and cate2=? and app=? LIMIT 0,1"; @@ -17,7 +16,7 @@ public void test_0() throws Exception { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_json.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_json.java index f7b5e2d9c6..2b29ddeac3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_json.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_json.java @@ -21,13 +21,12 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlSelectTest_json extends MysqlTest { - public void test_0() throws Exception { parseTrue("SELECT json_size('{\"x\": {\"a\": 1, \"b\": 2}}', '$.x')", "SELECT json_size('{\"x\": {\"a\": 1, \"b\": 2}}', '$.x')"); parseTrue("SELECT regexp_extract(fld11,'\"campaign_group_id\":\"?([-+]?[0-9]{1,19}+)',1)\n" + - "FROM rmlog_push_dla_poc WHERE day='20190301' and hour='00' LIMIT 10", + "FROM rmlog_push_dla_poc WHERE day='20190301' and hour='00' LIMIT 10", "SELECT regexp_extract(fld11, '\"campaign_group_id\":\"?([-+]?[0-9]{1,19}+)', 1)\n" + "FROM rmlog_push_dla_poc\n" + "WHERE day = '20190301'\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_mtr.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_mtr.java index 9276ae5ac3..4107ae4c35 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_mtr.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_mtr.java @@ -24,7 +24,6 @@ public class MySqlSelectTest_mtr extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT 1 FROM ((SELECT 2) LIMIT 1) AS res; "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_ques.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_ques.java index 5aeda1ef16..b94fae7015 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_ques.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_ques.java @@ -15,7 +15,6 @@ * @Date 2019-07-17 10:30 */ public class MySqlSelectTest_plus_ques extends MysqlTest { - public void test_0() { String sql = "select +?;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_sub_comment.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_sub_comment.java index cdddc65e36..2663ff7405 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_sub_comment.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_sub_comment.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlSelectTest_plus_sub_comment extends MysqlTest { - public void test_0() throws Exception { String sql = "select 1 -+2"; @@ -37,6 +36,7 @@ public void test_0() throws Exception { SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals("SELECT 1 - +2", stmt.toString()); } + public void test_1() throws Exception { String sql = "select 1 ---2 "; @@ -48,6 +48,7 @@ public void test_1() throws Exception { SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals("SELECT 1 - --2", stmt.toString()); } + public void test_1_1() throws Exception { String sql = "select 1 --- 2 "; @@ -60,6 +61,7 @@ public void test_1_1() throws Exception { assertTrue(e instanceof ParserException); } } + public void test_3() throws Exception { String sql = "select 1 --+1"; @@ -106,13 +108,14 @@ public void test_6() throws Exception { assertTrue(e instanceof ParserException); } } + public void test_7() throws Exception { String sql = "select 1 --+- 1"; - MySqlStatementParser parser = new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); - assertEquals("SELECT 1 - -(+-1)", stmt.toString()); + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); + assertEquals("SELECT 1 - -(+-1)", stmt.toString()); } public void test_8() throws Exception { @@ -153,7 +156,6 @@ public void test_12() throws Exception { } public void test_13() throws Exception { - String sql = "select max(id) --- min(id) from test_tablesl"; try { @@ -212,7 +214,7 @@ public void test_18() throws Exception { public void test_19() throws Exception { String sql = "-- comments\n" - + "SELECT * FROM mp_Sites WHERE SiteID = -1 OR -1 = -1 -- ORDER BY SiteID LIMIT 1"; + + "SELECT * FROM mp_Sites WHERE SiteID = -1 OR -1 = -1 -- ORDER BY SiteID LIMIT 1"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_straight_join.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_straight_join.java index 2a96ffcb01..4180198bff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_straight_join.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_straight_join.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlSelectTest_straight_join extends MysqlTest { - public void test_0() throws Exception { String sql = "select count(*) from nation n1 join nation n2 on n1.nationkey = n2.nationkey straight_join nation n3 on n2.nationkey=n3.nationkey;"; @@ -37,7 +36,7 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals(1, statementList.size()); - + String expected = "SELECT count(*)\n" + "FROM nation n1\n" + "\tJOIN nation n2 ON n1.nationkey = n2.nationkey\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_trim.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_trim.java index dab72cad91..81ae45eeac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_trim.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_trim.java @@ -13,12 +13,11 @@ import java.util.List; public class MySqlSelectTest_trim extends MysqlTest { - public void test_0() throws Exception { String sql = "select trim('x' from 'xxdxx')"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - SQLSelectStatement stmt = (SQLSelectStatement)statementList.get(0); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -36,7 +35,7 @@ public void test_0() throws Exception { sql = "select trim('x')"; statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - stmt = (SQLSelectStatement)statementList.get(0); + stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); @@ -53,7 +52,7 @@ public void test_0() throws Exception { System.out.println(outParameters); sql = "select trim(TRAILING 'x' from 'xxxxxxxdxx')"; statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); - stmt = (SQLSelectStatement)statementList.get(0); + stmt = (SQLSelectStatement) statementList.get(0); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_update.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_update.java index 5a149e0c18..6b3fcef71b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_update.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_update.java @@ -24,13 +24,12 @@ import java.util.List; public class MySqlSelectTest_update extends MysqlTest { - public void test_0() throws Exception { String sql = "select current_no from " - + "update wlb_waybill_branch_rule set current_no = current_no + ? ,gmt_modified = now() " - + "where id = ? and status = ? and end_no > current_no " - + "order by current_no desc " - + "limit 10"; + + "update wlb_waybill_branch_rule set current_no = current_no + ? ,gmt_modified = now() " + + "where id = ? and status = ? and end_no > current_no " + + "order by current_no desc " + + "limit 10"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -39,7 +38,7 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals(1, statementList.size()); - + String expected = "SELECT current_no" + "\nFROM UPDATE wlb_waybill_branch_rule" + "\nSET current_no = current_no + ?, gmt_modified = now()" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_with_20433301.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_with_20433301.java index 16b226eb72..31b5711d63 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_with_20433301.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_with_20433301.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_with_20433301 extends MysqlTest { - public void test_0() throws Exception { String sql = "WITH total AS(\n" + "SELECT cinema_id, count(1) as scheduleCnt, sum(hall_seat_cnt) as hall_seat_cnt, sum(sold_seat_cnt) as sold_seat_cnt, sum(avg_ticket_price*sold_seat_cnt) as box_office\n" + @@ -102,5 +101,4 @@ public void test_0() throws Exception { } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlResolveTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlResolveTest.java index 99f3d690a0..a266973b6e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlResolveTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlResolveTest.java @@ -22,10 +22,8 @@ * @author lijun.cailj 2018/3/8 */ public class MysqlResolveTest { - @Test public void test_1() { - SchemaRepository repository = new SchemaRepository(DbType.mysql); repository.console("create table t_emp(emp_id bigint, name varchar(20));"); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlSelectTest_like.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlSelectTest_like.java index 0b3383bcd5..31c6a22998 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlSelectTest_like.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlSelectTest_like.java @@ -8,11 +8,9 @@ import java.util.List; /** - * * @author lijun.cailj 2018/1/3 */ public class MysqlSelectTest_like extends MysqlTest { - public void test_2() throws Exception { String sql = "select * from table1 where name like \"%lijun%\""; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowFieldsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowFieldsTest.java index b9a5ca5eb3..a9e25ae12f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowFieldsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowFieldsTest.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowFieldsTest extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW FIELDS FROM `schema_migrations`"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTestMaterializedView.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTestMaterializedView.java index f5e4f24a14..065986bd5c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTestMaterializedView.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTestMaterializedView.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlShowTestMaterializedView extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW MATERIALIZED VIEWS "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_0.java index 86da53ab35..a17581d9ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_0.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW TRIGGERS FROM `sonar` LIKE 'action_plans'"; @@ -64,10 +63,10 @@ public void test_1() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); statemen.accept(visitor); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); - System.out.println("coditions : " + visitor.getConditions()); - System.out.println("orderBy : " + visitor.getOrderByColumns()); + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_1.java index 24de307a35..dac4a4b70b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_1.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW INDEXES FROM `sonar`.`action_plans`"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_10_broadcasts.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_10_broadcasts.java index e75e88adb4..fd3fee8247 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_10_broadcasts.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_10_broadcasts.java @@ -22,12 +22,11 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; public class MySqlShowTest_10_broadcasts extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW BROADCASTS"; SQLStatement stmt = SQLUtils.parseStatements(sql, DbType.mysql).get(0); - + String result = SQLUtils.toMySqlString(stmt); assertEquals("SHOW BROADCASTS", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_11_datasources.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_11_datasources.java index 7aff11e51c..668c95a562 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_11_datasources.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_11_datasources.java @@ -22,12 +22,11 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; public class MySqlShowTest_11_datasources extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW DATASOURCES"; SQLStatement stmt = SQLUtils.parseStatements(sql, DbType.mysql).get(0); - + String result = SQLUtils.toMySqlString(stmt); assertEquals("SHOW DATASOURCES", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_12_node.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_12_node.java index 665e27e7e9..814e68c7b5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_12_node.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_12_node.java @@ -22,12 +22,11 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; public class MySqlShowTest_12_node extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW NODE"; SQLStatement stmt = SQLUtils.parseStatements(sql, DbType.mysql).get(0); - + String result = SQLUtils.toMySqlString(stmt); assertEquals("SHOW NODE", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_13_help.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_13_help.java index d25423da39..77a6e35989 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_13_help.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_13_help.java @@ -22,12 +22,11 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; public class MySqlShowTest_13_help extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW HELP"; SQLStatement stmt = SQLUtils.parseStatements(sql, DbType.mysql).get(0); - + String result = SQLUtils.toMySqlString(stmt); assertEquals("SHOW HELP", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_14_slow.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_14_slow.java index a5655734a3..187ac401d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_14_slow.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_14_slow.java @@ -22,12 +22,11 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; public class MySqlShowTest_14_slow extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW SLOW"; SQLStatement stmt = SQLUtils.parseStatements(sql, DbType.mysql).get(0); - + String result = SQLUtils.toMySqlString(stmt); assertEquals("SHOW SLOW", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_outlines.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_outlines.java index 01e8c90e65..7fb401b16c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_outlines.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_outlines.java @@ -26,12 +26,11 @@ import java.util.List; public class MySqlShowTest_15_outlines extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW OUTLINES"; SQLStatement stmt = SQLUtils.parseStatements(sql, DbType.mysql).get(0); - + String result = SQLUtils.toMySqlString(stmt); assertEquals("SHOW OUTLINES", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_queryTask.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_queryTask.java index a7123625a1..321c270f95 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_queryTask.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_queryTask.java @@ -31,12 +31,11 @@ import java.util.List; public class MySqlShowTest_15_queryTask extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW QUERY_TASK"; SQLStatement stmt = SQLUtils.parseStatements(sql, DbType.mysql).get(0); - + String result = SQLUtils.toMySqlString(stmt); assertEquals("SHOW QUERY_TASK", result); @@ -53,13 +52,13 @@ public void test_1() throws Exception { String sql = "SHOW QUERY_TASK where name > 1 order by name desc limit 1"; MySqlStatementParser parser = new MySqlStatementParser(sql, SQLParserFeature.TDDLHint); List statementList = parser.parseStatementList(); - SQLShowQueryTaskStatement stmt = (SQLShowQueryTaskStatement)statementList.get(0); + SQLShowQueryTaskStatement stmt = (SQLShowQueryTaskStatement) statementList.get(0); String result = SQLUtils.toMySqlString(stmt); assertEquals("SHOW QUERY_TASK\n" - + "WHERE name > 1\n" - + "ORDER BY name DESC\n" - + "LIMIT 1", result); + + "WHERE name > 1\n" + + "ORDER BY name DESC\n" + + "LIMIT 1", result); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(DbType.mysql); stmt.accept(visitor); @@ -68,9 +67,9 @@ public void test_1() throws Exception { assertEquals(1, visitor.getColumns().size()); assertEquals(1, visitor.getConditions().size()); - stmt.replace(stmt.getWhere(),new SQLBinaryOpExpr(new SQLIdentifierExpr("a"), - SQLBinaryOperator.Equality, - new SQLBigIntExpr(1L))); + stmt.replace(stmt.getWhere(), new SQLBinaryOpExpr(new SQLIdentifierExpr("a"), + SQLBinaryOperator.Equality, + new SQLBigIntExpr(1L))); stmt.getOrderBy().replace(stmt.getOrderBy().getItems().get(0).getExpr(), new SQLIdentifierExpr("a")); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_sequence.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_sequence.java index 233ea013c9..46195493d9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_sequence.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_sequence.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_15_sequence extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW SEQUENCES"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_16_createView.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_16_createView.java index 77b0d24353..0564e98b8a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_16_createView.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_16_createView.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_16_createView extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW CREATE VIEW view_name"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_17_recyclebin.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_17_recyclebin.java index f35b774ebf..acfc2c3f93 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_17_recyclebin.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_17_recyclebin.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_17_recyclebin extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW recyclebin"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_18.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_18.java index daed708851..7f15f76704 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_18.java @@ -25,25 +25,25 @@ import java.util.List; public class MySqlShowTest_18 extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW HMSMETA s1.table1"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - MySqlShowHMSMetaStatement stmt = (MySqlShowHMSMetaStatement)stmtList.get(0); - + MySqlShowHMSMetaStatement stmt = (MySqlShowHMSMetaStatement) stmtList.get(0); + String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SHOW HMSMETA s1.table1", result); assertEquals("s1", stmt.getSchema()); assertEquals("table1", stmt.getTableName()); } + public void test_1() throws Exception { String sql = "SHOW HMSMETA table1"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - MySqlShowHMSMetaStatement stmt = (MySqlShowHMSMetaStatement)stmtList.get(0); + MySqlShowHMSMetaStatement stmt = (MySqlShowHMSMetaStatement) stmtList.get(0); String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SHOW HMSMETA table1", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_19_stats.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_19_stats.java index 8614b4464f..4ee5cb4e85 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_19_stats.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_19_stats.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_19_stats extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW FULL STATS"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_2.java index 84ac72b03d..fa4524563f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_2.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_2 extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW CREATE TABLE `sonar`.`action_plans`"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_20_outlines.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_20_outlines.java index 176da4b270..0ae16b30f6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_20_outlines.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_20_outlines.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_20_outlines extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW OUTLINES"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_21_outlines.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_21_outlines.java index bb7233ca5b..d7c0e7966e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_21_outlines.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_21_outlines.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_21_outlines extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW OUTLINES where 1=1 order by 1 limit 1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_22_rule_version.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_22_rule_version.java index b280792308..2666090335 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_22_rule_version.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_22_rule_version.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_22_rule_version extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW RULE VERSION where 1=1 order by 1 limit 1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_23_catalogs.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_23_catalogs.java index 857e79999e..138145c69b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_23_catalogs.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_23_catalogs.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_23_catalogs extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW CATALOGS"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_24_functions.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_24_functions.java index 92a624bf01..404c344463 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_24_functions.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_24_functions.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_24_functions extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW FUNCTIONS"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_25_schemas.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_25_schemas.java index 8c5a51defe..bd577916a9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_25_schemas.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_25_schemas.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_25_schemas extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW SCHEMAS"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_26_session.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_26_session.java index be56693101..4ef5959941 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_26_session.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_26_session.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_26_session extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW SESSION"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_27_plancache.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_27_plancache.java index 02d353a74d..54bbeda847 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_27_plancache.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_27_plancache.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_27_plancache extends MysqlTest { - public void test_0() throws Exception { String sql = "show plancache status"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_28_config.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_28_config.java index b610906685..e77e97ac80 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_28_config.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_28_config.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_28_config extends MysqlTest { - public void test_0() throws Exception { String sql = "show config a.b.c"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_29_plancache.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_29_plancache.java index d5ca727265..ca88ec251c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_29_plancache.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_29_plancache.java @@ -23,7 +23,6 @@ import java.util.List; public class MySqlShowTest_29_plancache extends MysqlTest { - public void test_0() throws Exception { String sql = "show plancache plan select * from table1;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_3.java index e61dff918b..57d240ad15 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_3.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_3 extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW FULL COLUMNS FROM `sonar`.`action_plans`"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_30_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_30_hints.java index b8d38b4715..5f104664bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_30_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_30_hints.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_30_hints extends MysqlTest { - public void test_0() throws Exception { String sql = "/* +TDDL:scan()*/ show tables;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_31_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_31_hints.java index ee86ee7bfb..bb6a13b9b5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_31_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_31_hints.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_31_hints extends MysqlTest { - public void test_0() throws Exception { String sql = "/* +TDDL:scan()*/show create table t;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_32_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_32_hints.java index 1b958029b7..e036446391 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_32_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_32_hints.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_32_hints extends MysqlTest { - public void test_0() throws Exception { String sql = "/* +TDDL:scan()*/show index from drds_shard;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_33_rule_status.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_33_rule_status.java index 8c12a6aabd..ba6afde705 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_33_rule_status.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_33_rule_status.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_33_rule_status extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW RULE STATUS"; @@ -96,7 +95,7 @@ public void test_2() throws Exception { public void test_3() throws Exception { String sql = "SHOW RULE FULL STATUS where GMT_MODIFIED_MANAGER > \"2018-03-29 13:53:18\" order by VERSION " - + "desc limit 1,2"; + + "desc limit 1,2"; MySqlStatementParser parser = new MySqlStatementParser(sql, SQLParserFeature.TDDLHint); List statementList = parser.parseStatementList(); @@ -115,8 +114,8 @@ public void test_3() throws Exception { // assertTrue(visitor.getTables().containsKey(new TableStat.Name("mytable"))); assertEquals("SHOW RULE FULL STATUS WHERE GMT_MODIFIED_MANAGER > '2018-03-29 13:53:18' ORDER BY VERSION " - + "DESC LIMIT 1, 2", stmt.toString()); + + "DESC LIMIT 1, 2", stmt.toString()); assertEquals("show rule full status where GMT_MODIFIED_MANAGER > '2018-03-29 13:53:18' order by VERSION " - + "desc limit 1, 2", stmt.toLowerCaseString()); + + "desc limit 1, 2", stmt.toLowerCaseString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_34_stats.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_34_stats.java index 0fdeaaa746..84fc35734f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_34_stats.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_34_stats.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_34_stats extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW STATS"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_35_PHYSICAL_PROCESSLIST.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_35_PHYSICAL_PROCESSLIST.java index 83c797d070..985704e4bd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_35_PHYSICAL_PROCESSLIST.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_35_PHYSICAL_PROCESSLIST.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_35_PHYSICAL_PROCESSLIST extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW PHYSICAL_PROCESSLIST"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_36_db.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_36_db.java index e31d01bfc4..9e6e40af50 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_36_db.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_36_db.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_36_db extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW DB STATUS"; @@ -117,7 +116,6 @@ public void test_3() throws Exception { assertEquals("show full database status where 1 = 1", stmt.toLowerCaseString()); } - public void test_4_orderBy() throws Exception { String sql = "SHOW FULL DB STATUS WHERE 1=1 ORDER BY col LIMIT 1,2"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_37_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_37_hints.java index d26835c8ca..11369b861a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_37_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_37_hints.java @@ -12,10 +12,9 @@ * @date 2018/8/24 上午10:37 */ public class MySqlShowTest_37_hints extends MysqlTest { - - private final static SQLParserFeature[] defaultFeatures = { SQLParserFeature.EnableSQLBinaryOpExprGroup, + private static final SQLParserFeature[] defaultFeatures = {SQLParserFeature.EnableSQLBinaryOpExprGroup, SQLParserFeature.UseInsertColumnsCache, SQLParserFeature.OptimizedForParameterized, - SQLParserFeature.TDDLHint, }; + SQLParserFeature.TDDLHint,}; public void test_0() throws Exception { String sql = "/* +TDDL:scan()*/show columns from drds_shard;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_38_hints.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_38_hints.java index 7ec3a868fb..579afc51a3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_38_hints.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_38_hints.java @@ -12,10 +12,9 @@ * @date 2018/8/24 上午10:53 */ public class MySqlShowTest_38_hints extends MysqlTest { - - private final static SQLParserFeature[] defaultFeatures = { SQLParserFeature.EnableSQLBinaryOpExprGroup, - SQLParserFeature.UseInsertColumnsCache, SQLParserFeature.OptimizedForParameterized, - SQLParserFeature.TDDLHint, }; + private static final SQLParserFeature[] defaultFeatures = {SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.UseInsertColumnsCache, SQLParserFeature.OptimizedForParameterized, + SQLParserFeature.TDDLHint,}; public void test_0() throws Exception { String sql = "/* +TDDL:scan()*/show table status from corona_qatest_0;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_39_stc.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_39_stc.java index d23c273ef2..bd2090a1a6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_39_stc.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_39_stc.java @@ -13,7 +13,6 @@ * @date 2018/8/27 上午11:41 */ public class MySqlShowTest_39_stc extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW STC"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_4.java index 4f731941a6..c7dd9ec01a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_4.java @@ -25,14 +25,13 @@ import java.util.List; public class MySqlShowTest_4 extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW CREATE TABLE tblname"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); SQLStatement stmt = stmtList.get(0); - + String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SHOW CREATE TABLE tblname", result); // print(stmtList); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_40_partitions.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_40_partitions.java index ddde54b85b..94e5a863c4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_40_partitions.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_40_partitions.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlShowTest_40_partitions extends MysqlTest { - public void test_0() throws Exception { String sql = "show partitions abc partition(p='1')"; @@ -43,7 +42,7 @@ public void test_0() throws Exception { Assert.assertEquals(0, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("abc"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("abc"))); assertEquals("SHOW PARTITIONS abc PARTITION (p = '1')", stmt.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41.java index e404f01a3b..c7be4fa31c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_41 extends MysqlTest { - public void test_0() throws Exception { String sql = "show create table dla_table1 like mapping('mysql_table1');"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41_partitions.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41_partitions.java index b47bb0d8b4..4e0dd79c8d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41_partitions.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41_partitions.java @@ -25,7 +25,6 @@ import java.util.List; public class MySqlShowTest_41_partitions extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW PARTITIONS FROM t WHERE x = 1"; @@ -43,7 +42,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getOrderByColumns().size()); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t"))); assertEquals("SHOW PARTITIONS t WHERE x = 1", stmt.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_42_dla.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_42_dla.java index 6181bfecd4..d894bd957a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_42_dla.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_42_dla.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_42_dla extends MysqlTest { - public void test_0() throws Exception { String sql = "show full schemas;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_5.java index 20b4971a7f..74a7759752 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_5.java @@ -25,14 +25,13 @@ import java.util.List; public class MySqlShowTest_5 extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW COUNT(*) WARNINGS"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); SQLStatement stmt = stmtList.get(0); - + String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SHOW COUNT(*) WARNINGS", result); // print(stmtList); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_6.java index 913142ac33..b1f9767ee5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_6.java @@ -25,14 +25,13 @@ import java.util.List; public class MySqlShowTest_6 extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW INDEX FROM tblname"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); SQLStatement stmt = stmtList.get(0); - + String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SHOW INDEX FROM tblname", result); // print(stmtList); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_7_show_rule.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_7_show_rule.java index 31c1305a41..5cc6cfb468 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_7_show_rule.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_7_show_rule.java @@ -22,12 +22,11 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; public class MySqlShowTest_7_show_rule extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW RULE"; SQLStatement stmt = SQLUtils.parseStatements(sql, DbType.mysql).get(0); - + String result = SQLUtils.toMySqlString(stmt); assertEquals("SHOW RULE", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_8_topology.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_8_topology.java index 0c126a8f0c..040fcf47ac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_8_topology.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_8_topology.java @@ -22,12 +22,11 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; public class MySqlShowTest_8_topology extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW TOPOLOGY from t"; SQLStatement stmt = SQLUtils.parseStatements(sql, DbType.mysql).get(0); - + String result = SQLUtils.toMySqlString(stmt); assertEquals("SHOW TOPOLOGY FROM t", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_9_partitions.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_9_partitions.java index 69bbf92481..8ecf67919d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_9_partitions.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_9_partitions.java @@ -22,12 +22,11 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; public class MySqlShowTest_9_partitions extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW PARTITIONS from t"; SQLStatement stmt = SQLUtils.parseStatements(sql, DbType.mysql).get(0); - + String result = SQLUtils.toMySqlString(stmt); assertEquals("SHOW PARTITIONS FROM t", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_mappings.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_mappings.java index a723eb1491..e0210d8483 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_mappings.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_mappings.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.show; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; @@ -30,7 +29,6 @@ public class MySqlShowTest_mappings extends MysqlTest { - public void test_0() throws Exception { String sql = "show databases where type = 'mapping' and user_name = 'user001'"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table.java index b39bfbd6a0..5268a19162 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_table extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW FULL TABLES FROM sonar LIKE 'a'"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table2.java index 70f1c697b7..49ab121332 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table2.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_table2 extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW FULL TABLES FROM test-db WHERE Table_type != 'VIEW'"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table3.java index 5d81723ab3..f953dedc4a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table3.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_table3 extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW /*!50002 FULL*/ TABLES"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_users.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_users.java index fdfd2b0eec..13ddad9850 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_users.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_users.java @@ -24,7 +24,6 @@ import java.util.List; public class MySqlShowTest_users extends MysqlTest { - public void test_0() throws Exception { String sql = "SHOW USERS"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_COLUMNS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_COLUMNS_Syntax_Test.java index 104dc61c65..d18f4ecef4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_COLUMNS_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_COLUMNS_Syntax_Test.java @@ -26,7 +26,6 @@ import java.util.List; public class SHOW_COLUMNS_Syntax_Test extends TestCase { - public void test_0() throws Exception { String sql = "SHOW COLUMNS FROM City;"; @@ -59,7 +58,7 @@ public void test_2() throws Exception { Assert.assertEquals("SHOW COLUMNS FROM mydb.mytable;", text); } - + public void test_3() throws Exception { String sql = "SHOW COLUMNS FROM mytable IN mydb;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_DATABASES_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_DATABASES_Syntax_Test.java index 165be78bd1..247618cfd1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_DATABASES_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_DATABASES_Syntax_Test.java @@ -26,7 +26,6 @@ import java.util.List; public class SHOW_DATABASES_Syntax_Test extends TestCase { - public void test_0() throws Exception { String sql = "SHOW DATABASES;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_STATUS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_STATUS_Syntax_Test.java index c6d18a6067..447d0da26a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_STATUS_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_STATUS_Syntax_Test.java @@ -25,7 +25,6 @@ import java.util.List; public class SHOW_STATUS_Syntax_Test extends TestCase { - public void test_0() throws Exception { String sql = "SHOW STATUS LIKE 'Key%'"; @@ -36,7 +35,7 @@ public void test_0() throws Exception { Assert.assertEquals("SHOW STATUS LIKE 'Key%';", text); } - + public void test_where() throws Exception { String sql = "SHOW STATUS WHERE X LIKE 'Key%'"; @@ -47,7 +46,7 @@ public void test_where() throws Exception { Assert.assertEquals("SHOW STATUS WHERE X LIKE 'Key%';", text); } - + public void test_corba() throws Exception { String sql = "SHOW COBAR_STATUS"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_TABLES_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_TABLES_Syntax_Test.java index eafdc27237..e1ba0bdab6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_TABLES_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_TABLES_Syntax_Test.java @@ -26,9 +26,7 @@ import java.util.List; public class SHOW_TABLES_Syntax_Test extends TestCase { - public void test_0() throws Exception { - String sql = "SHOW TABLES FROM SUNTEST "; SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -65,7 +63,6 @@ public void test_0() throws Exception { text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("SHOW FULL TABLES FROM SUNTEST", text); - sql = "SHOW FULL TABLES IN SUNTEST LIKE '%DDD%' "; parser = new MySqlStatementParser(sql); stmtList = parser.parseStatementList(); @@ -84,7 +81,6 @@ public void test_0() throws Exception { text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); Assert.assertEquals("SHOW FULL TABLES FROM SUNTEST WHERE NAME = 'DDD'", text); - sql = "SHOW FULL TABLES FROM SUNTEST WHERE NAME = 'DDD' "; parser = new MySqlStatementParser(sql); stmtList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_WARNINGS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_WARNINGS_Syntax_Test.java index 45dc6d8983..3b48b829d9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_WARNINGS_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_WARNINGS_Syntax_Test.java @@ -26,7 +26,6 @@ import java.util.List; public class SHOW_WARNINGS_Syntax_Test extends TestCase { - public void test_0() throws Exception { String sql = "SHOW WARNINGS;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_0.java index a97a20f325..4047ab21c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_0.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlUpdateTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "UPDATE `z_code` SET `key`='INTRANT_NOTALLOWED_CATEGORY_C'"; @@ -45,7 +44,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_1.java index a482c08864..f5917cdfdf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_1.java @@ -26,12 +26,11 @@ import com.alibaba.druid.stat.TableStat; public class MySqlUpdateTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "UPDATE t_price, t_basic_store s " + // - "SET purchasePrice = :purchasePrice, operaterId = :operaterId, " + // - " operaterRealName = :operaterRealName, operateDateline = :operateDateline " + // - "WHERE goodsId = :goodsId AND s.id = storeId AND s.areaId = :areaId"; + "SET purchasePrice = :purchasePrice, operaterId = :operaterId, " + // + " operaterRealName = :operaterRealName, operateDateline = :operateDateline " + // + "WHERE goodsId = :goodsId AND s.id = storeId AND s.areaId = :areaId"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_10.java index 251cf3a740..6fcc4e2734 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_10.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlUpdateTest_10 extends MysqlTest { - public void test_0() throws Exception { String sql = "UPDATE car_tt set gps_url=null WHERE id = ?"; @@ -60,14 +59,14 @@ public void test_0() throws Exception { Assert.assertEquals("UPDATE car_tt\n" + "SET gps_url = NULL\n" + "WHERE id = ?", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("update car_tt\n" + "set gps_url = null\n" + "where id = ?", // - output); + output); } assertTrue(WallUtils.isValidateMySql(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_11_using.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_11_using.java index ea5ab8fc08..a8eb06e794 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_11_using.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_11_using.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlUpdateTest_11_using extends MysqlTest { - public void test_0() throws Exception { String sql = "update t1, t2, t3 inner join t4 using (col_name1, col_name2)\n" + "set t1.value_col = t3.new_value_col, t4.`some-col*` = `t2`.`***` * 2\n" + @@ -64,7 +63,7 @@ public void test_0() throws Exception { "SET t1.value_col = t3.new_value_col, t4.`some-col*` = `t2`.`***` * 2\n" + "WHERE t1.pk = t2.fk_t1_pk\n" + "\tAND t2.id = t4.fk_id_entity;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -73,7 +72,7 @@ public void test_0() throws Exception { "set t1.value_col = t3.new_value_col, t4.`some-col*` = `t2`.`***` * 2\n" + "where t1.pk = t2.fk_t1_pk\n" + "\tand t2.id = t4.fk_id_entity;", // - output); + output); } assertTrue(WallUtils.isValidateMySql(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_12.java index 48c83dfaf0..9c897e7084 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_12.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlUpdateTest_12 extends MysqlTest { - public void test_0() throws Exception { String sql = "UPDATE t1\n" + "INNER JOIN t2 ON t1.id = t2.id\n" + @@ -66,7 +65,7 @@ public void test_0() throws Exception { "\tINNER JOIN t3 cm ON t3.id2 = t1.id2\n" + "SET gps_url = NULL\n" + "WHERE t1.id = ?", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -75,7 +74,7 @@ public void test_0() throws Exception { "\tinner join t3 cm on t3.id2 = t1.id2\n" + "set gps_url = null\n" + "where t1.id = ?", // - output); + output); } assertTrue(WallUtils.isValidateMySql(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_13_force_partition.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_13_force_partition.java index ace4aa2475..64ec9d6cd4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_13_force_partition.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_13_force_partition.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlUpdateTest_13_force_partition extends MysqlTest { - public void test_0() throws Exception { String sql = "UPDATE force all partitions car_tt set gps_url=null WHERE id = ?"; @@ -60,14 +59,14 @@ public void test_0() throws Exception { Assert.assertEquals("UPDATE FORCE ALL PARTITIONS car_tt\n" + "SET gps_url = NULL\n" + "WHERE id = ?", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("update force all partitions car_tt\n" + "set gps_url = null\n" + "where id = ?", // - output); + output); } assertTrue(WallUtils.isValidateMySql(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_14_force_partition.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_14_force_partition.java index 7174972dbc..c2631b7127 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_14_force_partition.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_14_force_partition.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlUpdateTest_14_force_partition extends MysqlTest { - public void test_0() throws Exception { String sql = "UPDATE force partition 'pt001' car_tt set gps_url=null WHERE id = ?"; @@ -60,14 +59,14 @@ public void test_0() throws Exception { Assert.assertEquals("UPDATE FORCE PARTITION 'pt001' car_tt\n" + "SET gps_url = NULL\n" + "WHERE id = ?", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("update force partition 'pt001' car_tt\n" + "set gps_url = null\n" + "where id = ?", // - output); + output); } assertTrue(WallUtils.isValidateMySql(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_15.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_15.java index 2cbe85bed1..832004a5fd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_15.java @@ -28,7 +28,6 @@ import java.util.List; public class MySqlUpdateTest_15 extends MysqlTest { - public void test_0() throws Exception { String sql = "update students set name='test' where id in (select stu_id from score where s <100)"; @@ -66,7 +65,7 @@ public void test_0() throws Exception { "\t\tFROM score\n" + "\t\tWHERE s < 100\n" + "\t)", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -77,7 +76,7 @@ public void test_0() throws Exception { "\t\tfrom score\n" + "\t\twhere s < 100\n" + "\t)", // - output); + output); } assertTrue(WallUtils.isValidateMySql(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_16.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_16.java index 26a47d1a26..94afe1af70 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_16.java @@ -28,7 +28,6 @@ import java.util.List; public class MySqlUpdateTest_16 extends MysqlTest { - public void test_0() throws Exception { String sql = "update am_activity_prize set lock_left_count=lock_left_count-120.0, lock_count=lock_count+0.0 where id=?"; @@ -60,14 +59,14 @@ public void test_0() throws Exception { assertEquals("UPDATE am_activity_prize\n" + "SET lock_left_count = lock_left_count - 120.0, lock_count = lock_count + 0.0\n" + "WHERE id = ?", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("update am_activity_prize\n" + "set lock_left_count = lock_left_count - 120.0, lock_count = lock_count + 0.0\n" + "where id = ?", // - output); + output); } assertTrue(WallUtils.isValidateMySql(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_17.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_17.java index b256dbda0a..ed325148b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_17.java @@ -28,7 +28,6 @@ import java.util.List; public class MySqlUpdateTest_17 extends MysqlTest { - public void test_0() throws Exception { String sql = "update security_group_ip_count set ip_count=GREATEST(ip_count-?, 0), gmt_modified=now() where group_id=? "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_2.java index ad722a4da6..e703ab2ebb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_2.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlUpdateTest_2 extends MysqlTest { - public void test_0() throws Exception { String sql = "UPDATE `z_code` SET (f1, f2) = (1, 2)"; @@ -45,7 +44,7 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_3.java index 789a71e072..f5f68a631e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_3.java @@ -28,10 +28,9 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlUpdateTest_3 extends MysqlTest { - public void test_0() throws Exception { String sql = "update scheme.table set col_1 = 1, col2 = '2' " // - + "where col_3 = 3 and (length(col_4) > 4 or col_5 <> '5')"; + + "where col_3 = 3 and (length(col_4) > 4 or col_5 <> '5')"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -59,10 +58,10 @@ public void test_0() throws Exception { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("UPDATE scheme.table" // - + "\nSET col_1 = 1, col2 = '2'"// - + "\nWHERE col_3 = 3" // - + "\n\tAND (length(col_4) > 4" // - + "\n\t\tOR col_5 <> '5')", // - output); + + "\nSET col_1 = 1, col2 = '2'"// + + "\nWHERE col_3 = 3" // + + "\n\tAND (length(col_4) > 4" // + + "\n\t\tOR col_5 <> '5')", // + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_4.java index dfa5cdfb30..1b6e34d18c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_4.java @@ -28,7 +28,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlUpdateTest_4 extends MysqlTest { - public void test_0() throws Exception { String sql = "insert into darenai_stat_url SET user='nologin',ip='58.101.223.183',reffer='http://item.taobao.com/item.htm?spm=a230r.1.14.419.KDVewC&id=17052767689',url='/d/jingpinhui?spm=2013.1.0.0.zr4nLz&ac=shop&imageid=1019937265&s=1259538&s=1259538',shopnick='零利润3232',time=NOW()"; @@ -60,18 +59,18 @@ public void test_0() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("INSERT INTO darenai_stat_url (user, ip, reffer, url, shopnick" - + "\n\t, time)" - + "\nVALUES ('nologin', '58.101.223.183', 'http://item.taobao.com/item.htm?spm=a230r.1.14.419.KDVewC&id=17052767689', '/d/jingpinhui?spm=2013.1.0.0.zr4nLz&ac=shop&imageid=1019937265&s=1259538&s=1259538', '零利润3232'" - + "\n\t, NOW())", // - output); + + "\n\t, time)" + + "\nVALUES ('nologin', '58.101.223.183', 'http://item.taobao.com/item.htm?spm=a230r.1.14.419.KDVewC&id=17052767689', '/d/jingpinhui?spm=2013.1.0.0.zr4nLz&ac=shop&imageid=1019937265&s=1259538&s=1259538', '零利润3232'" + + "\n\t, NOW())", // + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("insert into darenai_stat_url (user, ip, reffer, url, shopnick" - + "\n\t, time)" - + "\nvalues ('nologin', '58.101.223.183', 'http://item.taobao.com/item.htm?spm=a230r.1.14.419.KDVewC&id=17052767689', '/d/jingpinhui?spm=2013.1.0.0.zr4nLz&ac=shop&imageid=1019937265&s=1259538&s=1259538', '零利润3232'" - + "\n\t, NOW())", // - output); + + "\n\t, time)" + + "\nvalues ('nologin', '58.101.223.183', 'http://item.taobao.com/item.htm?spm=a230r.1.14.419.KDVewC&id=17052767689', '/d/jingpinhui?spm=2013.1.0.0.zr4nLz&ac=shop&imageid=1019937265&s=1259538&s=1259538', '零利润3232'" + + "\n\t, NOW())", // + output); } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_5.java index 3cb6c68c14..e98553b0e8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_5.java @@ -28,7 +28,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlUpdateTest_5 extends MysqlTest { - public void test_0() throws Exception { String sql = "select num from update ttt set num=num+1 where id = 1"; @@ -59,18 +58,18 @@ public void test_0() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT num" - + "\nFROM UPDATE ttt" - + "\nSET num = num + 1" - + "\nWHERE id = 1", // - output); + + "\nFROM UPDATE ttt" + + "\nSET num = num + 1" + + "\nWHERE id = 1", // + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select num" - + "\nfrom update ttt" - + "\nset num = num + 1" - + "\nwhere id = 1", // - output); + + "\nfrom update ttt" + + "\nset num = num + 1" + + "\nwhere id = 1", // + output); } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_6.java index c10bd73d9a..fc26e8c36a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_6.java @@ -27,7 +27,6 @@ import java.util.List; public class MySqlUpdateTest_6 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT id, user_id, item_id, sku_id, flag, sellable_quantity, fff03, status, feature, feature_lock, version, gmt_create, gmt_modified, root_id, parent_id, dist_type, dist_id, occupy_quantity, user_type\n" + "FROM UPDATE COMMIT_ON_SUCCESS ROLLBACK_ON_FAIL TARGET_AFFECT_ROW ? `table_3966`\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_7.java index 22818b82ec..b57cb1f910 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_7.java @@ -28,7 +28,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlUpdateTest_7 extends MysqlTest { - public void test_0() throws Exception { String sql = "UPDATE ROLLBACK_ON_FAIL TARGET_AFFECT_ROW 1 " + "`table_3966` AS `table_3966_11` SET `version` = `version` + 3, `gmt_modified` = NOW(), `optype` = ?, `feature` = ? " @@ -62,26 +61,26 @@ public void test_0() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("UPDATE ROLLBACK_ON_FAIL TARGET_AFFECT_ROW 1 `table_3966` `table_3966_11`" - + "\nSET `version` = `version` + 3, `gmt_modified` = NOW(), `optype` = ?, `feature` = ?" - + "\nWHERE `sub_biz_order_id` = ?" - + "\n\tAND `biz_order_type` = ?" - + "\n\tAND `id` = ?" - + "\n\tAND `ti_id` = ?" - + "\n\tAND `optype` = ?" - + "\n\tAND `root_id` = ?", // - output); + + "\nSET `version` = `version` + 3, `gmt_modified` = NOW(), `optype` = ?, `feature` = ?" + + "\nWHERE `sub_biz_order_id` = ?" + + "\n\tAND `biz_order_type` = ?" + + "\n\tAND `id` = ?" + + "\n\tAND `ti_id` = ?" + + "\n\tAND `optype` = ?" + + "\n\tAND `root_id` = ?", // + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("update rollback_on_fail target_affect_row 1 `table_3966` `table_3966_11`" - + "\nset `version` = `version` + 3, `gmt_modified` = NOW(), `optype` = ?, `feature` = ?" - + "\nwhere `sub_biz_order_id` = ?" - + "\n\tand `biz_order_type` = ?" - + "\n\tand `id` = ?" - + "\n\tand `ti_id` = ?" - + "\n\tand `optype` = ?" - + "\n\tand `root_id` = ?", // - output); + + "\nset `version` = `version` + 3, `gmt_modified` = NOW(), `optype` = ?, `feature` = ?" + + "\nwhere `sub_biz_order_id` = ?" + + "\n\tand `biz_order_type` = ?" + + "\n\tand `id` = ?" + + "\n\tand `ti_id` = ?" + + "\n\tand `optype` = ?" + + "\n\tand `root_id` = ?", // + output); } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_8.java index 94f275bbf7..feef580ed0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_8.java @@ -28,7 +28,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlUpdateTest_8 extends MysqlTest { - public void test_0() throws Exception { String sql = "update haskell_function set `arity` = arity-'1' where id = 1;"; @@ -59,16 +58,16 @@ public void test_0() throws Exception { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("UPDATE haskell_function" - + "\nSET `arity` = arity - '1'" - + "\nWHERE id = 1;", // - output); + + "\nSET `arity` = arity - '1'" + + "\nWHERE id = 1;", // + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("update haskell_function" - + "\nset `arity` = arity - '1'" - + "\nwhere id = 1;", // - output); + + "\nset `arity` = arity - '1'" + + "\nwhere id = 1;", // + output); } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_9.java index 31d4e74b7b..9037e33ade 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_9.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlUpdateTest_9 extends MysqlTest { - public void test_0() throws Exception { String sql = "update tb1 a , tb2 b set a.name='abc' where a.id=b.id"; @@ -61,14 +60,14 @@ public void test_0() throws Exception { Assert.assertEquals("UPDATE tb1 a, tb2 b\n" + "SET a.name = 'abc'\n" + "WHERE a.id = b.id", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("update tb1 a, tb2 b\n" + "set a.name = 'abc'\n" + "where a.id = b.id", // - output); + output); } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlParameterizedOutputVisitorTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlParameterizedOutputVisitorTest.java index 6febe1d6c4..c1ca3174df 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlParameterizedOutputVisitorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlParameterizedOutputVisitorTest.java @@ -21,7 +21,6 @@ import junit.framework.TestCase; public class MySqlParameterizedOutputVisitorTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT appsheetserialno FROM app_trans WHERE nodeid = _gbk '619' " + " AND alino = _gbk '2013110900031031001700thfund00163619'" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java index 53a57c5752..ea624c89cb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcUtils; public class MySqlResourceTest extends TestCase { - public void test_0() throws Exception { // exec_test("bvt/parser/mysql-0.txt"); // exec_test("bvt/parser/mysql-1.txt"); @@ -164,7 +163,6 @@ public void exec_test(String resource) throws Exception { } void mergValidate(String sql, String expect) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java index f20a96b57f..abe8abab4d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlSchemaStatVisitorTest1 extends TestCase { - public void test_0() throws Exception { String sql = "select a.name, b.name FROM users a, usergroups b on a.groupId = b.id"; @@ -84,10 +83,10 @@ public void test_1() throws Exception { Assert.assertTrue(visitor.getColumn("users", "name").isSelect()); Assert.assertTrue(visitor.getColumn("usergroups", "name").isSelect()); - + Assert.assertTrue(visitor.getColumn("users", "groupId").isJoin()); Assert.assertTrue(visitor.getColumn("usergroups", "id").isJoin()); - + Assert.assertTrue(visitor.getColumn("users", "groupId").isWhere()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java index 88ec922fef..4bbd683206 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlSchemaStatVisitorTest2 extends TestCase { - public void test_0() throws Exception { String sql = "select id, name FROM users"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java index df46bdf21a..af63279412 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlSchemaStatVisitorTest3 extends TestCase { - public void test_0() throws Exception { String sql = "insert into users2 (id2, name2) select id, name FROM users where loginCount > 1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java index b7ed598595..037cd5a9ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlSchemaStatVisitorTest4 extends TestCase { - public void test_0() throws Exception { String sql = "insert into users (id, name) values(?, ?)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java index e21e1e3e65..2e50248bcf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java @@ -24,38 +24,37 @@ import java.util.List; public class MySqlSchemaStatVisitorTest5 extends TestCase { - - public void test_0() throws Exception { - String sql = "SELECT distinct a.id \"id\", a.col \"col\", a.position \"position\", a.panel_id \"panelId\" " - + "FROM (select * from view_position_info) a LEFT JOIN db1.view_portal b ON a.panel_id = b.panel_id " - + " LEFT JOIN (select * from view_portal_panel) c ON a.panel_id = c.panel_id " - + " WHERE b.user_id = ? and ((b.is_grid='y' and c.param_name='is_hidden' and c.param_value='false') or b.is_grid != 'y') and b.user_id in (select user_id from table1 where id = 1) ORDER BY a.col ASC, a.position ASC"; + public void test_0() throws Exception { + String sql = "SELECT distinct a.id \"id\", a.col \"col\", a.position \"position\", a.panel_id \"panelId\" " + + "FROM (select * from view_position_info) a LEFT JOIN db1.view_portal b ON a.panel_id = b.panel_id " + + " LEFT JOIN (select * from view_portal_panel) c ON a.panel_id = c.panel_id " + + " WHERE b.user_id = ? and ((b.is_grid='y' and c.param_name='is_hidden' and c.param_value='false') or b.is_grid != 'y') and b.user_id in (select user_id from table1 where id = 1) ORDER BY a.col ASC, a.position ASC"; // sql = "select columnName from table1 where id in (select id from table3 where name = ?)"; - MySqlStatementParser parser = new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); - Assert.assertEquals(1, statementList.size()); + Assert.assertEquals(1, statementList.size()); - System.out.println(stmt); + System.out.println(stmt); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); - stmt.accept(visitor); + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); - System.out.println(sql); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println(sql); + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); - Assert.assertEquals(4, visitor.getTables().size()); - Assert.assertEquals(true, visitor.containsTable("view_position_info")); + Assert.assertEquals(4, visitor.getTables().size()); + Assert.assertEquals(true, visitor.containsTable("view_position_info")); - Assert.assertEquals(11, visitor.getColumns().size()); - // Assert.assertEquals(true, visitor.getFields().contains(new - // Column("users", "id"))); - // Assert.assertEquals(true, visitor.getFields().contains(new - // Column("users", "name"))); + Assert.assertEquals(11, visitor.getColumns().size()); + // Assert.assertEquals(true, visitor.getFields().contains(new + // Column("users", "id"))); + // Assert.assertEquals(true, visitor.getFields().contains(new + // Column("users", "name"))); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest6.java index 772425167e..3fab641ede 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest6.java @@ -24,33 +24,32 @@ import java.util.List; public class MySqlSchemaStatVisitorTest6 extends TestCase { - - public void test_0() throws Exception { - String sql = "select * from t order by trim(trim(INTERVAL 3 YEAR))"; + public void test_0() throws Exception { + String sql = "select * from t order by trim(trim(INTERVAL 3 YEAR))"; // sql = "select columnName from table1 where id in (select id from table3 where name = ?)"; - MySqlStatementParser parser = new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); - Assert.assertEquals(1, statementList.size()); + Assert.assertEquals(1, statementList.size()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); - stmt.accept(visitor); + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); - System.out.println(sql); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println(sql); + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); - Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.containsTable("t")); + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(true, visitor.containsTable("t")); - Assert.assertEquals(1, visitor.getColumns().size()); - // Assert.assertEquals(true, visitor.getFields().contains(new - // Column("users", "id"))); - // Assert.assertEquals(true, visitor.getFields().contains(new - // Column("users", "name"))); + Assert.assertEquals(1, visitor.getColumns().size()); + // Assert.assertEquals(true, visitor.getFields().contains(new + // Column("users", "id"))); + // Assert.assertEquals(true, visitor.getFields().contains(new + // Column("users", "name"))); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7.java index 7579512517..14b9fa3510 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7.java @@ -24,60 +24,59 @@ import java.util.List; public class MySqlSchemaStatVisitorTest7 extends TestCase { - - public void test_0() throws Exception { - String sql = "select * from t1 where b in (select b from t2) and a = 1"; + public void test_0() throws Exception { + String sql = "select * from t1 where b in (select b from t2) and a = 1"; // sql = "select columnName from table1 where id in (select id from table3 where name = ?)"; - MySqlStatementParser parser = new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); - stmt.accept(visitor); + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); - System.out.println(sql); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); - System.out.println(visitor.getConditions()); + System.out.println(sql); + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println(visitor.getConditions()); - assertEquals(2, visitor.getTables().size()); - assertEquals(true, visitor.containsTable("t1")); - assertEquals(true, visitor.containsTable("t2")); + assertEquals(2, visitor.getTables().size()); + assertEquals(true, visitor.containsTable("t1")); + assertEquals(true, visitor.containsTable("t2")); - assertEquals(4, visitor.getColumns().size()); - assertEquals(true, visitor.containsColumn("t1", "b")); - assertEquals(true, visitor.containsColumn("t2", "b")); - assertEquals(true, visitor.containsColumn("t1", "a")); - // assertEquals(true, visitor.getFields().contains(new - // Column("users", "name"))); + assertEquals(4, visitor.getColumns().size()); + assertEquals(true, visitor.containsColumn("t1", "b")); + assertEquals(true, visitor.containsColumn("t2", "b")); + assertEquals(true, visitor.containsColumn("t1", "a")); + // assertEquals(true, visitor.getFields().contains(new + // Column("users", "name"))); - } + } - public void test_1() throws Exception { - String sql = "select id,name from bi.aaa where stat_date <= cast(current_date as varchar(10))"; + public void test_1() throws Exception { + String sql = "select id,name from bi.aaa where stat_date <= cast(current_date as varchar(10))"; // sql = "select columnName from table1 where id in (select id from table3 where name = ?)"; - MySqlStatementParser parser = new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); - stmt.accept(visitor); + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); - System.out.println(sql); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); - System.out.println(visitor.getConditions()); - assertEquals(1, visitor.getConditions().size()); - assertEquals(1, visitor.getConditions().get(0).getValues().size()); - assertEquals("CURRENT_DATE", visitor.getConditions().get(0).getValues().get(0)); + System.out.println(sql); + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println(visitor.getConditions()); + assertEquals(1, visitor.getConditions().size()); + assertEquals(1, visitor.getConditions().get(0).getValues().size()); + assertEquals("CURRENT_DATE", visitor.getConditions().get(0).getValues().get(0)); - assertEquals(1, visitor.getTables().size()); + assertEquals(1, visitor.getTables().size()); // assertEquals(true, visitor.containsTable("t1")); // assertEquals(true, visitor.containsTable("t2")); // @@ -85,8 +84,8 @@ public void test_1() throws Exception { // assertEquals(true, visitor.containsColumn("t1", "b")); // assertEquals(true, visitor.containsColumn("t2", "b")); // assertEquals(true, visitor.containsColumn("t1", "a")); - // assertEquals(true, visitor.getFields().contains(new - // Column("users", "name"))); + // assertEquals(true, visitor.getFields().contains(new + // Column("users", "name"))); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7_between.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7_between.java index c2a01c71a6..9da0fd5d85 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7_between.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7_between.java @@ -23,35 +23,34 @@ import java.util.List; public class MySqlSchemaStatVisitorTest7_between extends TestCase { - - public void test_0() throws Exception { - String sql = "select name from student where id = 4 and flag between 1 and 3"; + public void test_0() throws Exception { + String sql = "select name from student where id = 4 and flag between 1 and 3"; // sql = "select columnName from table1 where id in (select id from table3 where name = ?)"; - MySqlStatementParser parser = new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); - stmt.accept(visitor); + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); - System.out.println(sql); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); - System.out.println(visitor.getConditions()); + System.out.println(sql); + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println(visitor.getConditions()); - assertEquals(1, visitor.getTables().size()); - assertEquals(true, visitor.containsTable("student")); + assertEquals(1, visitor.getTables().size()); + assertEquals(true, visitor.containsTable("student")); - assertEquals(3, visitor.getColumns().size()); - assertEquals(true, visitor.containsColumn("student", "flag")); - assertEquals(true, visitor.containsColumn("student", "id")); - assertEquals(true, visitor.containsColumn("student", "name")); - // assertEquals(true, visitor.getFields().contains(new - // Column("users", "name"))); + assertEquals(3, visitor.getColumns().size()); + assertEquals(true, visitor.containsColumn("student", "flag")); + assertEquals(true, visitor.containsColumn("student", "id")); + assertEquals(true, visitor.containsColumn("student", "name")); + // assertEquals(true, visitor.getFields().contains(new + // Column("users", "name"))); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest8.java index 72764236bc..f41055854d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest8.java @@ -23,43 +23,42 @@ import java.util.List; public class MySqlSchemaStatVisitorTest8 extends TestCase { - - public void test_0() throws Exception { - String sql = "SELECT\n" + - "(SELECT count() FROM warn_condition_strategy WHERE user_id = 2510701 AND is_delete = 0 AND strategy_state IN\n" + - "(1, 2, 6)) AS monitorNum,\n" + - "(SELECT count() FROM warn_condition_trade_history WHERE user_id = 2510701 AND date_sub(curdate(), INTERVAL 7 DAY) <= date(create_date)) AS recentEntrustNum,\n" + - "(SELECT count() FROM warn_condition_strategy WHERE user_id = 2510701 AND (is_delete = 1 OR strategy_state IN (3, 4, 5))) AS historyNum,\n" + - "(SELECT count() FROM warn_condition_trade_history WHERE user_id = 2510701 AND status = 1) AS unreadEntrustNum"; + public void test_0() throws Exception { + String sql = "SELECT\n" + + "(SELECT count() FROM warn_condition_strategy WHERE user_id = 2510701 AND is_delete = 0 AND strategy_state IN\n" + + "(1, 2, 6)) AS monitorNum,\n" + + "(SELECT count() FROM warn_condition_trade_history WHERE user_id = 2510701 AND date_sub(curdate(), INTERVAL 7 DAY) <= date(create_date)) AS recentEntrustNum,\n" + + "(SELECT count() FROM warn_condition_strategy WHERE user_id = 2510701 AND (is_delete = 1 OR strategy_state IN (3, 4, 5))) AS historyNum,\n" + + "(SELECT count() FROM warn_condition_trade_history WHERE user_id = 2510701 AND status = 1) AS unreadEntrustNum"; // sql = "select columnName from table1 where id in (select id from table3 where name = ?)"; - MySqlStatementParser parser = new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); - stmt.accept(visitor); + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); - System.out.println(stmt.toString()); + System.out.println(stmt.toString()); // System.out.println(sql); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); - System.out.println(visitor.getConditions()); + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println(visitor.getConditions()); - assertEquals(2, visitor.getTables().size()); - assertEquals(true, visitor.containsTable("warn_condition_strategy")); - assertEquals(true, visitor.containsTable("warn_condition_trade_history")); + assertEquals(2, visitor.getTables().size()); + assertEquals(true, visitor.containsTable("warn_condition_strategy")); + assertEquals(true, visitor.containsTable("warn_condition_trade_history")); - assertEquals(6, visitor.getColumns().size()); - assertEquals(true, visitor.containsColumn("warn_condition_strategy", "user_id")); - assertEquals(true, visitor.containsColumn("warn_condition_strategy", "is_delete")); - assertEquals(true, visitor.containsColumn("warn_condition_strategy", "strategy_state")); - // assertEquals(true, visitor.getFields().contains(new - // Column("users", "name"))); + assertEquals(6, visitor.getColumns().size()); + assertEquals(true, visitor.containsColumn("warn_condition_strategy", "user_id")); + assertEquals(true, visitor.containsColumn("warn_condition_strategy", "is_delete")); + assertEquals(true, visitor.containsColumn("warn_condition_strategy", "strategy_state")); + // assertEquals(true, visitor.getFields().contains(new + // Column("users", "name"))); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest9_in.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest9_in.java index c4649610ee..ce24174f47 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest9_in.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest9_in.java @@ -23,31 +23,30 @@ import java.util.List; public class MySqlSchemaStatVisitorTest9_in extends TestCase { - - public void test_0() throws Exception { - String sql = "SELECT name FROM employee WHERE no in ('1', '2');"; + public void test_0() throws Exception { + String sql = "SELECT name FROM employee WHERE no in ('1', '2');"; // sql = "select columnName from table1 where id in (select id from table3 where name = ?)"; - MySqlStatementParser parser = new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); - stmt.accept(visitor); + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); - System.out.println(stmt.toString()); + System.out.println(stmt.toString()); // System.out.println(sql); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); - System.out.println(visitor.getConditions()); + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println(visitor.getConditions()); - assertEquals(1, visitor.getTables().size()); - assertEquals("[employee.no IN (\"1\", \"2\")]", visitor.getConditions().toString()); - // Column("users", "name"))); + assertEquals(1, visitor.getTables().size()); + assertEquals("[employee.no IN (\"1\", \"2\")]", visitor.getConditions().toString()); + // Column("users", "name"))); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Alter.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Alter.java index 345d09276d..9482b0e184 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Alter.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Alter.java @@ -26,7 +26,6 @@ import java.util.List; public class MySqlSchemaStatVisitorTest_Alter extends TestCase { - public void test_0() throws Exception { String sql = "alter table sql_perf add index `idx_instance_8` (`host`,`port`,`hashcode`,`item`,`time`,`value`);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java index 49517977f1..50ce71e673 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlSchemaStatVisitorTest_Delete extends TestCase { - public void test_0() throws Exception { String sql = "delete from users where id = ? or name = ?"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java index 92bdd1330d..f4e392d95c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlSchemaStatVisitorTest_Subquery extends TestCase { - public void test_0() throws Exception { String sql = "SELECT id2, name2 FROM (select id, name from users u where id = 22 limit 10) a"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java index f8c62e3b15..b287347e0e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlSchemaStatVisitorTest_Subquery2 extends TestCase { - public void test_0() throws Exception { String sql = "SELECT a.id, a.name, b.name groupName FROM (select id, name, groupId from users limit 10) a inner join groups b on a.groupId = b.id"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java index 1252264139..29f9ca178b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class MySqlSchemaStatVisitorTest_Update extends TestCase { - public void test_0() throws Exception { String sql = "update users set loginCount = loginCount + 1 where id = ?"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_pk_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_pk_0.java index 9d36658738..ddb28f4c86 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_pk_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_pk_0.java @@ -29,79 +29,78 @@ import java.util.List; public class MySqlSchemaStatVisitorTest_pk_0 extends TestCase { - - public void test_0() throws Exception { - String sql ="CREATE TABLE `m_dt` (\n" + - " `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',\n" + - " `gmt_create` datetime NOT NULL COMMENT '创建时间',\n" + - " `gmt_modified` datetime NOT NULL COMMENT '修改时间',\n" + - " `instance_id` int(11) NOT NULL COMMENT '实例id',\n" + - " `schema_name` varchar(128) NOT NULL COMMENT '数据库schema名称',\n" + - " `state` tinyint(4) NOT NULL DEFAULT '0' COMMENT ' x dd ',\n" + - " `busi_user` varchar(64) DEFAULT NULL COMMENT 'JDBC业务用户',\n" + - " `bzp` varchar(128) DEFAULT NULL COMMENT 'bcp',\n" + - " `ecd` varchar(32) DEFAULT NULL COMMENT 'xxx',\n" + - " `last_sync_time` datetime DEFAULT NULL COMMENT '最后同步时间',\n" + - " `catalog_name` varchar(128) NOT NULL COMMENT '物理库名称',\n" + - " `search_name` varchar(256) NOT NULL COMMENT '用于搜索，区分不同数据库的不同字段信息',\n" + - " `db_type` tinyint(4) NOT NULL COMMENT '数据库类型，和meta_instance表一致',\n" + - " `et` varchar(32) NOT NULL DEFAULT '' COMMENT 'et',\n" + - " `ae` varchar(32) DEFAULT NULL COMMENT 'ae',\n" + - " PRIMARY KEY (`id`),\n" + - " UNIQUE KEY `uk_instanceid_schemaname` (`instance_id`,`catalog_name`,`schema_name`),\n" + - " KEY `idx_schema_name` (`schema_name`),\n" + - " KEY `idx_instance_id_state` (`instance_id`,`id`,`state`),\n" + - " KEY `idx_search_name` (`search_name`(255))\n" + - ") ENGINE=InnoDB AUTO_INCREMENT=408695 DEFAULT CHARSET=utf8 COMMENT='数据库表信息'"; + public void test_0() throws Exception { + String sql = "CREATE TABLE `m_dt` (\n" + + " `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',\n" + + " `gmt_create` datetime NOT NULL COMMENT '创建时间',\n" + + " `gmt_modified` datetime NOT NULL COMMENT '修改时间',\n" + + " `instance_id` int(11) NOT NULL COMMENT '实例id',\n" + + " `schema_name` varchar(128) NOT NULL COMMENT '数据库schema名称',\n" + + " `state` tinyint(4) NOT NULL DEFAULT '0' COMMENT ' x dd ',\n" + + " `busi_user` varchar(64) DEFAULT NULL COMMENT 'JDBC业务用户',\n" + + " `bzp` varchar(128) DEFAULT NULL COMMENT 'bcp',\n" + + " `ecd` varchar(32) DEFAULT NULL COMMENT 'xxx',\n" + + " `last_sync_time` datetime DEFAULT NULL COMMENT '最后同步时间',\n" + + " `catalog_name` varchar(128) NOT NULL COMMENT '物理库名称',\n" + + " `search_name` varchar(256) NOT NULL COMMENT '用于搜索，区分不同数据库的不同字段信息',\n" + + " `db_type` tinyint(4) NOT NULL COMMENT '数据库类型，和meta_instance表一致',\n" + + " `et` varchar(32) NOT NULL DEFAULT '' COMMENT 'et',\n" + + " `ae` varchar(32) DEFAULT NULL COMMENT 'ae',\n" + + " PRIMARY KEY (`id`),\n" + + " UNIQUE KEY `uk_instanceid_schemaname` (`instance_id`,`catalog_name`,`schema_name`),\n" + + " KEY `idx_schema_name` (`schema_name`),\n" + + " KEY `idx_instance_id_state` (`instance_id`,`id`,`state`),\n" + + " KEY `idx_search_name` (`search_name`(255))\n" + + ") ENGINE=InnoDB AUTO_INCREMENT=408695 DEFAULT CHARSET=utf8 COMMENT='数据库表信息'"; // sql = "select columnName from table1 where id in (select id from table3 where name = ?)"; - MySqlStatementParser parser = new MySqlStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLCreateTableStatement stmt = (SQLCreateTableStatement) statementList.get(0); + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLCreateTableStatement stmt = (SQLCreateTableStatement) statementList.get(0); - Assert.assertEquals(1, statementList.size()); + Assert.assertEquals(1, statementList.size()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); - stmt.accept(visitor); + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); - System.out.println(sql); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println(sql); + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); - Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertEquals(true, visitor.containsTable("m_dt")); + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(true, visitor.containsTable("m_dt")); - Assert.assertEquals(15, visitor.getColumns().size()); + Assert.assertEquals(15, visitor.getColumns().size()); - { - TableStat.Column column = visitor.getColumn("m_dt", "id"); - assertNotNull(column); - assertTrue(column.isPrimaryKey()); - } - { - TableStat.Column column = visitor.getColumn("m_dt", "schema_name"); - assertNotNull(column); - assertTrue(column.isUnique()); - } - { - TableStat.Column column = visitor.getColumn("m_dt", "instance_id"); - assertNotNull(column); - assertTrue(column.isUnique()); - } + { + TableStat.Column column = visitor.getColumn("m_dt", "id"); + assertNotNull(column); + assertTrue(column.isPrimaryKey()); + } + { + TableStat.Column column = visitor.getColumn("m_dt", "schema_name"); + assertNotNull(column); + assertTrue(column.isUnique()); + } + { + TableStat.Column column = visitor.getColumn("m_dt", "instance_id"); + assertNotNull(column); + assertTrue(column.isUnique()); + } - for (SQLTableElement element : stmt.getTableElementList()) { - if (element instanceof SQLUnique) { - SQLName name = ((SQLUnique) element).getName(); - if (name != null) { - String uniqueName = name.toString(); - } - } - } - // Assert.assertEquals(true, visitor.getFields().contains(new - // Column("users", "id"))); - // Assert.assertEquals(true, visitor.getFields().contains(new - // Column("users", "name"))); + for (SQLTableElement element : stmt.getTableElementList()) { + if (element instanceof SQLUnique) { + SQLName name = ((SQLUnique) element).getName(); + if (name != null) { + String uniqueName = name.toString(); + } + } + } + // Assert.assertEquals(true, visitor.getFields().contains(new + // Column("users", "id"))); + // Assert.assertEquals(true, visitor.getFields().contains(new + // Column("users", "name"))); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest.java index 1753d27067..9b475c1c7b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableAddPartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE members ADD PARTITION (PARTITION p3 VALUES LESS THAN (2000));"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE members" - + "\n\tADD PARTITION (PARTITION p3 VALUES LESS THAN (2000));", - result); + + "\n\tADD PARTITION (PARTITION p3 VALUES LESS THAN (2000));", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table members" - + "\n\tadd partition (partition p3 values less than (2000));", - result); + + "\n\tadd partition (partition p3 values less than (2000));", + result); } print(stmtList); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest2.java index 99d23f3e1e..5ccfe1d71f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableAddPartitionTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "alter table clients add partition partitions 18;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE clients" - + "\n\tADD PARTITION PARTITIONS 18;", - result); + + "\n\tADD PARTITION PARTITIONS 18;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table clients" - + "\n\tadd partition partitions 18;", - result); + + "\n\tadd partition partitions 18;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest.java index d9eb1db603..46250c5ae8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableAnalyzePartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange ANALYZE PARTITION p1;"; // @@ -36,14 +35,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tANALYZE PARTITION p1;", - result); + + "\n\tANALYZE PARTITION p1;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tanalyze partition p1;", - result); + + "\n\tanalyze partition p1;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest2.java index 4d4d1032fe..815fc3d76d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableAnalyzePartitionTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange ANALYZE PARTITION ALL;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tANALYZE PARTITION ALL;", - result); + + "\n\tANALYZE PARTITION ALL;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tanalyze partition all;", - result); + + "\n\tanalyze partition all;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest3.java index b50eb4cbbc..f4f9deb0ed 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest3.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableAnalyzePartitionTest3 extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange ANALYZE PARTITION p1, p2;"; // @@ -36,14 +35,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tANALYZE PARTITION p1, p2;", - result); + + "\n\tANALYZE PARTITION p1, p2;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tanalyze partition p1, p2;", - result); + + "\n\tanalyze partition p1, p2;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest.java index d1a105df43..45796e1bb5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableCheckPartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange CHECK PARTITION p1;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tCHECK PARTITION p1;", - result); + + "\n\tCHECK PARTITION p1;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tcheck partition p1;", - result); + + "\n\tcheck partition p1;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest2.java index ee022e7d8b..9f8e504581 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableCheckPartitionTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange CHECK PARTITION ALL;"; // @@ -36,14 +35,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tCHECK PARTITION ALL;", - result); + + "\n\tCHECK PARTITION ALL;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tcheck partition all;", - result); + + "\n\tcheck partition all;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCoalescePartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCoalescePartitionTest.java index 5e006d99d2..97d8480e8d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCoalescePartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCoalescePartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableCoalescePartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE clients COALESCE PARTITION 6"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE clients" - + "\n\tCOALESCE PARTITION 6", - result); + + "\n\tCOALESCE PARTITION 6", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table clients" - + "\n\tcoalesce partition 6", - result); + + "\n\tcoalesce partition 6", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest.java index 0326e08b05..a78c00502e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableDiscardPartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange DISCARD PARTITION p1;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tDISCARD PARTITION p1;", - result); + + "\n\tDISCARD PARTITION p1;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tdiscard partition p1;", - result); + + "\n\tdiscard partition p1;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest2.java index 4a1e514b70..345522f8b5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableDiscardPartitionTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange DISCARD PARTITION ALL;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tDISCARD PARTITION ALL;", - result); + + "\n\tDISCARD PARTITION ALL;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tdiscard partition all;", - result); + + "\n\tdiscard partition all;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDropPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDropPartitionTest.java index f1c21f9d52..ea66f010fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDropPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDropPartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableDropPartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange DROP PARTITION p1;"; // @@ -37,7 +36,7 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" + // - "\n\tDROP PARTITION p1;", result); + "\n\tDROP PARTITION p1;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest.java index 27b1fce28f..7a6df4c8ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableImportPartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange IMPORT PARTITION p1;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tIMPORT PARTITION p1;", - result); + + "\n\tIMPORT PARTITION p1;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\timport partition p1;", - result); + + "\n\timport partition p1;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest2.java index 25c0902850..dc12ecaa26 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableImportPartitionTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange IMPORT PARTITION ALL;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tIMPORT PARTITION ALL;", - result); + + "\n\tIMPORT PARTITION ALL;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\timport partition all;", - result); + + "\n\timport partition all;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest.java index 26b643d60e..03e89b8b7b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableOptimizePartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange OPTIMIZE PARTITION p1;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tOPTIMIZE PARTITION p1;", - result); + + "\n\tOPTIMIZE PARTITION p1;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\toptimize partition p1;", - result); + + "\n\toptimize partition p1;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest2.java index c0d9b881aa..6af371a33c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableOptimizePartitionTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange OPTIMIZE PARTITION ALL;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tOPTIMIZE PARTITION ALL;", - result); + + "\n\tOPTIMIZE PARTITION ALL;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\toptimize partition all;", - result); + + "\n\toptimize partition all;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest.java index 0b6aa0812e..23e352f9de 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableReOrganizePartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE members " + "REORGANIZE PARTITION p0 INTO ( PARTITION s0 VALUES LESS THAN (1960), PARTITION s1 VALUES LESS THAN (1970) );"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE members" // - + "\n\tREORGANIZE p0 INTO (PARTITION s0 VALUES LESS THAN (1960), PARTITION s1 VALUES LESS THAN (1970));", - result); + + "\n\tREORGANIZE p0 INTO (PARTITION s0 VALUES LESS THAN (1960), PARTITION s1 VALUES LESS THAN (1970));", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table members" // - + "\n\treorganize p0 into (partition s0 values less than (1960), partition s1 values less than (1970));", - result); + + "\n\treorganize p0 into (partition s0 values less than (1960), partition s1 values less than (1970));", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest2.java index 7b792f48d7..4eacbed8ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableReOrganizePartitionTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE members " // + "REORGANIZE PARTITION s0,s1,p1,p2,p3 INTO ( "// @@ -41,14 +40,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE members" - + "\n\tREORGANIZE s0, s1, p1, p2, p3 INTO (PARTITION m0 VALUES LESS THAN (1980), PARTITION m1 VALUES LESS THAN (2000));", - result); + + "\n\tREORGANIZE s0, s1, p1, p2, p3 INTO (PARTITION m0 VALUES LESS THAN (1980), PARTITION m1 VALUES LESS THAN (2000));", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table members" - + "\n\treorganize s0, s1, p1, p2, p3 into (partition m0 values less than (1980), partition m1 values less than (2000));", - result); + + "\n\treorganize s0, s1, p1, p2, p3 into (partition m0 values less than (1980), partition m1 values less than (2000));", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest.java index dae72186ce..3695826163 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableRebuildPartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange REBUILD PARTITION p1;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tREBUILD PARTITION p1;", - result); + + "\n\tREBUILD PARTITION p1;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\trebuild partition p1;", - result); + + "\n\trebuild partition p1;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest2.java index 9e4dd81247..966f5896d9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableRebuildPartitionTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange REBUILD PARTITION ALL;"; // @@ -37,16 +36,16 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tREBUILD PARTITION ALL;", - result); + + "\n\tREBUILD PARTITION ALL;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\trebuild partition all;", - result); + + "\n\trebuild partition all;", + result); } - + Assert.assertEquals(1, stmtList.size()); MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRemovePartitioningTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRemovePartitioningTest.java index 8e07362562..167cd635a4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRemovePartitioningTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRemovePartitioningTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableRemovePartitioningTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange REMOVE PARTITIONING;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tREMOVE PARTITIONING;", - result); + + "\n\tREMOVE PARTITIONING;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tremove partitioning;", - result); + + "\n\tremove partitioning;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest.java index b79356b913..487ef3ffae 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableRepairPartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange REPAIR PARTITION p1;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tREPAIR PARTITION p1;", - result); + + "\n\tREPAIR PARTITION p1;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\trepair partition p1;", - result); + + "\n\trepair partition p1;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest2.java index 6993633b3b..da44de5aae 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableRepairPartitionTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange REPAIR PARTITION ALL;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tREPAIR PARTITION ALL;", - result); + + "\n\tREPAIR PARTITION ALL;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\trepair partition all;", - result); + + "\n\trepair partition all;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest.java index 1d85f653ca..bc9ae82df4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableTruncatePartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange TRUNCATE PARTITION p1;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tTRUNCATE PARTITION p1;", - result); + + "\n\tTRUNCATE PARTITION p1;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\ttruncate partition p1;", - result); + + "\n\ttruncate partition p1;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest2.java index 216f3a2a52..1c76768934 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableTruncatePartitionTest2 extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange TRUNCATE PARTITION ALL;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tTRUNCATE PARTITION ALL;", - result); + + "\n\tTRUNCATE PARTITION ALL;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\ttruncate partition all;", - result); + + "\n\ttruncate partition all;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableUpgradePartitioningTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableUpgradePartitioningTest.java index de4ee2526a..38f389d44a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableUpgradePartitioningTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableUpgradePartitioningTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseAlterTableUpgradePartitioningTest extends MysqlTest { - public void test_0() throws Exception { String sql = "ALTER TABLE tnrange UPGRADE PARTITIONING;"; // @@ -37,14 +36,14 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("ALTER TABLE tnrange" - + "\n\tUPGRADE PARTITIONING;", - result); + + "\n\tUPGRADE PARTITIONING;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("alter table tnrange" - + "\n\tupgrade partitioning;", - result); + + "\n\tupgrade partitioning;", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash.java index 75830a9539..af84852f7a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseCreateTableTest_partitionByHash extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE tnhash ( id INT, name VARCHAR(5) ) PARTITION BY HASH(id) PARTITIONS 2;"; // @@ -37,22 +36,22 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE tnhash (" - + "\n\tid INT," - + "\n\tname VARCHAR(5)" - + "\n)" - + "\nPARTITION BY HASH (id) PARTITIONS 2;", - result); + + "\n\tid INT," + + "\n\tname VARCHAR(5)" + + "\n)" + + "\nPARTITION BY HASH (id) PARTITIONS 2;", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table tnhash (" - + "\n\tid INT," - + "\n\tname VARCHAR(5)" - + "\n)" - + "\npartition by hash (id) partitions 2;", - result); + + "\n\tid INT," + + "\n\tname VARCHAR(5)" + + "\n)" + + "\npartition by hash (id) partitions 2;", + result); } - + Assert.assertEquals(1, stmtList.size()); MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash2.java index b1e5b81eec..21d559debd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseCreateTableTest_partitionByHash2 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE employees ( " // + "id INT NOT NULL, fname VARCHAR(30), " // @@ -44,30 +43,30 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE employees (" - + "\n\tid INT NOT NULL," - + "\n\tfname VARCHAR(30)," - + "\n\tlname VARCHAR(30)," - + "\n\thired DATE NOT NULL DEFAULT '1970-01-01'," - + "\n\tseparated DATE NOT NULL DEFAULT '9999-12-31'," - + "\n\tjob_code INT," - + "\n\tstore_id INT" - + "\n)" - + "\nPARTITION BY HASH (YEAR(hired)) PARTITIONS 4", - result); + + "\n\tid INT NOT NULL," + + "\n\tfname VARCHAR(30)," + + "\n\tlname VARCHAR(30)," + + "\n\thired DATE NOT NULL DEFAULT '1970-01-01'," + + "\n\tseparated DATE NOT NULL DEFAULT '9999-12-31'," + + "\n\tjob_code INT," + + "\n\tstore_id INT" + + "\n)" + + "\nPARTITION BY HASH (YEAR(hired)) PARTITIONS 4", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table employees (" - + "\n\tid INT not null," - + "\n\tfname VARCHAR(30)," - + "\n\tlname VARCHAR(30)," - + "\n\thired DATE not null default '1970-01-01'," - + "\n\tseparated DATE not null default '9999-12-31'," - + "\n\tjob_code INT," - + "\n\tstore_id INT" - + "\n)" - + "\npartition by hash (YEAR(hired)) partitions 4", - result); + + "\n\tid INT not null," + + "\n\tfname VARCHAR(30)," + + "\n\tlname VARCHAR(30)," + + "\n\thired DATE not null default '1970-01-01'," + + "\n\tseparated DATE not null default '9999-12-31'," + + "\n\tjob_code INT," + + "\n\tstore_id INT" + + "\n)" + + "\npartition by hash (YEAR(hired)) partitions 4", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByKey.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByKey.java index 5da9409da1..48297c5c38 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByKey.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByKey.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseCreateTableTest_partitionByKey extends MysqlTest { - public void test_0() throws Exception { String sql = "create table k2(id int primary key, name varchar(20)) partition by key() partitions 2"; // @@ -37,20 +36,20 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE k2 (" - + "\n\tid int PRIMARY KEY," - + "\n\tname varchar(20)" - + "\n)" - + "\nPARTITION BY KEY () PARTITIONS 2", - result); + + "\n\tid int PRIMARY KEY," + + "\n\tname varchar(20)" + + "\n)" + + "\nPARTITION BY KEY () PARTITIONS 2", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table k2 (" - + "\n\tid int primary key," - + "\n\tname varchar(20)" - + "\n)" - + "\npartition by key () partitions 2", - result); + + "\n\tid int primary key," + + "\n\tname varchar(20)" + + "\n)" + + "\npartition by key () partitions 2", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition.java index f66e52cf18..491440aea3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition.java @@ -25,7 +25,6 @@ import java.util.List; public class OceanbaseCreateTableTest_rangePartition extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE employees (" // + " id INT NOT NULL, fname VARCHAR(30)," // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition2.java index 11214474ab..54daac72c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition2.java @@ -25,7 +25,6 @@ import java.util.List; public class OceanbaseCreateTableTest_rangePartition2 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE employees ( " // + "id INT NOT NULL, " // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition3.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition3.java index 28fabec1b9..853922022f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition3.java @@ -25,7 +25,6 @@ import java.util.List; public class OceanbaseCreateTableTest_rangePartition3 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE employees ( " // + "id INT NOT NULL, " // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition4.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition4.java index e54438f04e..407a6ecd1a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition4.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseCreateTableTest_rangePartition4 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE employees ( " // + "id INT NOT NULL, " // @@ -48,40 +47,40 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE employees (" - + "\n\tid INT NOT NULL," - + "\n\tfname VARCHAR(30)," - + "\n\tlname VARCHAR(30)," - + "\n\thired DATE NOT NULL DEFAULT '1970-01-01'," - + "\n\tseparated DATE NOT NULL DEFAULT '9999-12-31'," - + "\n\tjob_code INT," - + "\n\tstore_id INT" - + "\n)" - + "\nPARTITION BY RANGE (YEAR(separated)) (" - + "\n\tPARTITION p0 VALUES LESS THAN (1991)," - + "\n\tPARTITION p1 VALUES LESS THAN (1996)," - + "\n\tPARTITION p2 VALUES LESS THAN (2001)," - + "\n\tPARTITION p3 VALUES LESS THAN MAXVALUE" - + "\n)", - result); + + "\n\tid INT NOT NULL," + + "\n\tfname VARCHAR(30)," + + "\n\tlname VARCHAR(30)," + + "\n\thired DATE NOT NULL DEFAULT '1970-01-01'," + + "\n\tseparated DATE NOT NULL DEFAULT '9999-12-31'," + + "\n\tjob_code INT," + + "\n\tstore_id INT" + + "\n)" + + "\nPARTITION BY RANGE (YEAR(separated)) (" + + "\n\tPARTITION p0 VALUES LESS THAN (1991)," + + "\n\tPARTITION p1 VALUES LESS THAN (1996)," + + "\n\tPARTITION p2 VALUES LESS THAN (2001)," + + "\n\tPARTITION p3 VALUES LESS THAN MAXVALUE" + + "\n)", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table employees (" - + "\n\tid INT not null," - + "\n\tfname VARCHAR(30)," - + "\n\tlname VARCHAR(30)," - + "\n\thired DATE not null default '1970-01-01'," - + "\n\tseparated DATE not null default '9999-12-31'," - + "\n\tjob_code INT," - + "\n\tstore_id INT" - + "\n)" - + "\npartition by range (YEAR(separated)) (" - + "\n\tpartition p0 values less than (1991)," - + "\n\tpartition p1 values less than (1996)," - + "\n\tpartition p2 values less than (2001)," - + "\n\tpartition p3 values less than maxvalue" - + "\n)", - result); + + "\n\tid INT not null," + + "\n\tfname VARCHAR(30)," + + "\n\tlname VARCHAR(30)," + + "\n\thired DATE not null default '1970-01-01'," + + "\n\tseparated DATE not null default '9999-12-31'," + + "\n\tjob_code INT," + + "\n\tstore_id INT" + + "\n)" + + "\npartition by range (YEAR(separated)) (" + + "\n\tpartition p0 values less than (1991)," + + "\n\tpartition p1 values less than (1996)," + + "\n\tpartition p2 values less than (2001)," + + "\n\tpartition p3 values less than maxvalue" + + "\n)", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition5.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition5.java index 0b205a971e..49ec5500e1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition5.java @@ -25,7 +25,6 @@ import java.util.List; public class OceanbaseCreateTableTest_rangePartition5 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE tnrange (id INT, name VARCHAR(5) )" + " PARTITION BY RANGE(id) ( " diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition.java index c955490498..2b18852b8f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseCreateTableTest_subPartition extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE ts (id INT, purchased DATE) " // + "PARTITION BY RANGE(YEAR(purchased)) " // @@ -43,30 +42,30 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("CREATE TABLE ts (" - + "\n\tid INT," - + "\n\tpurchased DATE" - + "\n)" - + "\nPARTITION BY RANGE (YEAR(purchased))" - + "\nSUBPARTITION BY HASH (TO_DAYS(purchased)) SUBPARTITIONS 2 (" - + "\n\tPARTITION p0 VALUES LESS THAN (1990)," - + "\n\tPARTITION p1 VALUES LESS THAN (2000)," - + "\n\tPARTITION p2 VALUES LESS THAN MAXVALUE" - + "\n)", - result); + + "\n\tid INT," + + "\n\tpurchased DATE" + + "\n)" + + "\nPARTITION BY RANGE (YEAR(purchased))" + + "\nSUBPARTITION BY HASH (TO_DAYS(purchased)) SUBPARTITIONS 2 (" + + "\n\tPARTITION p0 VALUES LESS THAN (1990)," + + "\n\tPARTITION p1 VALUES LESS THAN (2000)," + + "\n\tPARTITION p2 VALUES LESS THAN MAXVALUE" + + "\n)", + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("create table ts (" - + "\n\tid INT," - + "\n\tpurchased DATE" - + "\n)" - + "\npartition by range (YEAR(purchased))" - + "\nsubpartition by hash (TO_DAYS(purchased)) subpartitions 2 (" - + "\n\tpartition p0 values less than (1990)," - + "\n\tpartition p1 values less than (2000)," - + "\n\tpartition p2 values less than maxvalue" - + "\n)", - result); + + "\n\tid INT," + + "\n\tpurchased DATE" + + "\n)" + + "\npartition by range (YEAR(purchased))" + + "\nsubpartition by hash (TO_DAYS(purchased)) subpartitions 2 (" + + "\n\tpartition p0 values less than (1990)," + + "\n\tpartition p1 values less than (2000)," + + "\n\tpartition p2 values less than maxvalue" + + "\n)", + result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition2.java index 36cd373507..c8c0a63acc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseCreateTableTest_subPartition2 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE ts (id INT, purchased DATE) " // + "PARTITION BY RANGE(YEAR(purchased)) " // @@ -63,7 +62,7 @@ public void test_0() throws Exception { "\t\tSUBPARTITION s5\n" + "\t)\n" + ")", - result); + result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -86,7 +85,7 @@ public void test_0() throws Exception { "\t\tsubpartition s5\n" + "\t)\n" + ")", - result); + result); System.out.println(result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition3.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition3.java index a2ba4598c0..4946bdbaf6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition3.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseCreateTableTest_subPartition3 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE ts (id INT, purchased DATE) " // + "PARTITION BY RANGE(YEAR(purchased)) " // @@ -55,7 +54,7 @@ public void test_0() throws Exception { "\t\tSUBPARTITION s3\n" + "\t)\n" + ")", - result); + result); print(stmtList); Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition4.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition4.java index a916ae9b0d..060ece9233 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition4.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseCreateTableTest_subPartition4 extends MysqlTest { - public void test_0() throws Exception { String sql = "CREATE TABLE ts (id INT, purchased DATE) " // + "PARTITION BY RANGE(YEAR(purchased)) " // @@ -59,7 +58,7 @@ public void test_0() throws Exception { "\t\tSUBPARTITION s1\n" + "\t)\n" + ")", - result); + result); print(stmtList); Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java index c04bff45b0..5aa1b06823 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java @@ -26,14 +26,13 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseHintTest_Index extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT /*+ INDEX(t1 i1) , INDEX(t2 i2)*/ * from t1, t2 WHERE t1.c1=t2.c1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); SQLStatement stmt = stmtList.get(0); - + { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT /*+ INDEX(t1 i1) , INDEX(t2 i2)*/ *" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index2.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index2.java index 01b93dffbd..59b332d0ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index2.java @@ -26,14 +26,13 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseHintTest_Index2 extends MysqlTest { - public void test_0() throws Exception { String sql = "delete /*+ INDEX(t1 i1) */ from t1 where t1.c1=1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); SQLStatement stmt = stmtList.get(0); - + String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("DELETE /*+ INDEX(t1 i1) */ FROM t1" + "\nWHERE t1.c1 = 1;", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Topk.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Topk.java index c11a2e3411..2b53324b70 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Topk.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Topk.java @@ -26,14 +26,13 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseHintTest_Topk extends MysqlTest { - public void test_0() throws Exception { String sql = "select /*+ topk(90 1000) */ sum(c2), c1 from t1 group by c1 order by sum(c2) limit 10 "; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); SQLStatement stmt = stmtList.get(0); - + String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT /*+ topk(90 1000) */ sum(c2), c1\n" + "FROM t1\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_multiget.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_multiget.java index 38e6ac3c79..a245f4eabe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_multiget.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_multiget.java @@ -26,14 +26,13 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseHintTest_multiget extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM t1 WHERE (c1, c2, c3) IN ((1,2,3), (4,5,6))"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); SQLStatement stmt = stmtList.get(0); - + String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *" + "\nFROM t1" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java index d9e77f3d3d..deec378f5a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java @@ -26,14 +26,13 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseHintTest_parallel extends MysqlTest { - public void test_0() throws Exception { String sql = "select /*+ parallel(5) */ count(*) from t1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); SQLStatement stmt = stmtList.get(0); - + String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT /*+ parallel(5) */ count(*)" + "\nFROM t1;", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectPartitionTest.java index 2d1b735095..663d494258 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectPartitionTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OceanbaseSelectPartitionTest extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT * FROM tnhash partition(p0);"; // @@ -37,12 +36,12 @@ public void test_0() throws Exception { { String result = SQLUtils.toMySqlString(stmt); Assert.assertEquals("SELECT *" + // - "\nFROM tnhash PARTITION (p0);", result); + "\nFROM tnhash PARTITION (p0);", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select *" + // - "\nfrom tnhash partition (p0);", result); + "\nfrom tnhash partition (p0);", result); } Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAddStatisticTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAddStatisticTest.java index a4475face9..a215c688e1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAddStatisticTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAddStatisticTest.java @@ -11,27 +11,27 @@ public void test_table_count() throws Exception { String sql = "add statistic tbl_shop table_count;"; Assert.assertEquals("ADD STATISTIC tbl_shop TABLE_COUNT;", SQLUtils.formatOdps(sql)); } - + public void test_null_value() throws Exception { String sql = "add statistic tbl_shop null_value shop_name;"; Assert.assertEquals("ADD STATISTIC tbl_shop NULL_VALUE shop_name;", SQLUtils.formatOdps(sql)); } - + public void test_column_sum() throws Exception { String sql = "add statistic tbl_shop column_sum shop_name;"; Assert.assertEquals("ADD STATISTIC tbl_shop COLUMN_SUM shop_name;", SQLUtils.formatOdps(sql)); } - + public void test_column_max() throws Exception { String sql = "add statistic tbl_shop column_max shop_name;"; Assert.assertEquals("ADD STATISTIC tbl_shop COLUMN_MAX shop_name;", SQLUtils.formatOdps(sql)); } - + public void test_column_min() throws Exception { String sql = "add statistic tbl_shop column_min shop_name;"; Assert.assertEquals("ADD STATISTIC tbl_shop COLUMN_MIN shop_name;", SQLUtils.formatOdps(sql)); } - + public void test_expression_condition() throws Exception { String sql = "add statistic tbl_shop expression_condition tbl_shop='hangzhou';"; Assert.assertEquals("ADD STATISTIC tbl_shop EXPRESSION_CONDITION tbl_shop = 'hangzhou';", SQLUtils.formatOdps(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddColumnsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddColumnsTest.java index 29685a469e..31f89cacb5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddColumnsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddColumnsTest.java @@ -25,32 +25,31 @@ import java.util.List; public class OdpsAlterTableAddColumnsTest extends TestCase { - public void test_select() throws Exception { String sql = "alter table adl_smeta_column_indi_rule_relation_sdt add columns (rule_level string);";// Assert.assertEquals("ALTER TABLE adl_smeta_column_indi_rule_relation_sdt\n" + "\tADD COLUMNS (rule_level STRING);", SQLUtils.formatOdps(sql)); Assert.assertEquals("alter table adl_smeta_column_indi_rule_relation_sdt\n" + "\tadd columns (rule_level string);", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddPartitionTest.java index 5149cb0628..bd72311c5b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddPartitionTest.java @@ -7,7 +7,6 @@ import junit.framework.TestCase; public class OdpsAlterTableAddPartitionTest extends TestCase { - public void test_if() throws Exception { String sql = "alter table sale_detail add if not exists partition (sale_date='201312', region='hangzhou');"; Assert.assertEquals("ALTER TABLE sale_detail" // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest.java index b69949f803..9ab19c1fc9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest.java @@ -25,32 +25,31 @@ import java.util.List; public class OdpsAlterTableChangeColumnTest extends TestCase { - public void test_select() throws Exception { String sql = "ALTER TABLE adl_smeta_indi_rule_relation_sdt CHANGE COLUMN indi_level COMMENT 'xxxx';";// Assert.assertEquals("ALTER TABLE adl_smeta_indi_rule_relation_sdt\n" + "\tCHANGE COLUMN indi_level COMMENT 'xxxx';", SQLUtils.formatOdps(sql)); Assert.assertEquals("alter table adl_smeta_indi_rule_relation_sdt\n" + "\tchange column indi_level comment 'xxxx';", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest2.java index 57437d88b3..7a06fc6e3e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest2.java @@ -25,32 +25,31 @@ import java.util.List; public class OdpsAlterTableChangeColumnTest2 extends TestCase { - public void test_select() throws Exception { String sql = "alter table sale_detail change column old_col_name rename to new_col_name;";// Assert.assertEquals("ALTER TABLE sale_detail\n" + "\tCHANGE COLUMN old_col_name RENAME TO new_col_name;", SQLUtils.formatOdps(sql)); Assert.assertEquals("alter table sale_detail\n" + "\tchange column old_col_name rename to new_col_name;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest3.java index 7829d75be4..241e6fe336 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest3.java @@ -25,7 +25,6 @@ import java.util.List; public class OdpsAlterTableChangeColumnTest3 extends TestCase { - public void test_select() throws Exception { String sql = "ALTER TABLE table_name CHANGE COLUMN old_col_name new_col_name bigint COMMENT column_comment;";// Assert.assertEquals("ALTER TABLE table_name\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest4.java index 10ea90f49e..edd48833b6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest4.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsAlterTableChangeColumnTest4 extends TestCase { - public void test_select() throws Exception { String sql = "ALTER TABLE table_name CHANGE COLUMN old_col_name new_col_name column_type COMMENT '';";// assertEquals("ALTER TABLE table_name\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDisableLifecycle.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDisableLifecycle.java index 0a36f88a2b..01da49c578 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDisableLifecycle.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDisableLifecycle.java @@ -7,22 +7,20 @@ import junit.framework.TestCase; public class OdpsAlterTableDisableLifecycle extends TestCase { - public void test_no_partition() throws Exception { String sql = "ALTER TABLE trans DISABLE LIFECYCLE;"; Assert.assertEquals("ALTER TABLE trans" // + "\n\tDISABLE LIFECYCLE;", SQLUtils.formatOdps(sql)); - + Assert.assertEquals("alter table trans" // - + "\n\tdisable lifecycle;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\n\tdisable lifecycle;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - public void test_has_partition() throws Exception { String sql = "ALTER TABLE trans PARTITION(dt='20141111') DISABLE LIFECYCLE;"; Assert.assertEquals("ALTER TABLE trans" + "\n\tPARTITION (dt = '20141111') DISABLE LIFECYCLE;", SQLUtils.formatOdps(sql)); - + Assert.assertEquals("alter table trans" + "\n\tpartition (dt = '20141111') disable lifecycle;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest.java index 144d1ec85c..9448c4fb28 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest.java @@ -7,15 +7,14 @@ import junit.framework.TestCase; public class OdpsAlterTableDropPartitionTest extends TestCase { - public void test_if() throws Exception { String sql = "alter table sale_detail drop if exists partition (sale_date='201312', region='hangzhou');"; Assert.assertEquals("ALTER TABLE sale_detail" // + "\n\tDROP IF EXISTS PARTITION (sale_date = '201312', region = 'hangzhou');", SQLUtils.formatOdps(sql)); Assert.assertEquals("alter table sale_detail" // - + "\n\tdrop if exists partition (sale_date = '201312', region = 'hangzhou');", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\n\tdrop if exists partition (sale_date = '201312', region = 'hangzhou');", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - + public void test_purge() throws Exception { String sql = "alter table my_log drop partition (ds='20150618') purge;"; Assert.assertEquals("ALTER TABLE my_log" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest2.java index f96576dff3..0b20c81891 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest2.java @@ -5,7 +5,6 @@ import org.junit.Assert; public class OdpsAlterTableDropPartitionTest2 extends TestCase { - public void test_if() throws Exception { String sql = "alter table myp.table2 drop if exists partition(ds=20161209) \n"; Assert.assertEquals("ALTER TABLE myp.table2\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableEnableLifecycle.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableEnableLifecycle.java index 3c0886e123..1cc85b501f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableEnableLifecycle.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableEnableLifecycle.java @@ -7,22 +7,20 @@ import junit.framework.TestCase; public class OdpsAlterTableEnableLifecycle extends TestCase { - public void test_no_partition() throws Exception { String sql = "ALTER TABLE trans ENABLE LIFECYCLE;"; Assert.assertEquals("ALTER TABLE trans" // + "\n\tENABLE LIFECYCLE;", SQLUtils.formatOdps(sql)); - + Assert.assertEquals("alter table trans" // - + "\n\tenable lifecycle;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\n\tenable lifecycle;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - public void test_has_partition() throws Exception { String sql = "ALTER TABLE trans PARTITION(dt='20141111') ENABLE LIFECYCLE;"; Assert.assertEquals("ALTER TABLE trans" + "\n\tPARTITION (dt = '20141111') ENABLE LIFECYCLE;", SQLUtils.formatOdps(sql)); - + Assert.assertEquals("alter table trans" + "\n\tpartition (dt = '20141111') enable lifecycle;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableMergeSmallFilesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableMergeSmallFilesTest.java index 10b79cfc8e..8477ff1bcb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableMergeSmallFilesTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableMergeSmallFilesTest.java @@ -5,7 +5,6 @@ import org.junit.Assert; public class OdpsAlterTableMergeSmallFilesTest extends TestCase { - public void test_touch() throws Exception { String sql = "ALTER TABLE abc_dev.tdl_mytable_xx MERGE SMALLFILES;"; Assert.assertEquals("ALTER TABLE abc_dev.tdl_mytable_xx MERGE SMALLFILES;", SQLUtils.formatOdps(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableRenamePartitionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableRenamePartitionTest.java index 7d72caf0ff..aac231bee1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableRenamePartitionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableRenamePartitionTest.java @@ -7,7 +7,6 @@ import junit.framework.TestCase; public class OdpsAlterTableRenamePartitionTest extends TestCase { - public void test_if() throws Exception { String sql = "alter table sale_detail partition (sale_date='201312', region='hangzhou')" + "\nrename to partition(sale_date='201313', region='hangzhou');"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetCommentTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetCommentTest.java index f9d6116381..63b4e3f374 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetCommentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetCommentTest.java @@ -7,10 +7,9 @@ import junit.framework.TestCase; public class OdpsAlterTableSetCommentTest extends TestCase { - public void test_if() throws Exception { String sql = "alter table sale_detail set comment 'new coments for table sale_detail';"; Assert.assertEquals("ALTER TABLE sale_detail" // - + "\n\tSET COMMENT 'new coments for table sale_detail';", SQLUtils.formatOdps(sql)); + + "\n\tSET COMMENT 'new coments for table sale_detail';", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetLifecycle.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetLifecycle.java index f5fad3b589..b515bd8fd4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetLifecycle.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetLifecycle.java @@ -7,7 +7,6 @@ import junit.framework.TestCase; public class OdpsAlterTableSetLifecycle extends TestCase { - public void test_if() throws Exception { String sql = "alter table test_lifecycle set lifecycle 50;"; Assert.assertEquals("ALTER TABLE test_lifecycle" // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableTouchTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableTouchTest.java index 3c0c503a5f..88032f3ad1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableTouchTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableTouchTest.java @@ -7,13 +7,12 @@ import junit.framework.TestCase; public class OdpsAlterTableTouchTest extends TestCase { - public void test_touch() throws Exception { String sql = "alter table test_lifecycle touch;"; Assert.assertEquals("ALTER TABLE test_lifecycle" // + "\n\tTOUCH;", SQLUtils.formatOdps(sql)); } - + public void test_touch_partition() throws Exception { String sql = "alter table test_lifecycle touch PARTITION (dt='20141111');"; Assert.assertEquals("ALTER TABLE test_lifecycle" // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterViewTest.java index 13e6de864a..279091324f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterViewTest.java @@ -7,7 +7,6 @@ import junit.framework.TestCase; public class OdpsAlterViewTest extends TestCase { - public void test_if() throws Exception { String sql = "alter view view_name rename to new_view_name;"; Assert.assertEquals("ALTER VIEW view_name RENAME TO new_view_name;", SQLUtils.formatOdps(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAnalyzeTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAnalyzeTableTest.java index b1070f8968..a9654d6039 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAnalyzeTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAnalyzeTableTest.java @@ -11,7 +11,7 @@ public void test_0() throws Exception { String sql = "analyze table t partition(pt='1') compute statistics"; Assert.assertEquals("ANALYZE TABLE t PARTITION (pt = '1') COMPUTE STATISTICS", SQLUtils.formatOdps(sql)); } - + public void test_no_partition() throws Exception { String sql = "analyze table t compute statistics"; Assert.assertEquals("ANALYZE TABLE t COMPUTE STATISTICS", SQLUtils.formatOdps(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCaseWhenTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCaseWhenTest.java index 4c59c0b636..3dcd7f4bac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCaseWhenTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCaseWhenTest.java @@ -7,7 +7,6 @@ import junit.framework.TestCase; public class OdpsCaseWhenTest extends TestCase { - public void test_if() throws Exception { String sql = "select case when f1 = 'aaa' then 1 when f1 = 'bbb' then 2 else 3 end from dual"; Assert.assertEquals("SELECT CASE " diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java index 465618651c..a473a685a0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java @@ -10,17 +10,16 @@ import com.alibaba.druid.sql.parser.Token; public class OdpsCreateTableTest extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE IF NOT EXISTS sale_detail(" // - + " shop_name STRING," // - + " customer_id STRING," // - + " total_price DOUBLE" // - + ")" // - + "comment 'xxxx'" // - + "PARTITIONED BY (sale_date STRING,region STRING)" // - + "LIFECYCLE 5" // - + ";"; + + " shop_name STRING," // + + " customer_id STRING," // + + " total_price DOUBLE" // + + ")" // + + "comment 'xxxx'" // + + "PARTITIONED BY (sale_date STRING,region STRING)" // + + "LIFECYCLE 5" // + + ";"; OdpsStatementParser parser = new OdpsStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest2.java index 87031e12c8..8efb27278b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest2.java @@ -10,7 +10,6 @@ import com.alibaba.druid.sql.parser.Token; public class OdpsCreateTableTest2 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE sale_detail as select * from dual;"; OdpsStatementParser parser = new OdpsStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest3.java index 5f1831c738..a0f8a9f948 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest3.java @@ -10,7 +10,6 @@ import com.alibaba.druid.sql.parser.Token; public class OdpsCreateTableTest3 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE sale_detail_like LIKE sale_detail;"; OdpsStatementParser parser = new OdpsStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest4.java index 234f6a149e..0c070febf0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest4.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsCreateTableTest4 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "CREATE TABLE T1 (a string, b string, c bigint) CLUSTERED BY (c) SORTED by (c) INTO 1024 BUCKETS;";// @@ -45,28 +44,27 @@ public void test_select() throws Exception { "clustered by (c)\n" + "sorted by (c)\n" + "into 1024 buckets;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(3, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest6_array.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest6_array.java index 233cb7eeb8..0ca09bf1e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest6_array.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest6_array.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsCreateTableTest6_array extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "CREATE TABLE src_thrift\n" + @@ -41,8 +40,6 @@ public void test_select() throws Exception { " -- unionField3 PropValueUnion\n" + ");";// - - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); @@ -84,5 +81,4 @@ public void test_select() throws Exception { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest7_struct.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest7_struct.java index a120e0c11e..b3aa6dc06c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest7_struct.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest7_struct.java @@ -24,13 +24,10 @@ import java.util.List; public class OdpsCreateTableTest7_struct extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "CREATE TABLE DEST3(k STRUCT, v BIGINT) STORED AS TEXTFILE;";// - - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); @@ -65,5 +62,4 @@ public void test_select() throws Exception { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java index c26d6ff587..0f6157efc7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java @@ -10,7 +10,6 @@ import junit.framework.TestCase; public class OdpsCreateViewTest extends TestCase { - public void test_create() throws Exception { String sql = "CREATE view sale_detail as select * from dual;"; OdpsStatementParser parser = new OdpsStatementParser(sql); @@ -18,11 +17,11 @@ public void test_create() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toOdpsString(stmt); Assert.assertEquals("CREATE VIEW sale_detail" // - + "\nAS" // - + "\nSELECT *" // - + "\nFROM dual;", output); + + "\nAS" // + + "\nSELECT *" // + + "\nFROM dual;", output); } - + public void test_create_or_replace() throws Exception { String sql = "CREATE or replace view sale_detail as select * from dual;"; OdpsStatementParser parser = new OdpsStatementParser(sql); @@ -30,12 +29,11 @@ public void test_create_or_replace() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toOdpsString(stmt); Assert.assertEquals("CREATE OR REPLACE VIEW sale_detail" // - + "\nAS" // - + "\nSELECT *" // - + "\nFROM dual;", output); + + "\nAS" // + + "\nSELECT *" // + + "\nFROM dual;", output); } - - + public void test_create_if_not_exists() throws Exception { String sql = "CREATE view if not exists sale_detail as select * from dual;"; OdpsStatementParser parser = new OdpsStatementParser(sql); @@ -43,11 +41,11 @@ public void test_create_if_not_exists() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toOdpsString(stmt); Assert.assertEquals("CREATE VIEW IF NOT EXISTS sale_detail" // - + "\nAS" // - + "\nSELECT *" // - + "\nFROM dual;", output); + + "\nAS" // + + "\nSELECT *" // + + "\nFROM dual;", output); } - + public void test_create_comments() throws Exception { String sql = "CREATE view if not exists sale_detail comment 'aaaa' as select * from dual;"; OdpsStatementParser parser = new OdpsStatementParser(sql); @@ -55,12 +53,12 @@ public void test_create_comments() throws Exception { parser.match(Token.EOF); String output = SQLUtils.toOdpsString(stmt); Assert.assertEquals("CREATE VIEW IF NOT EXISTS sale_detail" // - + "\nCOMMENT 'aaaa'" // - + "\nAS" // - + "\nSELECT *" // - + "\nFROM dual;", output); + + "\nCOMMENT 'aaaa'" // + + "\nAS" // + + "\nSELECT *" // + + "\nFROM dual;", output); } - + public void test_create_column_comments() throws Exception { String sql = "CREATE view if not exists sale_detail (f1 comment 'aaaa', f2 comment 'bbb') as select * from dual;"; OdpsStatementParser parser = new OdpsStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDescTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDescTest.java index c2a70bc754..a505c7e732 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDescTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDescTest.java @@ -10,7 +10,6 @@ import com.alibaba.druid.sql.parser.Token; public class OdpsDescTest extends TestCase { - public void test_0() throws Exception { String sql = "desc coupon_dataset_4_feature"; OdpsStatementParser parser = new OdpsStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDoubleQuoteTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDoubleQuoteTest.java index d4ca36ef90..1ac2209f1c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDoubleQuoteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDoubleQuoteTest.java @@ -12,7 +12,6 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; - public class OdpsDoubleQuoteTest extends TestCase { public void test_0() throws Exception { String sql = "SELECT my_udtf(1,2,3) as (a, b, c) from employee t1 WHERE t1.name = \"aaa\";"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDropViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDropViewTest.java index 1bd8b5d1e4..a2fedcc574 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDropViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDropViewTest.java @@ -22,11 +22,9 @@ import junit.framework.TestCase; public class OdpsDropViewTest extends TestCase { - public void test_column_comment() throws Exception { String sql = "drop view if exists view_name;"; Assert.assertEquals("DROP VIEW IF EXISTS view_name;", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest.java index f54e794bdc..26ad5b680a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest.java @@ -22,7 +22,7 @@ public void test_column_2_comment() throws Exception { + "\n\t, f2 -- bbb" // + "\nFROM t1", SQLUtils.formatOdps(sql)); } - + public void test_column_2_multi_comment() throws Exception { String sql = "select f1 /*aa*/" + "\n, f2 -- bbb" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest10.java index 3b8ea66932..b7d10d83cb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest10.java @@ -23,5 +23,4 @@ public void test_column_comment() throws Exception { + "\nFROM xxx;", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest11.java index c402c57d1e..8f18b9e2c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest11.java @@ -16,5 +16,4 @@ public void test_column_comment() throws Exception { + "\nf1 > 0", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest12.java index 7f3736ea24..cccc465af2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest12.java @@ -13,5 +13,4 @@ public void test_column_comment() throws Exception { + "\nFROM t -- abc", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest13.java index dcba1c7c98..eb1b299c12 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest13.java @@ -22,5 +22,4 @@ public void test_column_comment() throws Exception { + "\n\tf2 > 2 -- comment_4", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest14.java index b0b724ed9a..edb07f28c4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest14.java @@ -34,5 +34,4 @@ public void test_column_comment() throws Exception { + "\n) xx", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest15.java index 8e6de173e0..75d940f5ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest15.java @@ -18,5 +18,4 @@ public void test_column_comment() throws Exception { + "\n);", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest16.java index 959c070598..94bcdd6167 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest16.java @@ -27,5 +27,4 @@ public void test_column_comment() throws Exception { + "\n);", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest17.java index b1d541a72f..a1fc9a209e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest17.java @@ -12,5 +12,4 @@ public void test_column_comment() throws Exception { Assert.assertEquals("SET xxx = aaa;-- ssss", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest18.java index 47f0447e77..b2bd3787cd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest18.java @@ -14,7 +14,6 @@ public void test_column_comment() throws Exception { + "\n)", SQLUtils.formatOdps(sql)); } - public void test_column_comment_2() throws Exception { String sql = "create table t (f1 string comment \"xxx's\")"; Assert.assertEquals("CREATE TABLE t (" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest19.java index efaf714c45..01aece3dc1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest19.java @@ -14,5 +14,4 @@ public void test_column_comment() throws Exception { + "\nSET yyy = 123;", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest20.java index d45c1060b4..a503989384 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest20.java @@ -15,5 +15,4 @@ public void test_column_comment() throws Exception { + "\nON a.id = b.id", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest21.java index 2532a71680..e615a988eb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest21.java @@ -14,5 +14,4 @@ public void test_column_comment() throws Exception { + "\n)", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest22.java index e6b2a3c4a4..af6e51bf40 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest22.java @@ -18,11 +18,11 @@ public void test_coalesce() throws Exception { Assert.assertEquals("SELECT COALESCE(f1, f2)" + "\nFROM dual", SQLUtils.formatOdps(sql)); } + public void test_count() throws Exception { String sql = "select count(*) from dual"; Assert.assertEquals("SELECT count(*)" + "\nFROM dual", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest23.java index 2726865068..6448cc3891 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest23.java @@ -14,5 +14,5 @@ public void test_drop_table() throws Exception { Assert.assertEquals("-- xxx" + "\n-- yyy" + "\nDROP TABLE IF EXISTS mytables;", SQLUtils.formatOdps(sql)); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest24.java index 0ffdbdfde9..ec87c21135 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest24.java @@ -14,5 +14,5 @@ public void test_drop_view() throws Exception { Assert.assertEquals("-- xxx" + "\n-- yyy" + "\nDROP VIEW IF EXISTS mytables;", SQLUtils.formatOdps(sql)); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest25.java index f72999a6e7..6ce8329396 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest25.java @@ -14,5 +14,5 @@ public void test_drop_function() throws Exception { Assert.assertEquals("-- xxx" + "\n-- yyy" + "\nDROP FUNCTION IF EXISTS mytables;", SQLUtils.formatOdps(sql)); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest26.java index edc3403fbd..aaf24f8ef6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest26.java @@ -13,5 +13,5 @@ public void test_drop_function() throws Exception { + "\nAS" + "\nSELECT *" + "\nFROM dual;", SQLUtils.formatOdps(sql)); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest27.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest27.java index b121e2d2d6..d2ff71fb35 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest27.java @@ -11,5 +11,5 @@ public void test_drop_function() throws Exception { String sql = "select split(val, ',')[1] from dual"; Assert.assertEquals("SELECT SPLIT(val, ',')[1]" + "\nFROM dual", SQLUtils.formatOdps(sql)); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest28.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest28.java index 0798c8b522..41dc78005c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest28.java @@ -12,5 +12,5 @@ public void test_drop_function() throws Exception { Assert.assertEquals("SELECT pageid, adid\n" + "FROM pageAds\n" + "\tLATERAL VIEW EXPLODE(adid_list) adTable AS adid;", SQLUtils.formatOdps(sql)); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest29.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest29.java index de19f79f7a..cab9f49d61 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest29.java @@ -16,5 +16,5 @@ public void test_drop_function() throws Exception { + "\n\tcol STRING, -- 测试2" + "\n\tcol2 STRING -- 测试3" + "\n)", SQLUtils.formatOdps(sql)); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest30.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest30.java index 6f6f77fb66..4992f0eb44 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest30.java @@ -20,5 +20,5 @@ public void test_drop_function() throws Exception { + "\n\tasdasd STRING," + "\n\tasasd STRING" + "\n);", SQLUtils.formatOdps(sql)); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest4.java index 00e44def35..3c2e7ae1e9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest4.java @@ -16,8 +16,7 @@ public void test_column_comment() throws Exception { + "\n -- comment_1" // + "\ninsert overwrite table c partition(ds='20150711')" // + "\nselect f0, f1, f2" // - + "\nwhere name rlike 'kk';" - ;// + + "\nwhere name rlike 'kk';";// Assert.assertEquals("FROM (\n" + "\tSELECT *\n" + "\tFROM xxx\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest5.java index 4c3d2caba1..15afd09854 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest5.java @@ -10,8 +10,7 @@ public class OdpsFormatCommentTest5 extends TestCase { public void test_column_comment() throws Exception { String sql = "select *" // + "\nfrom t -- xxxx"// - + "\nwhere id > 0;" - ;// + + "\nwhere id > 0;";// Assert.assertEquals("SELECT *" // + "\nFROM t -- xxxx" // + "\nWHERE id > 0;", SQLUtils.formatOdps(sql)); @@ -20,21 +19,18 @@ public void test_column_comment() throws Exception { public void test_column_comment_as() throws Exception { String sql = "select *" // + "\nfrom xxxx a-- xxxx"// - + "\nwhere id > 0;" - ;// + + "\nwhere id > 0;";// Assert.assertEquals("SELECT *" // + "\nFROM xxxx a -- xxxx" // + "\nWHERE id > 0;", SQLUtils.formatOdps(sql)); } - public void test_column_comment_subquery() throws Exception { String sql = "select *" // + "\nfrom (" // + "\n-- comment_xxx" // + "\nselect * from t" // - + "\n) a;" - ;// + + "\n) a;";// Assert.assertEquals("SELECT *" // + "\nFROM (" // + "\n\t-- comment_xxx" // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest6.java index d44c039f6a..8f92bc1966 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest6.java @@ -12,13 +12,11 @@ public void test_column_comment() throws Exception { + "\nfrom t "// + "\nwhere status = '20' -- comment xxx" + "\nand flag & 127 > 0 -- comment kkkkk" - + "\n;" - ;// + + "\n;";// Assert.assertEquals("SELECT *" + "\nFROM t" + "\nWHERE status = '20' -- comment xxx" + "\n\tAND flag & 127 > 0 -- comment kkkkk;", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java index 17dc4934fd..3daf0b9405 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java @@ -10,8 +10,7 @@ public class OdpsFormatCommentTest7 extends TestCase { public void test_column_comment() throws Exception { String sql = "--这里是注释" // + "\nselect * from table1;" // - + "\nselect * from table2;;" - ;// + + "\nselect * from table2;;";// Assert.assertEquals("-- 这里是注释" + "\nSELECT *" + "\nFROM table1;" @@ -20,5 +19,4 @@ public void test_column_comment() throws Exception { + "\nFROM table2;", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest8.java index 3ec7275c7f..3defb6f7f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest8.java @@ -11,8 +11,7 @@ public void test_column_comment() throws Exception { String sql = "select * from table1;--comment1 goes here" // + "\n" // + "\nselect * from table2;;select * from table3;" // - + "\n--comment2 goes here" - ;// + + "\n--comment2 goes here";// Assert.assertEquals("SELECT *\n" + "FROM table1;\n" + "\n" + @@ -24,7 +23,7 @@ public void test_column_comment() throws Exception { "FROM table3;\n" + "\n" + "-- comment2 goes here", SQLUtils.formatOdps(sql)); - + Assert.assertEquals("select *\n" + "from table1;\n" + "\n" + @@ -38,5 +37,4 @@ public void test_column_comment() throws Exception { "-- comment2 goes here", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest9.java index 0460fbf3d3..4ad05bdbdc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest9.java @@ -15,5 +15,4 @@ public void test_column_comment() throws Exception { + "\nFROM xxx;", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatInTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatInTest.java index 74c6fc9aeb..78d920e093 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatInTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatInTest.java @@ -24,5 +24,5 @@ public void test_drop_function() throws Exception { + "\n\t'10'" + "\n)" + "", SQLUtils.formatOdps(sql)); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java index 12f4004b23..cfa444b4fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java @@ -15,7 +15,7 @@ public void test_format() throws Exception { + "\nSELECT *" // + "\nFROM t2;", SQLUtils.formatOdps(sql)); } - + public void test_no_semi() throws Exception { String sql = "select * from t1; ;select * from t2"; Assert.assertEquals("SELECT *" // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsGrantTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsGrantTest.java index b24fe6f497..e2f539a5c1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsGrantTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsGrantTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.parser.Token; public class OdpsGrantTest extends TestCase { - public void test_0() throws Exception { String sql = "grant update, Select on table adl_register_baseline_sdt to user DXP_71074213@aliyun.com"; OdpsStatementParser parser = new OdpsStatementParser(sql); @@ -34,7 +33,7 @@ public void test_0() throws Exception { String output = SQLUtils.toOdpsString(stmt); // System.out.println(output); Assert.assertEquals("GRANT UPDATE, SELECT ON TABLE adl_register_baseline_sdt TO USER DXP_71074213@aliyun.com", - output); + output); } public void test_1() throws Exception { @@ -65,7 +64,7 @@ public void test_3() throws Exception { String output = SQLUtils.toOdpsString(stmt); // System.out.println(output); Assert.assertEquals("GRANT LABEL 2 ON TABLE adl_register_baseline_sdt(c1, c2) TO USER aliyun$DXP_xxxxx@aliyun.com WITH EXP 5", - output); + output); } public void test_4() throws Exception { @@ -76,6 +75,6 @@ public void test_4() throws Exception { String output = SQLUtils.toOdpsString(stmt); // System.out.println(output); Assert.assertEquals("GRANT CreateInstance, CreateResource, CreateFunction, CreateTable, LIST ON PROJECT test_project TO ROLE worker", - output); + output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsIfTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsIfTest.java index 79a737374d..5895ffeaff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsIfTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsIfTest.java @@ -7,7 +7,6 @@ import junit.framework.TestCase; public class OdpsIfTest extends TestCase { - public void test_if() throws Exception { String sql = "select sum(if(a > 0, 1, 0)) from t1"; Assert.assertEquals("SELECT sum(IF(a > 0, 1, 0))" // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsInsertTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsInsertTest.java index 895a4ea8ba..6ba8fee2ba 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsInsertTest.java @@ -34,7 +34,6 @@ import com.alibaba.druid.util.Utils; public class OdpsInsertTest extends TestCase { - public void test_0() throws Exception { exec_test("bvt/parser/odps-2.sql"); } @@ -70,7 +69,6 @@ public void exec_test(String resource) throws Exception { } void mergValidate(String sql, String expect) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); @@ -86,5 +84,4 @@ void mergValidate(String sql, String expect) { Assert.assertEquals(expect, out.toString()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsLexerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsLexerTest.java index 4e91dbbab7..5b0ca11934 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsLexerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsLexerTest.java @@ -58,7 +58,6 @@ public void test_4() throws Exception { assertEquals("${PN}_events", lexer.stringVal()); } - public void test_error_0() throws Exception { String str = "1 `aaa\n${PN}_events"; OdpsLexer lexer = new OdpsLexer(str); @@ -76,7 +75,6 @@ public void test_error_0() throws Exception { assertEquals("${PN}_events", lexer.stringVal()); } - public void test_error_1() throws Exception { String str = "`aaa\n${PN}_events"; OdpsLexer lexer = new OdpsLexer(str); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListResourcesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListResourcesTest.java index 3361358f17..ea4b9ff05f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListResourcesTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListResourcesTest.java @@ -38,7 +38,6 @@ import com.alibaba.druid.util.Utils; public class OdpsListResourcesTest extends TestCase { - public void test_0() throws Exception { exec_test("bvt/parser/odps-3.sql"); } @@ -120,7 +119,6 @@ public void exec_test(String resource) throws Exception { } void mergValidate(String sql, String expect) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); @@ -136,6 +134,4 @@ void mergValidate(String sql, String expect) { Assert.assertEquals(expect, out.toString()); } - - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListTest.java index 531a7f9d44..e360639900 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListTest.java @@ -10,7 +10,6 @@ import com.alibaba.druid.sql.parser.Token; public class OdpsListTest extends TestCase { - public void test_0() throws Exception { String sql = "list roles"; OdpsStatementParser parser = new OdpsStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsLoadTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsLoadTest.java index 9ab96586e3..6cb499b0ab 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsLoadTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsLoadTest.java @@ -4,7 +4,6 @@ import junit.framework.TestCase; public class OdpsLoadTest extends TestCase { - public void test_load_0() throws Exception { String sql = "LOAD OVERWRITE TABLE tsv_load_tbl \n" + "FROM\n" + @@ -18,7 +17,6 @@ public void test_load_0() throws Exception { "\t'odps.text.option.delimiter' = '\t'\n" + ");", SQLUtils.formatOdps(sql)); } - public void test_load_1() throws Exception { String sql = "LOAD OVERWRITE TABLE oss_load_static_part PARTITION(ds='20190101')\n" + @@ -30,8 +28,6 @@ public void test_load_1() throws Exception { "STORED AS PARQUET;", SQLUtils.formatOdps(sql)); } - - public void test_load_2() throws Exception { String sql = "LOAD OVERWRITE TABLE oss_load_dyn_part PARTITION(ds)\n" + "FROM\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest.java index 8a61c3ea6a..15164017bd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest.java @@ -34,7 +34,6 @@ import com.alibaba.druid.util.Utils; public class OdpsMultiInsertTest extends TestCase { - public void test_0() throws Exception { exec_test("bvt/parser/odps-1.sql"); } @@ -70,7 +69,6 @@ public void exec_test(String resource) throws Exception { } void mergValidate(String sql, String expect) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); @@ -86,5 +84,4 @@ void mergValidate(String sql, String expect) { Assert.assertEquals(expect, out.toString()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest2.java index a6dccee317..547df40e79 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest2.java @@ -16,5 +16,5 @@ public void test_for_multi_insert() throws Exception { "SELECT shop_name, customer_id, total_price\n" + "INSERT OVERWRITE TABLE sale_detail_multi PARTITION (sale_date='2011', region='china')\n" + "SELECT shop_name, customer_id, total_price;", SQLUtils.formatOdps(sql)); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsReadTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsReadTest.java index 9ec268ea68..ea2654306f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsReadTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsReadTest.java @@ -7,28 +7,26 @@ import junit.framework.TestCase; public class OdpsReadTest extends TestCase { - public void test_read() throws Exception { String sql = "read sale_detail"; Assert.assertEquals("READ sale_detail", SQLUtils.formatOdps(sql)); } - - + public void test_read_column() throws Exception { String sql = "read sale_detail(f0, f1, f2) 10"; Assert.assertEquals("READ sale_detail (f0, f1, f2) 10", SQLUtils.formatOdps(sql)); } - + public void test_read_limit() throws Exception { String sql = "read sale_detail 10"; Assert.assertEquals("READ sale_detail 10", SQLUtils.formatOdps(sql)); } - + public void test_read_partition() throws Exception { String sql = "read sale_detail partition(ds='20150701')"; Assert.assertEquals("READ sale_detail PARTITION (ds = '20150701')", SQLUtils.formatOdps(sql)); } - + public void test_read_partition_limit() throws Exception { String sql = "read sale_detail partition(ds='20150701') 10"; Assert.assertEquals("READ sale_detail PARTITION (ds = '20150701') 10", SQLUtils.formatOdps(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsRemoveStatisticTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsRemoveStatisticTest.java index 89b3b7637e..a5edc20bf6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsRemoveStatisticTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsRemoveStatisticTest.java @@ -11,27 +11,27 @@ public void test_table_count() throws Exception { String sql = "remove statistic tbl_shop table_count;"; Assert.assertEquals("REMOVE STATISTIC tbl_shop TABLE_COUNT;", SQLUtils.formatOdps(sql)); } - + public void test_null_value() throws Exception { String sql = "remove statistic tbl_shop null_value shop_name;"; Assert.assertEquals("REMOVE STATISTIC tbl_shop NULL_VALUE shop_name;", SQLUtils.formatOdps(sql)); } - + public void test_column_sum() throws Exception { String sql = "remove statistic tbl_shop column_sum shop_name;"; Assert.assertEquals("REMOVE STATISTIC tbl_shop COLUMN_SUM shop_name;", SQLUtils.formatOdps(sql)); } - + public void test_column_max() throws Exception { String sql = "remove statistic tbl_shop column_max shop_name;"; Assert.assertEquals("REMOVE STATISTIC tbl_shop COLUMN_MAX shop_name;", SQLUtils.formatOdps(sql)); } - + public void test_column_min() throws Exception { String sql = "remove statistic tbl_shop column_min shop_name;"; Assert.assertEquals("REMOVE STATISTIC tbl_shop COLUMN_MIN shop_name;", SQLUtils.formatOdps(sql)); } - + public void test_expression_condition() throws Exception { String sql = "remove statistic tbl_shop expression_condition tbl_shop='hangzhou';"; Assert.assertEquals("REMOVE STATISTIC tbl_shop EXPRESSION_CONDITION tbl_shop = 'hangzhou';", SQLUtils.formatOdps(sql)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsResourceTest.java index f86730025a..a1489d8f36 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsResourceTest.java @@ -34,7 +34,6 @@ import com.alibaba.druid.util.Utils; public class OdpsResourceTest extends TestCase { - public void test_0() throws Exception { exec_test("bvt/parser/odps-0.sql"); } @@ -50,11 +49,11 @@ public void exec_test(String resource) throws Exception { String[] items = input.split("---------------------------"); String sql = items[0].trim(); String expect = null; - + if (items.length > 1) { expect = items[1].trim(); } - + OdpsStatementParser parser = new OdpsStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -74,7 +73,6 @@ public void exec_test(String resource) throws Exception { } void mergValidate(String sql, String expect) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); @@ -90,5 +88,4 @@ void mergValidate(String sql, String expect) { Assert.assertEquals(expect, out.toString()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest.java index ff453017c8..574b9538a8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest.java @@ -20,7 +20,6 @@ import org.junit.Assert; public class OdpsSelectTest extends TestCase { - public void test_distribute_by() throws Exception { String sql = "select region from sale_detail distribute by region;";// assertEquals("SELECT region" // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest10.java index 3f70b5887f..5229e491fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest10.java @@ -28,7 +28,6 @@ import junit.framework.TestCase; public class OdpsSelectTest10 extends TestCase { - public void test_select() throws Exception { String sql = "select /* + mapjoin(a) */ " + " a.name, b.fals" @@ -41,25 +40,25 @@ public void test_select() throws Exception { "from abc a\n" + "join abc1 b\n" + "on a.name = b.fals;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(2, visitor.getConditions().size()); - + Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest11.java index 34293f016b..e769161e61 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest11.java @@ -28,32 +28,31 @@ import junit.framework.TestCase; public class OdpsSelectTest11 extends TestCase { - public void test_select() throws Exception { String sql = "select 'a\\'b' from abc;";// Assert.assertEquals("SELECT 'a\\'b'" + "\nFROM abc;", SQLUtils.formatOdps(sql)); Assert.assertEquals("select 'a\\'b'" + "\nfrom abc;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest12.java index f23120d970..7aa052ba94 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest12.java @@ -28,7 +28,6 @@ import junit.framework.TestCase; public class OdpsSelectTest12 extends TestCase { - public void test_select() throws Exception { String sql = "select name, sp from abc lateral view explode(split(concat(',','1','2','3'),',')) t as sp;";// Assert.assertEquals("SELECT name, sp\n" + @@ -37,27 +36,27 @@ public void test_select() throws Exception { Assert.assertEquals("select name, sp" + "\nfrom abc" + "\n\tlateral view explode(split(concat(',', '1', '2', '3'), ',')) t as sp;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); System.out.println(stmt); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest13.java index c3acb33180..1334055d1a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest13.java @@ -28,32 +28,31 @@ import junit.framework.TestCase; public class OdpsSelectTest13 extends TestCase { - public void test_select() throws Exception { String sql = "select `name` from `abc`;";// Assert.assertEquals("SELECT `name`" + "\nFROM `abc`;", SQLUtils.formatOdps(sql)); Assert.assertEquals("select `name`" + "\nfrom `abc`;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + assertTrue(visitor.containsColumn("abc", "name")); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest14.java index 2972c843d1..1c2c0ee4cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest14.java @@ -27,32 +27,31 @@ import junit.framework.TestCase; public class OdpsSelectTest14 extends TestCase { - public void test_select() throws Exception { String sql = "SELECT split_part(content, '\\001')[1] FROM dual;";// Assert.assertEquals("SELECT split_part(content, '\\001')[1]\n" + "FROM dual;", SQLUtils.formatOdps(sql)); Assert.assertEquals("select split_part(content, '\\001')[1]\n" + "from dual;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest15.java index 02e26dda9f..609afc61d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest15.java @@ -27,32 +27,31 @@ import junit.framework.TestCase; public class OdpsSelectTest15 extends TestCase { - public void test_select() throws Exception { String sql = "SELECT '\\n' FROM dual;";// Assert.assertEquals("SELECT '\\n'" + "\nFROM dual;", SQLUtils.formatOdps(sql)); Assert.assertEquals("select '\\n'" + "\nfrom dual;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest16.java index c7ea0fa31e..ac1ecef2da 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest16.java @@ -27,32 +27,31 @@ import junit.framework.TestCase; public class OdpsSelectTest16 extends TestCase { - public void test_select() throws Exception { String sql = "SELECT \"\\n\" FROM dual;";// Assert.assertEquals("SELECT '\\n'" + "\nFROM dual;", SQLUtils.formatOdps(sql)); Assert.assertEquals("select '\\n'" + "\nfrom dual;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest17.java index b7790d72c3..cbff109d75 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest17.java @@ -25,7 +25,6 @@ import java.util.List; public class OdpsSelectTest17 extends TestCase { - public void test_select() throws Exception { String sql = "SELECT prov\n" + " , name\n" + @@ -76,25 +75,25 @@ public void test_select() throws Exception { "\t)\n" + "order by cnt desc\n" + "limit 800", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(4, visitor.getColumns().size()); Assert.assertEquals(3, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest18.java index 1f0c1d4e03..225556ccd2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest18.java @@ -25,7 +25,6 @@ import java.util.List; public class OdpsSelectTest18 extends TestCase { - public void test_select() throws Exception { String sql = "select a, b, c from tableA where a in ( select a from tableB limit 10 )";// assertEquals("SELECT a, b, c\n" + @@ -42,25 +41,25 @@ public void test_select() throws Exception { "\tfrom tableB\n" + "\tlimit 10\n" + ")", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(4, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java index 9f5e7c1d30..788a0e9ebc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java @@ -25,7 +25,6 @@ import java.util.List; public class OdpsSelectTest19 extends TestCase { - public void test_select() throws Exception { byte[] bytes = new byte[8]; putLong(bytes, 0, 1095288847322L); @@ -35,35 +34,35 @@ public void test_select() throws Exception { "FROM mytable", SQLUtils.formatOdps(sql)); Assert.assertEquals("select wm_concat(DISTINCT ',', name)\n" + "from mytable", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } static void putLong(byte[] b, int off, long val) { - b[off + 7] = (byte) (val ); - b[off + 6] = (byte) (val >>> 8); + b[off + 7] = (byte) (val); + b[off + 6] = (byte) (val >>> 8); b[off + 5] = (byte) (val >>> 16); b[off + 4] = (byte) (val >>> 24); b[off + 3] = (byte) (val >>> 32); b[off + 2] = (byte) (val >>> 40); b[off + 1] = (byte) (val >>> 48); - b[off ] = (byte) (val >>> 56); + b[off] = (byte) (val >>> 56); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest2.java index 48a03f62e0..3d2d937e62 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest2.java @@ -20,7 +20,6 @@ import org.junit.Assert; public class OdpsSelectTest2 extends TestCase { - public void test_distribute_by() throws Exception { String sql = "SELECT user_id,user_flag,cat1_id,wireless_client_type,alipay_num,last_buy_time,md5,my_udf_001('t_datax_odps2ots_resource_tcif_dmp_user_topup_d',md5) AS datax_pt FROM mytable_001 WHERE ds='20150819' DISTRIBUTE BY cast (datax_pt as BIGINT) SORT BY md5,user_id,user_flag,cat1_id,wireless_client_type";// Assert.assertEquals("SELECT user_id, user_flag, cat1_id, wireless_client_type, alipay_num\n" + @@ -31,5 +30,4 @@ public void test_distribute_by() throws Exception { "SORT BY md5, user_id, user_flag, cat1_id, wireless_client_type", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest20.java index a0bd84ff82..b40dfb15e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest20.java @@ -25,7 +25,6 @@ import java.util.List; public class OdpsSelectTest20 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "select * from a DISTRIBUTE BY b,c";// @@ -35,26 +34,25 @@ public void test_select() throws Exception { Assert.assertEquals("select *\n" + "from a\n" + "distribute by b, c", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(3, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest21.java index 9bc239a34f..9c0bf1de19 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest21.java @@ -25,7 +25,6 @@ import java.util.List; public class OdpsSelectTest21 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "select wm_concat(',', a) from values('abc', 1), (null, 2) t (a, i);";// @@ -54,5 +53,4 @@ public void test_select() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest22.java index 23b77b5fc1..f8d6ecc0b2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest22.java @@ -25,7 +25,6 @@ import java.util.List; public class OdpsSelectTest22 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "select bucket_id,sum(pv) as pv, sum(clk) as clk,sum(clk)/(sum(pv)+1e-10) as ctr,sum(ut_ad_clk) as ut_ad_clk,sum(ad_clk) as ad_clk,sum(cost) as cost\n" + @@ -132,30 +131,29 @@ public void test_select() throws Exception { "\t\tor CLK.clk > 0\n" + ") A\n" + "group by bucket_id;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); System.out.println(stmt); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); - System.out.println("coditions : " + visitor.getConditions()); - System.out.println("orderBy : " + visitor.getOrderByColumns()); - + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + assertEquals(2, visitor.getTables().size()); assertEquals(15, visitor.getColumns().size()); assertEquals(6, visitor.getConditions().size()); System.out.println(SQLUtils.formatOdps(sql)); - + assertTrue(visitor.containsColumn("alimama_algo.fund_mlr_n_chicago_user_track_distinct_shark", "item_id")); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest23.java index 5475da8613..4d0462c5fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest23.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest23 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "select * FROM dual where 1 = 1 and (2 = 2 or ( 3 = 3 and 4 = 4));";// @@ -41,28 +40,27 @@ public void test_select() throws Exception { "\tand (2 = 2\n" + "\t\tor (3 = 3\n" + "\t\t\tand 4 = 4));", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(0, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest24.java index a7d1177ca9..94d908c96f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest24.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest24 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "SELECT ta.member_id AS member_id\n" + @@ -217,5 +216,4 @@ public void test_select() throws Exception { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest25.java index f5d3a88c4d..6e78e111d7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest25.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest25 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "INSERT overwrite TABLE ids_openapp_dau_d partition(dt = '${lastday}')\n" + @@ -145,5 +144,4 @@ public void test_select() throws Exception { assertTrue(visitor.containsColumn("openapp_log_d", "dt")); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest26.java index e131ebae78..93414b6fa4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest26.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest26 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "select count(distinct(trackid)) as total , process ,value5 as result\n" + @@ -73,28 +72,27 @@ public void test_select() throws Exception { "\t)\n" + "group by process, \n" + "\tvalue5", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(6, visitor.getColumns().size()); assertEquals(3, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest27.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest27.java index 5305780bbb..a32203c65e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest27.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest27 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "select case when aaa < 0.1 then 2 else 1 end as abc\n" + @@ -40,28 +39,27 @@ public void test_select() throws Exception { "\t\telse 1\n" + "\tend as abc\n" + "from bigdata_xy.dual;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertEquals(1, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest28.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest28.java index f032894035..bb3df80415 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest28.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest28 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "-- 注释\n" + @@ -34,28 +33,27 @@ public void test_select() throws Exception { assertEquals("-- 注释\n" + "read bigdata_xy.dual 10;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest29.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest29.java index 8a356c3bdf..fdbc1bf499 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest29.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest29 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "--aaaaa\n" + @@ -41,28 +40,27 @@ public void test_select() throws Exception { "select * -- hhhhh\n" + "from emp e\n" + "left outer join emp_datahub", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(2, visitor.getTables().size()); assertEquals(2, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest3.java index ed9a3fb3ff..4ee8453756 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest3.java @@ -22,12 +22,10 @@ import junit.framework.TestCase; public class OdpsSelectTest3 extends TestCase { - public void test_distribute_by() throws Exception { String sql = "select RANK() OVER (PARTITION BY ui ORDER BY duration DESC) rank from dual";// Assert.assertEquals("SELECT RANK() OVER (PARTITION BY ui ORDER BY duration DESC) AS rank" + "\nFROM dual", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest30.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest30.java index cb0c4cb016..06c576f5ac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest30.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest30 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "select a/100.0 from dual where 1=1;";// @@ -35,28 +34,27 @@ public void test_select() throws Exception { assertEquals("select a / 100.0\n" + "from dual\n" + "where 1 = 1;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(0, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest31.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest31.java index 950da6be17..d9d684c322 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest31.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest31 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = " select a, b, c from tdl_${bizdate} where 1=1;";// @@ -35,28 +34,27 @@ public void test_select() throws Exception { assertEquals("select a, b, c\n" + "from tdl_${bizdate}\n" + "where 1 = 1;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(3, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java index e764efac48..dcbb64ca27 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest32 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "SELECT * from mytable1 a LEFT SEMI JOIN mytable2 b on a.id=b.id;";// @@ -37,28 +36,27 @@ public void test_select() throws Exception { "from mytable1 a\n" + "left semi join mytable2 b\n" + "on a.id = b.id;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(2, visitor.getTables().size()); assertEquals(4, visitor.getColumns().size()); assertEquals(2, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java index b18c660826..88ebab3443 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest33 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "SELECT * from mytable1 a LEFT ANTI JOIN mytable2 b on a.id=b.id;";// @@ -37,28 +36,27 @@ public void test_select() throws Exception { "from mytable1 a\n" + "left anti join mytable2 b\n" + "on a.id = b.id;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(2, visitor.getTables().size()); assertEquals(4, visitor.getColumns().size()); assertEquals(2, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest34.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest34.java index 1c9a546529..0ca8a8aeef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest34.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest34 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "select a.city, a.car_id, a.rrc_id, a.brand, a.car_series, a.title\n" + @@ -48,28 +47,27 @@ public void test_select() throws Exception { "\tand model_id = 4419\n" + "\tand abs(datediff(licensed_date, '2013-07-01 00:00:00', 'mm')) <= 5\n" + "\tand abs(mileage - 7.01) < 3;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(10, visitor.getColumns().size()); assertEquals(2, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest35.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest35.java index e4f859a58f..04d0a981e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest35.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest35.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest35 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "SELECT a.city, a.car_id, a.rrc_id, a.brand, a.car_series\n" + @@ -46,28 +45,27 @@ public void test_select() throws Exception { "where status = 'PUBLISHED'\n" + "\tand model_id = 4419\n" + "\tand abs(datediff(licensed_date, '2013-07-01 00:00:00', 'mm')) <= 5;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(1, visitor.getTables().size()); assertEquals(9, visitor.getColumns().size()); assertEquals(2, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest36.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest36.java index 9726cda3fc..30caf33156 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest36.java @@ -24,7 +24,6 @@ import java.util.List; public class OdpsSelectTest36 extends TestCase { - public void test_select() throws Exception { // 1095288847322 String sql = "select *\n" + @@ -46,28 +45,27 @@ public void test_select() throws Exception { ")\n" + "union all\n" + "select 2;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); // System.out.println(SQLUtils.formatOdps(sql)); - + // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest4.java index 963b08027b..97d2347072 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest4.java @@ -20,7 +20,6 @@ import org.junit.Assert; public class OdpsSelectTest4 extends TestCase { - public void test_distribute_by() throws Exception { String sql = "select total_day_cnt * EXP(-datediff(to_date('20150819', 'yyyymmdd'), last_time, 'dd') / 60) from dual";// Assert.assertEquals("SELECT total_day_cnt * EXP((-datediff(TO_DATE('20150819', 'yyyymmdd'), last_time, 'dd')) / 60)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest5.java index a43907f425..8429e53d62 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest5.java @@ -22,7 +22,6 @@ import junit.framework.TestCase; public class OdpsSelectTest5 extends TestCase { - public void test_distribute_by() throws Exception { String sql = "select * from t where ds='20160303' and hour in ('18') ";// Assert.assertEquals("SELECT *" @@ -30,5 +29,5 @@ public void test_distribute_by() throws Exception { + "\nWHERE ds = '20160303'" + "\n\tAND hour IN ('18')", SQLUtils.formatOdps(sql)); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest6.java index 91650078eb..b34754d90f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest6.java @@ -27,30 +27,29 @@ import junit.framework.TestCase; public class OdpsSelectTest6 extends TestCase { - public void test_select() throws Exception { String sql = "select true from abc";// Assert.assertEquals("SELECT true" + "\nFROM abc", SQLUtils.formatOdps(sql)); Assert.assertEquals("select true" + "\nfrom abc", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest7.java index 91d291a6db..c5b6106c78 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest7.java @@ -28,32 +28,31 @@ import junit.framework.TestCase; public class OdpsSelectTest7 extends TestCase { - public void test_select() throws Exception { String sql = "select name as close from abc";// Assert.assertEquals("SELECT name AS close" + "\nFROM abc", SQLUtils.formatOdps(sql)); Assert.assertEquals("select name as close" + "\nfrom abc", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest8.java index 8cd88324ff..e7e6963181 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest8.java @@ -28,7 +28,6 @@ import junit.framework.TestCase; public class OdpsSelectTest8 extends TestCase { - public void test_select() throws Exception { String sql = "select * from (select * from abc limit 1) a;";// Assert.assertEquals("SELECT *" @@ -43,25 +42,25 @@ public void test_select() throws Exception { + "\n\tfrom abc" + "\n\tlimit 1" + "\n) a;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "*"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest9.java index 61b68acabc..6ceae57240 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest9.java @@ -28,32 +28,31 @@ import junit.framework.TestCase; public class OdpsSelectTest9 extends TestCase { - public void test_select() throws Exception { String sql = "select name as cross from abc";// Assert.assertEquals("SELECT name AS cross" + "\nFROM abc", SQLUtils.formatOdps(sql)); Assert.assertEquals("select name as cross" + "\nfrom abc", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_mapjoin.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_mapjoin.java index 25384847ef..fb2223b5cc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_mapjoin.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_mapjoin.java @@ -22,7 +22,6 @@ import junit.framework.TestCase; public class OdpsSelectTest_mapjoin extends TestCase { - public void test_column_comment() throws Exception { String sql = " select /* + mapjoin(a) */" + "\na.shop_name," @@ -37,5 +36,4 @@ public void test_column_comment() throws Exception { "\tAND b.ds = '20150101';", SQLUtils.formatOdps(sql)); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows.java index 6294c5b668..15e51a3751 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows.java @@ -25,32 +25,31 @@ import java.util.List; public class OdpsSelectTest_over_rows extends TestCase { - public void test_select() throws Exception { String sql = "SELECT sum(c) over(order by ds rows 9999 preceding) s, ds FROM t1";// assertEquals("SELECT sum(c) OVER (ORDER BY ds ROWS 9999 PRECEDING) AS s, ds\n" + "FROM t1", SQLUtils.formatOdps(sql)); Assert.assertEquals("select sum(c) over (order by ds rows 9999 preceding) as s, ds\n" + "from t1", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_1.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_1.java index 19360ab328..257e151d4a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_1.java @@ -25,7 +25,6 @@ import java.util.List; public class OdpsSelectTest_over_rows_1 extends TestCase { - public void test_select() throws Exception { String sql = "select last_name, first_name, department_id, hire_date, salary,\n" + " SUM (salary)\n" + @@ -43,25 +42,25 @@ public void test_select() throws Exception { "from employee\n" + "order by department_id, \n" + "\thire_date;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(5, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_2.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_2.java index 9591524101..91b55fb00c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_2.java @@ -25,7 +25,6 @@ import java.util.List; public class OdpsSelectTest_over_rows_2 extends TestCase { - public void test_select() throws Exception { String sql = "select last_name, first_name, department_id, hire_date, salary,\n" + " SUM (salary)\n" + @@ -46,25 +45,25 @@ public void test_select() throws Exception { "from employee\n" + "order by department_id, \n" + "\thire_date;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(5, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_3.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_3.java index 6c513b8783..925a246ce2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_3.java @@ -25,32 +25,31 @@ import java.util.List; public class OdpsSelectTest_over_rows_3 extends TestCase { - public void test_select() throws Exception { String sql = "SELECT sum(c) over(order by ds rows current row) s, ds FROM t1";// Assert.assertEquals("SELECT sum(c) OVER (ORDER BY ds ROWS CURRENT ROW) AS s, ds\n" + "FROM t1", SQLUtils.formatOdps(sql)); Assert.assertEquals("select sum(c) over (order by ds rows current row) as s, ds\n" + "from t1", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_4.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_4.java index c2bb5546f3..bfaf05ea21 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_4.java @@ -25,32 +25,31 @@ import java.util.List; public class OdpsSelectTest_over_rows_4 extends TestCase { - public void test_select() throws Exception { String sql = "SELECT sum(c) over(order by ds rows UNBOUNDED PRECEDING) s, ds FROM t1";// Assert.assertEquals("SELECT sum(c) OVER (ORDER BY ds ROWS UNBOUNDED PRECEDING) AS s, ds\n" + "FROM t1", SQLUtils.formatOdps(sql)); Assert.assertEquals("select sum(c) over (order by ds rows unbounded preceding) as s, ds\n" + "from t1", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_5.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_5.java index 23e4365c8e..9227bf386a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_5.java @@ -25,32 +25,31 @@ import java.util.List; public class OdpsSelectTest_over_rows_5 extends TestCase { - public void test_select() throws Exception { String sql = "SELECT sum(c) over(order by ds rows UNBOUNDED following) s, ds FROM t1";// Assert.assertEquals("SELECT sum(c) OVER (ORDER BY ds ROWS UNBOUNDED FOLLOWING) AS s, ds\n" + "FROM t1", SQLUtils.formatOdps(sql)); Assert.assertEquals("select sum(c) over (order by ds rows unbounded following) as s, ds\n" + "from t1", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); Assert.assertEquals(1, statementList.size()); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ODPS); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelect_distribute_by_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelect_distribute_by_Test.java index 07017519c4..2ebde19ad9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelect_distribute_by_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelect_distribute_by_Test.java @@ -34,7 +34,6 @@ import com.alibaba.druid.util.Utils; public class OdpsSelect_distribute_by_Test extends TestCase { - public void test_0() throws Exception { exec_test("bvt/parser/odps-1.sql"); exec_test("bvt/parser/odps-2.sql"); @@ -72,7 +71,6 @@ public void exec_test(String resource) throws Exception { } void mergValidate(String sql, String expect) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); @@ -88,5 +86,4 @@ void mergValidate(String sql, String expect) { Assert.assertEquals(expect, out.toString()); } - } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest.java index 7b3d11f5e8..5b34b5bfb8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest.java @@ -10,13 +10,12 @@ import com.alibaba.druid.sql.parser.Token; public class OdpsSetLabelTest extends TestCase { - public void test_odps() throws Exception { String sql = "SET LABEL S3 TO USER aliyun$abc@alibaba-inc.com"; OdpsStatementParser parser = new OdpsStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("SET LABEL S3 TO USER aliyun$abc@alibaba-inc.com", SQLUtils.toOdpsString(stmt)); Assert.assertEquals("set label S3 to user aliyun$abc@alibaba-inc.com", SQLUtils.toOdpsString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest2.java index dcae45ffb5..1be755a241 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest2.java @@ -10,7 +10,6 @@ import com.alibaba.druid.sql.parser.Token; public class OdpsSetLabelTest2 extends TestCase { - public void test_odps() throws Exception { String sql = "SET LABEL S3 TO TABLE xx(f1,f2)"; OdpsStatementParser parser = new OdpsStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowGrantsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowGrantsTest.java index d251a17731..ea8c53122b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowGrantsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowGrantsTest.java @@ -10,7 +10,6 @@ import com.alibaba.druid.sql.parser.Token; public class OdpsShowGrantsTest extends TestCase { - public void test_0() throws Exception { String sql = "show grants for aliyun$DXP_XXXX@aliyun.com"; OdpsStatementParser parser = new OdpsStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowPartitionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowPartitionsTest.java index 0a8c8dd31f..5149cf7eae 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowPartitionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowPartitionsTest.java @@ -10,7 +10,6 @@ import com.alibaba.druid.sql.parser.Token; public class OdpsShowPartitionsTest extends TestCase { - public void test_0() throws Exception { String sql = "show partitions secods.xxx"; OdpsStatementParser parser = new OdpsStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowStatisticTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowStatisticTest.java index f27b041abe..3b416d3b4d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowStatisticTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowStatisticTest.java @@ -10,7 +10,6 @@ import com.alibaba.druid.sql.parser.Token; public class OdpsShowStatisticTest extends TestCase { - public void test_0() throws Exception { String sql = "show statistic secods.xxx"; OdpsStatementParser parser = new OdpsStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowTablesTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowTablesTest0.java index 9a63a45e22..38dc7c66bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowTablesTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowTablesTest0.java @@ -10,7 +10,6 @@ import com.alibaba.druid.sql.parser.Token; public class OdpsShowTablesTest0 extends TestCase { - public void test_0() throws Exception { String sql = "show tables"; OdpsStatementParser parser = new OdpsStatementParser(sql); @@ -19,23 +18,23 @@ public void test_0() throws Exception { String output = SQLUtils.toOdpsString(stmt); Assert.assertEquals("SHOW TABLES", output); } - + public void test_from() throws Exception { String sql = "show tables from xx"; OdpsStatementParser parser = new OdpsStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("SHOW TABLES FROM xx", SQLUtils.toOdpsString(stmt)); Assert.assertEquals("show tables from xx", SQLUtils.toOdpsString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - + public void test_from_like() throws Exception { String sql = "show tables from xx like '*'"; OdpsStatementParser parser = new OdpsStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - + Assert.assertEquals("SHOW TABLES FROM xx LIKE '*'", SQLUtils.toOdpsString(stmt)); Assert.assertEquals("show tables from xx like '*'", SQLUtils.toOdpsString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDFTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDFTest.java index 3c26f99dd4..8f5684c512 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDFTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDFTest.java @@ -7,7 +7,6 @@ import junit.framework.TestCase; public class OdpsUDFTest extends TestCase { - public void test_if() throws Exception { String sql = "select secods:ip_region('192.168.1.1', 'city') from dual"; Assert.assertEquals("SELECT secods:ip_region('192.168.1.1', 'city')" // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDTFTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDTFTest.java index e4649940c3..f23867944e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDTFTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDTFTest.java @@ -12,7 +12,6 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; - public class OdpsUDTFTest extends TestCase { public void test_0() throws Exception { String sql = "SELECT my_udtf(1,2,3) as (a, b, c) from employee t1 WHERE t1.name = 'aaa';"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportColumnsTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportColumnsTest0.java index 26473f7744..fa259958d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportColumnsTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportColumnsTest0.java @@ -5,7 +5,6 @@ import junit.framework.TestCase; public class ExportColumnsTest0 extends TestCase { - private ExportColumns udf = new ExportColumns(); public void test_0() throws Exception { @@ -14,7 +13,7 @@ public void test_0() throws Exception { + "\n FROM fund_base_cv_ad_auction_ocr_pv_tfs a" + "\n JOIN fund_base_cv_ad_auction_ocr_pv_tfs_ocr b ON a.tfs = b.tfs" + "\n WHERE a.ds=20150819 and b.ds=20150819;"; - + udf.evaluate(sql, "odps"); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest.java index c99b6d2ae6..092f0c2465 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest.java @@ -5,15 +5,14 @@ import junit.framework.TestCase; public class ExportSelectListColumnsTest extends TestCase { - private ExportSelectListColumns udf = new ExportSelectListColumns(); public void test_0() throws Exception { String sql = "SELECT fund_base_cv_creative_ocr_judge_control_words_1422189630695(a.tfs, b.ocr_text, a.cates)" - + "\n AS (tfs, control_word, ocr_word, control_type, cates)" - + "\n FROM fund_base_cv_ad_auction_ocr_pv_tfs a" - + "\n JOIN fund_base_cv_ad_auction_ocr_pv_tfs_ocr b ON a.tfs = b.tfs" - + "\n WHERE a.ds=20150819 and b.ds=20150819;"; + + "\n AS (tfs, control_word, ocr_word, control_type, cates)" + + "\n FROM fund_base_cv_ad_auction_ocr_pv_tfs a" + + "\n JOIN fund_base_cv_ad_auction_ocr_pv_tfs_ocr b ON a.tfs = b.tfs" + + "\n WHERE a.ds=20150819 and b.ds=20150819;"; System.out.println(udf.evaluate(sql, "odps")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest2.java index 24e5cecdf3..cb6f0e71bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest2.java @@ -7,7 +7,6 @@ import junit.framework.TestCase; public class ExportSelectListColumnsTest2 extends TestCase { - private ExportSelectListColumns udf = new ExportSelectListColumns(); public void test_0() throws Exception { @@ -16,9 +15,8 @@ public void test_0() throws Exception { + "\n WHERE ds=20150819"; String text = udf.evaluate(sql, "odps"); - - Assert.assertEquals("fund_base_cv_ad_auction_ocr_pv_tfs.*", text); + Assert.assertEquals("fund_base_cv_ad_auction_ocr_pv_tfs.*", text); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/CallTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/CallTest.java index 0623534d27..7e0a66fcb2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/CallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/CallTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; public class CallTest extends TestCase { - public void test_select() throws Exception { String sql = "call dbms_session.set_identifier('nfs_special_syncview')"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/CursorTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/CursorTest.java index 61b909d61d..38f719bf32 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/CursorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/CursorTest.java @@ -23,10 +23,9 @@ import com.alibaba.druid.sql.test.TestUtils; public class CursorTest extends TestCase { - public void test_cursor() throws Exception { String sql = "SELECT department_name, CURSOR(SELECT salary, commission_pct FROM employees e WHERE e.department_id = d.department_id) " - + "FROM departments d;"; + + "FROM departments d;"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); @@ -34,7 +33,7 @@ public void test_cursor() throws Exception { String text = TestUtils.outputOracle(stmt); Assert.assertEquals("SELECT department_name, CURSOR(\n\t\tSELECT salary, commission_pct\n" + "\t\tFROM employees e\n" - + "\t\tWHERE e.department_id = d.department_id\n\t)\n" + "FROM departments d;", text); + + "\t\tWHERE e.department_id = d.department_id\n\t)\n" + "FROM departments d;", text); System.out.println(text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java index ae95022863..9f04bc1134 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; public class LargeOrTest extends TestCase { - public void test_largeOr() throws Exception { StringBuffer buf = new StringBuffer(); buf.append("SELECT 1 FROM T WHERE ID = ?"); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/MergeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/MergeTest.java index 547f5749f3..f0d6bfce2b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/MergeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/MergeTest.java @@ -22,7 +22,6 @@ import com.alibaba.druid.util.JdbcUtils; public class MergeTest extends TestCase { - public void test_mergeCall() throws Exception { String sql = "{ call INTERFACE_DATA_EXTRACTION.INVOICE_INFO(?,?,?)}"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java index 23354da7a9..976ba541bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class OracleAnalyticTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT last_name, salary, STDDEV(salary) OVER (ORDER BY hire_date) \"StdDev\" " + "FROM employees " + "WHERE department_id = 30;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnyTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnyTest.java index 3346e8e50a..60510869bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnyTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnyTest.java @@ -23,17 +23,16 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleAnyTest extends TestCase { - public void test_any() throws Exception { String sql = "SELECT country, prod, year, s FROM sales_view " + "MODEL PARTITION BY (country) " - + "DIMENSION BY (prod, year) MEASURES (sale s) " + "IGNORE NAV " - + "UNIQUE DIMENSION RULES UPSERT SEQUENTIAL ORDER (s[ANY, 2000] = 0) " - + "ORDER BY country, prod, year;"; + + "DIMENSION BY (prod, year) MEASURES (sale s) " + "IGNORE NAV " + + "UNIQUE DIMENSION RULES UPSERT SEQUENTIAL ORDER (s[ANY, 2000] = 0) " + + "ORDER BY country, prod, year;"; String expect = "SELECT country, prod, year, s\n" + "FROM sales_view\n" + "MODEL\n" - + "\tPARTITION BY (country)\n" + "\tDIMENSION BY (prod, year)\n" + "\tMEASURES (sale s)\n" - + "\tIGNORE NAV\n" + "\tUNIQUE DIMENSION\n" - + "\tRULES UPSERT SEQUENTIAL ORDER (s[ANY, 2000] = 0)\n" + "ORDER BY country, prod, year;"; + + "\tPARTITION BY (country)\n" + "\tDIMENSION BY (prod, year)\n" + "\tMEASURES (sale s)\n" + + "\tIGNORE NAV\n" + "\tUNIQUE DIMENSION\n" + + "\tRULES UPSERT SEQUENTIAL ORDER (s[ANY, 2000] = 0)\n" + "ORDER BY country, prod, year;"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java index b1b8d58d49..41cfe6c803 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleCallTest extends OracleTest { - public void test_0() throws Exception { String sql = "call ORACLE_OCM.MGMT_CONFIG.collect_config ( )"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest2.java index b3dd242ea6..fd7ee84e3f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest2.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleCallTest2 extends OracleTest { - public void test_0() throws Exception { String sql = "{?= call FUNC_QUERY_DEPT(?,?)}"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest.java index 5f7bab4fea..e80fbdba50 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest.java @@ -26,11 +26,10 @@ import com.alibaba.druid.stat.TableStat; public class OracleDeleteTest extends OracleTest { - public void test_0() throws Exception { String sql = "delete from BILLING_LOG_MONITOR log where log.guid in (" + // - "'wb_xinmin.zhao_test121','wb_xinmin.zhao_test122'" + // - ",'wb_xinmin.zhao_test123','wb_xinmin.zhao_test124'" + ")"; + "'wb_xinmin.zhao_test121','wb_xinmin.zhao_test122'" + // + ",'wb_xinmin.zhao_test123','wb_xinmin.zhao_test124'" + ")"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -51,10 +50,10 @@ public void test_0() throws Exception { Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("BILLING_LOG_MONITOR"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("BILLING_LOG_MONITOR"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); // - Assert.assertTrue(visitor.containsColumn("BILLING_LOG_MONITOR", "guid")); + Assert.assertTrue(visitor.containsColumn("BILLING_LOG_MONITOR", "guid")); // Assert.assertTrue(visitor.containsColumn("employees", "salary")); // Assert.assertTrue(visitor.containsColumn("employees", "commission_pct")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_1.java index 77673ee81d..ab55dc550d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_1.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class OracleDeleteTest_1 extends OracleTest { - public void test_0() throws Exception { String sql = "delete fromm xx"; @@ -48,7 +47,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("fromm"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("fromm"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); // // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("fromm", "guid"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_2.java index 631eefc74d..032261eda7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_2.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleDeleteTest_2 extends OracleTest { - public void test_0() throws Exception { String sql = "DELETE FROM (SELECT * FROM ABC WHERE ID=6000)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_3.java index 8a2aff7ce0..6388543572 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_3.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleDeleteTest_3 extends OracleTest { - public void test_0() throws Exception { String sql = "delete from credit_corp_baseinfo o where o.applyid in(24032,23942,23579,23511,23408,23327,23322,23230,23228,23218);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropDbLinkTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropDbLinkTest.java index 8f8ba2e04a..984287d27f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropDbLinkTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropDbLinkTest.java @@ -27,10 +27,9 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleDropDbLinkTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "DROP PUBLIC DATABASE LINK remote"; + "DROP PUBLIC DATABASE LINK remote"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -38,7 +37,7 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals("DROP PUBLIC DATABASE LINK remote", - SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statement.accept(visitor); @@ -48,7 +47,7 @@ public void test_0() throws Exception { public void test_1() throws Exception { String sql = // - "DROP DATABASE LINK local;"; + "DROP DATABASE LINK local;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -56,7 +55,7 @@ public void test_1() throws Exception { print(statementList); Assert.assertEquals("DROP DATABASE LINK local;", - SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statement.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropIndexTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropIndexTest.java index c4556944c1..dd84334e32 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropIndexTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropIndexTest.java @@ -27,10 +27,9 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleDropIndexTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "DROP INDEX async_m_s_snapshot_id"; + "DROP INDEX async_m_s_snapshot_id"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -38,7 +37,7 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals("DROP INDEX async_m_s_snapshot_id", - SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statement.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropSequenceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropSequenceTest.java index 89e7278419..37fc34c1f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropSequenceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropSequenceTest.java @@ -28,10 +28,9 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleDropSequenceTest extends OracleTest { - public void test_types() throws Exception { String sql = // - "DROP SEQUENCE oe.customers_seq"; + "DROP SEQUENCE oe.customers_seq"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest.java index 4e56f33740..3826578d2a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest.java @@ -27,10 +27,9 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleDropTableTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "DROP TABLE list_customers PURGE"; + "DROP TABLE list_customers PURGE"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -39,7 +38,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("DROP TABLE list_customers PURGE", - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest2.java index ef77ca39f4..44294cef10 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest2.java @@ -27,10 +27,9 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleDropTableTest2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "DROP TABLE list_customers CASCADE CONSTRAINTS"; + "DROP TABLE list_customers CASCADE CONSTRAINTS"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -39,7 +38,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("DROP TABLE list_customers CASCADE CONSTRAINTS", - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTriggerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTriggerTest.java index 77529e3f8c..a45cff54d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTriggerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTriggerTest.java @@ -27,10 +27,9 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleDropTriggerTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "DROP TRIGGER hr.salary_check; "; + "DROP TRIGGER hr.salary_check; "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -39,7 +38,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("DROP TRIGGER hr.salary_check;", - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropUserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropUserTest.java index 86d8c194c9..f590174962 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropUserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropUserTest.java @@ -27,10 +27,9 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleDropUserTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "DROP USER sidney; "; + "DROP USER sidney; "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -39,7 +38,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("DROP USER sidney;", - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropViewTest.java index 3f70a481be..bbda767102 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropViewTest.java @@ -27,10 +27,9 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleDropViewTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "DROP view list_customers CASCADE CONSTRAINTS"; + "DROP view list_customers CASCADE CONSTRAINTS"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -38,7 +37,7 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals("DROP VIEW list_customers CASCADE CONSTRAINTS", - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest.java index 65dd9bd93b..519a6be062 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleEXTRACTTest extends TestCase { - public void test_Extract() throws Exception { String sql = "SELECT EXTRACT(YEAR FROM DATE '1998-03-07') FROM DUAL;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest2.java index 8eedaa9404..20e1e50679 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest2.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class OracleEXTRACTTest2 extends TestCase { - public void test_Extract() throws Exception { String sql = "SELECT warehouse_name, EXTRACT(warehouse_spec, '/Warehouse/Docks')\n" + " \"Number of Docks\"\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java index 630847c5bf..1cc3b6514d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleExplainTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "EXPLAIN PLAN SET STATEMENT_ID='PLUS19628905' FOR select * from( select row_.*, rownum rownum_ from( SELECT h.id taskId, t.id tradeId, t.OUT_ORDER_ID orderId, t.SELLER_SEQ sellerSeq, t.BUYER_SEQ buyerSeq, h.RECORD_TYPE recordType, t.SELLER_LOGIN_ID sellerLoginId, t.SELLER_ADMIN_SEQ sellerAdminSeq, h.GMT_CREATE gmtTaskCreate, h.GMT_MODIFIED gmtTaskModified, h.GMT_FETCH_TASK gmtFetchTask, h.GMT_FINISH_TASK gmtFinishTask, h.STATUS status, h.OWNER owner FROM HT_TASK_TRADE_HISTORY h, escrow_trade t WHERE h.TRADE_ID= t.ID and h.OWNER='zhoufei.zhangzf' and h.STATUS in('running') ORDER BY h.TASK_FLOW_LEVEL, t.GMT_CREATE, h.GMT_MODIFIED DESC) row_ where rownum<= 100) where rownum_>= 80"; + "EXPLAIN PLAN SET STATEMENT_ID='PLUS19628905' FOR select * from( select row_.*, rownum rownum_ from( SELECT h.id taskId, t.id tradeId, t.OUT_ORDER_ID orderId, t.SELLER_SEQ sellerSeq, t.BUYER_SEQ buyerSeq, h.RECORD_TYPE recordType, t.SELLER_LOGIN_ID sellerLoginId, t.SELLER_ADMIN_SEQ sellerAdminSeq, h.GMT_CREATE gmtTaskCreate, h.GMT_MODIFIED gmtTaskModified, h.GMT_FETCH_TASK gmtFetchTask, h.GMT_FINISH_TASK gmtFinishTask, h.STATUS status, h.OWNER owner FROM HT_TASK_TRADE_HISTORY h, escrow_trade t WHERE h.TRADE_ID= t.ID and h.OWNER='zhoufei.zhangzf' and h.STATUS in('running') ORDER BY h.TASK_FLOW_LEVEL, t.GMT_CREATE, h.GMT_MODIFIED DESC) row_ where rownum<= 100) where rownum_>= 80"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java index 54723df0aa..1a098a2fa7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java @@ -25,17 +25,16 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleExplainTest2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "EXPLAIN PLAN " + // - " SET STATEMENT_ID = 'Raise in Tokyo' " + // - " INTO plan_table " + // - " FOR UPDATE employees " + // - " SET salary = salary * 1.10 " + // - " WHERE department_id = " + // - " (SELECT department_id FROM departments" + // - " WHERE location_id = 1700); "; + "EXPLAIN PLAN " + // + " SET STATEMENT_ID = 'Raise in Tokyo' " + // + " INTO plan_table " + // + " FOR UPDATE employees " + // + " SET salary = salary * 1.10 " + // + " WHERE department_id = " + // + " (SELECT department_id FROM departments" + // + " WHERE location_id = 1700); "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest3.java index e0127e568a..31dfac9038 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest3.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleExplainTest3 extends OracleTest { - public void test_0() throws Exception { String sql = // - "explain plan for select 'enaliint'||m.login_id from vaccount v, company c, member m where m.company_id = c.id and v.id = c.id and v.status = 'enabled' and (v.service_type = 'cgs' or v.service_type = 'tp' or v.service_type = 'hkgs' or v.service_type = 'twgs') and m.company_id > 0 and m.status = 'enabled' and m.gmt_create > c.gmt_modified"; + "explain plan for select 'enaliint'||m.login_id from vaccount v, company c, member m where m.company_id = c.id and v.id = c.id and v.status = 'enabled' and (v.service_type = 'cgs' or v.service_type = 'tp' or v.service_type = 'hkgs' or v.service_type = 'twgs') and m.company_id > 0 and m.status = 'enabled' and m.gmt_create > c.gmt_modified"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest.java index 63831888cc..b9f735946e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest.java @@ -23,12 +23,11 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleFlashbackQueryTest extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT salary FROM employees AS OF TIMESTAMP (SYSTIMESTAMP - INTERVAL '1' DAY) WHERE last_name = 'Chung';"; String expect = "SELECT salary\n" + "FROM employees\n" + "AS OF TIMESTAMP (SYSTIMESTAMP - INTERVAL '1' DAY)\n" - + "WHERE last_name = 'Chung';"; + + "WHERE last_name = 'Chung';"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest2.java index 55c8ffedb3..1b1aafac19 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest2.java @@ -23,16 +23,15 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleFlashbackQueryTest2 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT salary FROM employees\n" - + "VERSIONS BETWEEN TIMESTAMP SYSTIMESTAMP - INTERVAL '10' MINUTE AND SYSTIMESTAMP - INTERVAL '1' MINUTE\n" - + "WHERE last_name = 'Chung';"; + + "VERSIONS BETWEEN TIMESTAMP SYSTIMESTAMP - INTERVAL '10' MINUTE AND SYSTIMESTAMP - INTERVAL '1' MINUTE\n" + + "WHERE last_name = 'Chung';"; String expect = "SELECT salary\n" - + "FROM employees\n" - + "VERSIONS BETWEEN TIMESTAMP (SYSTIMESTAMP - INTERVAL '10' MINUTE) AND SYSTIMESTAMP - INTERVAL '1' MINUTE\n" - + "WHERE last_name = 'Chung';"; + + "FROM employees\n" + + "VERSIONS BETWEEN TIMESTAMP (SYSTIMESTAMP - INTERVAL '10' MINUTE) AND SYSTIMESTAMP - INTERVAL '1' MINUTE\n" + + "WHERE last_name = 'Chung';"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest3.java index 2869bb9dd2..2a0f978690 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest3.java @@ -23,12 +23,11 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleFlashbackQueryTest3 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT DECODE(GROUPING(department_name), 1, 'All Departments', department_name) AS department," - + "DECODE(GROUPING(job_id), 1, 'All Jobs', job_id) AS job, COUNT(*) AS \"Total Empl\", AVG(salary) * 12 AS \"Average Sal\" " - + "FROM employees e, departments d\n" + "WHERE d.department_id = e.department_id\n" - + "GROUP BY ROLLUP (department_name, job_id);\n"; + + "DECODE(GROUPING(job_id), 1, 'All Jobs', job_id) AS job, COUNT(*) AS \"Total Empl\", AVG(salary) * 12 AS \"Average Sal\" " + + "FROM employees e, departments d\n" + "WHERE d.department_id = e.department_id\n" + + "GROUP BY ROLLUP (department_name, job_id);\n"; String expect = "SELECT DECODE(GROUPING(department_name), 1, 'All Departments', department_name) AS department\n" + "\t, DECODE(GROUPING(job_id), 1, 'All Jobs', job_id) AS job\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest4.java index 5892a5253b..c443ff1a56 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest4.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class OracleFlashbackQueryTest4 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT * FROM employees\n" + "AS OF TIMESTAMP\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest.java index 75ee283a52..ac0a5f3889 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest.java @@ -19,9 +19,9 @@ import com.alibaba.druid.sql.SQLUtils; -public class OracleFormatTest extends TestCase{ - public void test_formatOracle(){ - String sql = SQLUtils.formatOracle("select substr('123''''a''''bc',0,3) FROM dual"); - System.out.println(sql); - } +public class OracleFormatTest extends TestCase { + public void test_formatOracle() { + String sql = SQLUtils.formatOracle("select substr('123''''a''''bc',0,3) FROM dual"); + System.out.println(sql); + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest2.java index 7db0012286..8b224fbfa8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest2.java @@ -21,7 +21,6 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleFormatTest2 extends TestCase { - public void test_formatOracle() throws Exception { String text = "UPDATE MEMBER SET GMT_MODIFIED = SYSDATE, STATUS = ?, email = CASE WHEN status = ? THEN rtrim(email, ? || id || ?) ELSE email END WHERE ID IN (?) AND STATUS <> ?"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java index 3d663d1654..0e9990b034 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class OracleGrantTest extends OracleTest { - public void test_0() throws Exception { String sql = "grant all on p4p_pro"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_1.java index b112d43cf8..bd753a6dc9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_1.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleGrantTest_1 extends OracleTest { - public void test_0() throws Exception { String sql = "GRANT CREATE SESSION TO hr;"; @@ -39,7 +38,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("GRANT CREATE SESSION TO hr;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_2.java index 6432d3f589..e2a31d2c70 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_2.java @@ -27,16 +27,15 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleGrantTest_2 extends OracleTest { - public void test_0() throws Exception { String sql = "GRANT" // - + " CREATE ANY MATERIALIZED VIEW" // - + " , ALTER ANY MATERIALIZED VIEW" // - + " , DROP ANY MATERIALIZED VIEW" // - + " , QUERY REWRITE" // - + " , GLOBAL QUERY REWRITE" // - + " TO dw_manager" // - + " WITH ADMIN OPTION;"; + + " CREATE ANY MATERIALIZED VIEW" // + + " , ALTER ANY MATERIALIZED VIEW" // + + " , DROP ANY MATERIALIZED VIEW" // + + " , QUERY REWRITE" // + + " , GLOBAL QUERY REWRITE" // + + " TO dw_manager" // + + " WITH ADMIN OPTION;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -46,13 +45,13 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("GRANT CREATE ANY MATERIALIZED VIEW,"// - + " ALTER ANY MATERIALIZED VIEW,"// - + " DROP ANY MATERIALIZED VIEW,"// - + " QUERY REWRITE,"// - + " GLOBAL QUERY REWRITE"// - + " TO dw_manager"// - + " WITH ADMIN OPTION;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + " ALTER ANY MATERIALIZED VIEW,"// + + " DROP ANY MATERIALIZED VIEW,"// + + " QUERY REWRITE,"// + + " GLOBAL QUERY REWRITE"// + + " TO dw_manager"// + + " WITH ADMIN OPTION;",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_3.java index 441505bc38..8221d3b87f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_3.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleGrantTest_3 extends OracleTest { - public void test_0() throws Exception { String sql = "GRANT INHERIT PRIVILEGES ON USER sh TO hr;"; @@ -39,7 +38,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("GRANT INHERIT PRIVILEGES ON USER sh TO hr;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_4.java index 5deb4440cc..05657e0a21 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_4.java @@ -27,12 +27,11 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleGrantTest_4 extends OracleTest { - public void test_0() throws Exception { String sql = "GRANT REFERENCES (employee_id), " // - + " UPDATE (employee_id, salary, commission_pct) " // - + " ON hr.employees" // - + " TO oe; "; + + " UPDATE (employee_id, salary, commission_pct) " // + + " ON hr.employees" // + + " TO oe; "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -42,9 +41,9 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("GRANT REFERENCES(employee_id),"// - + " UPDATE(employee_id, salary, commission_pct)"// - + " ON hr.employees TO oe;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + " UPDATE(employee_id, salary, commission_pct)"// + + " ON hr.employees TO oe;",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_5.java index a3ed9fbe3c..d4295598ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_5.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleGrantTest_5 extends OracleTest { - public void test_0() throws Exception { String sql = "grant resource, connect, create view, create procedure, create sequence to DZFP_CX;"; @@ -37,7 +36,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("GRANT RESOURCE, CONNECT, CREATE VIEW, CREATE PROCEDURE, CREATE SEQUENCE TO DZFP_CX;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java index ead9b157c3..48d35bbdde 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java @@ -23,17 +23,16 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleGroupingSetTest extends TestCase { - public void test_interval() throws Exception { String sql = "SELECT channel_desc, calendar_month_desc, co.country_id, " - + "TO_CHAR(sum(amount_sold) , '9,999,999,999') AS SALES$\n" - + "FROM sales, customers, times, channels, countries co\n" - + "WHERE sales.time_id = times.time_id AND sales.cust_id = customers.cust_id AND sales.channel_id = channels.channel_id " - + "AND customers.country_id = co.country_id AND channels.channel_desc IN ('Direct Sales', 'Internet') " - + "AND times.calendar_month_desc IN ('2000-09', '2000-10') " - + "AND co.country_id IN ('UK', 'US')\n" - + "GROUP BY GROUPING SETS((channel_desc, calendar_month_desc, co.country_id), (channel_desc, co.country_id), " - + "( calendar_month_desc, co.country_id) );\n"; + + "TO_CHAR(sum(amount_sold) , '9,999,999,999') AS SALES$\n" + + "FROM sales, customers, times, channels, countries co\n" + + "WHERE sales.time_id = times.time_id AND sales.cust_id = customers.cust_id AND sales.channel_id = channels.channel_id " + + "AND customers.country_id = co.country_id AND channels.channel_desc IN ('Direct Sales', 'Internet') " + + "AND times.calendar_month_desc IN ('2000-09', '2000-10') " + + "AND co.country_id IN ('UK', 'US')\n" + + "GROUP BY GROUPING SETS((channel_desc, calendar_month_desc, co.country_id), (channel_desc, co.country_id), " + + "( calendar_month_desc, co.country_id) );\n"; String expected = "SELECT channel_desc, calendar_month_desc, co.country_id\n" + "\t, TO_CHAR(sum(amount_sold), '9,999,999,999') AS SALES$\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetsTest.java index 1bba8cecf8..74195e472d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetsTest.java @@ -12,10 +12,9 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleGroupingSetsTest extends OracleTest { - public void test_grouping_sets() throws Exception { String sql = // - "select department_id,job_id,avg(salary) from hr.employees group by grouping sets ((department_id,job_id));"; + "select department_id,job_id,avg(salary) from hr.employees group by grouping sets ((department_id,job_id));"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java index 0abdc4bb6c..2cee550cfe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java @@ -14,29 +14,28 @@ import junit.framework.TestCase; public class OracleHintTest extends TestCase { + public void test_hint1() throws Exception { + String sql = "SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ distinct e.id from ord_order_item e where e.F1 = Date '2011-10-01'"; - public void test_hint1() throws Exception { - String sql = "SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ distinct e.id from ord_order_item e where e.F1 = Date '2011-10-01'"; - - OracleStatementParser parser = new OracleStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement stmt = statementList.get(0); - - StringBuilder out = new StringBuilder(); - stmt.accept(new OracleOutputVisitor(out, true)); - - String newSQL = out.toString(); - Assert.assertEquals("SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ DISTINCT e.id\nFROM ord_order_item e\nWHERE e.F1 = DATE '2011-10-01'", newSQL); - - } - - public void test_hint2() throws Exception { - String sql = "SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ distinct e.id from ord_order_item e where e.F1 = Date '2011-10-01'"; - String countSQL = PagerUtils.count(sql, JdbcUtils.ORACLE); - Assert.assertEquals("SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ COUNT(DISTINCT e.id)\nFROM ord_order_item e\nWHERE e.F1 = DATE '2011-10-01'", countSQL); - } - - public void test_hint3() throws Exception { + OracleStatementParser parser = new OracleStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + + StringBuilder out = new StringBuilder(); + stmt.accept(new OracleOutputVisitor(out, true)); + + String newSQL = out.toString(); + Assert.assertEquals("SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ DISTINCT e.id\nFROM ord_order_item e\nWHERE e.F1 = DATE '2011-10-01'", newSQL); + + } + + public void test_hint2() throws Exception { + String sql = "SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ distinct e.id from ord_order_item e where e.F1 = Date '2011-10-01'"; + String countSQL = PagerUtils.count(sql, JdbcUtils.ORACLE); + Assert.assertEquals("SELECT /*+leading(e) index(e ORD_ORDER_ITEM_GS_BS_DI_IND)*/ COUNT(DISTINCT e.id)\nFROM ord_order_item e\nWHERE e.F1 = DATE '2011-10-01'", countSQL); + } + + public void test_hint3() throws Exception { String sql = "SELECT /*+index(a MTN_SMS_LOG_PK)*/ * from MTN_SMS_LOG a"; String formattedSql = SQLUtils.formatOracle(sql); Assert.assertEquals("SELECT /*+index(a MTN_SMS_LOG_PK)*/ *" + "\nFROM MTN_SMS_LOG a", formattedSql); @@ -55,19 +54,19 @@ public void test_hint5() throws Exception { String formattedSql = SQLUtils.formatOracle(sql); Assert.assertEquals("SELECT /*+index(clk) use_nl(clk) */ DISTINCT log.id AS log_id" + "\nFROM t", formattedSql); } - + public void test_hint6() throws Exception { String sql = "insert /*+APPEND*/ into emp_new select a.no, sysdate, a.name, b.service_duration from emp a, work b where a.no=b.no"; String formattedSql = SQLUtils.formatOracle(sql); Assert.assertEquals("INSERT /*+APPEND*/ INTO emp_new" + "\nSELECT a.no, SYSDATE, a.name, b.service_duration" - + "\nFROM emp a, work b" + "\nWHERE a.no = b.no", formattedSql); + + "\nFROM emp a, work b" + "\nWHERE a.no = b.no", formattedSql); } - + public void test_hint7() throws Exception { String sql = "delete /*+PARALLEL(semp, 5) */ from semp"; String formattedSql = SQLUtils.formatOracle(sql); Assert.assertEquals("DELETE /*+PARALLEL(semp, 5) */ FROM semp", formattedSql); } - - + + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java index 5b1ef825f3..a2c4319f6e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class OracleIbatisSelectTest extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT * FROM T WHERE F1 = #id# "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java index 4404875311..18db94a048 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class OracleIbatisSelectTest1 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT * FROM T WHERE F1 = $id$"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIntervalTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIntervalTest.java index a109a61d52..e031bb7a8e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIntervalTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIntervalTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleIntervalTest extends TestCase { - public void test_interval_literal() throws Exception { String sql = "SELECT INTERVAL '123-2' YEAR(3) TO MONTH FROM DUAL"; @@ -112,7 +111,7 @@ public void test_interval() throws Exception { String text = TestUtils.outputOracle(stmt); Assert.assertEquals("SELECT (SYSTIMESTAMP - order_date) DAY(9) TO SECOND\n" + "FROM orders\n" - + "WHERE order_id = 2458;", text); + + "WHERE order_id = 2458;", text); System.out.println(text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsASetTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsASetTest.java index 7ab699d56b..89fac941b9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsASetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsASetTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleIsASetTest extends TestCase { - public void test_is_a_set() throws Exception { String sql = "SELECT customer_id, cust_address_ntab FROM customers_demo WHERE cust_address_ntab IS A SET;"; @@ -34,7 +33,7 @@ public void test_is_a_set() throws Exception { String text = TestUtils.outputOracle(stmt); Assert.assertEquals("SELECT customer_id, cust_address_ntab\n" + "FROM customers_demo\n" - + "WHERE cust_address_ntab IS A SET;", text); + + "WHERE cust_address_ntab IS A SET;", text); System.out.println(text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsEmptyTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsEmptyTest.java index a6489bb6a8..8fd13f6b56 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsEmptyTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsEmptyTest.java @@ -24,12 +24,11 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleIsEmptyTest extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT product_id, TO_CHAR(ad_finaltext) FROM print_media WHERE ad_textdocs_ntab IS NOT EMPTY;"; String expect = "SELECT product_id, TO_CHAR(ad_finaltext)\n" + "FROM print_media\n" - + "WHERE ad_textdocs_ntab IS NOT EMPTY;"; + + "WHERE ad_textdocs_ntab IS NOT EMPTY;"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLexerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLexerTest.java index bb4c6b7fa8..1b66d32e40 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLexerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLexerTest.java @@ -21,11 +21,10 @@ import com.alibaba.druid.sql.parser.Token; public class OracleLexerTest extends TestCase { - public void test_hint() throws Exception { String sql = "SELECT /*+FIRST_ROWS*/ * FROM T WHERE F1 = ? ORDER BY F2"; OracleLexer lexer = new OracleLexer(sql); - for (;;) { + for (; ; ) { lexer.nextToken(); Token tok = lexer.token(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest.java index 5a4058e793..c654935248 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest.java @@ -13,15 +13,14 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleListAggTest extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT prod_id, LISTAGG(cust_first_name||' '||cust_last_name, '; ') \n" // - + " WITHIN GROUP (ORDER BY amount_sold DESC) cust_list\n" // - + "FROM sales, customers\n" // - + "WHERE sales.cust_id = customers.cust_id AND cust_gender = 'M' \n" // - + " AND cust_credit_limit = 15000 AND prod_id BETWEEN 15 AND 18 \n" // - + " AND channel_id = 2 AND time_id > '01-JAN-01'\n" // - + "GROUP BY prod_id;"; + + " WITHIN GROUP (ORDER BY amount_sold DESC) cust_list\n" // + + "FROM sales, customers\n" // + + "WHERE sales.cust_id = customers.cust_id AND cust_gender = 'M' \n" // + + " AND cust_credit_limit = 15000 AND prod_id BETWEEN 15 AND 18 \n" // + + " AND channel_id = 2 AND time_id > '01-JAN-01'\n" // + + "GROUP BY prod_id;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -40,7 +39,7 @@ public void test_0() throws Exception { "\tAND channel_id = 2\n" + "\tAND time_id > '01-JAN-01'\n" + "GROUP BY prod_id;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest1.java index 6495f15a8f..b574776b9d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest1.java @@ -50,7 +50,7 @@ public void test_0() throws Exception { "\t\tGROUP BY T.ID\n" + "\t) T1 ON T.ID = T1.ID \n" + "WHERE t.IS_DELETED = 0",// - SQLUtils.toSQLString(stmt, dbType)); + SQLUtils.toSQLString(stmt, dbType)); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(dbType); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLiteralTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLiteralTest.java index e564092dbe..e94e93fe34 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLiteralTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLiteralTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleLiteralTest extends TestCase { - public void test_oracle() throws Exception { String sql = "SELECT FROM_TZ(TIMESTAMP '2007-11-20 08:00:00', '3:00') FROM DUAL;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java index 110f122632..36f1d5fb68 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class OracleLockTableTest1 extends OracleTest { - public void test_0() throws Exception { String sql = "LOCK TABLE employees IN EXCLUSIVE MODE NOWAIT; "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java index 31baf823fe..3676d52eb8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class OracleLockTableTest2 extends OracleTest { - public void test_0() throws Exception { String sql = "LOCK TABLE employees@remote IN SHARE MODE"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest3.java index 7d7ffbf158..9dd8943f67 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest3.java @@ -27,7 +27,6 @@ import java.util.List; public class OracleLockTableTest3 extends OracleTest { - public void test_0() throws Exception { String sql = "LOCK TABLE \"FIN_SETTLEMENT_DETAIL\" IN ROW SHARE MODE "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest4.java index 20a3149484..7e3992f093 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest4.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleLockTableTest4 extends OracleTest { - public void test_0() throws Exception { String sql = "LOCK TABLE \"TAB9527\" IN EXCLUSIVE MODE NOWAIT"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java index 14baf8a931..5f3a62ca0f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java @@ -26,17 +26,16 @@ import com.alibaba.druid.stat.TableStat; public class OracleMergeTest extends OracleTest { - public void test_0() throws Exception { String sql = "MERGE INTO bonuses D" + // - " USING (SELECT employee_id, salary, department_id FROM employees" + // - " WHERE department_id = 80) S" + // - " ON (D.employee_id = S.employee_id)" + // - " WHEN MATCHED THEN UPDATE SET D.bonus = D.bonus + S.salary*0.01" + // - " DELETE WHERE (S.salary > 8000)" + // - " WHEN NOT MATCHED THEN INSERT (D.employee_id, D.bonus)" + // - " VALUES (S.employee_id, S.salary*0.01)" + // - " WHERE (S.salary <= 8000);"; + " USING (SELECT employee_id, salary, department_id FROM employees" + // + " WHERE department_id = 80) S" + // + " ON (D.employee_id = S.employee_id)" + // + " WHEN MATCHED THEN UPDATE SET D.bonus = D.bonus + S.salary*0.01" + // + " DELETE WHERE (S.salary > 8000)" + // + " WHEN NOT MATCHED THEN INSERT (D.employee_id, D.bonus)" + // + " VALUES (S.employee_id, S.salary*0.01)" + // + " WHERE (S.salary <= 8000);"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest10.java index 3818ac1979..1e2bc3df9a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest10.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleMergeTest10 extends OracleTest { - public void test_0() throws Exception { String sql = "merge into bonuses d \n" + " using (select employee_id.* from employees) s \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest11.java index 0d19459f34..56ad9814c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest11.java @@ -30,7 +30,6 @@ import java.util.List; public class OracleMergeTest11 extends OracleTest { - public void test_0() throws Exception { String sql = "MERGE INTO (\n" + "SELECT *\n" + @@ -67,9 +66,9 @@ public void test_0() throws Exception { ") B ON (A.AREA_ID = B.AREA_ID\n" + "AND A.AREA_LEVEL = B.AREA_LEVEL) \n" + "WHEN MATCHED THEN UPDATE SET A.SUM_CHRG_YS = ROUND(B.TOTAL_CHARGE * 1.00 / 10000, 2), A.CHARGE = B.THIS_CHARGE;", - result); + result); - SQLSelect select = ((SQLSubqueryTableSource)mergeStatement.getInto()).getSelect(); + SQLSelect select = ((SQLSubqueryTableSource) mergeStatement.getInto()).getSelect(); assertEquals("SELECT *\n" + "FROM KPI_M_CW_INCOME_FACT_BAK\n" + "WHERE THE_DATE = '{THISMONTH}'\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java index 2d440f6329..911b722090 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java @@ -26,37 +26,36 @@ import com.alibaba.druid.stat.TableStat; public class OracleMergeTest2 extends OracleTest { - public void test_0() throws Exception { String sql = "MERGE INTO \"ESCROW\".\"HT_TASK_TRADE_HISTORY_NEW\" SNA$ " + // - " USING (" + // - " SELECT CURRENT$.\"ID\",CURRENT$.\"GMT_MODIFIED\"" + // - " ,CURRENT$.\"GMT_CREATE\",CURRENT$.\"TRADE_ID\",CURRENT$.\"STATUS\",CURRENT$.\"OWNER\"" + // - " ,CURRENT$.\"GMT_FETCH_TASK\",CURRENT$.\"GMT_FINISH_TASK\",CURRENT$.\"VERSION\"" + // - " ,CURRENT$.\"RECORD_TYPE\",CURRENT$.\"TASK_FLOW_LEVEL\",CURRENT$.\"DEAL_TYPE\"" + // - " ,CURRENT$.\"END_REASON\",CURRENT$.\"TRANSIT_TIME\" " + // - " FROM (" + // - " SELECT \"HT_TASK_TRADE_HISTORY\".\"ID\" \"ID\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"GMT_MODIFIED\" \"GMT_MODIFIED\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"GMT_CREATE\" \"GMT_CREATE\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"TRADE_ID\" \"TRADE_ID\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"STATUS\" \"STATUS\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"OWNER\" \"OWNER\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"GMT_FETCH_TASK\" \"GMT_FETCH_TASK\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"GMT_FINISH_TASK\" \"GMT_FINISH_TASK\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"VERSION\" \"VERSION\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"RECORD_TYPE\" \"RECORD_TYPE\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"TASK_FLOW_LEVEL\" \"TASK_FLOW_LEVEL\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"DEAL_TYPE\" \"DEAL_TYPE\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"END_REASON\" \"END_REASON\"" + // - " ,\"HT_TASK_TRADE_HISTORY\".\"TRANSIT_TIME\" \"TRANSIT_TIME\" " + // - " FROM \"ESCROW\".\"HT_TASK_TRADE_HISTORY\" \"HT_TASK_TRADE_HISTORY\"" + // - " ) CURRENT$, " + // - " (SELECT DISTINCT MLOG$.\"ID\" " + // - " FROM \"ESCROW\".\"MLOG$_HT_TASK_TRADE_HISTOR\" MLOG$ " + // - " WHERE \"SNAPTIME$$\" > :1 AND (\"DMLTYPE$$\" != 'D')" + // - " ) LOG$ " + // - " WHERE CURRENT$.\"ID\" = LOG$.\"ID\") AS OF SNAPSHOT(:SCN) MAS$ ON (SNA$.\"ID\" = MAS$.\"ID\") WHEN MATCHED THEN UPDATE SET SNA$.\"ID\" = MAS$.\"ID\", SNA$.\"GMT_MODIFIED\" = MAS$.\"GMT_MODIFIED\", SNA$.\"GMT_CREATE\" = MAS$.\"GMT_CREATE\", SNA$.\"TRADE_ID\" = MAS$.\"TRADE_ID\", SNA$.\"STATUS\" = MAS$.\"STATUS\", SNA$.\"OWNER\" = MAS$.\"OWNER\", SNA$.\"GMT_FETCH_TASK\" = MAS$.\"GMT_FETCH_TASK\", SNA$.\"GMT_FINISH_TASK\" = MAS$.\"GMT_FINISH_TASK\", SNA$.\"VERSION\" = MAS$.\"VERSION\", SNA$.\"RECORD_TYPE\" = MAS$.\"RECORD_TYPE\", SNA$.\"TASK_FLOW_LEVEL\" = MAS$.\"TASK_FLOW_LEVEL\", SNA$.\"DEAL_TYPE\" = MAS$.\"DEAL_TYPE\", SNA$.\"END_REASON\" = MAS$.\"END_REASON\", SNA$.\"TRANSIT_TIME\" = MAS$.\"TRANSIT_TIME\" WHEN NOT MATCHED THEN INSERT (\"ID\",\"GMT_MODIFIED\",\"GMT_CREATE\",\"TRADE_ID\",\"STATUS\",\"OWNER\",\"GMT_FETCH_TASK\",\"GMT_FINISH_TASK\",\"VERSION\",\"RECORD_TYPE\",\"TASK_FLOW_LEVEL\",\"DEAL_TYPE\",\"END_REASON\",\"TRANSIT_TIME\") VALUES (MAS$.\"ID\",MAS$.\"GMT_MODIFIED\",MAS$.\"GMT_CREATE\",MAS$.\"TRADE_ID\",MAS$.\"STATUS\",MAS$.\"OWNER\",MAS$.\"GMT_FETCH_TASK\",MAS$.\"GMT_FINISH_TASK\",MAS$.\"VERSION\",MAS$.\"RECORD_TYPE\",MAS$.\"TASK_FLOW_LEVEL\",MAS$.\"DEAL_TYPE\",MAS$.\"END_REASON\",MAS$.\"TRANSIT_TIME\")"; + " USING (" + // + " SELECT CURRENT$.\"ID\",CURRENT$.\"GMT_MODIFIED\"" + // + " ,CURRENT$.\"GMT_CREATE\",CURRENT$.\"TRADE_ID\",CURRENT$.\"STATUS\",CURRENT$.\"OWNER\"" + // + " ,CURRENT$.\"GMT_FETCH_TASK\",CURRENT$.\"GMT_FINISH_TASK\",CURRENT$.\"VERSION\"" + // + " ,CURRENT$.\"RECORD_TYPE\",CURRENT$.\"TASK_FLOW_LEVEL\",CURRENT$.\"DEAL_TYPE\"" + // + " ,CURRENT$.\"END_REASON\",CURRENT$.\"TRANSIT_TIME\" " + // + " FROM (" + // + " SELECT \"HT_TASK_TRADE_HISTORY\".\"ID\" \"ID\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"GMT_MODIFIED\" \"GMT_MODIFIED\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"GMT_CREATE\" \"GMT_CREATE\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"TRADE_ID\" \"TRADE_ID\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"STATUS\" \"STATUS\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"OWNER\" \"OWNER\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"GMT_FETCH_TASK\" \"GMT_FETCH_TASK\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"GMT_FINISH_TASK\" \"GMT_FINISH_TASK\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"VERSION\" \"VERSION\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"RECORD_TYPE\" \"RECORD_TYPE\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"TASK_FLOW_LEVEL\" \"TASK_FLOW_LEVEL\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"DEAL_TYPE\" \"DEAL_TYPE\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"END_REASON\" \"END_REASON\"" + // + " ,\"HT_TASK_TRADE_HISTORY\".\"TRANSIT_TIME\" \"TRANSIT_TIME\" " + // + " FROM \"ESCROW\".\"HT_TASK_TRADE_HISTORY\" \"HT_TASK_TRADE_HISTORY\"" + // + " ) CURRENT$, " + // + " (SELECT DISTINCT MLOG$.\"ID\" " + // + " FROM \"ESCROW\".\"MLOG$_HT_TASK_TRADE_HISTOR\" MLOG$ " + // + " WHERE \"SNAPTIME$$\" > :1 AND (\"DMLTYPE$$\" != 'D')" + // + " ) LOG$ " + // + " WHERE CURRENT$.\"ID\" = LOG$.\"ID\") AS OF SNAPSHOT(:SCN) MAS$ ON (SNA$.\"ID\" = MAS$.\"ID\") WHEN MATCHED THEN UPDATE SET SNA$.\"ID\" = MAS$.\"ID\", SNA$.\"GMT_MODIFIED\" = MAS$.\"GMT_MODIFIED\", SNA$.\"GMT_CREATE\" = MAS$.\"GMT_CREATE\", SNA$.\"TRADE_ID\" = MAS$.\"TRADE_ID\", SNA$.\"STATUS\" = MAS$.\"STATUS\", SNA$.\"OWNER\" = MAS$.\"OWNER\", SNA$.\"GMT_FETCH_TASK\" = MAS$.\"GMT_FETCH_TASK\", SNA$.\"GMT_FINISH_TASK\" = MAS$.\"GMT_FINISH_TASK\", SNA$.\"VERSION\" = MAS$.\"VERSION\", SNA$.\"RECORD_TYPE\" = MAS$.\"RECORD_TYPE\", SNA$.\"TASK_FLOW_LEVEL\" = MAS$.\"TASK_FLOW_LEVEL\", SNA$.\"DEAL_TYPE\" = MAS$.\"DEAL_TYPE\", SNA$.\"END_REASON\" = MAS$.\"END_REASON\", SNA$.\"TRANSIT_TIME\" = MAS$.\"TRANSIT_TIME\" WHEN NOT MATCHED THEN INSERT (\"ID\",\"GMT_MODIFIED\",\"GMT_CREATE\",\"TRADE_ID\",\"STATUS\",\"OWNER\",\"GMT_FETCH_TASK\",\"GMT_FINISH_TASK\",\"VERSION\",\"RECORD_TYPE\",\"TASK_FLOW_LEVEL\",\"DEAL_TYPE\",\"END_REASON\",\"TRANSIT_TIME\") VALUES (MAS$.\"ID\",MAS$.\"GMT_MODIFIED\",MAS$.\"GMT_CREATE\",MAS$.\"TRADE_ID\",MAS$.\"STATUS\",MAS$.\"OWNER\",MAS$.\"GMT_FETCH_TASK\",MAS$.\"GMT_FINISH_TASK\",MAS$.\"VERSION\",MAS$.\"RECORD_TYPE\",MAS$.\"TASK_FLOW_LEVEL\",MAS$.\"DEAL_TYPE\",MAS$.\"END_REASON\",MAS$.\"TRANSIT_TIME\")"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java index 91554a5683..7836ea3650 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class OracleMergeTest3 extends OracleTest { - public void test_0() throws Exception { String sql = "merge /*+ dynamic_sampling(mm 4) dynamic_sampling_est_cdn(mm) dynamic_sampling(m 4) dynamic_sampling_est_cdn(m) */ into sys.mon_mods_all$ mm using (select m.obj# obj#, m.inserts inserts, m.updates updates, m.deletes deletes, m.flags flags, m.timestamp timestamp, m.drop_segments drop_segments from sys.mon_mods$ m, tab$ t where m.obj# = t.obj# ) v on (mm.obj# = v.obj#) when matched then update set mm.inserts = mm.inserts + v.inserts, mm.updates = mm.updates + v.updates, mm.deletes = mm.deletes + v.deletes, mm.flags = mm.flags + v.flags - bitand(mm.flags,v.flags) /* bitor(mm.flags,v.flags) */, mm.timestamp = v.timestamp, mm.drop_segments = mm.drop_segments + v.drop_segments when NOT matched then insert (obj#, inserts, updates, deletes, timestamp, flags, drop_segments) values (v.obj#, v.inserts, v.updates, v.deletes, sysdate, v.flags, v.drop_segments);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java index 4d89396841..411cb29b1d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleMergeTest4 extends OracleTest { - public void test_0() throws Exception { String sql = "MERGE INTO \"ESCROW\". \"HT_TASK_TRADE_HISTORY_NEW \" SNA$ USING (SELECT \"CURRENT$ \". \"ID \", \"OUTERTAB$ \". \"GMT_MODIFIED \" \"GMT_MODIFIED \", \"OUTERTAB$ \". \"GMT_CREATE \" \"GMT_CREATE \", \"OUTERTAB$ \". \"TRADE_ID \" \"TRADE_ID \", \"OUTERTAB$ \". \"STATUS \" \"STATUS \", \"OUTERTAB$ \". \"OWNER \" \"OWNER \", \"OUTERTAB$ \". \"GMT_FETCH_TASK \" \"GMT_FETCH_TASK \", \"OUTERTAB$ \". \"GMT_FINISH_TASK \" \"GMT_FINISH_TASK \", \"OUTERTAB$ \". \"VERSION \" \"VERSION \", \"OUTERTAB$ \". \"RECORD_TYPE \" \"RECORD_TYPE \", \"OUTERTAB$ \". \"TASK_FLOW_LEVEL \" \"TASK_FLOW_LEVEL \", \"OUTERTAB$ \". \"DEAL_TYPE \" \"DEAL_TYPE \", \"OUTERTAB$ \". \"END_REASON \" \"END_REASON \", \"OUTERTAB$ \". \"TRANSIT_TIME \" \"TRANSIT_TIME \" FROM (SELECT /*+ NO_MERGE NO_MERGE(LL$) ROWID(MAS$) ORDERED USE_NL(MAS$) NO_INDEX(MAS$) PQ_DISTRIBUTE(MAS$,RANDOM,NONE) */ \"MAS$ \". \"ID \" \"ID \" FROM \"ALL_SUMDELTA\" \"LL$\", \"ESCROW\". \"HT_TASK_TRADE_HISTORY\" \"MAS$ \" WHERE ((LL$.TABLEOBJ# = :1 AND LL$.TIMESTAMP > :2 AND \"MAS$ \".ROWID BETWEEN LL$.LOWROWID AND LL$.HIGHROWID))) CURRENT$, \"ESCROW\". \"HT_TASK_TRADE_HISTORY\" OUTERTAB$ WHERE CURRENT$. \"ID \" = OUTERTAB$. \"ID \") AS OF SNAPSHOT(:SCN) MAS$ ON (SNA$. \"ID \" = MAS$. \"ID \") WHEN MATCHED THEN UPDATE SET SNA$. \"ID \" = MAS$. \"ID \", SNA$. \"GMT_MODIFIED \" = MAS$. \"GMT_MODIFIED \", SNA$. \"GMT_CREATE \" = MAS$. \"GMT_CREATE \", SNA$. \"TRADE_ID \" = MAS$. \"TRADE_ID \", SNA$. \"STATUS \" = MAS$. \"STATUS \", SNA$. \"OWNER \" = MAS$. \"OWNER \", SNA$. \"GMT_FETCH_TASK \" = MAS$. \"GMT_FETCH_TASK \", SNA$. \"GMT_FINISH_TASK \" = MAS$. \"GMT_FINISH_TASK \", SNA$. \"VERSION \" = MAS$. \"VERSION \", SNA$. \"RECORD_TYPE \" = MAS$. \"RECORD_TYPE \", SNA$. \"TASK_FLOW_LEVEL \" = MAS$. \"TASK_FLOW_LEVEL \", SNA$. \"DEAL_TYPE \" = MAS$. \"DEAL_TYPE \", SNA$. \"END_REASON \" = MAS$. \"END_REASON \", SNA$. \"TRANSIT_TIME \" = MAS$. \"TRANSIT_TIME \" WHEN NOT MATCHED THEN INSERT ( \"ID \", \"GMT_MODIFIED \", \"GMT_CREATE \", \"TRADE_ID \", \"STATUS \", \"OWNER \", \"GMT_FETCH_TASK \", \"GMT_FINISH_TASK \", \"VERSION \", \"RECORD_TYPE \", \"TASK_FLOW_LEVEL \", \"DEAL_TYPE \", \"END_REASON \", \"TRANSIT_TIME \") VALUES (MAS$. \"ID \",MAS$. \"GMT_MODIFIED \",MAS$. \"GMT_CREATE \",MAS$. \"TRADE_ID \",MAS$. \"STATUS \",MAS$. \"OWNER \",MAS$. \"GMT_FETCH_TASK \",MAS$. \"GMT_FINISH_TASK \",MAS$. \"VERSION \",MAS$. \"RECORD_TYPE \",MAS$. \"TASK_FLOW_LEVEL \",MAS$. \"DEAL_TYPE \",MAS$. \"END_REASON \",MAS$. \"TRANSIT_TIME \")"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java index e03fb882af..e6b69d4504 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java @@ -26,17 +26,16 @@ import com.alibaba.druid.stat.TableStat; public class OracleMergeTest5 extends OracleTest { - public void test_0() throws Exception { String sql = "MERGE " + // - "INTO MEMBER_LAST_LOGIN M2 " + // - "USING MEMBER_LAST_LOGIN_HZ M1 ON (M1.ID = M2.ID) " + // - " WHEN MATCHED THEN " + // - " UPDATE SET M2.LAST_LOGIN_TIME = M1.LAST_LOGIN_TIME, M2.GMT_MODIFIED = M1.GMT_MODIFIED" + // - " , M2.OWNER_SEQ = M1.OWNER_SEQ, M2.OWNER_MEMBER_ID = M1.OWNER_MEMBER_ID, M2.IP = M1.IP " + // - " WHEN NOT MATCHED THEN " + // - " INSERT VALUES (M1.ID, M1.GMT_CREATE, M1.GMT_MODIFIED, M1.OWNER_SEQ" + // - " , M1.LAST_LOGIN_TIME, M1.OWNER_MEMBER_ID, M1.IP)"; + "INTO MEMBER_LAST_LOGIN M2 " + // + "USING MEMBER_LAST_LOGIN_HZ M1 ON (M1.ID = M2.ID) " + // + " WHEN MATCHED THEN " + // + " UPDATE SET M2.LAST_LOGIN_TIME = M1.LAST_LOGIN_TIME, M2.GMT_MODIFIED = M1.GMT_MODIFIED" + // + " , M2.OWNER_SEQ = M1.OWNER_SEQ, M2.OWNER_MEMBER_ID = M1.OWNER_MEMBER_ID, M2.IP = M1.IP " + // + " WHEN NOT MATCHED THEN " + // + " INSERT VALUES (M1.ID, M1.GMT_CREATE, M1.GMT_MODIFIED, M1.OWNER_SEQ" + // + " , M1.LAST_LOGIN_TIME, M1.OWNER_MEMBER_ID, M1.IP)"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest6.java index caf49e83e5..6b2ef9f7b3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest6.java @@ -26,15 +26,14 @@ import com.alibaba.druid.stat.TableStat; public class OracleMergeTest6 extends OracleTest { - public void test_0() throws Exception { String sql = "MERGE INTO console_stb_ipstatus T1 " + // - "USING (SELECT '02222601005592002863423471' AS stbid FROM dual) T2 " + // - "ON ( T1.stbid=T2.stbid) " + // - "WHEN MATCHED THEN " + // - "update set t1.ip='10.104.131.175',t1.port='6666',t1.status = 1, t1.time = to_char(sysdate, 'yyyy-MM-dd HH24:mi:ss') " + // - "WHEN NOT MATCHED THEN insert (id, stbid, ip, port, time, firsttime, status) " + // - "values (CONSOLE_SEQ.nextval,'02222601005592002863423471','10.104.131.175','6666',to_char(sysdate, 'yyyy-MM-dd HH24:mi:ss'),to_char(sysdate, 'yyyy-MM-dd HH24:mi:ss'),1) "; + "USING (SELECT '02222601005592002863423471' AS stbid FROM dual) T2 " + // + "ON ( T1.stbid=T2.stbid) " + // + "WHEN MATCHED THEN " + // + "update set t1.ip='10.104.131.175',t1.port='6666',t1.status = 1, t1.time = to_char(sysdate, 'yyyy-MM-dd HH24:mi:ss') " + // + "WHEN NOT MATCHED THEN insert (id, stbid, ip, port, time, firsttime, status) " + // + "values (CONSOLE_SEQ.nextval,'02222601005592002863423471','10.104.131.175','6666',to_char(sysdate, 'yyyy-MM-dd HH24:mi:ss'),to_char(sysdate, 'yyyy-MM-dd HH24:mi:ss'),1) "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -58,13 +57,13 @@ public void test_0() throws Exception { Assert.assertEquals(7, visitor.getColumns().size()); - Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "stbid")); - Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "ip")); - Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "port")); - Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "status")); - Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "time")); - Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "id")); - Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "firsttime")); + Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "stbid")); + Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "ip")); + Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "port")); + Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "status")); + Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "time")); + Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "id")); + Assert.assertTrue(visitor.containsColumn("console_stb_ipstatus", "firsttime")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest7.java index b92f84455c..5c54e928ec 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest7.java @@ -27,30 +27,29 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class OracleMergeTest7 extends OracleTest { - public void test_0() throws Exception { String sql = "MERGE INTO copy_emp c " + // - "USING employees e " + // - "ON (c.employee_id=e.employee_id) " + // - "WHEN MATCHED THEN " + // - "UPDATE SET " + // - "c.first_name=e.first_name, " + // - "c.last_name=e.last_name, " + // - "c.department_id=e.department_id " + // - "WHEN NOT MATCHED THEN " + // - "INSERT VALUES(e.employee_id,e.first_name,e.last_name," + // - "e.email,e.phone_number,e.hire_date,e.job_id, " + // - "e.salary,e.commission_pct,e.manager_id,e.department_id)"; + "USING employees e " + // + "ON (c.employee_id=e.employee_id) " + // + "WHEN MATCHED THEN " + // + "UPDATE SET " + // + "c.first_name=e.first_name, " + // + "c.last_name=e.last_name, " + // + "c.department_id=e.department_id " + // + "WHEN NOT MATCHED THEN " + // + "INSERT VALUES(e.employee_id,e.first_name,e.last_name," + // + "e.email,e.phone_number,e.hire_date,e.job_id, " + // + "e.salary,e.commission_pct,e.manager_id,e.department_id)"; SQLStatementParser parser = new OracleStatementParser(sql); List stmtList = parser.parseStatementList(); SQLMergeStatement mergeStatement = (SQLMergeStatement) stmtList.get(0); String result = SQLUtils.toOracleString(mergeStatement); Assert.assertEquals("MERGE INTO copy_emp c" // - + "\nUSING employees e ON (c.employee_id = e.employee_id) " // - + "\nWHEN MATCHED THEN UPDATE SET c.first_name = e.first_name, c.last_name = e.last_name, c.department_id = e.department_id" // - + "\nWHEN NOT MATCHED THEN INSERT VALUES (e.employee_id, e.first_name, e.last_name, e.email, e.phone_number, e.hire_date, e.job_id, e.salary, e.commission_pct, e.manager_id, e.department_id)", - result); + + "\nUSING employees e ON (c.employee_id = e.employee_id) " // + + "\nWHEN MATCHED THEN UPDATE SET c.first_name = e.first_name, c.last_name = e.last_name, c.department_id = e.department_id" // + + "\nWHEN NOT MATCHED THEN INSERT VALUES (e.employee_id, e.first_name, e.last_name, e.email, e.phone_number, e.hire_date, e.job_id, e.salary, e.commission_pct, e.manager_id, e.department_id)", + result); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest8.java index fb2f7c95c0..bb134f74f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest8.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class OracleMergeTest8 extends OracleTest { - public void test_0() throws Exception { String sql = "merge into (select * from T09_RULE_CAL_COUNT where data_dt = '20160328' and rule_type = '2') t " // + "using (" @@ -59,7 +58,7 @@ public void test_0() throws Exception { "\t)\n" + ") t3 ON (t3.cust_no = t.cust_no) \n" + "WHEN MATCHED THEN UPDATE SET t.organ_key = t3.organ_key", - result); + result); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest9.java index 991ed7031b..c8b3db9389 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest9.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleMergeTest9 extends OracleTest { - public void test_0() throws Exception { String sql = "MERGE INTO tb_xxx_test t1\n" + "USING (SELECT '1' AS aa_item_id, '2' AS mem_test_id FROM dual) t2\n" + @@ -50,7 +49,7 @@ public void test_0() throws Exception { ") t2 ON (t1.aa_item_id = t2.aa_item_id\n" + "AND t1.mem_test_id = t2.mem_test_id) \n" + "WHEN NOT MATCHED THEN INSERT (aa_id, aa_item_id, gg_id, test_id) VALUES (?, ?, ?, ?)", - result); + result); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java index 5e3778dbee..6f3c2e4b3b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java @@ -26,26 +26,25 @@ import com.alibaba.druid.stat.TableStat; public class OracleMultiInsertTest extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT ALL" + // - " INTO sales (prod_id, cust_id, time_id, amount)" + // - " VALUES (product_id, customer_id, weekly_start_date, sales_sun)" + // - " INTO sales (prod_id, cust_id, time_id, amount)" + // - " VALUES (product_id, customer_id, weekly_start_date+1, sales_mon)" + // - " INTO sales (prod_id, cust_id, time_id, amount)" + // - " VALUES (product_id, customer_id, weekly_start_date+2, sales_tue)" + // - " INTO sales (prod_id, cust_id, time_id, amount)" + // - " VALUES (product_id, customer_id, weekly_start_date+3, sales_wed)" + // - " INTO sales (prod_id, cust_id, time_id, amount)" + // - " VALUES (product_id, customer_id, weekly_start_date+4, sales_thu)" + // - " INTO sales (prod_id, cust_id, time_id, amount)" + // - " VALUES (product_id, customer_id, weekly_start_date+5, sales_fri)" + // - " INTO sales (prod_id, cust_id, time_id, amount)" + // - " VALUES (product_id, customer_id, weekly_start_date+6, sales_sat)" + // - " SELECT product_id, customer_id, weekly_start_date, sales_sun," + // - " sales_mon, sales_tue, sales_wed, sales_thu, sales_fri, sales_sat" + // - " FROM sales_input_table;"; // + " INTO sales (prod_id, cust_id, time_id, amount)" + // + " VALUES (product_id, customer_id, weekly_start_date, sales_sun)" + // + " INTO sales (prod_id, cust_id, time_id, amount)" + // + " VALUES (product_id, customer_id, weekly_start_date+1, sales_mon)" + // + " INTO sales (prod_id, cust_id, time_id, amount)" + // + " VALUES (product_id, customer_id, weekly_start_date+2, sales_tue)" + // + " INTO sales (prod_id, cust_id, time_id, amount)" + // + " VALUES (product_id, customer_id, weekly_start_date+3, sales_wed)" + // + " INTO sales (prod_id, cust_id, time_id, amount)" + // + " VALUES (product_id, customer_id, weekly_start_date+4, sales_thu)" + // + " INTO sales (prod_id, cust_id, time_id, amount)" + // + " VALUES (product_id, customer_id, weekly_start_date+5, sales_fri)" + // + " INTO sales (prod_id, cust_id, time_id, amount)" + // + " VALUES (product_id, customer_id, weekly_start_date+6, sales_sat)" + // + " SELECT product_id, customer_id, weekly_start_date, sales_sun," + // + " sales_mon, sales_tue, sales_wed, sales_thu, sales_fri, sales_sat" + // + " FROM sales_input_table;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java index 57452507b2..71991d7d36 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java @@ -26,17 +26,16 @@ import com.alibaba.druid.stat.TableStat; public class OracleMultiInsertTest2 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT ALL" + // - " WHEN order_total < 100000 THEN" + // - " INTO small_orders" + // - " WHEN order_total > 100000 AND order_total < 200000 THEN" + // - " INTO medium_orders" + // - " ELSE" + // - " INTO large_orders" + // - " SELECT order_id, order_total, sales_rep_id, customer_id" + // - " FROM orders;"; // + " WHEN order_total < 100000 THEN" + // + " INTO small_orders" + // + " WHEN order_total > 100000 AND order_total < 200000 THEN" + // + " INTO medium_orders" + // + " ELSE" + // + " INTO large_orders" + // + " SELECT order_id, order_total, sales_rep_id, customer_id" + // + " FROM orders;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleNumberLiteralTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleNumberLiteralTest.java index cb9f4672f5..46aed36ed0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleNumberLiteralTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleNumberLiteralTest.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleNumberLiteralTest extends TestCase { - public void test_number_literal() throws Exception { String sql = "SELECT 7, +255, 0.5, +6.34,25e-03, +6.34F, 0.5d, -1D FROM DUAL"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleOuterTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleOuterTest.java index dd67334b16..53f9f57d46 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleOuterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleOuterTest.java @@ -23,13 +23,12 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleOuterTest extends TestCase { - public void test_oracle() throws Exception { String sql = "SELECT employee_id, manager_id\n" + "FROM employees\n" - + "WHERE employees.manager_id(+) = employees.employee_id;"; + + "WHERE employees.manager_id(+) = employees.employee_id;"; String expect = "SELECT employee_id, manager_id\n" + "FROM employees\n" - + "WHERE employees.manager_id(+) = employees.employee_id;"; + + "WHERE employees.manager_id(+) = employees.employee_id;"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); 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 233d8e40fd..9e9f1c7bd9 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 @@ -22,7 +22,6 @@ import org.junit.Assert; public class OraclePivotClauseTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT *\n" + "FROM pivot_table\n" + "UNPIVOT (yearly_total FOR order_mode IN (store AS 'direct', internet AS 'online'))\n" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePriorTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePriorTest.java index 014e3a6597..fc873f394f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePriorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePriorTest.java @@ -23,12 +23,11 @@ import com.alibaba.druid.sql.test.TestUtils; public class OraclePriorTest extends TestCase { - public void test_oracle() throws Exception { String sql = "SELECT employee_id, last_name, manager_id FROM employees CONNECT BY PRIOR employee_id = manager_id;"; String expect = "SELECT employee_id, last_name, manager_id\n" + "FROM employees\n" - + "CONNECT BY PRIOR employee_id = manager_id;"; + + "CONNECT BY PRIOR employee_id = manager_id;"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); @@ -42,12 +41,12 @@ public void test_oracle() throws Exception { public void test_oracle_2() throws Exception { String sql = "SELECT last_name, employee_id, manager_id, LEVEL\n" + "FROM employees\n" - + "START WITH employee_id = 100\n" + "CONNECT BY PRIOR employee_id = manager_id\n" - + "ORDER SIBLINGS BY last_name;"; + + "START WITH employee_id = 100\n" + "CONNECT BY PRIOR employee_id = manager_id\n" + + "ORDER SIBLINGS BY last_name;"; String expect = "SELECT last_name, employee_id, manager_id, LEVEL\n" + "FROM employees\n" - + "START WITH employee_id = 100\n" + "CONNECT BY PRIOR employee_id = manager_id\n" - + "ORDER SIBLINGS BY last_name;"; + + "START WITH employee_id = 100\n" + "CONNECT BY PRIOR employee_id = manager_id\n" + + "ORDER SIBLINGS BY last_name;"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java index 07daf162bc..04d9493014 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleSQLParserResourceTest extends TestCase { - public void test_0() throws Exception { // for (int i = 0; i <= 53; ++i) { // String resource = "bvt/parser/oracle-" + i + ".txt"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java index 84c6a3f075..70ae72c797 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java @@ -26,7 +26,6 @@ public class OracleSQLParserTest extends TestCase { - public void test_1() throws Exception { String sql = "SELECT employees_seq.nextval FROM DUAL;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSampleClauseTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSampleClauseTest.java index ab782250e2..89d42b78f4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSampleClauseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSampleClauseTest.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleSampleClauseTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT COUNT(*) * 10 FROM orders SAMPLE (10);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSchemaStatVisitorTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSchemaStatVisitorTest.java index c9138cbfbc..9f0fa53a16 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSchemaStatVisitorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSchemaStatVisitorTest.java @@ -30,10 +30,9 @@ import com.alibaba.druid.stat.TableStat.Condition; public class OracleSchemaStatVisitorTest extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT id, name name from department d" + // - " WHERE d.id = ? order by name desc"; + " WHERE d.id = ? order by name desc"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -61,12 +60,12 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("department", "id"))); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("department", "name"))); - + Assert.assertEquals(1, visitor.getConditions().size()); - + Condition condition = visitor.getConditions().get(0); Assert.assertSame(parameters.get(0), condition.getValues().get(0)); - + Column orderByColumn = visitor.getOrderByColumns().iterator().next(); Assert.assertEquals(SQLOrderingSpecification.DESC, orderByColumn.getAttributes().get("orderBy.type")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java index 5d98dde66d..1673b8665d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleSetTransactionTest extends OracleTest { - public void test_0() throws Exception { String sql = "set transaction name 'IGNORED_TRANS' "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest2.java index 3320e3875b..b1bfa31ecd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest2.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleSetTransactionTest2 extends OracleTest { - public void test_0() throws Exception { String sql = "SET TRANSACTION READ ONLY NAME 'Toronto';"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest3.java index 3af2fcbf25..d345c8f113 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest3.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleSetTransactionTest3 extends OracleTest { - public void test_0() throws Exception { String sql = "set transaction read write;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest.java index 9a5b546e27..79695526c7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest.java @@ -23,15 +23,14 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleSubqueryFactoringTest extends TestCase { - public void test_interval() throws Exception { String sql = "WITH dept_costs AS (\n" - + "SELECT department_name, SUM(salary) dept_total\n" - + "FROM employees e, departments d\n" - + "WHERE e.department_id = d.department_id\n" - + "GROUP BY department_name), " - + "avg_cost AS (SELECT SUM(dept_total)/COUNT(*) avg FROM dept_costs)\n" - + "SELECT * FROM dept_costs WHERE dept_total > (SELECT avg FROM avg_cost) ORDER BY department_name;"; + + "SELECT department_name, SUM(salary) dept_total\n" + + "FROM employees e, departments d\n" + + "WHERE e.department_id = d.department_id\n" + + "GROUP BY department_name), " + + "avg_cost AS (SELECT SUM(dept_total)/COUNT(*) avg FROM dept_costs)\n" + + "SELECT * FROM dept_costs WHERE dept_total > (SELECT avg FROM avg_cost) ORDER BY department_name;"; String expected = "WITH dept_costs AS (\n" + "\t\tSELECT department_name, SUM(salary) AS dept_total\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest2.java index 19f385f6a8..5eefb4ef03 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest2.java @@ -23,20 +23,19 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleSubqueryFactoringTest2 extends TestCase { - public void test_interval() throws Exception { String sql = "WITH org_chart (eid, emp_last, mgr_id, reportLevel, salary, job_id) AS\n" - + "(\n" - + "SELECT employee_id, last_name, manager_id, 0 reportLevel, salary, job_id\n" - + "FROM employees\n" - + "WHERE manager_id is null\n" - + "UNION ALL\n" - + "SELECT e.employee_id, e.last_name, e.manager_id, r.reportLevel+1 reportLevel, e.salary, e.job_id\n" - + "FROM org_chart r, employees e\n" + "WHERE r.eid = e.manager_id\n" + ")\n" - + "SEARCH DEPTH FIRST BY emp_last SET order1\n" - + "CYCLE hire_date SET is_cycle TO 'Y' DEFAULT 'N'" - + "SELECT lpad(' ',2*reportLevel)||emp_last emp_name, eid, mgr_id, salary, job_id\n" - + "FROM org_chart\n" + "ORDER BY order1;\n"; + + "(\n" + + "SELECT employee_id, last_name, manager_id, 0 reportLevel, salary, job_id\n" + + "FROM employees\n" + + "WHERE manager_id is null\n" + + "UNION ALL\n" + + "SELECT e.employee_id, e.last_name, e.manager_id, r.reportLevel+1 reportLevel, e.salary, e.job_id\n" + + "FROM org_chart r, employees e\n" + "WHERE r.eid = e.manager_id\n" + ")\n" + + "SEARCH DEPTH FIRST BY emp_last SET order1\n" + + "CYCLE hire_date SET is_cycle TO 'Y' DEFAULT 'N'" + + "SELECT lpad(' ',2*reportLevel)||emp_last emp_name, eid, mgr_id, salary, job_id\n" + + "FROM org_chart\n" + "ORDER BY order1;\n"; String expected = "WITH org_chart (eid, emp_last, mgr_id, reportLevel, salary, job_id) AS (\n" + "\t\tSELECT employee_id, last_name, manager_id, 0 AS reportLevel, salary\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java index 00a0c4f942..b05dc6ac71 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleTest2 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT NAME FROM V$ARCHIVED_LOG;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTruncateTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTruncateTableTest.java index a513fe6c36..3bda227f0e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTruncateTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTruncateTableTest.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleTruncateTableTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "truncate table \"ESCROW\".\"HT_TASK_TRADE_HISTORY_NEW\" purge snapshot log"; + "truncate table \"ESCROW\".\"HT_TASK_TRADE_HISTORY_NEW\" purge snapshot log"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java index 2d47d8887a..0a3fa72f74 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java @@ -26,13 +26,12 @@ import com.alibaba.druid.stat.TableStat; public class OracleUpdateTest1 extends OracleTest { - public void test_0() throws Exception { String sql = "UPDATE table1 t_alias1 " + // - " SET column = " + // - " (SELECT expr " + // - " FROM table2 t_alias2 " + // - " WHERE t_alias1.column = t_alias2.column); "; + " SET column = " + // + " (SELECT expr " + // + " FROM table2 t_alias2 " + // + " WHERE t_alias1.column = t_alias2.column); "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { Assert.assertEquals(2, visitor.getTables().size()); Assert.assertEquals(3, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("table1", "column"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("table2", "expr"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("table2", "column"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("table1", "column"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("table2", "expr"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("table2", "column"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest2.java index 5f2a961b57..194b3e85e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest2.java @@ -26,21 +26,20 @@ import com.alibaba.druid.stat.TableStat; public class OracleUpdateTest2 extends OracleTest { - public void test_0() throws Exception { String sql = "UPDATE wrh$_tempfile tfh " // - + " SET (snap_id, filename, tsname) =" // - + " (SELECT :lah_snap_id, tf.name name, ts.name tsname" - + // - " FROM v$tempfile tf, ts$ ts" - + // - " WHERE tf.ts# = ts.ts# AND tfh.file# = tf.file# AND tfh.creation_change# = tf.creation_change#" - + // - " )" + // - "WHERE (file#, creation_change#) IN (" + // - " SELECT tf.tfnum, to_number(tf.tfcrc_scn) creation_change# " + // - " FROM x$kcctf tf " + // - " WHERE tf.tfdup != 0) AND dbid = :dbid AND snap_id < :snap_id"; // + + " SET (snap_id, filename, tsname) =" // + + " (SELECT :lah_snap_id, tf.name name, ts.name tsname" + + // + " FROM v$tempfile tf, ts$ ts" + + // + " WHERE tf.ts# = ts.ts# AND tfh.file# = tf.file# AND tfh.creation_change# = tf.creation_change#" + + // + " )" + // + "WHERE (file#, creation_change#) IN (" + // + " SELECT tf.tfnum, to_number(tf.tfcrc_scn) creation_change# " + // + " FROM x$kcctf tf " + // + " WHERE tf.tfdup != 0) AND dbid = :dbid AND snap_id < :snap_id"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java index 28b327a494..3b33dce8d5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java @@ -26,16 +26,15 @@ import com.alibaba.druid.stat.TableStat; public class OracleUpdateTest3 extends OracleTest { - public void test_0() throws Exception { String sql = "update sys.col_usage$ " // - + "set equality_preds = equality_preds + decode(bitand(:flag,1),0,0,1)" // - + " , equijoin_preds = equijoin_preds + decode(bitand(:flag,2),0,0,1)" // - + " , nonequijoin_preds = nonequijoin_preds + decode(bitand(:flag,4),0,0,1)" // - + " , range_preds = range_preds + decode(bitand(:flag,8),0,0,1)" // - + " , like_preds = like_preds + decode(bitand(:flag,16),0,0,1)" // - + " , null_preds = null_preds + decode(bitand(:flag,32),0,0,1), timestamp = :time " + // - "where obj# = :objn and intcol# = :coln"; // + + "set equality_preds = equality_preds + decode(bitand(:flag,1),0,0,1)" // + + " , equijoin_preds = equijoin_preds + decode(bitand(:flag,2),0,0,1)" // + + " , nonequijoin_preds = nonequijoin_preds + decode(bitand(:flag,4),0,0,1)" // + + " , range_preds = range_preds + decode(bitand(:flag,8),0,0,1)" // + + " , like_preds = like_preds + decode(bitand(:flag,16),0,0,1)" // + + " , null_preds = null_preds + decode(bitand(:flag,32),0,0,1), timestamp = :time " + // + "where obj# = :objn and intcol# = :coln"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest4.java index b5624f62a1..787dc4705e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest4.java @@ -26,14 +26,13 @@ import com.alibaba.druid.stat.TableStat; public class OracleUpdateTest4 extends OracleTest { - public void test_0() throws Exception { String sql = "update tabpart$ set " - + // - "dataobj# = :1, part# = :2, hiboundlen = :3, hiboundval = :4, ts# = :5, file# = :6, block# = :7, pctfree$ = :8, pctused$ = :9, initrans = :10, maxtrans = :11, flags = :12, analyzetime = :13, samplesize = :14, rowcnt = :15, blkcnt = :16, empcnt = :17, avgspc = :18, chncnt = :19, avgrln = :20, bhiboundval = EMPTY_BLOB() " - + // - "where obj# = :21 " + // - "returning bhiboundval into :22"; // + + // + "dataobj# = :1, part# = :2, hiboundlen = :3, hiboundval = :4, ts# = :5, file# = :6, block# = :7, pctfree$ = :8, pctused$ = :9, initrans = :10, maxtrans = :11, flags = :12, analyzetime = :13, samplesize = :14, rowcnt = :15, blkcnt = :16, empcnt = :17, avgspc = :18, chncnt = :19, avgrln = :20, bhiboundval = EMPTY_BLOB() " + + // + "where obj# = :21 " + // + "returning bhiboundval into :22"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest5_encoding_error.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest5_encoding_error.java index 25974860a6..8a9fa459d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest5_encoding_error.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest5_encoding_error.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleUpdateTest5_encoding_error extends OracleTest { - public void test_0() throws Exception { String sql = "update x1_use_agent t2 set t2.start_time =to_date((select to_char(sysdate,'yyyy-mm-dd HH24:mi:ss') from dual), 'yyyy-mm-dd HH24:mi:ss'), t2.end_time=to_date((select to_char(sysdate + interval '1' year ,'yyyy-mm-dd HH24:mi:ss') from dual), 'yyyy-mm-dd HH24:mi:ss') where t2.attr2 ='ZB201708311440560'"; @@ -46,7 +45,7 @@ public void test_0() throws Exception { "\tFROM dual\n" + "), 'yyyy-mm-dd HH24:mi:ss')\n" + "WHERE t2.attr2 = 'ZB201708311440560'",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); @@ -61,7 +60,7 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().containsKey(new TableStat.Name("x1_use_agent"))); - assertTrue(visitor.getColumns().contains(new TableStat.Column("x1_use_agent", "start_time"))); + assertTrue(visitor.getColumns().contains(new TableStat.Column("x1_use_agent", "start_time"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterFunctionTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterFunctionTest0.java index 73014c2b70..f99b5d0c8a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterFunctionTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterFunctionTest0.java @@ -26,10 +26,9 @@ import java.util.List; public class OracleAlterFunctionTest0 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER FUNCTION \"ZEUS\".\"STRCAT\" COMPILE REUSE SETTINGS;"; + "ALTER FUNCTION \"ZEUS\".\"STRCAT\" COMPILE REUSE SETTINGS;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest1.java index dbe1554865..c7f09f34d7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest1.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleAlterIndexTest1 extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter index PRODUCT_ADDITION_IND1 monitoring usage"; + "alter index PRODUCT_ADDITION_IND1 monitoring usage"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest2.java index ab6d56825b..b8cb462934 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest2.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleAlterIndexTest2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter index TAXI.AE_ID_AU_CATE_PROD_HMK_TMP_IND rebuild"; + "alter index TAXI.AE_ID_AU_CATE_PROD_HMK_TMP_IND rebuild"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest3.java index a932dd4249..db28bee9dc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest3.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleAlterIndexTest3 extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter index PRODUCT_ADDITION_NCID_IND parallel 1"; + "alter index PRODUCT_ADDITION_NCID_IND parallel 1"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest4.java index da2dd5fd4e..3618734eb2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest4.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleAlterIndexTest4 extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter index HT_TASK_TRADE_HIS_TID_RT_IND_N rename to HT_TASK_TRADE_HIS_TID_RT_IND"; + "alter index HT_TASK_TRADE_HIS_TID_RT_IND_N rename to HT_TASK_TRADE_HIS_TID_RT_IND"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest.java index 79e31b3226..7d610bd4b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleAlterProcedureTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter PROCEDURE ALIBABA1949.SP_BUILD_WS_DEGRADE_EMAIL compile "; + "alter PROCEDURE ALIBABA1949.SP_BUILD_WS_DEGRADE_EMAIL compile "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest2.java index d3dc099f85..c34957e306 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest2.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleAlterProcedureTest2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER PROCEDURE \"ALIBABA1949\".\"FIX_PRODUCT_ADDITION_YZS_0210\" COMPILE REUSE SETTINGS"; + "ALTER PROCEDURE \"ALIBABA1949\".\"FIX_PRODUCT_ADDITION_YZS_0210\" COMPILE REUSE SETTINGS"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSequence_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSequence_0.java index 1f0fa84624..20752d9ce5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSequence_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSequence_0.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class OracleAlterSequence_0 extends TestCase { - public void test_alter_seq_0() throws Exception { String sql = "ALTER SEQUENCE SEQ_XXX INCREMENT BY 2"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSessionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSessionTest.java index 2c6c0e8af4..186ef5f3ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSessionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSessionTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleAlterSessionTest extends OracleTest { - public void test_0() throws Exception { String sql = "alter session set current_schema=retl"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSynonymTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSynonymTest.java index 5e394f146c..9e2ec80486 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSynonymTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSynonymTest.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleAlterSynonymTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER SYNONYM \"ESCROW\".\"COMPANY\" COMPILE"; + "ALTER SYNONYM \"ESCROW\".\"COMPANY\" COMPILE"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest.java index 4983e27aee..f0c6a0dd40 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter table WRH$_SERVICE_WAIT_CLASS drop partition WRH$_SERVIC_1870432296_13478"; + "alter table WRH$_SERVICE_WAIT_CLASS drop partition WRH$_SERVIC_1870432296_13478"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -49,7 +48,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("WRH$_SERVICE_WAIT_CLASS"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("WRH$_SERVICE_WAIT_CLASS"))); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest10.java index 8c41550f1f..6d011c8f5c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest10.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest10 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE ws_affiliate_tran_product add ( discount_amount NUMBER, commission_amount NUMBER )"; + "ALTER TABLE ws_affiliate_tran_product add ( discount_amount NUMBER, commission_amount NUMBER )"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,8 +52,8 @@ public void test_0() throws Exception { Assert.assertEquals(2, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("ws_affiliate_tran_product", "discount_amount"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("ws_affiliate_tran_product", "commission_amount"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("ws_affiliate_tran_product", "discount_amount"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("ws_affiliate_tran_product", "commission_amount"))); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "order_mode"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest11.java index b16c2cc8aa..c40b17584f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest11.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest11 extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter table PRODUCT_IDS_ZZJ_TBD0209 move tablespace MCSHADOWTS"; + "alter table PRODUCT_IDS_ZZJ_TBD0209 move tablespace MCSHADOWTS"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest12.java index 10aab02d93..aaabfd9b8f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest12.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest12 extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter table st_jklsxxb enable constraint FK_ST_xxx_REFERENCE_ST_xxx"; + "alter table st_jklsxxb enable constraint FK_ST_xxx_REFERENCE_ST_xxx"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest13.java index 8483985638..62dedd87e1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest13.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest13 extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter table st_jklsxxb disable constraint FK_ST_xxx_REFERENCE_ST_xxx"; + "alter table st_jklsxxb disable constraint FK_ST_xxx_REFERENCE_ST_xxx"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest14.java index f987ac64fe..6a5b11e902 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest14.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest14 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE measure_data MODIFY measure_id NUMBER(38)"; + "ALTER TABLE measure_data MODIFY measure_id NUMBER(38)"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest15.java index c3c8fab9b0..e2219050b3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest15.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest15 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE extensions ADD core NUMBER(1)"; + "ALTER TABLE extensions ADD core NUMBER(1)"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest16.java index ec5e03e095..089db51d59 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest16.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest16 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE extensions DROP COLUMN category"; + "ALTER TABLE extensions DROP COLUMN category"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest17.java index 38d577be0c..e0be429b8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest17.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest17 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE rules RENAME COLUMN temp_plugin_config_key to plugin_config_key"; + "ALTER TABLE rules RENAME COLUMN temp_plugin_config_key to plugin_config_key"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest18.java index 8e0ef6f8d7..103ee95d19 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest18.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest18 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE project_measures DROP (diff_value_1, diff_value_2, diff_value_3)"; + "ALTER TABLE project_measures DROP (diff_value_1, diff_value_2, diff_value_3)"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest19.java index 625c5c6815..1765a15ec7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest19.java @@ -28,13 +28,12 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleAlterTableTest19 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE warehouses" // - + " ADD CONSTRAINT wh_unq UNIQUE (warehouse_id, warehouse_name)"// - + " USING INDEX PCTFREE 5"// - + " EXCEPTIONS INTO wrong_id;"; + "ALTER TABLE warehouses" // + + " ADD CONSTRAINT wh_unq UNIQUE (warehouse_id, warehouse_name)"// + + " USING INDEX PCTFREE 5"// + + " EXCEPTIONS INTO wrong_id;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest2.java index 3f02821717..9e8e9c8175 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest2.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter table cdc.en_complaint_ipr_stat_fdt0 truncate partition AUTO_P_2012_02_14"; + "alter table cdc.en_complaint_ipr_stat_fdt0 truncate partition AUTO_P_2012_02_14"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -49,7 +48,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, visitor.getTables().size()); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("cdc.en_complaint_ipr_stat_fdt0"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("cdc.en_complaint_ipr_stat_fdt0"))); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest20.java index d45c36ed3c..6dc1c895f2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest20.java @@ -28,11 +28,10 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleAlterTableTest20 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE sales " // - + " ADD CONSTRAINT sales_pk PRIMARY KEY (prod_id, cust_id) DISABLE; "; + "ALTER TABLE sales " // + + " ADD CONSTRAINT sales_pk PRIMARY KEY (prod_id, cust_id) DISABLE; "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -51,8 +50,8 @@ public void test_0() throws Exception { System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals("ALTER TABLE sales" // - + "\n\tADD CONSTRAINT sales_pk PRIMARY KEY (prod_id, cust_id) DISABLE;", // - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tADD CONSTRAINT sales_pk PRIMARY KEY (prod_id, cust_id) DISABLE;", // + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); Assert.assertEquals(1, visitor.getTables().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest21.java index 499dec1b03..0899528985 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest21.java @@ -28,10 +28,9 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleAlterTableTest21 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE long_tab DROP COLUMN long_pics;"; + "ALTER TABLE long_tab DROP COLUMN long_pics;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -50,8 +49,8 @@ public void test_0() throws Exception { System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals("ALTER TABLE long_tab"// - + "\n\tDROP COLUMN long_pics;", // - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tDROP COLUMN long_pics;", // + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); Assert.assertEquals(1, visitor.getTables().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest22.java index 6ddb856caa..0ae075a820 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest22.java @@ -28,12 +28,11 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleAlterTableTest22 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE employees ADD CONSTRAINT check_comp " // - + " CHECK (salary + (commission_pct*salary) <= 5000)" // - + " DISABLE;"; + "ALTER TABLE employees ADD CONSTRAINT check_comp " // + + " CHECK (salary + (commission_pct*salary) <= 5000)" // + + " DISABLE;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,8 +51,8 @@ public void test_0() throws Exception { System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals("ALTER TABLE employees" // - + "\n\tADD CONSTRAINT check_comp CHECK (salary + commission_pct * salary <= 5000) DISABLE;", // - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tADD CONSTRAINT check_comp CHECK (salary + commission_pct * salary <= 5000) DISABLE;", // + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); Assert.assertEquals(1, visitor.getTables().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest24.java index 2f65760378..3ab33b9f9c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest24.java @@ -27,10 +27,9 @@ import java.util.List; public class OracleAlterTableTest24 extends OracleTest { - public void test_0() throws Exception { String sql = // - "RENAME new_duplications_index TO duplications_index"; + "RENAME new_duplications_index TO duplications_index"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -49,7 +48,7 @@ public void test_0() throws Exception { System.out.println("orderBy : " + visitor.getOrderByColumns()); Assert.assertEquals("RENAME new_duplications_index TO duplications_index", // - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); Assert.assertEquals(1, visitor.getTables().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest25_drop_pk.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest25_drop_pk.java index cec3c6d6ac..fc97e9368e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest25_drop_pk.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest25_drop_pk.java @@ -25,7 +25,6 @@ import org.junit.Assert; public class OracleAlterTableTest25_drop_pk extends TestCase { - public void test_alter_constraint() throws Exception { String sql = "alter table supplier drop primary key;"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest3.java index fc6f5e2c8b..1eccab0da5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest3.java @@ -26,14 +26,13 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest3 extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter table WRH$_ROWCACHE_SUMMARY split partition WRH$_ROWCAC_1870432296_13862 " // - + " at (1870432296,13910) " // - + " into (partition WRH$_ROWCAC_1870432296_13862 tablespace SYSAUX, partition WRH$_ROWCAC_1870432296_13910 tablespace SYSAUX" // - + ") " + // - " update indexes"; + "alter table WRH$_ROWCACHE_SUMMARY split partition WRH$_ROWCAC_1870432296_13862 " // + + " at (1870432296,13910) " // + + " into (partition WRH$_ROWCAC_1870432296_13862 tablespace SYSAUX, partition WRH$_ROWCAC_1870432296_13910 tablespace SYSAUX" // + + ") " + // + " update indexes"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest4.java index 19170d7db9..d4223fdd24 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest4.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest4 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE ws_pledge_contract modify ( reference VARCHAR2(4000) )"; + "ALTER TABLE ws_pledge_contract modify ( reference VARCHAR2(4000) )"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,7 +52,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("ws_pledge_contract", "reference"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("ws_pledge_contract", "reference"))); // 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/alter/OracleAlterTableTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest5.java index 8d745c1828..d19117e5a3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest5.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest5 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE ht_task_flow_biz_product_2 modify ( ipr_biz_type_id DEFAULT 0 )"; + "ALTER TABLE ht_task_flow_biz_product_2 modify ( ipr_biz_type_id DEFAULT 0 )"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -54,7 +53,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("ht_task_flow_biz_product_2", - "ipr_biz_type_id"))); + "ipr_biz_type_id"))); // 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/alter/OracleAlterTableTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest6.java index 8ccc380b22..7b3b5e0dc1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest6.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest6 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE wl_service_record add ( service_type VARCHAR2(32) )"; + "ALTER TABLE wl_service_record add ( service_type VARCHAR2(32) )"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,7 +52,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("wl_service_record", "service_type"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("wl_service_record", "service_type"))); // 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/alter/OracleAlterTableTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest7.java index 2412d3e9dc..3f6df8be05 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest7.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest7 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE wl_ship_order modify ( forwarder_service DEFAULT 'UPS', status DEFAULT 500 )"; + "ALTER TABLE wl_ship_order modify ( forwarder_service DEFAULT 'UPS', status DEFAULT 500 )"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,8 +52,8 @@ public void test_0() throws Exception { Assert.assertEquals(2, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("wl_ship_order", "forwarder_service"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("wl_ship_order", "status"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("wl_ship_order", "forwarder_service"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("wl_ship_order", "status"))); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "order_mode"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest8.java index f72808e266..54e988b368 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest8.java @@ -26,11 +26,10 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest8 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE ws_i18n_translate_item ADD CONSTRAINT ws_i18n_translate_item_pk "// - + "PRIMARY KEY (id) USING INDEX ws_i18n_translate_item_pk"; + "ALTER TABLE ws_i18n_translate_item ADD CONSTRAINT ws_i18n_translate_item_pk "// + + "PRIMARY KEY (id) USING INDEX ws_i18n_translate_item_pk"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest9.java index c2aacbd03e..f11985301a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest9.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTest9 extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter table archive_feedback drop partition P201150 update global indexes"; + "alter table archive_feedback drop partition P201150 update global indexes"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTestRename.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTestRename.java index 708d629a16..a6a3426c58 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTestRename.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTestRename.java @@ -26,10 +26,9 @@ import com.alibaba.druid.stat.TableStat; public class OracleAlterTableTestRename extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter table PRODUCT_NEW_CLUSTER_YZS_0210 rename to PRODUCT_NEW_CLUSTER_YZS_0210_1"; + "alter table PRODUCT_NEW_CLUSTER_YZS_0210 rename to PRODUCT_NEW_CLUSTER_YZS_0210_1"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest_drop_constraint.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest_drop_constraint.java index ee21f539f9..43b954815c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest_drop_constraint.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest_drop_constraint.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleAlterTableTest_drop_constraint extends TestCase { - public void test_alter_constraint() throws Exception { String sql = "alter table TUSER drop constraint UK_084c17821a8f47e8b31fbb126b6"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -45,7 +44,7 @@ public void test_alter_constraint() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE); Assert.assertEquals("ALTER TABLE TUSER" + // - "\n\tDROP CONSTRAINT UK_084c17821a8f47e8b31fbb126b6", output); + "\n\tDROP CONSTRAINT UK_084c17821a8f47e8b31fbb126b6", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTablespaceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTablespaceTest.java index 27d8cbd847..bb8b24c69a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTablespaceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTablespaceTest.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleAlterTablespaceTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter tablespace escrow_data add datafile '/opt/oracle/oradata/usoint/f937.dbf' size 4095m autoextend off"; + "alter tablespace escrow_data add datafile '/opt/oracle/oradata/usoint/f937.dbf' size 4095m autoextend off"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest.java index e8d8f01aa7..30d74a8198 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleAlterTriggerTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter trigger DDL_TRIGGER_FOR_DATABASE ENABLE"; + "alter trigger DDL_TRIGGER_FOR_DATABASE ENABLE"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest2.java index a14b4f8b73..ecfa024655 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest2.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleAlterTriggerTest2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter TRIGGER RETL.TRG_COMPANY_SYNC compile"; + "alter TRIGGER RETL.TRG_COMPANY_SYNC compile"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTypeTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTypeTest0.java index d37e30800b..5145f53faa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTypeTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTypeTest0.java @@ -26,10 +26,9 @@ import java.util.List; public class OracleAlterTypeTest0 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TYPE \"ZEUS\".\"STRCAT_TYPE\" COMPILE BODY REUSE SETTINGS;"; + "ALTER TYPE \"ZEUS\".\"STRCAT_TYPE\" COMPILE BODY REUSE SETTINGS;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterViewTest.java index 097bd4d709..ebcf197410 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterViewTest.java @@ -25,10 +25,9 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleAlterViewTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "alter VIEW ALIBABA1949.COMPANY_VIEW_2 compile"; + "alter VIEW ALIBABA1949.COMPANY_VIEW_2 compile"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest.java index 60eec23e01..7eb7a6ac87 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleBlockTest extends OracleTest { - public void test_0() throws Exception { String sql = "BEGIN :RESULT := \"SYS\".\"DBMS_AQ_IMPORT_INTERNAL\".\"AQ_EXPORT_CHECK\"(:arg); END;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest1.java index 8bc0b24543..7455a24479 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest1.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleBlockTest1 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE n NUMBER; str_stmt VARCHAR2(4000); sql_text ora_name_list_t; l_trace NUMBER; l_alert NUMBER; BEGIN n := ora_sql_txt(sql_text); FOR i IN 1 .. n LOOP str_stmt := SUBSTR(str_stmt || sql_text(i), 1, 300); END LOOP; SELECT COUNT(*) INTO l_trace FROM DUAL WHERE (sys_context('userenv', 'ip_address') IS NOT NULL) and lower(str_stmt) like 'alter% compile%'; IF l_trace > 0 THEN RAISE_APPLICATION_ERROR(-20001,'Please try later,DBA is publishing DDL for project'); END IF; END;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest10.java index f81fac3274..a4668f61c7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest10.java @@ -26,18 +26,17 @@ import com.alibaba.druid.stat.TableStat; public class OracleBlockTest10 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE" + // - " CURSOR c1 IS" + // - " SELECT last_name, department_name" + // - " FROM employees, departments" + // - " WHERE employees.department_id = departments.department_id " + // - " AND job_id = 'SA_MAN'" + // - " FOR UPDATE OF salary;" + // - "BEGIN" + // - " NULL;" + // - "END;"; // + " CURSOR c1 IS" + // + " SELECT last_name, department_name" + // + " FROM employees, departments" + // + " WHERE employees.department_id = departments.department_id " + // + " AND job_id = 'SA_MAN'" + // + " FOR UPDATE OF salary;" + // + "BEGIN" + // + " NULL;" + // + "END;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest11.java index a248b0cf93..6e14f61ecb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest11.java @@ -26,42 +26,41 @@ import com.alibaba.druid.stat.TableStat; public class OracleBlockTest11 extends OracleTest { - public void test_0() throws Exception { String sql = "DROP TABLE emp;" + - "CREATE TABLE emp AS SELECT * FROM employees;" + - " " + - "DECLARE" + - " CURSOR c1 IS" + - " SELECT * FROM emp" + - " FOR UPDATE OF salary" + - " ORDER BY employee_id;" + - " emp_rec emp%ROWTYPE;" + - "BEGIN" + - " OPEN c1;" + - " LOOP" + - " FETCH c1 INTO emp_rec; -- fails on second iteration\n" + - " EXIT WHEN c1%NOTFOUND;" + - " DBMS_OUTPUT.PUT_LINE (" + - " 'emp_rec.employee_id = ' ||" + - " TO_CHAR(emp_rec.employee_id)" + - " );" + - " " + - " UPDATE emp" + - " SET salary = salary * 1.05" + - " WHERE employee_id = 105;" + - " " + - " COMMIT; -- releases locks\n" + - " END LOOP;" + - "END;"; // + "CREATE TABLE emp AS SELECT * FROM employees;" + + " " + + "DECLARE" + + " CURSOR c1 IS" + + " SELECT * FROM emp" + + " FOR UPDATE OF salary" + + " ORDER BY employee_id;" + + " emp_rec emp%ROWTYPE;" + + "BEGIN" + + " OPEN c1;" + + " LOOP" + + " FETCH c1 INTO emp_rec; -- fails on second iteration\n" + + " EXIT WHEN c1%NOTFOUND;" + + " DBMS_OUTPUT.PUT_LINE (" + + " 'emp_rec.employee_id = ' ||" + + " TO_CHAR(emp_rec.employee_id)" + + " );" + + " " + + " UPDATE emp" + + " SET salary = salary * 1.05" + + " WHERE employee_id = 105;" + + " " + + " COMMIT; -- releases locks\n" + + " END LOOP;" + + "END;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); - for (SQLStatement stmt : statementList) { - System.out.println(stmt); - System.out.println(); - } + for (SQLStatement stmt : statementList) { + System.out.println(stmt); + System.out.println(); + } Assert.assertEquals(3, statementList.size()); @@ -86,7 +85,7 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.containsColumn("employees", "*")); Assert.assertTrue(visitor.containsColumn("emp", "employee_id")); - Assert.assertTrue(visitor.containsColumn("emp", "*")); - Assert.assertTrue(visitor.containsColumn("emp", "salary")); + Assert.assertTrue(visitor.containsColumn("emp", "*")); + Assert.assertTrue(visitor.containsColumn("emp", "salary")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest12.java index ee280b4853..5861ed7bc5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest12.java @@ -26,32 +26,31 @@ import com.alibaba.druid.stat.TableStat; public class OracleBlockTest12 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE" + - " emp_id NUMBER(6);" + - " emp_lastname VARCHAR2(25);" + - " emp_salary NUMBER(8,2);" + - " emp_jobid VARCHAR2(10);" + - "BEGIN" + - " SELECT employee_id, last_name, salary, job_id" + - " INTO emp_id, emp_lastname, emp_salary, emp_jobid" + - " FROM employees" + - " WHERE employee_id = 120;" + - "" + - " INSERT INTO emp_name (employee_id, last_name)" + - " VALUES (emp_id, emp_lastname); " + - " INSERT INTO emp_sal (employee_id, salary) " + - " VALUES (emp_id, emp_salary);" + - "" + - " INSERT INTO emp_job (employee_id, job_id)" + - " VALUES (emp_id, emp_jobid);" + - " " + - "EXCEPTION" + - " WHEN DUP_VAL_ON_INDEX THEN" + - " ROLLBACK;" + - " DBMS_OUTPUT.PUT_LINE('Inserts were rolled back');" + - "END;"; // + " emp_id NUMBER(6);" + + " emp_lastname VARCHAR2(25);" + + " emp_salary NUMBER(8,2);" + + " emp_jobid VARCHAR2(10);" + + "BEGIN" + + " SELECT employee_id, last_name, salary, job_id" + + " INTO emp_id, emp_lastname, emp_salary, emp_jobid" + + " FROM employees" + + " WHERE employee_id = 120;" + + "" + + " INSERT INTO emp_name (employee_id, last_name)" + + " VALUES (emp_id, emp_lastname); " + + " INSERT INTO emp_sal (employee_id, salary) " + + " VALUES (emp_id, emp_salary);" + + "" + + " INSERT INTO emp_job (employee_id, job_id)" + + " VALUES (emp_id, emp_jobid);" + + " " + + "EXCEPTION" + + " WHEN DUP_VAL_ON_INDEX THEN" + + " ROLLBACK;" + + " DBMS_OUTPUT.PUT_LINE('Inserts were rolled back');" + + "END;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest13.java index 85f21fcbba..1e685a3820 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest13.java @@ -26,36 +26,35 @@ import com.alibaba.druid.stat.TableStat; public class OracleBlockTest13 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE" + // - " emp_id employees.employee_id%TYPE;" + // - " emp_lastname employees.last_name%TYPE;" + // - " emp_salary employees.salary%TYPE;" + // - "" + // - "BEGIN" + // - " SELECT employee_id, last_name, salary" + // - " INTO emp_id, emp_lastname, emp_salary " + // - " FROM employees" + // - " WHERE employee_id = 120;" + // - " " + // - " UPDATE emp_name" + // - " SET salary = salary * 1.1" + // - " WHERE employee_id = emp_id;" + // - "" + // - " DELETE FROM emp_name" + // - " WHERE employee_id = 130;" + // - "" + // - " SAVEPOINT do_insert;" + // - " " + // - " INSERT INTO emp_name (employee_id, last_name, salary)" + // - " VALUES (emp_id, emp_lastname, emp_salary);" + // - " " + // - "EXCEPTION" + // - " WHEN DUP_VAL_ON_INDEX THEN" + // - " ROLLBACK TO do_insert;" + // - " DBMS_OUTPUT.PUT_LINE('Insert was rolled back');" + // - "END;"; // + " emp_id employees.employee_id%TYPE;" + // + " emp_lastname employees.last_name%TYPE;" + // + " emp_salary employees.salary%TYPE;" + // + "" + // + "BEGIN" + // + " SELECT employee_id, last_name, salary" + // + " INTO emp_id, emp_lastname, emp_salary " + // + " FROM employees" + // + " WHERE employee_id = 120;" + // + " " + // + " UPDATE emp_name" + // + " SET salary = salary * 1.1" + // + " WHERE employee_id = emp_id;" + // + "" + // + " DELETE FROM emp_name" + // + " WHERE employee_id = 130;" + // + "" + // + " SAVEPOINT do_insert;" + // + " " + // + " INSERT INTO emp_name (employee_id, last_name, salary)" + // + " VALUES (emp_id, emp_lastname, emp_salary);" + // + " " + // + "EXCEPTION" + // + " WHEN DUP_VAL_ON_INDEX THEN" + // + " ROLLBACK TO do_insert;" + // + " DBMS_OUTPUT.PUT_LINE('Insert was rolled back');" + // + "END;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest14.java index 282acf430e..16d124ecb9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest14.java @@ -26,37 +26,36 @@ import com.alibaba.druid.stat.TableStat; public class OracleBlockTest14 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE" + // - " emp_id employees.employee_id%TYPE;" + // - " emp_lastname employees.last_name%TYPE;" + // - " emp_salary employees.salary%TYPE;" + // - "" + // - "BEGIN" + // - " SELECT employee_id, last_name, salary" + // - " INTO emp_id, emp_lastname, emp_salary" + // - " FROM employees" + // - " WHERE employee_id = 120;" + // - " SAVEPOINT my_savepoint;" + // - " " + // - " UPDATE emp_name" + // - " SET salary = salary * 1.1" + // - " WHERE employee_id = emp_id;" + // - " " + // - " DELETE FROM emp_name" + // - " WHERE employee_id = 130;" + // - " " + // - " SAVEPOINT my_savepoint;" + // - " " + // - " INSERT INTO emp_name (employee_id, last_name, salary)" + // - " VALUES (emp_id, emp_lastname, emp_salary);" + // - "" + // - "EXCEPTION" + // - " WHEN DUP_VAL_ON_INDEX THEN" + // - " ROLLBACK TO my_savepoint;" + // - " DBMS_OUTPUT.PUT_LINE('Transaction rolled back.');" + // - "END;"; // + " emp_id employees.employee_id%TYPE;" + // + " emp_lastname employees.last_name%TYPE;" + // + " emp_salary employees.salary%TYPE;" + // + "" + // + "BEGIN" + // + " SELECT employee_id, last_name, salary" + // + " INTO emp_id, emp_lastname, emp_salary" + // + " FROM employees" + // + " WHERE employee_id = 120;" + // + " SAVEPOINT my_savepoint;" + // + " " + // + " UPDATE emp_name" + // + " SET salary = salary * 1.1" + // + " WHERE employee_id = emp_id;" + // + " " + // + " DELETE FROM emp_name" + // + " WHERE employee_id = 130;" + // + " " + // + " SAVEPOINT my_savepoint;" + // + " " + // + " INSERT INTO emp_name (employee_id, last_name, salary)" + // + " VALUES (emp_id, emp_lastname, emp_salary);" + // + "" + // + "EXCEPTION" + // + " WHEN DUP_VAL_ON_INDEX THEN" + // + " ROLLBACK TO my_savepoint;" + // + " DBMS_OUTPUT.PUT_LINE('Transaction rolled back.');" + // + "END;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest15.java index e8dd6d9757..9c40f374df 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest15.java @@ -27,22 +27,21 @@ import java.util.List; public class OracleBlockTest15 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + - " sales NUMBER(8,2) := 10100;\n" + - " quota NUMBER(8,2) := 10000;\n" + - " bonus NUMBER(6,2);\n" + - " emp_id NUMBER(6) := 120;\n" + - " BEGIN\n" + - " IF sales > (quota + 200) THEN\n" + - " bonus := (sales - quota)/4;\n" + - " \n" + - " UPDATE employees SET salary =\n" + - " salary + bonus\n" + - " WHERE employee_id = emp_id;\n" + - " END IF;\n" + - " END;"; // + " sales NUMBER(8,2) := 10100;\n" + + " quota NUMBER(8,2) := 10000;\n" + + " bonus NUMBER(6,2);\n" + + " emp_id NUMBER(6) := 120;\n" + + " BEGIN\n" + + " IF sales > (quota + 200) THEN\n" + + " bonus := (sales - quota)/4;\n" + + " \n" + + " UPDATE employees SET salary =\n" + + " salary + bonus\n" + + " WHERE employee_id = emp_id;\n" + + " END IF;\n" + + " END;"; // List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest16.java index a077de7566..3fe58df80e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest16.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleBlockTest16 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + " s PLS_INTEGER := 0;\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest17.java index ef81c71db8..235319450f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest17.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleBlockTest17 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + " x NUMBER := 0;\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest18.java index 2f995f4d0d..dfe3cdb530 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest18.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleBlockTest18 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE PROCEDURE p (\n" + " sales NUMBER,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest19.java index 29e4af40b0..5f21bd123d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest19.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleBlockTest19 extends OracleTest { - public void test_0() throws Exception { String sql = "BEGIN\n" + " EXECUTE IMMEDIATE 'DROP SEQUENCE properties_seq';\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest2.java index e3620dbf27..55a1867247 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest2.java @@ -26,25 +26,24 @@ import com.alibaba.druid.stat.TableStat; public class OracleBlockTest2 extends OracleTest { - public void test_0() throws Exception { String sql = "declare i integer := 0; " // - + "begin " + // - " for c in (" + // - " select id " + // - " from wl_ship_order" + // - " where forwarder_service is null or status is null) " + // - " loop" + // - " update wl_ship_order" + // - " set forwarder_service = nvl(forwarder_service, 'UPS'), status = nvl(status, 500)" + // - " where id = c.id;" + // - " i := i + 1;" + // - " if mod(i, 100) = 0 then" + // - " commit;" + // - " end if;" + // - " end loop;" + // - " commit; " + // - "end;"; + + "begin " + // + " for c in (" + // + " select id " + // + " from wl_ship_order" + // + " where forwarder_service is null or status is null) " + // + " loop" + // + " update wl_ship_order" + // + " set forwarder_service = nvl(forwarder_service, 'UPS'), status = nvl(status, 500)" + // + " where id = c.id;" + // + " i := i + 1;" + // + " if mod(i, 100) = 0 then" + // + " commit;" + // + " end if;" + // + " end loop;" + // + " commit; " + // + "end;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest20.java index 846948dc58..e90b47b119 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest20.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleBlockTest20 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + " sql_stmt VARCHAR2(200);\n" + @@ -102,6 +101,6 @@ public void test_0() throws Exception { assertEquals(2, visitor.getConditions().size()); assertEquals(0, visitor.getRelationships().size()); - assertTrue(visitor.getColumns().contains(new TableStat.Column("bonus", "id"))); + assertTrue(visitor.getColumns().contains(new TableStat.Column("bonus", "id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest21.java index 22e7ec54cd..eab5af585a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest21.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleBlockTest21 extends OracleTest { - public void test_0() throws Exception { String sql = "BEGIN\n" + " FOR someone IN (\n" + @@ -77,6 +76,6 @@ public void test_0() throws Exception { assertEquals(1, visitor.getConditions().size()); assertEquals(0, visitor.getRelationships().size()); - assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); + assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest22_comment.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest22_comment.java index 0f840f489f..f62e6a6807 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest22_comment.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest22_comment.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleBlockTest22_comment extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + " howmany NUMBER;\n" + @@ -76,7 +75,7 @@ public void test_0() throws Exception { assertEquals(1, visitor.getConditions().size()); assertEquals(0, visitor.getRelationships().size()); - assertTrue(visitor.containsColumn("USER_OBJECTS", "OBJECT_TYPE")); - assertTrue(visitor.containsColumn("USER_OBJECTS", "*")); + assertTrue(visitor.containsColumn("USER_OBJECTS", "OBJECT_TYPE")); + assertTrue(visitor.containsColumn("USER_OBJECTS", "*")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest3.java index 386b9ee24a..16f4372ede 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest3.java @@ -25,19 +25,18 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleBlockTest3 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE " + // - " job BINARY_INTEGER := :job; " + // - " next_date DATE := :mydate; " + // - " broken BOOLEAN := FALSE; " + // - "BEGIN " + // - " get_promo_product_search; " + // - " :mydate := next_date; " + // - " IF broken THEN :b := 1; " + // - " ELSE :b := 0; " + // - " END IF; " + // - "END; "; + " job BINARY_INTEGER := :job; " + // + " next_date DATE := :mydate; " + // + " broken BOOLEAN := FALSE; " + // + "BEGIN " + // + " get_promo_product_search; " + // + " :mydate := next_date; " + // + " IF broken THEN :b := 1; " + // + " ELSE :b := 0; " + // + " END IF; " + // + "END; "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest4.java index 18fcab42e4..2b0a99ec3c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest4.java @@ -25,18 +25,17 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleBlockTest4 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE" + // - " done BOOLEAN;" + // - "BEGIN" + // - " FOR i IN 1..50 LOOP" + // - " IF done THEN" + // - " GOTO end_loop;" + // - " END IF;" + // - " <>" + // - " END LOOP;" + // - "END;"; + " done BOOLEAN;" + // + "BEGIN" + // + " FOR i IN 1..50 LOOP" + // + " IF done THEN" + // + " GOTO end_loop;" + // + " END IF;" + // + " <>" + // + " END LOOP;" + // + "END;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest5.java index f47ce30f6a..f65437c521 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest5.java @@ -28,23 +28,22 @@ import com.alibaba.druid.stat.TableStat; public class OracleBlockTest5 extends OracleTest { - public void test_0() throws Exception { String sql = "declare l_cnt number; " - + // - "begin l_cnt := 0;" - + // - " for c1 in (select id || '' id" +// - " from escrow_trade" + // - " where out_order_id in" + // - " (select out_order_id from tab_ipay_out_order_ids)" + // - " ) " + // - " loop" + // - " update ipay_contract" + // - " set is_chargeback = 'N'" + // - " where out_ref = c1.id and is_chargeback <> 'N'; l_cnt := l_cnt + 1; if (mod(l_cnt, 200) = 0) then commit; end if; dbms_application_info.set_client_info(l_cnt || ' rows updated!'); end loop; commit; exception when others then raise;" - + " rollback; " + // - "end;;"; + + // + "begin l_cnt := 0;" + + // + " for c1 in (select id || '' id" +// + " from escrow_trade" + // + " where out_order_id in" + // + " (select out_order_id from tab_ipay_out_order_ids)" + // + " ) " + // + " loop" + // + " update ipay_contract" + // + " set is_chargeback = 'N'" + // + " where out_ref = c1.id and is_chargeback <> 'N'; l_cnt := l_cnt + 1; if (mod(l_cnt, 200) = 0) then commit; end if; dbms_application_info.set_client_info(l_cnt || ' rows updated!'); end loop; commit; exception when others then raise;" + + " rollback; " + // + "end;;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -65,17 +64,17 @@ public void test_0() throws Exception { Assert.assertEquals(3, visitor.getTables().size()); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("escrow_trade"))); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("tab_ipay_out_order_ids"))); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("ipay_contract"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("escrow_trade"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("tab_ipay_out_order_ids"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("ipay_contract"))); Assert.assertEquals(5, visitor.getColumns().size()); Assert.assertEquals(3, visitor.getConditions().size()); - Assert.assertTrue(visitor.containsColumn("escrow_trade", "id")); - Assert.assertTrue(visitor.containsColumn("escrow_trade", "out_order_id")); - Assert.assertTrue(visitor.containsColumn("tab_ipay_out_order_ids", "out_order_id")); - Assert.assertTrue(visitor.containsColumn("ipay_contract", "is_chargeback")); - Assert.assertTrue(visitor.containsColumn("ipay_contract", "out_ref")); + Assert.assertTrue(visitor.containsColumn("escrow_trade", "id")); + Assert.assertTrue(visitor.containsColumn("escrow_trade", "out_order_id")); + Assert.assertTrue(visitor.containsColumn("tab_ipay_out_order_ids", "out_order_id")); + Assert.assertTrue(visitor.containsColumn("ipay_contract", "is_chargeback")); + Assert.assertTrue(visitor.containsColumn("ipay_contract", "out_ref")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest6.java index 25142c8f05..eaaf42ce98 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest6.java @@ -25,35 +25,34 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleBlockTest6 extends OracleTest { - public void test_0() throws Exception { String sql = "declare" + // - " l_line varchar2(32767);" + // - " l_done number;" + // - " l_buffer varchar2(32767) := '';" + // - " l_lengthbuffer number := 0;" + // - " l_lengthline number := 0; " + // - "begin" + // - " loop" + // - " dbms_output.get_line( l_line, l_done );" + // - " if (l_buffer is null) then" + // - " l_lengthbuffer := 0;" + // - " else" + // - " l_lengthbuffer := length(l_buffer);" + // - " end if;" + // - " if (l_line is null) then" + // - " l_lengthline := 0;" + // - " else" + // - " l_lengthline := length(l_line);" + // - " end if;" + // - " exit when l_lengthbuffer + l_lengthline > :maxbytes " + // - " OR l_lengthbuffer + l_lengthline > 32767 OR l_done = 1;" + // - " l_buffer := l_buffer || l_line || chr(10);" + // - " end loop;" + // - " :done := l_done;" + // - " :buffer := l_buffer;" + // - " :line := l_line; " + // - "end;"; + " l_line varchar2(32767);" + // + " l_done number;" + // + " l_buffer varchar2(32767) := '';" + // + " l_lengthbuffer number := 0;" + // + " l_lengthline number := 0; " + // + "begin" + // + " loop" + // + " dbms_output.get_line( l_line, l_done );" + // + " if (l_buffer is null) then" + // + " l_lengthbuffer := 0;" + // + " else" + // + " l_lengthbuffer := length(l_buffer);" + // + " end if;" + // + " if (l_line is null) then" + // + " l_lengthline := 0;" + // + " else" + // + " l_lengthline := length(l_line);" + // + " end if;" + // + " exit when l_lengthbuffer + l_lengthline > :maxbytes " + // + " OR l_lengthbuffer + l_lengthline > 32767 OR l_done = 1;" + // + " l_buffer := l_buffer || l_line || chr(10);" + // + " end loop;" + // + " :done := l_done;" + // + " :buffer := l_buffer;" + // + " :line := l_line; " + // + "end;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest7.java index 58a8813a6c..a1e388ca4e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest7.java @@ -26,33 +26,32 @@ import com.alibaba.druid.stat.TableStat; public class OracleBlockTest7 extends OracleTest { - public void test_0() throws Exception { String sql = "DROP TABLE employees_temp; " + // - "CREATE TABLE employees_temp AS " + // - " SELECT employee_id, first_name, last_name " + // - " FROM employees;" + // - " " + // - "DECLARE" + // - " emp_id employees_temp.employee_id%TYPE := 299;" + // - " emp_first_name employees_temp.first_name%TYPE := 'Bob';" + // - " emp_last_name employees_temp.last_name%TYPE := 'Henry';" + // - "BEGIN" + // - " INSERT INTO employees_temp (employee_id, first_name, last_name) " + // - " VALUES (emp_id, emp_first_name, emp_last_name);" + // - " " + // - " UPDATE employees_temp" + // - " SET first_name = 'Robert'" + // - " WHERE employee_id = emp_id;" + // - " " + // - " DELETE FROM employees_temp" + // - " WHERE employee_id = emp_id" + // - " RETURNING first_name, last_name" + // - " INTO emp_first_name, emp_last_name;" + // - "" + // - " COMMIT;" + // - " DBMS_OUTPUT.PUT_LINE (emp_first_name || ' ' || emp_last_name);" + // - "END;"; // + "CREATE TABLE employees_temp AS " + // + " SELECT employee_id, first_name, last_name " + // + " FROM employees;" + // + " " + // + "DECLARE" + // + " emp_id employees_temp.employee_id%TYPE := 299;" + // + " emp_first_name employees_temp.first_name%TYPE := 'Bob';" + // + " emp_last_name employees_temp.last_name%TYPE := 'Henry';" + // + "BEGIN" + // + " INSERT INTO employees_temp (employee_id, first_name, last_name) " + // + " VALUES (emp_id, emp_first_name, emp_last_name);" + // + " " + // + " UPDATE employees_temp" + // + " SET first_name = 'Robert'" + // + " WHERE employee_id = emp_id;" + // + " " + // + " DELETE FROM employees_temp" + // + " WHERE employee_id = emp_id" + // + " RETURNING first_name, last_name" + // + " INTO emp_first_name, emp_last_name;" + // + "" + // + " COMMIT;" + // + " DBMS_OUTPUT.PUT_LINE (emp_first_name || ' ' || emp_last_name);" + // + "END;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -73,12 +72,12 @@ public void test_0() throws Exception { Assert.assertEquals(2, visitor.getTables().size()); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees_temp"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees_temp"))); Assert.assertEquals(6, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getConditions().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest8.java index 0772c5c887..9857b59cea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest8.java @@ -26,33 +26,32 @@ import com.alibaba.druid.stat.TableStat; public class OracleBlockTest8 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE" + // - " daily_order_total NUMBER(12,2);" + // - " weekly_order_total NUMBER(12,2); " + // - " monthly_order_total NUMBER(12,2);" + // - "BEGIN" + // - " COMMIT; -- end previous transaction\n" + // - " SET TRANSACTION READ ONLY NAME 'Calculate Order Totals';" + // - "" + // - " SELECT SUM (order_total)" + // - " INTO daily_order_total" + // - " FROM orders" + // - " WHERE order_date = SYSDATE;" + // - "" + // - " SELECT SUM (order_total)" + // - " INTO weekly_order_total" + // - " FROM orders" + // - " WHERE order_date = SYSDATE - 7;" + // - "" + // - " SELECT SUM (order_total)" + // - " INTO monthly_order_total" + // - " FROM orders" + // - " WHERE order_date = SYSDATE - 30;" + // - "" + // - " COMMIT; -- ends read-only transaction\n" + // - "END;"; // + " daily_order_total NUMBER(12,2);" + // + " weekly_order_total NUMBER(12,2); " + // + " monthly_order_total NUMBER(12,2);" + // + "BEGIN" + // + " COMMIT; -- end previous transaction\n" + // + " SET TRANSACTION READ ONLY NAME 'Calculate Order Totals';" + // + "" + // + " SELECT SUM (order_total)" + // + " INTO daily_order_total" + // + " FROM orders" + // + " WHERE order_date = SYSDATE;" + // + "" + // + " SELECT SUM (order_total)" + // + " INTO weekly_order_total" + // + " FROM orders" + // + " WHERE order_date = SYSDATE - 7;" + // + "" + // + " SELECT SUM (order_total)" + // + " INTO monthly_order_total" + // + " FROM orders" + // + " WHERE order_date = SYSDATE - 30;" + // + "" + // + " COMMIT; -- ends read-only transaction\n" + // + "END;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest9.java index 637281fe8e..98390e57ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest9.java @@ -26,27 +26,26 @@ import com.alibaba.druid.stat.TableStat; public class OracleBlockTest9 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE" + // - " my_emp_id NUMBER(6);" + // - " my_job_id VARCHAR2(10);" + // - " my_sal NUMBER(8,2);" + // - " CURSOR c1 IS" + // - " SELECT employee_id, job_id, salary" + // - " FROM employees FOR UPDATE;" + // - "BEGIN" + // - " OPEN c1;" + // - " LOOP" + // - " FETCH c1 INTO my_emp_id, my_job_id, my_sal;" + // - " IF my_job_id = 'SA_REP' THEN" + // - " UPDATE employees" + // - " SET salary = salary * 1.02" + // - " WHERE CURRENT OF c1;" + // - " END IF;" + // - " EXIT WHEN c1%NOTFOUND;" + // - " END LOOP;" + // - "END;"; // + " my_emp_id NUMBER(6);" + // + " my_job_id VARCHAR2(10);" + // + " my_sal NUMBER(8,2);" + // + " CURSOR c1 IS" + // + " SELECT employee_id, job_id, salary" + // + " FROM employees FOR UPDATE;" + // + "BEGIN" + // + " OPEN c1;" + // + " LOOP" + // + " FETCH c1 INTO my_emp_id, my_job_id, my_sal;" + // + " IF my_job_id = 'SA_REP' THEN" + // + " UPDATE employees" + // + " SET salary = salary * 1.02" + // + " WHERE CURRENT OF c1;" + // + " END IF;" + // + " EXIT WHEN c1%NOTFOUND;" + // + " END LOOP;" + // + "END;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest.java index 3d6469862d..92d3578c6e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest.java @@ -26,10 +26,9 @@ import java.util.List; public class OracleCreateDbLinkTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE PUBLIC DATABASE LINK remote USING 'remote'; "; + "CREATE PUBLIC DATABASE LINK remote USING 'remote'; "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -37,17 +36,17 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals("CREATE PUBLIC DATABASE LINK remote USING 'remote';", - SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statement.accept(visitor); Assert.assertEquals(0, visitor.getTables().size()); } - + public void test_1() throws Exception { String sql = // - "CREATE DATABASE LINK local CONNECT TO hr IDENTIFIED BY hr USING 'local';"; + "CREATE DATABASE LINK local CONNECT TO hr IDENTIFIED BY hr USING 'local';"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,18 +54,18 @@ public void test_1() throws Exception { print(statementList); Assert.assertEquals("CREATE DATABASE LINK local CONNECT TO hr IDENTIFIED BY hr USING 'local';", - SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statement.accept(visitor); Assert.assertEquals(0, visitor.getTables().size()); } - - + + public void test_2() throws Exception { String sql = // - "CREATE DATABASE LINK remote.us.oracle.com CONNECT TO CURRENT_USER USING 'remote';"; + "CREATE DATABASE LINK remote.us.oracle.com CONNECT TO CURRENT_USER USING 'remote';"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -74,7 +73,7 @@ public void test_2() throws Exception { print(statementList); Assert.assertEquals("CREATE DATABASE LINK remote.us.oracle.com CONNECT TO CURRENT_USER USING 'remote';", - SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statement.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest1.java index f59164c95b..f11a333588 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest1.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateDbLinkTest1 extends OracleTest { - public void test_0() throws Exception { String sql = // "create database link db_link connect to \"xxx\" identified by \"xxx\" using '(DESCRIPTION = (ADDRESS_LIST = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521))) (CONNECT_DATA = (SERVICE_NAME = orcl)))'"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_0.java index 076779e8b5..367f4594b0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_0.java @@ -26,19 +26,18 @@ import java.util.List; public class OracleCreateFunctionTest_0 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE FUNCTION get_bal(acc_no IN NUMBER) \n" + - " RETURN NUMBER \n" + - " IS acc_bal NUMBER(11,2);\n" + - " BEGIN \n" + - " SELECT order_total \n" + - " INTO acc_bal \n" + - " FROM orders \n" + - " WHERE customer_id = acc_no; \n" + - " RETURN(acc_bal); \n" + - " END;"; + "CREATE FUNCTION get_bal(acc_no IN NUMBER) \n" + + " RETURN NUMBER \n" + + " IS acc_bal NUMBER(11,2);\n" + + " BEGIN \n" + + " SELECT order_total \n" + + " INTO acc_bal \n" + + " FROM orders \n" + + " WHERE customer_id = acc_no; \n" + + " RETURN(acc_bal); \n" + + " END;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -60,7 +59,7 @@ public void test_types() throws Exception { "\tWHERE customer_id = acc_no;\n" + "\tRETURN acc_bal;\n" + "END;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_1.java index e4a5010ce8..68b5feee74 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_1.java @@ -25,12 +25,11 @@ import java.util.List; public class OracleCreateFunctionTest_1 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE OR REPLACE FUNCTION STRCAT(input varchar2 )\n" + - "RETURN varchar2\n" + - "PARALLEL_ENABLE AGGREGATE USING strcat_type;"; + "CREATE OR REPLACE FUNCTION STRCAT(input varchar2 )\n" + + "RETURN varchar2\n" + + "PARALLEL_ENABLE AGGREGATE USING strcat_type;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -46,7 +45,7 @@ public void test_types() throws Exception { "PARALLEL_ENABLE\n" + "AGGREGATE\n" + "USING strcat_type;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_2.java index 5a8993c0c8..f2e82db5d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_2.java @@ -25,11 +25,10 @@ import java.util.List; public class OracleCreateFunctionTest_2 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE FUNCTION StockPivot(p refcur_pkg.refcur_t) \n" + - " RETURN TickerTypeSet PIPELINED USING StockPivotImpl;\n"; + "CREATE FUNCTION StockPivot(p refcur_pkg.refcur_t) \n" + + " RETURN TickerTypeSet PIPELINED USING StockPivotImpl;\n"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -43,7 +42,7 @@ public void test_types() throws Exception { ")\n" + "RETURN TickerTypeSetPIPELINED \n" + "USING StockPivotImpl;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_3.java index 7bea7f0829..a0fe477385 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_3.java @@ -25,53 +25,52 @@ import java.util.List; public class OracleCreateFunctionTest_3 extends OracleTest { - public void test_types() throws Exception { String sql = // - "FUNCTION FN_LGN_CHK(USERINFO IN VARCHAR2)\n" + - " RETURN VARCHAR2 IS\n" + - " -- Author : yuguoq\n" + - " -- Created : 2013-10-14\n" + - " -- Purpose : ??????\n" + - " RESULT VARCHAR2(20);\n" + - " TYPE TYPE_ARRAY IS VARRAY(3) OF VARCHAR2(50);\n" + - " VAR_ARRAY TYPE_ARRAY := TYPE_ARRAY();\n" + - " CURSOR VALUECURSOR IS\n" + - " SELECT *\n" + - " FROM TABLE(CAST(FN_SPLIT(USERINFO, ',') AS TY_STR_SPLIT))\n" + - " WHERE ROWNUM < 4;\n" + - " CURPOLICYINFO VALUECURSOR%ROWTYPE; ---??????\n" + - " I INTEGER := 1;\n" + - "BEGIN\n" + - " OPEN VALUECURSOR; ---open cursor\n" + - " LOOP\n" + - " --deal with extraction data from DB\n" + - " FETCH VALUECURSOR\n" + - " INTO CURPOLICYINFO;\n" + - " EXIT WHEN VALUECURSOR%NOTFOUND;\n" + - " VAR_ARRAY.EXTEND;\n" + - " VAR_ARRAY(I) := CURPOLICYINFO.COLUMN_VALUE;\n" + - " I := I + 1;\n" + - " END LOOP;\n" + - " if VAR_ARRAY.count <> 3 then\n" + - " RESULT := '1';\n" + - " else\n" + - " IF VAR_ARRAY(3) = md5(VAR_ARRAY(1) || VAR_ARRAY(2)) THEN\n" + - " RESULT := VAR_ARRAY(1);\n" + - " ELSE\n" + - " RESULT := '1';\n" + - " END IF;\n" + - " end if;\n" + - " RETURN(RESULT);\n" + - "EXCEPTION\n" + - " WHEN OTHERS THEN\n" + - " CLOSE VALUECURSOR;\n" + - " DBMS_OUTPUT.PUT_LINE(SQLERRM);\n" + - " IF VALUECURSOR%ISOPEN THEN\n" + - " --close cursor\n" + - " CLOSE VALUECURSOR;\n" + - " END IF;\n" + - "END FN_LGN_CHK;"; + "FUNCTION FN_LGN_CHK(USERINFO IN VARCHAR2)\n" + + " RETURN VARCHAR2 IS\n" + + " -- Author : yuguoq\n" + + " -- Created : 2013-10-14\n" + + " -- Purpose : ??????\n" + + " RESULT VARCHAR2(20);\n" + + " TYPE TYPE_ARRAY IS VARRAY(3) OF VARCHAR2(50);\n" + + " VAR_ARRAY TYPE_ARRAY := TYPE_ARRAY();\n" + + " CURSOR VALUECURSOR IS\n" + + " SELECT *\n" + + " FROM TABLE(CAST(FN_SPLIT(USERINFO, ',') AS TY_STR_SPLIT))\n" + + " WHERE ROWNUM < 4;\n" + + " CURPOLICYINFO VALUECURSOR%ROWTYPE; ---??????\n" + + " I INTEGER := 1;\n" + + "BEGIN\n" + + " OPEN VALUECURSOR; ---open cursor\n" + + " LOOP\n" + + " --deal with extraction data from DB\n" + + " FETCH VALUECURSOR\n" + + " INTO CURPOLICYINFO;\n" + + " EXIT WHEN VALUECURSOR%NOTFOUND;\n" + + " VAR_ARRAY.EXTEND;\n" + + " VAR_ARRAY(I) := CURPOLICYINFO.COLUMN_VALUE;\n" + + " I := I + 1;\n" + + " END LOOP;\n" + + " if VAR_ARRAY.count <> 3 then\n" + + " RESULT := '1';\n" + + " else\n" + + " IF VAR_ARRAY(3) = md5(VAR_ARRAY(1) || VAR_ARRAY(2)) THEN\n" + + " RESULT := VAR_ARRAY(1);\n" + + " ELSE\n" + + " RESULT := '1';\n" + + " END IF;\n" + + " end if;\n" + + " RETURN(RESULT);\n" + + "EXCEPTION\n" + + " WHEN OTHERS THEN\n" + + " CLOSE VALUECURSOR;\n" + + " DBMS_OUTPUT.PUT_LINE(SQLERRM);\n" + + " IF VALUECURSOR%ISOPEN THEN\n" + + " --close cursor\n" + + " CLOSE VALUECURSOR;\n" + + " END IF;\n" + + "END FN_LGN_CHK;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -121,7 +120,7 @@ public void test_types() throws Exception { "\t\t\tCLOSE VALUECURSOR;\n" + "\t\tEND IF;\n" + "END;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_4.java index 08df71aece..f88f6295aa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_4.java @@ -25,44 +25,43 @@ import java.util.List; public class OracleCreateFunctionTest_4 extends OracleTest { - public void test_types() throws Exception { String sql = // - "FUNCTION SPLITSTR(STR IN CLOB,\n" + - " I IN NUMBER := 0,\n" + - " SEP IN VARCHAR2 := ',') RETURN VARCHAR2\n" + - " DETERMINISTIC\n" + - "/**************************************\n" + - " * NAME: SPLITSTR\n" + - " * AUTHOR: SEAN ZHANG.\n" + - " * DATE: 2012-09-03.\n" + - " * FUNCTION: ??????????????????????\n" + - " * PARAMETERS: STR: ????????\n" + - " I: ?????????I?0??STR????????I ??????????????\n" + - " SEP: ????????????????????????????????STR????SEP?????\n" + - " * EXAMPLE: SELECT SPLITSTR('ABC,DEF', 1) AS STR FROM DUAL; ?? ABC\n" + - " SELECT SPLITSTR('ABC,DEF', 3) AS STR FROM DUAL; ?? ?\n" + - " **************************************/\n" + - " IS\n" + - " T_COUNT NUMBER;\n" + - " T_STR VARCHAR2(4000);\n" + - "BEGIN\n" + - " IF I = 0 THEN\n" + - " T_STR := STR;\n" + - " ELSIF INSTR(STR, SEP) = 0 THEN\n" + - " T_STR := SEP;\n" + - " ELSE\n" + - " SELECT COUNT(*) INTO T_COUNT FROM TABLE(SPLIT(STR, SEP));\n" + - " IF I <= T_COUNT THEN\n" + - " SELECT STR\n" + - " INTO T_STR\n" + - " FROM (SELECT ROWNUM AS ITEM, COLUMN_VALUE AS STR\n" + - " FROM TABLE(SPLIT(STR, SEP)))\n" + - " WHERE ITEM = I;\n" + - " END IF;\n" + - " END IF;\n" + - " RETURN T_STR;\n" + - "END;"; + "FUNCTION SPLITSTR(STR IN CLOB,\n" + + " I IN NUMBER := 0,\n" + + " SEP IN VARCHAR2 := ',') RETURN VARCHAR2\n" + + " DETERMINISTIC\n" + + "/**************************************\n" + + " * NAME: SPLITSTR\n" + + " * AUTHOR: SEAN ZHANG.\n" + + " * DATE: 2012-09-03.\n" + + " * FUNCTION: ??????????????????????\n" + + " * PARAMETERS: STR: ????????\n" + + " I: ?????????I?0??STR????????I ??????????????\n" + + " SEP: ????????????????????????????????STR????SEP?????\n" + + " * EXAMPLE: SELECT SPLITSTR('ABC,DEF', 1) AS STR FROM DUAL; ?? ABC\n" + + " SELECT SPLITSTR('ABC,DEF', 3) AS STR FROM DUAL; ?? ?\n" + + " **************************************/\n" + + " IS\n" + + " T_COUNT NUMBER;\n" + + " T_STR VARCHAR2(4000);\n" + + "BEGIN\n" + + " IF I = 0 THEN\n" + + " T_STR := STR;\n" + + " ELSIF INSTR(STR, SEP) = 0 THEN\n" + + " T_STR := SEP;\n" + + " ELSE\n" + + " SELECT COUNT(*) INTO T_COUNT FROM TABLE(SPLIT(STR, SEP));\n" + + " IF I <= T_COUNT THEN\n" + + " SELECT STR\n" + + " INTO T_STR\n" + + " FROM (SELECT ROWNUM AS ITEM, COLUMN_VALUE AS STR\n" + + " FROM TABLE(SPLIT(STR, SEP)))\n" + + " WHERE ITEM = I;\n" + + " END IF;\n" + + " END IF;\n" + + " RETURN T_STR;\n" + + "END;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -101,7 +100,7 @@ public void test_types() throws Exception { "\tEND IF;\n" + "\tRETURN T_STR;\n" + "END;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_5.java index e984bf4860..f8df0d7a09 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_5.java @@ -25,33 +25,32 @@ import java.util.List; public class OracleCreateFunctionTest_5 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE OR REPLACE FUNCTION fibonacci wrapped \n" + - "a000000\n" + - "b2\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "abcd\n" + - "8\n" + - "14a fb\n" + - "e1Yq3QQJoEoNKIeJlbgLoLdSgogwgxDcf8vWfHSKbuowFOXFKoj9MqYGqWyRxeeCUVqNVIO1\n" + - "ICqJa3yPr6e7z8GZpMH3J0Cx0uQ0B1JuysymdNDlzfTvb7QWsrLU4jGs3h8Mm49/L9nyO4Xh\n" + - "Ae06nawFpOJIAYpBf9wBVC+ZrjU/nuEtokBqCce6HWIoF6rYgz0V0W/47x5KpOnQ2i7X3kFe\n" + - "FR8K7jT7X58k8xK9uYlZv5LhV71a7A=="; + "CREATE OR REPLACE FUNCTION fibonacci wrapped \n" + + "a000000\n" + + "b2\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "abcd\n" + + "8\n" + + "14a fb\n" + + "e1Yq3QQJoEoNKIeJlbgLoLdSgogwgxDcf8vWfHSKbuowFOXFKoj9MqYGqWyRxeeCUVqNVIO1\n" + + "ICqJa3yPr6e7z8GZpMH3J0Cx0uQ0B1JuysymdNDlzfTvb7QWsrLU4jGs3h8Mm49/L9nyO4Xh\n" + + "Ae06nawFpOJIAYpBf9wBVC+ZrjU/nuEtokBqCce6HWIoF6rYgz0V0W/47x5KpOnQ2i7X3kFe\n" + + "FR8K7jT7X58k8xK9uYlZv5LhV71a7A=="; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -83,7 +82,7 @@ public void test_types() throws Exception { "ICqJa3yPr6e7z8GZpMH3J0Cx0uQ0B1JuysymdNDlzfTvb7QWsrLU4jGs3h8Mm49/L9nyO4Xh\n" + "Ae06nawFpOJIAYpBf9wBVC+ZrjU/nuEtokBqCce6HWIoF6rYgz0V0W/47x5KpOnQ2i7X3kFe\n" + "FR8K7jT7X58k8xK9uYlZv5LhV71a7A==",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest1.java index 399fc95cec..13668a5e51 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest1.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateIndexTest1 extends OracleTest { - public void test_0() throws Exception { String sql = // - "create index PFS_PACKAGE_SAMPLE_PID_IND on PFS_PACKAGE_SAMPLE(PACKAGE_ID) tablespace appindx1m"; + "create index PFS_PACKAGE_SAMPLE_PID_IND on PFS_PACKAGE_SAMPLE(PACKAGE_ID) tablespace appindx1m"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest10_function.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest10_function.java index d5418d9d0a..e63ca59104 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest10_function.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest10_function.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateIndexTest10_function extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE INDEX upper_ix ON employees (UPPER(last_name)); "; + "CREATE INDEX upper_ix ON employees (UPPER(last_name)); "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest11.java index d392615791..cb920fcfd8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest11.java @@ -25,38 +25,37 @@ import java.util.List; public class OracleCreateIndexTest11 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE INDEX sales_ix ON composite_sales(time_id, prod_id)\n" + - " STORAGE (INITIAL 1M MAXEXTENTS UNLIMITED)\n" + - " LOCAL\n" + - " (PARTITION q1_1998,\n" + - " PARTITION q2_1998,\n" + - " PARTITION q3_1998,\n" + - " PARTITION q4_1998,\n" + - " PARTITION q1_1999,\n" + - " PARTITION q2_1999,\n" + - " PARTITION q3_1999,\n" + - " PARTITION q4_1999,\n" + - " PARTITION q1_2000,\n" + - " PARTITION q2_2000\n" + - " (SUBPARTITION pq2001, SUBPARTITION pq2002, \n" + - " SUBPARTITION pq2003, SUBPARTITION pq2004,\n" + - " SUBPARTITION pq2005, SUBPARTITION pq2006, \n" + - " SUBPARTITION pq2007, SUBPARTITION pq2008),\n" + - " PARTITION q3_2000\n" + - " (SUBPARTITION c1 TABLESPACE tbs_02, \n" + - " SUBPARTITION c2 TABLESPACE tbs_02, \n" + - " SUBPARTITION c3 TABLESPACE tbs_02,\n" + - " SUBPARTITION c4 TABLESPACE tbs_02,\n" + - " SUBPARTITION c5 TABLESPACE tbs_02),\n" + - " PARTITION q4_2000\n" + - " (SUBPARTITION pq4001 TABLESPACE tbs_03, \n" + - " SUBPARTITION pq4002 TABLESPACE tbs_03,\n" + - " SUBPARTITION pq4003 TABLESPACE tbs_03,\n" + - " SUBPARTITION pq4004 TABLESPACE tbs_03)\n" + - ");"; + "CREATE INDEX sales_ix ON composite_sales(time_id, prod_id)\n" + + " STORAGE (INITIAL 1M MAXEXTENTS UNLIMITED)\n" + + " LOCAL\n" + + " (PARTITION q1_1998,\n" + + " PARTITION q2_1998,\n" + + " PARTITION q3_1998,\n" + + " PARTITION q4_1998,\n" + + " PARTITION q1_1999,\n" + + " PARTITION q2_1999,\n" + + " PARTITION q3_1999,\n" + + " PARTITION q4_1999,\n" + + " PARTITION q1_2000,\n" + + " PARTITION q2_2000\n" + + " (SUBPARTITION pq2001, SUBPARTITION pq2002, \n" + + " SUBPARTITION pq2003, SUBPARTITION pq2004,\n" + + " SUBPARTITION pq2005, SUBPARTITION pq2006, \n" + + " SUBPARTITION pq2007, SUBPARTITION pq2008),\n" + + " PARTITION q3_2000\n" + + " (SUBPARTITION c1 TABLESPACE tbs_02, \n" + + " SUBPARTITION c2 TABLESPACE tbs_02, \n" + + " SUBPARTITION c3 TABLESPACE tbs_02,\n" + + " SUBPARTITION c4 TABLESPACE tbs_02,\n" + + " SUBPARTITION c5 TABLESPACE tbs_02),\n" + + " PARTITION q4_2000\n" + + " (SUBPARTITION pq4001 TABLESPACE tbs_03, \n" + + " SUBPARTITION pq4002 TABLESPACE tbs_03,\n" + + " SUBPARTITION pq4003 TABLESPACE tbs_03,\n" + + " SUBPARTITION pq4004 TABLESPACE tbs_03)\n" + + ");"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest12.java index 3ccd9a658f..7626ebbc89 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest12.java @@ -25,17 +25,16 @@ import java.util.List; public class OracleCreateIndexTest12 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE BITMAP INDEX product_bm_ix \n" + - " ON hash_products(list_price)\n" + - " TABLESPACE tbs_1\n" + - " LOCAL(PARTITION ix_p1 TABLESPACE tbs_02,\n" + - " PARTITION ix_p2,\n" + - " PARTITION ix_p3 TABLESPACE tbs_03,\n" + - " PARTITION ix_p4,\n" + - " PARTITION ix_p5 TABLESPACE tbs_04 );\n"; + "CREATE BITMAP INDEX product_bm_ix \n" + + " ON hash_products(list_price)\n" + + " TABLESPACE tbs_1\n" + + " LOCAL(PARTITION ix_p1 TABLESPACE tbs_02,\n" + + " PARTITION ix_p2,\n" + + " PARTITION ix_p3 TABLESPACE tbs_03,\n" + + " PARTITION ix_p4,\n" + + " PARTITION ix_p5 TABLESPACE tbs_04 );\n"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest13.java index 089ed6460a..0e2630ab97 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest13.java @@ -25,11 +25,10 @@ import java.util.List; public class OracleCreateIndexTest13 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE UNIQUE INDEX nested_tab_ix\n" + - " ON textdocs_nestedtab(NESTED_TABLE_ID, document_typ);"; + "CREATE UNIQUE INDEX nested_tab_ix\n" + + " ON textdocs_nestedtab(NESTED_TABLE_ID, document_typ);"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest14.java index fbb741b3bb..1d3cadccc8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest14.java @@ -25,11 +25,10 @@ import java.util.List; public class OracleCreateIndexTest14 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE INDEX salary_i \n" + - " ON books (TREAT(author AS employee_t).salary);"; + "CREATE INDEX salary_i \n" + + " ON books (TREAT(author AS employee_t).salary);"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest15.java index 2641140a96..e0155d13bf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest15.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateIndexTest15 extends OracleTest { - public void test_0() throws Exception { String sql = // - "create index idx_t12 on t1(id) tablespace users online;"; + "create index idx_t12 on t1(id) tablespace users online;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest16_local.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest16_local.java index 4016283689..ad0f5a3355 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest16_local.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest16_local.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateIndexTest16_local extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE INDEX dbobjs_idx ON dbobjs (created) LOCAL"; + "CREATE INDEX dbobjs_idx ON dbobjs (created) LOCAL"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest17_global.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest17_global.java index 42b25c02bb..d0d1342adf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest17_global.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest17_global.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateIndexTest17_global extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE INDEX dbobjs_idx ON dbobjs (created) global"; + "CREATE INDEX dbobjs_idx ON dbobjs (created) global"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest18_global.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest18_global.java index 51e17fc474..a8976e4430 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest18_global.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest18_global.java @@ -25,14 +25,13 @@ import java.util.List; public class OracleCreateIndexTest18_global extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE INDEX cost_ix ON sales (amount_sold)\n" + - " GLOBAL PARTITION BY RANGE (amount_sold)\n" + - " (PARTITION p1 VALUES LESS THAN (1000),\n" + - " PARTITION p2 VALUES LESS THAN (2500),\n" + - " PARTITION p3 VALUES LESS THAN (MAXVALUE));"; + "CREATE INDEX cost_ix ON sales (amount_sold)\n" + + " GLOBAL PARTITION BY RANGE (amount_sold)\n" + + " (PARTITION p1 VALUES LESS THAN (1000),\n" + + " PARTITION p2 VALUES LESS THAN (2500),\n" + + " PARTITION p3 VALUES LESS THAN (MAXVALUE));"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_global.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_global.java index b24105df09..400a555bcd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_global.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_global.java @@ -25,12 +25,11 @@ import java.util.List; public class OracleCreateIndexTest19_global extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE INDEX cust_last_name_ix ON customers (cust_last_name)\n" + - " GLOBAL PARTITION BY HASH (cust_last_name)\n" + - " PARTITIONS 4;"; + "CREATE INDEX cust_last_name_ix ON customers (cust_last_name)\n" + + " GLOBAL PARTITION BY HASH (cust_last_name)\n" + + " PARTITIONS 4;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_local_store.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_local_store.java index 79383e5902..afca3bca20 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_local_store.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_local_store.java @@ -25,11 +25,10 @@ import java.util.List; public class OracleCreateIndexTest19_local_store extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE INDEX prod_idx ON hash_products(product_id) LOCAL\n" + - " STORE IN (tbs_01, tbs_02);"; + "CREATE INDEX prod_idx ON hash_products(product_id) LOCAL\n" + + " STORE IN (tbs_01, tbs_02);"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest2.java index e7396fccce..09ca170fdc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest2.java @@ -25,12 +25,11 @@ import java.util.List; public class OracleCreateIndexTest2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE UNIQUE INDEX \"ESCROW\".\"SYS_IOT_TOP_196679\" " + // - "on \"ESCROW\".\"SYS_JOURNAL_196678\"(\"C0\",\"C1\",\"C2\",\"C3\",\"RID\") " + // - "INDEX ONLY TOPLEVEL TABLESPACE \"ESCROW_INDX\" NOPARALLEL"; + "CREATE UNIQUE INDEX \"ESCROW\".\"SYS_IOT_TOP_196679\" " + // + "on \"ESCROW\".\"SYS_JOURNAL_196678\"(\"C0\",\"C1\",\"C2\",\"C3\",\"RID\") " + // + "INDEX ONLY TOPLEVEL TABLESPACE \"ESCROW_INDX\" NOPARALLEL"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest20.java index b84ac931c7..9c80442392 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest20.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateIndexTest20 extends OracleTest { - public void test_0() throws Exception { String sql = // - "create index idx_id on t2(id) local;"; + "create index idx_id on t2(id) local;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest21.java index 9183d7b3ad..840703ce7a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest21.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateIndexTest21 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE UNIQUE INDEX \"FINANCE\".\"PK_POS_SEND_UNIQUE\" ON \"FINANCE\".\"POS_SEND_UNIQUE\" (\"SETTLE_ID\", \"PHASE\") REVERSE \n" + " PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest3.java index 19b1e41bec..4325009858 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest3.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateIndexTest3 extends OracleTest { - public void test_0() throws Exception { String sql = // - "create index PRODUCT_ADDITION_NCID_IND on PRODUCT_ADDITION(NEW_CLUSTER_ID,GMT_LAST_FEEDBACK) tablespace APPINDX4M online parallel 4"; + "create index PRODUCT_ADDITION_NCID_IND on PRODUCT_ADDITION(NEW_CLUSTER_ID,GMT_LAST_FEEDBACK) tablespace APPINDX4M online parallel 4"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,8 +51,8 @@ public void test_0() throws Exception { Assert.assertEquals(2, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("PRODUCT_ADDITION", "NEW_CLUSTER_ID"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("PRODUCT_ADDITION", "GMT_LAST_FEEDBACK"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("PRODUCT_ADDITION", "NEW_CLUSTER_ID"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("PRODUCT_ADDITION", "GMT_LAST_FEEDBACK"))); // 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/create/OracleCreateIndexTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest4.java index e072c5d8ba..2d635a0ab6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest4.java @@ -25,12 +25,11 @@ import java.util.List; 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\" ;"; + " 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(); @@ -54,7 +53,7 @@ public void test_0() throws Exception { 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("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/create/OracleCreateIndexTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest5.java index 00bb5c827a..7ed09c4219 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest5.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateIndexTest5 extends OracleTest { - public void test_0() throws Exception { String sql = // - " CREATE UNIQUE INDEX \"FINANCE\".\"SYS_IOT_TOP_179872\" on \"FINANCE\".\"SYS_JOURNAL_179871\"(\"C0\",\"RID\") INDEX ONLY TOPLEVEL TABLESPACE \"FINANCE\" STORAGE( BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT) NOPARALLEL ;"; + " CREATE UNIQUE INDEX \"FINANCE\".\"SYS_IOT_TOP_179872\" on \"FINANCE\".\"SYS_JOURNAL_179871\"(\"C0\",\"RID\") INDEX ONLY TOPLEVEL TABLESPACE \"FINANCE\" STORAGE( BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT) NOPARALLEL ;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,7 +51,7 @@ public void test_0() throws Exception { Assert.assertEquals(2, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("FINANCE.SYS_JOURNAL_179871", "RID"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("FINANCE.SYS_JOURNAL_179871", "RID"))); // 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/create/OracleCreateIndexTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest6.java index 28dbd79122..5abef0e024 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest6.java @@ -26,13 +26,12 @@ import java.util.List; public class OracleCreateIndexTest6 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE INDEX ord_customer_ix_demo\n" + - " ON orders (order_mode)\n" + - " NOSORT\n" + - " NOLOGGING;"; + "CREATE INDEX ord_customer_ix_demo\n" + + " ON orders (order_mode)\n" + + " NOSORT\n" + + " NOLOGGING;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -59,7 +58,7 @@ public void test_0() throws Exception { assertEquals(1, visitor.getColumns().size()); - assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "order_mode"))); + assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "order_mode"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "YEAR"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "order_mode"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest7.java index 997c6b1085..f04ef7cd56 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest7.java @@ -25,12 +25,11 @@ import java.util.List; public class OracleCreateIndexTest7 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE INDEX ord_customer_ix_demo \n" + - " ON orders (customer_id, sales_rep_id)\n" + - " COMPRESS 1;\n"; + "CREATE INDEX ord_customer_ix_demo \n" + + " ON orders (customer_id, sales_rep_id)\n" + + " COMPRESS 1;\n"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); @@ -56,7 +55,7 @@ public void test_0() throws Exception { assertEquals(2, visitor.getColumns().size()); - assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "sales_rep_id"))); + assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "sales_rep_id"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "YEAR"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "order_mode"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest8_cluster.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest8_cluster.java index 1e5cca9203..5c55f31f68 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest8_cluster.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest8_cluster.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateIndexTest8_cluster extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE INDEX idx_personnel ON CLUSTER personnel; "; + "CREATE INDEX idx_personnel ON CLUSTER personnel; "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest9.java index 98b4a62213..456c74ac78 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest9.java @@ -25,11 +25,10 @@ import java.util.List; public class OracleCreateIndexTest9 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE INDEX area_index ON xwarehouses e \n" + - " (EXTRACTVALUE(VALUE(e),'/Warehouse/Area'));"; + "CREATE INDEX area_index ON xwarehouses e \n" + + " (EXTRACTVALUE(VALUE(e),'/Warehouse/Area'));"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest0.java index 6ea39ed072..5a31b47eac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest0.java @@ -26,22 +26,21 @@ import java.util.List; public class OracleCreateMaterializedViewTest0 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE MATERIALIZED VIEW sales_summary AS\n" + - " SELECT\n" + - " seller_no,\n" + - " invoice_date,\n" + - " sum(invoice_amt) as sales_amt\n" + - " FROM invoice\n" + - " WHERE invoice_date < CURRENT_DATE\n" + - " GROUP BY\n" + - " seller_no,\n" + - " invoice_date\n" + - " ORDER BY\n" + - " seller_no,\n" + - " invoice_date;\n"; + "CREATE MATERIALIZED VIEW sales_summary AS\n" + + " SELECT\n" + + " seller_no,\n" + + " invoice_date,\n" + + " sum(invoice_amt) as sales_amt\n" + + " FROM invoice\n" + + " WHERE invoice_date < CURRENT_DATE\n" + + " GROUP BY\n" + + " seller_no,\n" + + " invoice_date\n" + + " ORDER BY\n" + + " seller_no,\n" + + " invoice_date;\n"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -57,7 +56,7 @@ public void test_types() throws Exception { "WHERE invoice_date < CURRENT_DATE\n" + "GROUP BY seller_no, invoice_date\n" + "ORDER BY seller_no, invoice_date;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest1.java index eb8fa6a75c..31591a3857 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest1.java @@ -26,17 +26,16 @@ import java.util.List; public class OracleCreateMaterializedViewTest1 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE MATERIALIZED VIEW sales_mv\n" + - " BUILD IMMEDIATE\n" + - " REFRESH FAST ON COMMIT\n" + - " AS SELECT t.calendar_year, p.prod_id, \n" + - " SUM(s.amount_sold) AS sum_sales\n" + - " FROM times t, products p, sales s\n" + - " WHERE t.time_id = s.time_id AND p.prod_id = s.prod_id\n" + - " GROUP BY t.calendar_year, p.prod_id;"; + "CREATE MATERIALIZED VIEW sales_mv\n" + + " BUILD IMMEDIATE\n" + + " REFRESH FAST ON COMMIT\n" + + " AS SELECT t.calendar_year, p.prod_id, \n" + + " SUM(s.amount_sold) AS sum_sales\n" + + " FROM times t, products p, sales s\n" + + " WHERE t.time_id = s.time_id AND p.prod_id = s.prod_id\n" + + " GROUP BY t.calendar_year, p.prod_id;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -54,7 +53,7 @@ public void test_types() throws Exception { "WHERE t.time_id = s.time_id\n" + "\tAND p.prod_id = s.prod_id\n" + "GROUP BY t.calendar_year, p.prod_id;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest2.java index 584dc418d9..e84610bb47 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest2.java @@ -26,20 +26,19 @@ import java.util.List; public class OracleCreateMaterializedViewTest2 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE MATERIALIZED VIEW sales_by_month_by_state\n" + - " TABLESPACE example\n" + - " PARALLEL 4\n" + - " BUILD IMMEDIATE\n" + - " REFRESH COMPLETE\n" + - " ENABLE QUERY REWRITE\n" + - " AS SELECT t.calendar_month_desc, c.cust_state_province,\n" + - " SUM(s.amount_sold) AS sum_sales\n" + - " FROM times t, sales s, customers c\n" + - " WHERE s.time_id = t.time_id AND s.cust_id = c.cust_id\n" + - " GROUP BY t.calendar_month_desc, c.cust_state_province;"; + "CREATE MATERIALIZED VIEW sales_by_month_by_state\n" + + " TABLESPACE example\n" + + " PARALLEL 4\n" + + " BUILD IMMEDIATE\n" + + " REFRESH COMPLETE\n" + + " ENABLE QUERY REWRITE\n" + + " AS SELECT t.calendar_month_desc, c.cust_state_province,\n" + + " SUM(s.amount_sold) AS sum_sales\n" + + " FROM times t, sales s, customers c\n" + + " WHERE s.time_id = t.time_id AND s.cust_id = c.cust_id\n" + + " GROUP BY t.calendar_month_desc, c.cust_state_province;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -60,7 +59,7 @@ public void test_types() throws Exception { "WHERE s.time_id = t.time_id\n" + "\tAND s.cust_id = c.cust_id\n" + "GROUP BY t.calendar_month_desc, c.cust_state_province;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest3.java index 469a957614..c4a8ed0bf7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest3.java @@ -25,38 +25,37 @@ import java.util.List; public class OracleCreateMaterializedViewTest3 extends OracleTest { - public void test_types() throws Exception { String sql = // - "DROP MATERIALIZED VIEW ATOM_MVIEW.NONAUTO_CLAIM_FOLDER_T;\n" + - "--create materualized_view\n" + - "CREATE MATERIALIZED VIEW ATOM_MVIEW.NONAUTO_CLAIM_FOLDER_T\n" + - "PARTITION BY RANGE (BRANCH_COMPANY_CODE)\n" + - "( \n" + - " PARTITION P1010100 VALUES LESS THAN ('1020100')\n" + - " LOGGING\n" + - " NOCOMPRESS , \n" + - " PARTITION P1020100 VALUES LESS THAN ('1030100')\n" + - " LOGGING\n" + - " NOCOMPRESS , \n" + - " PARTITION P7040100 VALUES LESS THAN ('7050100')\n" + - " LOGGING\n" + - " NOCOMPRESS , \n" + - " PARTITION P7050100 VALUES LESS THAN ('7060100')\n" + - " LOGGING\n" + - " NOCOMPRESS , \n" + - " PARTITION P7060100 VALUES LESS THAN (MAXVALUE)\n" + - " LOGGING\n" + - " NOCOMPRESS\n" + - ")\n" + - "NOCACHE\n" + - "LOGGING\n" + - "NOCOMPRESS\n" + - "NOPARALLEL\n" + - "BUILD DEFERRED\n" + - "REFRESH FAST ON DEMAND\n" + - "WITH ROWID\n" + - "AS SELECT * FROM atom.NONAUTO_CLAIM_FOLDER_T@IDS_44;"; + "DROP MATERIALIZED VIEW ATOM_MVIEW.NONAUTO_CLAIM_FOLDER_T;\n" + + "--create materualized_view\n" + + "CREATE MATERIALIZED VIEW ATOM_MVIEW.NONAUTO_CLAIM_FOLDER_T\n" + + "PARTITION BY RANGE (BRANCH_COMPANY_CODE)\n" + + "( \n" + + " PARTITION P1010100 VALUES LESS THAN ('1020100')\n" + + " LOGGING\n" + + " NOCOMPRESS , \n" + + " PARTITION P1020100 VALUES LESS THAN ('1030100')\n" + + " LOGGING\n" + + " NOCOMPRESS , \n" + + " PARTITION P7040100 VALUES LESS THAN ('7050100')\n" + + " LOGGING\n" + + " NOCOMPRESS , \n" + + " PARTITION P7050100 VALUES LESS THAN ('7060100')\n" + + " LOGGING\n" + + " NOCOMPRESS , \n" + + " PARTITION P7060100 VALUES LESS THAN (MAXVALUE)\n" + + " LOGGING\n" + + " NOCOMPRESS\n" + + ")\n" + + "NOCACHE\n" + + "LOGGING\n" + + "NOCOMPRESS\n" + + "NOPARALLEL\n" + + "BUILD DEFERRED\n" + + "REFRESH FAST ON DEMAND\n" + + "WITH ROWID\n" + + "AS SELECT * FROM atom.NONAUTO_CLAIM_FOLDER_T@IDS_44;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -91,7 +90,7 @@ public void test_types() throws Exception { "AS\n" + "SELECT *\n" + "FROM atom.NONAUTO_CLAIM_FOLDER_T@IDS_44;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest4.java index 0f09c40ffd..1cfbc59af3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest4.java @@ -26,18 +26,16 @@ import java.util.List; public class OracleCreateMaterializedViewTest4 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE MATERIALIZED VIEW sales_mv\n" + - " BUILD IMMEDIATE\n" + - " REFRESH FAST ON COMMIT\n" + - " AS SELECT t.calendar_year, p.prod_id, \n" + - " SUM(s.amount_sold) AS sum_sales\n" + - " FROM times t, products p, sales s\n" + - " WHERE t.time_id = s.time_id AND p.prod_id = s.prod_id\n" + - " GROUP BY t.calendar_year, p.prod_id;\n" - ; + "CREATE MATERIALIZED VIEW sales_mv\n" + + " BUILD IMMEDIATE\n" + + " REFRESH FAST ON COMMIT\n" + + " AS SELECT t.calendar_year, p.prod_id, \n" + + " SUM(s.amount_sold) AS sum_sales\n" + + " FROM times t, products p, sales s\n" + + " WHERE t.time_id = s.time_id AND p.prod_id = s.prod_id\n" + + " GROUP BY t.calendar_year, p.prod_id;\n"; System.out.println(sql); @@ -57,7 +55,7 @@ public void test_types() throws Exception { "WHERE t.time_id = s.time_id\n" + "\tAND p.prod_id = s.prod_id\n" + "GROUP BY t.calendar_year, p.prod_id;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest0.java index 3a81d0d338..f12c25cb89 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest0.java @@ -26,81 +26,80 @@ import java.util.List; public class OracleCreatePackageTest0 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE OR REPLACE PACKAGE BODY emp_mgmt AS \n" + - " tot_emps NUMBER; \n" + - " tot_depts NUMBER; \n" + - "FUNCTION hire \n" + - " (last_name VARCHAR2, job_id VARCHAR2, \n" + - " manager_id NUMBER, salary NUMBER, \n" + - " commission_pct NUMBER, department_id NUMBER) \n" + - " RETURN NUMBER IS new_empno NUMBER; \n" + - "BEGIN \n" + - " SELECT employees_seq.NEXTVAL \n" + - " INTO new_empno \n" + - " FROM DUAL; \n" + - " INSERT INTO employees \n" + - " VALUES (new_empno, 'First', 'Last','first.last@oracle.com', \n" + - " '(123)123-1234','18-JUN-02','IT_PROG',90000000,00, \n" + - " 100,110); \n" + - " tot_emps := tot_emps + 1; \n" + - " RETURN(new_empno); \n" + - "END; \n" + - "FUNCTION create_dept(department_id NUMBER, location_id NUMBER) \n" + - " RETURN NUMBER IS \n" + - " new_deptno NUMBER; \n" + - " BEGIN \n" + - " SELECT departments_seq.NEXTVAL \n" + - " INTO new_deptno \n" + - " FROM dual; \n" + - " INSERT INTO departments \n" + - " VALUES (new_deptno, 'department name', 100, 1700); \n" + - " tot_depts := tot_depts + 1; \n" + - " RETURN(new_deptno); \n" + - " END; \n" + - "PROCEDURE remove_emp (employee_id NUMBER) IS \n" + - " BEGIN \n" + - " DELETE FROM employees \n" + - " WHERE employees.employee_id = remove_emp.employee_id; \n" + - " tot_emps := tot_emps - 1; \n" + - " END; \n" + - "PROCEDURE remove_dept(department_id NUMBER) IS \n" + - " BEGIN \n" + - " DELETE FROM departments \n" + - " WHERE departments.department_id = remove_dept.department_id; \n" + - " tot_depts := tot_depts - 1; \n" + - " SELECT COUNT(*) INTO tot_emps FROM employees; \n" + - " END; \n" + - "PROCEDURE increase_sal(employee_id NUMBER, salary_incr NUMBER) IS \n" + - " curr_sal NUMBER; \n" + - " BEGIN \n" + - " SELECT salary INTO curr_sal FROM employees \n" + - " WHERE employees.employee_id = increase_sal.employee_id; \n" + - " IF curr_sal IS NULL \n" + - " THEN RAISE no_sal; \n" + - " ELSE \n" + - " UPDATE employees \n" + - " SET salary = salary + salary_incr \n" + - " WHERE employee_id = employee_id; \n" + - " END IF; \n" + - " END; \n" + - "PROCEDURE increase_comm(employee_id NUMBER, comm_incr NUMBER) IS \n" + - " curr_comm NUMBER; \n" + - " BEGIN \n" + - " SELECT commission_pct \n" + - " INTO curr_comm \n" + - " FROM employees \n" + - " WHERE employees.employee_id = increase_comm.employee_id; \n" + - " IF curr_comm IS NULL \n" + - " THEN RAISE no_comm; \n" + - " ELSE \n" + - " UPDATE employees \n" + - " SET commission_pct = commission_pct + comm_incr; \n" + - " END IF; \n" + - " END; \n" + - "END emp_mgmt; "; + " CREATE OR REPLACE PACKAGE BODY emp_mgmt AS \n" + + " tot_emps NUMBER; \n" + + " tot_depts NUMBER; \n" + + "FUNCTION hire \n" + + " (last_name VARCHAR2, job_id VARCHAR2, \n" + + " manager_id NUMBER, salary NUMBER, \n" + + " commission_pct NUMBER, department_id NUMBER) \n" + + " RETURN NUMBER IS new_empno NUMBER; \n" + + "BEGIN \n" + + " SELECT employees_seq.NEXTVAL \n" + + " INTO new_empno \n" + + " FROM DUAL; \n" + + " INSERT INTO employees \n" + + " VALUES (new_empno, 'First', 'Last','first.last@oracle.com', \n" + + " '(123)123-1234','18-JUN-02','IT_PROG',90000000,00, \n" + + " 100,110); \n" + + " tot_emps := tot_emps + 1; \n" + + " RETURN(new_empno); \n" + + "END; \n" + + "FUNCTION create_dept(department_id NUMBER, location_id NUMBER) \n" + + " RETURN NUMBER IS \n" + + " new_deptno NUMBER; \n" + + " BEGIN \n" + + " SELECT departments_seq.NEXTVAL \n" + + " INTO new_deptno \n" + + " FROM dual; \n" + + " INSERT INTO departments \n" + + " VALUES (new_deptno, 'department name', 100, 1700); \n" + + " tot_depts := tot_depts + 1; \n" + + " RETURN(new_deptno); \n" + + " END; \n" + + "PROCEDURE remove_emp (employee_id NUMBER) IS \n" + + " BEGIN \n" + + " DELETE FROM employees \n" + + " WHERE employees.employee_id = remove_emp.employee_id; \n" + + " tot_emps := tot_emps - 1; \n" + + " END; \n" + + "PROCEDURE remove_dept(department_id NUMBER) IS \n" + + " BEGIN \n" + + " DELETE FROM departments \n" + + " WHERE departments.department_id = remove_dept.department_id; \n" + + " tot_depts := tot_depts - 1; \n" + + " SELECT COUNT(*) INTO tot_emps FROM employees; \n" + + " END; \n" + + "PROCEDURE increase_sal(employee_id NUMBER, salary_incr NUMBER) IS \n" + + " curr_sal NUMBER; \n" + + " BEGIN \n" + + " SELECT salary INTO curr_sal FROM employees \n" + + " WHERE employees.employee_id = increase_sal.employee_id; \n" + + " IF curr_sal IS NULL \n" + + " THEN RAISE no_sal; \n" + + " ELSE \n" + + " UPDATE employees \n" + + " SET salary = salary + salary_incr \n" + + " WHERE employee_id = employee_id; \n" + + " END IF; \n" + + " END; \n" + + "PROCEDURE increase_comm(employee_id NUMBER, comm_incr NUMBER) IS \n" + + " curr_comm NUMBER; \n" + + " BEGIN \n" + + " SELECT commission_pct \n" + + " INTO curr_comm \n" + + " FROM employees \n" + + " WHERE employees.employee_id = increase_comm.employee_id; \n" + + " IF curr_comm IS NULL \n" + + " THEN RAISE no_comm; \n" + + " ELSE \n" + + " UPDATE employees \n" + + " SET commission_pct = commission_pct + comm_incr; \n" + + " END IF; \n" + + " END; \n" + + "END emp_mgmt; "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -210,7 +209,7 @@ public void test_types() throws Exception { "\t\tEND IF;\n" + "\tEND;\n" + "END emp_mgmt;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest1.java index d697b37ab5..49b2756ad7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest1.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreatePackageTest1 extends OracleTest { - public void test_types() throws Exception { String sql = // "CREATE OR REPLACE PACKAGE ACHIEVE_CONTRACT_SPECIMEN IS\n" + @@ -48,7 +47,7 @@ public void test_types() throws Exception { "\t)\n" + "\t;\n" + "END ACHIEVE_CONTRACT_SPECIMEN;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest2.java index d4f72d01f7..424347e8db 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest2.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreatePackageTest2 extends OracleTest { - public void test_types() throws Exception { String sql = // "CREATE OR REPLACE package PKG_ECC_CAL_TASK_ACCOMPLISH\n" + @@ -57,7 +56,7 @@ public void test_types() throws Exception { "\t)\n" + "\t;\n" + "END PKG_ECC_CAL_TASK_ACCOMPLISH;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest3.java index 30a052ca60..22b3f3a045 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest3.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreatePackageTest3 extends OracleTest { - public void test_types() throws Exception { String sql = // "\n" + @@ -125,7 +124,7 @@ public void test_types() throws Exception { "\tRETURN VARCHAR2\n" + "\t\n" + "END Mail_fck_bpi;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest4.java index 7f971393f2..650c622aa7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest4.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreatePackageTest4 extends OracleTest { - public void test_types() throws Exception { String sql = // "CREATE OR REPLACE PACKAGE XON_CALC_RIGHT_PRICE_PKG IS\n" + @@ -119,7 +118,7 @@ public void test_types() throws Exception { "\t)\n" + "\t;\n" + "END XON_CALC_RIGHT_PRICE_PKG;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest5.java index 86892d8049..201ee39fe0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest5.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreatePackageTest5 extends OracleTest { - public void test_types() throws Exception { String sql = // "CREATE OR REPLACE package body cms_con_attributes_pkg is\n" + @@ -72,7 +71,7 @@ public void test_types() throws Exception { "\t\tRETURN;\n" + "\tEND;\n" + "END cms_con_attributes_pkg;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest1.java index 4a14b67625..89dccb19a6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest1.java @@ -25,28 +25,27 @@ import java.util.List; public class OracleCreateProcedureTest1 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE OR REPLACE PROCEDURE p (" + - " dept_no NUMBER" + - ") AS " + - "BEGIN" + - " DELETE FROM dept_temp" + - " WHERE department_id = dept_no;" + - " " + - " IF SQL%FOUND THEN" + - " DBMS_OUTPUT.PUT_LINE (" + - " 'Delete succeeded for department number ' || dept_no" + - " );" + - " ELSE" + - " DBMS_OUTPUT.PUT_LINE ('No department number ' || dept_no);" + - " END IF;" + - "END;" + - "/" + - "BEGIN" + - " p(270);" + - " p(400);" + - "END;"; // + " dept_no NUMBER" + + ") AS " + + "BEGIN" + + " DELETE FROM dept_temp" + + " WHERE department_id = dept_no;" + + " " + + " IF SQL%FOUND THEN" + + " DBMS_OUTPUT.PUT_LINE (" + + " 'Delete succeeded for department number ' || dept_no" + + " );" + + " ELSE" + + " DBMS_OUTPUT.PUT_LINE ('No department number ' || dept_no);" + + " END IF;" + + "END;" + + "/" + + "BEGIN" + + " p(270);" + + " p(400);" + + "END;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest2.java index dcd298753a..2135dae91c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest2.java @@ -25,24 +25,23 @@ import java.util.List; public class OracleCreateProcedureTest2 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE OR REPLACE PROCEDURE transfer (" + // - " from_acct NUMBER," + // - " to_acct NUMBER," + // - " amount NUMBER" + // - ") AS " + // - "BEGIN" + // - " UPDATE accounts" + // - " SET balance = balance - amount" + // - " WHERE account_id = from_acct;" + // - " " + // - " UPDATE accounts" + // - " SET balance = balance + amount" + // - " WHERE account_id = to_acct;" + // - " " + // - " COMMIT WRITE IMMEDIATE NOWAIT;" + // - "END;"; // + " from_acct NUMBER," + // + " to_acct NUMBER," + // + " amount NUMBER" + // + ") AS " + // + "BEGIN" + // + " UPDATE accounts" + // + " SET balance = balance - amount" + // + " WHERE account_id = from_acct;" + // + " " + // + " UPDATE accounts" + // + " SET balance = balance + amount" + // + " WHERE account_id = to_acct;" + // + " " + // + " COMMIT WRITE IMMEDIATE NOWAIT;" + // + "END;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -85,7 +84,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getRelationships().size()); - Assert.assertTrue(visitor.containsColumn("accounts", "balance")); - Assert.assertTrue(visitor.containsColumn("accounts", "account_id")); + Assert.assertTrue(visitor.containsColumn("accounts", "balance")); + Assert.assertTrue(visitor.containsColumn("accounts", "account_id")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest3.java index 5e6539f6d2..6e9348f4d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest3.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateProcedureTest3 extends OracleTest { - public void test_0() throws Exception { String sql = "PROCEDURE PRC_DEALSMS IS\n" + " LV_HOUR NUMBER; --??\n" + @@ -65,7 +64,7 @@ public void test_0() throws Exception { Assert.assertEquals(2, visitor.getConditions().size()); Assert.assertEquals(0, visitor.getRelationships().size()); - Assert.assertTrue(visitor.containsColumn("CRMSMS_MT_SEND", "SENDFLAG")); - Assert.assertTrue(visitor.containsColumn("CRMSMS_MT_SEND", "FLAGID")); + Assert.assertTrue(visitor.containsColumn("CRMSMS_MT_SEND", "SENDFLAG")); + Assert.assertTrue(visitor.containsColumn("CRMSMS_MT_SEND", "FLAGID")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest4.java index b75fc88c44..70320e0bba 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest4.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateProcedureTest4 extends OracleTest { - public void test_0() throws Exception { String sql = "PROCEDURE abc_apply(in_json IN VARCHAR2,\n" + " out_ret OUT NUMBER,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest5.java index 78bd79f20d..6e3a1080df 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest5.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateProcedureTest5 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE OR REPLACE PROCEDURE proc_helloworld\n" + "IS\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest6.java index 22d3394221..fede694464 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest6.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateProcedureTest6 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE PROCEDURE wraptest wrapped \n" + "a000000\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest7.java index 28311b6e24..067cde2f2d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest7.java @@ -24,23 +24,22 @@ import java.util.List; public class OracleCreateProcedureTest7 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE OR REPLACE PROCEDURE proc_helloworld\n" + "AS\n" + "\tV_TMP_NUM1 NUMBER(2);\n" - + "\tV_TMP_NUM2 NUMBER(2);\n" + "\tTYPE T_VARRAY IS VARRAY(30) OF NUMBER(2);\n" - + "\tV_VAR T_VARRAY := T_VARRAY(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 44, 41, 42, 43, 51, 52, 53, 61, 62, 63, 71, 72, 73, 81, 82, 83, 91, 92);\n" - + "BEGIN\n" + "\tFOR ROWDATA IN (\n" + "\t\tSELECT *\n" + "\t\tFROM user_defer_ctrl_cfg\n" - + "\t\tWHERE HOME_CITY = 592\n" + "\t\t\tAND DEFER_TYPE = 1\n" + "\t\t\tAND STATUS = 0\n" - + "\t\t\tAND DEFER_END_DATE < to_date(20171217, 'yyyymmdd')\n" + "\t)\n" + "\tLOOP\n" - + "\t\tBEGIN\n" + "\t\t\tV_USER_ID := ROWDATA.USER_ID;\n" + "\t\t\tV_SEQ_ID := ROWDATA.SEQ_ID;\n" - + "\t\t\tV_TMP_NUM1 := MOD(V_USER_ID, 10);\n" + "\t\t\tV_TMP_NUM2 := MOD(V_USER_ID, 3);\n" - + "\t\t\tV_INDEX := V_TMP_NUM1 * 3 + V_TMP_NUM2 + 1;\n" + "\t\t\tINSERT INTO CREDIT_CTRL_REQ\n" - + "\t\t\t\t(PROC_NO, REQ_SRC, HOME_CITY, EXEC_STATUS, REQ_ID\n" - + "\t\t\t\t, CTRL_ID, CTRL_TYPE, ID_TYPE, INSERT_TIME, REQUEST_SEQ)\n" - + "\t\t\tVALUES (V_VAR(V_INDEX), 1, 592, 0, Seq_Credit_Ctrl_Req_ID.NEXTVAL\n" - + "\t\t\t\t, V_USER_ID, 1, 1, SYSDATE, V_SEQ_ID);\n" + "\t\t\tUPDATE user_defer_ctrl_cfg\n" - + "\t\t\tSET STATUS = 9\n" + "\t\t\tWHERE SEQ_ID = V_SEQ_ID;\n" + "\t\tEND;\n" + "\tEND LOOP;\n" - + "\tCOMMIT;\n" + "END;"; + + "\tV_TMP_NUM2 NUMBER(2);\n" + "\tTYPE T_VARRAY IS VARRAY(30) OF NUMBER(2);\n" + + "\tV_VAR T_VARRAY := T_VARRAY(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 44, 41, 42, 43, 51, 52, 53, 61, 62, 63, 71, 72, 73, 81, 82, 83, 91, 92);\n" + + "BEGIN\n" + "\tFOR ROWDATA IN (\n" + "\t\tSELECT *\n" + "\t\tFROM user_defer_ctrl_cfg\n" + + "\t\tWHERE HOME_CITY = 592\n" + "\t\t\tAND DEFER_TYPE = 1\n" + "\t\t\tAND STATUS = 0\n" + + "\t\t\tAND DEFER_END_DATE < to_date(20171217, 'yyyymmdd')\n" + "\t)\n" + "\tLOOP\n" + + "\t\tBEGIN\n" + "\t\t\tV_USER_ID := ROWDATA.USER_ID;\n" + "\t\t\tV_SEQ_ID := ROWDATA.SEQ_ID;\n" + + "\t\t\tV_TMP_NUM1 := MOD(V_USER_ID, 10);\n" + "\t\t\tV_TMP_NUM2 := MOD(V_USER_ID, 3);\n" + + "\t\t\tV_INDEX := V_TMP_NUM1 * 3 + V_TMP_NUM2 + 1;\n" + "\t\t\tINSERT INTO CREDIT_CTRL_REQ\n" + + "\t\t\t\t(PROC_NO, REQ_SRC, HOME_CITY, EXEC_STATUS, REQ_ID\n" + + "\t\t\t\t, CTRL_ID, CTRL_TYPE, ID_TYPE, INSERT_TIME, REQUEST_SEQ)\n" + + "\t\t\tVALUES (V_VAR(V_INDEX), 1, 592, 0, Seq_Credit_Ctrl_Req_ID.NEXTVAL\n" + + "\t\t\t\t, V_USER_ID, 1, 1, SYSDATE, V_SEQ_ID);\n" + "\t\t\tUPDATE user_defer_ctrl_cfg\n" + + "\t\t\tSET STATUS = 9\n" + "\t\t\tWHERE SEQ_ID = V_SEQ_ID;\n" + "\t\tEND;\n" + "\tEND LOOP;\n" + + "\tCOMMIT;\n" + "END;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); print(statementList); @@ -53,20 +52,20 @@ public void test_0() throws Exception { stmt.accept(visitor); assertEquals("CREATE OR REPLACE PROCEDURE proc_helloworld\n" + "AS\n" + "\tV_TMP_NUM1 NUMBER(2);\n" - + "\tV_TMP_NUM2 NUMBER(2);\n" + "\tTYPE T_VARRAY IS VARRAY(30) OF NUMBER(2);\n" - + "\tV_VAR T_VARRAY := T_VARRAY(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 44, 41, 42, 43, 51, 52, 53, 61, 62, 63, 71, 72, 73, 81, 82, 83, 91, 92);\n" - + "BEGIN\n" + "\tFOR ROWDATA IN (\n" + "\t\tSELECT *\n" + "\t\tFROM user_defer_ctrl_cfg\n" - + "\t\tWHERE HOME_CITY = 592\n" + "\t\t\tAND DEFER_TYPE = 1\n" + "\t\t\tAND STATUS = 0\n" - + "\t\t\tAND DEFER_END_DATE < to_date(20171217, 'yyyymmdd')\n" + "\t)\n" + "\tLOOP\n" - + "\t\tBEGIN\n" + "\t\t\tV_USER_ID := ROWDATA.USER_ID;\n" + "\t\t\tV_SEQ_ID := ROWDATA.SEQ_ID;\n" - + "\t\t\tV_TMP_NUM1 := MOD(V_USER_ID, 10);\n" + "\t\t\tV_TMP_NUM2 := MOD(V_USER_ID, 3);\n" - + "\t\t\tV_INDEX := V_TMP_NUM1 * 3 + V_TMP_NUM2 + 1;\n" + "\t\t\tINSERT INTO CREDIT_CTRL_REQ\n" - + "\t\t\t\t(PROC_NO, REQ_SRC, HOME_CITY, EXEC_STATUS, REQ_ID\n" - + "\t\t\t\t, CTRL_ID, CTRL_TYPE, ID_TYPE, INSERT_TIME, REQUEST_SEQ)\n" - + "\t\t\tVALUES (V_VAR(V_INDEX), 1, 592, 0, Seq_Credit_Ctrl_Req_ID.NEXTVAL\n" - + "\t\t\t\t, V_USER_ID, 1, 1, SYSDATE, V_SEQ_ID);\n" + "\t\t\tUPDATE user_defer_ctrl_cfg\n" - + "\t\t\tSET STATUS = 9\n" + "\t\t\tWHERE SEQ_ID = V_SEQ_ID;\n" + "\t\tEND;\n" + "\tEND LOOP;\n" - + "\tCOMMIT;\n" + "END;", stmt.toString()); + + "\tV_TMP_NUM2 NUMBER(2);\n" + "\tTYPE T_VARRAY IS VARRAY(30) OF NUMBER(2);\n" + + "\tV_VAR T_VARRAY := T_VARRAY(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 44, 41, 42, 43, 51, 52, 53, 61, 62, 63, 71, 72, 73, 81, 82, 83, 91, 92);\n" + + "BEGIN\n" + "\tFOR ROWDATA IN (\n" + "\t\tSELECT *\n" + "\t\tFROM user_defer_ctrl_cfg\n" + + "\t\tWHERE HOME_CITY = 592\n" + "\t\t\tAND DEFER_TYPE = 1\n" + "\t\t\tAND STATUS = 0\n" + + "\t\t\tAND DEFER_END_DATE < to_date(20171217, 'yyyymmdd')\n" + "\t)\n" + "\tLOOP\n" + + "\t\tBEGIN\n" + "\t\t\tV_USER_ID := ROWDATA.USER_ID;\n" + "\t\t\tV_SEQ_ID := ROWDATA.SEQ_ID;\n" + + "\t\t\tV_TMP_NUM1 := MOD(V_USER_ID, 10);\n" + "\t\t\tV_TMP_NUM2 := MOD(V_USER_ID, 3);\n" + + "\t\t\tV_INDEX := V_TMP_NUM1 * 3 + V_TMP_NUM2 + 1;\n" + "\t\t\tINSERT INTO CREDIT_CTRL_REQ\n" + + "\t\t\t\t(PROC_NO, REQ_SRC, HOME_CITY, EXEC_STATUS, REQ_ID\n" + + "\t\t\t\t, CTRL_ID, CTRL_TYPE, ID_TYPE, INSERT_TIME, REQUEST_SEQ)\n" + + "\t\t\tVALUES (V_VAR(V_INDEX), 1, 592, 0, Seq_Credit_Ctrl_Req_ID.NEXTVAL\n" + + "\t\t\t\t, V_USER_ID, 1, 1, SYSDATE, V_SEQ_ID);\n" + "\t\t\tUPDATE user_defer_ctrl_cfg\n" + + "\t\t\tSET STATUS = 9\n" + "\t\t\tWHERE SEQ_ID = V_SEQ_ID;\n" + "\t\tEND;\n" + "\tEND LOOP;\n" + + "\tCOMMIT;\n" + "END;", stmt.toString()); System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest.java index ec96037107..a7bf2be3b3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest.java @@ -24,14 +24,13 @@ import java.util.List; public class OracleCreateSequenceTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE SEQUENCE customers_seq" + // - " START WITH 1000" + // - " INCREMENT BY 1" + // - " NOCACHE" + // - " NOCYCLE;"; + "CREATE SEQUENCE customers_seq" + // + " START WITH 1000" + // + " INCREMENT BY 1" + // + " NOCACHE" + // + " NOCYCLE;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1.java index c5f7d7059d..85aa31338e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1.java @@ -24,10 +24,9 @@ import java.util.List; public class OracleCreateSequenceTest_1 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE SEQUENCE projects_seq START WITH 10000"; + "CREATE SEQUENCE projects_seq START WITH 10000"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1_bugfix.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1_bugfix.java index d86ee1b1ee..05b53802da 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1_bugfix.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1_bugfix.java @@ -24,10 +24,9 @@ import java.util.List; public class OracleCreateSequenceTest_1_bugfix extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE SEQUENCE \"YDJC\".\"SEQ_ZW_DZFPKJRZ_RZBS\" START WITH ? INCREMENT BY ? MAXVALUE ? MINVALUE ? CACHE ?;"; + "CREATE SEQUENCE \"YDJC\".\"SEQ_ZW_DZFPKJRZ_RZBS\" START WITH ? INCREMENT BY ? MAXVALUE ? MINVALUE ? CACHE ?;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_2.java index 7d57d421e2..3fee2563e8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_2.java @@ -26,10 +26,9 @@ import java.util.List; public class OracleCreateSequenceTest_2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE SEQUENCE \"AO_4AEACD_WEBHOOK_DAO_ID_SEQ\" INCREMENT BY 1 START WITH 1 NOMAXVALUE MINVALUE 1"; + "CREATE SEQUENCE \"AO_4AEACD_WEBHOOK_DAO_ID_SEQ\" INCREMENT BY 1 START WITH 1 NOMAXVALUE MINVALUE 1"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -37,9 +36,9 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals(1, statementList.size()); - + Assert.assertEquals("CREATE SEQUENCE \"AO_4AEACD_WEBHOOK_DAO_ID_SEQ\" START WITH 1 INCREMENT BY 1 NOMAXVALUE MINVALUE 1",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_3_cachevalue.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_3_cachevalue.java index 98a34e8697..a427b9485a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_3_cachevalue.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_3_cachevalue.java @@ -26,10 +26,9 @@ import java.util.List; public class OracleCreateSequenceTest_3_cachevalue extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" CACHE 2"; + "CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" CACHE 2"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -37,9 +36,9 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals(1, statementList.size()); - + Assert.assertEquals("CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" CACHE 2",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_4_order.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_4_order.java index 23e956dd03..6539672b8e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_4_order.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_4_order.java @@ -26,10 +26,9 @@ import java.util.List; public class OracleCreateSequenceTest_4_order extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" ORDER"; + "CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" ORDER"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -37,9 +36,9 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals(1, statementList.size()); - + Assert.assertEquals("CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" ORDER",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_5_noorder.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_5_noorder.java index 28bc03760f..15e89a7392 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_5_noorder.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_5_noorder.java @@ -26,10 +26,9 @@ import java.util.List; public class OracleCreateSequenceTest_5_noorder extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" NOORDER"; + "CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" NOORDER"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -37,9 +36,9 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals(1, statementList.size()); - + Assert.assertEquals("CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" NOORDER",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_6_goto.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_6_goto.java index 8fa12441fa..64c8d6f66b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_6_goto.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_6_goto.java @@ -26,10 +26,9 @@ import java.util.List; public class OracleCreateSequenceTest_6_goto extends OracleTest { - public void test_0() throws Exception { String sql = // - "create sequence GOTO.SEQ_GT_BUSINESS_CATEGORY increment by 1 start with 1 minvalue 1"; + "create sequence GOTO.SEQ_GT_BUSINESS_CATEGORY increment by 1 start with 1 minvalue 1"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -37,9 +36,9 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals(1, statementList.size()); - + Assert.assertEquals("CREATE SEQUENCE GOTO.SEQ_GT_BUSINESS_CATEGORY START WITH 1 INCREMENT BY 1 MINVALUE 1",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest.java index ea9a3fc3d7..28bd2c5568 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest.java @@ -24,11 +24,10 @@ import java.util.List; public class OracleCreateSynonymTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE SYNONYM offices \n" + - " FOR hr.locations;"; + "CREATE SYNONYM offices \n" + + " FOR hr.locations;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest1.java index 401910dbad..c500ed6971 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest1.java @@ -24,10 +24,9 @@ import java.util.List; public class OracleCreateSynonymTest1 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE PUBLIC SYNONYM customers FOR oe.customers;"; + "CREATE PUBLIC SYNONYM customers FOR oe.customers;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest2.java index 59200a82d6..e4b77e5b39 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest2.java @@ -24,11 +24,10 @@ import java.util.List; public class OracleCreateSynonymTest2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE PUBLIC SYNONYM emp_table \n" + - " FOR hr.employees@remote.us.oracle.com;"; + "CREATE PUBLIC SYNONYM emp_table \n" + + " FOR hr.employees@remote.us.oracle.com;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_0.java index 50895b18e4..b868e50174 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_0.java @@ -24,11 +24,10 @@ import java.util.List; public class OracleCreateSynonymTest_0 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE PUBLIC SYNONYM emp_table \n" + - " FOR hr.employees@remote.us.oracle.com;"; + "CREATE PUBLIC SYNONYM emp_table \n" + + " FOR hr.employees@remote.us.oracle.com;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_1.java index 2f8375496f..ca9f7578cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_1.java @@ -24,11 +24,10 @@ import java.util.List; public class OracleCreateSynonymTest_1 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE SYNONYM offices \n" + - " FOR hr.locations;"; + "CREATE SYNONYM offices \n" + + " FOR hr.locations;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_2.java index 4e48bf4f81..d289c5ce5f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_2.java @@ -24,10 +24,9 @@ import java.util.List; public class OracleCreateSynonymTest_2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE OR REPLACE SYNONYM CSCLIENT.ECC_CUST_AREA_INFO FOR ECC_CUST.ECC_CUST_AREA_INFO"; + "CREATE OR REPLACE SYNONYM CSCLIENT.ECC_CUST_AREA_INFO FOR ECC_CUST.ECC_CUST_AREA_INFO"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest.java index c7b2939c7b..a4a5e76270 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest.java @@ -26,15 +26,14 @@ import java.util.List; public class OracleCreateTriggerTest extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE TRIGGER \"AO_4AEACD_WEBHOOK_D367380484\" " // - + "BEFORE INSERT"// - + " ON \"AO_4AEACD_WEBHOOK_DAO\" FOR EACH ROW "// - + "BEGIN"// - + " SELECT \"AO_4AEACD_WEBHOOK_DAO_ID_SEQ\".NEXTVAL INTO :NEW.\"ID\" FROM DUAL;"// - + "END;"; + "CREATE TRIGGER \"AO_4AEACD_WEBHOOK_D367380484\" " // + + "BEFORE INSERT"// + + " ON \"AO_4AEACD_WEBHOOK_DAO\" FOR EACH ROW "// + + "BEGIN"// + + " SELECT \"AO_4AEACD_WEBHOOK_DAO_ID_SEQ\".NEXTVAL INTO :NEW.\"ID\" FROM DUAL;"// + + "END;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,7 +51,7 @@ public void test_0() throws Exception { "\tINTO :NEW.\"ID\"\n" + "\tFROM DUAL;\n" + "END;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest2.java index 7990539482..6f38f61e7d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest2.java @@ -26,17 +26,16 @@ import java.util.List; public class OracleCreateTriggerTest2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE OR REPLACE TRIGGER projects_idt\n" + - " BEFORE INSERT ON projects\n" + - " FOR EACH ROW\n" + - " BEGIN\n" + - " IF :new.id IS null THEN\n" + - " SELECT projects_seq.nextval INTO :new.id FROM dual;\n" + - " END IF;\n" + - " END;"; + "CREATE OR REPLACE TRIGGER projects_idt\n" + + " BEFORE INSERT ON projects\n" + + " FOR EACH ROW\n" + + " BEGIN\n" + + " IF :new.id IS null THEN\n" + + " SELECT projects_seq.nextval INTO :new.id FROM dual;\n" + + " END IF;\n" + + " END;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -56,7 +55,7 @@ public void test_0() throws Exception { "\t\tFROM dual;\n" + "\tEND IF;\n" + "END;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest3.java index 1a12b34f6d..38329ef874 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest3.java @@ -26,14 +26,13 @@ import java.util.List; public class OracleCreateTriggerTest3 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE TRIGGER salary_check\n" + - " BEFORE INSERT OR UPDATE OF salary, job_id ON employees\n" + - " FOR EACH ROW\n" + - " WHEN (new.job_id <> 'AD_VP')\n" + - " CALL check_sal(:new.job_id, :new.salary, :new.last_name)"; + "CREATE TRIGGER salary_check\n" + + " BEFORE INSERT OR UPDATE OF salary, job_id ON employees\n" + + " FOR EACH ROW\n" + + " WHEN (new.job_id <> 'AD_VP')\n" + + " CALL check_sal(:new.job_id, :new.salary, :new.last_name)"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -48,7 +47,7 @@ public void test_0() throws Exception { "\tFOR EACH ROW\n" + "\tWHEN new.job_id <> 'AD_VP'\n" + "CALL check_sal(:new.job_id, :new.salary, :new.last_name)",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest4.java index 034339b9a5..a20e8f28e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest4.java @@ -26,21 +26,20 @@ import java.util.List; public class OracleCreateTriggerTest4 extends OracleTest { - public void test_0() throws Exception { String sql = // - "TRIGGER RRP.TRG_HR_AK_AFTINST AFTER INSERT ON hr_structure FOR EACH ROW\n" + - "DECLARE\n" + - "BEGIN\n" + - " INSERT INTO hr_structure_temp\n" + - " (com_code,CODE,NAME,status,sjcode,\n" + - " isdept,type,selfcode,POS,createdate,\n" + - " issync,syncdate,deptsale)\n" + - " VALUES\n" + - " (:NEW.com_code,:NEW.CODE,:NEW.NAME,:NEW.status,:NEW.sjcode,\n" + - " :NEW.isdept,:NEW.type,:NEW.selfcode,:NEW.POS,SYSDATE,\n" + - " 'N',NULL,:NEW.deptsale);\n" + - "END;"; + "TRIGGER RRP.TRG_HR_AK_AFTINST AFTER INSERT ON hr_structure FOR EACH ROW\n" + + "DECLARE\n" + + "BEGIN\n" + + " INSERT INTO hr_structure_temp\n" + + " (com_code,CODE,NAME,status,sjcode,\n" + + " isdept,type,selfcode,POS,createdate,\n" + + " issync,syncdate,deptsale)\n" + + " VALUES\n" + + " (:NEW.com_code,:NEW.CODE,:NEW.NAME,:NEW.status,:NEW.sjcode,\n" + + " :NEW.isdept,:NEW.type,:NEW.selfcode,:NEW.POS,SYSDATE,\n" + + " 'N',NULL,:NEW.deptsale);\n" + + "END;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -62,7 +61,7 @@ public void test_0() throws Exception { "\t\t, :NEW.isdept, :NEW.type, :NEW.selfcode, :NEW.POS, SYSDATE\n" + "\t\t, 'N', NULL, :NEW.deptsale);\n" + "END;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest5.java index e05f1547be..16a6fb4ad3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest5.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleCreateTriggerTest5 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE OR REPLACE TRIGGER XONN.GAPM_PROJECT_INFO_SYNC_IOA_t\n" + @@ -55,7 +54,7 @@ public void test_0() throws Exception { "\tINTO :New.PROJECT_SYN_ID\n" + "\tFROM dual;\n" + "END;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); Assert.assertEquals("CREATE OR REPLACE TRIGGER XONN.GAPM_PROJECT_INFO_SYNC_IOA_t\n" + "\tBEFORE INSERT\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest6.java index 90f7f48ff9..b068792c7d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest6.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleCreateTriggerTest6 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE OR REPLACE TRIGGER XON_EPM.EPM_TG_FIRSTCHECK\n" + @@ -109,7 +108,7 @@ public void test_0() throws Exception { "\t\tEND IF;\n" + "\tEND IF;\n" + "END;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); Assert.assertEquals("CREATE OR REPLACE TRIGGER XON_EPM.EPM_TG_FIRSTCHECK\n" + "\tAFTER INSERT OR UPDATE\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest0.java index f961a815ba..227c914ccd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest0.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateTypeTest0 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TYPE customer_typ_demo AS OBJECT\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest1.java index b3d3f33836..c9c87f99c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest1.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateTypeTest1 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE OR REPLACE TYPE BODY \"STRCAT_TYPE\" is\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest10.java index 6a4b73ee90..d5211c2aa7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest10.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateTypeTest10 extends OracleTest { - public void test_types() throws Exception { String sql = "CREATE OR REPLACE type body connstrBycomma is\n" + " static function ODCIAggregateInitialize(sctx IN OUT connstrBycomma)\t\n" + @@ -107,7 +106,7 @@ public void test_types() throws Exception { "\t\tRETURN ODCIConst.Success;\n" + "\tEND;\n" + "END",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest11.java index c23380ddd0..59750ecd82 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest11.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateTypeTest11 extends OracleTest { - public void test_types() throws Exception { String sql = "CREATE TYPE BODY rational\n" + " IS\n" + @@ -83,7 +82,7 @@ public void test_types() throws Exception { "\t\tRETURN r;\n" + "\tEND;\n" + "END;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest12.java index 462ecc455a..816a7fb8b7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest12.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateTypeTest12 extends OracleTest { - public void test_types() throws Exception { String sql = "CREATE OR REPLACE\n" + "TYPE mybb wrapped\n" + @@ -85,7 +84,7 @@ public void test_types() throws Exception { "4YeykduDwWpKI7JeaWrDQ5SWiVgwg5n0dLhcWvou/6GX6rh0K6W/m8Ayy8xQjwlppZmB8L8z\n" + "vbLLUrKeK2fhZ1JJscqkTZ4s6sZ86o5CkZQ1+fmoCEHRnn2mVV986ixuyTCSREZA25hXQFfU\n" + "W757xtr4B5ICysO43qOCpqYu0laZ;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest2.java index 1429d481bd..9651d702e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest2.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateTypeTest2 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TYPE customer_typ_demo AS OBJECT\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest3.java index 3d0fe3e51c..2b459ec63b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest3.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateTypeTest3 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TYPE data_typ1 AS OBJECT \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest4.java index 7d24433ea6..09d707a96a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest4.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateTypeTest4 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE OR REPLACE TYPE cms_contract_config_obj_TABLE\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest5.java index d409bb0e7f..08c0f7bead 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest5.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateTypeTest5 extends OracleTest { - public void test_types() throws Exception { String sql = "CREATE OR REPLACE TYPE T_PMINFO_LOAN_OBJECT \n" + "is object(\n" + @@ -56,7 +55,7 @@ public void test_types() throws Exception { "\tcarriert_type varchar2(20), \n" + "\tdept_id number(10)\n" + ") NOT FINAL INSTANTIABLE;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest6.java index d59d0cc720..e6f586dc8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest6.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateTypeTest6 extends OracleTest { - public void test_types() throws Exception { String sql = "CREATE OR REPLACE TYPE \"VARRAY_DEPT_TYPE\"\n" + " AS varray(7000) OF NUMBER(10) "; @@ -38,7 +37,7 @@ public void test_types() throws Exception { assertEquals(1, statementList.size()); assertEquals("CREATE OR REPLACE TYPE \"VARRAY_DEPT_TYPE\" VARRAY (7000) OF NUMBER(10)",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest7.java index 6ad7b42321..39edea42b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest7.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateTypeTest7 extends OracleTest { - public void test_types() throws Exception { String sql = "CREATE OR REPLACE TYPE histogram_entry_type AUTHID CURRENT_USER AS OBJECT\n" + " (count NUMBER\n" + @@ -43,7 +42,7 @@ public void test_types() throws Exception { "\tcount NUMBER, \n" + "\tvalue NUMBER(5)\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest8.java index b6619c6995..afd252f067 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest8.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateTypeTest8 extends OracleTest { - public void test_types() throws Exception { String sql = "CREATE OR REPLACE TYPE dmbanimp AUTHID CURRENT_USER AS OBJECT (\n" + " key RAW(4),\n" + @@ -144,7 +143,7 @@ public void test_types() throws Exception { "\tMEMBER FUNCTION dmbanFetchStub (self IN OUT dmbanimp, nrows IN NUMBER, outset OUT dmbaos) RETURN NUMBER, \n" + "\tMEMBER FUNCTION dmbanCloseStub (self IN dmbanimp) RETURN NUMBER\n" + ");",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest9.java index 0766159421..fba14e3815 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest9.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateTypeTest9 extends OracleTest { - public void test_types() throws Exception { String sql = "CREATE OR REPLACE TYPE \"T_EVA_PM_INFO_OBJECT\" \n" + "under ecc_pm.t_pminfo_loan_object(\n" + @@ -61,7 +60,7 @@ public void test_types() throws Exception { "\tsanctionedParty12 varchar2(256), \n" + "\tsanctionedParty22 varchar2(256)\n" + ");",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateUserTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateUserTest1.java index 040bb15f82..f195cb8c18 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateUserTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateUserTest1.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateUserTest1 extends OracleTest { - public void test_0() throws Exception { String sql = // "create user DZFP_CX identified by oracle;"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest0.java index 9648c8b0b6..33e694a7d2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest0.java @@ -26,11 +26,10 @@ import java.util.List; public class OracleCreateViewTest0 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE OR REPLACE FORCE VIEW \"SC0\".\"V_001\" (\"ID\", \"GROUP_ID\", \"IND_BY_ALL\", \"IND_BY_GROUP\", \"OWNER_MEMBER_ID\", \"OWNER_MEMBER_SEQ\", \"GMT_MODIFIED\") AS \n" + - " select id, GROUP_ID ,IND_BY_ALL, IND_BY_GROUP, OWNER_MEMBER_ID, OWNER_MEMBER_SEQ,gmt_modified "; + " CREATE OR REPLACE FORCE VIEW \"SC0\".\"V_001\" (\"ID\", \"GROUP_ID\", \"IND_BY_ALL\", \"IND_BY_GROUP\", \"OWNER_MEMBER_ID\", \"OWNER_MEMBER_SEQ\", \"GMT_MODIFIED\") AS \n" + + " select id, GROUP_ID ,IND_BY_ALL, IND_BY_GROUP, OWNER_MEMBER_ID, OWNER_MEMBER_SEQ,gmt_modified "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,7 +51,7 @@ public void test_types() throws Exception { "SELECT id, GROUP_ID, IND_BY_ALL, IND_BY_GROUP, OWNER_MEMBER_ID\n" + "\t, OWNER_MEMBER_SEQ, gmt_modified\n" + "FROM DUAL",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest1.java index c8cd479dec..fdd27e5764 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest1.java @@ -27,66 +27,65 @@ import java.util.List; public class OracleCreateViewTest1 extends OracleTest { - public void test_types() throws Exception { String sql = // - " \n" + - " CREATE OR REPLACE FORCE VIEW \"XBO\".\"VW_SCY\" (\"ID\", \"GMT_CREATE\", \"GMT_MODIFIED\", \"COMPANY_NAME\", \"BIZ_TYPE\", \"BIZ_TYPE_2\", \"SERVICE_TYPE\", \"SERVICE_LEVEL\", \"BUSINESS_ROLE\", \"STATUS\", \"RECOMMENDED\", \"COUNTRY\", \"PROVINCE\", \"CITY\", \"ADDRESS\", \"ZIP\", \"LOGO_FILE\", \"EMAIL\", \"BRIEF_PROFILE\", \"DOMAIN_ID\", \"IS_PASS_AV\", \"KEYWORDS\", \"PROVIDE_PRODUCTS\", \"PURCHASE_PRODUCTS\", \"BRAND_NAME\", \"PROMOTION_VALUE\", \"OWNER_MEMBER_ID\", \"OWNER_SEQ\", \"EMPLOYEES_COUNT\", \"ANNUAL_REVENUE\", \"HOMEPAGE_URL\", \"REG_ADDRESS\", \"TRADE_REGION\", \"TRADE_REGION_USER\", \"REG_CAPITAL\", \"OWNERSHIP_TYPE\", \"ESTABLISHED_YEAR\", \"PRINCIPAL\", \"ANNUAL_PURCHASE\", \"CERTIFICATION\", \"CERTIFICATION_2\", \"CONTACT_MANUFACTURING\", \"YEARS_OEM\", \"CREATE_TYPE\", \"VIDEO_PATH\", \"ABOUTUS_IMAGE_PATH\", \"ABOUTUS_IMAGE_TITLE\", \"CHINESE_NAME\", \"C_RID\", \"V_RID\") AS \n" + - " select /*+ use_hash(v c) ordered */\n" + - " c.id,\n" + - " c.gmt_create,\n" + - " c.gmt_modified,\n" + - " c.company_name,\n" + - " c.biz_type,\n" + - " c.biz_type_2,\n" + - " v.service_type,\n" + - " v.service_level,\n" + - " v.business_role,\n" + - " c.status,\n" + - " c.recommended,\n" + - " c.country,\n" + - " c.province,\n" + - " c.city,\n" + - " c.address,\n" + - " c.zip,\n" + - " c.logo_file,\n" + - " c.email,\n" + - " c.brief_profile,\n" + - " c.domain_id,\n" + - " c.is_pass_av,\n" + - " c.keywords,\n" + - " c.provide_products,\n" + - " c.purchase_products,\n" + - " c.brand_name,\n" + - " c.promotion_value,\n" + - " c.owner_member_id,\n" + - " c.owner_seq,\n" + - " c.employees_count,\n" + - " c.annual_revenue,\n" + - " c.homepage_url,\n" + - " c.reg_address,\n" + - " c.trade_region,\n" + - " c.trade_region_user,\n" + - " c.reg_capital,\n" + - " c.ownership_type,\n" + - " c.established_year,\n" + - " c.principal,\n" + - " c.annual_purchase,\n" + - " c.certification,\n" + - " c.certification_2,\n" + - " c.contact_manufacturing,\n" + - " c.years_oem,\n" + - " v.stage create_type,\n" + - " c.video_path,\n" + - " c.aboutus_image_path,\n" + - " c.aboutus_image_title,\n" + - " c.chinese_name,\n" + - " c.rowid c_rid,\n" + - " v.rowid v_rid\n" + - " from tb_001 v, tb_002 c\n" + - " where (v.service_type in ('gs', 'cgs', 'hkgs', 'twgs') or\n" + - " (v.service_type = 'cnfm' and v.stage = 'new_order'))\n" + - " and v.id = c.id "; + " \n" + + " CREATE OR REPLACE FORCE VIEW \"XBO\".\"VW_SCY\" (\"ID\", \"GMT_CREATE\", \"GMT_MODIFIED\", \"COMPANY_NAME\", \"BIZ_TYPE\", \"BIZ_TYPE_2\", \"SERVICE_TYPE\", \"SERVICE_LEVEL\", \"BUSINESS_ROLE\", \"STATUS\", \"RECOMMENDED\", \"COUNTRY\", \"PROVINCE\", \"CITY\", \"ADDRESS\", \"ZIP\", \"LOGO_FILE\", \"EMAIL\", \"BRIEF_PROFILE\", \"DOMAIN_ID\", \"IS_PASS_AV\", \"KEYWORDS\", \"PROVIDE_PRODUCTS\", \"PURCHASE_PRODUCTS\", \"BRAND_NAME\", \"PROMOTION_VALUE\", \"OWNER_MEMBER_ID\", \"OWNER_SEQ\", \"EMPLOYEES_COUNT\", \"ANNUAL_REVENUE\", \"HOMEPAGE_URL\", \"REG_ADDRESS\", \"TRADE_REGION\", \"TRADE_REGION_USER\", \"REG_CAPITAL\", \"OWNERSHIP_TYPE\", \"ESTABLISHED_YEAR\", \"PRINCIPAL\", \"ANNUAL_PURCHASE\", \"CERTIFICATION\", \"CERTIFICATION_2\", \"CONTACT_MANUFACTURING\", \"YEARS_OEM\", \"CREATE_TYPE\", \"VIDEO_PATH\", \"ABOUTUS_IMAGE_PATH\", \"ABOUTUS_IMAGE_TITLE\", \"CHINESE_NAME\", \"C_RID\", \"V_RID\") AS \n" + + " select /*+ use_hash(v c) ordered */\n" + + " c.id,\n" + + " c.gmt_create,\n" + + " c.gmt_modified,\n" + + " c.company_name,\n" + + " c.biz_type,\n" + + " c.biz_type_2,\n" + + " v.service_type,\n" + + " v.service_level,\n" + + " v.business_role,\n" + + " c.status,\n" + + " c.recommended,\n" + + " c.country,\n" + + " c.province,\n" + + " c.city,\n" + + " c.address,\n" + + " c.zip,\n" + + " c.logo_file,\n" + + " c.email,\n" + + " c.brief_profile,\n" + + " c.domain_id,\n" + + " c.is_pass_av,\n" + + " c.keywords,\n" + + " c.provide_products,\n" + + " c.purchase_products,\n" + + " c.brand_name,\n" + + " c.promotion_value,\n" + + " c.owner_member_id,\n" + + " c.owner_seq,\n" + + " c.employees_count,\n" + + " c.annual_revenue,\n" + + " c.homepage_url,\n" + + " c.reg_address,\n" + + " c.trade_region,\n" + + " c.trade_region_user,\n" + + " c.reg_capital,\n" + + " c.ownership_type,\n" + + " c.established_year,\n" + + " c.principal,\n" + + " c.annual_purchase,\n" + + " c.certification,\n" + + " c.certification_2,\n" + + " c.contact_manufacturing,\n" + + " c.years_oem,\n" + + " v.stage create_type,\n" + + " c.video_path,\n" + + " c.aboutus_image_path,\n" + + " c.aboutus_image_title,\n" + + " c.chinese_name,\n" + + " c.rowid c_rid,\n" + + " v.rowid v_rid\n" + + " from tb_001 v, tb_002 c\n" + + " where (v.service_type in ('gs', 'cgs', 'hkgs', 'twgs') or\n" + + " (v.service_type = 'cnfm' and v.stage = 'new_order'))\n" + + " and v.id = c.id "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -163,7 +162,7 @@ public void test_types() throws Exception { "\t\tOR (v.service_type = 'cnfm'\n" + "\t\t\tAND v.stage = 'new_order'))\n" + "\tAND v.id = c.id",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest10_with_read_only.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest10_with_read_only.java index 2471e30e9c..db14770871 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest10_with_read_only.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest10_with_read_only.java @@ -26,13 +26,12 @@ import java.util.List; public class OracleCreateViewTest10_with_read_only extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE VIEW customer_ro (name, language, credit)\n" + - " AS SELECT cust_last_name, nls_language, credit_limit\n" + - " FROM customers\n" + - " WITH READ ONLY;"; + "CREATE VIEW customer_ro (name, language, credit)\n" + + " AS SELECT cust_last_name, nls_language, credit_limit\n" + + " FROM customers\n" + + " WITH READ ONLY;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -50,7 +49,7 @@ public void test_types() throws Exception { "SELECT cust_last_name, nls_language, credit_limit\n" + "FROM customers\n" + "WITH READ ONLY;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest11_error_encoding.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest11_error_encoding.java index 7722631fcc..775bd0f888 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest11_error_encoding.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest11_error_encoding.java @@ -26,75 +26,74 @@ import java.util.List; public class OracleCreateViewTest11_error_encoding extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE OR REPLACE FORCE VIEW \"TCP_CPR\".\"CPR_SYS_BOM_MODULE_V\" (\"PROD_TYPE_ID\", \"PROD_TYPE_NAME\", \"PROD_ID\", \"PROD_NAME\", \"DEVICE_ID\", \"DEVICE_NAME\", \"MODULE_ID\", \"STRUCTURE_CODE\", \"MODULE_NAME\", \"ENG_DESCRIPTION\", \"ZH_UNIT\", \"EN_UNIT\", \"ITEM_CODE\", \"SALES_DEPT_ID\", \"CLUEIDS\", \"SEQ\", \"ORGANIZATION_ID\", \"ORGANIZATION_NAME\", \"ATTRIBUTE1\", \"ATTRIBUTE2\", \"ATTRIBUTE3\", \"ATTRIBUTE4\", \"ATTRIBUTE5\", \"ATTRIBUTE6\", \"TSM_FLAG\", \"TSM_CODE\", \"HARD_PARAM\", \"SOFT_PARAM\", \"MAKE_PARAM\", \"RISK_PARAM\", \"SOFT_COST_PARAM\", \"FIXED_RATE\", \"TEMP_FIELD1\", \"TEMP_FIELD2\") AS \n" + - " SELECT CP.Parent_System_Bom_Id PROD_TYPE_ID,--Я'{ID\n" + - " FL.DESCRIPTION PROD_TYPE_NAME,--Я'{\n" + - " CP.System_Bom_Id PROD_ID,--ЯID\n" + - " CPD.DESCRIPTION PROD_NAME,--Я\n" + - " DV.System_Bom_Id DEVICE_ID,--:婭D\n" + - " DVD.DESCRIPTION DEVICE_NAME,--:�\n" + - " B1.SYSTEM_BOM_ID MODULE_ID, -- !WID\n" + - " B1.STRUCTURE_CODE, \n" + - " B2.DESCRIPTION MODULE_NAME, --!W\n" + - " B3.DESCRIPTION ENG_DESCRIPTION,--駠\n" + - " B2.PRIMARY_UNIT_OF_MEASURE ZH_UNIT,---嘦M\n" + - " B3.PRIMARY_UNIT_OF_MEASURE EN_UNIT,--駠UM\n" + - " B1.ITEM_CODE, \n" + - " B1.SALES_DEPT_ID, \n" + - " B1.CLUEIDS, \n" + - " B1.SEQ, \n" + - " B1.ORGANIZATION_ID, \n" + - " ORGN.NAME ORGANIZATION_NAME,\n" + - " B1.ATTRIBUTE1, \n" + - " B1.ATTRIBUTE2, \n" + - " B1.ATTRIBUTE3, \n" + - " B1.ATTRIBUTE4, \n" + - " B1.ATTRIBUTE5, \n" + - " B1.ATTRIBUTE6, \n" + - " B1.TSM_FLAG, \n" + - " B1.TSM_CODE, \n" + - " B1.HARD_PARAM, \n" + - " B1.SOFT_PARAM, \n" + - " B1.MAKE_PARAM, \n" + - " B1.RISK_PARAM, \n" + - " B1.SOFT_COST_PARAM, \n" + - " B1.FIXED_RATE,\n" + - " B1.TEMP_FIELD1,\n" + - " B1.TEMP_FIELD2 \n" + - " FROM TCP_CPR.SYSTEM_BOM B1,\n" + - " TCP_CPR.SYSTEM_BOM_DESC B2,\n" + - " TCP_CPR.SYSTEM_BOM_DESC B3,\n" + - " TCP_CPR.SYSTEM_BOM_DESC FL,\n" + - " TCP_CPR.SYSTEM_BOM CP,\n" + - " TCP_CPR.SYSTEM_BOM_DESC CPD,\n" + - " TCP_CPR.SYSTEM_BOM DV,\n" + - " TCP_CPR.SYSTEM_BOM_DESC DVD,\n" + - " TCP_FND.TCP_FND_ORGANIZATION ORGN\n" + - " WHERE B1.SYSTEM_BOM_ID = B2.SYSTEM_BOM_ID(+)\n" + - " AND B2.ENABLED_FLAG(+) = 'Y'\n" + - " AND B1.SYSTEM_BOM_ID = B3.SYSTEM_BOM_ID(+)\n" + - " AND B3.ENABLED_FLAG(+) = 'Y'\n" + - " AND B1.ENABLED_FLAG(+) = 'Y'\n" + - " AND B1.LAYER = 4\n" + - " AND B3.LANGUAGE(+) = 'en-US'\n" + - " AND B2.LANGUAGE(+) = 'zh-CN'\n" + - " AND B1.Parent_System_Bom_Id = DV.SYSTEM_BOM_ID(+)\n" + - " AND DV.ENABLED_FLAG='Y'\n" + - " AND DV.SYSTEM_BOM_ID=DVD.SYSTEM_BOM_ID\n" + - " AND DVD.ENABLED_FLAG(+) = 'Y'\n" + - " AND DVD.LANGUAGE(+) = 'zh-CN'\n" + - " AND DV.Parent_System_Bom_Id = CP.SYSTEM_BOM_ID(+)\n" + - " AND CP.ENABLED_FLAG='Y'\n" + - " AND CP.SYSTEM_BOM_ID=CPD.SYSTEM_BOM_ID\n" + - " AND CPD.ENABLED_FLAG(+) = 'Y'\n" + - " AND CPD.LANGUAGE(+) = 'zh-CN'\n" + - " AND CP.Parent_System_Bom_Id = FL.SYSTEM_BOM_ID(+)\n" + - " AND FL.ENABLED_FLAG(+) = 'Y'\n" + - " AND FL.LANGUAGE(+) = 'zh-CN'\n" + - " AND B1.ORGANIZATION_ID=ORGN.ORGANIZATION_ID(+)"; + " CREATE OR REPLACE FORCE VIEW \"TCP_CPR\".\"CPR_SYS_BOM_MODULE_V\" (\"PROD_TYPE_ID\", \"PROD_TYPE_NAME\", \"PROD_ID\", \"PROD_NAME\", \"DEVICE_ID\", \"DEVICE_NAME\", \"MODULE_ID\", \"STRUCTURE_CODE\", \"MODULE_NAME\", \"ENG_DESCRIPTION\", \"ZH_UNIT\", \"EN_UNIT\", \"ITEM_CODE\", \"SALES_DEPT_ID\", \"CLUEIDS\", \"SEQ\", \"ORGANIZATION_ID\", \"ORGANIZATION_NAME\", \"ATTRIBUTE1\", \"ATTRIBUTE2\", \"ATTRIBUTE3\", \"ATTRIBUTE4\", \"ATTRIBUTE5\", \"ATTRIBUTE6\", \"TSM_FLAG\", \"TSM_CODE\", \"HARD_PARAM\", \"SOFT_PARAM\", \"MAKE_PARAM\", \"RISK_PARAM\", \"SOFT_COST_PARAM\", \"FIXED_RATE\", \"TEMP_FIELD1\", \"TEMP_FIELD2\") AS \n" + + " SELECT CP.Parent_System_Bom_Id PROD_TYPE_ID,--Я'{ID\n" + + " FL.DESCRIPTION PROD_TYPE_NAME,--Я'{\n" + + " CP.System_Bom_Id PROD_ID,--ЯID\n" + + " CPD.DESCRIPTION PROD_NAME,--Я\n" + + " DV.System_Bom_Id DEVICE_ID,--:婭D\n" + + " DVD.DESCRIPTION DEVICE_NAME,--:�\n" + + " B1.SYSTEM_BOM_ID MODULE_ID, -- !WID\n" + + " B1.STRUCTURE_CODE, \n" + + " B2.DESCRIPTION MODULE_NAME, --!W\n" + + " B3.DESCRIPTION ENG_DESCRIPTION,--駠\n" + + " B2.PRIMARY_UNIT_OF_MEASURE ZH_UNIT,---嘦M\n" + + " B3.PRIMARY_UNIT_OF_MEASURE EN_UNIT,--駠UM\n" + + " B1.ITEM_CODE, \n" + + " B1.SALES_DEPT_ID, \n" + + " B1.CLUEIDS, \n" + + " B1.SEQ, \n" + + " B1.ORGANIZATION_ID, \n" + + " ORGN.NAME ORGANIZATION_NAME,\n" + + " B1.ATTRIBUTE1, \n" + + " B1.ATTRIBUTE2, \n" + + " B1.ATTRIBUTE3, \n" + + " B1.ATTRIBUTE4, \n" + + " B1.ATTRIBUTE5, \n" + + " B1.ATTRIBUTE6, \n" + + " B1.TSM_FLAG, \n" + + " B1.TSM_CODE, \n" + + " B1.HARD_PARAM, \n" + + " B1.SOFT_PARAM, \n" + + " B1.MAKE_PARAM, \n" + + " B1.RISK_PARAM, \n" + + " B1.SOFT_COST_PARAM, \n" + + " B1.FIXED_RATE,\n" + + " B1.TEMP_FIELD1,\n" + + " B1.TEMP_FIELD2 \n" + + " FROM TCP_CPR.SYSTEM_BOM B1,\n" + + " TCP_CPR.SYSTEM_BOM_DESC B2,\n" + + " TCP_CPR.SYSTEM_BOM_DESC B3,\n" + + " TCP_CPR.SYSTEM_BOM_DESC FL,\n" + + " TCP_CPR.SYSTEM_BOM CP,\n" + + " TCP_CPR.SYSTEM_BOM_DESC CPD,\n" + + " TCP_CPR.SYSTEM_BOM DV,\n" + + " TCP_CPR.SYSTEM_BOM_DESC DVD,\n" + + " TCP_FND.TCP_FND_ORGANIZATION ORGN\n" + + " WHERE B1.SYSTEM_BOM_ID = B2.SYSTEM_BOM_ID(+)\n" + + " AND B2.ENABLED_FLAG(+) = 'Y'\n" + + " AND B1.SYSTEM_BOM_ID = B3.SYSTEM_BOM_ID(+)\n" + + " AND B3.ENABLED_FLAG(+) = 'Y'\n" + + " AND B1.ENABLED_FLAG(+) = 'Y'\n" + + " AND B1.LAYER = 4\n" + + " AND B3.LANGUAGE(+) = 'en-US'\n" + + " AND B2.LANGUAGE(+) = 'zh-CN'\n" + + " AND B1.Parent_System_Bom_Id = DV.SYSTEM_BOM_ID(+)\n" + + " AND DV.ENABLED_FLAG='Y'\n" + + " AND DV.SYSTEM_BOM_ID=DVD.SYSTEM_BOM_ID\n" + + " AND DVD.ENABLED_FLAG(+) = 'Y'\n" + + " AND DVD.LANGUAGE(+) = 'zh-CN'\n" + + " AND DV.Parent_System_Bom_Id = CP.SYSTEM_BOM_ID(+)\n" + + " AND CP.ENABLED_FLAG='Y'\n" + + " AND CP.SYSTEM_BOM_ID=CPD.SYSTEM_BOM_ID\n" + + " AND CPD.ENABLED_FLAG(+) = 'Y'\n" + + " AND CPD.LANGUAGE(+) = 'zh-CN'\n" + + " AND CP.Parent_System_Bom_Id = FL.SYSTEM_BOM_ID(+)\n" + + " AND FL.ENABLED_FLAG(+) = 'Y'\n" + + " AND FL.LANGUAGE(+) = 'zh-CN'\n" + + " AND B1.ORGANIZATION_ID=ORGN.ORGANIZATION_ID(+)"; System.out.println(sql); @@ -172,7 +171,7 @@ public void test_types() throws Exception { "\tAND FL.ENABLED_FLAG(+) = 'Y'\n" + "\tAND FL.LANGUAGE(+) = 'zh-CN'\n" + "\tAND B1.ORGANIZATION_ID = ORGN.ORGANIZATION_ID(+)",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest12.java index 67764e4330..3d3a997755 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest12.java @@ -26,127 +26,126 @@ import java.util.List; public class OracleCreateViewTest12 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE OR REPLACE FORCE VIEW \"TCP_CPR\".\"DIFF_CON_CONFIG_ALL_V\" (\"OSG_TYPE_ID\", \"CONTRACT_HEADER_ID\", \"CONTRACT_NUMBER\", \"ORGANIZATION_ID\", \"CONTRACT_PRODUCT_ID\", \"PROD_ID\", \"PROD_DES\", \"MI\", \"CONTRACT_DEVICE_ID\", \"DEV_ID\", \"DEV_DES\", \"SITE_ID\", \"SITE_QUANTITY\", \"SITE_DES\", \"CONTRACT_MODULE_ID\", \"MOD_ID\", \"MOD_DES\", \"MODULE_QUANTITY\", \"CONTRACT_ITEM_ID\", \"ITEM_ID\", \"ITEM_DES\", \"ITEM_TYPE\", \"ITEM_QUANTITY\", \"HARD_PARAM\", \"SOFT_PARAM\", \"MAKE_PARAM\", \"RISK_PARAM\", \"SOFT_COST_PARAM\", \"PROD_MANAGER\", \"COST_PRICE04\", \"CONFIRM_ITEM_PARAM\", \"CONFIRM_FLAG04\", \"COST_PRICE\", \"COST_PRICE_PARAMETER\", \"OLD_COST\", \"LIST_PRICE\", \"ITEM_CODE\", \"CONFIRM_COST_PRICE04\", \"CUSTOMIZE_SITES_ID\", \"SPARE_FLAG\") AS \n" + - " SELECT I.osg_type_id, M.CONTRACT_HEADER_ID,M.CONTRACT_NUMBER,\n" + - " M.ORGANIZATION_ID,\n" + - " M.CONTRACT_PRODUCT_ID,\n" + - " M.prod_id,\n" + - " M.prod_des,M.MI,\n" + - " M.CONTRACT_DEVICE_ID,\n" + - " M.dev_id,\n" + - " m.dev_des,\n" + - " M.SITE_ID ,\n" + - " M.SITE_QUANTITY,\n" + - " M.site_des,\n" + - " M.CONTRACT_MODULE_ID,\n" + - " M.mod_id,\n" + - " M.mod_des,\n" + - " M.MODULE_QUANTITY,\n" + - " I.CONTRACT_ITEM_ID,\n" + - " I.ITEM_ID,\n" + - " I.ITEM_DES,\n" + - " I.ITEM_TYPE,\n" + - " I.item_quantity,\n" + - " M.hard_param,\n" + - " M.soft_param, M.make_param,M.risk_param, M.soft_cost_param,\n" + - " M.prod_manager, I.COST_PRICE04, I.CONFIRM_ITEM_PARAM, I.CONFIRM_FLAG04,\n" + - " I.cost_price,I.COST_PRICE_PARAMETER,I.OLD_COST,I.LIST_PRICE,I.ITEM_CODE,\n" + - " I.CONFIRM_COST_PRICE04\n" + - " --,I.PROD_ATTRIBUTE_ID,I.ITEM_CHIP\n" + - " ,M.customize_sites_id\n" + - " ,M.spare_flag\n" + - " FROM TCP_CPR.DIFF_CON_CONFIG_MODULE_V M\n" + - " LEFT JOIN\n" + - " (\n" + - " (\n" + - " select 0 osg_type_id,\n" + - " v.contract_module_id,\n" + - " v.item_id,\n" + - " v.contract_item_id,\n" + - " v.item_des,\n" + - " v.item_type,\n" + - " v.ITEM_QUANTITY,\n" + - " v.cost_price,\n" + - " v.COST_PRICE_PARAMETER,\n" + - " v.CONFIRM_FLAG,\n" + - " v.COST_PRICE04,\n" + - " v.CONFIRM_ITEM_PARAM,\n" + - " v.CONFIRM_FLAG04,\n" + - " v.OLD_COST,\n" + - " v.LIST_PRICE,\n" + - " v.ITEM_CODE,\n" + - " v.CONFIRM_COST_PRICE04\n" + - " from TCP_CPR.DIFF_CON_CONFIG_ITEM_V v\n" + - " )\n" + - " union all\n" + - " (\n" + - " SELECT header.product_id osg_type_id,\n" + - " HEADER.PARENT_ID CONTRACT_MODULE_ID,\n" + - " HEADER.SERIAL_ID item_id,\n" + - " HEADER.OSG_HEADER_ID CONTRACT_ITEM_ID,\n" + - " ser.product_serial item_name,\n" + - " 'OSG' item_type,\n" + - " HEADER.QUANTITY item_quantity,\n" + - " (LINE.REF_PRICE+ nvl(REPLY.MARKET_REFERENCE_PRICE,0)) COST_PRICE,\n" + - " 1 COST_PRICE_PARAMETER,\n" + - " 'Y' CONFIRM_FLAG,\n" + - " 0 COST_PRICE04,\n" + - " 1 CONFIRM_ITEM_PARAM,\n" + - " 'Y' CONFIRM_FLAG04,\n" + - " 1 OLD_COST,\n" + - " --LINE.PRICE+nvl(REPLY.LIST_PRICE,0) LIST_PRICE,\n" + - " HEADER.LIST_PRICE LIST_PRICE,\n" + - " '+Mn\u0016-�' ITEM_CODE,\n" + - " (LINE.COST+ nvl(REPLY.RMBPRICE_WITHTAX,0)) CONFIRM_COST_PRICE04\n" + - " --0 PROD_ATTRIBUTE_ID,0 ITEM_CHIP\n" + - " FROM TCP_CPR.DIFF_CON_OSG3_HEADERS HEADER,ERP_ZTE.ZTE_KX_OSG3_SERIALS ser, ERP_ZTE.zte_kx_osg3_reply_headers\n" + - " REPLY, (\n" + - " select LINE.OSG_HEADER_ID,SUM((LINE.QUANTITY-LINE.THEORETIC_QTY)*\n" + - " PART.rmbprice_withtax) COST, SUM((LINE.QUANTITY-\n" + - " LINE.THEORETIC_QTY)* PART.LIST_PRICE) PRICE, SUM((\n" + - " LINE.QUANTITY-LINE.THEORETIC_QTY)* PART.MARKET_REFERENCE_PRICE\n" + - " ) REF_PRICE\n" + - " from TCP_CPR.DIFF_CON_OSG3_LINES LINE,\n" + - " ERP_ZTE.ZTE_KX_OSG3_PART_DETAILS PART\n" + - " WHERE LINE.PART_DETAIL_ID = PART.PART_DETAIL_ID\n" + - " AND LINE.ENABLED_FLAG = 'Y'\n" + - " GROUP BY LINE.OSG_HEADER_ID) LINE\n" + - " where HEADER.ENABLED_FLAG = 'Y' AND ser.serial_id=HEADER.Serial_Id\n" + - " and header.REPLY_ID = reply.reply_head_id(+)\n" + - " and header.OSG_HEADER_ID = line.OSG_HEADER_ID\n" + - " )\n" + - " union all\n" + - " (\n" + - " SELECT item.osg_type_id osg_type_id,\n" + - " ITEM.PARENT_ID CONTRACT_MODULE_ID,\n" + - " item.osg_item_id item_id,\n" + - " ITEM.OSG_ITEM_ID CONTRACT_ITEM_ID,\n" + - " SYS_ITEM.DESCRIPTION item_name,\n" + - " 'SINGLEOSG' item_type,\n" + - " ITEM.QUANTITY item_quantity,\n" + - " SYS_ITEM.MARKET_REFERENCE_PRICE COST_PRICE,\n" + - " 1 COST_PRICE_PARAMETER,\n" + - " SYS_ITEM.ENABLED_FLAG CONFIRM_FLAG,\n" + - " 0 COST_PRICE04,\n" + - " 1 CONFIRM_ITEM_PARAM,\n" + - " 'Y' CONFIRM_FLAG04,\n" + - " 1 OLD_COST,\n" + - " --SYS_ITEM.LIST_PRICE LIST_PRICE,\n" + - " ITEM.LIST_PRICE LIST_PRICE,\n" + - " SYS_ITEM.INVENTORY_ID||'\n" + - "+Mn\u0016-�' ITEM_CODE,\n" + - " SYS_ITEM.PRICE CONFIRM_COST_PRICE04--, 0 PROD_ATTRIBUTE_ID--,0 ITEM_CHIP\n" + - " FROM TCP_CPR.DIFF_CON_OSG3A_HEADERS ITEM,ERP_ZTE.ZTE_KX_OSG3_ITEMS\n" + - " SYS_ITEM\n" + - " where ITEM.OSG_ITEM_ID = SYS_ITEM.OSG_ITEM_ID\n" + - " AND ITEM.ENABLED_FLAG = 'Y'\n" + - " )\n" + - " ) I\n" + - " ON M.CONTRACT_MODULE_ID = I.CONTRACT_MODULE_ID\n" + - " WHERE item_quantity>=0"; + "CREATE OR REPLACE FORCE VIEW \"TCP_CPR\".\"DIFF_CON_CONFIG_ALL_V\" (\"OSG_TYPE_ID\", \"CONTRACT_HEADER_ID\", \"CONTRACT_NUMBER\", \"ORGANIZATION_ID\", \"CONTRACT_PRODUCT_ID\", \"PROD_ID\", \"PROD_DES\", \"MI\", \"CONTRACT_DEVICE_ID\", \"DEV_ID\", \"DEV_DES\", \"SITE_ID\", \"SITE_QUANTITY\", \"SITE_DES\", \"CONTRACT_MODULE_ID\", \"MOD_ID\", \"MOD_DES\", \"MODULE_QUANTITY\", \"CONTRACT_ITEM_ID\", \"ITEM_ID\", \"ITEM_DES\", \"ITEM_TYPE\", \"ITEM_QUANTITY\", \"HARD_PARAM\", \"SOFT_PARAM\", \"MAKE_PARAM\", \"RISK_PARAM\", \"SOFT_COST_PARAM\", \"PROD_MANAGER\", \"COST_PRICE04\", \"CONFIRM_ITEM_PARAM\", \"CONFIRM_FLAG04\", \"COST_PRICE\", \"COST_PRICE_PARAMETER\", \"OLD_COST\", \"LIST_PRICE\", \"ITEM_CODE\", \"CONFIRM_COST_PRICE04\", \"CUSTOMIZE_SITES_ID\", \"SPARE_FLAG\") AS \n" + + " SELECT I.osg_type_id, M.CONTRACT_HEADER_ID,M.CONTRACT_NUMBER,\n" + + " M.ORGANIZATION_ID,\n" + + " M.CONTRACT_PRODUCT_ID,\n" + + " M.prod_id,\n" + + " M.prod_des,M.MI,\n" + + " M.CONTRACT_DEVICE_ID,\n" + + " M.dev_id,\n" + + " m.dev_des,\n" + + " M.SITE_ID ,\n" + + " M.SITE_QUANTITY,\n" + + " M.site_des,\n" + + " M.CONTRACT_MODULE_ID,\n" + + " M.mod_id,\n" + + " M.mod_des,\n" + + " M.MODULE_QUANTITY,\n" + + " I.CONTRACT_ITEM_ID,\n" + + " I.ITEM_ID,\n" + + " I.ITEM_DES,\n" + + " I.ITEM_TYPE,\n" + + " I.item_quantity,\n" + + " M.hard_param,\n" + + " M.soft_param, M.make_param,M.risk_param, M.soft_cost_param,\n" + + " M.prod_manager, I.COST_PRICE04, I.CONFIRM_ITEM_PARAM, I.CONFIRM_FLAG04,\n" + + " I.cost_price,I.COST_PRICE_PARAMETER,I.OLD_COST,I.LIST_PRICE,I.ITEM_CODE,\n" + + " I.CONFIRM_COST_PRICE04\n" + + " --,I.PROD_ATTRIBUTE_ID,I.ITEM_CHIP\n" + + " ,M.customize_sites_id\n" + + " ,M.spare_flag\n" + + " FROM TCP_CPR.DIFF_CON_CONFIG_MODULE_V M\n" + + " LEFT JOIN\n" + + " (\n" + + " (\n" + + " select 0 osg_type_id,\n" + + " v.contract_module_id,\n" + + " v.item_id,\n" + + " v.contract_item_id,\n" + + " v.item_des,\n" + + " v.item_type,\n" + + " v.ITEM_QUANTITY,\n" + + " v.cost_price,\n" + + " v.COST_PRICE_PARAMETER,\n" + + " v.CONFIRM_FLAG,\n" + + " v.COST_PRICE04,\n" + + " v.CONFIRM_ITEM_PARAM,\n" + + " v.CONFIRM_FLAG04,\n" + + " v.OLD_COST,\n" + + " v.LIST_PRICE,\n" + + " v.ITEM_CODE,\n" + + " v.CONFIRM_COST_PRICE04\n" + + " from TCP_CPR.DIFF_CON_CONFIG_ITEM_V v\n" + + " )\n" + + " union all\n" + + " (\n" + + " SELECT header.product_id osg_type_id,\n" + + " HEADER.PARENT_ID CONTRACT_MODULE_ID,\n" + + " HEADER.SERIAL_ID item_id,\n" + + " HEADER.OSG_HEADER_ID CONTRACT_ITEM_ID,\n" + + " ser.product_serial item_name,\n" + + " 'OSG' item_type,\n" + + " HEADER.QUANTITY item_quantity,\n" + + " (LINE.REF_PRICE+ nvl(REPLY.MARKET_REFERENCE_PRICE,0)) COST_PRICE,\n" + + " 1 COST_PRICE_PARAMETER,\n" + + " 'Y' CONFIRM_FLAG,\n" + + " 0 COST_PRICE04,\n" + + " 1 CONFIRM_ITEM_PARAM,\n" + + " 'Y' CONFIRM_FLAG04,\n" + + " 1 OLD_COST,\n" + + " --LINE.PRICE+nvl(REPLY.LIST_PRICE,0) LIST_PRICE,\n" + + " HEADER.LIST_PRICE LIST_PRICE,\n" + + " '+Mn\u0016-�' ITEM_CODE,\n" + + " (LINE.COST+ nvl(REPLY.RMBPRICE_WITHTAX,0)) CONFIRM_COST_PRICE04\n" + + " --0 PROD_ATTRIBUTE_ID,0 ITEM_CHIP\n" + + " FROM TCP_CPR.DIFF_CON_OSG3_HEADERS HEADER,ERP_ZTE.ZTE_KX_OSG3_SERIALS ser, ERP_ZTE.zte_kx_osg3_reply_headers\n" + + " REPLY, (\n" + + " select LINE.OSG_HEADER_ID,SUM((LINE.QUANTITY-LINE.THEORETIC_QTY)*\n" + + " PART.rmbprice_withtax) COST, SUM((LINE.QUANTITY-\n" + + " LINE.THEORETIC_QTY)* PART.LIST_PRICE) PRICE, SUM((\n" + + " LINE.QUANTITY-LINE.THEORETIC_QTY)* PART.MARKET_REFERENCE_PRICE\n" + + " ) REF_PRICE\n" + + " from TCP_CPR.DIFF_CON_OSG3_LINES LINE,\n" + + " ERP_ZTE.ZTE_KX_OSG3_PART_DETAILS PART\n" + + " WHERE LINE.PART_DETAIL_ID = PART.PART_DETAIL_ID\n" + + " AND LINE.ENABLED_FLAG = 'Y'\n" + + " GROUP BY LINE.OSG_HEADER_ID) LINE\n" + + " where HEADER.ENABLED_FLAG = 'Y' AND ser.serial_id=HEADER.Serial_Id\n" + + " and header.REPLY_ID = reply.reply_head_id(+)\n" + + " and header.OSG_HEADER_ID = line.OSG_HEADER_ID\n" + + " )\n" + + " union all\n" + + " (\n" + + " SELECT item.osg_type_id osg_type_id,\n" + + " ITEM.PARENT_ID CONTRACT_MODULE_ID,\n" + + " item.osg_item_id item_id,\n" + + " ITEM.OSG_ITEM_ID CONTRACT_ITEM_ID,\n" + + " SYS_ITEM.DESCRIPTION item_name,\n" + + " 'SINGLEOSG' item_type,\n" + + " ITEM.QUANTITY item_quantity,\n" + + " SYS_ITEM.MARKET_REFERENCE_PRICE COST_PRICE,\n" + + " 1 COST_PRICE_PARAMETER,\n" + + " SYS_ITEM.ENABLED_FLAG CONFIRM_FLAG,\n" + + " 0 COST_PRICE04,\n" + + " 1 CONFIRM_ITEM_PARAM,\n" + + " 'Y' CONFIRM_FLAG04,\n" + + " 1 OLD_COST,\n" + + " --SYS_ITEM.LIST_PRICE LIST_PRICE,\n" + + " ITEM.LIST_PRICE LIST_PRICE,\n" + + " SYS_ITEM.INVENTORY_ID||'\n" + + "+Mn\u0016-�' ITEM_CODE,\n" + + " SYS_ITEM.PRICE CONFIRM_COST_PRICE04--, 0 PROD_ATTRIBUTE_ID--,0 ITEM_CHIP\n" + + " FROM TCP_CPR.DIFF_CON_OSG3A_HEADERS ITEM,ERP_ZTE.ZTE_KX_OSG3_ITEMS\n" + + " SYS_ITEM\n" + + " where ITEM.OSG_ITEM_ID = SYS_ITEM.OSG_ITEM_ID\n" + + " AND ITEM.ENABLED_FLAG = 'Y'\n" + + " )\n" + + " ) I\n" + + " ON M.CONTRACT_MODULE_ID = I.CONTRACT_MODULE_ID\n" + + " WHERE item_quantity>=0"; System.out.println(sql); @@ -247,7 +246,7 @@ public void test_types() throws Exception { "\t\t\tAND ITEM.ENABLED_FLAG = 'Y'\n" + "\t) I ON M.CONTRACT_MODULE_ID = I.CONTRACT_MODULE_ID \n" + "WHERE item_quantity >= 0",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest13.java index 20f173b6cf..3c65cff3ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest13.java @@ -26,19 +26,17 @@ import java.util.List; public class OracleCreateViewTest13 extends OracleTest { - public void test_types() throws Exception { String sql = // - "SELECT rbi.rma_id, rbi.last_update_time\n" + - "FROM ktv_epm.ktv_eq_rprboarditem rbi\n" + - "JOIN ktv_epm.ktv_eq_rma_header rma ON rma.rma_id = rbi.rma_id \n" + - "\tJOIN ktv_epm.ktv_eq_rprsenditem rsi ON rsi.e_rprboardid = rbi.e_rprboardid\n" + - "AND rsi.e_boardid = rbi.e_boardid \n" + - "WHERE rbi.rma_id > ?\n" + - "\tAND rsi.e_rprsendid = ?\n" + - "\tAND rsi.e_boardid IN (?)\n" + - "FOR UPDATE(rbi.rma_id)\n" - ; + "SELECT rbi.rma_id, rbi.last_update_time\n" + + "FROM ktv_epm.ktv_eq_rprboarditem rbi\n" + + "JOIN ktv_epm.ktv_eq_rma_header rma ON rma.rma_id = rbi.rma_id \n" + + "\tJOIN ktv_epm.ktv_eq_rprsenditem rsi ON rsi.e_rprboardid = rbi.e_rprboardid\n" + + "AND rsi.e_boardid = rbi.e_boardid \n" + + "WHERE rbi.rma_id > ?\n" + + "\tAND rsi.e_rprsendid = ?\n" + + "\tAND rsi.e_boardid IN (?)\n" + + "FOR UPDATE(rbi.rma_id)\n"; System.out.println(sql); @@ -58,7 +56,7 @@ public void test_types() throws Exception { "\tAND rsi.e_rprsendid = ?\n" + "\tAND rsi.e_boardid IN (?)\n" + "FOR UPDATE(rbi.rma_id)",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest14.java index d37cf7d2cf..168473d724 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest14.java @@ -26,163 +26,161 @@ import java.util.List; public class OracleCreateViewTest14 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE OR REPLACE FORCE VIEW \"CITSONLINE\".\"VIEW_SK_ORDER_APPLY\" (\"ORDER_ID\", \"PRODUCT_TYPE\", \"ORDER_AGENT\", \"COLLECT_MONEY\", \"CUSTOMER_ID\", \"ADD_USER\", \"ADD_DATE\", \"TEAM_NAME\", \"TEAM_NO\", \"CONTACT\", \"ORDER_ACCOUNT\") AS \n" + - " select id as order_id,\n" + - " 'PW' product_type,\n" + - " order_owner as order_agent,\n" + - " account_receivable as collect_money,\n" + - " customer_group as customer_id,\n" + - " operator_id as add_user,\n" + - " order_date as add_date,\n" + - " '' as team_name,\n" + - " '' as team_no,\n" + - " customer_name as contact,\n" + - " (select t.name from operator t where t.account = at.ouser_id) order_account\n" + - " from ticket_product_order pw_order_info, allot_track at\n" + - " where at.order_id like '%' || pw_order_info.id || '%'\n" + - " and at.produce_id = 'PW'\n" + - " and at.end_date = to_date('1900-01-01', 'yyyy-mm-dd') --hn --766ߡh (\n" + - " and pw_order_info.status = '4'\n" + - "union\n" + - "select insurance_order. order_id as order_id,\n" + - " 'BX' product_type,\n" + - " insurance_order.agent_id as order_agent,\n" + - " insurance_order. all_price as collect_money,\n" + - " insurance_order. custom_id as customer_id,\n" + - " insurance_order. add_user,\n" + - " insurance_order. add_date,\n" + - " '' as team_name,\n" + - " '' as team_no,\n" + - " insurance_order. contact_name as contact,\n" + - " (select t.name from operator t where t.account = at.ouser_id) order_account\n" + - " from insurance_order insurance_order, allot_track at\n" + - " where insurance_order.status = '3' --iU\n" + - " and at.order_id_s = insurance_order.order_id\n" + - " and at.produce_id = 'BX'\n" + - " and at.end_date = to_date('1900-01-01', 'yyyy-mm-dd')\n" + - "union\n" + - "select t.order_id as order_id,\n" + - " tt.product_type product_type,\n" + - " tt.true_agent_id as order_agent,\n" + - " t.price as collect_money,\n" + - " t.custom_id as customer_id,\n" + - " t.add_user,\n" + - " t.add_date,\n" + - " tb.name as team_name,\n" + - " tb.team_no as team_no,\n" + - " t.person as contact,\n" + - " (select t.name from operator t where t.account = tt.od_user) order_account\n" + - " from order_info t, order_flow_info tt, team_baseinfo tb\n" + - " where t.product_type in ('0', '7')\n" + - " and t.order_id = tt.order_id\n" + - " and tt.user_type = '0'\n" + - " and (tt.status = '3' or tt.status = '4' or tt.status = '5')\n" + - " and tt.product_id = tb.team_id\n" + - " --3n,4c,5c*6>\n" + - "\n" + - " union\n" + - "/* hU*/\n" + - "\n" + - "select t.order_id as order_id,\n" + - " 'GN' product_type,\n" + - " t.agent_id as order_agent,\n" + - " t.all_price as collect_money,\n" + - " t.olduserid as customer_id,\n" + - " t.add_user as add_user,\n" + - " t.add_date as add_date,\n" + - " '' as team_name,\n" + - " '' as team_no,\n" + - " t.client_name as contact,\n" + - " (select o.name\n" + - " from operator o, allot_track a\n" + - " where o.account = a.ouser_id\n" + - " and a.order_id_s = t.order_id\n" + - " and a.agent_id_s = o.agent_id\n" + - " and a.agent_id_s = t.agent_id\n" + - " and a.end_date =\n" + - " to_timestamp('1900-1-1', 'yyyy-mm-dd hh24:mi:ssxff')) order_account\n" + - " from ticket_order_info t\n" + - " where t.product_type = 'GN'\n" + - " and (t.order_status = '6' or t.ticket_status = '2')\n" + - "\n" + - "union\n" + - "\n" + - "/* Eh*/\n" + - "select t.order_id as order_id,\n" + - " 'GJ' product_type,\n" + - " t.agent_id as order_agent,\n" + - " t.all_price as collect_money,\n" + - " t.olduserid as customer_id,\n" + - " t.add_user as add_user,\n" + - " t.add_date as add_date,\n" + - " '' as team_name,\n" + - " '' as team_no,\n" + - " t.client_name as contact,\n" + - " (select o.name\n" + - " from operator o, allot_track a\n" + - " where o.account = a.ouser_id\n" + - " and a.order_id_s = t.order_id\n" + - " and a.agent_id_s = t.agent_id\n" + - " and a.agent_id_s = o.agent_id\n" + - " and a.end_date =\n" + - " to_timestamp('1900-1-1', 'yyyy-mm-dd hh24:mi:ssxff')) order_account\n" + - " from ticket_order_info t\n" + - " where t.product_type = 'GJ'\n" + - " and t.order_id like '02%'\n" + - " and (t.order_status = '3' or t.ticket_status = '2')\n" + - " union\n" + - "--~\"5\">~,6\">ӗ\n" + - "select voi.order_id as order_id,\n" + - " 'QZ' product_type,\n" + - " ofi.true_agent_id as order_agent,\n" + - " ofi.sell_sum,\n" + - " voi.custom_id as customer_id,\n" + - " voi.add_user,\n" + - " voi.add_date,\n" + - " ofi.bal_team_id as team_name,\n" + - " ofi.bal_team_no as team_no,\n" + - " voi.user_name as contact,\n" + - " (select op.name\n" + - " from operator op, allot_track al\n" + - " where op.account = al.ouser_id\n" + - " and al.order_id_s = ofi.order_id\n" + - " and al.supply_id_s = ofi.supply_id\n" + - " and al.agent_id_s = ofi.agent_id\n" + - " and al.end_date = to_timestamp('1900-01-01', 'yyyy-MM-dd')\n" + - " and al.produce_Id = 'QZ') order_account\n" + - " from order_flow_info ofi, visa_order_info voi\n" + - " where ofi.product_type = 'QZ'\n" + - " and voi.order_id = ofi.order_id\n" + - " and ofi.user_type = '0'\n" + - " and (ofi.status = '5' or ofi.status = '6')\n" + - "\n" + - "\n" + - " union\n" + - "--R3an,3bn*,7B2C6>n\n" + - "select res.reservation_id,\n" + - " 'FD' product_type,\n" + - " res.agent_id,\n" + - " res.total_sale_amt sale_amt,\n" + - " bus.customer_id,\n" + - " bus.operator,\n" + - " bus.create_date,\n" + - " '' as team_name,\n" + - " '' as team_no,\n" + - " res.contact_person as contact,\n" + - " (select t.name\n" + - " from operator t, allot_track a\n" + - " where t.account = a.ouser_id\n" + - " and bus.reservation_id = a.order_id\n" + - " and bus.agent_id = a.agent_id\n" + - " and a.end_date =\n" + - " to_timestamp('1900-1-1', 'yyyy-mm-dd hh24:mi:ssxff')) order_account\n" + - " from resaccount res, businessres bus\n" + - " where bus.reservation_id = res.reservation_id\n" + - " and (bus.confirm_status = '3' or bus.confirm_status = '7')" - ; + "CREATE OR REPLACE FORCE VIEW \"CITSONLINE\".\"VIEW_SK_ORDER_APPLY\" (\"ORDER_ID\", \"PRODUCT_TYPE\", \"ORDER_AGENT\", \"COLLECT_MONEY\", \"CUSTOMER_ID\", \"ADD_USER\", \"ADD_DATE\", \"TEAM_NAME\", \"TEAM_NO\", \"CONTACT\", \"ORDER_ACCOUNT\") AS \n" + + " select id as order_id,\n" + + " 'PW' product_type,\n" + + " order_owner as order_agent,\n" + + " account_receivable as collect_money,\n" + + " customer_group as customer_id,\n" + + " operator_id as add_user,\n" + + " order_date as add_date,\n" + + " '' as team_name,\n" + + " '' as team_no,\n" + + " customer_name as contact,\n" + + " (select t.name from operator t where t.account = at.ouser_id) order_account\n" + + " from ticket_product_order pw_order_info, allot_track at\n" + + " where at.order_id like '%' || pw_order_info.id || '%'\n" + + " and at.produce_id = 'PW'\n" + + " and at.end_date = to_date('1900-01-01', 'yyyy-mm-dd') --hn --766ߡh (\n" + + " and pw_order_info.status = '4'\n" + + "union\n" + + "select insurance_order. order_id as order_id,\n" + + " 'BX' product_type,\n" + + " insurance_order.agent_id as order_agent,\n" + + " insurance_order. all_price as collect_money,\n" + + " insurance_order. custom_id as customer_id,\n" + + " insurance_order. add_user,\n" + + " insurance_order. add_date,\n" + + " '' as team_name,\n" + + " '' as team_no,\n" + + " insurance_order. contact_name as contact,\n" + + " (select t.name from operator t where t.account = at.ouser_id) order_account\n" + + " from insurance_order insurance_order, allot_track at\n" + + " where insurance_order.status = '3' --iU\n" + + " and at.order_id_s = insurance_order.order_id\n" + + " and at.produce_id = 'BX'\n" + + " and at.end_date = to_date('1900-01-01', 'yyyy-mm-dd')\n" + + "union\n" + + "select t.order_id as order_id,\n" + + " tt.product_type product_type,\n" + + " tt.true_agent_id as order_agent,\n" + + " t.price as collect_money,\n" + + " t.custom_id as customer_id,\n" + + " t.add_user,\n" + + " t.add_date,\n" + + " tb.name as team_name,\n" + + " tb.team_no as team_no,\n" + + " t.person as contact,\n" + + " (select t.name from operator t where t.account = tt.od_user) order_account\n" + + " from order_info t, order_flow_info tt, team_baseinfo tb\n" + + " where t.product_type in ('0', '7')\n" + + " and t.order_id = tt.order_id\n" + + " and tt.user_type = '0'\n" + + " and (tt.status = '3' or tt.status = '4' or tt.status = '5')\n" + + " and tt.product_id = tb.team_id\n" + + " --3n,4c,5c*6>\n" + + "\n" + + " union\n" + + "/* hU*/\n" + + "\n" + + "select t.order_id as order_id,\n" + + " 'GN' product_type,\n" + + " t.agent_id as order_agent,\n" + + " t.all_price as collect_money,\n" + + " t.olduserid as customer_id,\n" + + " t.add_user as add_user,\n" + + " t.add_date as add_date,\n" + + " '' as team_name,\n" + + " '' as team_no,\n" + + " t.client_name as contact,\n" + + " (select o.name\n" + + " from operator o, allot_track a\n" + + " where o.account = a.ouser_id\n" + + " and a.order_id_s = t.order_id\n" + + " and a.agent_id_s = o.agent_id\n" + + " and a.agent_id_s = t.agent_id\n" + + " and a.end_date =\n" + + " to_timestamp('1900-1-1', 'yyyy-mm-dd hh24:mi:ssxff')) order_account\n" + + " from ticket_order_info t\n" + + " where t.product_type = 'GN'\n" + + " and (t.order_status = '6' or t.ticket_status = '2')\n" + + "\n" + + "union\n" + + "\n" + + "/* Eh*/\n" + + "select t.order_id as order_id,\n" + + " 'GJ' product_type,\n" + + " t.agent_id as order_agent,\n" + + " t.all_price as collect_money,\n" + + " t.olduserid as customer_id,\n" + + " t.add_user as add_user,\n" + + " t.add_date as add_date,\n" + + " '' as team_name,\n" + + " '' as team_no,\n" + + " t.client_name as contact,\n" + + " (select o.name\n" + + " from operator o, allot_track a\n" + + " where o.account = a.ouser_id\n" + + " and a.order_id_s = t.order_id\n" + + " and a.agent_id_s = t.agent_id\n" + + " and a.agent_id_s = o.agent_id\n" + + " and a.end_date =\n" + + " to_timestamp('1900-1-1', 'yyyy-mm-dd hh24:mi:ssxff')) order_account\n" + + " from ticket_order_info t\n" + + " where t.product_type = 'GJ'\n" + + " and t.order_id like '02%'\n" + + " and (t.order_status = '3' or t.ticket_status = '2')\n" + + " union\n" + + "--~\"5\">~,6\">ӗ\n" + + "select voi.order_id as order_id,\n" + + " 'QZ' product_type,\n" + + " ofi.true_agent_id as order_agent,\n" + + " ofi.sell_sum,\n" + + " voi.custom_id as customer_id,\n" + + " voi.add_user,\n" + + " voi.add_date,\n" + + " ofi.bal_team_id as team_name,\n" + + " ofi.bal_team_no as team_no,\n" + + " voi.user_name as contact,\n" + + " (select op.name\n" + + " from operator op, allot_track al\n" + + " where op.account = al.ouser_id\n" + + " and al.order_id_s = ofi.order_id\n" + + " and al.supply_id_s = ofi.supply_id\n" + + " and al.agent_id_s = ofi.agent_id\n" + + " and al.end_date = to_timestamp('1900-01-01', 'yyyy-MM-dd')\n" + + " and al.produce_Id = 'QZ') order_account\n" + + " from order_flow_info ofi, visa_order_info voi\n" + + " where ofi.product_type = 'QZ'\n" + + " and voi.order_id = ofi.order_id\n" + + " and ofi.user_type = '0'\n" + + " and (ofi.status = '5' or ofi.status = '6')\n" + + "\n" + + "\n" + + " union\n" + + "--R3an,3bn*,7B2C6>n\n" + + "select res.reservation_id,\n" + + " 'FD' product_type,\n" + + " res.agent_id,\n" + + " res.total_sale_amt sale_amt,\n" + + " bus.customer_id,\n" + + " bus.operator,\n" + + " bus.create_date,\n" + + " '' as team_name,\n" + + " '' as team_no,\n" + + " res.contact_person as contact,\n" + + " (select t.name\n" + + " from operator t, allot_track a\n" + + " where t.account = a.ouser_id\n" + + " and bus.reservation_id = a.order_id\n" + + " and bus.agent_id = a.agent_id\n" + + " and a.end_date =\n" + + " to_timestamp('1900-1-1', 'yyyy-mm-dd hh24:mi:ssxff')) order_account\n" + + " from resaccount res, businessres bus\n" + + " where bus.reservation_id = res.reservation_id\n" + + " and (bus.confirm_status = '3' or bus.confirm_status = '7')"; System.out.println(sql); @@ -319,7 +317,7 @@ public void test_types() throws Exception { "WHERE bus.reservation_id = res.reservation_id\n" + "\tAND (bus.confirm_status = '3'\n" + "\t\tOR bus.confirm_status = '7')",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest15.java index fc48c06826..18e14881f4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest15.java @@ -26,20 +26,18 @@ import java.util.List; public class OracleCreateViewTest15 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE OR REPLACE FORCE VIEW \"ZJGT_DKXY\".\"V_ZJ_DKXMXXEXP\" (\"PRJ_NO\", \"EXPLST\") AS \n" + - " select b.prj_no,explst\n" + - " from (with temp_exp as (select t.prj_no, t.explx,t.expname\n" + - " from v_zjk_xmlist t\n" + - " where t.expname is not null\n" + - " and t.explx not like '%组员%')\n" + - " select prj_no,\n" + - " dbms_lob.substr(wmsys.wm_concat(explx||': '||expname) over(partition by prj_no)，4000,1) as explst\n" + - " from temp_exp) b\n" + - " group by b.prj_no,explst" - ; + "CREATE OR REPLACE FORCE VIEW \"ZJGT_DKXY\".\"V_ZJ_DKXMXXEXP\" (\"PRJ_NO\", \"EXPLST\") AS \n" + + " select b.prj_no,explst\n" + + " from (with temp_exp as (select t.prj_no, t.explx,t.expname\n" + + " from v_zjk_xmlist t\n" + + " where t.expname is not null\n" + + " and t.explx not like '%组员%')\n" + + " select prj_no,\n" + + " dbms_lob.substr(wmsys.wm_concat(explx||': '||expname) over(partition by prj_no)，4000,1) as explst\n" + + " from temp_exp) b\n" + + " group by b.prj_no,explst"; System.out.println(sql); @@ -68,7 +66,7 @@ public void test_types() throws Exception { "\tFROM temp_exp\n" + ") b\n" + "GROUP BY b.prj_no, explst",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest16.java index 2139e4fd1e..8b35a0d97d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest16.java @@ -26,59 +26,57 @@ import java.util.List; public class OracleCreateViewTest16 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE OR REPLACE FORCE VIEW \"APPS\".\"PMI_REP_SALES_DETAILS_V\" (\n" + - "\t\"ITEM_ID\", \"ORDER_QUANTITY\", \"WAREHOUSE_SHIPPED_FROM\", \"EXTENDED_PRICE_BASE_CURRENCY\", \"CHARGES_BASE_CURRENCY\", \"SALES_COMPANY\", \"SALES_ORGANIZATION\", \"PERIOD_START_DATE\", \"OPERATING_UNIT_ID\", \"YEAR_ID\", \"QUARTER_ID\", \"PERIOD_ID\"\n" + - ") AS \n" + - "SELECT ITEM_ID ,SUM(ORDER_QUANTITY) ORDER_QUANTITY ,WAREHOUSE_SHIPPED_FROM ,SUM(EXTENDED_PRICE_BASE_CURRENCY) EXTENDED_PRICE_BASE_CURRENCY \n" + - "\t,SUM(CHARGES_BASE_CURRENCY) CHARGES_BASE_CURRENCY \n" + - "\t,SALES_COMPANY ,SALES_ORGANIZATION ,PERIOD_START_DATE ,OPERATING_UNIT_ID ,YEAR_ID ,QUARTER_ID ,PERIOD_ID \n" + - "FROM (\n" + - "\tSELECT orderdetail.ITEM_ID ITEM_ID\n" + - "\t\t, gmicuom.i2uom_cv(orderdetail.ITEM_ID,0,orderdetail.ORDER_UM1,orderdetail.ORDER_QTY1, itemmaster.ITEM_UM) ORDER_QUANTITY\n" + - "\t\t, orderdetail.FROM_WHSE WAREHOUSE_SHIPPED_FROM\n" + - "\t\t, DECODE(orderdetail.BASE_CURRENCY,orderdetail.BILLING_CURRENCY, orderdetail.EXTENDED_PRICE\n" + - "\t\t\t, Decode(orderdetail.mul_div_sign,0,orderdetail.EXTENDED_PRICE*orderdetail.EXCHANGE_RATE, orderdetail.EXTENDED_PRICE/orderdetail.EXCHANGE_RATE)\n" + - "\t\t\t) EXTENDED_PRICE_BASE_CURRENCY\n" + - "\t\t, pmi_sales_pkg.pmisa_get_charge(orderdetail.order_id,orderdetail.line_id,orderdetail.extended_price\n" + - "\t\t\t, orderdetail.billing_currency,orderdetail.BASE_CURRENCY, orderdetail.EXCHANGE_RATE,orderdetail.mul_div_sign) CHARGES_BASE_CURRENCY\n" + - "\t\t\t, salesorg.CO_CODE SALES_COMPANY, orderhdr.ORGN_CODE SALES_ORGANIZATION, glcldr.period_start_date PERIOD_START_DATE\n" + - "\t\t\t, ou.organization_id operating_unit_id, glcldr.year_id, glcldr.quarter_id, glcldr.period_id \n" + - "\tFROM PMI_GL_TIME_V glcldr, GL_PLCY_MST glplcy, OP_ORDR_HDR orderhdr, OP_ORDR_DTL orderdetail, ic_item_mst_b itemmaster, IC_WHSE_MST shippingwarehouse, SY_ORGN_MST salesorg, HR_OPERATING_UNITS ou \n" + - "\tWHERE orderhdr.order_id = orderdetail.order_id \n" + - "\t\tAND orderhdr.orgn_code = salesorg.orgn_code \n" + - "\t\tAND orderdetail.from_whse=shippingwarehouse.whse_code \n" + - "\t\tAND glplcy.co_code = salesorg.co_code \n" + - "\t\tAND glcldr.set_of_books_name=glplcy.set_of_books_name \n" + - "\t\tAND trunc(orderdetail.ACTUAL_SHIPDATE) between glcldr.period_start_date and glcldr.period_end_date \n" + - "\t\tAND orderdetail.LINE_STATUS>=20 \n" + - "\t\tAND ou.organization_id = glplcy.org_id \n" + - "\t\tAND itemmaster.item_id = orderdetail.item_id \n" + - "\t\tAND 'TRUE' = PMI_SECURITY_PKG.show_record(salesorg.orgn_code) \n" + - "\n" + - "\tUNION ALL \n" + - "\n" + - "\tSELECT itemmaster.ITEM_ID ITEM_ID, gmicuom.i2uom_cv(itemmaster.ITEM_ID, 0, orderdetail.ORDER_QUANTITY_UOM, orderdetail.ORDERED_QUANTITY, itemmaster.ITEM_UM) ORDER_QUANTITY\n" + - "\t\t, shippingwarehouse.whse_code WAREHOUSE_SHIPPED_FROM\n" + - "\t\t, DECODE(SOB.CURRENCY_CODE, orderhdr.TRANSACTIONAL_CURR_CODE, orderdetail.UNIT_LIST_PRICE * ORDERED_QUANTITY, orderdetail.UNIT_LIST_PRICE * NVL(orderhdr.CONVERSION_RATE, PMI_COMMON_PKG.PMICO_GET_MULCURR_AMT(orderhdr.TRANSACTIONAL_CURR_CODE, sob.CURRENCY_CODE,orderdetail.ACTUAL_SHIPMENT_DATE, 1)) * ORDERED_QUANTITY) EXTENDED_PRICE_BASE_CURRENCY, (orderdetail.UNIT_LIST_PRICE - orderdetail.UNIT_SELLING_PRICE) * orderdetail.ORDERED_QUANTITY CHARGES_BASE_CURRENCY, NULL SALES_COMPANY, NULL SALES_ORGANIZATION, glcldr.period_start_date PERIOD_START_DATE, ou.organization_id OPERATING_UNIT_ID, glcldr.YEAR_ID, glcldr.QUARTER_ID, glcldr.PERIOD_ID \n" + - "\tFROM oe_order_headers_all orderhdr, oe_order_lines_all orderdetail, oe_system_parameters_all params, mtl_system_items_b msi, ic_item_mst_b itemmaster, hr_operating_units ou, gl_sets_of_books sob, ic_whse_mst shippingwarehouse, PMI_GL_TIME_V glcldr \n" + - "\tWHERE orderdetail.header_id = orderhdr.header_id \n" + - "\t\tAND params.org_id = orderhdr.org_id \n" + - "\t\tAND msi.organization_id = params.master_organization_id \n" + - "\t\tAND msi.inventory_item_id = orderdetail.inventory_item_id \n" + - "\t\tAND itemmaster.item_no(+) = msi.segment1 \n" + - "\t\tAND ou.organization_id = orderhdr.org_id AND ou.organization_id = orderdetail.org_id \n" + - "\t\tAND sob.set_of_books_id = ou.set_of_books_id \n" + - "\t\tAND shippingwarehouse.mtl_organization_id = orderdetail.ship_from_org_id \n" + - "\t\tAND trunc(orderdetail.ACTUAL_SHIPMENT_DATE) between glcldr.period_start_date and glcldr.period_end_date \n" + - "\t\tAND sob.period_set_name = glcldr.period_set_name \n" + - "\t\tand SOB.NAME = glcldr.SET_OF_BOOKS_NAME \n" + - "\t\tAND HR_SECURITY.SHOW_BIS_RECORD( orderhdr.org_id ) = 'TRUE' \n" + - ") \n" + - "GROUP BY ITEM_ID ,WAREHOUSE_SHIPPED_FROM ,SALES_COMPANY ,SALES_ORGANIZATION ,PERIOD_START_DATE ,OPERATING_UNIT_ID ,YEAR_ID ,QUARTER_ID ,PERIOD_ID with read only" - ; + "CREATE OR REPLACE FORCE VIEW \"APPS\".\"PMI_REP_SALES_DETAILS_V\" (\n" + + "\t\"ITEM_ID\", \"ORDER_QUANTITY\", \"WAREHOUSE_SHIPPED_FROM\", \"EXTENDED_PRICE_BASE_CURRENCY\", \"CHARGES_BASE_CURRENCY\", \"SALES_COMPANY\", \"SALES_ORGANIZATION\", \"PERIOD_START_DATE\", \"OPERATING_UNIT_ID\", \"YEAR_ID\", \"QUARTER_ID\", \"PERIOD_ID\"\n" + + ") AS \n" + + "SELECT ITEM_ID ,SUM(ORDER_QUANTITY) ORDER_QUANTITY ,WAREHOUSE_SHIPPED_FROM ,SUM(EXTENDED_PRICE_BASE_CURRENCY) EXTENDED_PRICE_BASE_CURRENCY \n" + + "\t,SUM(CHARGES_BASE_CURRENCY) CHARGES_BASE_CURRENCY \n" + + "\t,SALES_COMPANY ,SALES_ORGANIZATION ,PERIOD_START_DATE ,OPERATING_UNIT_ID ,YEAR_ID ,QUARTER_ID ,PERIOD_ID \n" + + "FROM (\n" + + "\tSELECT orderdetail.ITEM_ID ITEM_ID\n" + + "\t\t, gmicuom.i2uom_cv(orderdetail.ITEM_ID,0,orderdetail.ORDER_UM1,orderdetail.ORDER_QTY1, itemmaster.ITEM_UM) ORDER_QUANTITY\n" + + "\t\t, orderdetail.FROM_WHSE WAREHOUSE_SHIPPED_FROM\n" + + "\t\t, DECODE(orderdetail.BASE_CURRENCY,orderdetail.BILLING_CURRENCY, orderdetail.EXTENDED_PRICE\n" + + "\t\t\t, Decode(orderdetail.mul_div_sign,0,orderdetail.EXTENDED_PRICE*orderdetail.EXCHANGE_RATE, orderdetail.EXTENDED_PRICE/orderdetail.EXCHANGE_RATE)\n" + + "\t\t\t) EXTENDED_PRICE_BASE_CURRENCY\n" + + "\t\t, pmi_sales_pkg.pmisa_get_charge(orderdetail.order_id,orderdetail.line_id,orderdetail.extended_price\n" + + "\t\t\t, orderdetail.billing_currency,orderdetail.BASE_CURRENCY, orderdetail.EXCHANGE_RATE,orderdetail.mul_div_sign) CHARGES_BASE_CURRENCY\n" + + "\t\t\t, salesorg.CO_CODE SALES_COMPANY, orderhdr.ORGN_CODE SALES_ORGANIZATION, glcldr.period_start_date PERIOD_START_DATE\n" + + "\t\t\t, ou.organization_id operating_unit_id, glcldr.year_id, glcldr.quarter_id, glcldr.period_id \n" + + "\tFROM PMI_GL_TIME_V glcldr, GL_PLCY_MST glplcy, OP_ORDR_HDR orderhdr, OP_ORDR_DTL orderdetail, ic_item_mst_b itemmaster, IC_WHSE_MST shippingwarehouse, SY_ORGN_MST salesorg, HR_OPERATING_UNITS ou \n" + + "\tWHERE orderhdr.order_id = orderdetail.order_id \n" + + "\t\tAND orderhdr.orgn_code = salesorg.orgn_code \n" + + "\t\tAND orderdetail.from_whse=shippingwarehouse.whse_code \n" + + "\t\tAND glplcy.co_code = salesorg.co_code \n" + + "\t\tAND glcldr.set_of_books_name=glplcy.set_of_books_name \n" + + "\t\tAND trunc(orderdetail.ACTUAL_SHIPDATE) between glcldr.period_start_date and glcldr.period_end_date \n" + + "\t\tAND orderdetail.LINE_STATUS>=20 \n" + + "\t\tAND ou.organization_id = glplcy.org_id \n" + + "\t\tAND itemmaster.item_id = orderdetail.item_id \n" + + "\t\tAND 'TRUE' = PMI_SECURITY_PKG.show_record(salesorg.orgn_code) \n" + + "\n" + + "\tUNION ALL \n" + + "\n" + + "\tSELECT itemmaster.ITEM_ID ITEM_ID, gmicuom.i2uom_cv(itemmaster.ITEM_ID, 0, orderdetail.ORDER_QUANTITY_UOM, orderdetail.ORDERED_QUANTITY, itemmaster.ITEM_UM) ORDER_QUANTITY\n" + + "\t\t, shippingwarehouse.whse_code WAREHOUSE_SHIPPED_FROM\n" + + "\t\t, DECODE(SOB.CURRENCY_CODE, orderhdr.TRANSACTIONAL_CURR_CODE, orderdetail.UNIT_LIST_PRICE * ORDERED_QUANTITY, orderdetail.UNIT_LIST_PRICE * NVL(orderhdr.CONVERSION_RATE, PMI_COMMON_PKG.PMICO_GET_MULCURR_AMT(orderhdr.TRANSACTIONAL_CURR_CODE, sob.CURRENCY_CODE,orderdetail.ACTUAL_SHIPMENT_DATE, 1)) * ORDERED_QUANTITY) EXTENDED_PRICE_BASE_CURRENCY, (orderdetail.UNIT_LIST_PRICE - orderdetail.UNIT_SELLING_PRICE) * orderdetail.ORDERED_QUANTITY CHARGES_BASE_CURRENCY, NULL SALES_COMPANY, NULL SALES_ORGANIZATION, glcldr.period_start_date PERIOD_START_DATE, ou.organization_id OPERATING_UNIT_ID, glcldr.YEAR_ID, glcldr.QUARTER_ID, glcldr.PERIOD_ID \n" + + "\tFROM oe_order_headers_all orderhdr, oe_order_lines_all orderdetail, oe_system_parameters_all params, mtl_system_items_b msi, ic_item_mst_b itemmaster, hr_operating_units ou, gl_sets_of_books sob, ic_whse_mst shippingwarehouse, PMI_GL_TIME_V glcldr \n" + + "\tWHERE orderdetail.header_id = orderhdr.header_id \n" + + "\t\tAND params.org_id = orderhdr.org_id \n" + + "\t\tAND msi.organization_id = params.master_organization_id \n" + + "\t\tAND msi.inventory_item_id = orderdetail.inventory_item_id \n" + + "\t\tAND itemmaster.item_no(+) = msi.segment1 \n" + + "\t\tAND ou.organization_id = orderhdr.org_id AND ou.organization_id = orderdetail.org_id \n" + + "\t\tAND sob.set_of_books_id = ou.set_of_books_id \n" + + "\t\tAND shippingwarehouse.mtl_organization_id = orderdetail.ship_from_org_id \n" + + "\t\tAND trunc(orderdetail.ACTUAL_SHIPMENT_DATE) between glcldr.period_start_date and glcldr.period_end_date \n" + + "\t\tAND sob.period_set_name = glcldr.period_set_name \n" + + "\t\tand SOB.NAME = glcldr.SET_OF_BOOKS_NAME \n" + + "\t\tAND HR_SECURITY.SHOW_BIS_RECORD( orderhdr.org_id ) = 'TRUE' \n" + + ") \n" + + "GROUP BY ITEM_ID ,WAREHOUSE_SHIPPED_FROM ,SALES_COMPANY ,SALES_ORGANIZATION ,PERIOD_START_DATE ,OPERATING_UNIT_ID ,YEAR_ID ,QUARTER_ID ,PERIOD_ID with read only"; System.out.println(sql); @@ -152,7 +150,7 @@ public void test_types() throws Exception { ")\n" + "GROUP BY ITEM_ID, WAREHOUSE_SHIPPED_FROM, SALES_COMPANY, SALES_ORGANIZATION, PERIOD_START_DATE, OPERATING_UNIT_ID, YEAR_ID, QUARTER_ID, PERIOD_ID\n" + "WITH READ ONLY",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest17_dblink.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest17_dblink.java index 6d27c46e01..73145a076a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest17_dblink.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest17_dblink.java @@ -26,35 +26,33 @@ import java.util.List; public class OracleCreateViewTest17_dblink extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE OR REPLACE FORCE VIEW \"OA\".\"HET_MANAGER1_FW\" (\"LX\", \"HS\") AS \n" + - " SELECT B.SELECTNAME LX,\n" + - " AVG(FUN_CAL_TIME_BETWEEN@LINK_OMSS(TO_CHAR(TO_DATE(A.RECEIVEDATE ||\n" + - " A.RECEIVETIME,\n" + - " 'YYYY-MM-DD HH24:MI:SS'),\n" + - " 'YYYYMMDDHH24MISS'),\n" + - " TO_CHAR(TO_DATE(D.OPERATEDATE ||\n" + - " D.OPERATETIME,\n" + - " 'YYYY-MM-DD HH24:MI:SS'),\n" + - " 'YYYYMMDDHH24MISS'))) HS\n" + - " FROM WORKFLOW_CURRENTOPERATOR A,\n" + - " WORKFLOW_SELECTITEM B,\n" + - " FORMTABLE_MAIN_93 C,\n" + - " WORKFLOW_CURRENTOPERATOR D\n" + - " WHERE A.WORKFLOWID = 606\n" + - " AND D.WORKFLOWID = 606\n" + - " AND A.NODEID = 2249\n" + - " AND D.NODEID = 2251\n" + - " AND B.FIELDID = 10259\n" + - " AND A.REQUESTID = C.REQUESTID\n" + - " AND D.REQUESTID = C.REQUESTID\n" + - " AND C.Hetonglx = B.SELECTVALUE\n" + - " AND C.SHENQINGRIQI >= '2017-10-01'\n" + - " AND C.SHENQINGRIQI <= '2017-12-31'\n" + - " GROUP BY B.SELECTNAME" - ; + "CREATE OR REPLACE FORCE VIEW \"OA\".\"HET_MANAGER1_FW\" (\"LX\", \"HS\") AS \n" + + " SELECT B.SELECTNAME LX,\n" + + " AVG(FUN_CAL_TIME_BETWEEN@LINK_OMSS(TO_CHAR(TO_DATE(A.RECEIVEDATE ||\n" + + " A.RECEIVETIME,\n" + + " 'YYYY-MM-DD HH24:MI:SS'),\n" + + " 'YYYYMMDDHH24MISS'),\n" + + " TO_CHAR(TO_DATE(D.OPERATEDATE ||\n" + + " D.OPERATETIME,\n" + + " 'YYYY-MM-DD HH24:MI:SS'),\n" + + " 'YYYYMMDDHH24MISS'))) HS\n" + + " FROM WORKFLOW_CURRENTOPERATOR A,\n" + + " WORKFLOW_SELECTITEM B,\n" + + " FORMTABLE_MAIN_93 C,\n" + + " WORKFLOW_CURRENTOPERATOR D\n" + + " WHERE A.WORKFLOWID = 606\n" + + " AND D.WORKFLOWID = 606\n" + + " AND A.NODEID = 2249\n" + + " AND D.NODEID = 2251\n" + + " AND B.FIELDID = 10259\n" + + " AND A.REQUESTID = C.REQUESTID\n" + + " AND D.REQUESTID = C.REQUESTID\n" + + " AND C.Hetonglx = B.SELECTVALUE\n" + + " AND C.SHENQINGRIQI >= '2017-10-01'\n" + + " AND C.SHENQINGRIQI <= '2017-12-31'\n" + + " GROUP BY B.SELECTNAME"; System.out.println(sql); @@ -84,7 +82,7 @@ public void test_types() throws Exception { "\tAND C.SHENQINGRIQI >= '2017-10-01'\n" + "\tAND C.SHENQINGRIQI <= '2017-12-31'\n" + "GROUP BY B.SELECTNAME",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest18_with_check_option.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest18_with_check_option.java index 58676681f4..0c592db0c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest18_with_check_option.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest18_with_check_option.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateViewTest18_with_check_option extends OracleTest { - public void test_types() throws Exception { String sql = "CREATE OR REPLACE VIEW \"ZJ\".\"SMP_SERVICE_GROUP_DEFN\" (\"OWNER\", \"GROUP_NAME\", \"GROUP_TYPE\") AS \n" + " select OWNER, GROUP_NAME, GROUP_TYPE from SMP_SERVICE_GROUP_DEFN_\n" + @@ -51,7 +50,7 @@ public void test_types() throws Exception { "FROM SMP_SERVICE_GROUP_DEFN_\n" + "WHERE USER = OWNER\n" + "WITH CHECK OPTION CONSTRAINT \"SMP_SERVICE_GROUP_DEFN_CNST\";", - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest2.java index 594ceb6f1f..645498c062 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest2.java @@ -27,35 +27,34 @@ import java.util.List; public class OracleCreateViewTest2 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE OR REPLACE FORCE VIEW \"RMAN\".\"V_001\" (\"DB_KEY\", \"DB_ID\", \"BS_KEY\", \"RECID\", \"STAMP\", \"SET_STAMP\", \"SET_COUNT\", \"BACKUP_TYPE\", \"INCREMENTAL_LEVEL\", \"PIECES\", \"START_TIME\", \"COMPLETION_TIME\", \"ELAPSED_SECONDS\", \"STATUS\", \"CONTROLFILE_INCLUDED\", \"INPUT_FILE_SCAN_ONLY\", \"KEEP\", \"KEEP_UNTIL\", \"KEEP_OPTIONS\") AS \n" + - " select db.db_key,\n" + - " db.db_id,\n" + - " bs.bs_key,\n" + - " bs.bs_recid recid,\n" + - " bs.bs_stamp stamp,\n" + - " bs.set_stamp,\n" + - " bs.set_count,\n" + - " bs.bck_type backup_type,\n" + - " bs.incr_level incremental_level,\n" + - " bs.pieces,\n" + - " bs.start_time,\n" + - " bs.completion_time,\n" + - " abs((bs.completion_time - bs.start_time) * 86400) elapsed_seconds,\n" + - " bs.status,\n" + - " bs.controlfile_included,\n" + - " bs.input_file_scan_only,\n" + - " decode(keep_options, 0, 'NO',\n" + - " 'YES') keep,\n" + - " keep_until,\n" + - " decode(keep_options, 256, 'LOGS',\n" + - " 512, 'NOLOGS',\n" + - " 1024, 'CONSISTENT',\n" + - " NULL) keep_options\n" + - "from db, bs\n" + - "where db.db_key = bs.db_key "; + " CREATE OR REPLACE FORCE VIEW \"RMAN\".\"V_001\" (\"DB_KEY\", \"DB_ID\", \"BS_KEY\", \"RECID\", \"STAMP\", \"SET_STAMP\", \"SET_COUNT\", \"BACKUP_TYPE\", \"INCREMENTAL_LEVEL\", \"PIECES\", \"START_TIME\", \"COMPLETION_TIME\", \"ELAPSED_SECONDS\", \"STATUS\", \"CONTROLFILE_INCLUDED\", \"INPUT_FILE_SCAN_ONLY\", \"KEEP\", \"KEEP_UNTIL\", \"KEEP_OPTIONS\") AS \n" + + " select db.db_key,\n" + + " db.db_id,\n" + + " bs.bs_key,\n" + + " bs.bs_recid recid,\n" + + " bs.bs_stamp stamp,\n" + + " bs.set_stamp,\n" + + " bs.set_count,\n" + + " bs.bck_type backup_type,\n" + + " bs.incr_level incremental_level,\n" + + " bs.pieces,\n" + + " bs.start_time,\n" + + " bs.completion_time,\n" + + " abs((bs.completion_time - bs.start_time) * 86400) elapsed_seconds,\n" + + " bs.status,\n" + + " bs.controlfile_included,\n" + + " bs.input_file_scan_only,\n" + + " decode(keep_options, 0, 'NO',\n" + + " 'YES') keep,\n" + + " keep_until,\n" + + " decode(keep_options, 256, 'LOGS',\n" + + " 512, 'NOLOGS',\n" + + " 1024, 'CONSISTENT',\n" + + " NULL) keep_options\n" + + "from db, bs\n" + + "where db.db_key = bs.db_key "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -96,7 +95,7 @@ public void test_types() throws Exception { "\t, decode(keep_options, 256, 'LOGS', 512, 'NOLOGS', 1024, 'CONSISTENT', NULL) AS keep_options\n" + "FROM db, bs\n" + "WHERE db.db_key = bs.db_key",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest3.java index 2720a37fa2..9462da41a1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest3.java @@ -27,36 +27,35 @@ import java.util.List; public class OracleCreateViewTest3 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE OR REPLACE FORCE VIEW \"RMAN\".\"V_001\" (\"DB_KEY\", \"DBINC_KEY\", \"FILE#\", \"BLOCK#\", \"BLOCKS\", \"CORRUPTION_CHANGE#\", \"CORRUPTION_TYPE\") AS \n" + - " select distinct\n" + - " db_key, dbinc_key, file#, block#, blocks, corruption_change#,\n" + - " corruption_type from\n" + - " (select db_key, dbinc_key, file#, block#, blocks,\n" + - " corruption_change#, copy_stamp stamp, corruption_type\n" + - " from tb_004 union\n" + - " select bs.db_key, dbinc_key, file#, block#, blocks,\n" + - " corruption_change#, bs.stamp, corruption_type\n" + - " from tb_005 bc, tb_006 bs\n" + - " where bc.bs_key = bs.bs_key) outer\n" + - "where not exists\n" + - " (select 1\n" + - " from tb_001\n" + - " where outer.db_key = db_key and\n" + - " outer.dbinc_key = dbinc_key and\n" + - " scanned = 'YES' and\n" + - " outer.file# = file# and\n" + - " outer.stamp < stamp\n" + - " union\n" + - " select 1\n" + - " from tb_002 bdf, tb_003 bs\n" + - " where bdf.bs_key = bs.bs_key and\n" + - " outer.db_key = bdf.db_key and\n" + - " outer.dbinc_key = bdf.dbinc_key and\n" + - " outer.file# = file# and\n" + - " outer.stamp < bs.stamp) "; + " CREATE OR REPLACE FORCE VIEW \"RMAN\".\"V_001\" (\"DB_KEY\", \"DBINC_KEY\", \"FILE#\", \"BLOCK#\", \"BLOCKS\", \"CORRUPTION_CHANGE#\", \"CORRUPTION_TYPE\") AS \n" + + " select distinct\n" + + " db_key, dbinc_key, file#, block#, blocks, corruption_change#,\n" + + " corruption_type from\n" + + " (select db_key, dbinc_key, file#, block#, blocks,\n" + + " corruption_change#, copy_stamp stamp, corruption_type\n" + + " from tb_004 union\n" + + " select bs.db_key, dbinc_key, file#, block#, blocks,\n" + + " corruption_change#, bs.stamp, corruption_type\n" + + " from tb_005 bc, tb_006 bs\n" + + " where bc.bs_key = bs.bs_key) outer\n" + + "where not exists\n" + + " (select 1\n" + + " from tb_001\n" + + " where outer.db_key = db_key and\n" + + " outer.dbinc_key = dbinc_key and\n" + + " scanned = 'YES' and\n" + + " outer.file# = file# and\n" + + " outer.stamp < stamp\n" + + " union\n" + + " select 1\n" + + " from tb_002 bdf, tb_003 bs\n" + + " where bdf.bs_key = bs.bs_key and\n" + + " outer.db_key = bdf.db_key and\n" + + " outer.dbinc_key = bdf.dbinc_key and\n" + + " outer.file# = file# and\n" + + " outer.stamp < bs.stamp) "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -104,7 +103,7 @@ public void test_types() throws Exception { "\t\tAND outer.file# = file#\n" + "\t\tAND outer.stamp < bs.stamp\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest4.java index b84dc90fdf..a1e8fac541 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest4.java @@ -26,28 +26,27 @@ import java.util.List; public class OracleCreateViewTest4 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE OR REPLACE FORCE VIEW \"SC_001\".\"V_001\" (\"OBJ_OWNER\", \"OBJ_NAME\", \"OBJ_TYPE\", \"OBJ_ROWID\", \"DB_USER\", \"SID\", \"LOCK_TYPE\", \"ROW_WAIT_FILE#\", \"ROW_WAIT_BLOCK#\", \"ROW_WAIT_ROW#\") AS \n" + - " SELECT owner obj_owner,\n" + - " object_name obj_name,\n" + - " object_type obj_type,\n" + - " dbms_rowid.rowid_create(1, row_wait_obj#, ROW_WAIT_FILE#,\n" + - " ROW_WAIT_BLOCK#,ROW_WAIT_ROW#) obj_rowid,\n" + - " a.username db_user, a.SID SID, a.TYPE lock_type,\n" + - " a.row_wait_file#, a.row_wait_block#, a.row_wait_row#\n" + - " FROM TB_001,\n" + - " (SELECT /*+ no_merge(a) no_merge(b) */\n" + - " a.username, a.SID, a.row_wait_obj#, a.ROW_WAIT_FILE#,\n" + - " a.ROW_WAIT_BLOCK#, a.ROW_WAIT_ROW#, b.TYPE\n" + - " FROM sys.V_$SESSION a, sys.V_$LOCK b\n" + - " WHERE a.username IS NOT NULL\n" + - " AND a.row_wait_obj# <> -1\n" + - " AND a.SID = b.SID\n" + - " AND b.TYPE IN ('TX','TM')\n" + - " ) a\n" + - " WHERE object_id = a.row_wait_obj# "; + " CREATE OR REPLACE FORCE VIEW \"SC_001\".\"V_001\" (\"OBJ_OWNER\", \"OBJ_NAME\", \"OBJ_TYPE\", \"OBJ_ROWID\", \"DB_USER\", \"SID\", \"LOCK_TYPE\", \"ROW_WAIT_FILE#\", \"ROW_WAIT_BLOCK#\", \"ROW_WAIT_ROW#\") AS \n" + + " SELECT owner obj_owner,\n" + + " object_name obj_name,\n" + + " object_type obj_type,\n" + + " dbms_rowid.rowid_create(1, row_wait_obj#, ROW_WAIT_FILE#,\n" + + " ROW_WAIT_BLOCK#,ROW_WAIT_ROW#) obj_rowid,\n" + + " a.username db_user, a.SID SID, a.TYPE lock_type,\n" + + " a.row_wait_file#, a.row_wait_block#, a.row_wait_row#\n" + + " FROM TB_001,\n" + + " (SELECT /*+ no_merge(a) no_merge(b) */\n" + + " a.username, a.SID, a.row_wait_obj#, a.ROW_WAIT_FILE#,\n" + + " a.ROW_WAIT_BLOCK#, a.ROW_WAIT_ROW#, b.TYPE\n" + + " FROM sys.V_$SESSION a, sys.V_$LOCK b\n" + + " WHERE a.username IS NOT NULL\n" + + " AND a.row_wait_obj# <> -1\n" + + " AND a.SID = b.SID\n" + + " AND b.TYPE IN ('TX','TM')\n" + + " ) a\n" + + " WHERE object_id = a.row_wait_obj# "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -83,7 +82,7 @@ public void test_types() throws Exception { "\t\tAND b.TYPE IN ('TX', 'TM')\n" + ") a\n" + "WHERE object_id = a.row_wait_obj#",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest5.java index b5ee9e45ee..80b39391f2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest5.java @@ -27,23 +27,22 @@ import java.util.List; public class OracleCreateViewTest5 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE OR REPLACE FORCE VIEW \"SC_001\".\"TB_001\" (\"OBJECT_NAME\", \"SESSION_ID\", \"ORACLE_USERNAME\", \"OS_USER_NAME\", \"SQL_ACTIONS\", \"LOCK_MODE\") AS \n" + - " SELECT /*+ no_merge(lo) */\n" + - " DO.object_name, lo.SESSION_ID, lo.oracle_username, lo.OS_USER_NAME,\n" + - " DECODE(locked_mode,\n" + - " 1, 'SELECT',\n" + - " 2, 'SELECT FOR UPDATE / LOCK ROW SHARE',\n" + - " 3, 'INSERT/UPDATE/DELETE/LOCK ROW EXCLUSIVE',\n" + - " 4, 'CREATE INDEX/LOCK SHARE',\n" + - " 5, 'LOCK SHARE ROW EXCLUSIVE',\n" + - " 6, 'ALTER TABLE/DROP TABLE/DROP INDEX/TRUNCATE TABLE/LOCK EXCLUSIVE') sql_actions,\n" + - " DECODE(locked_mode, 1, 'NULL', 2, 'SS - SUB SHARE', 3, 'SX - SUB EXCLUSIVE',\n" + - " 4, 'S - SHARE', 5, 'SSX - SHARE/SUB EXCLUSIVE', 6, 'X - EXCLUSIVE') Lock_mode\n" + - " FROM sys.V_$LOCKED_OBJECT lo, TB_002 DO\n" + - " WHERE DO.object_id = lo.object_id "; + " CREATE OR REPLACE FORCE VIEW \"SC_001\".\"TB_001\" (\"OBJECT_NAME\", \"SESSION_ID\", \"ORACLE_USERNAME\", \"OS_USER_NAME\", \"SQL_ACTIONS\", \"LOCK_MODE\") AS \n" + + " SELECT /*+ no_merge(lo) */\n" + + " DO.object_name, lo.SESSION_ID, lo.oracle_username, lo.OS_USER_NAME,\n" + + " DECODE(locked_mode,\n" + + " 1, 'SELECT',\n" + + " 2, 'SELECT FOR UPDATE / LOCK ROW SHARE',\n" + + " 3, 'INSERT/UPDATE/DELETE/LOCK ROW EXCLUSIVE',\n" + + " 4, 'CREATE INDEX/LOCK SHARE',\n" + + " 5, 'LOCK SHARE ROW EXCLUSIVE',\n" + + " 6, 'ALTER TABLE/DROP TABLE/DROP INDEX/TRUNCATE TABLE/LOCK EXCLUSIVE') sql_actions,\n" + + " DECODE(locked_mode, 1, 'NULL', 2, 'SS - SUB SHARE', 3, 'SX - SUB EXCLUSIVE',\n" + + " 4, 'S - SHARE', 5, 'SSX - SHARE/SUB EXCLUSIVE', 6, 'X - EXCLUSIVE') Lock_mode\n" + + " FROM sys.V_$LOCKED_OBJECT lo, TB_002 DO\n" + + " WHERE DO.object_id = lo.object_id "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -66,7 +65,7 @@ public void test_types() throws Exception { "\t, DECODE(locked_mode, 1, 'NULL', 2, 'SS - SUB SHARE', 3, 'SX - SUB EXCLUSIVE', 4, 'S - SHARE', 5, 'SSX - SHARE/SUB EXCLUSIVE', 6, 'X - EXCLUSIVE') AS Lock_mode\n" + "FROM sys.V_$LOCKED_OBJECT lo, TB_002 DO\n" + "WHERE DO.object_id = lo.object_id",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest6.java index eac26a2bed..4b63332075 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest6.java @@ -27,49 +27,48 @@ import java.util.List; public class OracleCreateViewTest6 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE OR REPLACE FORCE VIEW \"SC_001\".\"TV_001\" (\"ID\", \"GMT_CREATE\", \"CREATOR\", \"GMT_MODIFIED\", \"MODIFIER\", \"IS_DELETED\", \"CONTRACT_PARTY\", \"COMPANY_NAME\", \"PRODUCT_TYPE\", \"PERIOD\", \"JOIN\", \"OVER\", \"CONTRACT_TERM\", \"CONTRACT_CASH\", \"EXEC_CASH\", \"CANCELED_CASH\", \"RECEIVERD_CASH\", \"O_S_CASH\", \"REMARK\", \"FENTAN_CHECK\", \"TOTAL_CASH\", \"NOT_CONFIRMED\", \"PRE_RECEIVED\", \"NOT_RECEIVED\", \"CONTRACT_DATE\", \"OWNER_1\", \"AREA_ID_1\", \"FIRST_OWNER\", \"FIRST_AREA_ID\", \"CONTRACT_ID\", \"IS_RENEW_UPGRADE\", \"CATEGORY_ID_1\", \"CATEGORY_ID_2\", \"FIRST_RECEIPT_DATE\", \"RECEIPT_REMARK\", \"CONTRACT_SERIAL\", \"IS_MERGED\") AS \n" + - " SELECT\n" + - "ID,\n" + - "GMT_CREATE,\n" + - "utl_raw.cast_to_raw(CREATOR) AS CREATOR,\n" + - "GMT_MODIFIED,\n" + - "utl_raw.cast_to_raw(MODIFIER) AS MODIFIER,\n" + - "IS_DELETED,\n" + - "utl_raw.cast_to_raw(CONTRACT_PARTY) AS CONTRACT_PARTY,\n" + - "utl_raw.cast_to_raw(COMPANY_NAME) AS COMPANY_NAME,\n" + - "utl_raw.cast_to_raw(PRODUCT_TYPE) AS PRODUCT_TYPE,\n" + - "utl_raw.cast_to_raw(PERIOD) AS PERIOD,\n" + - "JOIN,\n" + - "OVER,\n" + - "CONTRACT_TERM,\n" + - "CONTRACT_CASH,\n" + - "EXEC_CASH,\n" + - "CANCELED_CASH,\n" + - "RECEIVERD_CASH,\n" + - "O_S_CASH,\n" + - "utl_raw.cast_to_raw(REMARK) AS REMARK,\n" + - "FENTAN_CHECK,\n" + - "TOTAL_CASH,\n" + - "NOT_CONFIRMED,\n" + - "PRE_RECEIVED,\n" + - "NOT_RECEIVED,\n" + - "CONTRACT_DATE,\n" + - "utl_raw.cast_to_raw(OWNER_1) AS OWNER_1,\n" + - "AREA_ID_1,\n" + - "utl_raw.cast_to_raw(FIRST_OWNER) AS FIRST_OWNER,\n" + - "FIRST_AREA_ID,\n" + - "utl_raw.cast_to_raw(CONTRACT_ID) AS CONTRACT_ID,\n" + - "utl_raw.cast_to_raw(IS_RENEW_UPGRADE) AS IS_RENEW_UPGRADE,\n" + - "CATEGORY_ID_1,\n" + - "CATEGORY_ID_2,\n" + - "FIRST_RECEIPT_DATE,\n" + - "utl_raw.cast_to_raw(RECEIPT_REMARK) AS RECEIPT_REMARK,\n" + - "utl_raw.cast_to_raw(CONTRACT_SERIAL) AS CONTRACT_SERIAL,\n" + - "IS_MERGED\n" + - "FROM TB_002 "; + " CREATE OR REPLACE FORCE VIEW \"SC_001\".\"TV_001\" (\"ID\", \"GMT_CREATE\", \"CREATOR\", \"GMT_MODIFIED\", \"MODIFIER\", \"IS_DELETED\", \"CONTRACT_PARTY\", \"COMPANY_NAME\", \"PRODUCT_TYPE\", \"PERIOD\", \"JOIN\", \"OVER\", \"CONTRACT_TERM\", \"CONTRACT_CASH\", \"EXEC_CASH\", \"CANCELED_CASH\", \"RECEIVERD_CASH\", \"O_S_CASH\", \"REMARK\", \"FENTAN_CHECK\", \"TOTAL_CASH\", \"NOT_CONFIRMED\", \"PRE_RECEIVED\", \"NOT_RECEIVED\", \"CONTRACT_DATE\", \"OWNER_1\", \"AREA_ID_1\", \"FIRST_OWNER\", \"FIRST_AREA_ID\", \"CONTRACT_ID\", \"IS_RENEW_UPGRADE\", \"CATEGORY_ID_1\", \"CATEGORY_ID_2\", \"FIRST_RECEIPT_DATE\", \"RECEIPT_REMARK\", \"CONTRACT_SERIAL\", \"IS_MERGED\") AS \n" + + " SELECT\n" + + "ID,\n" + + "GMT_CREATE,\n" + + "utl_raw.cast_to_raw(CREATOR) AS CREATOR,\n" + + "GMT_MODIFIED,\n" + + "utl_raw.cast_to_raw(MODIFIER) AS MODIFIER,\n" + + "IS_DELETED,\n" + + "utl_raw.cast_to_raw(CONTRACT_PARTY) AS CONTRACT_PARTY,\n" + + "utl_raw.cast_to_raw(COMPANY_NAME) AS COMPANY_NAME,\n" + + "utl_raw.cast_to_raw(PRODUCT_TYPE) AS PRODUCT_TYPE,\n" + + "utl_raw.cast_to_raw(PERIOD) AS PERIOD,\n" + + "JOIN,\n" + + "OVER,\n" + + "CONTRACT_TERM,\n" + + "CONTRACT_CASH,\n" + + "EXEC_CASH,\n" + + "CANCELED_CASH,\n" + + "RECEIVERD_CASH,\n" + + "O_S_CASH,\n" + + "utl_raw.cast_to_raw(REMARK) AS REMARK,\n" + + "FENTAN_CHECK,\n" + + "TOTAL_CASH,\n" + + "NOT_CONFIRMED,\n" + + "PRE_RECEIVED,\n" + + "NOT_RECEIVED,\n" + + "CONTRACT_DATE,\n" + + "utl_raw.cast_to_raw(OWNER_1) AS OWNER_1,\n" + + "AREA_ID_1,\n" + + "utl_raw.cast_to_raw(FIRST_OWNER) AS FIRST_OWNER,\n" + + "FIRST_AREA_ID,\n" + + "utl_raw.cast_to_raw(CONTRACT_ID) AS CONTRACT_ID,\n" + + "utl_raw.cast_to_raw(IS_RENEW_UPGRADE) AS IS_RENEW_UPGRADE,\n" + + "CATEGORY_ID_1,\n" + + "CATEGORY_ID_2,\n" + + "FIRST_RECEIPT_DATE,\n" + + "utl_raw.cast_to_raw(RECEIPT_REMARK) AS RECEIPT_REMARK,\n" + + "utl_raw.cast_to_raw(CONTRACT_SERIAL) AS CONTRACT_SERIAL,\n" + + "IS_MERGED\n" + + "FROM TB_002 "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -131,7 +130,7 @@ public void test_types() throws Exception { "\t, CATEGORY_ID_1, CATEGORY_ID_2, FIRST_RECEIPT_DATE, utl_raw.cast_to_raw(RECEIPT_REMARK) AS RECEIPT_REMARK\n" + "\t, utl_raw.cast_to_raw(CONTRACT_SERIAL) AS CONTRACT_SERIAL, IS_MERGED\n" + "FROM TB_002",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest7.java index 30014a9651..46d1fa807d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest7.java @@ -27,13 +27,12 @@ import java.util.List; public class OracleCreateViewTest7 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE VIEW emp_view AS \n" + - " SELECT last_name, salary*12 annual_salary\n" + - " FROM employees \n" + - " WHERE department_id = 20;"; + " CREATE VIEW emp_view AS \n" + + " SELECT last_name, salary*12 annual_salary\n" + + " FROM employees \n" + + " WHERE department_id = 20;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -47,7 +46,7 @@ public void test_types() throws Exception { "SELECT last_name, salary * 12 AS annual_salary\n" + "FROM employees\n" + "WHERE department_id = 20;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest8.java index 2cfec5a52a..a521a68ebc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest8.java @@ -27,13 +27,12 @@ import java.util.List; public class OracleCreateViewTest8 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE VIEW emp_sal (emp_id, last_name, \n" + - " email UNIQUE RELY DISABLE NOVALIDATE,\n" + - " CONSTRAINT id_pk PRIMARY KEY (emp_id) RELY DISABLE NOVALIDATE)\n" + - " AS SELECT employee_id, last_name, email FROM employees;"; + " CREATE VIEW emp_sal (emp_id, last_name, \n" + + " email UNIQUE RELY DISABLE NOVALIDATE,\n" + + " CONSTRAINT id_pk PRIMARY KEY (emp_id) RELY DISABLE NOVALIDATE)\n" + + " AS SELECT employee_id, last_name, email FROM employees;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -51,7 +50,7 @@ public void test_types() throws Exception { "AS\n" + "SELECT employee_id, last_name, email\n" + "FROM employees;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest9_check_option.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest9_check_option.java index f2ddebf8b8..441fa538ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest9_check_option.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest9_check_option.java @@ -26,16 +26,15 @@ import java.util.List; public class OracleCreateViewTest9_check_option extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE VIEW clerk AS\n" + - " SELECT employee_id, last_name, department_id, job_id \n" + - " FROM employees\n" + - " WHERE job_id = 'PU_CLERK' \n" + - " or job_id = 'SH_CLERK' \n" + - " or job_id = 'ST_CLERK'\n" + - " WITH CHECK OPTION;"; + " CREATE VIEW clerk AS\n" + + " SELECT employee_id, last_name, department_id, job_id \n" + + " FROM employees\n" + + " WHERE job_id = 'PU_CLERK' \n" + + " or job_id = 'SH_CLERK' \n" + + " or job_id = 'ST_CLERK'\n" + + " WITH CHECK OPTION;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,7 +51,7 @@ public void test_types() throws Exception { "\tOR job_id = 'SH_CLERK'\n" + "\tOR job_id = 'ST_CLERK'\n" + "WITH CHECK OPTION;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropSynonymTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropSynonymTest_0.java index a6e389d419..e26a17d1e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropSynonymTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropSynonymTest_0.java @@ -24,10 +24,9 @@ import java.util.List; public class OracleDropSynonymTest_0 extends OracleTest { - public void test_0() throws Exception { String sql = // - "DROP PUBLIC SYNONYM customers;"; + "DROP PUBLIC SYNONYM customers;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropTypeTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropTypeTest_0.java index 5186677e50..f9e4eb0a37 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropTypeTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropTypeTest_0.java @@ -24,10 +24,9 @@ import java.util.List; public class OracleDropTypeTest_0 extends OracleTest { - public void test_0() throws Exception { String sql = // - "DROP type dmcfck;"; + "DROP type dmcfck;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OraclePipeRowStatementTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OraclePipeRowStatementTest.java index 10bb8d401b..71e3c69b6c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OraclePipeRowStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OraclePipeRowStatementTest.java @@ -25,10 +25,9 @@ import java.util.List; public class OraclePipeRowStatementTest extends OracleTest { - public void test_types() throws Exception { String sql = // - "PIPE ROW(substr(p_string, v_start));"; + "PIPE ROW(substr(p_string, v_start));"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -38,7 +37,7 @@ public void test_types() throws Exception { assertEquals(1, statementList.size()); assertEquals("PIPE ROW(substr(p_string, v_start));",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest1.java index 520b369304..44b545e2a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest1.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateTableTest1 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE TABLE wl_track_task ( id NUMBER NOT NULL, gmt_modified DATE NOT NULL, gmt_create DATE NOT NULL, task_status VARCHAR2(8) NOT NULL, task_error_msg VARCHAR2(512), task_update_count NUMBER, logistics_no VARCHAR2(32) NOT NULL, logistics_type NUMBER NOT NULL ) tablespace escrow_data"; + "CREATE TABLE wl_track_task ( id NUMBER NOT NULL, gmt_modified DATE NOT NULL, gmt_create DATE NOT NULL, task_status VARCHAR2(8) NOT NULL, task_error_msg VARCHAR2(512), task_update_count NUMBER, logistics_no VARCHAR2(32) NOT NULL, logistics_type NUMBER NOT NULL ) tablespace escrow_data"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest10.java index 3aff037919..bb79db23dc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest10.java @@ -25,12 +25,11 @@ import java.util.List; public class OracleCreateTableTest10 extends OracleTest { - public void test_0() throws Exception { String sql = // - "create global temporary table sys.ora_temp_1_ds_16247 on commit preserve rows cache noparallel " + // - "as " + // - "select /*+ no_parallel(t) no_parallel_index(t) dbms_stats cursor_sharing_exact use_weak_name_resl dynamic_sampling(0) no_monitoring */\"OBJ#\",\"INTCOL#\",\"SAVTIME\",\"FLAGS\",\"NULL_CNT\",\"MINIMUM\",\"MAXIMUM\",\"DISTCNT\",\"DENSITY\",\"LOWVAL\",\"HIVAL\",\"AVGCLN\",\"SAMPLE_DISTCNT\",\"SAMPLE_SIZE\",\"TIMESTAMP#\",\"SPARE1\",\"SPARE2\",\"SPARE3\",\"SPARE4\",\"SPARE5\",\"SPARE6\",SYS_EXTRACT_UTC(\"SAVTIME\") SYS_DS_ALIAS_22 from \"SYS\".\"WRI$_OPTSTAT_HISTHEAD_HISTORY\" sample ( 5.8764601401) t where 1 = 2"; + "create global temporary table sys.ora_temp_1_ds_16247 on commit preserve rows cache noparallel " + // + "as " + // + "select /*+ no_parallel(t) no_parallel_index(t) dbms_stats cursor_sharing_exact use_weak_name_resl dynamic_sampling(0) no_monitoring */\"OBJ#\",\"INTCOL#\",\"SAVTIME\",\"FLAGS\",\"NULL_CNT\",\"MINIMUM\",\"MAXIMUM\",\"DISTCNT\",\"DENSITY\",\"LOWVAL\",\"HIVAL\",\"AVGCLN\",\"SAMPLE_DISTCNT\",\"SAMPLE_SIZE\",\"TIMESTAMP#\",\"SPARE1\",\"SPARE2\",\"SPARE3\",\"SPARE4\",\"SPARE5\",\"SPARE6\",SYS_EXTRACT_UTC(\"SAVTIME\") SYS_DS_ALIAS_22 from \"SYS\".\"WRI$_OPTSTAT_HISTHEAD_HISTORY\" sample ( 5.8764601401) t where 1 = 2"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest11.java index ff472a7d9f..8a8a18cbe9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest11.java @@ -25,43 +25,42 @@ import java.util.List; public class OracleCreateTableTest11 extends OracleTest { - public void test_0() throws Exception { String sql = // - "create table zfj_en_click(" + // - "P_M CHAR(6), KEYWORD VARCHAR2(256), " + // - "REGION_NAME VARCHAR2(100), " + // - "COUNTRY_ACCORD_NAME VARCHAR2(256), " + // - "P_NAME VARCHAR2(256), " + // - "P_VALUE VARCHAR2(256), " + // - "CLICK_CNT NUMBER" + // - ") " + // - "partition by range (p_m) " + // - "(" + // - "partition part_201108 values less than('201109')," + // - "partition part_201109 values less than('201110')," + // - "partition part_201110 values less than('201111'), " + // - "partition part_201111 values less than('201112'), " + // - "partition part_201112 values less than('201201'), " + // - "partition part_201201 values less than('201202'), " + // - "partition part_201202 values less than('201203'), " + // - "partition part_201203 values less than('201204'), " + // - "partition part_201204 values less than('201205'), " + // - "partition part_201205 values less than('201206'), " + // - "partition part_201206 values less than('201207'), " + // - "partition part_201207 values less than('201208'), " + // - "partition part_201208 values less than('201209'), " + // - "partition part_201209 values less than('201210'), " + // - "partition part_201210 values less than('201211'), " + // - "partition part_201211 values less than('201212'), " + // - "partition part_201212 values less than('201301'), " + // - "partition part_201301 values less than('201302'), " + // - "partition part_201302 values less than('201303'), " + // - "partition part_201303 values less than('201304'), " + // - "partition part_201304 values less than('201305'), " + // - "partition part_201305 values less than('201306'), " + // - "partition part_201306 values less than('201307') " + // - ") "; + "create table zfj_en_click(" + // + "P_M CHAR(6), KEYWORD VARCHAR2(256), " + // + "REGION_NAME VARCHAR2(100), " + // + "COUNTRY_ACCORD_NAME VARCHAR2(256), " + // + "P_NAME VARCHAR2(256), " + // + "P_VALUE VARCHAR2(256), " + // + "CLICK_CNT NUMBER" + // + ") " + // + "partition by range (p_m) " + // + "(" + // + "partition part_201108 values less than('201109')," + // + "partition part_201109 values less than('201110')," + // + "partition part_201110 values less than('201111'), " + // + "partition part_201111 values less than('201112'), " + // + "partition part_201112 values less than('201201'), " + // + "partition part_201201 values less than('201202'), " + // + "partition part_201202 values less than('201203'), " + // + "partition part_201203 values less than('201204'), " + // + "partition part_201204 values less than('201205'), " + // + "partition part_201205 values less than('201206'), " + // + "partition part_201206 values less than('201207'), " + // + "partition part_201207 values less than('201208'), " + // + "partition part_201208 values less than('201209'), " + // + "partition part_201209 values less than('201210'), " + // + "partition part_201210 values less than('201211'), " + // + "partition part_201211 values less than('201212'), " + // + "partition part_201212 values less than('201301'), " + // + "partition part_201301 values less than('201302'), " + // + "partition part_201302 values less than('201303'), " + // + "partition part_201303 values less than('201304'), " + // + "partition part_201304 values less than('201305'), " + // + "partition part_201305 values less than('201306'), " + // + "partition part_201306 values less than('201307') " + // + ") "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest12.java index 32f080b8f3..934889effa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest12.java @@ -25,25 +25,24 @@ import java.util.List; public class OracleCreateTableTest12 extends OracleTest { - public void test_0() throws Exception { String sql = // - "create table CARD_MONEYOPERATION (" + // - "ID varchar2(50 char) not null, " + // - "DDBH varchar2(50 char) not null, " + // - "IDNO varchar2(18 char), " + // - "JKKH varchar2(50 char) not null, " + // - "JYDW varchar2(50 char), " + // - "JYJE number(19,2) not null, " + // - "JYNO varchar2(50 char), " + // - "JYZT number(19,0) not null, " + // - "NAME varchar2(10 char), " + // - "OPDATE timestamp, " + // - "REMARK varchar2(50 char), " + // - "TYPE varchar2(20 char) not null, " + // - "OPID varchar2(50 char), " + // - "primary key (ID)" + // - ") "; + "create table CARD_MONEYOPERATION (" + // + "ID varchar2(50 char) not null, " + // + "DDBH varchar2(50 char) not null, " + // + "IDNO varchar2(18 char), " + // + "JKKH varchar2(50 char) not null, " + // + "JYDW varchar2(50 char), " + // + "JYJE number(19,2) not null, " + // + "JYNO varchar2(50 char), " + // + "JYZT number(19,0) not null, " + // + "NAME varchar2(10 char), " + // + "OPDATE timestamp, " + // + "REMARK varchar2(50 char), " + // + "TYPE varchar2(20 char) not null, " + // + "OPID varchar2(50 char), " + // + "primary key (ID)" + // + ") "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest13.java index 886d282dbf..b47b5f3b84 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest13.java @@ -25,18 +25,17 @@ import java.util.List; public class OracleCreateTableTest13 extends OracleTest { - public void test_0() throws Exception { String sql = // - "create table T (" + // - "F1 CHAR(1)," + // - "F2 VARCHAR2(2)," + // - "F3 NCHAR(3), " + // - "F4 NVARCHAR2(4), " + // - "F5 NUMBER (10, 2)," + // - "F6 NUMBER(10)," + // - "F7 FLOAT(126)" + // - ") "; + "create table T (" + // + "F1 CHAR(1)," + // + "F2 VARCHAR2(2)," + // + "F3 NCHAR(3), " + // + "F4 NVARCHAR2(4), " + // + "F5 NUMBER (10, 2)," + // + "F6 NUMBER(10)," + // + "F7 FLOAT(126)" + // + ") "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest14.java index 4e99b34fae..ffde95c4df 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest14.java @@ -27,23 +27,22 @@ import java.util.List; public class OracleCreateTableTest14 extends OracleTest { - public void test_charTypes() throws Exception { String sql = // - "create table T (" + // - "F1 CHAR(1)," + // - "F2 CHAR(1 BYTE)," + // - "F3 CHAR(1 CHAR)," + // - "F4 VARCHAR2(2)," + // - "F5 VARCHAR2(2 BYTE)," + // - "F6 VARCHAR2(2 CHAR)," + // - "F7 NCHAR(3 BYTE), " + // - "F8 NCHAR(3 CHAR), " + // - "F9 NCHAR(3), " + // - "F10 NVARCHAR2(4), " + // - "F11 NVARCHAR2(4 BYTE), " + // - "F12 NVARCHAR2(4 CHAR) " + // - ") "; + "create table T (" + // + "F1 CHAR(1)," + // + "F2 CHAR(1 BYTE)," + // + "F3 CHAR(1 CHAR)," + // + "F4 VARCHAR2(2)," + // + "F5 VARCHAR2(2 BYTE)," + // + "F6 VARCHAR2(2 CHAR)," + // + "F7 NCHAR(3 BYTE), " + // + "F8 NCHAR(3 CHAR), " + // + "F9 NCHAR(3), " + // + "F10 NVARCHAR2(4), " + // + "F11 NVARCHAR2(4 BYTE), " + // + "F12 NVARCHAR2(4 CHAR) " + // + ") "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -51,8 +50,8 @@ public void test_charTypes() throws Exception { print(statementList); Assert.assertEquals(1, statementList.size()); - - Assert.assertEquals( "CREATE TABLE T (" + // + + Assert.assertEquals("CREATE TABLE T (" + // "\n\tF1 CHAR(1)," + // "\n\tF2 CHAR(1 BYTE)," + // "\n\tF3 CHAR(1 CHAR)," + // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest15.java index ebe56babff..bb08ed33a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest15.java @@ -26,17 +26,16 @@ import java.util.List; public class OracleCreateTableTest15 extends OracleTest { - public void test_types() throws Exception { String sql = // - "create table T (" + // - "F1 TIMESTAMP," + // - "F2 TIMESTAMP(9), " + // - "F3 TIMESTAMP WITH TIME ZONE," + // - "F4 TIMESTAMP(9) WITH TIME ZONE, " + // - "F5 TIMESTAMP WITH TIME ZONE," + // - "F6 TIMESTAMP(9) WITH TIME ZONE" + // - ") "; + "create table T (" + // + "F1 TIMESTAMP," + // + "F2 TIMESTAMP(9), " + // + "F3 TIMESTAMP WITH TIME ZONE," + // + "F4 TIMESTAMP(9) WITH TIME ZONE, " + // + "F5 TIMESTAMP WITH TIME ZONE," + // + "F6 TIMESTAMP(9) WITH TIME ZONE" + // + ") "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -46,13 +45,13 @@ public void test_types() throws Exception { assertEquals(1, statementList.size()); assertEquals("CREATE TABLE T (" + // - "\n\tF1 TIMESTAMP," + // - "\n\tF2 TIMESTAMP(9)," + // - "\n\tF3 TIMESTAMP WITH TIME ZONE," + // - "\n\tF4 TIMESTAMP(9) WITH TIME ZONE," + // - "\n\tF5 TIMESTAMP WITH TIME ZONE," + // - "\n\tF6 TIMESTAMP(9) WITH TIME ZONE" + // - "\n)", SQLUtils.toSQLString(statement, DbType.oracle)); + "\n\tF1 TIMESTAMP," + // + "\n\tF2 TIMESTAMP(9)," + // + "\n\tF3 TIMESTAMP WITH TIME ZONE," + // + "\n\tF4 TIMESTAMP(9) WITH TIME ZONE," + // + "\n\tF5 TIMESTAMP WITH TIME ZONE," + // + "\n\tF6 TIMESTAMP(9) WITH TIME ZONE" + // + "\n)", SQLUtils.toSQLString(statement, DbType.oracle)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statement.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest16.java index 28917277db..25762c0d6b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest16.java @@ -27,17 +27,16 @@ import java.util.List; public class OracleCreateTableTest16 extends OracleTest { - public void test_types() throws Exception { String sql = // - "create table T (" + // - "F1 INTERVAL YEAR TO MONTH," + // - "F2 INTERVAL YEAR (3) TO MONTH," + // - "F3 INTERVAL DAY TO SECOND," + // - "F4 INTERVAL DAY (3) TO SECOND," + // - "F5 INTERVAL DAY TO SECOND (9)," + // - "F6 INTERVAL DAY (3) TO SECOND (9)" + // - ") "; + "create table T (" + // + "F1 INTERVAL YEAR TO MONTH," + // + "F2 INTERVAL YEAR (3) TO MONTH," + // + "F3 INTERVAL DAY TO SECOND," + // + "F4 INTERVAL DAY (3) TO SECOND," + // + "F5 INTERVAL DAY TO SECOND (9)," + // + "F6 INTERVAL DAY (3) TO SECOND (9)" + // + ") "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -47,13 +46,13 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE T (" + // - "\n\tF1 INTERVAL YEAR TO MONTH," + // - "\n\tF2 INTERVAL YEAR(3) TO MONTH," + // - "\n\tF3 INTERVAL DAY TO SECOND," + // - "\n\tF4 INTERVAL DAY(3) TO SECOND," + // - "\n\tF5 INTERVAL DAY TO SECOND(9)," + // - "\n\tF6 INTERVAL DAY(3) TO SECOND(9)" + // - "\n)", SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + "\n\tF1 INTERVAL YEAR TO MONTH," + // + "\n\tF2 INTERVAL YEAR(3) TO MONTH," + // + "\n\tF3 INTERVAL DAY TO SECOND," + // + "\n\tF4 INTERVAL DAY(3) TO SECOND," + // + "\n\tF5 INTERVAL DAY TO SECOND(9)," + // + "\n\tF6 INTERVAL DAY(3) TO SECOND(9)" + // + "\n)", SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statement.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest17.java index 281643c21b..34c0aea567 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest17.java @@ -27,25 +27,24 @@ import java.util.List; public class OracleCreateTableTest17 extends OracleTest { - public void test_types() throws Exception { String sql = // - "create table ACT_HI_PROCINST ( "// - + "ID_ NVARCHAR2(64) not null, "// - + "PROC_INST_ID_ NVARCHAR2(64) not null, "// - + "BUSINESS_KEY_ NVARCHAR2(255), "// - + "PROC_DEF_ID_ NVARCHAR2(64) not null, "// - + "START_TIME_ TIMESTAMP(6) not null, "// - + "END_TIME_ TIMESTAMP(6), "// - + "DURATION_ NUMBER(19,0), "// - + "START_USER_ID_ NVARCHAR2(255), "// - + "START_ACT_ID_ NVARCHAR2(255), "// - + "END_ACT_ID_ NVARCHAR2(255), "// - + "SUPER_PROCESS_INSTANCE_ID_ NVARCHAR2(64), "// - + "DELETE_REASON_ NVARCHAR2(2000), "// - + "primary key (ID_), "// - + "unique (PROC_INST_ID_) "// - + ")"; + "create table ACT_HI_PROCINST ( "// + + "ID_ NVARCHAR2(64) not null, "// + + "PROC_INST_ID_ NVARCHAR2(64) not null, "// + + "BUSINESS_KEY_ NVARCHAR2(255), "// + + "PROC_DEF_ID_ NVARCHAR2(64) not null, "// + + "START_TIME_ TIMESTAMP(6) not null, "// + + "END_TIME_ TIMESTAMP(6), "// + + "DURATION_ NUMBER(19,0), "// + + "START_USER_ID_ NVARCHAR2(255), "// + + "START_ACT_ID_ NVARCHAR2(255), "// + + "END_ACT_ID_ NVARCHAR2(255), "// + + "SUPER_PROCESS_INSTANCE_ID_ NVARCHAR2(64), "// + + "DELETE_REASON_ NVARCHAR2(2000), "// + + "primary key (ID_), "// + + "unique (PROC_INST_ID_) "// + + ")"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest18.java index ed39c7492f..f8feadb0ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest18.java @@ -26,22 +26,21 @@ import java.util.List; public class OracleCreateTableTest18 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SONAR\".\"AUTHORS\" " // - + " ( \"ID\" NUMBER(38,0) NOT NULL ENABLE, " // - + " \"PERSON_ID\" NUMBER(38,0) NOT NULL ENABLE, " // - + " \"LOGIN\" VARCHAR2(100 BYTE), " // - + " \"CREATED_AT\" TIMESTAMP (6), " // - + " \"UPDATED_AT\" TIMESTAMP (6), " // - + " 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\" ;"; + " CREATE TABLE \"SONAR\".\"AUTHORS\" " // + + " ( \"ID\" NUMBER(38,0) NOT NULL ENABLE, " // + + " \"PERSON_ID\" NUMBER(38,0) NOT NULL ENABLE, " // + + " \"LOGIN\" VARCHAR2(100 BYTE), " // + + " \"CREATED_AT\" TIMESTAMP (6), " // + + " \"UPDATED_AT\" TIMESTAMP (6), " // + + " 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\" ;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -72,7 +71,7 @@ public void test_types() throws Exception { "NOCOMPRESS\n" + "LOGGING\n" + "TABLESPACE \"USERS\";", // - SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statement.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest19.java index e10ccc9420..8d06225569 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest19.java @@ -26,27 +26,26 @@ import java.util.List; 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\" ;"; + " 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(); @@ -100,7 +99,7 @@ public void test_types() throws Exception { "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + ");", // - SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statement.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest2.java index f5fca7c9da..b788973dfb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest2.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateTableTest2 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE TABLE wl_ship_forecast ( id NUMBER NOT NULL, gmt_modified DATE DEFAULT sysdate NOT NULL, gmt_create DATE DEFAULT sysdate NOT NULL, status NUMBER NOT NULL, gmt_forecast DATE, gmt_accept DATE, gmt_accept_notify DATE ) tablespace escrow_data"; + "CREATE TABLE wl_ship_forecast ( id NUMBER NOT NULL, gmt_modified DATE DEFAULT sysdate NOT NULL, gmt_create DATE DEFAULT sysdate NOT NULL, status NUMBER NOT NULL, gmt_forecast DATE, gmt_accept DATE, gmt_accept_notify DATE ) tablespace escrow_data"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest20.java index 4ad1b41609..52c48a651c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest20.java @@ -26,26 +26,25 @@ import java.util.List; 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 ) ;"; + " 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(); @@ -86,7 +85,7 @@ public void test_types() throws Exception { "\tNOCACHE\n" + "\tKEEP_DUPLICATES\n" + ");",// - SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statement.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest21.java index 763b6b0535..b9dc3664b0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest21.java @@ -27,14 +27,13 @@ import java.util.List; public class OracleCreateTableTest21 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE divisions " // - + " (div_no NUMBER(2), " // - + " div_name VARCHAR2(14), "// - + " location VARCHAR2(13) ) " // - + " STORAGE ( INITIAL 8M MAXSIZE 1G );"; + "CREATE TABLE divisions " // + + " (div_no NUMBER(2), " // + + " div_name VARCHAR2(14), "// + + " location VARCHAR2(13) ) " // + + " STORAGE ( INITIAL 8M MAXSIZE 1G );"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,7 +51,7 @@ public void test_types() throws Exception { "\tINITIAL 8M\n" + "\tMAXSIZE 1G\n" + ");",// - SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statement.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest22.java index 594d63a5a6..19d9109a04 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest22.java @@ -27,20 +27,19 @@ import java.util.List; public class OracleCreateTableTest22 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE promotions_var2" // - + " ( promo_id NUMBER(6)"// - + " , promo_name VARCHAR2(20)"// - + " , promo_category VARCHAR2(15)"// - + " , promo_cost NUMBER(10,2)"// - + " , promo_begin_date DATE"// - + " , promo_end_date DATE"// - + " , CONSTRAINT promo_id_u UNIQUE (promo_id)"// - + " USING INDEX PCTFREE 20"// - + " TABLESPACE stocks"// - + " STORAGE (INITIAL 8M) );"; + "CREATE TABLE promotions_var2" // + + " ( promo_id NUMBER(6)"// + + " , promo_name VARCHAR2(20)"// + + " , promo_category VARCHAR2(15)"// + + " , promo_cost NUMBER(10,2)"// + + " , promo_begin_date DATE"// + + " , promo_end_date DATE"// + + " , CONSTRAINT promo_id_u UNIQUE (promo_id)"// + + " USING INDEX PCTFREE 20"// + + " TABLESPACE stocks"// + + " STORAGE (INITIAL 8M) );"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -64,7 +63,7 @@ public void test_types() throws Exception { "\t\t\tINITIAL 8M\n" + "\t\t)\n" + ");",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest23.java index a276ea4942..98a5b41dc1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest23.java @@ -27,18 +27,17 @@ import java.util.List; public class OracleCreateTableTest23 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE promotions_var1" // - + " ( promo_id NUMBER(6)" // - + " CONSTRAINT promo_id_u UNIQUE" // - + " , promo_name VARCHAR2(20)" // - + " , promo_category VARCHAR2(15)" // - + " , promo_cost NUMBER(10,2)" // - + " , promo_begin_date DATE" // - + " , promo_end_date DATE" // - + " ) ;"; + "CREATE TABLE promotions_var1" // + + " ( promo_id NUMBER(6)" // + + " CONSTRAINT promo_id_u UNIQUE" // + + " , promo_name VARCHAR2(20)" // + + " , promo_category VARCHAR2(15)" // + + " , promo_cost NUMBER(10,2)" // + + " , promo_begin_date DATE" // + + " , promo_end_date DATE" // + + " ) ;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -48,15 +47,15 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE promotions_var1 (" // - + "\n\tpromo_id NUMBER(6)" // - + "\n\t\tCONSTRAINT promo_id_u UNIQUE," // - + "\n\tpromo_name VARCHAR2(20)," // - + "\n\tpromo_category VARCHAR2(15)," // - + "\n\tpromo_cost NUMBER(10, 2)," // - + "\n\tpromo_begin_date DATE," // - + "\n\tpromo_end_date DATE" // - + "\n);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tpromo_id NUMBER(6)" // + + "\n\t\tCONSTRAINT promo_id_u UNIQUE," // + + "\n\tpromo_name VARCHAR2(20)," // + + "\n\tpromo_category VARCHAR2(15)," // + + "\n\tpromo_cost NUMBER(10, 2)," // + + "\n\tpromo_begin_date DATE," // + + "\n\tpromo_end_date DATE" // + + "\n);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest24.java index a5eb65ad2c..2aa33c6575 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest24.java @@ -27,17 +27,16 @@ import java.util.List; public class OracleCreateTableTest24 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE locations_demo" // - + " ( location_id NUMBER(4) CONSTRAINT loc_id_pk PRIMARY KEY" // - + " , street_address VARCHAR2(40)" // - + " , postal_code VARCHAR2(12)" // - + " , city VARCHAR2(30)" // - + " , state_province VARCHAR2(25)" // - + " , country_id CHAR(2)" // - + " ) ;"; + "CREATE TABLE locations_demo" // + + " ( location_id NUMBER(4) CONSTRAINT loc_id_pk PRIMARY KEY" // + + " , street_address VARCHAR2(40)" // + + " , postal_code VARCHAR2(12)" // + + " , city VARCHAR2(30)" // + + " , state_province VARCHAR2(25)" // + + " , country_id CHAR(2)" // + + " ) ;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -47,15 +46,15 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE locations_demo (" // - + "\n\tlocation_id NUMBER(4)"// - + "\n\t\tCONSTRAINT loc_id_pk PRIMARY KEY," // - + "\n\tstreet_address VARCHAR2(40)," // - + "\n\tpostal_code VARCHAR2(12)," // - + "\n\tcity VARCHAR2(30)," // - + "\n\tstate_province VARCHAR2(25)," // - + "\n\tcountry_id CHAR(2)" // - + "\n);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tlocation_id NUMBER(4)"// + + "\n\t\tCONSTRAINT loc_id_pk PRIMARY KEY," // + + "\n\tstreet_address VARCHAR2(40)," // + + "\n\tpostal_code VARCHAR2(12)," // + + "\n\tcity VARCHAR2(30)," // + + "\n\tstate_province VARCHAR2(25)," // + + "\n\tcountry_id CHAR(2)" // + + "\n);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest25.java index 3cb535fce2..c0761c6fe7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest25.java @@ -27,17 +27,16 @@ import java.util.List; public class OracleCreateTableTest25 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE locations_demo" // - + " ( location_id NUMBER(4) "// - + " , street_address VARCHAR2(40)"// - + " , postal_code VARCHAR2(12)"// - + " , city VARCHAR2(30)"// - + " , state_province VARCHAR2(25)"// - + " , country_id CHAR(2)"// - + " , CONSTRAINT loc_id_pk PRIMARY KEY (location_id));"; + "CREATE TABLE locations_demo" // + + " ( location_id NUMBER(4) "// + + " , street_address VARCHAR2(40)"// + + " , postal_code VARCHAR2(12)"// + + " , city VARCHAR2(30)"// + + " , state_province VARCHAR2(25)"// + + " , country_id CHAR(2)"// + + " , CONSTRAINT loc_id_pk PRIMARY KEY (location_id));"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -47,15 +46,15 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE locations_demo (" // - + "\n\tlocation_id NUMBER(4)," // - + "\n\tstreet_address VARCHAR2(40)," // - + "\n\tpostal_code VARCHAR2(12)," // - + "\n\tcity VARCHAR2(30)," // - + "\n\tstate_province VARCHAR2(25)," // - + "\n\tcountry_id CHAR(2)," - + "\n\tCONSTRAINT loc_id_pk PRIMARY KEY (location_id)" // - + "\n);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tlocation_id NUMBER(4)," // + + "\n\tstreet_address VARCHAR2(40)," // + + "\n\tpostal_code VARCHAR2(12)," // + + "\n\tcity VARCHAR2(30)," // + + "\n\tstate_province VARCHAR2(25)," // + + "\n\tcountry_id CHAR(2)," + + "\n\tCONSTRAINT loc_id_pk PRIMARY KEY (location_id)" // + + "\n);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest26.java index 156bff6d48..2abfb5b591 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest26.java @@ -26,19 +26,18 @@ import java.util.List; public class OracleCreateTableTest26 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE dept_20 " // - + " (employee_id NUMBER(4), "// - + " last_name VARCHAR2(10), "// - + " job_id VARCHAR2(9), "// - + " manager_id NUMBER(4), "// - + " hire_date DATE, "// - + " salary NUMBER(7,2), "// - + " commission_pct NUMBER(7,2), "// - + " department_id CONSTRAINT fk_deptno "// - + " REFERENCES departments(department_id) ); "; + "CREATE TABLE dept_20 " // + + " (employee_id NUMBER(4), "// + + " last_name VARCHAR2(10), "// + + " job_id VARCHAR2(9), "// + + " manager_id NUMBER(4), "// + + " hire_date DATE, "// + + " salary NUMBER(7,2), "// + + " commission_pct NUMBER(7,2), "// + + " department_id CONSTRAINT fk_deptno "// + + " REFERENCES departments(department_id) ); "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -48,17 +47,17 @@ public void test_types() throws Exception { assertEquals(1, statementList.size()); assertEquals("CREATE TABLE dept_20 (" // - + "\n\temployee_id NUMBER(4),"// - + "\n\tlast_name VARCHAR2(10),"// - + "\n\tjob_id VARCHAR2(9),"// - + "\n\tmanager_id NUMBER(4),"// - + "\n\thire_date DATE,"// - + "\n\tsalary NUMBER(7, 2),"// - + "\n\tcommission_pct NUMBER(7, 2),"// - + "\n\tdepartment_id"// - + "\n\t\tCONSTRAINT fk_deptno REFERENCES departments (department_id)"// - + "\n);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\temployee_id NUMBER(4),"// + + "\n\tlast_name VARCHAR2(10),"// + + "\n\tjob_id VARCHAR2(9),"// + + "\n\tmanager_id NUMBER(4),"// + + "\n\thire_date DATE,"// + + "\n\tsalary NUMBER(7, 2),"// + + "\n\tcommission_pct NUMBER(7, 2),"// + + "\n\tdepartment_id"// + + "\n\t\tCONSTRAINT fk_deptno REFERENCES departments (department_id)"// + + "\n);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest27.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest27.java index 9bdf03f50c..1c7b069747 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest27.java @@ -27,21 +27,20 @@ import java.util.List; public class OracleCreateTableTest27 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE dept_20 " // - + " (employee_id NUMBER(4), " // - + " last_name VARCHAR2(10), " // - + " job_id VARCHAR2(9), " // - + " manager_id NUMBER(4), " // - + " hire_date DATE, " // - + " salary NUMBER(7,2), " // - + " commission_pct NUMBER(7,2), " // - + " department_id, " // - + " CONSTRAINT fk_deptno " // - + " FOREIGN KEY (department_id) " // - + " REFERENCES departments(department_id) ); "; + "CREATE TABLE dept_20 " // + + " (employee_id NUMBER(4), " // + + " last_name VARCHAR2(10), " // + + " job_id VARCHAR2(9), " // + + " manager_id NUMBER(4), " // + + " hire_date DATE, " // + + " salary NUMBER(7,2), " // + + " commission_pct NUMBER(7,2), " // + + " department_id, " // + + " CONSTRAINT fk_deptno " // + + " FOREIGN KEY (department_id) " // + + " REFERENCES departments(department_id) ); "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -62,7 +61,7 @@ public void test_types() throws Exception { "\tCONSTRAINT fk_deptno FOREIGN KEY (department_id)\n" + "\t\tREFERENCES departments (department_id)\n" + ");",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest28.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest28.java index 088717f11d..dd06e5920e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest28.java @@ -27,20 +27,19 @@ import java.util.List; public class OracleCreateTableTest28 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE divisions " // - + " (div_no NUMBER CONSTRAINT check_divno" // - + " CHECK (div_no BETWEEN 10 AND 99) " // - + " DISABLE, " // - + " div_name VARCHAR2(9) CONSTRAINT check_divname" // - + " CHECK (div_name = UPPER(div_name)) " // - + " DISABLE, " // - + " office VARCHAR2(10) CONSTRAINT check_office" // - + " CHECK (office IN ('DALLAS','BOSTON'," // - + " 'PARIS','TOKYO')) " // - + " DISABLE); "; + "CREATE TABLE divisions " // + + " (div_no NUMBER CONSTRAINT check_divno" // + + " CHECK (div_no BETWEEN 10 AND 99) " // + + " DISABLE, " // + + " div_name VARCHAR2(9) CONSTRAINT check_divname" // + + " CHECK (div_name = UPPER(div_name)) " // + + " DISABLE, " // + + " office VARCHAR2(10) CONSTRAINT check_office" // + + " CHECK (office IN ('DALLAS','BOSTON'," // + + " 'PARIS','TOKYO')) " // + + " DISABLE); "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -50,14 +49,14 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE divisions (" // - + "\n\tdiv_no NUMBER" // - + "\n\t\tCONSTRAINT check_divno CHECK (div_no BETWEEN 10 AND 99) DISABLE," // - + "\n\tdiv_name VARCHAR2(9)" // - + "\n\t\tCONSTRAINT check_divname CHECK (div_name = UPPER(div_name)) DISABLE," // - + "\n\toffice VARCHAR2(10)" // - + "\n\t\tCONSTRAINT check_office CHECK (office IN ('DALLAS', 'BOSTON', 'PARIS', 'TOKYO')) DISABLE" // - + "\n);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tdiv_no NUMBER" // + + "\n\t\tCONSTRAINT check_divno CHECK (div_no BETWEEN 10 AND 99) DISABLE," // + + "\n\tdiv_name VARCHAR2(9)" // + + "\n\t\tCONSTRAINT check_divname CHECK (div_name = UPPER(div_name)) DISABLE," // + + "\n\toffice VARCHAR2(10)" // + + "\n\t\tCONSTRAINT check_office CHECK (office IN ('DALLAS', 'BOSTON', 'PARIS', 'TOKYO')) DISABLE" // + + "\n);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest29.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest29.java index 584b2dce04..4ac0fc4163 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest29.java @@ -27,18 +27,17 @@ import java.util.List; public class OracleCreateTableTest29 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE dept_20" // - + " (employee_id NUMBER(4) PRIMARY KEY, "// - + " last_name VARCHAR2(10), "// - + " job_id VARCHAR2(9), "// - + " manager_id NUMBER(4), "// - + " salary NUMBER(7,2), "// - + " commission_pct NUMBER(7,2), "// - + " department_id NUMBER(2),"// - + " CONSTRAINT check_sal CHECK (salary * commission_pct <= 5000));"; + "CREATE TABLE dept_20" // + + " (employee_id NUMBER(4) PRIMARY KEY, "// + + " last_name VARCHAR2(10), "// + + " job_id VARCHAR2(9), "// + + " manager_id NUMBER(4), "// + + " salary NUMBER(7,2), "// + + " commission_pct NUMBER(7,2), "// + + " department_id NUMBER(2),"// + + " CONSTRAINT check_sal CHECK (salary * commission_pct <= 5000));"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -48,16 +47,16 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE dept_20 (" // - + "\n\temployee_id NUMBER(4) PRIMARY KEY," // - + "\n\tlast_name VARCHAR2(10)," // - + "\n\tjob_id VARCHAR2(9)," // - + "\n\tmanager_id NUMBER(4)," // - + "\n\tsalary NUMBER(7, 2)," // - + "\n\tcommission_pct NUMBER(7, 2)," // - + "\n\tdepartment_id NUMBER(2)," // - + "\n\tCONSTRAINT check_sal CHECK (salary * commission_pct <= 5000)" // - + "\n);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\temployee_id NUMBER(4) PRIMARY KEY," // + + "\n\tlast_name VARCHAR2(10)," // + + "\n\tjob_id VARCHAR2(9)," // + + "\n\tmanager_id NUMBER(4)," // + + "\n\tsalary NUMBER(7, 2)," // + + "\n\tcommission_pct NUMBER(7, 2)," // + + "\n\tdepartment_id NUMBER(2)," // + + "\n\tCONSTRAINT check_sal CHECK (salary * commission_pct <= 5000)" // + + "\n);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest3.java index ea72dd12e5..23c00483a1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest3.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateTableTest3 extends OracleTest { - public void test_0() throws Exception { String sql = // - "ALTER TABLE wl_ship_order modify ( forwarder_service NOT NULL , status NOT NULL )"; + "ALTER TABLE wl_ship_order modify ( forwarder_service NOT NULL , status NOT NULL )"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest30.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest30.java index 12726a0fad..7f68af3479 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest30.java @@ -27,22 +27,21 @@ import java.util.List; public class OracleCreateTableTest30 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE order_detail " // - + " (CONSTRAINT pk_od PRIMARY KEY (order_id, part_no), " // - + " order_id NUMBER " // - + " CONSTRAINT fk_oid " // - + " REFERENCES oe.orders(order_id), " // - + " part_no NUMBER " // - + " CONSTRAINT fk_pno " // - + " REFERENCES oe.product_information(product_id), " // - + " quantity NUMBER " // - + " CONSTRAINT nn_qty NOT NULL " // - + " CONSTRAINT check_qty CHECK (quantity > 0), " // - + " cost NUMBER " // - + " CONSTRAINT check_cost CHECK (cost > 0) ); "; + "CREATE TABLE order_detail " // + + " (CONSTRAINT pk_od PRIMARY KEY (order_id, part_no), " // + + " order_id NUMBER " // + + " CONSTRAINT fk_oid " // + + " REFERENCES oe.orders(order_id), " // + + " part_no NUMBER " // + + " CONSTRAINT fk_pno " // + + " REFERENCES oe.product_information(product_id), " // + + " quantity NUMBER " // + + " CONSTRAINT nn_qty NOT NULL " // + + " CONSTRAINT check_qty CHECK (quantity > 0), " // + + " cost NUMBER " // + + " CONSTRAINT check_cost CHECK (cost > 0) ); "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,18 +51,18 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE order_detail (" // - + "\n\tCONSTRAINT pk_od PRIMARY KEY (order_id, part_no)," // - + "\n\torder_id NUMBER" // - + "\n\t\tCONSTRAINT fk_oid REFERENCES oe.orders (order_id)," // - + "\n\tpart_no NUMBER" // - + "\n\t\tCONSTRAINT fk_pno REFERENCES oe.product_information (product_id)," // - + "\n\tquantity NUMBER" // - + "\n\t\tCONSTRAINT nn_qty NOT NULL" // - + "\n\t\tCONSTRAINT check_qty CHECK (quantity > 0)," // - + "\n\tcost NUMBER" // - + "\n\t\tCONSTRAINT check_cost CHECK (cost > 0)" // - + "\n);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tCONSTRAINT pk_od PRIMARY KEY (order_id, part_no)," // + + "\n\torder_id NUMBER" // + + "\n\t\tCONSTRAINT fk_oid REFERENCES oe.orders (order_id)," // + + "\n\tpart_no NUMBER" // + + "\n\t\tCONSTRAINT fk_pno REFERENCES oe.product_information (product_id)," // + + "\n\tquantity NUMBER" // + + "\n\t\tCONSTRAINT nn_qty NOT NULL" // + + "\n\t\tCONSTRAINT check_qty CHECK (quantity > 0)," // + + "\n\tcost NUMBER" // + + "\n\t\tCONSTRAINT check_cost CHECK (cost > 0)" // + + "\n);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest31.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest31.java index 10ce95c9f8..1470f90dbe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest31.java @@ -27,12 +27,11 @@ import java.util.List; public class OracleCreateTableTest31 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE students (name person_name, age INTEGER," // - + " CHECK (name.first_name IS NOT NULL AND " // - + " name.last_name IS NOT NULL));"; + "CREATE TABLE students (name person_name, age INTEGER," // + + " CHECK (name.first_name IS NOT NULL AND " // + + " name.last_name IS NOT NULL));"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -42,12 +41,12 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE students (" - + "\n\tname person_name," - + "\n\tage INTEGER," - + "\n\tCHECK (name.first_name IS NOT NULL" - + "\n\t\tAND name.last_name IS NOT NULL)" - + "\n);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tname person_name," + + "\n\tage INTEGER," + + "\n\tCHECK (name.first_name IS NOT NULL" + + "\n\t\tAND name.last_name IS NOT NULL)" + + "\n);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest32.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest32.java index 567a9d3794..3a5336a7d8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest32.java @@ -27,10 +27,9 @@ import java.util.List; public class OracleCreateTableTest32 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE games (scores NUMBER CHECK (scores >= 0));"; + "CREATE TABLE games (scores NUMBER CHECK (scores >= 0));"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -40,10 +39,10 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE games (" // - + "\n\tscores NUMBER" // - + "\n\t\tCHECK (scores >= 0)" // - + "\n);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tscores NUMBER" // + + "\n\t\tCHECK (scores >= 0)" // + + "\n);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest33.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest33.java index 565d86e46c..90cecb9fd4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest33.java @@ -27,12 +27,11 @@ import java.util.List; public class OracleCreateTableTest33 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE games" // - + " (scores NUMBER, CONSTRAINT unq_num UNIQUE (scores)" // - + " INITIALLY DEFERRED DEFERRABLE);"; + "CREATE TABLE games" // + + " (scores NUMBER, CONSTRAINT unq_num UNIQUE (scores)" // + + " INITIALLY DEFERRED DEFERRABLE);"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -42,10 +41,10 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE games (" // - + "\n\tscores NUMBER," // - + "\n\tCONSTRAINT unq_num UNIQUE (scores) INITIALLY DEFERRED DEFERRABLE" // - + "\n);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tscores NUMBER," // + + "\n\tCONSTRAINT unq_num UNIQUE (scores) INITIALLY DEFERRED DEFERRABLE" // + + "\n);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest34.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest34.java index 4942c4ce45..a41f879e13 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest34.java @@ -27,10 +27,9 @@ import java.util.List; public class OracleCreateTableTest34 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE long_tab (pic_id NUMBER, long_pics LONG RAW);"; + "CREATE TABLE long_tab (pic_id NUMBER, long_pics LONG RAW);"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -40,10 +39,10 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE long_tab ("// - + "\n\tpic_id NUMBER,"// - + "\n\tlong_pics LONG RAW"// - + "\n);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tpic_id NUMBER,"// + + "\n\tlong_pics LONG RAW"// + + "\n);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest35.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest35.java index 38e939acc2..f6fc4f9ec0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest35.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest35.java @@ -27,10 +27,9 @@ import java.util.List; public class OracleCreateTableTest35 extends OracleTest { - public void test_types() throws Exception { String sql = // - "create table sto_scandata_bak_2013_05_08_023000 AS (select * from sto_scandata t where t.delflag=1 )"; + "create table sto_scandata_bak_2013_05_08_023000 AS (select * from sto_scandata t where t.delflag=1 )"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -40,11 +39,11 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE sto_scandata_bak_2013_05_08_023000" // - + "\nAS"// - + "\nSELECT *"// - + "\nFROM sto_scandata t"// - + "\nWHERE t.delflag = 1",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\nAS"// + + "\nSELECT *"// + + "\nFROM sto_scandata t"// + + "\nWHERE t.delflag = 1",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest36.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest36.java index e2b239f358..d5faf12cb2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest36.java @@ -27,40 +27,39 @@ import java.util.List; public class OracleCreateTableTest36 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE composite_sales" - + " ( prod_id NUMBER(6)" - + " , cust_id NUMBER" - + " , time_id DATE" - + " , channel_id CHAR(1)" - + " , promo_id NUMBER(6)" - + " , quantity_sold NUMBER(3)" - + " , amount_sold NUMBER(10,2)" - + " ) " - + "PARTITION BY RANGE (time_id)" - + "SUBPARTITION BY HASH (channel_id)" - + " (PARTITION SALES_Q1_1998 VALUES LESS THAN (TO_DATE('01-APR-1998','DD-MON-YYYY'))," - + " PARTITION SALES_Q2_1998 VALUES LESS THAN (TO_DATE('01-JUL-1998','DD-MON-YYYY'))," - + " PARTITION SALES_Q3_1998 VALUES LESS THAN (TO_DATE('01-OCT-1998','DD-MON-YYYY'))," - + " PARTITION SALES_Q4_1998 VALUES LESS THAN (TO_DATE('01-JAN-1999','DD-MON-YYYY'))," - + " PARTITION SALES_Q1_1999 VALUES LESS THAN (TO_DATE('01-APR-1999','DD-MON-YYYY'))," - + " PARTITION SALES_Q2_1999 VALUES LESS THAN (TO_DATE('01-JUL-1999','DD-MON-YYYY'))," - + " PARTITION SALES_Q3_1999 VALUES LESS THAN (TO_DATE('01-OCT-1999','DD-MON-YYYY'))," - + " PARTITION SALES_Q4_1999 VALUES LESS THAN (TO_DATE('01-JAN-2000','DD-MON-YYYY'))," - + " PARTITION SALES_Q1_2000 VALUES LESS THAN (TO_DATE('01-APR-2000','DD-MON-YYYY'))," - + " PARTITION SALES_Q2_2000 VALUES LESS THAN (TO_DATE('01-JUL-2000','DD-MON-YYYY'))" - + " SUBPARTITIONS 8," - + " PARTITION SALES_Q3_2000 VALUES LESS THAN (TO_DATE('01-OCT-2000','DD-MON-YYYY'))" - + " (SUBPARTITION ch_c," - + " SUBPARTITION ch_i," - + " SUBPARTITION ch_p," - + " SUBPARTITION ch_s," - + " SUBPARTITION ch_t)," - + " PARTITION SALES_Q4_2000 VALUES LESS THAN (MAXVALUE)" - + " SUBPARTITIONS 4)" - + ";"; + "CREATE TABLE composite_sales" + + " ( prod_id NUMBER(6)" + + " , cust_id NUMBER" + + " , time_id DATE" + + " , channel_id CHAR(1)" + + " , promo_id NUMBER(6)" + + " , quantity_sold NUMBER(3)" + + " , amount_sold NUMBER(10,2)" + + " ) " + + "PARTITION BY RANGE (time_id)" + + "SUBPARTITION BY HASH (channel_id)" + + " (PARTITION SALES_Q1_1998 VALUES LESS THAN (TO_DATE('01-APR-1998','DD-MON-YYYY'))," + + " PARTITION SALES_Q2_1998 VALUES LESS THAN (TO_DATE('01-JUL-1998','DD-MON-YYYY'))," + + " PARTITION SALES_Q3_1998 VALUES LESS THAN (TO_DATE('01-OCT-1998','DD-MON-YYYY'))," + + " PARTITION SALES_Q4_1998 VALUES LESS THAN (TO_DATE('01-JAN-1999','DD-MON-YYYY'))," + + " PARTITION SALES_Q1_1999 VALUES LESS THAN (TO_DATE('01-APR-1999','DD-MON-YYYY'))," + + " PARTITION SALES_Q2_1999 VALUES LESS THAN (TO_DATE('01-JUL-1999','DD-MON-YYYY'))," + + " PARTITION SALES_Q3_1999 VALUES LESS THAN (TO_DATE('01-OCT-1999','DD-MON-YYYY'))," + + " PARTITION SALES_Q4_1999 VALUES LESS THAN (TO_DATE('01-JAN-2000','DD-MON-YYYY'))," + + " PARTITION SALES_Q1_2000 VALUES LESS THAN (TO_DATE('01-APR-2000','DD-MON-YYYY'))," + + " PARTITION SALES_Q2_2000 VALUES LESS THAN (TO_DATE('01-JUL-2000','DD-MON-YYYY'))" + + " SUBPARTITIONS 8," + + " PARTITION SALES_Q3_2000 VALUES LESS THAN (TO_DATE('01-OCT-2000','DD-MON-YYYY'))" + + " (SUBPARTITION ch_c," + + " SUBPARTITION ch_i," + + " SUBPARTITION ch_p," + + " SUBPARTITION ch_s," + + " SUBPARTITION ch_t)," + + " PARTITION SALES_Q4_2000 VALUES LESS THAN (MAXVALUE)" + + " SUBPARTITIONS 4)" + + ";"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -70,38 +69,38 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE composite_sales (" - + "\n\tprod_id NUMBER(6)," - + "\n\tcust_id NUMBER," - + "\n\ttime_id DATE," - + "\n\tchannel_id CHAR(1)," - + "\n\tpromo_id NUMBER(6)," - + "\n\tquantity_sold NUMBER(3)," - + "\n\tamount_sold NUMBER(10, 2)" - + "\n)" - + "\nPARTITION BY RANGE (time_id)" - + "\nSUBPARTITION BY HASH (channel_id) (" - + "\n\tPARTITION SALES_Q1_1998 VALUES LESS THAN (TO_DATE('01-APR-1998', 'DD-MON-YYYY'))," - + "\n\tPARTITION SALES_Q2_1998 VALUES LESS THAN (TO_DATE('01-JUL-1998', 'DD-MON-YYYY'))," - + "\n\tPARTITION SALES_Q3_1998 VALUES LESS THAN (TO_DATE('01-OCT-1998', 'DD-MON-YYYY'))," - + "\n\tPARTITION SALES_Q4_1998 VALUES LESS THAN (TO_DATE('01-JAN-1999', 'DD-MON-YYYY'))," - + "\n\tPARTITION SALES_Q1_1999 VALUES LESS THAN (TO_DATE('01-APR-1999', 'DD-MON-YYYY'))," - + "\n\tPARTITION SALES_Q2_1999 VALUES LESS THAN (TO_DATE('01-JUL-1999', 'DD-MON-YYYY'))," - + "\n\tPARTITION SALES_Q3_1999 VALUES LESS THAN (TO_DATE('01-OCT-1999', 'DD-MON-YYYY'))," - + "\n\tPARTITION SALES_Q4_1999 VALUES LESS THAN (TO_DATE('01-JAN-2000', 'DD-MON-YYYY'))," - + "\n\tPARTITION SALES_Q1_2000 VALUES LESS THAN (TO_DATE('01-APR-2000', 'DD-MON-YYYY'))," - + "\n\tPARTITION SALES_Q2_2000 VALUES LESS THAN (TO_DATE('01-JUL-2000', 'DD-MON-YYYY'))" - + "\n\t\tSUBPARTITIONS 8," - + "\n\tPARTITION SALES_Q3_2000 VALUES LESS THAN (TO_DATE('01-OCT-2000', 'DD-MON-YYYY')) (" - + "\n\t\tSUBPARTITION ch_c," - + "\n\t\tSUBPARTITION ch_i," - + "\n\t\tSUBPARTITION ch_p," - + "\n\t\tSUBPARTITION ch_s," - + "\n\t\tSUBPARTITION ch_t" - + "\n\t)," - + "\n\tPARTITION SALES_Q4_2000 VALUES LESS THAN (MAXVALUE)" - + "\n\t\tSUBPARTITIONS 4" - + "\n);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tprod_id NUMBER(6)," + + "\n\tcust_id NUMBER," + + "\n\ttime_id DATE," + + "\n\tchannel_id CHAR(1)," + + "\n\tpromo_id NUMBER(6)," + + "\n\tquantity_sold NUMBER(3)," + + "\n\tamount_sold NUMBER(10, 2)" + + "\n)" + + "\nPARTITION BY RANGE (time_id)" + + "\nSUBPARTITION BY HASH (channel_id) (" + + "\n\tPARTITION SALES_Q1_1998 VALUES LESS THAN (TO_DATE('01-APR-1998', 'DD-MON-YYYY'))," + + "\n\tPARTITION SALES_Q2_1998 VALUES LESS THAN (TO_DATE('01-JUL-1998', 'DD-MON-YYYY'))," + + "\n\tPARTITION SALES_Q3_1998 VALUES LESS THAN (TO_DATE('01-OCT-1998', 'DD-MON-YYYY'))," + + "\n\tPARTITION SALES_Q4_1998 VALUES LESS THAN (TO_DATE('01-JAN-1999', 'DD-MON-YYYY'))," + + "\n\tPARTITION SALES_Q1_1999 VALUES LESS THAN (TO_DATE('01-APR-1999', 'DD-MON-YYYY'))," + + "\n\tPARTITION SALES_Q2_1999 VALUES LESS THAN (TO_DATE('01-JUL-1999', 'DD-MON-YYYY'))," + + "\n\tPARTITION SALES_Q3_1999 VALUES LESS THAN (TO_DATE('01-OCT-1999', 'DD-MON-YYYY'))," + + "\n\tPARTITION SALES_Q4_1999 VALUES LESS THAN (TO_DATE('01-JAN-2000', 'DD-MON-YYYY'))," + + "\n\tPARTITION SALES_Q1_2000 VALUES LESS THAN (TO_DATE('01-APR-2000', 'DD-MON-YYYY'))," + + "\n\tPARTITION SALES_Q2_2000 VALUES LESS THAN (TO_DATE('01-JUL-2000', 'DD-MON-YYYY'))" + + "\n\t\tSUBPARTITIONS 8," + + "\n\tPARTITION SALES_Q3_2000 VALUES LESS THAN (TO_DATE('01-OCT-2000', 'DD-MON-YYYY')) (" + + "\n\t\tSUBPARTITION ch_c," + + "\n\t\tSUBPARTITION ch_i," + + "\n\t\tSUBPARTITION ch_p," + + "\n\t\tSUBPARTITION ch_s," + + "\n\t\tSUBPARTITION ch_t" + + "\n\t)," + + "\n\tPARTITION SALES_Q4_2000 VALUES LESS THAN (MAXVALUE)" + + "\n\t\tSUBPARTITIONS 4" + + "\n);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest37.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest37.java index 69ea408880..e1c971556d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest37.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest37.java @@ -27,30 +27,29 @@ import java.util.List; public class OracleCreateTableTest37 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE hash_products " - + " ( product_id NUMBER(6) PRIMARY KEY" - + " , product_name VARCHAR2(50) " - + " , product_description VARCHAR2(2000) " - + " , category_id NUMBER(2) " - + " , weight_class NUMBER(1) " - + " , warranty_period INTERVAL YEAR TO MONTH " - + " , supplier_id NUMBER(6) " - + " , product_status VARCHAR2(20) " - + " , list_price NUMBER(8,2) " - + " , min_price NUMBER(8,2) " - + " , catalog_url VARCHAR2(50) " - + " , CONSTRAINT product_status_lov_demo " - + " CHECK (product_status in ('orderable' " - + " ,'planned' " - + " ,'under development' " - + " ,'obsolete') " - + ") ) " - + " PARTITION BY HASH (product_id) " - + " PARTITIONS 4 " - + " STORE IN (tbs_01, tbs_02, tbs_03, tbs_04);"; + "CREATE TABLE hash_products " + + " ( product_id NUMBER(6) PRIMARY KEY" + + " , product_name VARCHAR2(50) " + + " , product_description VARCHAR2(2000) " + + " , category_id NUMBER(2) " + + " , weight_class NUMBER(1) " + + " , warranty_period INTERVAL YEAR TO MONTH " + + " , supplier_id NUMBER(6) " + + " , product_status VARCHAR2(20) " + + " , list_price NUMBER(8,2) " + + " , min_price NUMBER(8,2) " + + " , catalog_url VARCHAR2(50) " + + " , CONSTRAINT product_status_lov_demo " + + " CHECK (product_status in ('orderable' " + + " ,'planned' " + + " ,'under development' " + + " ,'obsolete') " + + ") ) " + + " PARTITION BY HASH (product_id) " + + " PARTITIONS 4 " + + " STORE IN (tbs_01, tbs_02, tbs_03, tbs_04);"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -60,22 +59,22 @@ public void test_types() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE TABLE hash_products (" - + "\n\tproduct_id NUMBER(6) PRIMARY KEY," - + "\n\tproduct_name VARCHAR2(50)," - + "\n\tproduct_description VARCHAR2(2000)," - + "\n\tcategory_id NUMBER(2)," - + "\n\tweight_class NUMBER(1)," - + "\n\twarranty_period INTERVAL YEAR TO MONTH," - + "\n\tsupplier_id NUMBER(6)," - + "\n\tproduct_status VARCHAR2(20)," - + "\n\tlist_price NUMBER(8, 2)," - + "\n\tmin_price NUMBER(8, 2)," - + "\n\tcatalog_url VARCHAR2(50)," - + "\n\tCONSTRAINT product_status_lov_demo CHECK (product_status IN ('orderable', 'planned', 'under development', 'obsolete'))" - + "\n)" - + "\nPARTITION BY HASH (product_id) PARTITIONS 4" - + "\nSTORE IN (tbs_01, tbs_02, tbs_03, tbs_04);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\tproduct_id NUMBER(6) PRIMARY KEY," + + "\n\tproduct_name VARCHAR2(50)," + + "\n\tproduct_description VARCHAR2(2000)," + + "\n\tcategory_id NUMBER(2)," + + "\n\tweight_class NUMBER(1)," + + "\n\twarranty_period INTERVAL YEAR TO MONTH," + + "\n\tsupplier_id NUMBER(6)," + + "\n\tproduct_status VARCHAR2(20)," + + "\n\tlist_price NUMBER(8, 2)," + + "\n\tmin_price NUMBER(8, 2)," + + "\n\tcatalog_url VARCHAR2(50)," + + "\n\tCONSTRAINT product_status_lov_demo CHECK (product_status IN ('orderable', 'planned', 'under development', 'obsolete'))" + + "\n)" + + "\nPARTITION BY HASH (product_id) PARTITIONS 4" + + "\nSTORE IN (tbs_01, tbs_02, tbs_03, tbs_04);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest38.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest38.java index 01680041e1..837812a9d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest38.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest38.java @@ -27,22 +27,21 @@ import java.util.List; public class OracleCreateTableTest38 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE list_customers " - + " ( customer_id NUMBER(6)" - + " , cust_first_name VARCHAR2(20) " - + " , cust_last_name VARCHAR2(20)" - + " , cust_address CUST_ADDRESS_TYP" - + " , nls_territory VARCHAR2(30)" - + " , cust_email VARCHAR2(40))" - + " PARTITION BY LIST (nls_territory) (" - + " PARTITION asia VALUES ('CHINA', 'THAILAND')," - + " PARTITION europe VALUES ('GERMANY', 'ITALY', 'SWITZERLAND')," - + " PARTITION west VALUES ('AMERICA')," - + " PARTITION east VALUES ('INDIA')," - + " PARTITION rest VALUES (DEFAULT));"; + "CREATE TABLE list_customers " + + " ( customer_id NUMBER(6)" + + " , cust_first_name VARCHAR2(20) " + + " , cust_last_name VARCHAR2(20)" + + " , cust_address CUST_ADDRESS_TYP" + + " , nls_territory VARCHAR2(30)" + + " , cust_email VARCHAR2(40))" + + " PARTITION BY LIST (nls_territory) (" + + " PARTITION asia VALUES ('CHINA', 'THAILAND')," + + " PARTITION europe VALUES ('GERMANY', 'ITALY', 'SWITZERLAND')," + + " PARTITION west VALUES ('AMERICA')," + + " PARTITION east VALUES ('INDIA')," + + " PARTITION rest VALUES (DEFAULT));"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -66,7 +65,7 @@ public void test_types() throws Exception { "\tPARTITION east VALUES ('INDIA'), \n" + "\tPARTITION rest VALUES (DEFAULT)\n" + ");",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest39.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest39.java index c382ff0238..645c59d512 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest39.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest39.java @@ -27,17 +27,16 @@ import java.util.List; public class OracleCreateTableTest39 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE customers_demo (" - + " customer_id number(6)," - + " cust_first_name varchar2(20)," - + " cust_last_name varchar2(20)," - + " credit_limit number(9,2))" - + "PARTITION BY RANGE (credit_limit)" - + "INTERVAL (1000)" - + "(PARTITION p1 VALUES LESS THAN (5001));"; + "CREATE TABLE customers_demo (" + + " customer_id number(6)," + + " cust_first_name varchar2(20)," + + " cust_last_name varchar2(20)," + + " credit_limit number(9,2))" + + "PARTITION BY RANGE (credit_limit)" + + "INTERVAL (1000)" + + "(PARTITION p1 VALUES LESS THAN (5001));"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,7 +54,7 @@ public void test_types() throws Exception { "PARTITION BY RANGE (credit_limit) INTERVAL (1000) (\n" + "\tPARTITION p1 VALUES LESS THAN (5001)\n" + ");",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest4.java index c6e6e5e94e..b86662a2b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest4.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateTableTest4 extends OracleTest { - public void test_0() throws Exception { String sql = // - "create table tbd_qi_xiaq_100961 tablespace tbd_data as select * /*1*/from product where company_id=10239004 "; + "create table tbd_qi_xiaq_100961 tablespace tbd_data as select * /*1*/from product where company_id=10239004 "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest40.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest40.java index f1f802e602..b707c1a9ac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest40.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest40.java @@ -27,26 +27,25 @@ import java.util.List; public class OracleCreateTableTest40 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE customers_part (" - + " customer_id NUMBER(6)," - + " cust_first_name VARCHAR2(20)," - + " cust_last_name VARCHAR2(20)," - + " nls_territory VARCHAR2(30)," - + " credit_limit NUMBER(9,2)) " - + " PARTITION BY RANGE (credit_limit)" - + " SUBPARTITION BY LIST (nls_territory)" - + " SUBPARTITION TEMPLATE " - + " (SUBPARTITION east VALUES " - + " ('CHINA', 'JAPAN', 'INDIA', 'THAILAND')," - + " SUBPARTITION west VALUES " - + " ('AMERICA', 'GERMANY', 'ITALY', 'SWITZERLAND')," - + " SUBPARTITION other VALUES (DEFAULT))" - + " (PARTITION p1 VALUES LESS THAN (1000)," - + " PARTITION p2 VALUES LESS THAN (2500)," - + " PARTITION p3 VALUES LESS THAN (MAXVALUE));"; + "CREATE TABLE customers_part (" + + " customer_id NUMBER(6)," + + " cust_first_name VARCHAR2(20)," + + " cust_last_name VARCHAR2(20)," + + " nls_territory VARCHAR2(30)," + + " credit_limit NUMBER(9,2)) " + + " PARTITION BY RANGE (credit_limit)" + + " SUBPARTITION BY LIST (nls_territory)" + + " SUBPARTITION TEMPLATE " + + " (SUBPARTITION east VALUES " + + " ('CHINA', 'JAPAN', 'INDIA', 'THAILAND')," + + " SUBPARTITION west VALUES " + + " ('AMERICA', 'GERMANY', 'ITALY', 'SWITZERLAND')," + + " SUBPARTITION other VALUES (DEFAULT))" + + " (PARTITION p1 VALUES LESS THAN (1000)," + + " PARTITION p2 VALUES LESS THAN (2500)," + + " PARTITION p3 VALUES LESS THAN (MAXVALUE));"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -73,7 +72,7 @@ public void test_types() throws Exception { "\tPARTITION p2 VALUES LESS THAN (2500),\n" + "\tPARTITION p3 VALUES LESS THAN (MAXVALUE)\n" + ");",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest41.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest41.java index 43eda41730..16b157dc84 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest41.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest41.java @@ -26,40 +26,39 @@ import java.util.List; public class OracleCreateTableTest41 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " (\t\"NUM\" NUMBER(2,0), \n" + - "\t\"BLOB_COL\" BLOB, \n" + - "\t\"CLOB_COL\" CLOB, \n" + - "\t\"CH\" VARCHAR2(55), \n" + - "\t CONSTRAINT \"PK_A\" PRIMARY KEY (\"NUM\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"USERS\" ENABLE, \n" + - "\t SUPPLEMENTAL LOG GROUP \"GGS_16346\" (\"NUM\") ALWAYS, \n" + - "\t SUPPLEMENTAL LOG DATA (PRIMARY KEY) COLUMNS, \n" + - "\t SUPPLEMENTAL LOG DATA (UNIQUE INDEX) COLUMNS, \n" + - "\t SUPPLEMENTAL LOG DATA (FOREIGN KEY) COLUMNS, \n" + - "\t SUPPLEMENTAL LOG DATA (ALL) COLUMNS, \n" + - "\t SUPPLEMENTAL LOG GROUP \"ALLINS_POLNO\" (\"NUM\") ALWAYS\n" + - " ) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"USERS\" \n" + - " LOB (\"BLOB_COL\") STORE AS BASICFILE (\n" + - " TABLESPACE \"USERS\" ENABLE STORAGE IN ROW CHUNK 8192 RETENTION \n" + - " NOCACHE LOGGING \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)) \n" + - " LOB (\"CLOB_COL\") STORE AS BASICFILE (\n" + - " TABLESPACE \"USERS\" ENABLE STORAGE IN ROW CHUNK 8192 RETENTION \n" + - " NOCACHE LOGGING \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)) "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " (\t\"NUM\" NUMBER(2,0), \n" + + "\t\"BLOB_COL\" BLOB, \n" + + "\t\"CLOB_COL\" CLOB, \n" + + "\t\"CH\" VARCHAR2(55), \n" + + "\t CONSTRAINT \"PK_A\" PRIMARY KEY (\"NUM\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"USERS\" ENABLE, \n" + + "\t SUPPLEMENTAL LOG GROUP \"GGS_16346\" (\"NUM\") ALWAYS, \n" + + "\t SUPPLEMENTAL LOG DATA (PRIMARY KEY) COLUMNS, \n" + + "\t SUPPLEMENTAL LOG DATA (UNIQUE INDEX) COLUMNS, \n" + + "\t SUPPLEMENTAL LOG DATA (FOREIGN KEY) COLUMNS, \n" + + "\t SUPPLEMENTAL LOG DATA (ALL) COLUMNS, \n" + + "\t SUPPLEMENTAL LOG GROUP \"ALLINS_POLNO\" (\"NUM\") ALWAYS\n" + + " ) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"USERS\" \n" + + " LOB (\"BLOB_COL\") STORE AS BASICFILE (\n" + + " TABLESPACE \"USERS\" ENABLE STORAGE IN ROW CHUNK 8192 RETENTION \n" + + " NOCACHE LOGGING \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)) \n" + + " LOB (\"CLOB_COL\") STORE AS BASICFILE (\n" + + " TABLESPACE \"USERS\" ENABLE STORAGE IN ROW CHUNK 8192 RETENTION \n" + + " NOCACHE LOGGING \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)) "; // System.out.println(sql); @@ -141,7 +140,7 @@ public void test_types() throws Exception { "\tNOCACHE\n" + "\tRETENTION\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest42.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest42.java index af0b001098..e204cd5e50 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest42.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest42.java @@ -26,25 +26,24 @@ import java.util.List; public class OracleCreateTableTest42 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"GROUP_NAME\" VARCHAR2(8) NOT NULL ENABLE, \n" + - " \"GROUP_KEY\" NUMBER(19,0) NOT NULL ENABLE, \n" + - " \"LOG_CMPLT_CSN\" VARCHAR2(128) NOT NULL ENABLE, \n" + - " \"LOG_CMPLT_XIDS_SEQ\" NUMBER(5,0) NOT NULL ENABLE, \n" + - " \"LOG_CMPLT_XIDS\" VARCHAR2(2000) NOT NULL ENABLE, \n" + - " PRIMARY KEY (\"GROUP_NAME\", \"GROUP_KEY\", \"LOG_CMPLT_CSN\", \"LOG_CMPLT_XIDS_SEQ\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS NOCOMPRESS LOGGING\n" + - " TABLESPACE \"USERS\" ENABLE, \n" + - " SUPPLEMENTAL LOG GROUP \"GGS_15754\" (\"GROUP_NAME\", \"GROUP_KEY\", \"LOG_CMPLT_CSN\", \"LOG_CMPLT_XIDS_SEQ\") ALWAYS, \n" + - " SUPPLEMENTAL LOG DATA (PRIMARY KEY) COLUMNS, \n" + - " SUPPLEMENTAL LOG DATA (UNIQUE INDEX) COLUMNS, \n" + - " SUPPLEMENTAL LOG DATA (FOREIGN KEY) COLUMNS\n" + - " ) SEGMENT CREATION DEFERRED \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + - " TABLESPACE \"USERS\" \n"; + "CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"GROUP_NAME\" VARCHAR2(8) NOT NULL ENABLE, \n" + + " \"GROUP_KEY\" NUMBER(19,0) NOT NULL ENABLE, \n" + + " \"LOG_CMPLT_CSN\" VARCHAR2(128) NOT NULL ENABLE, \n" + + " \"LOG_CMPLT_XIDS_SEQ\" NUMBER(5,0) NOT NULL ENABLE, \n" + + " \"LOG_CMPLT_XIDS\" VARCHAR2(2000) NOT NULL ENABLE, \n" + + " PRIMARY KEY (\"GROUP_NAME\", \"GROUP_KEY\", \"LOG_CMPLT_CSN\", \"LOG_CMPLT_XIDS_SEQ\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS NOCOMPRESS LOGGING\n" + + " TABLESPACE \"USERS\" ENABLE, \n" + + " SUPPLEMENTAL LOG GROUP \"GGS_15754\" (\"GROUP_NAME\", \"GROUP_KEY\", \"LOG_CMPLT_CSN\", \"LOG_CMPLT_XIDS_SEQ\") ALWAYS, \n" + + " SUPPLEMENTAL LOG DATA (PRIMARY KEY) COLUMNS, \n" + + " SUPPLEMENTAL LOG DATA (UNIQUE INDEX) COLUMNS, \n" + + " SUPPLEMENTAL LOG DATA (FOREIGN KEY) COLUMNS\n" + + " ) SEGMENT CREATION DEFERRED \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + " TABLESPACE \"USERS\" \n"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -81,7 +80,7 @@ public void test_types() throws Exception { "NOCOMPRESS\n" + "LOGGING\n" + "TABLESPACE \"USERS\"",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest43.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest43.java index dff90bd970..df1be9853c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest43.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest43.java @@ -26,23 +26,22 @@ import java.util.List; public class OracleCreateTableTest43 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " (\t\"DNAME\" VARCHAR2(10), \n" + - "\t\"DATA\" VARCHAR2(20)\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " STORAGE(\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"USERS\" \n" + - " PARTITION BY LIST (\"DNAME\") \n" + - " (PARTITION \"PART02\" VALUES ('SMT', 'SALE') \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"USERS\" NOCOMPRESS ) \n" + - " "; + "CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " (\t\"DNAME\" VARCHAR2(10), \n" + + "\t\"DATA\" VARCHAR2(20)\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " STORAGE(\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"USERS\" \n" + + " PARTITION BY LIST (\"DNAME\") \n" + + " (PARTITION \"PART02\" VALUES ('SMT', 'SALE') \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"USERS\" NOCOMPRESS ) \n" + + " "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -86,7 +85,7 @@ public void test_types() throws Exception { "\t\t\tCELL_FLASH_CACHE DEFAULT\n" + "\t\t)\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest44.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest44.java index ade5bc7bad..af8b63cf92 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest44.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest44.java @@ -26,36 +26,35 @@ import java.util.List; public class OracleCreateTableTest44 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"PK1\" NUMBER, \n" + - " \"COL1\" CHAR(1), \n" + - " \"COL2\" NCHAR(20), \n" + - " \"COL3\" VARCHAR2(30), \n" + - " \"COL4\" NVARCHAR2(30), \n" + - " \"COL5\" NUMBER(*,0), \n" + - " \"COL6\" FLOAT(10), \n" + - " \"COL7\" DATE, \n" + - " \"COL8\" TIMESTAMP (6), \n" + - " \"COL9\" BLOB, \n" + - " \"COL10\" LONG, \n" + - " PRIMARY KEY (\"PK1\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"USERS\" ENABLE\n" + - " ) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"USERS\" \n" + - " LOB (\"COL9\") STORE AS BASICFILE (\n" + - " TABLESPACE \"USERS\" ENABLE STORAGE IN ROW CHUNK 8192 RETENTION \n" + - " NOCACHE LOGGING \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT))"; + "CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"PK1\" NUMBER, \n" + + " \"COL1\" CHAR(1), \n" + + " \"COL2\" NCHAR(20), \n" + + " \"COL3\" VARCHAR2(30), \n" + + " \"COL4\" NVARCHAR2(30), \n" + + " \"COL5\" NUMBER(*,0), \n" + + " \"COL6\" FLOAT(10), \n" + + " \"COL7\" DATE, \n" + + " \"COL8\" TIMESTAMP (6), \n" + + " \"COL9\" BLOB, \n" + + " \"COL10\" LONG, \n" + + " PRIMARY KEY (\"PK1\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"USERS\" ENABLE\n" + + " ) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"USERS\" \n" + + " LOB (\"COL9\") STORE AS BASICFILE (\n" + + " TABLESPACE \"USERS\" ENABLE STORAGE IN ROW CHUNK 8192 RETENTION \n" + + " NOCACHE LOGGING \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT))"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -136,7 +135,7 @@ public void test_types() throws Exception { "\tNOCACHE\n" + "\tRETENTION\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest45.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest45.java index fd047a7fb8..a7938e01cc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest45.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest45.java @@ -26,24 +26,23 @@ import java.util.List; public class OracleCreateTableTest45 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"ID\" NUMBER, \n" + - " \"COL_CHAR1\" CHAR(128), \n" + - " \"COL_VARCHAR1\" VARCHAR2(128), \n" + - " \"COL_DATE\" DATE, \n" + - " \"COL_TIMESTAMP\" TIMESTAMP (6), \n" + - " \"COL_CHAR2\" CHAR(128), \n" + - " \"COL_VARCHAR2\" VARCHAR2(128), \n" + - " \"COL_CHAR3\" CHAR(128), \n" + - " \"COL_NUMBER\" NUMBER\n" + - " ) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 COMPRESS FOR OLTP LOGGING\n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"USERS\" "; + "CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"ID\" NUMBER, \n" + + " \"COL_CHAR1\" CHAR(128), \n" + + " \"COL_VARCHAR1\" VARCHAR2(128), \n" + + " \"COL_DATE\" DATE, \n" + + " \"COL_TIMESTAMP\" TIMESTAMP (6), \n" + + " \"COL_CHAR2\" CHAR(128), \n" + + " \"COL_VARCHAR2\" VARCHAR2(128), \n" + + " \"COL_CHAR3\" CHAR(128), \n" + + " \"COL_NUMBER\" NUMBER\n" + + " ) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 COMPRESS FOR OLTP LOGGING\n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"USERS\" "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -82,7 +81,7 @@ public void test_types() throws Exception { "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest46.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest46.java index e1e85e5b63..73bd2cea82 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest46.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest46.java @@ -26,28 +26,27 @@ import java.util.List; public class OracleCreateTableTest46 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + - " \"GMT_CREATE\" DATE NOT NULL ENABLE, \n" + - " \"GMT_MODIFIED\" DATE NOT NULL ENABLE, \n" + - " \"SETTING_LEVEL\" VARCHAR2(8) NOT NULL ENABLE, \n" + - " \"OWNER\" NUMBER DEFAULT 0 NOT NULL ENABLE NOVALIDATE, \n" + - " \"ITEM_KEY\" VARCHAR2(64) NOT NULL ENABLE NOVALIDATE, \n" + - " \"ITEM_VALUE\" VARCHAR2(64), \n" + - " \"MODIFIER\" NUMBER NOT NULL ENABLE NOVALIDATE, \n" + - " \"MEMO\" VARCHAR2(512), \n" + - " CONSTRAINT \"AMAIL_USER_SETTING_PK\" PRIMARY KEY (\"ID\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPDATA1M\" ENABLE\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPDATA1M\" "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + + " \"GMT_CREATE\" DATE NOT NULL ENABLE, \n" + + " \"GMT_MODIFIED\" DATE NOT NULL ENABLE, \n" + + " \"SETTING_LEVEL\" VARCHAR2(8) NOT NULL ENABLE, \n" + + " \"OWNER\" NUMBER DEFAULT 0 NOT NULL ENABLE NOVALIDATE, \n" + + " \"ITEM_KEY\" VARCHAR2(64) NOT NULL ENABLE NOVALIDATE, \n" + + " \"ITEM_VALUE\" VARCHAR2(64), \n" + + " \"MODIFIER\" NUMBER NOT NULL ENABLE NOVALIDATE, \n" + + " \"MEMO\" VARCHAR2(512), \n" + + " CONSTRAINT \"AMAIL_USER_SETTING_PK\" PRIMARY KEY (\"ID\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPDATA1M\" ENABLE\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPDATA1M\" "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -102,7 +101,7 @@ public void test_types() throws Exception { "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest47.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest47.java index 35b4c9a7a6..cfee7ea874 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest47.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest47.java @@ -26,37 +26,36 @@ import java.util.List; public class OracleCreateTableTest47 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " (\t\"ID\" NUMBER, \n" + - "\t\"IS_DELETED\" CHAR(1), \n" + - "\t\"GMT_MODIFIED\" DATE, \n" + - "\t\"GMT_CREATE\" DATE, \n" + - "\t\"CREATOR\" VARCHAR2(32), \n" + - "\t\"MODIFIER\" VARCHAR2(32), \n" + - "\t\"SEND_TIME\" DATE, \n" + - "\t\"SUBJECT\" VARCHAR2(256), \n" + - "\t\"SENDER\" VARCHAR2(128), \n" + - "\t\"PROVIDER\" VARCHAR2(16), \n" + - "\t\"AVINFO_ID\" NUMBER, \n" + - "\t\"CONTENT\" CLOB, \n" + - "\t CONSTRAINT \"AV_EMAIL_PK\" PRIMARY KEY (\"ID\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 4194304 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPINDX1M\" ENABLE\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + - "\n" + - " STORAGE(INITIAL 4194304 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPDATA1M\" \n" + - " LOB (\"CONTENT\") STORE AS (\n" + - " TABLESPACE \"APPDATA1M\" ENABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + - " NOCACHE LOGGING \n" + - " STORAGE(INITIAL 4194304 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT))"; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " (\t\"ID\" NUMBER, \n" + + "\t\"IS_DELETED\" CHAR(1), \n" + + "\t\"GMT_MODIFIED\" DATE, \n" + + "\t\"GMT_CREATE\" DATE, \n" + + "\t\"CREATOR\" VARCHAR2(32), \n" + + "\t\"MODIFIER\" VARCHAR2(32), \n" + + "\t\"SEND_TIME\" DATE, \n" + + "\t\"SUBJECT\" VARCHAR2(256), \n" + + "\t\"SENDER\" VARCHAR2(128), \n" + + "\t\"PROVIDER\" VARCHAR2(16), \n" + + "\t\"AVINFO_ID\" NUMBER, \n" + + "\t\"CONTENT\" CLOB, \n" + + "\t CONSTRAINT \"AV_EMAIL_PK\" PRIMARY KEY (\"ID\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 4194304 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPINDX1M\" ENABLE\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + "\n" + + " STORAGE(INITIAL 4194304 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPDATA1M\" \n" + + " LOB (\"CONTENT\") STORE AS (\n" + + " TABLESPACE \"APPDATA1M\" ENABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + + " NOCACHE LOGGING \n" + + " STORAGE(INITIAL 4194304 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT))"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -131,7 +130,7 @@ public void test_types() throws Exception { "\tCHUNK 8192\n" + "\tNOCACHE\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest48.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest48.java index 364ca3170e..597b80b5fc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest48.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest48.java @@ -26,31 +26,30 @@ import java.util.List; public class OracleCreateTableTest48 extends OracleTest { - public void test_types() throws Exception { String sql = // - " \n" + - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"ID\" NUMBER, \n" + - " \"GMT_CREATE\" DATE, \n" + - " \"GMT_MODIFIED\" DATE, \n" + - " \"TEMPLATE\" VARCHAR2(64), \n" + - " \"COMPANY_ID\" NUMBER, \n" + - " \"COLUMN_NAME\" VARCHAR2(64), \n" + - " \"COLUMN_PROFILE\" VARCHAR2(4000), \n" + - " \"COLUMN_IMAGE\" VARCHAR2(128), \n" + - " \"ORDERING\" NUMBER, \n" + - " \"STATUS\" VARCHAR2(16), \n" + - " \"CREATE_TYPE\" VARCHAR2(256), \n" + - " CONSTRAINT \"COLUMNS_PK\" PRIMARY KEY (\"ID\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"BOPSINDXTS\" ENABLE\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS NOLOGGING\n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"BOPSDATATS\" "; + " \n" + + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"ID\" NUMBER, \n" + + " \"GMT_CREATE\" DATE, \n" + + " \"GMT_MODIFIED\" DATE, \n" + + " \"TEMPLATE\" VARCHAR2(64), \n" + + " \"COMPANY_ID\" NUMBER, \n" + + " \"COLUMN_NAME\" VARCHAR2(64), \n" + + " \"COLUMN_PROFILE\" VARCHAR2(4000), \n" + + " \"COLUMN_IMAGE\" VARCHAR2(128), \n" + + " \"ORDERING\" NUMBER, \n" + + " \"STATUS\" VARCHAR2(16), \n" + + " \"CREATE_TYPE\" VARCHAR2(256), \n" + + " CONSTRAINT \"COLUMNS_PK\" PRIMARY KEY (\"ID\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"BOPSINDXTS\" ENABLE\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS NOLOGGING\n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"BOPSDATATS\" "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -107,7 +106,7 @@ public void test_types() throws Exception { "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest49.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest49.java index 96fa151dfc..392f91560b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest49.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest49.java @@ -26,94 +26,93 @@ import java.util.List; public class OracleCreateTableTest49 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + - " \"GMT_CREATE\" DATE, \n" + - " \"GMT_MODIFIED\" DATE, \n" + - " \"POSTING_TYPE\" VARCHAR2(20), \n" + - " \"POSTING_ID\" NUMBER, \n" + - " \"SYS_FRAUD\" NUMBER, \n" + - " \"CONFIRM_FRAUD\" NUMBER, \n" + - " \"FRAUD_RESON\" VARCHAR2(128), \n" + - " \"USER_ID\" NUMBER, \n" + - " \"IDENTIFIER_ID\" NUMBER, \n" + - " \"POSTING_CREATE\" DATE, \n" + - " \"POSTING_MODIFIER\" DATE, \n" + - " \"MEMBER_ID\" VARCHAR2(32), \n" + - " \"MEMBER_LEVEL\" VARCHAR2(16), \n" + - " \"SERVICE_VALUE\" VARCHAR2(32), \n" + - " \"ADDRESS\" VARCHAR2(256), \n" + - " \"COUNTRY\" VARCHAR2(64), \n" + - " \"PROVINCE\" VARCHAR2(128), \n" + - " \"CITY\" VARCHAR2(128), \n" + - " \"ZIP\" VARCHAR2(32), \n" + - " \"FIRST_NAME\" VARCHAR2(128), \n" + - " \"LAST_NAME\" VARCHAR2(128), \n" + - " \"PHONE_COUNTRY\" VARCHAR2(8), \n" + - " \"PHONE_AREA\" VARCHAR2(8), \n" + - " \"PHONE_NUMBER\" VARCHAR2(128), \n" + - " \"FAX_COUNTRY\" VARCHAR2(8), \n" + - " \"FAX_AREA\" VARCHAR2(8), \n" + - " \"FAX_NUMBER\" VARCHAR2(128), \n" + - " \"IP_COUNTRY\" VARCHAR2(128), \n" + - " \"MOBILE_NO\" VARCHAR2(128), \n" + - " \"EMAIL\" VARCHAR2(128), \n" + - " \"ALT_EMAIL\" VARCHAR2(128), \n" + - " \"COMPANY\" VARCHAR2(128), \n" + - " \"HOMEPAGE_URL\" VARCHAR2(128), \n" + - " \"CATEGORY_ID_1\" NUMBER, \n" + - " \"CATEGORY_ID_2\" NUMBER, \n" + - " \"CATEGORY_ID_3\" NUMBER, \n" + - " \"CATEGORY_ID_4\" NUMBER, \n" + - " \"CATEGORY_ID_5\" NUMBER, \n" + - " \"SUBJECT\" VARCHAR2(256), \n" + - " \"KEYWORDS\" VARCHAR2(512), \n" + - " \"DETAIL\" CLOB, \n" + - " \"POSTING_STATUS\" VARCHAR2(16), \n" + - " \"OFFER_TYPE\" VARCHAR2(32)\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " STORAGE(\n" + - " BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APP_DATA1K\" \n" + - " LOB (\"DETAIL\") STORE AS (\n" + - " ENABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + - " NOCACHE LOGGING \n" + - " STORAGE(\n" + - " BUFFER_POOL DEFAULT)) \n" + - " PARTITION BY RANGE (\"GMT_CREATE\") \n" + - " (PARTITION \"P2008\" VALUES LESS THAN (TO_DATE(' 2009-01-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APP_DATA1K\" \n" + - " LOB (\"DETAIL\") STORE AS (\n" + - " TABLESPACE \"APP_DATA1K\" ENABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + - " NOCACHE LOGGING \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)) NOCOMPRESS , \n" + - " PARTITION \"P2009\" VALUES LESS THAN (TO_DATE(' 2010-01-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APP_DATA1K\" \n" + - " LOB (\"DETAIL\") STORE AS (\n" + - " TABLESPACE \"APP_DATA1K\" ENABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + - " NOCACHE LOGGING \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)) NOCOMPRESS , \n" + - " PARTITION \"P2010\" VALUES LESS THAN (TO_DATE(' 2011-01-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPDATA1M\" \n" + - " LOB (\"DETAIL\") STORE AS (\n" + - " TABLESPACE \"BOPSDATATS\" ENABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + - " NOCACHE LOGGING \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)) NOCOMPRESS ) "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + + " \"GMT_CREATE\" DATE, \n" + + " \"GMT_MODIFIED\" DATE, \n" + + " \"POSTING_TYPE\" VARCHAR2(20), \n" + + " \"POSTING_ID\" NUMBER, \n" + + " \"SYS_FRAUD\" NUMBER, \n" + + " \"CONFIRM_FRAUD\" NUMBER, \n" + + " \"FRAUD_RESON\" VARCHAR2(128), \n" + + " \"USER_ID\" NUMBER, \n" + + " \"IDENTIFIER_ID\" NUMBER, \n" + + " \"POSTING_CREATE\" DATE, \n" + + " \"POSTING_MODIFIER\" DATE, \n" + + " \"MEMBER_ID\" VARCHAR2(32), \n" + + " \"MEMBER_LEVEL\" VARCHAR2(16), \n" + + " \"SERVICE_VALUE\" VARCHAR2(32), \n" + + " \"ADDRESS\" VARCHAR2(256), \n" + + " \"COUNTRY\" VARCHAR2(64), \n" + + " \"PROVINCE\" VARCHAR2(128), \n" + + " \"CITY\" VARCHAR2(128), \n" + + " \"ZIP\" VARCHAR2(32), \n" + + " \"FIRST_NAME\" VARCHAR2(128), \n" + + " \"LAST_NAME\" VARCHAR2(128), \n" + + " \"PHONE_COUNTRY\" VARCHAR2(8), \n" + + " \"PHONE_AREA\" VARCHAR2(8), \n" + + " \"PHONE_NUMBER\" VARCHAR2(128), \n" + + " \"FAX_COUNTRY\" VARCHAR2(8), \n" + + " \"FAX_AREA\" VARCHAR2(8), \n" + + " \"FAX_NUMBER\" VARCHAR2(128), \n" + + " \"IP_COUNTRY\" VARCHAR2(128), \n" + + " \"MOBILE_NO\" VARCHAR2(128), \n" + + " \"EMAIL\" VARCHAR2(128), \n" + + " \"ALT_EMAIL\" VARCHAR2(128), \n" + + " \"COMPANY\" VARCHAR2(128), \n" + + " \"HOMEPAGE_URL\" VARCHAR2(128), \n" + + " \"CATEGORY_ID_1\" NUMBER, \n" + + " \"CATEGORY_ID_2\" NUMBER, \n" + + " \"CATEGORY_ID_3\" NUMBER, \n" + + " \"CATEGORY_ID_4\" NUMBER, \n" + + " \"CATEGORY_ID_5\" NUMBER, \n" + + " \"SUBJECT\" VARCHAR2(256), \n" + + " \"KEYWORDS\" VARCHAR2(512), \n" + + " \"DETAIL\" CLOB, \n" + + " \"POSTING_STATUS\" VARCHAR2(16), \n" + + " \"OFFER_TYPE\" VARCHAR2(32)\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " STORAGE(\n" + + " BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APP_DATA1K\" \n" + + " LOB (\"DETAIL\") STORE AS (\n" + + " ENABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + + " NOCACHE LOGGING \n" + + " STORAGE(\n" + + " BUFFER_POOL DEFAULT)) \n" + + " PARTITION BY RANGE (\"GMT_CREATE\") \n" + + " (PARTITION \"P2008\" VALUES LESS THAN (TO_DATE(' 2009-01-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APP_DATA1K\" \n" + + " LOB (\"DETAIL\") STORE AS (\n" + + " TABLESPACE \"APP_DATA1K\" ENABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + + " NOCACHE LOGGING \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)) NOCOMPRESS , \n" + + " PARTITION \"P2009\" VALUES LESS THAN (TO_DATE(' 2010-01-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APP_DATA1K\" \n" + + " LOB (\"DETAIL\") STORE AS (\n" + + " TABLESPACE \"APP_DATA1K\" ENABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + + " NOCACHE LOGGING \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)) NOCOMPRESS , \n" + + " PARTITION \"P2010\" VALUES LESS THAN (TO_DATE(' 2011-01-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPDATA1M\" \n" + + " LOB (\"DETAIL\") STORE AS (\n" + + " TABLESPACE \"BOPSDATATS\" ENABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + + " NOCACHE LOGGING \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)) NOCOMPRESS ) "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -238,7 +237,7 @@ public void test_types() throws Exception { "\t\t)\n" + "\t\tNOCOMPRESS\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest5.java index 1eb6e7e6dc..0552f09b6b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest5.java @@ -25,11 +25,10 @@ import java.util.List; public class OracleCreateTableTest5 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE GLOBAL TEMPORARY TABLE \"SYS\".\"SYS_TEMP_0FD9D670A_93E068F3\" (\"C0\" VARCHAR2(30),\"C1\" VARCHAR2(27) ) " - + "IN_MEMORY_METADATA CURSOR_SPECIFIC_SEGMENT STORAGE (OBJNO 4254951178 )"; + "CREATE GLOBAL TEMPORARY TABLE \"SYS\".\"SYS_TEMP_0FD9D670A_93E068F3\" (\"C0\" VARCHAR2(30),\"C1\" VARCHAR2(27) ) " + + "IN_MEMORY_METADATA CURSOR_SPECIFIC_SEGMENT STORAGE (OBJNO 4254951178 )"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,8 +52,8 @@ public void test_0() throws Exception { Assert.assertEquals(2, visitor.getColumns().size()); - Assert.assertTrue(visitor.containsColumn("SYS.SYS_TEMP_0FD9D670A_93E068F3", "C0")); - Assert.assertTrue(visitor.containsColumn("SYS.SYS_TEMP_0FD9D670A_93E068F3", "C1")); + Assert.assertTrue(visitor.containsColumn("SYS.SYS_TEMP_0FD9D670A_93E068F3", "C0")); + Assert.assertTrue(visitor.containsColumn("SYS.SYS_TEMP_0FD9D670A_93E068F3", "C1")); // 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/createTable/OracleCreateTableTest50.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest50.java index 9558e4201c..14595d6d95 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest50.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest50.java @@ -26,142 +26,141 @@ import java.util.List; public class OracleCreateTableTest50 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + - " \"GMT_CREATE\" DATE, \n" + - " \"GMT_MODIFIED\" DATE, \n" + - " \"COMPANY_ID\" NUMBER, \n" + - " \"IMAGE_REPOSITORY_IDS\" VARCHAR2(128), \n" + - " \"HAVE_IMAGE\" CHAR(1), \n" + - " \"IMAGE_COUNT\" NUMBER, \n" + - " \"IMAGE_WATERMARK\" CHAR(1), \n" + - " \"IMAGE_PROCESS\" VARCHAR2(16), \n" + - " \"MEMBER_ID\" VARCHAR2(32), \n" + - " \"MEMBER_SEQ\" NUMBER, \n" + - " \"SUBJECT\" VARCHAR2(256), \n" + - " \"KEYWORDS\" VARCHAR2(512), \n" + - " \"REPOSITORY_TYPE\" VARCHAR2(16), \n" + - " \"TYPE\" VARCHAR2(16), \n" + - " \"CATEGORY_ID\" NUMBER, \n" + - " \"GROUP_ID\" NUMBER DEFAULT 0, \n" + - " \"STATUS\" VARCHAR2(16), \n" + - " \"IS_DISPLAY\" CHAR(1), \n" + - " \"HS_CODE\" VARCHAR2(16), \n" + - " \"IND_BY_ALL\" NUMBER, \n" + - " \"IND_BY_GROUP\" NUMBER, \n" + - " \"OWNER_MEMBER_ID\" VARCHAR2(32), \n" + - " \"OWNER_MEMBER_SEQ\" NUMBER, \n" + - " \"CERTIFICATE_IDS\" VARCHAR2(256), \n" + - " \"MONEY_TYPE\" NUMBER, \n" + - " \"PRICE_RANGE\" VARCHAR2(256), \n" + - " \"PORT\" VARCHAR2(256), \n" + - " \"PAYMENT_METHOD\" VARCHAR2(128), \n" + - " \"PAYMENT_METHOD_OTHER\" VARCHAR2(256), \n" + - " \"MIN_ORDER_QUANTITY\" VARCHAR2(64), \n" + - " \"MIN_ORDER_UNIT\" NUMBER, \n" + - " \"MIN_ORDER_OTHER\" VARCHAR2(256), \n" + - " \"SUPPLY_QUANTITY\" VARCHAR2(64), \n" + - " \"SUPPLY_UNIT\" NUMBER, \n" + - " \"SUPPLY_PERIOD\" VARCHAR2(16), \n" + - " \"SUPPLY_OTHER\" VARCHAR2(256), \n" + - " \"PACKAGING_DESC\" VARCHAR2(512), \n" + - " \"CONSIGNMENT_TERM\" VARCHAR2(64), \n" + - " \"IS_VALIDATE\" CHAR(1), \n" + - " \"CREATE_TYPE\" VARCHAR2(16), \n" + - " \"RED_MODEL\" VARCHAR2(128), \n" + - " \"DRAFT_STATUS\" VARCHAR2(16) DEFAULT 'no_status', \n" + - " \"EXPORT_TYPE\" VARCHAR2(16) DEFAULT 'normal', \n" + - " \"IS_ESCROW\" CHAR(1) DEFAULT 'N', \n" + - " \"SALE_TYPE\" VARCHAR2(64) DEFAULT 'sourcing', \n" + - " \"WS_DISPLAY\" VARCHAR2(16), \n" + - " \"WS_OFFLINE_DATE\" DATE, \n" + - " \"WS_VALID_NUM\" NUMBER, \n" + - " \"WS_REPOST_NUM\" NUMBER, \n" + - " \"WS_AUTO_REPOST\" CHAR(1), \n" + - " \"PRICE_UNIT\" NUMBER, \n" + - " \"IMAGE_VERSION\" NUMBER, \n" + - " \"SCORE\" NUMBER, \n" + - " \"GROUP_ID2\" NUMBER, \n" + - " \"GROUP_ID3\" NUMBER, \n" + - " \"IND_BY_GROUP2\" NUMBER, \n" + - " \"IND_BY_GROUP3\" NUMBER, \n" + - " CONSTRAINT \"P_PRODUCT_PK1\" PRIMARY KEY (\"ID\", \"COMPANY_ID\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 \n" + - " STORAGE(\n" + - " BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPINDX1M\" LOCAL\n" + - " (PARTITION \"PRODUCT_HASH_P1\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P2\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P3\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P4\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P5\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P6\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P7\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P8\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P9\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P10\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P11\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P12\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P13\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P14\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P15\" \n" + - " TABLESPACE \"APPINDX1M\", \n" + - " PARTITION \"PRODUCT_HASH_P16\" \n" + - " TABLESPACE \"APPINDX1M\") ENABLE NOVALIDATE\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " STORAGE(\n" + - " BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APP_DATA1K\" \n" + - " PARTITION BY HASH (\"COMPANY_ID\") \n" + - " (PARTITION \"PRODUCT_HASH_P1\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P2\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P3\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P4\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P5\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P6\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P7\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P8\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P9\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P10\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P11\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P12\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P13\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P14\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P15\" \n" + - " TABLESPACE \"APPDATA1M\", \n" + - " PARTITION \"PRODUCT_HASH_P16\" \n" + - " TABLESPACE \"APPDATA1M\") "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + + " \"GMT_CREATE\" DATE, \n" + + " \"GMT_MODIFIED\" DATE, \n" + + " \"COMPANY_ID\" NUMBER, \n" + + " \"IMAGE_REPOSITORY_IDS\" VARCHAR2(128), \n" + + " \"HAVE_IMAGE\" CHAR(1), \n" + + " \"IMAGE_COUNT\" NUMBER, \n" + + " \"IMAGE_WATERMARK\" CHAR(1), \n" + + " \"IMAGE_PROCESS\" VARCHAR2(16), \n" + + " \"MEMBER_ID\" VARCHAR2(32), \n" + + " \"MEMBER_SEQ\" NUMBER, \n" + + " \"SUBJECT\" VARCHAR2(256), \n" + + " \"KEYWORDS\" VARCHAR2(512), \n" + + " \"REPOSITORY_TYPE\" VARCHAR2(16), \n" + + " \"TYPE\" VARCHAR2(16), \n" + + " \"CATEGORY_ID\" NUMBER, \n" + + " \"GROUP_ID\" NUMBER DEFAULT 0, \n" + + " \"STATUS\" VARCHAR2(16), \n" + + " \"IS_DISPLAY\" CHAR(1), \n" + + " \"HS_CODE\" VARCHAR2(16), \n" + + " \"IND_BY_ALL\" NUMBER, \n" + + " \"IND_BY_GROUP\" NUMBER, \n" + + " \"OWNER_MEMBER_ID\" VARCHAR2(32), \n" + + " \"OWNER_MEMBER_SEQ\" NUMBER, \n" + + " \"CERTIFICATE_IDS\" VARCHAR2(256), \n" + + " \"MONEY_TYPE\" NUMBER, \n" + + " \"PRICE_RANGE\" VARCHAR2(256), \n" + + " \"PORT\" VARCHAR2(256), \n" + + " \"PAYMENT_METHOD\" VARCHAR2(128), \n" + + " \"PAYMENT_METHOD_OTHER\" VARCHAR2(256), \n" + + " \"MIN_ORDER_QUANTITY\" VARCHAR2(64), \n" + + " \"MIN_ORDER_UNIT\" NUMBER, \n" + + " \"MIN_ORDER_OTHER\" VARCHAR2(256), \n" + + " \"SUPPLY_QUANTITY\" VARCHAR2(64), \n" + + " \"SUPPLY_UNIT\" NUMBER, \n" + + " \"SUPPLY_PERIOD\" VARCHAR2(16), \n" + + " \"SUPPLY_OTHER\" VARCHAR2(256), \n" + + " \"PACKAGING_DESC\" VARCHAR2(512), \n" + + " \"CONSIGNMENT_TERM\" VARCHAR2(64), \n" + + " \"IS_VALIDATE\" CHAR(1), \n" + + " \"CREATE_TYPE\" VARCHAR2(16), \n" + + " \"RED_MODEL\" VARCHAR2(128), \n" + + " \"DRAFT_STATUS\" VARCHAR2(16) DEFAULT 'no_status', \n" + + " \"EXPORT_TYPE\" VARCHAR2(16) DEFAULT 'normal', \n" + + " \"IS_ESCROW\" CHAR(1) DEFAULT 'N', \n" + + " \"SALE_TYPE\" VARCHAR2(64) DEFAULT 'sourcing', \n" + + " \"WS_DISPLAY\" VARCHAR2(16), \n" + + " \"WS_OFFLINE_DATE\" DATE, \n" + + " \"WS_VALID_NUM\" NUMBER, \n" + + " \"WS_REPOST_NUM\" NUMBER, \n" + + " \"WS_AUTO_REPOST\" CHAR(1), \n" + + " \"PRICE_UNIT\" NUMBER, \n" + + " \"IMAGE_VERSION\" NUMBER, \n" + + " \"SCORE\" NUMBER, \n" + + " \"GROUP_ID2\" NUMBER, \n" + + " \"GROUP_ID3\" NUMBER, \n" + + " \"IND_BY_GROUP2\" NUMBER, \n" + + " \"IND_BY_GROUP3\" NUMBER, \n" + + " CONSTRAINT \"P_PRODUCT_PK1\" PRIMARY KEY (\"ID\", \"COMPANY_ID\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 \n" + + " STORAGE(\n" + + " BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPINDX1M\" LOCAL\n" + + " (PARTITION \"PRODUCT_HASH_P1\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P2\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P3\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P4\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P5\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P6\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P7\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P8\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P9\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P10\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P11\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P12\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P13\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P14\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P15\" \n" + + " TABLESPACE \"APPINDX1M\", \n" + + " PARTITION \"PRODUCT_HASH_P16\" \n" + + " TABLESPACE \"APPINDX1M\") ENABLE NOVALIDATE\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " STORAGE(\n" + + " BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APP_DATA1K\" \n" + + " PARTITION BY HASH (\"COMPANY_ID\") \n" + + " (PARTITION \"PRODUCT_HASH_P1\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P2\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P3\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P4\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P5\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P6\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P7\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P8\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P9\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P10\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P11\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P12\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P13\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P14\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P15\" \n" + + " TABLESPACE \"APPDATA1M\", \n" + + " PARTITION \"PRODUCT_HASH_P16\" \n" + + " TABLESPACE \"APPDATA1M\") "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -282,7 +281,7 @@ public void test_types() throws Exception { "\tPARTITION \"PRODUCT_HASH_P16\"\n" + "\t\tTABLESPACE \"APPDATA1M\"\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest51.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest51.java index 631c79f00a..6c48b9f899 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest51.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest51.java @@ -26,17 +26,16 @@ import java.util.List; public class OracleCreateTableTest51 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"A\" NUMBER, \n" + - " \"C\" VARCHAR2(7), \n" + - " \"DC1\" VARCHAR2(120)\n" + - " ) PCTFREE 0 PCTUSED 40 INITRANS 1 MAXTRANS 255 COMPRESS NOLOGGING\n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APP_DATA1K\" "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"A\" NUMBER, \n" + + " \"C\" VARCHAR2(7), \n" + + " \"DC1\" VARCHAR2(120)\n" + + " ) PCTFREE 0 PCTUSED 40 INITRANS 1 MAXTRANS 255 COMPRESS NOLOGGING\n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APP_DATA1K\" "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -67,7 +66,7 @@ public void test_types() throws Exception { "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest52.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest52.java index 3997a9a16b..e33f8a9ca5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest52.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest52.java @@ -26,30 +26,29 @@ import java.util.List; public class OracleCreateTableTest52 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + - " \"GMT_CREATE\" DATE NOT NULL ENABLE, \n" + - " \"GMT_MODIFIED\" DATE NOT NULL ENABLE, \n" + - " \"ADMIN_SEQ\" NUMBER, \n" + - " \"COMPANY_ID\" NUMBER, \n" + - " \"NOW_LEVEL\" NUMBER, \n" + - " \"GMV_30DAY\" NUMBER, \n" + - " \"REFUND_30DAY\" NUMBER, \n" + - " \"REPUTATION_30DAY\" NUMBER, \n" + - " \"REBUY_AMOUNT\" NUMBER, \n" + - " \"STANDARD_CNT\" NUMBER, \n" + - " CONSTRAINT \"WS_SELLER_LEVEL_PK\" PRIMARY KEY (\"ID\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPDATA1M\" ENABLE\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPDATA1M\" ENABLE ROW MOVEMENT "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + + " \"GMT_CREATE\" DATE NOT NULL ENABLE, \n" + + " \"GMT_MODIFIED\" DATE NOT NULL ENABLE, \n" + + " \"ADMIN_SEQ\" NUMBER, \n" + + " \"COMPANY_ID\" NUMBER, \n" + + " \"NOW_LEVEL\" NUMBER, \n" + + " \"GMV_30DAY\" NUMBER, \n" + + " \"REFUND_30DAY\" NUMBER, \n" + + " \"REPUTATION_30DAY\" NUMBER, \n" + + " \"REBUY_AMOUNT\" NUMBER, \n" + + " \"STANDARD_CNT\" NUMBER, \n" + + " CONSTRAINT \"WS_SELLER_LEVEL_PK\" PRIMARY KEY (\"ID\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPDATA1M\" ENABLE\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPDATA1M\" ENABLE ROW MOVEMENT "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -106,7 +105,7 @@ public void test_types() throws Exception { "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest53.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest53.java index efa67e3da2..6af0334b45 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest53.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest53.java @@ -26,32 +26,31 @@ import java.util.List; public class OracleCreateTableTest53 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"RUNID\" NUMBER, \n" + - " \"UNIT_NUMBER\" NUMBER, \n" + - " \"LINE#\" NUMBER NOT NULL ENABLE, \n" + - " \"TOTAL_OCCUR\" NUMBER, \n" + - " \"TOTAL_TIME\" NUMBER, \n" + - " \"MIN_TIME\" NUMBER, \n" + - " \"MAX_TIME\" NUMBER, \n" + - " \"SPARE1\" NUMBER, \n" + - " \"SPARE2\" NUMBER, \n" + - " \"SPARE3\" NUMBER, \n" + - " \"SPARE4\" NUMBER, \n" + - " PRIMARY KEY (\"RUNID\", \"UNIT_NUMBER\", \"LINE#\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"SYSTEM\" ENABLE, \n" + - " FOREIGN KEY (\"RUNID\", \"UNIT_NUMBER\")\n" + - " REFERENCES \"B2BDBA\".\"PLSQL_PROFILER_UNITS\" (\"RUNID\", \"UNIT_NUMBER\") ENABLE\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"SYSTEM\" "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"RUNID\" NUMBER, \n" + + " \"UNIT_NUMBER\" NUMBER, \n" + + " \"LINE#\" NUMBER NOT NULL ENABLE, \n" + + " \"TOTAL_OCCUR\" NUMBER, \n" + + " \"TOTAL_TIME\" NUMBER, \n" + + " \"MIN_TIME\" NUMBER, \n" + + " \"MAX_TIME\" NUMBER, \n" + + " \"SPARE1\" NUMBER, \n" + + " \"SPARE2\" NUMBER, \n" + + " \"SPARE3\" NUMBER, \n" + + " \"SPARE4\" NUMBER, \n" + + " PRIMARY KEY (\"RUNID\", \"UNIT_NUMBER\", \"LINE#\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"SYSTEM\" ENABLE, \n" + + " FOREIGN KEY (\"RUNID\", \"UNIT_NUMBER\")\n" + + " REFERENCES \"B2BDBA\".\"PLSQL_PROFILER_UNITS\" (\"RUNID\", \"UNIT_NUMBER\") ENABLE\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"SYSTEM\" "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -110,7 +109,7 @@ public void test_types() throws Exception { "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest54.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest54.java index 373df2c4d3..9c389b2626 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest54.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest54.java @@ -26,27 +26,26 @@ import java.util.List; public class OracleCreateTableTest54 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"PUSH\" NUMBER, \n" + - " \"LOAD\" NUMBER, \n" + - " \"TABLE_ID\" NUMBER, \n" + - " \"TABLE_NAME\" VARCHAR2(50), \n" + - " \"PRI_KEY\" VARCHAR2(50), \n" + - " \"TEMP_TABLE_NAME\" VARCHAR2(50)\n" + - " ) \n" + - " ORGANIZATION EXTERNAL \n" + - " ( TYPE ORACLE_LOADER\n" + - " DEFAULT DIRECTORY \"DIR_MQ\"\n" + - " ACCESS PARAMETERS\n" + - " ( records delimited by newline fields terminated by '|' )\n" + - " LOCATION\n" + - " ( 'retl-table.cfg'\n" + - " )\n" + - " )\n" + - " REJECT LIMIT UNLIMITED "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"PUSH\" NUMBER, \n" + + " \"LOAD\" NUMBER, \n" + + " \"TABLE_ID\" NUMBER, \n" + + " \"TABLE_NAME\" VARCHAR2(50), \n" + + " \"PRI_KEY\" VARCHAR2(50), \n" + + " \"TEMP_TABLE_NAME\" VARCHAR2(50)\n" + + " ) \n" + + " ORGANIZATION EXTERNAL \n" + + " ( TYPE ORACLE_LOADER\n" + + " DEFAULT DIRECTORY \"DIR_MQ\"\n" + + " ACCESS PARAMETERS\n" + + " ( records delimited by newline fields terminated by '|' )\n" + + " LOCATION\n" + + " ( 'retl-table.cfg'\n" + + " )\n" + + " )\n" + + " REJECT LIMIT UNLIMITED "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -73,7 +72,7 @@ public void test_types() throws Exception { "\t\tLOCATION ('retl-table.cfg')\n" + "\t)\n" + "\tREJECT LIMIT UNLIMITED",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest55.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest55.java index 0ecdba3afd..fdaa161d3a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest55.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest55.java @@ -26,21 +26,20 @@ import java.util.List; public class OracleCreateTableTest55 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"I\" NUMBER, \n" + - " \"C\" CLOB\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"USERS\" \n" + - " LOB (\"C\") STORE AS (\n" + - " TABLESPACE \"USERS\" DISABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + - " NOCACHE LOGGING \n" + - " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)) "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"I\" NUMBER, \n" + + " \"C\" CLOB\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"USERS\" \n" + + " LOB (\"C\") STORE AS (\n" + + " TABLESPACE \"USERS\" DISABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + + " NOCACHE LOGGING \n" + + " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)) "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -87,7 +86,7 @@ public void test_types() throws Exception { "\tCHUNK 8192\n" + "\tNOCACHE\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest56.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest56.java index 2c40cc17d5..67cc5fed82 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest56.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest56.java @@ -26,29 +26,28 @@ import java.util.List; public class OracleCreateTableTest56 extends OracleTest { - public void test_types() throws Exception { String sql = // - " \n" + - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"SNAP_ID\" NUMBER(6,0) NOT NULL ENABLE, \n" + - " \"DBID\" NUMBER NOT NULL ENABLE, \n" + - " \"INSTANCE_NUMBER\" NUMBER NOT NULL ENABLE, \n" + - " \"EVENT\" VARCHAR2(64) NOT NULL ENABLE, \n" + - " \"TOTAL_WAITS\" NUMBER, \n" + - " \"TOTAL_TIMEOUTS\" NUMBER, \n" + - " \"TIME_WAITED_MICRO\" NUMBER, \n" + - " CONSTRAINT \"STATS$BG_EVENT_SUMMARY_PK\" PRIMARY KEY (\"SNAP_ID\", \"DBID\", \"INSTANCE_NUMBER\", \"EVENT\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"PERFSTAT\" ENABLE, \n" + - " CONSTRAINT \"STATS$BG_EVENT_SUMMARY_FK\" FOREIGN KEY (\"SNAP_ID\", \"DBID\", \"INSTANCE_NUMBER\")\n" + - " REFERENCES \"PERFSTAT\".\"STATS$SNAPSHOT\" (\"SNAP_ID\", \"DBID\", \"INSTANCE_NUMBER\") ON DELETE CASCADE ENABLE\n" + - " ) PCTFREE 5 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"PERFSTAT\" "; + " \n" + + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"SNAP_ID\" NUMBER(6,0) NOT NULL ENABLE, \n" + + " \"DBID\" NUMBER NOT NULL ENABLE, \n" + + " \"INSTANCE_NUMBER\" NUMBER NOT NULL ENABLE, \n" + + " \"EVENT\" VARCHAR2(64) NOT NULL ENABLE, \n" + + " \"TOTAL_WAITS\" NUMBER, \n" + + " \"TOTAL_TIMEOUTS\" NUMBER, \n" + + " \"TIME_WAITED_MICRO\" NUMBER, \n" + + " CONSTRAINT \"STATS$BG_EVENT_SUMMARY_PK\" PRIMARY KEY (\"SNAP_ID\", \"DBID\", \"INSTANCE_NUMBER\", \"EVENT\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"PERFSTAT\" ENABLE, \n" + + " CONSTRAINT \"STATS$BG_EVENT_SUMMARY_FK\" FOREIGN KEY (\"SNAP_ID\", \"DBID\", \"INSTANCE_NUMBER\")\n" + + " REFERENCES \"PERFSTAT\".\"STATS$SNAPSHOT\" (\"SNAP_ID\", \"DBID\", \"INSTANCE_NUMBER\") ON DELETE CASCADE ENABLE\n" + + " ) PCTFREE 5 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"PERFSTAT\" "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -104,7 +103,7 @@ public void test_types() throws Exception { "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest57.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest57.java index 1b494075ce..484f6fbb83 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest57.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest57.java @@ -26,76 +26,75 @@ import java.util.List; public class OracleCreateTableTest57 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + - " \"GMT_CREATE\" DATE, \n" + - " \"GMT_MODIFIED\" DATE, \n" + - " \"COMPANY_ID\" NUMBER, \n" + - " \"IMAGE_REPOSITORY_IDS\" VARCHAR2(128), \n" + - " \"HAVE_IMAGE\" CHAR(1), \n" + - " \"IMAGE_COUNT\" NUMBER, \n" + - " \"IMAGE_WATERMARK\" CHAR(1), \n" + - " \"IMAGE_PROCESS\" VARCHAR2(16), \n" + - " \"MEMBER_ID\" VARCHAR2(32), \n" + - " \"MEMBER_SEQ\" NUMBER, \n" + - " \"SUBJECT\" VARCHAR2(256), \n" + - " \"KEYWORDS\" VARCHAR2(512), \n" + - " \"REPOSITORY_TYPE\" VARCHAR2(16), \n" + - " \"TYPE\" VARCHAR2(16), \n" + - " \"CATEGORY_ID\" NUMBER, \n" + - " \"GROUP_ID\" NUMBER, \n" + - " \"STATUS\" VARCHAR2(16), \n" + - " \"IS_DISPLAY\" CHAR(1), \n" + - " \"HS_CODE\" VARCHAR2(16), \n" + - " \"IND_BY_ALL\" NUMBER, \n" + - " \"IND_BY_GROUP\" NUMBER, \n" + - " \"OWNER_MEMBER_ID\" VARCHAR2(32), \n" + - " \"OWNER_MEMBER_SEQ\" NUMBER, \n" + - " \"CERTIFICATE_IDS\" VARCHAR2(256), \n" + - " \"MONEY_TYPE\" NUMBER, \n" + - " \"PRICE_RANGE\" VARCHAR2(256), \n" + - " \"PORT\" VARCHAR2(256), \n" + - " \"PAYMENT_METHOD\" VARCHAR2(128), \n" + - " \"PAYMENT_METHOD_OTHER\" VARCHAR2(256), \n" + - " \"MIN_ORDER_QUANTITY\" VARCHAR2(64), \n" + - " \"MIN_ORDER_UNIT\" NUMBER, \n" + - " \"MIN_ORDER_OTHER\" VARCHAR2(256), \n" + - " \"SUPPLY_QUANTITY\" VARCHAR2(64), \n" + - " \"SUPPLY_UNIT\" NUMBER, \n" + - " \"SUPPLY_PERIOD\" VARCHAR2(16), \n" + - " \"SUPPLY_OTHER\" VARCHAR2(256), \n" + - " \"PACKAGING_DESC\" VARCHAR2(512), \n" + - " \"CONSIGNMENT_TERM\" VARCHAR2(64), \n" + - " \"IS_VALIDATE\" CHAR(1), \n" + - " \"CREATE_TYPE\" VARCHAR2(16), \n" + - " \"RED_MODEL\" VARCHAR2(128), \n" + - " \"DRAFT_STATUS\" VARCHAR2(16) DEFAULT 'no_status', \n" + - " \"EXPORT_TYPE\" VARCHAR2(16) DEFAULT 'normal', \n" + - " \"IS_ESCROW\" CHAR(1), \n" + - " \"SALE_TYPE\" VARCHAR2(64), \n" + - " \"WS_DISPLAY\" VARCHAR2(16), \n" + - " \"WS_OFFLINE_DATE\" DATE, \n" + - " \"WS_VALID_NUM\" NUMBER, \n" + - " \"WS_REPOST_NUM\" NUMBER, \n" + - " \"WS_AUTO_REPOST\" CHAR(1), \n" + - " \"PRICE_UNIT\" NUMBER, \n" + - " \"IMAGE_VERSION\" NUMBER, \n" + - " \"SCORE\" NUMBER, \n" + - " \"GROUP_ID2\" NUMBER, \n" + - " \"GROUP_ID3\" NUMBER, \n" + - " \"IND_BY_GROUP2\" NUMBER, \n" + - " \"IND_BY_GROUP3\" NUMBER, \n" + - " CONSTRAINT \"PRODUCT_PK\" PRIMARY KEY (\"ID\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 83886080 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPINDX1M\" ENABLE\n" + - " ) CLUSTER \"SEARCHTEST\".\"CLUSTER_PRODUCT_COMPANY_ID\" (\"COMPANY_ID\")\n" + - "\n" + - " "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + + " \"GMT_CREATE\" DATE, \n" + + " \"GMT_MODIFIED\" DATE, \n" + + " \"COMPANY_ID\" NUMBER, \n" + + " \"IMAGE_REPOSITORY_IDS\" VARCHAR2(128), \n" + + " \"HAVE_IMAGE\" CHAR(1), \n" + + " \"IMAGE_COUNT\" NUMBER, \n" + + " \"IMAGE_WATERMARK\" CHAR(1), \n" + + " \"IMAGE_PROCESS\" VARCHAR2(16), \n" + + " \"MEMBER_ID\" VARCHAR2(32), \n" + + " \"MEMBER_SEQ\" NUMBER, \n" + + " \"SUBJECT\" VARCHAR2(256), \n" + + " \"KEYWORDS\" VARCHAR2(512), \n" + + " \"REPOSITORY_TYPE\" VARCHAR2(16), \n" + + " \"TYPE\" VARCHAR2(16), \n" + + " \"CATEGORY_ID\" NUMBER, \n" + + " \"GROUP_ID\" NUMBER, \n" + + " \"STATUS\" VARCHAR2(16), \n" + + " \"IS_DISPLAY\" CHAR(1), \n" + + " \"HS_CODE\" VARCHAR2(16), \n" + + " \"IND_BY_ALL\" NUMBER, \n" + + " \"IND_BY_GROUP\" NUMBER, \n" + + " \"OWNER_MEMBER_ID\" VARCHAR2(32), \n" + + " \"OWNER_MEMBER_SEQ\" NUMBER, \n" + + " \"CERTIFICATE_IDS\" VARCHAR2(256), \n" + + " \"MONEY_TYPE\" NUMBER, \n" + + " \"PRICE_RANGE\" VARCHAR2(256), \n" + + " \"PORT\" VARCHAR2(256), \n" + + " \"PAYMENT_METHOD\" VARCHAR2(128), \n" + + " \"PAYMENT_METHOD_OTHER\" VARCHAR2(256), \n" + + " \"MIN_ORDER_QUANTITY\" VARCHAR2(64), \n" + + " \"MIN_ORDER_UNIT\" NUMBER, \n" + + " \"MIN_ORDER_OTHER\" VARCHAR2(256), \n" + + " \"SUPPLY_QUANTITY\" VARCHAR2(64), \n" + + " \"SUPPLY_UNIT\" NUMBER, \n" + + " \"SUPPLY_PERIOD\" VARCHAR2(16), \n" + + " \"SUPPLY_OTHER\" VARCHAR2(256), \n" + + " \"PACKAGING_DESC\" VARCHAR2(512), \n" + + " \"CONSIGNMENT_TERM\" VARCHAR2(64), \n" + + " \"IS_VALIDATE\" CHAR(1), \n" + + " \"CREATE_TYPE\" VARCHAR2(16), \n" + + " \"RED_MODEL\" VARCHAR2(128), \n" + + " \"DRAFT_STATUS\" VARCHAR2(16) DEFAULT 'no_status', \n" + + " \"EXPORT_TYPE\" VARCHAR2(16) DEFAULT 'normal', \n" + + " \"IS_ESCROW\" CHAR(1), \n" + + " \"SALE_TYPE\" VARCHAR2(64), \n" + + " \"WS_DISPLAY\" VARCHAR2(16), \n" + + " \"WS_OFFLINE_DATE\" DATE, \n" + + " \"WS_VALID_NUM\" NUMBER, \n" + + " \"WS_REPOST_NUM\" NUMBER, \n" + + " \"WS_AUTO_REPOST\" CHAR(1), \n" + + " \"PRICE_UNIT\" NUMBER, \n" + + " \"IMAGE_VERSION\" NUMBER, \n" + + " \"SCORE\" NUMBER, \n" + + " \"GROUP_ID2\" NUMBER, \n" + + " \"GROUP_ID3\" NUMBER, \n" + + " \"IND_BY_GROUP2\" NUMBER, \n" + + " \"IND_BY_GROUP3\" NUMBER, \n" + + " CONSTRAINT \"PRODUCT_PK\" PRIMARY KEY (\"ID\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 83886080 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPINDX1M\" ENABLE\n" + + " ) CLUSTER \"SEARCHTEST\".\"CLUSTER_PRODUCT_COMPANY_ID\" (\"COMPANY_ID\")\n" + + "\n" + + " "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -183,7 +182,7 @@ public void test_types() throws Exception { "\t\tENABLE\n" + ")\n" + "CLUSTER \"SEARCHTEST\".\"CLUSTER_PRODUCT_COMPANY_ID\" (\"COMPANY_ID\")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest58.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest58.java index 82b4bbb962..b3a333788c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest58.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest58.java @@ -26,42 +26,41 @@ import java.util.List; public class OracleCreateTableTest58 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + - " \"PROPS\" VARCHAR2(4000), \n" + - " CONSTRAINT \"PRODUCT_PROPERTY_SEARCH_PK\" PRIMARY KEY (\"ID\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 LOGGING \n" + - " STORAGE(\n" + - " BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPINDX1K\" LOCAL\n" + - " (PARTITION \"P1\" \n" + - " PCTFREE 10 INITRANS 2 MAXTRANS 255 \n" + - " STORAGE(INITIAL 24117248 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPINDX1K\" , \n" + - " PARTITION \"P2\" \n" + - " PCTFREE 10 INITRANS 2 MAXTRANS 255 \n" + - " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPINDX1K\" ) ENABLE\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 LOGGING \n" + - " STORAGE(\n" + - " BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APP_DATA1K\" \n" + - " PARTITION BY RANGE (\"ID\") \n" + - " (PARTITION \"P1\" VALUES LESS THAN (2000000000) \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " STORAGE(INITIAL 150994944 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APPDATA1M\" NOCOMPRESS , \n" + - " PARTITION \"P2\" VALUES LESS THAN (MAXVALUE) \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"APP_DATA1K\" NOCOMPRESS ) "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + + " \"PROPS\" VARCHAR2(4000), \n" + + " CONSTRAINT \"PRODUCT_PROPERTY_SEARCH_PK\" PRIMARY KEY (\"ID\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 LOGGING \n" + + " STORAGE(\n" + + " BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPINDX1K\" LOCAL\n" + + " (PARTITION \"P1\" \n" + + " PCTFREE 10 INITRANS 2 MAXTRANS 255 \n" + + " STORAGE(INITIAL 24117248 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPINDX1K\" , \n" + + " PARTITION \"P2\" \n" + + " PCTFREE 10 INITRANS 2 MAXTRANS 255 \n" + + " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPINDX1K\" ) ENABLE\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 LOGGING \n" + + " STORAGE(\n" + + " BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APP_DATA1K\" \n" + + " PARTITION BY RANGE (\"ID\") \n" + + " (PARTITION \"P1\" VALUES LESS THAN (2000000000) \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " STORAGE(INITIAL 150994944 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APPDATA1M\" NOCOMPRESS , \n" + + " PARTITION \"P2\" VALUES LESS THAN (MAXVALUE) \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"APP_DATA1K\" NOCOMPRESS ) "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -130,7 +129,7 @@ public void test_types() throws Exception { "\t\t\tBUFFER_POOL DEFAULT\n" + "\t\t)\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest59.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest59.java index 9c5be16756..1b135eb37e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest59.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest59.java @@ -26,25 +26,24 @@ import java.util.List; public class OracleCreateTableTest59 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"CATEGORY_ROOT_ID\" NUMBER NOT NULL ENABLE, \n" + - " \"CATEGORY_ROOT_DESC\" VARCHAR2(128) NOT NULL ENABLE, \n" + - " \"CATEGORY_LEVEL2_ID\" NUMBER, \n" + - " \"CATEGORY_LEVEL2_DESC\" VARCHAR2(128), \n" + - " \"CATEGORY_LEVEL3_ID\" NUMBER, \n" + - " \"CATEGORY_LEVEL3_DESC\" VARCHAR2(128), \n" + - " \"CATEGORY_LEAF_ID\" NUMBER, \n" + - " \"CATEGORY_LEAF_DESC\" VARCHAR2(128), \n" + - " \"IS_LEAF\" CHAR(1), \n" + - " CONSTRAINT \"EN_CATE_POST_C_DIMT0_PK\" PRIMARY KEY (\"CATEGORY_LEVEL2_ID\", \"CATEGORY_LEAF_ID\") ENABLE\n" + - " ) ORGANIZATION INDEX COMPRESS 1 PCTFREE 10 INITRANS 2 MAXTRANS 255 LOGGING\n" + - " STORAGE(INITIAL 4194304 NEXT 4194304 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"ZEUS_IND\" \n" + - " PCTTHRESHOLD 50 "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"CATEGORY_ROOT_ID\" NUMBER NOT NULL ENABLE, \n" + + " \"CATEGORY_ROOT_DESC\" VARCHAR2(128) NOT NULL ENABLE, \n" + + " \"CATEGORY_LEVEL2_ID\" NUMBER, \n" + + " \"CATEGORY_LEVEL2_DESC\" VARCHAR2(128), \n" + + " \"CATEGORY_LEVEL3_ID\" NUMBER, \n" + + " \"CATEGORY_LEVEL3_DESC\" VARCHAR2(128), \n" + + " \"CATEGORY_LEAF_ID\" NUMBER, \n" + + " \"CATEGORY_LEAF_DESC\" VARCHAR2(128), \n" + + " \"IS_LEAF\" CHAR(1), \n" + + " CONSTRAINT \"EN_CATE_POST_C_DIMT0_PK\" PRIMARY KEY (\"CATEGORY_LEVEL2_ID\", \"CATEGORY_LEAF_ID\") ENABLE\n" + + " ) ORGANIZATION INDEX COMPRESS 1 PCTFREE 10 INITRANS 2 MAXTRANS 255 LOGGING\n" + + " STORAGE(INITIAL 4194304 NEXT 4194304 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"ZEUS_IND\" \n" + + " PCTTHRESHOLD 50 "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -85,7 +84,7 @@ public void test_types() throws Exception { "\t\tCELL_FLASH_CACHE DEFAULT\n" + "\t)\n" + "\tPCTTHRESHOLD 50",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest6.java index 6653342121..cb471a23be 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest6.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleCreateTableTest6 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE GLOBAL TEMPORARY TABLE \"SYS\".\"SYS_TEMP_0FD9D66FD_93E068F3\" (\"C0\" NUMBER,\"C1\" NUMBER ) IN_MEMORY_METADATA CURSOR_SPECIFIC_SEGMENT STORAGE (OBJNO 4254951165 ) NOPARALLEL"; + "CREATE GLOBAL TEMPORARY TABLE \"SYS\".\"SYS_TEMP_0FD9D66FD_93E068F3\" (\"C0\" NUMBER,\"C1\" NUMBER ) IN_MEMORY_METADATA CURSOR_SPECIFIC_SEGMENT STORAGE (OBJNO 4254951165 ) NOPARALLEL"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,8 +51,8 @@ public void test_0() throws Exception { Assert.assertEquals(2, visitor.getColumns().size()); - Assert.assertTrue(visitor.containsColumn("SYS.SYS_TEMP_0FD9D66FD_93E068F3", "C0")); - Assert.assertTrue(visitor.containsColumn("SYS.SYS_TEMP_0FD9D66FD_93E068F3", "C1")); + Assert.assertTrue(visitor.containsColumn("SYS.SYS_TEMP_0FD9D66FD_93E068F3", "C0")); + Assert.assertTrue(visitor.containsColumn("SYS.SYS_TEMP_0FD9D66FD_93E068F3", "C1")); // Assert.assertTrue(visitor.containsColumn("pivot_table", "order_mode"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest60.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest60.java index 0b99e84e42..2d0cc8d146 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest60.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest60.java @@ -26,20 +26,19 @@ import java.util.List; public class OracleCreateTableTest60 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"MEMBER_ID\" VARCHAR2(32) NOT NULL ENABLE, \n" + - " \"CATEGORY_LEVEL2_ID\" NUMBER NOT NULL ENABLE, \n" + - " \"CATEGORY_LEVEL2_DESC\" VARCHAR2(128), \n" + - " \"AVG_INQUIRY_CNT\" NUMBER, \n" + - " \"AVG_INQUIRY_CNT_TOP10\" NUMBER\n" + - " ) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 0 PCTUSED 40 INITRANS 1 MAXTRANS 255 COMPRESS BASIC LOGGING\n" + - " STORAGE(INITIAL 50331648 NEXT 4194304 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"ZEUS_IND\" "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"MEMBER_ID\" VARCHAR2(32) NOT NULL ENABLE, \n" + + " \"CATEGORY_LEVEL2_ID\" NUMBER NOT NULL ENABLE, \n" + + " \"CATEGORY_LEVEL2_DESC\" VARCHAR2(128), \n" + + " \"AVG_INQUIRY_CNT\" NUMBER, \n" + + " \"AVG_INQUIRY_CNT_TOP10\" NUMBER\n" + + " ) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 0 PCTUSED 40 INITRANS 1 MAXTRANS 255 COMPRESS BASIC LOGGING\n" + + " STORAGE(INITIAL 50331648 NEXT 4194304 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"ZEUS_IND\" "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -74,7 +73,7 @@ public void test_types() throws Exception { "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest61.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest61.java index 6dc8841970..53e7024d53 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest61.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest61.java @@ -26,43 +26,42 @@ import java.util.List; public class OracleCreateTableTest61 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"ID\" NUMBER(11,0) NOT NULL ENABLE, \n" + - " \"GMT_CREATED\" DATE, \n" + - " \"GMT_MODIFIED\" DATE, \n" + - " \"CREATOR\" VARCHAR2(32), \n" + - " \"MODIFIER\" VARCHAR2(32), \n" + - " \"TEMPLATE_NAME\" VARCHAR2(64), \n" + - " \"MAIL_CATEGORY_ID\" NUMBER(11,0) NOT NULL ENABLE, \n" + - " \"DEFAULT_SUBJECT\" VARCHAR2(128), \n" + - " \"CONTENT_TYPE\" VARCHAR2(32) NOT NULL ENABLE, \n" + - " \"CONTENT\" CLOB, \n" + - " \"SHARE_FLAG\" VARCHAR2(32), \n" + - " \"STATUS\" VARCHAR2(32), \n" + - " \"DOUBT_IDS\" VARCHAR2(4000), \n" + - " \"PARA_1\" VARCHAR2(128), \n" + - " \"PARA_2\" VARCHAR2(128), \n" + - " \"PARA_3\" VARCHAR2(128), \n" + - " CONSTRAINT \"PK_ADMIN_MAIL_TEMPLATE\" PRIMARY KEY (\"ID\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 1048576 NEXT 131072 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"NIRVANA1M_IND\" ENABLE, \n" + - " CONSTRAINT \"FK_ADMIN_MA_REFERENCE_ADMIN_MA\" FOREIGN KEY (\"MAIL_CATEGORY_ID\")\n" + - " REFERENCES \"NIRVANA\".\"ADMIN_MAIL_CATEGORY\" (\"ID\") ENABLE NOVALIDATE\n" + - " ) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 1048576 NEXT 131072 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"NIRVANA1M\" \n" + - " LOB (\"CONTENT\") STORE AS BASICFILE (\n" + - " TABLESPACE \"NIRVANA1M\" ENABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + - " NOCACHE LOGGING \n" + - " STORAGE(INITIAL 1048576 NEXT 131072 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)) \n "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"ID\" NUMBER(11,0) NOT NULL ENABLE, \n" + + " \"GMT_CREATED\" DATE, \n" + + " \"GMT_MODIFIED\" DATE, \n" + + " \"CREATOR\" VARCHAR2(32), \n" + + " \"MODIFIER\" VARCHAR2(32), \n" + + " \"TEMPLATE_NAME\" VARCHAR2(64), \n" + + " \"MAIL_CATEGORY_ID\" NUMBER(11,0) NOT NULL ENABLE, \n" + + " \"DEFAULT_SUBJECT\" VARCHAR2(128), \n" + + " \"CONTENT_TYPE\" VARCHAR2(32) NOT NULL ENABLE, \n" + + " \"CONTENT\" CLOB, \n" + + " \"SHARE_FLAG\" VARCHAR2(32), \n" + + " \"STATUS\" VARCHAR2(32), \n" + + " \"DOUBT_IDS\" VARCHAR2(4000), \n" + + " \"PARA_1\" VARCHAR2(128), \n" + + " \"PARA_2\" VARCHAR2(128), \n" + + " \"PARA_3\" VARCHAR2(128), \n" + + " CONSTRAINT \"PK_ADMIN_MAIL_TEMPLATE\" PRIMARY KEY (\"ID\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 1048576 NEXT 131072 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"NIRVANA1M_IND\" ENABLE, \n" + + " CONSTRAINT \"FK_ADMIN_MA_REFERENCE_ADMIN_MA\" FOREIGN KEY (\"MAIL_CATEGORY_ID\")\n" + + " REFERENCES \"NIRVANA\".\"ADMIN_MAIL_CATEGORY\" (\"ID\") ENABLE NOVALIDATE\n" + + " ) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 1048576 NEXT 131072 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"NIRVANA1M\" \n" + + " LOB (\"CONTENT\") STORE AS BASICFILE (\n" + + " TABLESPACE \"NIRVANA1M\" ENABLE STORAGE IN ROW CHUNK 8192 PCTVERSION 10\n" + + " NOCACHE LOGGING \n" + + " STORAGE(INITIAL 1048576 NEXT 131072 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)) \n "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -149,7 +148,7 @@ public void test_types() throws Exception { "\tCHUNK 8192\n" + "\tNOCACHE\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest62.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest62.java index 46ccc83251..a10b96ac15 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest62.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest62.java @@ -26,38 +26,37 @@ import java.util.List; public class OracleCreateTableTest62 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " ( \"TOTAL_PRICE_ACTUAL\" NUMBER, \n" + - " \"GMT_VOUCHER_RECEIVE\" DATE, \n" + - " \"CS4_OWNER_ID\" VARCHAR2(32), \n" + - " \"DISABLE_DATE\" DATE, \n" + - " \"MEMBER_ID\" VARCHAR2(32) NOT NULL ENABLE, \n" + - " \"ITEM_ID\" NUMBER NOT NULL ENABLE, \n" + - " \"CONTACT_COUNT\" NUMBER(11,0), \n" + - " \"ORIGIN_DISABLE_DATE\" DATE, \n" + - " \"GMT_PAYMENT_REMIT\" DATE, \n" + - " \"PRODUCT_ID\" NUMBER, \n" + - " \"PERIOD\" NUMBER, \n" + - " \"PERIOD_UNIT\" VARCHAR2(32), \n" + - " \"MEMBER_TYPE\" VARCHAR2(20), \n" + - " \"GMT_AV_SEND\" DATE, \n" + - " \"GMT_ENABLE\" DATE, \n" + - " \"COMPANY\" VARCHAR2(128), \n" + - " \"PAYMENT_STATUS\" VARCHAR2(32), \n" + - " \"TMP_ALIID\" VARCHAR2(64)\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 LOGGING \n" + - " STORAGE(\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"NIRVANA1M\" \n" + - " PARTITION BY RANGE (\"GMT_VOUCHER_RECEIVE\") \n" + - " (PARTITION \"PONLY\" VALUES LESS THAN (MAXVALUE) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING \n" + - " STORAGE(INITIAL 1048576 NEXT 131072 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"NIRVANA1M\" ) "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " ( \"TOTAL_PRICE_ACTUAL\" NUMBER, \n" + + " \"GMT_VOUCHER_RECEIVE\" DATE, \n" + + " \"CS4_OWNER_ID\" VARCHAR2(32), \n" + + " \"DISABLE_DATE\" DATE, \n" + + " \"MEMBER_ID\" VARCHAR2(32) NOT NULL ENABLE, \n" + + " \"ITEM_ID\" NUMBER NOT NULL ENABLE, \n" + + " \"CONTACT_COUNT\" NUMBER(11,0), \n" + + " \"ORIGIN_DISABLE_DATE\" DATE, \n" + + " \"GMT_PAYMENT_REMIT\" DATE, \n" + + " \"PRODUCT_ID\" NUMBER, \n" + + " \"PERIOD\" NUMBER, \n" + + " \"PERIOD_UNIT\" VARCHAR2(32), \n" + + " \"MEMBER_TYPE\" VARCHAR2(20), \n" + + " \"GMT_AV_SEND\" DATE, \n" + + " \"GMT_ENABLE\" DATE, \n" + + " \"COMPANY\" VARCHAR2(128), \n" + + " \"PAYMENT_STATUS\" VARCHAR2(32), \n" + + " \"TMP_ALIID\" VARCHAR2(64)\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 LOGGING \n" + + " STORAGE(\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"NIRVANA1M\" \n" + + " PARTITION BY RANGE (\"GMT_VOUCHER_RECEIVE\") \n" + + " (PARTITION \"PONLY\" VALUES LESS THAN (MAXVALUE) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING \n" + + " STORAGE(INITIAL 1048576 NEXT 131072 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"NIRVANA1M\" ) "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -119,7 +118,7 @@ public void test_types() throws Exception { "\t\t\tCELL_FLASH_CACHE DEFAULT\n" + "\t\t)\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest63.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest63.java index cd6320f589..3d333124bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest63.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest63.java @@ -26,18 +26,17 @@ import java.util.List; public class OracleCreateTableTest63 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" OF \"ZHANGZJ\".\"T_OBJECT\" \n" + - " OIDINDEX ( PCTFREE 10 INITRANS 2 MAXTRANS 255 \n" + - " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"USERS\" ) \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"USERS\" "; + " CREATE TABLE \"SC_001\".\"TB_001\" OF \"ZHANGZJ\".\"T_OBJECT\" \n" + + " OIDINDEX ( PCTFREE 10 INITRANS 2 MAXTRANS 255 \n" + + " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"USERS\" ) \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"USERS\" "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -81,7 +80,7 @@ public void test_types() throws Exception { "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest64.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest64.java index 75abdfe52c..3646653326 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest64.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest64.java @@ -26,41 +26,40 @@ import java.util.List; public class OracleCreateTableTest64 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " (\t\"STOREID\" VARCHAR2(40) NOT NULL ENABLE, \n" + - "\t\"OPPTIME\" DATE, \n" + - "\t\"CREATETIME\" DATE, \n" + - "\t\"NAME\" VARCHAR2(254), \n" + - "\t\"FILEPATH\" VARCHAR2(254), \n" + - "\t\"FILENAME\" VARCHAR2(64), \n" + - "\t\"EVENTCODE\" VARCHAR2(200), \n" + - "\t\"FILECODE\" VARCHAR2(200), \n" + - "\t\"RESULTCODE\" VARCHAR2(200), \n" + - "\t\"RESULTMESSAGE\" VARCHAR2(4000), \n" + - "\t\"RESULTMEMO\" VARCHAR2(200), \n" + - "\t\"STATUSCODE\" VARCHAR2(200), \n" + - "\t\"STATUSMESSAGE\" VARCHAR2(4000), \n" + - "\t\"UPLOADSUCCESS\" VARCHAR2(200), \n" + - "\t\"BZ\" VARCHAR2(4000), \n" + - "\t\"DATACOUNT\" NUMBER, \n" + - "\t\"FILECONTS\" CLOB, \n" + - "\t\"XFJBH\" VARCHAR2(38)\n" + - " ) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " NOCOMPRESS NOLOGGING\n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"XINFANG\" \n" + - " LOB (\"FILECONTS\") STORE AS BASICFILE (\n" + - " TABLESPACE \"XINFANG\" ENABLE STORAGE IN ROW CHUNK 8192 RETENTION \n" + - " NOCACHE NOLOGGING \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)) "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " (\t\"STOREID\" VARCHAR2(40) NOT NULL ENABLE, \n" + + "\t\"OPPTIME\" DATE, \n" + + "\t\"CREATETIME\" DATE, \n" + + "\t\"NAME\" VARCHAR2(254), \n" + + "\t\"FILEPATH\" VARCHAR2(254), \n" + + "\t\"FILENAME\" VARCHAR2(64), \n" + + "\t\"EVENTCODE\" VARCHAR2(200), \n" + + "\t\"FILECODE\" VARCHAR2(200), \n" + + "\t\"RESULTCODE\" VARCHAR2(200), \n" + + "\t\"RESULTMESSAGE\" VARCHAR2(4000), \n" + + "\t\"RESULTMEMO\" VARCHAR2(200), \n" + + "\t\"STATUSCODE\" VARCHAR2(200), \n" + + "\t\"STATUSMESSAGE\" VARCHAR2(4000), \n" + + "\t\"UPLOADSUCCESS\" VARCHAR2(200), \n" + + "\t\"BZ\" VARCHAR2(4000), \n" + + "\t\"DATACOUNT\" NUMBER, \n" + + "\t\"FILECONTS\" CLOB, \n" + + "\t\"XFJBH\" VARCHAR2(38)\n" + + " ) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " NOCOMPRESS NOLOGGING\n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"XINFANG\" \n" + + " LOB (\"FILECONTS\") STORE AS BASICFILE (\n" + + " TABLESPACE \"XINFANG\" ENABLE STORAGE IN ROW CHUNK 8192 RETENTION \n" + + " NOCACHE NOLOGGING \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)) "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -128,7 +127,7 @@ public void test_types() throws Exception { "\tNOCACHE\n" + "\tRETENTION\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest65.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest65.java index d19c59c6c4..1a74cef70d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest65.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest65.java @@ -26,41 +26,40 @@ import java.util.List; public class OracleCreateTableTest65 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " (\t\"ID_\" NVARCHAR2(64) NOT NULL ENABLE, \n" + - "\t\"PROC_DEF_ID_\" NVARCHAR2(64), \n" + - "\t\"TASK_DEF_KEY_\" NVARCHAR2(255), \n" + - "\t\"PROC_INST_ID_\" NVARCHAR2(64), \n" + - "\t\"EXECUTION_ID_\" NVARCHAR2(64), \n" + - "\t\"PARENT_TASK_ID_\" NVARCHAR2(64), \n" + - "\t\"NAME_\" NVARCHAR2(255), \n" + - "\t\"DESCRIPTION_\" NVARCHAR2(2000), \n" + - "\t\"OWNER_\" NVARCHAR2(255), \n" + - "\t\"ASSIGNEE_\" NVARCHAR2(255), \n" + - "\t\"START_TIME_\" TIMESTAMP (6) NOT NULL ENABLE, \n" + - "\t\"CLAIM_TIME_\" TIMESTAMP (6), \n" + - "\t\"END_TIME_\" TIMESTAMP (6), \n" + - "\t\"DURATION_\" NUMBER(19,0), \n" + - "\t\"DELETE_REASON_\" NVARCHAR2(2000), \n" + - "\t\"PRIORITY_\" NUMBER(*,0), \n" + - "\t\"DUE_DATE_\" TIMESTAMP (6), \n" + - "\t\"FORM_KEY_\" NVARCHAR2(255), \n" + - "\t PRIMARY KEY (\"ID_\")\n" + - " USING INDEX REVERSE PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 196608 NEXT 8388608 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"RDP_IDX\" ENABLE\n" + - " ) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 2097152 NEXT 8388608 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"RDP_DATA\" "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " (\t\"ID_\" NVARCHAR2(64) NOT NULL ENABLE, \n" + + "\t\"PROC_DEF_ID_\" NVARCHAR2(64), \n" + + "\t\"TASK_DEF_KEY_\" NVARCHAR2(255), \n" + + "\t\"PROC_INST_ID_\" NVARCHAR2(64), \n" + + "\t\"EXECUTION_ID_\" NVARCHAR2(64), \n" + + "\t\"PARENT_TASK_ID_\" NVARCHAR2(64), \n" + + "\t\"NAME_\" NVARCHAR2(255), \n" + + "\t\"DESCRIPTION_\" NVARCHAR2(2000), \n" + + "\t\"OWNER_\" NVARCHAR2(255), \n" + + "\t\"ASSIGNEE_\" NVARCHAR2(255), \n" + + "\t\"START_TIME_\" TIMESTAMP (6) NOT NULL ENABLE, \n" + + "\t\"CLAIM_TIME_\" TIMESTAMP (6), \n" + + "\t\"END_TIME_\" TIMESTAMP (6), \n" + + "\t\"DURATION_\" NUMBER(19,0), \n" + + "\t\"DELETE_REASON_\" NVARCHAR2(2000), \n" + + "\t\"PRIORITY_\" NUMBER(*,0), \n" + + "\t\"DUE_DATE_\" TIMESTAMP (6), \n" + + "\t\"FORM_KEY_\" NVARCHAR2(255), \n" + + "\t PRIMARY KEY (\"ID_\")\n" + + " USING INDEX REVERSE PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 196608 NEXT 8388608 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"RDP_IDX\" ENABLE\n" + + " ) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 2097152 NEXT 8388608 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"RDP_DATA\" "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -129,7 +128,7 @@ public void test_types() throws Exception { "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest66.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest66.java index 405e923a95..eae6c2c566 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest66.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest66.java @@ -26,122 +26,121 @@ import java.util.List; public class OracleCreateTableTest66 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"SC_001\".\"TB_001\" \n" + - " (\t\"ID\" VARCHAR2(32) DEFAULT Sys_guid() NOT NULL ENABLE, \n" + - "\t\"ISDEL\" NUMBER(1,0) DEFAULT 0, \n" + - "\t\"DATAVERSION\" CHAR(14) DEFAULT to_char(sysdate,'yyyymmddhh24miss'), \n" + - "\t\"LRR_SFZH\" VARCHAR2(50), \n" + - "\t\"LRSJ\" DATE DEFAULT sysdate, \n" + - "\t\"JQZT\" VARCHAR2(10), \n" + - "\t\"JQDD\" VARCHAR2(200), \n" + - "\t\"BJFS\" VARCHAR2(10), \n" + - "\t\"BJSJ\" DATE, \n" + - "\t\"BJR\" VARCHAR2(150), \n" + - "\t\"BJDH\" VARCHAR2(50), \n" + - "\t\"BJNR\" VARCHAR2(4000), \n" + - "\t\"PDDDSJ\" DATE, \n" + - "\t\"PDJSSJ\" DATE, \n" + - "\t\"CJMJ\" VARCHAR2(50), \n" + - "\t\"CJDW\" VARCHAR2(50), \n" + - "\t\"CJSJ\" DATE, \n" + - "\t\"DDXCSJ\" DATE, \n" + - "\t\"CJCS\" VARCHAR2(2000), \n" + - "\t\"CJJG\" VARCHAR2(2000), \n" + - "\t\"GZYQ\" VARCHAR2(2000), \n" + - "\t\"JQBH\" VARCHAR2(30), \n" + - "\t\"XGR_SFZH\" VARCHAR2(50), \n" + - "\t\"XGSJ\" DATE DEFAULT sysdate, \n" + - "\t\"AJLY\" VARCHAR2(10) DEFAULT '03', \n" + - "\t\"JQMC\" VARCHAR2(200), \n" + - "\t\"CJJGSM\" VARCHAR2(2000), \n" + - "\t\"CJMJ_XM\" VARCHAR2(200), \n" + - "\t\"CJDW_MC\" VARCHAR2(200), \n" + - "\t\"JQLB\" VARCHAR2(20), \n" + - "\t\"XXLX\" VARCHAR2(20), \n" + - "\t\"JJDBH\" VARCHAR2(50), \n" + - "\t\"XZQH\" VARCHAR2(50), \n" + - "\t\"CBQY_BH\" VARCHAR2(50), \n" + - "\t\"SJLY\" VARCHAR2(200) DEFAULT '????', \n" + - "\t\"GXDWDM\" VARCHAR2(20), \n" + - "\t\"BJLXDM\" VARCHAR2(20), \n" + - "\t\"BJXLDM\" VARCHAR2(20), \n" + - "\t\"CJDW_OLD\" VARCHAR2(50), \n" + - "\t\"JQLY\" VARCHAR2(20), \n" + - "\t\"IS_AJ_ANALYZE\" VARCHAR2(1) DEFAULT '9', \n" + - "\t\"SJJE\" VARCHAR2(20), \n" + - "\t\"YSDWFL\" VARCHAR2(5), \n" + - "\t\"YSDWMC\" VARCHAR2(50), \n" + - "\t\"YSDWCBR\" VARCHAR2(20), \n" + - "\t\"CBRLXDH\" VARCHAR2(20), \n" + - "\t\"TBDW\" VARCHAR2(50), \n" + - "\t\"TBR\" VARCHAR2(20), \n" + - "\t\"TBRQ\" DATE, \n" + - "\t\"JZ_JQLB\" VARCHAR2(20), \n" + - "\t\"SFZR\" VARCHAR2(10), \n" + - "\t\"SJDWDM\" VARCHAR2(40), \n" + - "\t CONSTRAINT \"PK_CASE_GG_JQXX1\" PRIMARY KEY (\"ID\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 150994944 NEXT 8388608 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"RDP_IDX\" ENABLE\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " STORAGE(\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"RDP_DATA\" \n" + - " PARTITION BY RANGE (\"LRSJ\") \n" + - " (PARTITION \"T_RANGE_V1\" VALUES LESS THAN (TO_DATE(' 2015-01-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 80 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " COMPRESS FOR OLTP LOGGING \n" + - " STORAGE(INITIAL 553648128 NEXT 16384 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"RDP_DATA\" , \n" + - " PARTITION \"T_RANGE_V2\" VALUES LESS THAN (TO_DATE(' 2015-07-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 80 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " COMPRESS FOR OLTP LOGGING \n" + - " STORAGE(INITIAL 553648128 NEXT 16384 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"RDP_DATA\" , \n" + - " PARTITION \"T_RANGE_V3\" VALUES LESS THAN (TO_DATE(' 2016-01-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 80 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " COMPRESS FOR OLTP LOGGING \n" + - " STORAGE(INITIAL 553648128 NEXT 16384 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"RDP_DATA\" , \n" + - " PARTITION \"T_RANGE_V4\" VALUES LESS THAN (TO_DATE(' 2016-07-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 80 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " COMPRESS FOR OLTP LOGGING \n" + - " STORAGE(INITIAL 553648128 NEXT 16384 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"RDP_DATA\" , \n" + - " PARTITION \"T_RANGE_V5\" VALUES LESS THAN (TO_DATE(' 2017-01-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 80 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " COMPRESS FOR OLTP LOGGING \n" + - " STORAGE(INITIAL 553648128 NEXT 16384 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"RDP_DATA\" , \n" + - " PARTITION \"T_RANGE_V6\" VALUES LESS THAN (TO_DATE(' 2017-07-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 80 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " COMPRESS FOR OLTP LOGGING \n" + - " STORAGE(INITIAL 553648128 NEXT 16384 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"RDP_DATA\" , \n" + - " PARTITION \"MAXPART\" VALUES LESS THAN (MAXVALUE) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " COMPRESS FOR OLTP LOGGING \n" + - " STORAGE(INITIAL 8388608 NEXT 8388608 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"RDP_DATA\" ) "; + " CREATE TABLE \"SC_001\".\"TB_001\" \n" + + " (\t\"ID\" VARCHAR2(32) DEFAULT Sys_guid() NOT NULL ENABLE, \n" + + "\t\"ISDEL\" NUMBER(1,0) DEFAULT 0, \n" + + "\t\"DATAVERSION\" CHAR(14) DEFAULT to_char(sysdate,'yyyymmddhh24miss'), \n" + + "\t\"LRR_SFZH\" VARCHAR2(50), \n" + + "\t\"LRSJ\" DATE DEFAULT sysdate, \n" + + "\t\"JQZT\" VARCHAR2(10), \n" + + "\t\"JQDD\" VARCHAR2(200), \n" + + "\t\"BJFS\" VARCHAR2(10), \n" + + "\t\"BJSJ\" DATE, \n" + + "\t\"BJR\" VARCHAR2(150), \n" + + "\t\"BJDH\" VARCHAR2(50), \n" + + "\t\"BJNR\" VARCHAR2(4000), \n" + + "\t\"PDDDSJ\" DATE, \n" + + "\t\"PDJSSJ\" DATE, \n" + + "\t\"CJMJ\" VARCHAR2(50), \n" + + "\t\"CJDW\" VARCHAR2(50), \n" + + "\t\"CJSJ\" DATE, \n" + + "\t\"DDXCSJ\" DATE, \n" + + "\t\"CJCS\" VARCHAR2(2000), \n" + + "\t\"CJJG\" VARCHAR2(2000), \n" + + "\t\"GZYQ\" VARCHAR2(2000), \n" + + "\t\"JQBH\" VARCHAR2(30), \n" + + "\t\"XGR_SFZH\" VARCHAR2(50), \n" + + "\t\"XGSJ\" DATE DEFAULT sysdate, \n" + + "\t\"AJLY\" VARCHAR2(10) DEFAULT '03', \n" + + "\t\"JQMC\" VARCHAR2(200), \n" + + "\t\"CJJGSM\" VARCHAR2(2000), \n" + + "\t\"CJMJ_XM\" VARCHAR2(200), \n" + + "\t\"CJDW_MC\" VARCHAR2(200), \n" + + "\t\"JQLB\" VARCHAR2(20), \n" + + "\t\"XXLX\" VARCHAR2(20), \n" + + "\t\"JJDBH\" VARCHAR2(50), \n" + + "\t\"XZQH\" VARCHAR2(50), \n" + + "\t\"CBQY_BH\" VARCHAR2(50), \n" + + "\t\"SJLY\" VARCHAR2(200) DEFAULT '????', \n" + + "\t\"GXDWDM\" VARCHAR2(20), \n" + + "\t\"BJLXDM\" VARCHAR2(20), \n" + + "\t\"BJXLDM\" VARCHAR2(20), \n" + + "\t\"CJDW_OLD\" VARCHAR2(50), \n" + + "\t\"JQLY\" VARCHAR2(20), \n" + + "\t\"IS_AJ_ANALYZE\" VARCHAR2(1) DEFAULT '9', \n" + + "\t\"SJJE\" VARCHAR2(20), \n" + + "\t\"YSDWFL\" VARCHAR2(5), \n" + + "\t\"YSDWMC\" VARCHAR2(50), \n" + + "\t\"YSDWCBR\" VARCHAR2(20), \n" + + "\t\"CBRLXDH\" VARCHAR2(20), \n" + + "\t\"TBDW\" VARCHAR2(50), \n" + + "\t\"TBR\" VARCHAR2(20), \n" + + "\t\"TBRQ\" DATE, \n" + + "\t\"JZ_JQLB\" VARCHAR2(20), \n" + + "\t\"SFZR\" VARCHAR2(10), \n" + + "\t\"SJDWDM\" VARCHAR2(40), \n" + + "\t CONSTRAINT \"PK_CASE_GG_JQXX1\" PRIMARY KEY (\"ID\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 150994944 NEXT 8388608 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"RDP_IDX\" ENABLE\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " STORAGE(\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"RDP_DATA\" \n" + + " PARTITION BY RANGE (\"LRSJ\") \n" + + " (PARTITION \"T_RANGE_V1\" VALUES LESS THAN (TO_DATE(' 2015-01-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 80 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " COMPRESS FOR OLTP LOGGING \n" + + " STORAGE(INITIAL 553648128 NEXT 16384 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"RDP_DATA\" , \n" + + " PARTITION \"T_RANGE_V2\" VALUES LESS THAN (TO_DATE(' 2015-07-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 80 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " COMPRESS FOR OLTP LOGGING \n" + + " STORAGE(INITIAL 553648128 NEXT 16384 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"RDP_DATA\" , \n" + + " PARTITION \"T_RANGE_V3\" VALUES LESS THAN (TO_DATE(' 2016-01-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 80 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " COMPRESS FOR OLTP LOGGING \n" + + " STORAGE(INITIAL 553648128 NEXT 16384 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"RDP_DATA\" , \n" + + " PARTITION \"T_RANGE_V4\" VALUES LESS THAN (TO_DATE(' 2016-07-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 80 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " COMPRESS FOR OLTP LOGGING \n" + + " STORAGE(INITIAL 553648128 NEXT 16384 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"RDP_DATA\" , \n" + + " PARTITION \"T_RANGE_V5\" VALUES LESS THAN (TO_DATE(' 2017-01-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 80 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " COMPRESS FOR OLTP LOGGING \n" + + " STORAGE(INITIAL 553648128 NEXT 16384 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"RDP_DATA\" , \n" + + " PARTITION \"T_RANGE_V6\" VALUES LESS THAN (TO_DATE(' 2017-07-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS', 'NLS_CALENDAR=GREGORIAN')) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 80 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " COMPRESS FOR OLTP LOGGING \n" + + " STORAGE(INITIAL 553648128 NEXT 16384 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"RDP_DATA\" , \n" + + " PARTITION \"MAXPART\" VALUES LESS THAN (MAXVALUE) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " COMPRESS FOR OLTP LOGGING \n" + + " STORAGE(INITIAL 8388608 NEXT 8388608 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"RDP_DATA\" ) "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -376,7 +375,7 @@ public void test_types() throws Exception { "\t\t\tCELL_FLASH_CACHE DEFAULT\n" + "\t\t)\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest67.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest67.java index 63a1297a79..f2ae0dff95 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest67.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest67.java @@ -27,10 +27,9 @@ import java.util.List; public class OracleCreateTableTest67 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE new_duplications_index (\"ID\" PRIMARY KEY, project_snapshot_id, snapshot_id, hash, index_in_file, start_line, end_line) NOLOGGING AS SELECT CAST(duplications_index_seq.nextval AS NUMBER(38)) \"ID\", project_snapshot_id, snapshot_id, hash, index_in_file, start_line, end_line FROM duplications_index "; + " CREATE TABLE new_duplications_index (\"ID\" PRIMARY KEY, project_snapshot_id, snapshot_id, hash, index_in_file, start_line, end_line) NOLOGGING AS SELECT CAST(duplications_index_seq.nextval AS NUMBER(38)) \"ID\", project_snapshot_id, snapshot_id, hash, index_in_file, start_line, end_line FROM duplications_index "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,7 +52,7 @@ public void test_types() throws Exception { "SELECT CAST(duplications_index_seq.NEXTVAL AS NUMBER(38)) AS \"ID\", project_snapshot_id, snapshot_id, hash, index_in_file\n" + "\t, start_line, end_line\n" + "FROM duplications_index",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest68.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest68.java index 8d48813da1..e6154d760e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest68.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest68.java @@ -24,20 +24,19 @@ import java.util.List; public class OracleCreateTableTest68 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"JWGZPT\".\"A\" \n" + - " ( \"XM\" VARCHAR2(100), \n" + - " \"SFZH\" VARCHAR2(20), \n" + - " \"GZDW\" VARCHAR2(200)\n" + - " ) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 81920 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"TBS_JWGZPT\" "; + " CREATE TABLE \"JWGZPT\".\"A\" \n" + + " ( \"XM\" VARCHAR2(100), \n" + + " \"SFZH\" VARCHAR2(20), \n" + + " \"GZDW\" VARCHAR2(200)\n" + + " ) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 81920 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"TBS_JWGZPT\" "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); @@ -69,7 +68,7 @@ public void test_types() throws Exception { "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest69.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest69.java index dbe28d1388..f9bdab3d60 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest69.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest69.java @@ -23,20 +23,19 @@ import java.util.List; public class OracleCreateTableTest69 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE HASH_TABLE\n" + - "(\n" + - "COL NUMBER(8),\n" + - "INF VARCHAR2(100)\n" + - ")\n" + - "PARTITION BY HASH (COL)\n" + - "(\n" + - "PARTITION PART01 TABLESPACE HASH_TS01,\n" + - "PARTITION PART02 TABLESPACE HASH_TS02,\n" + - "PARTITION PART03 TABLESPACE HASH_TS03\n" + - ") "; + " CREATE TABLE HASH_TABLE\n" + + "(\n" + + "COL NUMBER(8),\n" + + "INF VARCHAR2(100)\n" + + ")\n" + + "PARTITION BY HASH (COL)\n" + + "(\n" + + "PARTITION PART01 TABLESPACE HASH_TS01,\n" + + "PARTITION PART02 TABLESPACE HASH_TS02,\n" + + "PARTITION PART03 TABLESPACE HASH_TS03\n" + + ") "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); @@ -56,7 +55,7 @@ public void test_types() throws Exception { "\tPARTITION PART03\n" + "\t\tTABLESPACE HASH_TS03\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest7.java index 87df7043c6..8266674ce1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest7.java @@ -25,12 +25,11 @@ import java.util.List; public class OracleCreateTableTest7 extends OracleTest { - public void test_0() throws Exception { String sql = // - "create table \"ALIBABA1949\".\"SYS_JOURNAL_209051\" (" + // - "C0 VARCHAR2(256), opcode char(1), partno number, rid rowid, primary key( C0 , rid )" + // - ") organization index TABLESPACE \"APPINDX1M\""; + "create table \"ALIBABA1949\".\"SYS_JOURNAL_209051\" (" + // + "C0 VARCHAR2(256), opcode char(1), partno number, rid rowid, primary key( C0 , rid )" + // + ") organization index TABLESPACE \"APPINDX1M\""; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest70.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest70.java index b85e59a510..7e3d8fdca6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest70.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest70.java @@ -23,15 +23,14 @@ import java.util.List; public class OracleCreateTableTest70 extends OracleTest { - public void test_types() throws Exception { String sql = // - " create table month_part (c1 number,c3 date)\n" + - "partition by range(c3)\n" + - "interval(numtoyminterval (1,'month'))\n" + - "(partition part1 values less than (to_date('2010-01-01','YYYY-MM-DD')),\n" + - "partition part2 values less than (to_date('2010-02-01','YYYY-MM-DD'))\n" + - ") "; + " create table month_part (c1 number,c3 date)\n" + + "partition by range(c3)\n" + + "interval(numtoyminterval (1,'month'))\n" + + "(partition part1 values less than (to_date('2010-01-01','YYYY-MM-DD')),\n" + + "partition part2 values less than (to_date('2010-02-01','YYYY-MM-DD'))\n" + + ") "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); @@ -47,7 +46,7 @@ public void test_types() throws Exception { "\tPARTITION part1 VALUES LESS THAN (to_date('2010-01-01', 'YYYY-MM-DD')),\n" + "\tPARTITION part2 VALUES LESS THAN (to_date('2010-02-01', 'YYYY-MM-DD'))\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest71.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest71.java index 5e9014f0af..890005969a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest71.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest71.java @@ -23,20 +23,19 @@ import java.util.List; public class OracleCreateTableTest71 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"CMIS\".\"DR$IDX_FULL_BIZ_TABLE_NAME$N\" \n" + - " (\t\"NLT_DOCID\" NUMBER(38,0), \n" + - "\t\"NLT_MARK\" CHAR(1) NOT NULL ENABLE, \n" + - "\t PRIMARY KEY (\"NLT_DOCID\") ENABLE\n" + - " ) ORGANIZATION INDEX NOCOMPRESS PCTFREE 10 INITRANS 2 MAXTRANS 255 LOGGING\n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"CMISTBS\" \n" + - " PCTTHRESHOLD 50\n" + - " MONITORING "; + " CREATE TABLE \"CMIS\".\"DR$IDX_FULL_BIZ_TABLE_NAME$N\" \n" + + " (\t\"NLT_DOCID\" NUMBER(38,0), \n" + + "\t\"NLT_MARK\" CHAR(1) NOT NULL ENABLE, \n" + + "\t PRIMARY KEY (\"NLT_DOCID\") ENABLE\n" + + " ) ORGANIZATION INDEX NOCOMPRESS PCTFREE 10 INITRANS 2 MAXTRANS 255 LOGGING\n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"CMISTBS\" \n" + + " PCTTHRESHOLD 50\n" + + " MONITORING "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); @@ -70,7 +69,7 @@ public void test_types() throws Exception { "\t)\n" + "\tPCTTHRESHOLD 50\n" + "MONITORING",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest72.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest72.java index 2846c401a4..8baa8fbd87 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest72.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest72.java @@ -23,23 +23,22 @@ import java.util.List; public class OracleCreateTableTest72 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE GLOBAL TEMPORARY TABLE \"RETL\".\"REFFERAL_MEMBER\" \n" + - " (\t\"ID\" NUMBER NOT NULL ENABLE, \n" + - "\t\"GMT_CREATE\" DATE NOT NULL ENABLE, \n" + - "\t\"GMT_MODIFIED\" DATE NOT NULL ENABLE, \n" + - "\t\"FROM_NAME\" VARCHAR2(128) NOT NULL ENABLE, \n" + - "\t\"FROM_EMAIL\" VARCHAR2(128) NOT NULL ENABLE, \n" + - "\t\"TO_NAME\" VARCHAR2(128), \n" + - "\t\"TO_EMAIL\" VARCHAR2(128) NOT NULL ENABLE, \n" + - "\t\"MESSAGE\" VARCHAR2(512), \n" + - "\t\"GMT_JOIN_MEMBER\" DATE, \n" + - "\t\"SOURCE_CODE\" VARCHAR2(32) NOT NULL ENABLE, \n" + - "\t\"IS_FROM_MEMBER\" CHAR(1) NOT NULL ENABLE, \n" + - "\t\"IS_JOIN\" CHAR(1) NOT NULL ENABLE\n" + - " ) ON COMMIT DELETE ROWS "; + " CREATE GLOBAL TEMPORARY TABLE \"RETL\".\"REFFERAL_MEMBER\" \n" + + " (\t\"ID\" NUMBER NOT NULL ENABLE, \n" + + "\t\"GMT_CREATE\" DATE NOT NULL ENABLE, \n" + + "\t\"GMT_MODIFIED\" DATE NOT NULL ENABLE, \n" + + "\t\"FROM_NAME\" VARCHAR2(128) NOT NULL ENABLE, \n" + + "\t\"FROM_EMAIL\" VARCHAR2(128) NOT NULL ENABLE, \n" + + "\t\"TO_NAME\" VARCHAR2(128), \n" + + "\t\"TO_EMAIL\" VARCHAR2(128) NOT NULL ENABLE, \n" + + "\t\"MESSAGE\" VARCHAR2(512), \n" + + "\t\"GMT_JOIN_MEMBER\" DATE, \n" + + "\t\"SOURCE_CODE\" VARCHAR2(32) NOT NULL ENABLE, \n" + + "\t\"IS_FROM_MEMBER\" CHAR(1) NOT NULL ENABLE, \n" + + "\t\"IS_JOIN\" CHAR(1) NOT NULL ENABLE\n" + + " ) ON COMMIT DELETE ROWS "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); @@ -62,7 +61,7 @@ public void test_types() throws Exception { "\t\"IS_JOIN\" CHAR(1) NOT NULL ENABLE\n" + ")\n" + "ON COMMIT DELETE ROWS",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest74.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest74.java index a5d3064986..ba81389179 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest74.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest74.java @@ -23,38 +23,37 @@ import java.util.List; public class OracleCreateTableTest74 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE \"WEB_FPXX\".\"XX_MX_0901\" \n" + - " (\t\"NSRSBH\" VARCHAR2(20) NOT NULL ENABLE, \n" + - "\t\"SBRQ\" DATE NOT NULL ENABLE, \n" + - "\t\"TBRQ\" DATE, \n" + - "\t\"SSSQQ\" DATE NOT NULL ENABLE, \n" + - "\t\"FPDM\" CHAR(10) NOT NULL ENABLE, \n" + - "\t\"FPHM\" CHAR(8) NOT NULL ENABLE, \n" + - "\t\"KPRQ\" DATE, \n" + - "\t\"JE\" NUMBER(14,2) NOT NULL ENABLE, \n" + - "\t\"SE\" NUMBER(14,2) NOT NULL ENABLE, \n" + - "\t\"GHF_NSRSBH\" VARCHAR2(20) NOT NULL ENABLE, \n" + - "\t\"ZF_BZ\" CHAR(1) NOT NULL ENABLE, \n" + - "\t\"SWJG_DM\" CHAR(11) NOT NULL ENABLE, \n" + - "\t\"BZ\" CHAR(1), \n" + - "\t\"FP_LB\" VARCHAR2(4), \n" + - "\t CONSTRAINT \"PK_XX_MX_0901\" PRIMARY KEY (\"FPDM\", \"FPHM\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"FPXX_IDX\" ENABLE\n" + - " ) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 2 MAXTRANS 255 \n" + - " NOCOMPRESS NOLOGGING\n" + - " STORAGE(INITIAL 24576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"FPXX_DAT\" \n" + - " CACHE PARALLEL "; + "CREATE TABLE \"WEB_FPXX\".\"XX_MX_0901\" \n" + + " (\t\"NSRSBH\" VARCHAR2(20) NOT NULL ENABLE, \n" + + "\t\"SBRQ\" DATE NOT NULL ENABLE, \n" + + "\t\"TBRQ\" DATE, \n" + + "\t\"SSSQQ\" DATE NOT NULL ENABLE, \n" + + "\t\"FPDM\" CHAR(10) NOT NULL ENABLE, \n" + + "\t\"FPHM\" CHAR(8) NOT NULL ENABLE, \n" + + "\t\"KPRQ\" DATE, \n" + + "\t\"JE\" NUMBER(14,2) NOT NULL ENABLE, \n" + + "\t\"SE\" NUMBER(14,2) NOT NULL ENABLE, \n" + + "\t\"GHF_NSRSBH\" VARCHAR2(20) NOT NULL ENABLE, \n" + + "\t\"ZF_BZ\" CHAR(1) NOT NULL ENABLE, \n" + + "\t\"SWJG_DM\" CHAR(11) NOT NULL ENABLE, \n" + + "\t\"BZ\" CHAR(1), \n" + + "\t\"FP_LB\" VARCHAR2(4), \n" + + "\t CONSTRAINT \"PK_XX_MX_0901\" PRIMARY KEY (\"FPDM\", \"FPHM\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 1048576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"FPXX_IDX\" ENABLE\n" + + " ) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 2 MAXTRANS 255 \n" + + " NOCOMPRESS NOLOGGING\n" + + " STORAGE(INITIAL 24576 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"FPXX_DAT\" \n" + + " CACHE PARALLEL "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); @@ -119,7 +118,7 @@ public void test_types() throws Exception { ")\n" + "PARALLEL\n" + "CACHE",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest75.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest75.java index 3c316cdc14..971de785c6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest75.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest75.java @@ -23,32 +23,31 @@ import java.util.List; public class OracleCreateTableTest75 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE TABLE \"CMIS\".\"DR$IDX_FULL_BIZ_TABLE_NAME$R\" \n" + - " (\t\"ROW_NO\" NUMBER(3,0), \n" + - "\t\"DATA\" BLOB, \n" + - "\t CONSTRAINT \"DRC$IDX_FULL_BIZ_TABLE_NAME$R\" PRIMARY KEY (\"ROW_NO\")\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"CMISTBS\" ENABLE\n" + - " ) SEGMENT CREATION IMMEDIATE \n" + - " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + - " NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + - " TABLESPACE \"CMISTBS\" \n" + - " LOB (\"DATA\") STORE AS BASICFILE (\n" + - " TABLESPACE \"CMISTBS\" ENABLE STORAGE IN ROW CHUNK 8192 RETENTION \n" + - " CACHE \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + - " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)) \n" + - " MONITORING "; + "CREATE TABLE \"CMIS\".\"DR$IDX_FULL_BIZ_TABLE_NAME$R\" \n" + + " (\t\"ROW_NO\" NUMBER(3,0), \n" + + "\t\"DATA\" BLOB, \n" + + "\t CONSTRAINT \"DRC$IDX_FULL_BIZ_TABLE_NAME$R\" PRIMARY KEY (\"ROW_NO\")\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"CMISTBS\" ENABLE\n" + + " ) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 \n" + + " NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"CMISTBS\" \n" + + " LOB (\"DATA\") STORE AS BASICFILE (\n" + + " TABLESPACE \"CMISTBS\" ENABLE STORAGE IN ROW CHUNK 8192 RETENTION \n" + + " CACHE \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1\n" + + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)) \n" + + " MONITORING "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); @@ -118,7 +117,7 @@ public void test_types() throws Exception { "\tRETENTION\n" + ")\n" + "MONITORING",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest76.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest76.java index 98543eef26..c1c23f02c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest76.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest76.java @@ -23,30 +23,29 @@ import java.util.List; public class OracleCreateTableTest76 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE TABLE \"TCC_CPR\".\"KTV_CONFIG_SCALE_DETAILS_TEMP\" \n" + - " (\t\"ID\" NUMBER(10,0) NOT NULL ENABLE, \n" + - "\t\"CONTRACT_HEAD_ID\" NUMBER(10,0) NOT NULL ENABLE, \n" + - "\t\"PRODUCT_BIG_ID\" NUMBER(10,0), \n" + - "\t\"PRODUCT_ID\" NUMBER(10,0), \n" + - "\t\"SCALE\" NUMBER(10,2), \n" + - "\t\"ENABLED_FLAG\" CHAR(1), \n" + - "\t\"CREATED_BY\" NUMBER(10,0), \n" + - "\t\"CREATION_DATE\" TIMESTAMP (6), \n" + - "\t\"LAST_UPDATED_BY\" NUMBER(10,0), \n" + - "\t\"LAST_UPDATE_DATE\" TIMESTAMP (6), \n" + - "\t\"CON_TYPE\" VARCHAR2(2), \n" + - "\t CONSTRAINT \"P_ID\" PRIMARY KEY (\"ID\") DEFERRABLE INITIALLY DEFERRED\n" + - " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"TCC_CPR_TSP\" ENABLE\n" + - " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + - " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + - " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + - " TABLESPACE \"TCC_CPR_TSP\" "; + " CREATE TABLE \"TCC_CPR\".\"KTV_CONFIG_SCALE_DETAILS_TEMP\" \n" + + " (\t\"ID\" NUMBER(10,0) NOT NULL ENABLE, \n" + + "\t\"CONTRACT_HEAD_ID\" NUMBER(10,0) NOT NULL ENABLE, \n" + + "\t\"PRODUCT_BIG_ID\" NUMBER(10,0), \n" + + "\t\"PRODUCT_ID\" NUMBER(10,0), \n" + + "\t\"SCALE\" NUMBER(10,2), \n" + + "\t\"ENABLED_FLAG\" CHAR(1), \n" + + "\t\"CREATED_BY\" NUMBER(10,0), \n" + + "\t\"CREATION_DATE\" TIMESTAMP (6), \n" + + "\t\"LAST_UPDATED_BY\" NUMBER(10,0), \n" + + "\t\"LAST_UPDATE_DATE\" TIMESTAMP (6), \n" + + "\t\"CON_TYPE\" VARCHAR2(2), \n" + + "\t CONSTRAINT \"P_ID\" PRIMARY KEY (\"ID\") DEFERRABLE INITIALLY DEFERRED\n" + + " USING INDEX PCTFREE 10 INITRANS 2 MAXTRANS 255 COMPUTE STATISTICS \n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"TCC_CPR_TSP\" ENABLE\n" + + " ) PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT)\n" + + " TABLESPACE \"TCC_CPR_TSP\" "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); @@ -102,7 +101,7 @@ public void test_types() throws Exception { "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest77.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest77.java index cac33c7197..64c81d8631 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest77.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest77.java @@ -23,47 +23,46 @@ import java.util.List; public class OracleCreateTableTest77 extends OracleTest { - public void test_types() throws Exception { String sql = // - " CREATE OR REPLACE FORCE VIEW \"TPC_CPR\".\"TPC_CPR_ITEM_PRICE_V\" (\"CONTRACT_HEADER_ID\", \"CONTRACT_NUMBER\", \"CONTRACT_PRODUCT_ID\", \"PROD_ID\", \"PROD_DES\", \"MI\", \"CONTRACT_DEVICE_ID\", \"DEV_ID\", \"DEV_DES\", \"SITE_ID\", \"SITE_QUANTITY\", \"SITE_DES\", \"CONTRACT_MODULE_ID\", \"MOD_ID\", \"MOD_DES\", \"MODULE_QUANTITY\", \"CONTRACT_ITEM_ID\", \"ITEM_ID\", \"ITEM_DES\", \"ITEM_TYPE\", \"ITEM_QUANTITY\", \"HARD_PARAM\", \"SOFT_PARAM\", \"MAKE_PARAM\", \"RISK_PARAM\", \"SOFT_COST_PARAM\", \"PROD_MANAGER\", \"COST_PRICE04\", \"CONFIRM_ITEM_PARAM\", \"CONFIRM_FLAG04\", \"COST_PRICE\", \"COST_PRICE_PARAMETER\", \"OLD_COST\", \"LIST_PRICE\", \"ITEM_CODE\", \"CONFIRM_COST_PRICE04\", \"PROD_ATTRIBUTE_ID\", \"ITEM_CHIP\") AS \n" + - " select Mod.CONTRACT_HEADER_ID,'',Mod.CONTRACT_PRODUCT_ID,\n" + - "Mod.PROD_ID , Mod.PROD_DES,Mod.MI, Mod.CONTRACT_DEVICE_ID, Mod.DEV_ID,Mod.DEV_DES,\n" + - "Mod.SITE_ID , Mod.SITE_QUANTITY, Mod.SITE_DES, Mod.CONTRACT_MODULE_ID,\n" + - "Mod.MOD_ID, Mod.MOD_DES, Mod.module_quantity, I.CONTRACT_ITEM_ID, I.INVENTORY_ITEM_ID\n" + - "ITEM_ID, I.DESCRIPTION ITEM_DES,I.ATTRIBUTE1 ITEM_TYPE , I.item_quantity,\n" + - "Mod.hard_param,Mod.soft_param, Mod.make_param, Mod.risk_param, Mod.soft_cost_param,\n" + - "Mod.prod_manager, I.COST_PRICE04, I.CONFIRM_ITEM_PARAM, I.CONFIRM_FLAG04,\n" + - "I.cost_price, I.COST_PRICE_PARAMETER,I.OLD_COST,I.LIST_PRICE,I.ITEM_CODE,\n" + - "I.CONFIRM_COST_PRICE04,I.PROD_ATTRIBUTE_ID,I.ITEM_CHIP from ( SELECT p.CONTRACT_HEADER_ID,'',P.CONTRACT_PRODUCT_ID,\n" + - "P.INVENTORY_ITEM_ID PROD_ID,P.DESCRIPTION PROD_DES,P.MI, D.CONTRACT_DEVICE_ID,\n" + - "D.INVENTORY_ITEM_ID DEV_ID,D.DESCRIPTION DEV_DES, S.SITE_ID, S.SITE_QUANTITY,\n" + - "( S.SITE_ADDRESS||S.SECOND_LEVEL|| S.THIRD_LEVEL|| S.FOURTH_LEVEL) SITE_DES,\n" + - "M.CONTRACT_MODULE_ID, M.INVENTORY_ITEM_ID MOD_ID , M.DESCRIPTION MOD_DES,\n" + - "M.module_quantity, p.hard_param, p.soft_param, p.make_param,p.risk_param,\n" + - "p.soft_cost_param, p.prod_manager FROM ( SELECT PROD.*,SYS_ITEM1.ATTRIBUTE2\n" + - "MI,SYS_ITEM1.DESCRIPTION, SYS_ITEM1.ATTRIBUTE3 PROD_MANAGER , SYS_ITEM1.HARD_PARAM,\n" + - "SYS_ITEM1.SOFT_PARAM,SYS_ITEM1.MAKE_PARAM,SYS_ITEM1.RISK_PARAM, SYS_ITEM1.SOFT_COST_PARAM\n" + - "FROM TPC_CPR.TPC_CPR_PRODUCTS PROD, TPC_CPR.TPC_CPR_SYSTEM_ITEMS SYS_ITEM1\n" + - "WHERE PROD.INVENTORY_ITEM_ID = SYS_ITEM1.INVENTORY_ITEM_ID AND SYS_ITEM1.ITEM_TYPE\n" + - "= 'CP' AND PROD.ENABLED_FLAG = 'Y') P, ( SELECT DEV.*,SYS_ITEM2.DESCRIPTION\n" + - "FROM TPC_CPR.TPC_CPR_DEVICES DEV,TPC_CPR.TPC_CPR_SYSTEM_ITEMS SYS_ITEM2\n" + - "WHERE DEV.INVENTORY_ITEM_ID = SYS_ITEM2.INVENTORY_ITEM_ID AND SYS_ITEM2.ITEM_TYPE\n" + - "= 'SB' AND DEV.ENABLED_FLAG = 'Y') D, ( SELECT SITE.* FROM TPC_CPR.TPC_CPR_SITES\n" + - "SITE WHERE SITE.ENABLED_FLAG = 'Y') S, ( SELECT MOD.*,SYS_ITEM3.DESCRIPTION\n" + - "FROM TPC_CPR.TPC_CPR_MODULES MOD,TPC_CPR.TPC_CPR_SYSTEM_ITEMS SYS_ITEM3\n" + - "WHERE MOD.INVENTORY_ITEM_ID = SYS_ITEM3.INVENTORY_ITEM_ID AND SYS_ITEM3.ITEM_TYPE\n" + - "= 'MK' AND MOD.ENABLED_FLAG = 'Y') M WHERE P.CONTRACT_PRODUCT_ID = D.CONTRACT_PRODUCT_ID\n" + - "AND D.CONTRACT_DEVICE_ID = S.CONTRACT_DEVICE_ID AND S.SITE_ID = M.SITE_ID\n" + - ") Mod LEFT JOIN ( ( SELECT ITEM.CONTRACT_MODULE_ID CONTRACT_MODULE_ID,\n" + - "ITEM.INVENTORY_ITEM_ID, ITEM.CONTRACT_ITEM_ID, SYS_ITEM.DESCRIPTION, SYS_ITEM.ATTRIBUTE1,\n" + - "ITEM.ITEM_QUANTITY, SYS_ITEM.CATALOG_SOFTWARE_FLAG, P.COST_PRICE, P.COST_PRICE_PARAMETER,\n" + - "P.CONFIRM_FLAG,P.COST_PRICE04, P.CONFIRM_ITEM_PARAM, P.CONFIRM_FLAG04,\n" + - "P.OLD_COST,P.LIST_PRICE, SYS_ITEM.ITEM_CODE, P.CONFIRM_COST_PRICE04, SYS_ITEM.ITEM_ID\n" + - "PROD_ATTRIBUTE_ID,SYS_ITEM.ITEM_CHIP FROM TPC_CPR.TPC_CPR_ITEMS ITEM, TPC_CPR.TPC_CPR_SYSTEM_ITEMS\n" + - "SYS_ITEM, TPC_CPR.TPC_CPR_PRICE P where ITEM.INVENTORY_ITEM_ID = P.INVENTORY_ITEM_ID\n" + - "AND ITEM.INVENTORY_ITEM_ID = SYS_ITEM.INVENTORY_ITEM_ID AND ITEM.ENABLED_FLAG\n" + - "= 'Y' ) ) I ON Mod.CONTRACT_MODULE_ID = I.CONTRACT_MODULE_ID "; + " CREATE OR REPLACE FORCE VIEW \"TPC_CPR\".\"TPC_CPR_ITEM_PRICE_V\" (\"CONTRACT_HEADER_ID\", \"CONTRACT_NUMBER\", \"CONTRACT_PRODUCT_ID\", \"PROD_ID\", \"PROD_DES\", \"MI\", \"CONTRACT_DEVICE_ID\", \"DEV_ID\", \"DEV_DES\", \"SITE_ID\", \"SITE_QUANTITY\", \"SITE_DES\", \"CONTRACT_MODULE_ID\", \"MOD_ID\", \"MOD_DES\", \"MODULE_QUANTITY\", \"CONTRACT_ITEM_ID\", \"ITEM_ID\", \"ITEM_DES\", \"ITEM_TYPE\", \"ITEM_QUANTITY\", \"HARD_PARAM\", \"SOFT_PARAM\", \"MAKE_PARAM\", \"RISK_PARAM\", \"SOFT_COST_PARAM\", \"PROD_MANAGER\", \"COST_PRICE04\", \"CONFIRM_ITEM_PARAM\", \"CONFIRM_FLAG04\", \"COST_PRICE\", \"COST_PRICE_PARAMETER\", \"OLD_COST\", \"LIST_PRICE\", \"ITEM_CODE\", \"CONFIRM_COST_PRICE04\", \"PROD_ATTRIBUTE_ID\", \"ITEM_CHIP\") AS \n" + + " select Mod.CONTRACT_HEADER_ID,'',Mod.CONTRACT_PRODUCT_ID,\n" + + "Mod.PROD_ID , Mod.PROD_DES,Mod.MI, Mod.CONTRACT_DEVICE_ID, Mod.DEV_ID,Mod.DEV_DES,\n" + + "Mod.SITE_ID , Mod.SITE_QUANTITY, Mod.SITE_DES, Mod.CONTRACT_MODULE_ID,\n" + + "Mod.MOD_ID, Mod.MOD_DES, Mod.module_quantity, I.CONTRACT_ITEM_ID, I.INVENTORY_ITEM_ID\n" + + "ITEM_ID, I.DESCRIPTION ITEM_DES,I.ATTRIBUTE1 ITEM_TYPE , I.item_quantity,\n" + + "Mod.hard_param,Mod.soft_param, Mod.make_param, Mod.risk_param, Mod.soft_cost_param,\n" + + "Mod.prod_manager, I.COST_PRICE04, I.CONFIRM_ITEM_PARAM, I.CONFIRM_FLAG04,\n" + + "I.cost_price, I.COST_PRICE_PARAMETER,I.OLD_COST,I.LIST_PRICE,I.ITEM_CODE,\n" + + "I.CONFIRM_COST_PRICE04,I.PROD_ATTRIBUTE_ID,I.ITEM_CHIP from ( SELECT p.CONTRACT_HEADER_ID,'',P.CONTRACT_PRODUCT_ID,\n" + + "P.INVENTORY_ITEM_ID PROD_ID,P.DESCRIPTION PROD_DES,P.MI, D.CONTRACT_DEVICE_ID,\n" + + "D.INVENTORY_ITEM_ID DEV_ID,D.DESCRIPTION DEV_DES, S.SITE_ID, S.SITE_QUANTITY,\n" + + "( S.SITE_ADDRESS||S.SECOND_LEVEL|| S.THIRD_LEVEL|| S.FOURTH_LEVEL) SITE_DES,\n" + + "M.CONTRACT_MODULE_ID, M.INVENTORY_ITEM_ID MOD_ID , M.DESCRIPTION MOD_DES,\n" + + "M.module_quantity, p.hard_param, p.soft_param, p.make_param,p.risk_param,\n" + + "p.soft_cost_param, p.prod_manager FROM ( SELECT PROD.*,SYS_ITEM1.ATTRIBUTE2\n" + + "MI,SYS_ITEM1.DESCRIPTION, SYS_ITEM1.ATTRIBUTE3 PROD_MANAGER , SYS_ITEM1.HARD_PARAM,\n" + + "SYS_ITEM1.SOFT_PARAM,SYS_ITEM1.MAKE_PARAM,SYS_ITEM1.RISK_PARAM, SYS_ITEM1.SOFT_COST_PARAM\n" + + "FROM TPC_CPR.TPC_CPR_PRODUCTS PROD, TPC_CPR.TPC_CPR_SYSTEM_ITEMS SYS_ITEM1\n" + + "WHERE PROD.INVENTORY_ITEM_ID = SYS_ITEM1.INVENTORY_ITEM_ID AND SYS_ITEM1.ITEM_TYPE\n" + + "= 'CP' AND PROD.ENABLED_FLAG = 'Y') P, ( SELECT DEV.*,SYS_ITEM2.DESCRIPTION\n" + + "FROM TPC_CPR.TPC_CPR_DEVICES DEV,TPC_CPR.TPC_CPR_SYSTEM_ITEMS SYS_ITEM2\n" + + "WHERE DEV.INVENTORY_ITEM_ID = SYS_ITEM2.INVENTORY_ITEM_ID AND SYS_ITEM2.ITEM_TYPE\n" + + "= 'SB' AND DEV.ENABLED_FLAG = 'Y') D, ( SELECT SITE.* FROM TPC_CPR.TPC_CPR_SITES\n" + + "SITE WHERE SITE.ENABLED_FLAG = 'Y') S, ( SELECT MOD.*,SYS_ITEM3.DESCRIPTION\n" + + "FROM TPC_CPR.TPC_CPR_MODULES MOD,TPC_CPR.TPC_CPR_SYSTEM_ITEMS SYS_ITEM3\n" + + "WHERE MOD.INVENTORY_ITEM_ID = SYS_ITEM3.INVENTORY_ITEM_ID AND SYS_ITEM3.ITEM_TYPE\n" + + "= 'MK' AND MOD.ENABLED_FLAG = 'Y') M WHERE P.CONTRACT_PRODUCT_ID = D.CONTRACT_PRODUCT_ID\n" + + "AND D.CONTRACT_DEVICE_ID = S.CONTRACT_DEVICE_ID AND S.SITE_ID = M.SITE_ID\n" + + ") Mod LEFT JOIN ( ( SELECT ITEM.CONTRACT_MODULE_ID CONTRACT_MODULE_ID,\n" + + "ITEM.INVENTORY_ITEM_ID, ITEM.CONTRACT_ITEM_ID, SYS_ITEM.DESCRIPTION, SYS_ITEM.ATTRIBUTE1,\n" + + "ITEM.ITEM_QUANTITY, SYS_ITEM.CATALOG_SOFTWARE_FLAG, P.COST_PRICE, P.COST_PRICE_PARAMETER,\n" + + "P.CONFIRM_FLAG,P.COST_PRICE04, P.CONFIRM_ITEM_PARAM, P.CONFIRM_FLAG04,\n" + + "P.OLD_COST,P.LIST_PRICE, SYS_ITEM.ITEM_CODE, P.CONFIRM_COST_PRICE04, SYS_ITEM.ITEM_ID\n" + + "PROD_ATTRIBUTE_ID,SYS_ITEM.ITEM_CHIP FROM TPC_CPR.TPC_CPR_ITEMS ITEM, TPC_CPR.TPC_CPR_SYSTEM_ITEMS\n" + + "SYS_ITEM, TPC_CPR.TPC_CPR_PRICE P where ITEM.INVENTORY_ITEM_ID = P.INVENTORY_ITEM_ID\n" + + "AND ITEM.INVENTORY_ITEM_ID = SYS_ITEM.INVENTORY_ITEM_ID AND ITEM.ENABLED_FLAG\n" + + "= 'Y' ) ) I ON Mod.CONTRACT_MODULE_ID = I.CONTRACT_MODULE_ID "; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); @@ -164,7 +163,7 @@ public void test_types() throws Exception { "\t\t\tAND ITEM.INVENTORY_ITEM_ID = SYS_ITEM.INVENTORY_ITEM_ID\n" + "\t\t\tAND ITEM.ENABLED_FLAG = 'Y'\n" + "\t) I ON Mod.CONTRACT_MODULE_ID = I.CONTRACT_MODULE_ID ",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest78.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest78.java index 69e8336095..60346d5655 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest78.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest78.java @@ -23,52 +23,51 @@ import java.util.List; public class OracleCreateTableTest78 extends OracleTest { - public void test_types() throws Exception { String sql = // - "CREATE OR REPLACE FORCE VIEW \"TCP_EPM\".\"EPM_VW_CONTRACT\" (\"NID\", \"SCONTRACTNO\", \"SCONTRACTNAME\", \"NOFFICEID\", \"SOFFICENAME\", \"NSALEDEPTID\", \"SSALEDEPTNAME\", \"NPRODDEPTID\", \"SPRODDEPTNAME\", \"NCUSTOMERID\", \"SCUSTOMERNAME\", \"SSERVICEPROVIDERID\", \"SSERVICEPROVIDERNAME\", \"NMAINPRODUCTID\", \"SMAINPRODUCTNAME\", \"SCONTRACTTYPE\", \"SCONTRACTTYPETEXT\", \"SCONTRACTKIND\", \"SCONTRACTKINDTEXT\", \"SISFIRSTCHECKED\", \"SISLASTCHECKED\", \"SISOUTSOURCE\", \"SISRECONSIGN\", \"DGUARANTEE\", \"DCREATEDTIME\", \"NERPCONTRACTID\", \"NSTATE\", \"DFIRSTCHECKTIME\", \"DLASTCHECKTIME\", \"DPLANFIRSTCHECKTIME\", \"DPLANLASTCHECKTIME\") AS \n" + - " select\n" + - " EPM_TBL_CONTRACT.OID as nID,\n" + - " EPM_TBL_CONTRACT.CONTRACTNO as sContractNo,\n" + - " EPM_TBL_CONTRACT.CONTRACTNAME as sCONTRACTNAME,\n" + - " EPM_TBL_CONTRACT.ENGDUTYDEP as nOfficeID,\n" + - " TCP_FND_DEPT.DEPT_NAME as sOfficeName,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.nSaleDeptID as nSaleDeptID,\n" + - " TCP_FND_DEPT1.DEPT_NAME as sSaleDeptName,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.nProdDeptID as nProdDeptID,\n" + - " TCP_FND_DEPT2.DEPT_NAME as sProdDeptName,\n" + - " EPM_TBL_CONTRACT.CUSTOMID as nCustomerID,\n" + - " TCP_CUST_CUSTOMER.Name as sCustomerName,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.sServiceProviderID as sServiceProviderID,\n" + - " TCP_CUST_ENUM.DESC_ as sServiceProviderName,\n" + - " EPM_TBL_CONTRACT.MASTERPRODUCT as nMainProductID,\n" + - " TCP_FND_PRODUCT.CN_NAME as sMainProductName,\n" + - " EPM_TBL_CONTRACT.CONTRACTTYPE as sContractType,\n" + - " TCP_FND_LOOKUP_CODE.MEANING as sContractTypeText,\n" + - " EPM_TBL_CONTRACT.Contrctkind as sContractKind,\n" + - " TCP_FND_LOOKUP_CODE1.MEANING as sContractKindText,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.sIsFirstChecked as sIsFirstChecked,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.sIsLastChecked as sIsLastChecked,\n" + - " case when (select count(*) from EPM_TBL_ENGINE_PROJECT,EPM_TBL_SUBCONTRACT_DISPATCH where EPM_TBL_ENGINE_PROJECT.CONTRACTID=EPM_TBL_CONTRACT.Oid and EPM_TBL_ENGINE_PROJECT.OID=EPM_TBL_SUBCONTRACT_DISPATCH.ENGINEID) > 0 then '/' else '&' end as sIsOutSource,\n" + - " case when (select count(*) from TCP_EPM.EPM_TBL_RECONSIGN_RECONSIGN where TCP_EPM.EPM_TBL_RECONSIGN_RECONSIGN.CONTRACTID=EPM_TBL_CONTRACT.Oid) > 0 then '/' else '&' end as sIsReconsign,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.dGuarantee as dGuarantee,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.dCreatedTime as dCreatedTime,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.nERPContractID as nERPContractID,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.nState as nState,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.DFIRSTCHECKTIME as DFIRSTCHECKTIME,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.DLASTCHECKTIME as DLASTCHECKTIME,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.DPLANFIRSTCHECKTIME as DPLANFIRSTCHECKTIME,\n" + - " TCP_EPM.EPM_TB_CONTRACT_EX.DPLANLASTCHECKTIME as DPLANLASTCHECKTIME\n" + - " from\n" + - " ((((((((( TCP_EPM.Epm_Tbl_Contract left join TCP_FND.TCP_FND_DEPT on TCP_FND_DEPT.Dept_Id=Epm_Tbl_Contract.Engdutydep )\n" + - " left join TCP_EPM.EPM_TB_CONTRACT_EX on EPM_TB_CONTRACT_EX.NCONTRACTID=Epm_Tbl_Contract.Oid)\n" + - " left join TCP_FND.TCP_FND_DEPT TCP_FND_DEPT1 on TCP_FND_DEPT1.Dept_Id=EPM_TB_CONTRACT_EX.nSaleDeptID)\n" + - " left join TCP_FND.TCP_FND_DEPT TCP_FND_DEPT2 on TCP_FND_DEPT2.Dept_Id=EPM_TB_CONTRACT_EX.nProdDeptID)\n" + - " left join TCP_CUST.TCP_CUST_CUSTOMER on TCP_CUST_CUSTOMER.ID=EPM_TBL_CONTRACT.Customid)\n" + - " left join TCP_CUST.TCP_CUST_ENUM on TCP_CUST_ENUM.Codeid=EPM_TB_CONTRACT_EX.sServiceProviderID)\n" + - " left join TCP_FND.TCP_FND_PRODUCT on TCP_FND_PRODUCT.INVENTORY_ITEM_ID=EPM_TBL_CONTRACT.MASTERPRODUCT)\n" + - " left join TCP_FND.TCP_FND_LOOKUP_CODE on TCP_FND_LOOKUP_CODE.LOOKUP_TYPE='CONTRACT_TYPE' and TCP_FND_LOOKUP_CODE.LOOKUP_CODE=EPM_TBL_CONTRACT.CONTRACTTYPE)\n" + - " left join TCP_FND.TCP_FND_LOOKUP_CODE TCP_FND_LOOKUP_CODE1 on TCP_FND_LOOKUP_CODE1.LOOKUP_TYPE='CONTRACT_CATE' and TCP_FND_LOOKUP_CODE1.LOOKUP_CODE=EPM_TBL_CONTRACT.Contrctkind)"; + "CREATE OR REPLACE FORCE VIEW \"TCP_EPM\".\"EPM_VW_CONTRACT\" (\"NID\", \"SCONTRACTNO\", \"SCONTRACTNAME\", \"NOFFICEID\", \"SOFFICENAME\", \"NSALEDEPTID\", \"SSALEDEPTNAME\", \"NPRODDEPTID\", \"SPRODDEPTNAME\", \"NCUSTOMERID\", \"SCUSTOMERNAME\", \"SSERVICEPROVIDERID\", \"SSERVICEPROVIDERNAME\", \"NMAINPRODUCTID\", \"SMAINPRODUCTNAME\", \"SCONTRACTTYPE\", \"SCONTRACTTYPETEXT\", \"SCONTRACTKIND\", \"SCONTRACTKINDTEXT\", \"SISFIRSTCHECKED\", \"SISLASTCHECKED\", \"SISOUTSOURCE\", \"SISRECONSIGN\", \"DGUARANTEE\", \"DCREATEDTIME\", \"NERPCONTRACTID\", \"NSTATE\", \"DFIRSTCHECKTIME\", \"DLASTCHECKTIME\", \"DPLANFIRSTCHECKTIME\", \"DPLANLASTCHECKTIME\") AS \n" + + " select\n" + + " EPM_TBL_CONTRACT.OID as nID,\n" + + " EPM_TBL_CONTRACT.CONTRACTNO as sContractNo,\n" + + " EPM_TBL_CONTRACT.CONTRACTNAME as sCONTRACTNAME,\n" + + " EPM_TBL_CONTRACT.ENGDUTYDEP as nOfficeID,\n" + + " TCP_FND_DEPT.DEPT_NAME as sOfficeName,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.nSaleDeptID as nSaleDeptID,\n" + + " TCP_FND_DEPT1.DEPT_NAME as sSaleDeptName,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.nProdDeptID as nProdDeptID,\n" + + " TCP_FND_DEPT2.DEPT_NAME as sProdDeptName,\n" + + " EPM_TBL_CONTRACT.CUSTOMID as nCustomerID,\n" + + " TCP_CUST_CUSTOMER.Name as sCustomerName,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.sServiceProviderID as sServiceProviderID,\n" + + " TCP_CUST_ENUM.DESC_ as sServiceProviderName,\n" + + " EPM_TBL_CONTRACT.MASTERPRODUCT as nMainProductID,\n" + + " TCP_FND_PRODUCT.CN_NAME as sMainProductName,\n" + + " EPM_TBL_CONTRACT.CONTRACTTYPE as sContractType,\n" + + " TCP_FND_LOOKUP_CODE.MEANING as sContractTypeText,\n" + + " EPM_TBL_CONTRACT.Contrctkind as sContractKind,\n" + + " TCP_FND_LOOKUP_CODE1.MEANING as sContractKindText,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.sIsFirstChecked as sIsFirstChecked,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.sIsLastChecked as sIsLastChecked,\n" + + " case when (select count(*) from EPM_TBL_ENGINE_PROJECT,EPM_TBL_SUBCONTRACT_DISPATCH where EPM_TBL_ENGINE_PROJECT.CONTRACTID=EPM_TBL_CONTRACT.Oid and EPM_TBL_ENGINE_PROJECT.OID=EPM_TBL_SUBCONTRACT_DISPATCH.ENGINEID) > 0 then '/' else '&' end as sIsOutSource,\n" + + " case when (select count(*) from TCP_EPM.EPM_TBL_RECONSIGN_RECONSIGN where TCP_EPM.EPM_TBL_RECONSIGN_RECONSIGN.CONTRACTID=EPM_TBL_CONTRACT.Oid) > 0 then '/' else '&' end as sIsReconsign,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.dGuarantee as dGuarantee,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.dCreatedTime as dCreatedTime,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.nERPContractID as nERPContractID,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.nState as nState,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.DFIRSTCHECKTIME as DFIRSTCHECKTIME,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.DLASTCHECKTIME as DLASTCHECKTIME,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.DPLANFIRSTCHECKTIME as DPLANFIRSTCHECKTIME,\n" + + " TCP_EPM.EPM_TB_CONTRACT_EX.DPLANLASTCHECKTIME as DPLANLASTCHECKTIME\n" + + " from\n" + + " ((((((((( TCP_EPM.Epm_Tbl_Contract left join TCP_FND.TCP_FND_DEPT on TCP_FND_DEPT.Dept_Id=Epm_Tbl_Contract.Engdutydep )\n" + + " left join TCP_EPM.EPM_TB_CONTRACT_EX on EPM_TB_CONTRACT_EX.NCONTRACTID=Epm_Tbl_Contract.Oid)\n" + + " left join TCP_FND.TCP_FND_DEPT TCP_FND_DEPT1 on TCP_FND_DEPT1.Dept_Id=EPM_TB_CONTRACT_EX.nSaleDeptID)\n" + + " left join TCP_FND.TCP_FND_DEPT TCP_FND_DEPT2 on TCP_FND_DEPT2.Dept_Id=EPM_TB_CONTRACT_EX.nProdDeptID)\n" + + " left join TCP_CUST.TCP_CUST_CUSTOMER on TCP_CUST_CUSTOMER.ID=EPM_TBL_CONTRACT.Customid)\n" + + " left join TCP_CUST.TCP_CUST_ENUM on TCP_CUST_ENUM.Codeid=EPM_TB_CONTRACT_EX.sServiceProviderID)\n" + + " left join TCP_FND.TCP_FND_PRODUCT on TCP_FND_PRODUCT.INVENTORY_ITEM_ID=EPM_TBL_CONTRACT.MASTERPRODUCT)\n" + + " left join TCP_FND.TCP_FND_LOOKUP_CODE on TCP_FND_LOOKUP_CODE.LOOKUP_TYPE='CONTRACT_TYPE' and TCP_FND_LOOKUP_CODE.LOOKUP_CODE=EPM_TBL_CONTRACT.CONTRACTTYPE)\n" + + " left join TCP_FND.TCP_FND_LOOKUP_CODE TCP_FND_LOOKUP_CODE1 on TCP_FND_LOOKUP_CODE1.LOOKUP_TYPE='CONTRACT_CATE' and TCP_FND_LOOKUP_CODE1.LOOKUP_CODE=EPM_TBL_CONTRACT.Contrctkind)"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); @@ -147,7 +146,7 @@ public void test_types() throws Exception { "\tAND TCP_FND_LOOKUP_CODE.LOOKUP_CODE = EPM_TBL_CONTRACT.CONTRACTTYPE \n" + "\tLEFT JOIN TCP_FND.TCP_FND_LOOKUP_CODE TCP_FND_LOOKUP_CODE1 ON TCP_FND_LOOKUP_CODE1.LOOKUP_TYPE = 'CONTRACT_CATE'\n" + "\tAND TCP_FND_LOOKUP_CODE1.LOOKUP_CODE = EPM_TBL_CONTRACT.Contrctkind ",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest79.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest79.java index 92ead91cb5..ec779a5dbe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest79.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest79.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleCreateTableTest79 extends OracleTest { - public void test_types() throws Exception { String sql = // "CREATE TABLE rules (id NUMBER(38) NOT NULL PRIMARY KEY, name varchar(200), plugin_rule_key varchar(200) NOT NULL, plugin_config_key varchar(200), plugin_name varchar(255) NOT NULL, description source, priority NUMBER(38), cardinality varchar(10), parent_id NUMBER(38), status varchar(40), language varchar(20), created_at TIMESTAMP, updated_at TIMESTAMP) "; @@ -49,7 +48,7 @@ public void test_types() throws Exception { "\tcreated_at TIMESTAMP,\n" + "\tupdated_at TIMESTAMP\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest8.java index 0d90d9092c..7d8a0ed991 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest8.java @@ -25,20 +25,19 @@ import java.util.List; public class OracleCreateTableTest8 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE TABLE \"PRODUCT_NEW_CLUSTER_YZS_0210\" (" + // - "\"PRODUCT_ID\" NUMBER NOT NULL ENABLE, " + // - "\"NEW_CLUSTER_ID\" NUMBER NOT NULL ENABLE, " + // - "\"STATUS\" VARCHAR2(1) NOT NULL ENABLE" + // - ") " + // - "PCTFREE 10 " + // - "PCTUSED 40 " + // - "INITRANS 1 " + // - "MAXTRANS 255 " + // - "STORAGE(INITIAL 2624585728 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT) " + // - "TABLESPACE \"MCSHADOWTS\" LOGGING NOCOMPRESS"; + "CREATE TABLE \"PRODUCT_NEW_CLUSTER_YZS_0210\" (" + // + "\"PRODUCT_ID\" NUMBER NOT NULL ENABLE, " + // + "\"NEW_CLUSTER_ID\" NUMBER NOT NULL ENABLE, " + // + "\"STATUS\" VARCHAR2(1) NOT NULL ENABLE" + // + ") " + // + "PCTFREE 10 " + // + "PCTUSED 40 " + // + "INITRANS 1 " + // + "MAXTRANS 255 " + // + "STORAGE(INITIAL 2624585728 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT) " + // + "TABLESPACE \"MCSHADOWTS\" LOGGING NOCOMPRESS"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest80.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest80.java index d5c3330190..8cb3b9b32d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest80.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest80.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleCreateTableTest80 extends OracleTest { - public void test_types() throws Exception { String sql = // "CREATE TABLE KTV.ALI_KTV_VISIT_TBD20150401 (\n" + @@ -45,7 +44,7 @@ public void test_types() throws Exception { "\tTYPE VARCHAR(20),\n" + "\tID VARCHAR(50)\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest81.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest81.java index 449032df67..d199fbba25 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest81.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest81.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleCreateTableTest81 extends OracleTest { - public void test_types() throws Exception { String sql = // "CREATE TABLE ZEUS.USER_LOGIN (\n" + @@ -43,7 +42,7 @@ public void test_types() throws Exception { "\tCOMMENTS VARCHAR(100),\n" + "\tSCHEMA VARCHAR(20)\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest82.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest82.java index 3a87f17057..c085c70ccc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest82.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest82.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleCreateTableTest82 extends OracleTest { - public void test_types() throws Exception { String sql = // "CREATE TABLE EOA_KTV.EOA_TMP_JOBS (\n" + @@ -55,7 +54,7 @@ public void test_types() throws Exception { "\tDBID DECIMAL(38),\n" + "\tCOLLECTION_TIME VARCHAR(19)\n" + ");",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); // stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest83.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest83.java index 3069ac8ca2..0b1465d038 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest83.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest83.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateTableTest83 extends OracleTest { - public void test_types() throws Exception { String sql = // "CREATE TABLE NIRVANA.CS_MATURE_ADVICE (\n" + @@ -64,7 +63,7 @@ public void test_types() throws Exception { "\tSERVICE_URL VARCHAR(512),\n" + "\tPRIMARY KEY (ID)\n" + ");",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); stmt.renameColumn("ID", "FID"); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest84.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest84.java index 32e0a1619e..efcf35d822 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest84.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest84.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateTableTest84 extends OracleTest { - public void test_types() throws Exception { String sql = // "CREATE TABLE \"IX\".\"ORDERS_QUEUETABLE\" \n" + @@ -153,7 +152,7 @@ public void test_types() throws Exception { "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + ")",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); stmt.renameColumn("ID", "FID"); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest85.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest85.java index 57da8f46a4..c64048f54c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest85.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest85.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleCreateTableTest85 extends OracleTest { - //oracle 支持 column char, column2 varchar , 默认字符长度 //https://docs.oracle.com/cd/B28359_01/server.111/b28286/sql_elements001.htm#SQLRF0021 public void test_0() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest86.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest86.java index aa186953c8..e731b9e60f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest86.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest86.java @@ -25,15 +25,14 @@ import java.util.List; public class OracleCreateTableTest86 extends OracleTest { - public void test_0() throws Exception { String sql = // "create table mid_users_restore_nogen_598 as\n" + - " select/*+ordered user_hash(a b)*/ a.*,\n" - + " nvl(b.total_amount-b.generated_amount,0) no_genrated_amount\n" - + " from mid_users_restore_account_598 a,\n" + " subtotal_bill b\n" + " where a.home_city = 598\n" - + " and b.home_city(+) = 598\n" + " and a.user_id = b.user_id(+)\n" - + " and b.month(+) = to_char(sysdate,'mm') ;"; + " select/*+ordered user_hash(a b)*/ a.*,\n" + + " nvl(b.total_amount-b.generated_amount,0) no_genrated_amount\n" + + " from mid_users_restore_account_598 a,\n" + " subtotal_bill b\n" + " where a.home_city = 598\n" + + " and b.home_city(+) = 598\n" + " and a.user_id = b.user_id(+)\n" + + " and b.month(+) = to_char(sysdate,'mm') ;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -60,13 +59,14 @@ public void test_0() throws Exception { Assert.assertEquals(8, visitor.getColumns().size()); } + public void test_1() throws Exception { String sql = // "create table mid_users_restore_nogen_594 as\n" + " select/*+ordered user_hash(a b)*/ a.*,\n" - + " nvl(b.total_amount-b.generated_amount,0) no_genrated_amount\n" - + " from mid_users_restore_account_594 a,\n" + " subtotal_bill b\n" + " where a.home_city = 594\n" - + " and b.home_city(+) = 594\n" + " and a.user_id = b.user_id(+)\n" - + " and b.month(+) = to_char(sysdate,'mm') ;"; + + " nvl(b.total_amount-b.generated_amount,0) no_genrated_amount\n" + + " from mid_users_restore_account_594 a,\n" + " subtotal_bill b\n" + " where a.home_city = 594\n" + + " and b.home_city(+) = 594\n" + " and a.user_id = b.user_id(+)\n" + + " and b.month(+) = to_char(sysdate,'mm') ;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest87.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest87.java index 8101dd2b47..03675251b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest87.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest87.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateTableTest87 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE \"HX_DJ\".\"DJ_JZYXMDJ_THJJFGQK\" \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest88.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest88.java index 5f45cf99af..9fc20fc085 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest88.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest88.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateTableTest88 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE \"FOGLIGHT\".\"Q_ALERT_LOG_ZJDBXE\"\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest89.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest89.java index c8c18f68ba..6e3f8a2bf3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest89.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest89.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleCreateTableTest89 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE \"ACCOUNT\".\"GROUP_BILLGEN_REQUEST\" \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest9.java index 00e32c077c..51d72cb4dd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest9.java @@ -25,15 +25,14 @@ import java.util.List; public class OracleCreateTableTest9 extends OracleTest { - public void test_0() throws Exception { String sql = // - "CREATE GLOBAL TEMPORARY TABLE \"ESCROW\".\"RUPD$_HT_TASK_TRADE_HISTOR\" (" + // - "\"ID\" NUMBER, " + // - "dmltype$$ varchar2(1), " + // - "snapid integer, " + // - "change_vector$$ raw(255)" + // - ") ON COMMIT PRESERVE ROWS"; + "CREATE GLOBAL TEMPORARY TABLE \"ESCROW\".\"RUPD$_HT_TASK_TRADE_HISTOR\" (" + // + "\"ID\" NUMBER, " + // + "dmltype$$ varchar2(1), " + // + "snapid integer, " + // + "change_vector$$ raw(255)" + // + ") ON COMMIT PRESERVE ROWS"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -59,11 +58,11 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.containsColumn("ESCROW.RUPD$_HT_TASK_TRADE_HISTOR", "ID")); Assert.assertTrue(visitor.containsColumn("ESCROW.RUPD$_HT_TASK_TRADE_HISTOR", - "dmltype$$")); + "dmltype$$")); Assert.assertTrue(visitor.containsColumn("ESCROW.RUPD$_HT_TASK_TRADE_HISTOR", - "snapid")); + "snapid")); Assert.assertTrue(visitor.containsColumn("ESCROW.RUPD$_HT_TASK_TRADE_HISTOR", - "change_vector$$")); + "change_vector$$")); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "order_mode"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest90.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest90.java index ec768b5f5b..b8f2f06544 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest90.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest90.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleCreateTableTest90 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE \"XZZYYY\".\"ZT_TJ_ASJ_ALL\" \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest91.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest91.java index 5c5f23d5da..ebe18cd7b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest91.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest91.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleCreateTableTest91 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE \"IX\".\"AQ$_ORDERS_QUEUETABLE_G\" \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest92.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest92.java index 96c32e2b3c..8abcf978da 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest92.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest92.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleCreateTableTest92 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE \"ACCOUNT\".\"BROADBAND_USERS_RESULT\" \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest93.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest93.java index 1341ae65d6..4899f13b47 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest93.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest93.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleCreateTableTest93 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE \"GXYY\".\"EMR_MED_REC\" \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest94.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest94.java index 36b4fb967a..252bc71bff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest94.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest94.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleCreateTableTest94 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE \"CITSONLINE\".\"ORDER_INFO_HIS_2015\" \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest95.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest95.java index 83b65cfad9..de16a67673 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest95.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest95.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleCreateTableTest95 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE \"HN3_3\".\"BGG_EXTEND_BULLETIN\" \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest96.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest96.java index 8412ca01f2..a14ff5dcb2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest96.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest96.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleCreateTableTest96 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE \"CAOBOHAHA_IAU\".\"IAU_USERSESSION\" \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest97.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest97.java index 41b5f69f60..98b430bef7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest97.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest97.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleCreateTableTest97 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE \"ADAM\".\"TAB_PART_RANGE_HASH\" \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest_error_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest_error_0.java index f942c93610..fc5f57d525 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest_error_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest_error_0.java @@ -21,7 +21,6 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleCreateTableTest_error_0 extends OracleTest { - public void test_types() throws Exception { Throwable error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest.java index d74c301294..b2bd0a0520 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class OracleInsertTest extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO films VALUES ('UA502', 'Bananas', 105, '1971-07-13', 'Comedy', '82 minutes');"; @@ -48,9 +47,9 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); Assert.assertEquals(0, visitor.getColumns().size()); - + // Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "producer_id"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest1.java index 7d331ca199..95d531a3c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest1.java @@ -26,12 +26,11 @@ import com.alibaba.druid.stat.TableStat; public class OracleInsertTest1 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO bonuses(employee_id)" + - " (SELECT e.employee_id FROM employees e, orders o" + - " WHERE e.employee_id = o.sales_rep_id" + - " GROUP BY e.employee_id); "; + " (SELECT e.employee_id FROM employees e, orders o" + + " WHERE e.employee_id = o.sales_rep_id" + + " GROUP BY e.employee_id); "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -54,11 +53,11 @@ public void test_0() throws Exception { Assert.assertEquals(3, visitor.getTables().size()); Assert.assertEquals(3, visitor.getColumns().size()); - + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "sales_rep_id"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest10.java index a0339df9b2..5f9e5ebbfe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest10.java @@ -28,10 +28,9 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleInsertTest10 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO departments" // - + " VALUES (280, 'Recreation', 121, 1700);"; + + " VALUES (280, 'Recreation', 121, 1700);"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -42,7 +41,7 @@ public void test_0() throws Exception { Assert.assertEquals("INSERT INTO departments\n" + "VALUES (280, 'Recreation', 121, 1700);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest11.java index f6ecbba178..44902de9ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest11.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleInsertTest11 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO departments" + " VALUES (280, 'Recreation', DEFAULT, 1700);"; @@ -39,10 +38,10 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals(1, statementList.size()); - + Assert.assertEquals("INSERT INTO departments"// - + "\nVALUES (280, 'Recreation', DEFAULT, 1700);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\nVALUES (280, 'Recreation', DEFAULT, 1700);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest12.java index a9bce9cc7a..f7f340bbaa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest12.java @@ -28,12 +28,11 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleInsertTest12 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO employees (employee_id, last_name, email, " // - + " hire_date, job_id, salary, commission_pct) "// - + " VALUES (207, 'Gregory', 'pgregory@example.com', "// - + " sysdate, 'PU_CLERK', 1.2E3, NULL);"; + + " hire_date, job_id, salary, commission_pct) "// + + " VALUES (207, 'Gregory', 'pgregory@example.com', "// + + " sysdate, 'PU_CLERK', 1.2E3, NULL);"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -43,11 +42,11 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("INSERT INTO employees" // - + "\n\t(employee_id, last_name, email, hire_date, job_id" // - + "\n\t, salary, commission_pct)" // - + "\nVALUES (207, 'Gregory', 'pgregory@example.com', SYSDATE, 'PU_CLERK'" // - + "\n\t, 1.2E3, NULL);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\n\t(employee_id, last_name, email, hire_date, job_id" // + + "\n\t, salary, commission_pct)" // + + "\nVALUES (207, 'Gregory', 'pgregory@example.com', SYSDATE, 'PU_CLERK'" // + + "\n\t, 1.2E3, NULL);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); @@ -62,7 +61,7 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest13.java index 24d98476b0..9ddec0a655 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest13.java @@ -28,12 +28,11 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleInsertTest13 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO bonuses" // - + " SELECT employee_id, salary*1.1 "// - + " FROM employees"// - + " WHERE commission_pct > 0.25; "; + + " SELECT employee_id, salary*1.1 "// + + " FROM employees"// + + " WHERE commission_pct > 0.25; "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -43,10 +42,10 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("INSERT INTO bonuses" // - + "\nSELECT employee_id, salary * 1.1"// - + "\nFROM employees"// - + "\nWHERE commission_pct > 0.25;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\nSELECT employee_id, salary * 1.1"// + + "\nFROM employees"// + + "\nWHERE commission_pct > 0.25;",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest14.java index cb739a9496..de060138df 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest14.java @@ -28,12 +28,11 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleInsertTest14 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO raises" // - + " SELECT employee_id, salary*1.1 FROM employees"// - + " WHERE commission_pct > .2"// - + " LOG ERRORS INTO errlog ('my_bad') REJECT LIMIT 10;"; + + " SELECT employee_id, salary*1.1 FROM employees"// + + " WHERE commission_pct > .2"// + + " LOG ERRORS INTO errlog ('my_bad') REJECT LIMIT 10;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -43,11 +42,11 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("INSERT INTO raises" // - + "\nSELECT employee_id, salary * 1.1"// - + "\nFROM employees"// - + "\nWHERE commission_pct > .2"// - + "\nLOG ERRORS INTO errlog ('my_bad') REJECT LIMIT 10;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\nSELECT employee_id, salary * 1.1"// + + "\nFROM employees"// + + "\nWHERE commission_pct > .2"// + + "\nLOG ERRORS INTO errlog ('my_bad') REJECT LIMIT 10;",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest15.java index b266028ebe..3506d09a1e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest15.java @@ -28,12 +28,11 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleInsertTest15 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO employees@remote" // - + " VALUES (8002, 'Juan', 'Fernandez', 'juanf@example.com', NULL, "// - + " TO_DATE('04-OCT-1992', 'DD-MON-YYYY'), 'SH_CLERK', 3000, "// - + " NULL, 121, 20); "; + + " VALUES (8002, 'Juan', 'Fernandez', 'juanf@example.com', NULL, "// + + " TO_DATE('04-OCT-1992', 'DD-MON-YYYY'), 'SH_CLERK', 3000, "// + + " NULL, 121, 20); "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -43,10 +42,10 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("INSERT INTO employees@remote" // - + "\nVALUES (8002, 'Juan', 'Fernandez', 'juanf@example.com', NULL"// - + "\n\t, TO_DATE('04-OCT-1992', 'DD-MON-YYYY'), 'SH_CLERK', 3000, NULL, 121"// - + "\n\t, 20);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\nVALUES (8002, 'Juan', 'Fernandez', 'juanf@example.com', NULL"// + + "\n\t, TO_DATE('04-OCT-1992', 'DD-MON-YYYY'), 'SH_CLERK', 3000, NULL, 121"// + + "\n\t, 20);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest16.java index 08f59b26aa..794b732c24 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest16.java @@ -28,10 +28,9 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleInsertTest16 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO departments " // - + " VALUES (departments_seq.nextval, 'Entertainment', 162, 1400); "; + + " VALUES (departments_seq.nextval, 'Entertainment', 162, 1400); "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -41,8 +40,8 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("INSERT INTO departments" // - + "\nVALUES (departments_seq.NEXTVAL, 'Entertainment', 162, 1400);",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\nVALUES (departments_seq.NEXTVAL, 'Entertainment', 162, 1400);",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest17.java index 9000a36c07..8c00c14bab 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest17.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleInsertTest17 extends OracleTest { - public void test_0() throws Exception { String sql = "insert into sys_log(ID,EXCEPTION) values(?,?)"; @@ -40,8 +39,8 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("INSERT INTO sys_log (ID, EXCEPTION)" - + "\nVALUES (?, ?)",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\nVALUES (?, ?)",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); @@ -56,8 +55,8 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("sys_log"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "ID"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "EXCEPTION"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "ID"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "EXCEPTION"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest18.java index 78f3c3f1bd..d6cf75ae99 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest18.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleInsertTest18 extends OracleTest { - public void test_0() throws Exception { String sql = "insert into sys_log(ID,\"EXCEPTION\") values(?,?)"; @@ -40,8 +39,8 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("INSERT INTO sys_log (ID, \"EXCEPTION\")" - + "\nVALUES (?, ?)",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\nVALUES (?, ?)",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); @@ -56,8 +55,8 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("sys_log"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "ID"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "EXCEPTION"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "ID"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "EXCEPTION"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest19.java index d4e148ff2a..89c0a4130e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest19.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleInsertTest19 extends OracleTest { - public void test_0() throws Exception { String sql = "insert into TB_DUOBAO_PARTICIPATE_NUMBER ( PARTICIPATE_NUMBER, PERIOD_ID, PRODUCT_ID,number_index)" + " (SELECT ?,?,?,? FROM DUAL)" @@ -43,12 +42,12 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("INSERT INTO TB_DUOBAO_PARTICIPATE_NUMBER (PARTICIPATE_NUMBER, PERIOD_ID, PRODUCT_ID, number_index)" - + "\nSELECT ?, ?, ?, ?" - + "\nFROM DUAL" - + "\nUNION ALL" - + "\nSELECT ?, ?, ?, ?" - + "\nFROM DUAL",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + "\nSELECT ?, ?, ?, ?" + + "\nFROM DUAL" + + "\nUNION ALL" + + "\nSELECT ?, ?, ?, ?" + + "\nFROM DUAL",// + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); @@ -63,10 +62,10 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("TB_DUOBAO_PARTICIPATE_NUMBER"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("TB_DUOBAO_PARTICIPATE_NUMBER", "PARTICIPATE_NUMBER"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("TB_DUOBAO_PARTICIPATE_NUMBER", "PERIOD_ID"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("TB_DUOBAO_PARTICIPATE_NUMBER", "PRODUCT_ID"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("TB_DUOBAO_PARTICIPATE_NUMBER", "number_index"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("TB_DUOBAO_PARTICIPATE_NUMBER", "PARTICIPATE_NUMBER"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("TB_DUOBAO_PARTICIPATE_NUMBER", "PERIOD_ID"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("TB_DUOBAO_PARTICIPATE_NUMBER", "PRODUCT_ID"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("TB_DUOBAO_PARTICIPATE_NUMBER", "number_index"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest2.java index 97b69dedc1..8b66d5e5ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest2.java @@ -26,14 +26,13 @@ import com.alibaba.druid.stat.TableStat; public class OracleInsertTest2 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO employees " + // - " (employee_id, last_name, email, hire_date, job_id, salary)" + // - " VALUES " + // - " (employees_seq.nextval, 'Doe', 'john.doe@example.com', " + // - " SYSDATE, 'SH_CLERK', 2400) " + // - " RETURNING salary*12, job_id INTO :bnd1, :bnd2; "; + " (employee_id, last_name, email, hire_date, job_id, salary)" + // + " VALUES " + // + " (employees_seq.nextval, 'Doe', 'john.doe@example.com', " + // + " SYSDATE, 'SH_CLERK', 2400) " + // + " RETURNING salary*12, job_id INTO :bnd1, :bnd2; "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest20_first.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest20_first.java index fd213639cd..80325c7930 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest20_first.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest20_first.java @@ -27,7 +27,6 @@ import java.util.List; public class OracleInsertTest20_first extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT FIRST\n" + " WHEN ottl < 100000 THEN\n" + @@ -70,7 +69,7 @@ public void test_0() throws Exception { "\t, c.cust_email AS cem\n" + "FROM orders o, customers c\n" + "WHERE o.customer_id = c.customer_id;",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); @@ -85,7 +84,7 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().containsKey(new TableStat.Name("orders"))); - assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "customer_id"))); + assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "customer_id"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest21_encoding_error.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest21_encoding_error.java index 343b506522..53a06d0566 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest21_encoding_error.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest21_encoding_error.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleInsertTest21_encoding_error extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO x1_use_agent (ID, company_name, company_id, amount, start_time, end_time, is_deleted,attr2) VALUES (seq_fee_use_agent.nextval,'\n" + "w[���р Pl�','19929',(select c.FEE_AGENT from cfg_fee_agent c), to_date((select to_char(sysdate,'yyyy-mm-dd HH24:mi:ss') from dual), 'yyyy-mm-dd HH24:mi:ss'),to_date((select to_char(sysdate + interval '1' year ,'yyyy-mm-dd HH24:mi:ss') from dual), 'yyyy-mm-dd HH24:mi:ss'),'0','ZB20170831142805148890')"; @@ -53,7 +52,7 @@ public void test_0() throws Exception { "\t\tSELECT to_char(SYSDATE + INTERVAL '1' YEAR, 'yyyy-mm-dd HH24:mi:ss')\n" + "\t\tFROM dual\n" + "\t), 'yyyy-mm-dd HH24:mi:ss'), '0', 'ZB20170831142805148890')",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); @@ -68,7 +67,7 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().containsKey(new TableStat.Name("x1_use_agent"))); - assertTrue(visitor.getColumns().contains(new TableStat.Column("x1_use_agent", "ID"))); + assertTrue(visitor.getColumns().contains(new TableStat.Column("x1_use_agent", "ID"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest22.java index 2cfeca75a5..26657855b6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest22.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleInsertTest22 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO MKTG_H_EXEC_RESULT_FACT\n" + "(THE_DATE, AREA_ID, SCENE_ID, MKTG_CNT, MKTG_SUC_CNT\n" + @@ -84,7 +83,7 @@ public void test_0() throws Exception { "WHERE T1.THE_DATE = TRUNC(SYSDATE)\n" + "\tAND T1.SCENE_ID = T2.SCENE_ID\n" + "GROUP BY T1.AREA_ID, RTRIM(TO_CHAR(T2.PID))",// - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); @@ -101,7 +100,7 @@ public void test_0() throws Exception { assertTrue(visitor.containsTable("DMN_MKTG_PLAN_TYPE")); assertTrue(visitor.containsTable("DMN_MKTG_PLAN_TYPE_TWO")); - assertTrue(visitor.getColumns().contains(new TableStat.Column("MKTG_H_EXEC_RESULT_FACT", "THE_DATE"))); + assertTrue(visitor.getColumns().contains(new TableStat.Column("MKTG_H_EXEC_RESULT_FACT", "THE_DATE"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest3.java index 3cf895db3b..7863a4b98c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest3.java @@ -26,12 +26,11 @@ import com.alibaba.druid.stat.TableStat; public class OracleInsertTest3 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO raises" + // - " SELECT employee_id, salary*1.1 FROM employees" + // - " WHERE commission_pct > .2" + // - " LOG ERRORS INTO errlog ('my_bad') REJECT LIMIT 10;"; + " SELECT employee_id, salary*1.1 FROM employees" + // + " WHERE commission_pct > .2" + // + " LOG ERRORS INTO errlog ('my_bad') REJECT LIMIT 10;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest4.java index d00dd87113..1b5aca4518 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest4.java @@ -26,49 +26,48 @@ import com.alibaba.druid.stat.TableStat; public class OracleInsertTest4 extends OracleTest { - public void test_0() throws Exception { String sql = "insert into \"OPS$ADMIN\".\"ORASTAT\"" - + // - " select /*+ rule */ :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, " - + // - "ot.name c1, null c2, null c3, c.name c4, u.name c5, " - + // - " h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, " - + // - " h.minimum n6, h.maximum n7, h.avgcln n8, " - + // - " decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, " - + // - " null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 " - + // - " from sys.user$ u, sys.obj$ ot, sys.col$ c, sys.hist_head$ h, histgrm$ hg " - + // - " where :3 is null and u.name = :1 and ot.owner# = u.user# and " - + // - " ot.name = :2 and ot.type# = 2 and c.obj# = ot.obj# and " - + // - " (:4 is null or c.name = :4) and h.obj# = ot.obj# and h.intcol# = c.intcol# and " - + // - " hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, " - + // - "'C' type, :6 version, bitand(h.spare2,7) flags, ot.name c1, op.subname c2, null c3, c.name c4, u.name c5, " - + // - " h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, " - + // - " h.minimum n6, h.maximum n7, h.avgcln n8, " - + // - " decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, " - + " h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.obj$ ot, sys.col$ c, sys.tabpart$ tp, sys.obj$ op, " - + " sys.hist_head$ h, histgrm$ hg where u.name = :1 and ot.owner# = u.user# and " - + " ot.name = :2 and ot.type# = 2 and c.obj# = ot.obj# and (:4 is null or c.name = :4) and " - + " tp.bo# = ot.obj# and tp.obj# = op.obj# and ((:3 is null and :vc_cascade_parts is not null) " - + " or op.subname = :3) and h.obj# = op.obj# and h.intcol# = c.intcol# and " - + " hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# " - + "" - + " union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, " - + " op.name c1, op.subname c2, null c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.col$ c, sys.tabcompart$ tp, sys.obj$ op, sys.hist_head$ h, histgrm$ hg where u.name = :1 and op.owner# = u.user# and op.name = :2 and op.type# = 19 and ((:3 is null and :vc_cascade_parts is not null) or op.subname = :3) and tp.obj# = op.obj# and c.obj# = tp.bo# and (:4 is null or c.name = :4) and h.obj# = op.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, op.name c1, op.subname c2, os.subname c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.col$ c, sys.tabcompart$ tp, sys.obj$ op, sys.tabsubpart$ ts, sys.obj$ os, sys.hist_head$ h, histgrm$ hg where u.name = :1 and op.owner# = u.user# and op.name = :2 and op.type# = 19 and tp.obj# = op.obj# and c.obj# = tp.bo# and (:4 is null or c.name = :4) and ts.pobj# = tp.obj# and ts.obj# = os.obj# and ((:3 is null and :vc_cascade_parts is not null) or (op.subname = :3 and (:vc_cascade_parts is not null or os.subname is null)) " - + " or os.subname = :3) and h.obj# = os.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# order by c5,c1,c2,c3,c4,n10"; + + // + " select /*+ rule */ :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, " + + // + "ot.name c1, null c2, null c3, c.name c4, u.name c5, " + + // + " h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, " + + // + " h.minimum n6, h.maximum n7, h.avgcln n8, " + + // + " decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, " + + // + " null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 " + + // + " from sys.user$ u, sys.obj$ ot, sys.col$ c, sys.hist_head$ h, histgrm$ hg " + + // + " where :3 is null and u.name = :1 and ot.owner# = u.user# and " + + // + " ot.name = :2 and ot.type# = 2 and c.obj# = ot.obj# and " + + // + " (:4 is null or c.name = :4) and h.obj# = ot.obj# and h.intcol# = c.intcol# and " + + // + " hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, " + + // + "'C' type, :6 version, bitand(h.spare2,7) flags, ot.name c1, op.subname c2, null c3, c.name c4, u.name c5, " + + // + " h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, " + + // + " h.minimum n6, h.maximum n7, h.avgcln n8, " + + // + " decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, " + + " h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.obj$ ot, sys.col$ c, sys.tabpart$ tp, sys.obj$ op, " + + " sys.hist_head$ h, histgrm$ hg where u.name = :1 and ot.owner# = u.user# and " + + " ot.name = :2 and ot.type# = 2 and c.obj# = ot.obj# and (:4 is null or c.name = :4) and " + + " tp.bo# = ot.obj# and tp.obj# = op.obj# and ((:3 is null and :vc_cascade_parts is not null) " + + " or op.subname = :3) and h.obj# = op.obj# and h.intcol# = c.intcol# and " + + " hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# " + + "" + + " union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, " + + " op.name c1, op.subname c2, null c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.col$ c, sys.tabcompart$ tp, sys.obj$ op, sys.hist_head$ h, histgrm$ hg where u.name = :1 and op.owner# = u.user# and op.name = :2 and op.type# = 19 and ((:3 is null and :vc_cascade_parts is not null) or op.subname = :3) and tp.obj# = op.obj# and c.obj# = tp.bo# and (:4 is null or c.name = :4) and h.obj# = op.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, op.name c1, op.subname c2, os.subname c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.col$ c, sys.tabcompart$ tp, sys.obj$ op, sys.tabsubpart$ ts, sys.obj$ os, sys.hist_head$ h, histgrm$ hg where u.name = :1 and op.owner# = u.user# and op.name = :2 and op.type# = 19 and tp.obj# = op.obj# and c.obj# = tp.bo# and (:4 is null or c.name = :4) and ts.pobj# = tp.obj# and ts.obj# = os.obj# and ((:3 is null and :vc_cascade_parts is not null) or (op.subname = :3 and (:vc_cascade_parts is not null or os.subname is null)) " + + " or os.subname = :3) and h.obj# = os.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# order by c5,c1,c2,c3,c4,n10"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest5.java index 3f99557908..efb8082fc6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest5.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleInsertTest5 extends OracleTest { - public void test_0() throws Exception { String sql = "insert into wrh$_seg_stat_obj ( snap_id , dbid , ts# , obj# , dataobj# , owner , object_name , subobject_name , partition_type , object_type , tablespace_name) select :lah_snap_id , :dbid , ss1.tsn_kewrseg , ss1.objn_kewrseg , ss1.objd_kewrseg , ss1.ownername_kewrseg , ss1.objname_kewrseg , ss1.subobjname_kewrseg , decode(po.parttype, 1, 'RANGE', 2, 'HASH', 3, 'SYSTEM', 4, 'LIST', NULL, 'NONE', 'UNKNOWN') , decode(ss1.objtype_kewrseg, 0, 'NEXT OBJECT', 1, 'INDEX', 2, 'TABLE', 3, 'CLUSTER', 4, 'VIEW', 5, 'SYNONYM', 6, 'SEQUENCE', 7, 'PROCEDURE', 8, 'FUNCTION', 9, 'PACKAGE', 11, 'PACKAGE BODY', 12, 'TRIGGER', 13, 'TYPE', 14, 'TYPE BODY', 19, 'TABLE PARTITION', 20, 'INDEX PARTITION', 21, 'LOB', 22, 'LIBRARY', 23, 'DIRECTORY', 24, 'QUEUE', 28, 'JAVA SOURCE', 29, 'JAVA CLASS', 30, 'JAVA RESOURCE', 32, 'INDEXTYPE', 33, 'OPERATOR', 34, 'TABLE SUBPARTITION', 35, 'INDEX SUBPARTITION', 40, 'LOB PARTITION', 41, 'LOB SUBPARTITION', 42, 'MATERIALIZED VIEW', 43, 'DIMENSION', 44, 'CONTEXT', 47, 'RESOURCE PLAN', 48, 'CONSUMER GROUP', 51, 'SUBSCRIPTION', 52, 'LOCATION', 55, 'XML SCHEMA', 56, 'JAVA DATA', 57, 'SECURITY PROFILE', 'UNDEFINED') , ss1.tsname_kewrseg from x$kewrattrnew at, x$kewrtsegstat ss1, (select tp.obj#, pob.parttype from sys.tabpart$ tp, sys.partobj$ pob where tp.bo# = pob.obj# union all select ip.obj#, pob.parttype from sys.indpart$ ip, sys.partobj$ pob where ip.bo# = pob.obj#) po where at.num1_kewrattr = ss1.objn_kewrseg and at.num2_kewrattr = ss1.objd_kewrseg and at.num1_kewrattr = po.obj#(+) and (ss1.objtype_kewrseg not in (1 /* INDEX - handled below */, 10 /* NON-EXISTENT */) or (ss1.objtype_kewrseg = 1 and 1 = (select 1 from ind$ i where i.obj# = ss1.objn_kewrseg and i.type# in (1, 2, 3, 4, 6, 7, 9)))) and ss1.objname_kewrseg != '_NEXT_OBJECT' and ss1.objname_kewrseg != '_default_auditing_options_'"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest6.java index cd5b73be3b..3b09b86d4a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest6.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleInsertTest6 extends OracleTest { - public void test_0() throws Exception { String sql = "insert into \"OPS$ADMIN\".\"ORASTAT\" select /*+ rule */ :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, ot.name c1, null c2, null c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.obj$ ot, sys.col$ c, sys.hist_head$ h, histgrm$ hg where :3 is null and u.name = :1 and ot.owner# = u.user# and ot.name = :2 and ot.type# = 2 and c.obj# = ot.obj# and (:4 is null or c.name = :4) and h.obj# = ot.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, ot.name c1, op.subname c2, null c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.obj$ ot, sys.col$ c, sys.tabpart$ tp, sys.obj$ op, sys.hist_head$ h, histgrm$ hg where u.name = :1 and ot.owner# = u.user# and ot.name = :2 and ot.type# = 2 and c.obj# = ot.obj# and (:4 is null or c.name = :4) and tp.bo# = ot.obj# and tp.obj# = op.obj# and ((:3 is null and :vc_cascade_parts is not null) or op.subname = :3) and h.obj# = op.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, op.name c1, op.subname c2, null c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.col$ c, sys.tabcompart$ tp, sys.obj$ op, sys.hist_head$ h, histgrm$ hg where u.name = :1 and op.owner# = u.user# and op.name = :2 and op.type# = 19 and ((:3 is null and :vc_cascade_parts is not null) or op.subname = :3) and tp.obj# = op.obj# and c.obj# = tp.bo# and (:4 is null or c.name = :4) and h.obj# = op.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, op.name c1, op.subname c2, os.subname c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.col$ c, sys.tabcompart$ tp, sys.obj$ op, sys.tabsubpart$ ts, sys.obj$ os, sys.hist_head$ h, histgrm$ hg where u.name = :1 and op.owner# = u.user# and op.name = :2 and op.type# = 19 and tp.obj# = op.obj# and c.obj# = tp.bo# and (:4 is null or c.name = :4) and ts.pobj# = tp.obj# and ts.obj# = os.obj# and ((:3 is null and :vc_cascade_parts is not null) or (op.subname = :3 and (:vc_cascade_parts is not null or os.subname is null)) or os.subname = :3) and h.obj# = os.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# order by c5,c1,c2,c3,c4,n10"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest7.java index 8719a7000b..15d6753027 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest7.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; public class OracleInsertTest7 extends OracleTest { - public void test_0() throws Exception { String sql = "insert into \"OPS$ADMIN\".\"ORASTAT\" select /*+ rule */ :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, ot.name c1, null c2, null c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.obj$ ot, sys.col$ c, sys.hist_head$ h, histgrm$ hg where :3 is null and u.name = :1 and ot.owner# = u.user# and ot.name = :2 and ot.type# = 2 and c.obj# = ot.obj# and (:4 is null or c.name = :4) and h.obj# = ot.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, ot.name c1, op.subname c2, null c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.obj$ ot, sys.col$ c, sys.tabpart$ tp, sys.obj$ op, sys.hist_head$ h, histgrm$ hg where u.name = :1 and ot.owner# = u.user# and ot.name = :2 and ot.type# = 2 and c.obj# = ot.obj# and (:4 is null or c.name = :4) and tp.bo# = ot.obj# and tp.obj# = op.obj# and ((:3 is null and :vc_cascade_parts is not null) or op.subname = :3) and h.obj# = op.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, op.name c1, op.subname c2, null c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.col$ c, sys.tabcompart$ tp, sys.obj$ op, sys.hist_head$ h, histgrm$ hg where u.name = :1 and op.owner# = u.user# and op.name = :2 and op.type# = 19 and ((:3 is null and :vc_cascade_parts is not null) or op.subname = :3) and tp.obj# = op.obj# and c.obj# = tp.bo# and (:4 is null or c.name = :4) and h.obj# = op.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# union all select :5 statid, 'C' type, :6 version, bitand(h.spare2,7) flags, op.name c1, op.subname c2, os.subname c3, c.name c4, u.name c5, h.distcnt n1, h.density n2, h.spare1 n3, h.sample_size n4, h.null_cnt n5, h.minimum n6, h.maximum n7, h.avgcln n8, decode(h.cache_cnt,0,null,1) n9, hg.bucket n10, hg.endpoint n11, null n12, h.timestamp# d1, h.lowval r1, h.hival r2, hg.epvalue ch1 from sys.user$ u, sys.col$ c, sys.tabcompart$ tp, sys.obj$ op, sys.tabsubpart$ ts, sys.obj$ os, sys.hist_head$ h, histgrm$ hg where u.name = :1 and op.owner# = u.user# and op.name = :2 and op.type# = 19 and tp.obj# = op.obj# and c.obj# = tp.bo# and (:4 is null or c.name = :4) and ts.pobj# = tp.obj# and ts.obj# = os.obj# and ((:3 is null and :vc_cascade_parts is not null) or (op.subname = :3 and (:vc_cascade_parts is not null or os.subname is null)) or os.subname = :3) and h.obj# = os.obj# and h.intcol# = c.intcol# and hg.obj#(+) = h.obj# and hg.intcol#(+) = h.intcol# order by c5,c1,c2,c3,c4,n10"; @@ -43,7 +42,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); System.out.println("relationships : " + visitor.getRelationships()); - + Assert.assertEquals(9, visitor.getTables().size()); Assert.assertEquals(36, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest8.java index b696ae0a72..cde0e6ae35 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest8.java @@ -26,15 +26,14 @@ import com.alibaba.druid.stat.TableStat; public class OracleInsertTest8 extends OracleTest { - public void test_0() throws Exception { String sql = "insert into AV_INFO_NEW (ID, GMT_CREATE, GMT_MODIFIED, COMPANY_ID, COMPANY_NAME_CN, COMPANY_NAME_EN, COMPANY_COUNTRY, " - + " COMPANY_PROVINCE, COMPANY_CITY, COMPANY_ADDR_CN, COMPANY_ADDR_EN, MEMBER_SEX, MEMBER_CN_NAME, MEMBER_FIRST_NAME, MEMBER_LAST_NAME," - + " MEMBER_PHONE_COUNTRY, MEMBER_PHONE_AREA, MEMBER_PHONE_NUMBER, MEMBER_JOB_TITLE_CN, MEMBER_JOB_TITLE_EN, MEMBER_DEPT_EN, " - + " MEMBER_DEPT_CN, LINK_EMAIL, STATUS, AV_PROVIDER, AV_ORIGIN)" - + " values (1000236058, sysdate, sysdate, 1300904670, '��������5''TW'" - + ", 'Yunnan', 'sadf', '4r7V', 'fdgtg', 'M', '�����info_name4', 'Fnameinfo_name4'" - + ", '33', '4444', '6666', '���fgsgsdfg', 'fggtgth', '�������������', null, 'zeus'" + ")"; + + " COMPANY_PROVINCE, COMPANY_CITY, COMPANY_ADDR_CN, COMPANY_ADDR_EN, MEMBER_SEX, MEMBER_CN_NAME, MEMBER_FIRST_NAME, MEMBER_LAST_NAME," + + " MEMBER_PHONE_COUNTRY, MEMBER_PHONE_AREA, MEMBER_PHONE_NUMBER, MEMBER_JOB_TITLE_CN, MEMBER_JOB_TITLE_EN, MEMBER_DEPT_EN, " + + " MEMBER_DEPT_CN, LINK_EMAIL, STATUS, AV_PROVIDER, AV_ORIGIN)" + + " values (1000236058, sysdate, sysdate, 1300904670, '��������5''TW'" + + ", 'Yunnan', 'sadf', '4r7V', 'fdgtg', 'M', '�����info_name4', 'Fnameinfo_name4'" + + ", '33', '4444', '6666', '���fgsgsdfg', 'fggtgth', '�������������', null, 'zeus'" + ")"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -54,7 +53,7 @@ public void test_0() throws Exception { Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(26, visitor.getColumns().size()); - Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("AV_INFO_NEW"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("AV_INFO_NEW"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); // // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest9.java index edafda3413..cf05c38af2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest9.java @@ -26,14 +26,13 @@ import com.alibaba.druid.stat.TableStat; public class OracleInsertTest9 extends OracleTest { - public void test_0() throws Exception { String sql = "INSERT INTO \"ZFJ_EN_CLICK\" \"A1\" (" + // - "\"P_M\",\"KEYWORD\",\"REGION_NAME\"," + // - "\"COUNTRY_ACCORD_NAME\",\"P_NAME\",\"P_VALUE\",\"CLICK_CNT\"" + // - ") " + "SELECT \"A2\".\"P_M\",\"A2\".\"KEYWORD\",\"A2\".\"REGION_NAME\"" + // - " ,\"A2\".\"COUNTRY_NAME\",\"A2\".\"P_NAME\",\"A2\".\"P_VALUE\",\"A2\".\"CLICK_CNT\" " + // - "FROM \"ZFJ_EN_CLICK_201202\"@! \"A2\""; + "\"P_M\",\"KEYWORD\",\"REGION_NAME\"," + // + "\"COUNTRY_ACCORD_NAME\",\"P_NAME\",\"P_VALUE\",\"CLICK_CNT\"" + // + ") " + "SELECT \"A2\".\"P_M\",\"A2\".\"KEYWORD\",\"A2\".\"REGION_NAME\"" + // + " ,\"A2\".\"COUNTRY_NAME\",\"A2\".\"P_NAME\",\"A2\".\"P_VALUE\",\"A2\".\"CLICK_CNT\" " + // + "FROM \"ZFJ_EN_CLICK_201202\"@! \"A2\""; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -56,8 +55,8 @@ public void test_0() throws Exception { // // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("ZFJ_EN_CLICK"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("ZFJ_EN_CLICK_201202@!"))); - - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("ZFJ_EN_CLICK", "P_M"))); + + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("ZFJ_EN_CLICK", "P_M"))); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_0.java index de75bbba78..f7c86bcb2c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_0.java @@ -24,18 +24,17 @@ import java.util.List; public class Oracle_pl_0 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE PROCEDURE remove_emp (employee_id NUMBER) AS\n" + - " tot_emps NUMBER;\n" + - " BEGIN\n" + - " DELETE FROM employees\n" + - " WHERE employees.employee_id = remove_emp.employee_id;\n" + - " tot_emps := tot_emps - 1;\n" + - " END;"; // + " tot_emps NUMBER;\n" + + " BEGIN\n" + + " DELETE FROM employees\n" + + " WHERE employees.employee_id = remove_emp.employee_id;\n" + + " tot_emps := tot_emps - 1;\n" + + " END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -44,7 +43,7 @@ public void test_0() throws Exception { statement.accept(visitor); } - System.out.println(stmt); + System.out.println(stmt); System.out.println("Tables : " + visitor.getTables()); System.out.println("fields : " + visitor.getColumns()); @@ -56,7 +55,7 @@ public void test_0() throws Exception { assertEquals(1, visitor.getColumns().size()); assertTrue(visitor.containsTable("employees")); - assertTrue(visitor.containsColumn("employees", "employee_id")); + assertTrue(visitor.containsColumn("employees", "employee_id")); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("emp_name"))); // Assert.assertEquals(7, visitor.getColumns().size()); @@ -65,33 +64,33 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("CREATE PROCEDURE remove_emp (\n" + - "\temployee_id NUMBER\n" + - ")\n" + - "AS\n" + - "\ttot_emps NUMBER;\n" + - "BEGIN\n" + - "\tDELETE FROM employees\n" + - "\tWHERE employees.employee_id = remove_emp.employee_id;\n" + - "\ttot_emps := tot_emps - 1;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("create procedure remove_emp (\n" + - "\temployee_id NUMBER\n" + - ")\n" + - "as\n" + - "\ttot_emps NUMBER;\n" + - "begin\n" + - "\tdelete from employees\n" + - "\twhere employees.employee_id = remove_emp.employee_id;\n" + - "\ttot_emps := tot_emps - 1;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("CREATE PROCEDURE remove_emp (\n" + + "\temployee_id NUMBER\n" + + ")\n" + + "AS\n" + + "\ttot_emps NUMBER;\n" + + "BEGIN\n" + + "\tDELETE FROM employees\n" + + "\tWHERE employees.employee_id = remove_emp.employee_id;\n" + + "\ttot_emps := tot_emps - 1;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("create procedure remove_emp (\n" + + "\temployee_id NUMBER\n" + + ")\n" + + "as\n" + + "\ttot_emps NUMBER;\n" + + "begin\n" + + "\tdelete from employees\n" + + "\twhere employees.employee_id = remove_emp.employee_id;\n" + + "\ttot_emps := tot_emps - 1;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_1.java index 0e8a8522f6..91443811fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_1.java @@ -24,37 +24,36 @@ import java.util.List; public class Oracle_pl_1 extends OracleTest { - public void test_0() throws Exception { String sql = "DROP TABLE employees_temp;\n" + - "CREATE TABLE employees_temp AS\n" + - " SELECT employee_id, first_name, last_name \n" + - " FROM employees;\n" + - " \n" + - "DECLARE\n" + - " emp_id employees_temp.employee_id%TYPE := 299;\n" + - " emp_first_name employees_temp.first_name%TYPE := 'Bob';\n" + - " emp_last_name employees_temp.last_name%TYPE := 'Henry';\n" + - "BEGIN\n" + - " INSERT INTO employees_temp (employee_id, first_name, last_name) \n" + - " VALUES (emp_id, emp_first_name, emp_last_name);\n" + - " \n" + - " UPDATE employees_temp\n" + - " SET first_name = 'Robert'\n" + - " WHERE employee_id = emp_id;\n" + - " \n" + - " DELETE FROM employees_temp\n" + - " WHERE employee_id = emp_id\n" + - " RETURNING first_name, last_name\n" + - " INTO emp_first_name, emp_last_name;\n" + - " \n" + - " COMMIT;\n" + - " DBMS_OUTPUT.PUT_LINE (emp_first_name || ' ' || emp_last_name);\n" + - "END;"; // + "CREATE TABLE employees_temp AS\n" + + " SELECT employee_id, first_name, last_name \n" + + " FROM employees;\n" + + " \n" + + "DECLARE\n" + + " emp_id employees_temp.employee_id%TYPE := 299;\n" + + " emp_first_name employees_temp.first_name%TYPE := 'Bob';\n" + + " emp_last_name employees_temp.last_name%TYPE := 'Henry';\n" + + "BEGIN\n" + + " INSERT INTO employees_temp (employee_id, first_name, last_name) \n" + + " VALUES (emp_id, emp_first_name, emp_last_name);\n" + + " \n" + + " UPDATE employees_temp\n" + + " SET first_name = 'Robert'\n" + + " WHERE employee_id = emp_id;\n" + + " \n" + + " DELETE FROM employees_temp\n" + + " WHERE employee_id = emp_id\n" + + " RETURNING first_name, last_name\n" + + " INTO emp_first_name, emp_last_name;\n" + + " \n" + + " COMMIT;\n" + + " DBMS_OUTPUT.PUT_LINE (emp_first_name || ' ' || emp_last_name);\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(3, statementList.size()); - SQLStatement stmt = statementList.get(2); + assertEquals(3, statementList.size()); + SQLStatement stmt = statementList.get(2); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -78,45 +77,45 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("DECLARE\n" + - "\temp_id employees_temp.employee_id%TYPE := 299;\n" + - "\temp_first_name employees_temp.first_name%TYPE := 'Bob';\n" + - "\temp_last_name employees_temp.last_name%TYPE := 'Henry';\n" + - "BEGIN\n" + - "\tINSERT INTO employees_temp (employee_id, first_name, last_name)\n" + - "\tVALUES (emp_id, emp_first_name, emp_last_name);\n" + - "\tUPDATE employees_temp\n" + - "\tSET first_name = 'Robert'\n" + - "\tWHERE employee_id = emp_id;\n" + - "\tDELETE FROM employees_temp\n" + - "\tWHERE employee_id = emp_id\n" + - "\tRETURNING first_name, last_name INTO emp_first_name, emp_last_name;\n" + - "\tCOMMIT;\n" + - "\tDBMS_OUTPUT.PUT_LINE(emp_first_name || ' ' || emp_last_name);\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\temp_id employees_temp.employee_id%TYPE := 299;\n" + - "\temp_first_name employees_temp.first_name%TYPE := 'Bob';\n" + - "\temp_last_name employees_temp.last_name%TYPE := 'Henry';\n" + - "begin\n" + - "\tinsert into employees_temp (employee_id, first_name, last_name)\n" + - "\tvalues (emp_id, emp_first_name, emp_last_name);\n" + - "\tupdate employees_temp\n" + - "\tset first_name = 'Robert'\n" + - "\twhere employee_id = emp_id;\n" + - "\tdelete from employees_temp\n" + - "\twhere employee_id = emp_id\n" + - "\treturning first_name, last_name into emp_first_name, emp_last_name;\n" + - "\tcommit;\n" + - "\tDBMS_OUTPUT.PUT_LINE(emp_first_name || ' ' || emp_last_name);\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("DECLARE\n" + + "\temp_id employees_temp.employee_id%TYPE := 299;\n" + + "\temp_first_name employees_temp.first_name%TYPE := 'Bob';\n" + + "\temp_last_name employees_temp.last_name%TYPE := 'Henry';\n" + + "BEGIN\n" + + "\tINSERT INTO employees_temp (employee_id, first_name, last_name)\n" + + "\tVALUES (emp_id, emp_first_name, emp_last_name);\n" + + "\tUPDATE employees_temp\n" + + "\tSET first_name = 'Robert'\n" + + "\tWHERE employee_id = emp_id;\n" + + "\tDELETE FROM employees_temp\n" + + "\tWHERE employee_id = emp_id\n" + + "\tRETURNING first_name, last_name INTO emp_first_name, emp_last_name;\n" + + "\tCOMMIT;\n" + + "\tDBMS_OUTPUT.PUT_LINE(emp_first_name || ' ' || emp_last_name);\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\temp_id employees_temp.employee_id%TYPE := 299;\n" + + "\temp_first_name employees_temp.first_name%TYPE := 'Bob';\n" + + "\temp_last_name employees_temp.last_name%TYPE := 'Henry';\n" + + "begin\n" + + "\tinsert into employees_temp (employee_id, first_name, last_name)\n" + + "\tvalues (emp_id, emp_first_name, emp_last_name);\n" + + "\tupdate employees_temp\n" + + "\tset first_name = 'Robert'\n" + + "\twhere employee_id = emp_id;\n" + + "\tdelete from employees_temp\n" + + "\twhere employee_id = emp_id\n" + + "\treturning first_name, last_name into emp_first_name, emp_last_name;\n" + + "\tcommit;\n" + + "\tDBMS_OUTPUT.PUT_LINE(emp_first_name || ' ' || emp_last_name);\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_2.java index 84cc8b560b..406432db91 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_2.java @@ -24,15 +24,14 @@ import java.util.List; public class Oracle_pl_2 extends OracleTest { - public void test_0() throws Exception { String sql = "BEGIN\n" + - " SET :id = sys.dbms_transaction.local_transaction_id;\n" + - "END;"; // + " SET :id = sys.dbms_transaction.local_transaction_id;\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); - SQLStatement stmt = statementList.get(0); + assertEquals(1, statementList.size()); + SQLStatement stmt = statementList.get(0); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -56,19 +55,19 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("BEGIN\n" + - "\tSET :id := sys.dbms_transaction.local_transaction_id;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("begin\n" + - "\tset :id := sys.dbms_transaction.local_transaction_id;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("BEGIN\n" + + "\tSET :id := sys.dbms_transaction.local_transaction_id;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("begin\n" + + "\tset :id := sys.dbms_transaction.local_transaction_id;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_3.java index 8c32abcce2..f2df17cedc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_3.java @@ -24,42 +24,41 @@ import java.util.List; public class Oracle_pl_3 extends OracleTest { - public void test_0() throws Exception { String sql = "create or replace type type_body_elements\n" + - "as object\n" + - "(\n" + - " some_string varchar2(64),\n" + - " member function function_one\n" + - " return varchar2,\n" + - " member function function_two\n" + - " return varchar2\n" + - ");\n" + - "/\n" + - "\n" + - "create or replace type body type_body_elements\n" + - "is\n" + - "\n" + - " member function function_one\n" + - " return varchar2\n" + - " is\n" + - " begin\n" + - " return 'the function_one result';\n" + - " end function_one;\n" + - "\n" + - " member function function_two\n" + - " return varchar2\n" + - " is\n" + - " begin\n" + - " return 'the function_two result';\n" + - " end function_two;\n" + - "\n" + - "end;\n" + - "/\n"; // + "as object\n" + + "(\n" + + " some_string varchar2(64),\n" + + " member function function_one\n" + + " return varchar2,\n" + + " member function function_two\n" + + " return varchar2\n" + + ");\n" + + "/\n" + + "\n" + + "create or replace type body type_body_elements\n" + + "is\n" + + "\n" + + " member function function_one\n" + + " return varchar2\n" + + " is\n" + + " begin\n" + + " return 'the function_one result';\n" + + " end function_one;\n" + + "\n" + + " member function function_two\n" + + " return varchar2\n" + + " is\n" + + " begin\n" + + " return 'the function_two result';\n" + + " end function_two;\n" + + "\n" + + "end;\n" + + "/\n"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(4, statementList.size()); - SQLStatement stmt = statementList.get(0); + assertEquals(4, statementList.size()); + SQLStatement stmt = statementList.get(0); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -83,23 +82,23 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("CREATE OR REPLACE TYPE type_body_elements AS OBJECT (\n" + - "\tsome_string varchar2(64), \n" + - "\tMEMBER FUNCTION function_one () RETURN varchar2, \n" + - "\tMEMBER FUNCTION function_two () RETURN varchar2\n" + - ");", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("create or replace type type_body_elements AS OBJECT (\n" + - "\tsome_string varchar2(64), \n" + - "\tmember function function_one () return varchar2, \n" + - "\tmember function function_two () return varchar2\n" + - ");", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("CREATE OR REPLACE TYPE type_body_elements AS OBJECT (\n" + + "\tsome_string varchar2(64), \n" + + "\tMEMBER FUNCTION function_one () RETURN varchar2, \n" + + "\tMEMBER FUNCTION function_two () RETURN varchar2\n" + + ");", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("create or replace type type_body_elements AS OBJECT (\n" + + "\tsome_string varchar2(64), \n" + + "\tmember function function_one () return varchar2, \n" + + "\tmember function function_two () return varchar2\n" + + ");", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_4.java index d92442a5a9..3f3214bdf2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_4.java @@ -24,16 +24,15 @@ import java.util.List; public class Oracle_pl_4 extends OracleTest { - public void test_0() throws Exception { String sql = "begin buf_b := HEXTORAW('636865642f4c'); \n" + - " dbms_lob.write(loc_b, 2048, 28493, buf_b);\n" + - "END;\n" + - "\n "; // + " dbms_lob.write(loc_b, 2048, 28493, buf_b);\n" + + "END;\n" + + "\n "; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); - SQLStatement stmt = statementList.get(0); + assertEquals(1, statementList.size()); + SQLStatement stmt = statementList.get(0); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -57,21 +56,21 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("BEGIN\n" + - "\tbuf_b := HEXTORAW('636865642f4c');\n" + - "\tdbms_lob.write(loc_b, 2048, 28493, buf_b);\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("begin\n" + - "\tbuf_b := HEXTORAW('636865642f4c');\n" + - "\tdbms_lob.write(loc_b, 2048, 28493, buf_b);\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("BEGIN\n" + + "\tbuf_b := HEXTORAW('636865642f4c');\n" + + "\tdbms_lob.write(loc_b, 2048, 28493, buf_b);\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("begin\n" + + "\tbuf_b := HEXTORAW('636865642f4c');\n" + + "\tdbms_lob.write(loc_b, 2048, 28493, buf_b);\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_5.java index 2ba18d8f8a..94ab15d339 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_5.java @@ -25,22 +25,21 @@ import java.util.List; public class Oracle_pl_5 extends OracleTest { - public void test_0() throws Exception { String sql = "create or replace procedure cursor_insert_user(inarea in number) is\n" + - "-- 使用游标添加数据至 用户表 用户表结构件 insertUser.sql\n" + - "cursor c_user is select * from TEST_USER T where T.active = 1 and T.area = inarea;\n" + - "\n" + - "begin\n" + - "for data in c_user loop\n" + - "insert into USER(id, name, username, passwd, age, sex, level, area, created_date, version)\n" + - "values (SEQ_USER.NEXTVAL, data.name, data.username, data.passwd, data.age, data.sex, data.level, data.area, data.created_date, 1);\n" + - "end loop;\n" + - "end;"; // + "-- 使用游标添加数据至 用户表 用户表结构件 insertUser.sql\n" + + "cursor c_user is select * from TEST_USER T where T.active = 1 and T.area = inarea;\n" + + "\n" + + "begin\n" + + "for data in c_user loop\n" + + "insert into USER(id, name, username, passwd, age, sex, level, area, created_date, version)\n" + + "values (SEQ_USER.NEXTVAL, data.name, data.username, data.passwd, data.age, data.sex, data.level, data.area, data.created_date, 1);\n" + + "end loop;\n" + + "end;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); - SQLStatement stmt = statementList.get(0); + assertEquals(1, statementList.size()); + SQLStatement stmt = statementList.get(0); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -65,51 +64,51 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("CREATE OR REPLACE PROCEDURE cursor_insert_user (\n" + - "\tinarea IN number\n" + - ")\n" + - "AS\n" + - "\tCURSOR c_user IS\n" + - "\t\tSELECT *\n" + - "\t\tFROM TEST_USER T\n" + - "\t\tWHERE T.active = 1\n" + - "\t\t\tAND T.area = inarea;\n" + - "BEGIN\n" + - "\tFOR data IN c_user\n" + - "\tLOOP\n" + - "\t\tINSERT INTO USER\n" + - "\t\t\t(id, name, username, passwd, age\n" + - "\t\t\t, sex, level, area, created_date, version)\n" + - "\t\tVALUES (SEQ_USER.NEXTVAL, data.name, data.username, data.passwd, data.age\n" + - "\t\t\t, data.sex, data.level, data.area, data.created_date, 1);\n" + - "\tEND LOOP;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("create or replace procedure cursor_insert_user (\n" + - "\tinarea in number\n" + - ")\n" + - "as\n" + - "\tcursor c_user is\n" + - "\t\tselect *\n" + - "\t\tfrom TEST_USER T\n" + - "\t\twhere T.active = 1\n" + - "\t\t\tand T.area = inarea;\n" + - "begin\n" + - "\tfor data in c_user\n" + - "\tloop\n" + - "\t\tinsert into USER\n" + - "\t\t\t(id, name, username, passwd, age\n" + - "\t\t\t, sex, level, area, created_date, version)\n" + - "\t\tvalues (SEQ_USER.nextval, data.name, data.username, data.passwd, data.age\n" + - "\t\t\t, data.sex, data.level, data.area, data.created_date, 1);\n" + - "\tend loop;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("CREATE OR REPLACE PROCEDURE cursor_insert_user (\n" + + "\tinarea IN number\n" + + ")\n" + + "AS\n" + + "\tCURSOR c_user IS\n" + + "\t\tSELECT *\n" + + "\t\tFROM TEST_USER T\n" + + "\t\tWHERE T.active = 1\n" + + "\t\t\tAND T.area = inarea;\n" + + "BEGIN\n" + + "\tFOR data IN c_user\n" + + "\tLOOP\n" + + "\t\tINSERT INTO USER\n" + + "\t\t\t(id, name, username, passwd, age\n" + + "\t\t\t, sex, level, area, created_date, version)\n" + + "\t\tVALUES (SEQ_USER.NEXTVAL, data.name, data.username, data.passwd, data.age\n" + + "\t\t\t, data.sex, data.level, data.area, data.created_date, 1);\n" + + "\tEND LOOP;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("create or replace procedure cursor_insert_user (\n" + + "\tinarea in number\n" + + ")\n" + + "as\n" + + "\tcursor c_user is\n" + + "\t\tselect *\n" + + "\t\tfrom TEST_USER T\n" + + "\t\twhere T.active = 1\n" + + "\t\t\tand T.area = inarea;\n" + + "begin\n" + + "\tfor data in c_user\n" + + "\tloop\n" + + "\t\tinsert into USER\n" + + "\t\t\t(id, name, username, passwd, age\n" + + "\t\t\t, sex, level, area, created_date, version)\n" + + "\t\tvalues (SEQ_USER.nextval, data.name, data.username, data.passwd, data.age\n" + + "\t\t\t, data.sex, data.level, data.area, data.created_date, 1);\n" + + "\tend loop;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_0.java index f41502d9fd..18e45a16e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_0.java @@ -24,25 +24,24 @@ import java.util.List; public class Oracle_pl_case_0 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + - " grade CHAR(1);\n" + - "BEGIN\n" + - " grade := 'B';\n" + - " \n" + - " CASE\n" + - " WHEN grade = 'A' THEN DBMS_OUTPUT.PUT_LINE('Excellent');\n" + - " WHEN grade = 'B' THEN DBMS_OUTPUT.PUT_LINE('Very Good');\n" + - " WHEN grade = 'C' THEN DBMS_OUTPUT.PUT_LINE('Good');\n" + - " WHEN grade = 'D' THEN DBMS_OUTPUT.PUT_LINE('Fair');\n" + - " WHEN grade = 'F' THEN DBMS_OUTPUT.PUT_LINE('Poor');\n" + - " ELSE DBMS_OUTPUT.PUT_LINE('No such grade');\n" + - " END CASE;\n" + - "END;"; // + " grade CHAR(1);\n" + + "BEGIN\n" + + " grade := 'B';\n" + + " \n" + + " CASE\n" + + " WHEN grade = 'A' THEN DBMS_OUTPUT.PUT_LINE('Excellent');\n" + + " WHEN grade = 'B' THEN DBMS_OUTPUT.PUT_LINE('Very Good');\n" + + " WHEN grade = 'C' THEN DBMS_OUTPUT.PUT_LINE('Good');\n" + + " WHEN grade = 'D' THEN DBMS_OUTPUT.PUT_LINE('Fair');\n" + + " WHEN grade = 'F' THEN DBMS_OUTPUT.PUT_LINE('Poor');\n" + + " ELSE DBMS_OUTPUT.PUT_LINE('No such grade');\n" + + " END CASE;\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -68,39 +67,39 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("DECLARE\n" + - "\tgrade CHAR(1);\n" + - "BEGIN\n" + - "\tgrade := 'B';\n" + - "\tCASE\n" + - "\t\tWHEN grade = 'A' THEN DBMS_OUTPUT.PUT_LINE('Excellent'); \n" + - "\t\tWHEN grade = 'B' THEN DBMS_OUTPUT.PUT_LINE('Very Good'); \n" + - "\t\tWHEN grade = 'C' THEN DBMS_OUTPUT.PUT_LINE('Good'); \n" + - "\t\tWHEN grade = 'D' THEN DBMS_OUTPUT.PUT_LINE('Fair'); \n" + - "\t\tWHEN grade = 'F' THEN DBMS_OUTPUT.PUT_LINE('Poor');\n" + - "\t\tELSE DBMS_OUTPUT.PUT_LINE('No such grade');\n" + - "\tEND CASE;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\tgrade CHAR(1);\n" + - "begin\n" + - "\tgrade := 'B';\n" + - "\tcase\n" + - "\t\twhen grade = 'A' then DBMS_OUTPUT.PUT_LINE('Excellent'); \n" + - "\t\twhen grade = 'B' then DBMS_OUTPUT.PUT_LINE('Very Good'); \n" + - "\t\twhen grade = 'C' then DBMS_OUTPUT.PUT_LINE('Good'); \n" + - "\t\twhen grade = 'D' then DBMS_OUTPUT.PUT_LINE('Fair'); \n" + - "\t\twhen grade = 'F' then DBMS_OUTPUT.PUT_LINE('Poor');\n" + - "\t\telse DBMS_OUTPUT.PUT_LINE('No such grade');\n" + - "\tend case;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("DECLARE\n" + + "\tgrade CHAR(1);\n" + + "BEGIN\n" + + "\tgrade := 'B';\n" + + "\tCASE\n" + + "\t\tWHEN grade = 'A' THEN DBMS_OUTPUT.PUT_LINE('Excellent'); \n" + + "\t\tWHEN grade = 'B' THEN DBMS_OUTPUT.PUT_LINE('Very Good'); \n" + + "\t\tWHEN grade = 'C' THEN DBMS_OUTPUT.PUT_LINE('Good'); \n" + + "\t\tWHEN grade = 'D' THEN DBMS_OUTPUT.PUT_LINE('Fair'); \n" + + "\t\tWHEN grade = 'F' THEN DBMS_OUTPUT.PUT_LINE('Poor');\n" + + "\t\tELSE DBMS_OUTPUT.PUT_LINE('No such grade');\n" + + "\tEND CASE;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tgrade CHAR(1);\n" + + "begin\n" + + "\tgrade := 'B';\n" + + "\tcase\n" + + "\t\twhen grade = 'A' then DBMS_OUTPUT.PUT_LINE('Excellent'); \n" + + "\t\twhen grade = 'B' then DBMS_OUTPUT.PUT_LINE('Very Good'); \n" + + "\t\twhen grade = 'C' then DBMS_OUTPUT.PUT_LINE('Good'); \n" + + "\t\twhen grade = 'D' then DBMS_OUTPUT.PUT_LINE('Fair'); \n" + + "\t\twhen grade = 'F' then DBMS_OUTPUT.PUT_LINE('Poor');\n" + + "\t\telse DBMS_OUTPUT.PUT_LINE('No such grade');\n" + + "\tend case;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_1.java index e61f5e4a15..a7a42fd630 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_1.java @@ -24,27 +24,26 @@ import java.util.List; public class Oracle_pl_case_1 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + - " grade CHAR(1);\n" + - "BEGIN\n" + - " grade := 'B';\n" + - " \n" + - " CASE\n" + - " WHEN grade = 'A' THEN DBMS_OUTPUT.PUT_LINE('Excellent');\n" + - " WHEN grade = 'B' THEN DBMS_OUTPUT.PUT_LINE('Very Good');\n" + - " WHEN grade = 'C' THEN DBMS_OUTPUT.PUT_LINE('Good');\n" + - " WHEN grade = 'D' THEN DBMS_OUTPUT.PUT_LINE('Fair');\n" + - " WHEN grade = 'F' THEN DBMS_OUTPUT.PUT_LINE('Poor');\n" + - " END CASE;\n" + - "EXCEPTION\n" + - " WHEN CASE_NOT_FOUND THEN\n" + - " DBMS_OUTPUT.PUT_LINE('No such grade');\n" + - "END;"; // + " grade CHAR(1);\n" + + "BEGIN\n" + + " grade := 'B';\n" + + " \n" + + " CASE\n" + + " WHEN grade = 'A' THEN DBMS_OUTPUT.PUT_LINE('Excellent');\n" + + " WHEN grade = 'B' THEN DBMS_OUTPUT.PUT_LINE('Very Good');\n" + + " WHEN grade = 'C' THEN DBMS_OUTPUT.PUT_LINE('Good');\n" + + " WHEN grade = 'D' THEN DBMS_OUTPUT.PUT_LINE('Fair');\n" + + " WHEN grade = 'F' THEN DBMS_OUTPUT.PUT_LINE('Poor');\n" + + " END CASE;\n" + + "EXCEPTION\n" + + " WHEN CASE_NOT_FOUND THEN\n" + + " DBMS_OUTPUT.PUT_LINE('No such grade');\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -70,41 +69,41 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("DECLARE\n" + - "\tgrade CHAR(1);\n" + - "BEGIN\n" + - "\tgrade := 'B';\n" + - "\tCASE\n" + - "\t\tWHEN grade = 'A' THEN DBMS_OUTPUT.PUT_LINE('Excellent'); \n" + - "\t\tWHEN grade = 'B' THEN DBMS_OUTPUT.PUT_LINE('Very Good'); \n" + - "\t\tWHEN grade = 'C' THEN DBMS_OUTPUT.PUT_LINE('Good'); \n" + - "\t\tWHEN grade = 'D' THEN DBMS_OUTPUT.PUT_LINE('Fair'); \n" + - "\t\tWHEN grade = 'F' THEN DBMS_OUTPUT.PUT_LINE('Poor');\n" + - "\tEND CASE;\n" + - "EXCEPTION\n" + - "\tWHEN CASE_NOT_FOUND THEN DBMS_OUTPUT.PUT_LINE('No such grade');\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\tgrade CHAR(1);\n" + - "begin\n" + - "\tgrade := 'B';\n" + - "\tcase\n" + - "\t\twhen grade = 'A' then DBMS_OUTPUT.PUT_LINE('Excellent'); \n" + - "\t\twhen grade = 'B' then DBMS_OUTPUT.PUT_LINE('Very Good'); \n" + - "\t\twhen grade = 'C' then DBMS_OUTPUT.PUT_LINE('Good'); \n" + - "\t\twhen grade = 'D' then DBMS_OUTPUT.PUT_LINE('Fair'); \n" + - "\t\twhen grade = 'F' then DBMS_OUTPUT.PUT_LINE('Poor');\n" + - "\tend case;\n" + - "exception\n" + - "\twhen CASE_NOT_FOUND then DBMS_OUTPUT.PUT_LINE('No such grade');\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("DECLARE\n" + + "\tgrade CHAR(1);\n" + + "BEGIN\n" + + "\tgrade := 'B';\n" + + "\tCASE\n" + + "\t\tWHEN grade = 'A' THEN DBMS_OUTPUT.PUT_LINE('Excellent'); \n" + + "\t\tWHEN grade = 'B' THEN DBMS_OUTPUT.PUT_LINE('Very Good'); \n" + + "\t\tWHEN grade = 'C' THEN DBMS_OUTPUT.PUT_LINE('Good'); \n" + + "\t\tWHEN grade = 'D' THEN DBMS_OUTPUT.PUT_LINE('Fair'); \n" + + "\t\tWHEN grade = 'F' THEN DBMS_OUTPUT.PUT_LINE('Poor');\n" + + "\tEND CASE;\n" + + "EXCEPTION\n" + + "\tWHEN CASE_NOT_FOUND THEN DBMS_OUTPUT.PUT_LINE('No such grade');\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tgrade CHAR(1);\n" + + "begin\n" + + "\tgrade := 'B';\n" + + "\tcase\n" + + "\t\twhen grade = 'A' then DBMS_OUTPUT.PUT_LINE('Excellent'); \n" + + "\t\twhen grade = 'B' then DBMS_OUTPUT.PUT_LINE('Very Good'); \n" + + "\t\twhen grade = 'C' then DBMS_OUTPUT.PUT_LINE('Good'); \n" + + "\t\twhen grade = 'D' then DBMS_OUTPUT.PUT_LINE('Fair'); \n" + + "\t\twhen grade = 'F' then DBMS_OUTPUT.PUT_LINE('Poor');\n" + + "\tend case;\n" + + "exception\n" + + "\twhen CASE_NOT_FOUND then DBMS_OUTPUT.PUT_LINE('No such grade');\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_2.java index 1ce9330a3f..866d6bb378 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_2.java @@ -24,25 +24,24 @@ import java.util.List; public class Oracle_pl_case_2 extends OracleTest { - public void test_0() throws Exception { String sql = "CASE l_employee_type\n" + - " WHEN 'S' \n" + - " THEN\n" + - " award_bonus (l_employee_id);\n" + - " WHEN 'H' \n" + - " THEN\n" + - " award_bonus (l_employee_id);\n" + - " WHEN 'C' \n" + - " THEN\n" + - " award_commissioned_bonus (\n" + - " l_employee_id);\n" + - " ELSE\n" + - " RAISE invalid_employee_type;\n" + - "END CASE;"; // + " WHEN 'S' \n" + + " THEN\n" + + " award_bonus (l_employee_id);\n" + + " WHEN 'H' \n" + + " THEN\n" + + " award_bonus (l_employee_id);\n" + + " WHEN 'C' \n" + + " THEN\n" + + " award_commissioned_bonus (\n" + + " l_employee_id);\n" + + " ELSE\n" + + " RAISE invalid_employee_type;\n" + + "END CASE;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -68,25 +67,25 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("CASE l_employee_type\n" + - "\tWHEN 'S' THEN award_bonus(l_employee_id); \n" + - "\tWHEN 'H' THEN award_bonus(l_employee_id); \n" + - "\tWHEN 'C' THEN award_commissioned_bonus(l_employee_id);\n" + - "\tELSE RAISE invalid_employee_type;\n" + - "END CASE;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("case l_employee_type\n" + - "\twhen 'S' then award_bonus(l_employee_id); \n" + - "\twhen 'H' then award_bonus(l_employee_id); \n" + - "\twhen 'C' then award_commissioned_bonus(l_employee_id);\n" + - "\telse raise invalid_employee_type;\n" + - "end case;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("CASE l_employee_type\n" + + "\tWHEN 'S' THEN award_bonus(l_employee_id); \n" + + "\tWHEN 'H' THEN award_bonus(l_employee_id); \n" + + "\tWHEN 'C' THEN award_commissioned_bonus(l_employee_id);\n" + + "\tELSE RAISE invalid_employee_type;\n" + + "END CASE;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("case l_employee_type\n" + + "\twhen 'S' then award_bonus(l_employee_id); \n" + + "\twhen 'H' then award_bonus(l_employee_id); \n" + + "\twhen 'C' then award_commissioned_bonus(l_employee_id);\n" + + "\telse raise invalid_employee_type;\n" + + "end case;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_0.java index 07c990a784..f267dac1c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_0.java @@ -24,43 +24,42 @@ import java.util.List; public class Oracle_pl_exception_0 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE OR REPLACE PROCEDURE select_item (\n" + - " t_column VARCHAR2,\n" + - " t_name VARCHAR2\n" + - ") AUTHID DEFINER\n" + - "IS\n" + - " temp VARCHAR2(30);\n" + - "BEGIN\n" + - " temp := t_column; -- For error message if next SELECT fails\n" + - " \n" + - " -- Fails if table t_name does not have column t_column:\n" + - " \n" + - " SELECT COLUMN_NAME INTO temp\n" + - " FROM USER_TAB_COLS \n" + - " WHERE TABLE_NAME = UPPER(t_name)\n" + - " AND COLUMN_NAME = UPPER(t_column);\n" + - " \n" + - " temp := t_name; -- For error message if next SELECT fails\n" + - " \n" + - " -- Fails if there is no table named t_name:\n" + - " \n" + - " SELECT OBJECT_NAME INTO temp\n" + - " FROM USER_OBJECTS\n" + - " WHERE OBJECT_NAME = UPPER(t_name)\n" + - " AND OBJECT_TYPE = 'TABLE';\n" + - " \n" + - "EXCEPTION\n" + - " WHEN NO_DATA_FOUND THEN\n" + - " DBMS_OUTPUT.PUT_LINE ('No Data found for SELECT on ' || temp);\n" + - " WHEN OTHERS THEN\n" + - " DBMS_OUTPUT.PUT_LINE ('Unexpected error');\n" + - " RAISE;\n" + - "END;"; // + " t_column VARCHAR2,\n" + + " t_name VARCHAR2\n" + + ") AUTHID DEFINER\n" + + "IS\n" + + " temp VARCHAR2(30);\n" + + "BEGIN\n" + + " temp := t_column; -- For error message if next SELECT fails\n" + + " \n" + + " -- Fails if table t_name does not have column t_column:\n" + + " \n" + + " SELECT COLUMN_NAME INTO temp\n" + + " FROM USER_TAB_COLS \n" + + " WHERE TABLE_NAME = UPPER(t_name)\n" + + " AND COLUMN_NAME = UPPER(t_column);\n" + + " \n" + + " temp := t_name; -- For error message if next SELECT fails\n" + + " \n" + + " -- Fails if there is no table named t_name:\n" + + " \n" + + " SELECT OBJECT_NAME INTO temp\n" + + " FROM USER_OBJECTS\n" + + " WHERE OBJECT_NAME = UPPER(t_name)\n" + + " AND OBJECT_TYPE = 'TABLE';\n" + + " \n" + + "EXCEPTION\n" + + " WHEN NO_DATA_FOUND THEN\n" + + " DBMS_OUTPUT.PUT_LINE ('No Data found for SELECT on ' || temp);\n" + + " WHEN OTHERS THEN\n" + + " DBMS_OUTPUT.PUT_LINE ('Unexpected error');\n" + + " RAISE;\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -84,72 +83,72 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("CREATE OR REPLACE PROCEDURE select_item (\n" + - "\tt_column VARCHAR2, \n" + - "\tt_name VARCHAR2\n" + - ") AUTHID DEFINER\n" + - "AS\n" + - "\ttemp VARCHAR2(30);\n" + - "BEGIN\n" + - "\ttemp := t_column;\n" + - "\t-- For error message if next SELECT fails\n" + - "\t-- Fails if table t_name does not have column t_column:\n" + - "\tSELECT COLUMN_NAME\n" + - "\tINTO temp\n" + - "\tFROM USER_TAB_COLS\n" + - "\tWHERE TABLE_NAME = UPPER(t_name)\n" + - "\t\tAND COLUMN_NAME = UPPER(t_column);\n" + - "\ttemp := t_name;\n" + - "\t-- For error message if next SELECT fails\n" + - "\t-- Fails if there is no table named t_name:\n" + - "\tSELECT OBJECT_NAME\n" + - "\tINTO temp\n" + - "\tFROM USER_OBJECTS\n" + - "\tWHERE OBJECT_NAME = UPPER(t_name)\n" + - "\t\tAND OBJECT_TYPE = 'TABLE';\n" + - "EXCEPTION\n" + - "\tWHEN NO_DATA_FOUND THEN DBMS_OUTPUT.PUT_LINE('No Data found for SELECT on ' || temp);\n" + - "\tWHEN OTHERS THEN\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Unexpected error');\n" + - "\t\tRAISE;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("create or replace procedure select_item (\n" + - "\tt_column VARCHAR2, \n" + - "\tt_name VARCHAR2\n" + - ") authid DEFINER\n" + - "as\n" + - "\ttemp VARCHAR2(30);\n" + - "begin\n" + - "\ttemp := t_column;\n" + - "\t-- For error message if next SELECT fails\n" + - "\t-- Fails if table t_name does not have column t_column:\n" + - "\tselect COLUMN_NAME\n" + - "\tinto temp\n" + - "\tfrom USER_TAB_COLS\n" + - "\twhere TABLE_NAME = UPPER(t_name)\n" + - "\t\tand COLUMN_NAME = UPPER(t_column);\n" + - "\ttemp := t_name;\n" + - "\t-- For error message if next SELECT fails\n" + - "\t-- Fails if there is no table named t_name:\n" + - "\tselect OBJECT_NAME\n" + - "\tinto temp\n" + - "\tfrom USER_OBJECTS\n" + - "\twhere OBJECT_NAME = UPPER(t_name)\n" + - "\t\tand OBJECT_TYPE = 'TABLE';\n" + - "exception\n" + - "\twhen NO_DATA_FOUND then DBMS_OUTPUT.PUT_LINE('No Data found for SELECT on ' || temp);\n" + - "\twhen OTHERS then\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Unexpected error');\n" + - "\t\traise;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("CREATE OR REPLACE PROCEDURE select_item (\n" + + "\tt_column VARCHAR2, \n" + + "\tt_name VARCHAR2\n" + + ") AUTHID DEFINER\n" + + "AS\n" + + "\ttemp VARCHAR2(30);\n" + + "BEGIN\n" + + "\ttemp := t_column;\n" + + "\t-- For error message if next SELECT fails\n" + + "\t-- Fails if table t_name does not have column t_column:\n" + + "\tSELECT COLUMN_NAME\n" + + "\tINTO temp\n" + + "\tFROM USER_TAB_COLS\n" + + "\tWHERE TABLE_NAME = UPPER(t_name)\n" + + "\t\tAND COLUMN_NAME = UPPER(t_column);\n" + + "\ttemp := t_name;\n" + + "\t-- For error message if next SELECT fails\n" + + "\t-- Fails if there is no table named t_name:\n" + + "\tSELECT OBJECT_NAME\n" + + "\tINTO temp\n" + + "\tFROM USER_OBJECTS\n" + + "\tWHERE OBJECT_NAME = UPPER(t_name)\n" + + "\t\tAND OBJECT_TYPE = 'TABLE';\n" + + "EXCEPTION\n" + + "\tWHEN NO_DATA_FOUND THEN DBMS_OUTPUT.PUT_LINE('No Data found for SELECT on ' || temp);\n" + + "\tWHEN OTHERS THEN\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Unexpected error');\n" + + "\t\tRAISE;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("create or replace procedure select_item (\n" + + "\tt_column VARCHAR2, \n" + + "\tt_name VARCHAR2\n" + + ") authid DEFINER\n" + + "as\n" + + "\ttemp VARCHAR2(30);\n" + + "begin\n" + + "\ttemp := t_column;\n" + + "\t-- For error message if next SELECT fails\n" + + "\t-- Fails if table t_name does not have column t_column:\n" + + "\tselect COLUMN_NAME\n" + + "\tinto temp\n" + + "\tfrom USER_TAB_COLS\n" + + "\twhere TABLE_NAME = UPPER(t_name)\n" + + "\t\tand COLUMN_NAME = UPPER(t_column);\n" + + "\ttemp := t_name;\n" + + "\t-- For error message if next SELECT fails\n" + + "\t-- Fails if there is no table named t_name:\n" + + "\tselect OBJECT_NAME\n" + + "\tinto temp\n" + + "\tfrom USER_OBJECTS\n" + + "\twhere OBJECT_NAME = UPPER(t_name)\n" + + "\t\tand OBJECT_TYPE = 'TABLE';\n" + + "exception\n" + + "\twhen NO_DATA_FOUND then DBMS_OUTPUT.PUT_LINE('No Data found for SELECT on ' || temp);\n" + + "\twhen OTHERS then\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Unexpected error');\n" + + "\t\traise;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_1.java index b9a329b8c4..2591f5e3ba 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_1.java @@ -24,30 +24,29 @@ import java.util.List; public class Oracle_pl_exception_1 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE OR REPLACE PROCEDURE loc_var AUTHID DEFINER IS\n" + - " stmt_no POSITIVE;\n" + - " name_ VARCHAR2(100);\n" + - "BEGIN\n" + - " stmt_no := 1;\n" + - "\n" + - " SELECT table_name INTO name_\n" + - " FROM user_tables\n" + - " WHERE table_name LIKE 'ABC%';\n" + - "\n" + - " stmt_no := 2;\n" + - "\n" + - " SELECT table_name INTO name_\n" + - " FROM user_tables\n" + - " WHERE table_name LIKE 'XYZ%';\n" + - "EXCEPTION\n" + - " WHEN NO_DATA_FOUND THEN\n" + - " DBMS_OUTPUT.PUT_LINE ('Table name not found in query ' || stmt_no);\n" + - "END;"; // + " stmt_no POSITIVE;\n" + + " name_ VARCHAR2(100);\n" + + "BEGIN\n" + + " stmt_no := 1;\n" + + "\n" + + " SELECT table_name INTO name_\n" + + " FROM user_tables\n" + + " WHERE table_name LIKE 'ABC%';\n" + + "\n" + + " stmt_no := 2;\n" + + "\n" + + " SELECT table_name INTO name_\n" + + " FROM user_tables\n" + + " WHERE table_name LIKE 'XYZ%';\n" + + "EXCEPTION\n" + + " WHEN NO_DATA_FOUND THEN\n" + + " DBMS_OUTPUT.PUT_LINE ('Table name not found in query ' || stmt_no);\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -71,50 +70,50 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("CREATE OR REPLACE PROCEDURE loc_var AUTHID DEFINER\n" + - "AS\n" + - "\tstmt_no POSITIVE;\n" + - "\tname_ VARCHAR2(100);\n" + - "BEGIN\n" + - "\tstmt_no := 1;\n" + - "\tSELECT table_name\n" + - "\tINTO name_\n" + - "\tFROM user_tables\n" + - "\tWHERE table_name LIKE 'ABC%';\n" + - "\tstmt_no := 2;\n" + - "\tSELECT table_name\n" + - "\tINTO name_\n" + - "\tFROM user_tables\n" + - "\tWHERE table_name LIKE 'XYZ%';\n" + - "EXCEPTION\n" + - "\tWHEN NO_DATA_FOUND THEN DBMS_OUTPUT.PUT_LINE('Table name not found in query ' || stmt_no);\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("create or replace procedure loc_var authid DEFINER\n" + - "as\n" + - "\tstmt_no POSITIVE;\n" + - "\tname_ VARCHAR2(100);\n" + - "begin\n" + - "\tstmt_no := 1;\n" + - "\tselect table_name\n" + - "\tinto name_\n" + - "\tfrom user_tables\n" + - "\twhere table_name like 'ABC%';\n" + - "\tstmt_no := 2;\n" + - "\tselect table_name\n" + - "\tinto name_\n" + - "\tfrom user_tables\n" + - "\twhere table_name like 'XYZ%';\n" + - "exception\n" + - "\twhen NO_DATA_FOUND then DBMS_OUTPUT.PUT_LINE('Table name not found in query ' || stmt_no);\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("CREATE OR REPLACE PROCEDURE loc_var AUTHID DEFINER\n" + + "AS\n" + + "\tstmt_no POSITIVE;\n" + + "\tname_ VARCHAR2(100);\n" + + "BEGIN\n" + + "\tstmt_no := 1;\n" + + "\tSELECT table_name\n" + + "\tINTO name_\n" + + "\tFROM user_tables\n" + + "\tWHERE table_name LIKE 'ABC%';\n" + + "\tstmt_no := 2;\n" + + "\tSELECT table_name\n" + + "\tINTO name_\n" + + "\tFROM user_tables\n" + + "\tWHERE table_name LIKE 'XYZ%';\n" + + "EXCEPTION\n" + + "\tWHEN NO_DATA_FOUND THEN DBMS_OUTPUT.PUT_LINE('Table name not found in query ' || stmt_no);\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("create or replace procedure loc_var authid DEFINER\n" + + "as\n" + + "\tstmt_no POSITIVE;\n" + + "\tname_ VARCHAR2(100);\n" + + "begin\n" + + "\tstmt_no := 1;\n" + + "\tselect table_name\n" + + "\tinto name_\n" + + "\tfrom user_tables\n" + + "\twhere table_name like 'ABC%';\n" + + "\tstmt_no := 2;\n" + + "\tselect table_name\n" + + "\tinto name_\n" + + "\tfrom user_tables\n" + + "\twhere table_name like 'XYZ%';\n" + + "exception\n" + + "\twhen NO_DATA_FOUND then DBMS_OUTPUT.PUT_LINE('Table name not found in query ' || stmt_no);\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_2.java index 5d1b6e8a54..b153d7f116 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_2.java @@ -24,23 +24,22 @@ import java.util.List; public class Oracle_pl_exception_2 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + - " stock_price NUMBER := 9.73;\n" + - " net_earnings NUMBER := 0;\n" + - " pe_ratio NUMBER;\n" + - "BEGIN\n" + - " pe_ratio := stock_price / net_earnings; -- raises ZERO_DIVIDE exception\n" + - " DBMS_OUTPUT.PUT_LINE('Price/earnings ratio = ' || pe_ratio);\n" + - "EXCEPTION\n" + - " WHEN ZERO_DIVIDE THEN\n" + - " DBMS_OUTPUT.PUT_LINE('Company had zero earnings.');\n" + - " pe_ratio := NULL;\n" + - "END;"; // + " stock_price NUMBER := 9.73;\n" + + " net_earnings NUMBER := 0;\n" + + " pe_ratio NUMBER;\n" + + "BEGIN\n" + + " pe_ratio := stock_price / net_earnings; -- raises ZERO_DIVIDE exception\n" + + " DBMS_OUTPUT.PUT_LINE('Price/earnings ratio = ' || pe_ratio);\n" + + "EXCEPTION\n" + + " WHEN ZERO_DIVIDE THEN\n" + + " DBMS_OUTPUT.PUT_LINE('Company had zero earnings.');\n" + + " pe_ratio := NULL;\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -64,38 +63,38 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("DECLARE\n" + - "\tstock_price NUMBER := 9.73;\n" + - "\tnet_earnings NUMBER := 0;\n" + - "\tpe_ratio NUMBER;\n" + - "BEGIN\n" + - "\tpe_ratio := stock_price / net_earnings;\n" + - "\tDBMS_OUTPUT.PUT_LINE('Price/earnings ratio = ' || pe_ratio);\n" + - "EXCEPTION\n" + - "\tWHEN ZERO_DIVIDE THEN\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Company had zero earnings.');\n" + - "\t\tpe_ratio := NULL;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\tstock_price NUMBER := 9.73;\n" + - "\tnet_earnings NUMBER := 0;\n" + - "\tpe_ratio NUMBER;\n" + - "begin\n" + - "\tpe_ratio := stock_price / net_earnings;\n" + - "\tDBMS_OUTPUT.PUT_LINE('Price/earnings ratio = ' || pe_ratio);\n" + - "exception\n" + - "\twhen ZERO_DIVIDE then\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Company had zero earnings.');\n" + - "\t\tpe_ratio := null;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("DECLARE\n" + + "\tstock_price NUMBER := 9.73;\n" + + "\tnet_earnings NUMBER := 0;\n" + + "\tpe_ratio NUMBER;\n" + + "BEGIN\n" + + "\tpe_ratio := stock_price / net_earnings;\n" + + "\tDBMS_OUTPUT.PUT_LINE('Price/earnings ratio = ' || pe_ratio);\n" + + "EXCEPTION\n" + + "\tWHEN ZERO_DIVIDE THEN\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Company had zero earnings.');\n" + + "\t\tpe_ratio := NULL;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tstock_price NUMBER := 9.73;\n" + + "\tnet_earnings NUMBER := 0;\n" + + "\tpe_ratio NUMBER;\n" + + "begin\n" + + "\tpe_ratio := stock_price / net_earnings;\n" + + "\tDBMS_OUTPUT.PUT_LINE('Price/earnings ratio = ' || pe_ratio);\n" + + "exception\n" + + "\twhen ZERO_DIVIDE then\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Company had zero earnings.');\n" + + "\t\tpe_ratio := null;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_3.java index 5c5cb7c060..0b912c49c1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_3.java @@ -24,39 +24,38 @@ import java.util.List; public class Oracle_pl_exception_3 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + - " salary_too_high EXCEPTION;\n" + - " current_salary NUMBER := 20000;\n" + - " max_salary NUMBER := 10000;\n" + - " erroneous_salary NUMBER;\n" + - "BEGIN\n" + - "\n" + - " BEGIN\n" + - " IF current_salary > max_salary THEN\n" + - " RAISE salary_too_high; -- raise exception\n" + - " END IF;\n" + - " EXCEPTION\n" + - " WHEN salary_too_high THEN -- start handling exception\n" + - " erroneous_salary := current_salary;\n" + - " DBMS_OUTPUT.PUT_LINE('Salary ' || erroneous_salary ||' is out of range.');\n" + - " DBMS_OUTPUT.PUT_LINE ('Maximum salary is ' || max_salary || '.');\n" + - " RAISE; -- reraise current exception (exception name is optional)\n" + - " END;\n" + - "\n" + - "EXCEPTION\n" + - " WHEN salary_too_high THEN -- finish handling exception\n" + - " current_salary := max_salary;\n" + - "\n" + - " DBMS_OUTPUT.PUT_LINE (\n" + - " 'Revising salary from ' || erroneous_salary ||\n" + - " ' to ' || current_salary || '.'\n" + - " );\n" + - "END;"; // + " salary_too_high EXCEPTION;\n" + + " current_salary NUMBER := 20000;\n" + + " max_salary NUMBER := 10000;\n" + + " erroneous_salary NUMBER;\n" + + "BEGIN\n" + + "\n" + + " BEGIN\n" + + " IF current_salary > max_salary THEN\n" + + " RAISE salary_too_high; -- raise exception\n" + + " END IF;\n" + + " EXCEPTION\n" + + " WHEN salary_too_high THEN -- start handling exception\n" + + " erroneous_salary := current_salary;\n" + + " DBMS_OUTPUT.PUT_LINE('Salary ' || erroneous_salary ||' is out of range.');\n" + + " DBMS_OUTPUT.PUT_LINE ('Maximum salary is ' || max_salary || '.');\n" + + " RAISE; -- reraise current exception (exception name is optional)\n" + + " END;\n" + + "\n" + + "EXCEPTION\n" + + " WHEN salary_too_high THEN -- finish handling exception\n" + + " current_salary := max_salary;\n" + + "\n" + + " DBMS_OUTPUT.PUT_LINE (\n" + + " 'Revising salary from ' || erroneous_salary ||\n" + + " ' to ' || current_salary || '.'\n" + + " );\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -80,58 +79,58 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("DECLARE\n" + - "\tsalary_too_high EXCEPTION;\n" + - "\tcurrent_salary NUMBER := 20000;\n" + - "\tmax_salary NUMBER := 10000;\n" + - "\terroneous_salary NUMBER;\n" + - "BEGIN\n" + - "\tBEGIN\n" + - "\t\tIF current_salary > max_salary THEN\n" + - "\t\t\tRAISE salary_too_high;\n" + - "\t\tEND IF;\n" + - "\tEXCEPTION\n" + - "\t\tWHEN salary_too_high THEN\n" + - "\t\t\terroneous_salary := current_salary;\n" + - "\t\t\tDBMS_OUTPUT.PUT_LINE('Salary ' || erroneous_salary || ' is out of range.');\n" + - "\t\t\tDBMS_OUTPUT.PUT_LINE('Maximum salary is ' || max_salary || '.');\n" + - "\t\t\tRAISE;\n" + - "\tEND;\n" + - "EXCEPTION\n" + - "\tWHEN salary_too_high THEN\n" + - "\t\tcurrent_salary := max_salary;\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Revising salary from ' || erroneous_salary || ' to ' || current_salary || '.');\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\tsalary_too_high EXCEPTION;\n" + - "\tcurrent_salary NUMBER := 20000;\n" + - "\tmax_salary NUMBER := 10000;\n" + - "\terroneous_salary NUMBER;\n" + - "begin\n" + - "\tbegin\n" + - "\t\tif current_salary > max_salary then\n" + - "\t\t\traise salary_too_high;\n" + - "\t\tend if;\n" + - "\texception\n" + - "\t\twhen salary_too_high then\n" + - "\t\t\terroneous_salary := current_salary;\n" + - "\t\t\tDBMS_OUTPUT.PUT_LINE('Salary ' || erroneous_salary || ' is out of range.');\n" + - "\t\t\tDBMS_OUTPUT.PUT_LINE('Maximum salary is ' || max_salary || '.');\n" + - "\t\t\traise;\n" + - "\tend;\n" + - "exception\n" + - "\twhen salary_too_high then\n" + - "\t\tcurrent_salary := max_salary;\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Revising salary from ' || erroneous_salary || ' to ' || current_salary || '.');\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("DECLARE\n" + + "\tsalary_too_high EXCEPTION;\n" + + "\tcurrent_salary NUMBER := 20000;\n" + + "\tmax_salary NUMBER := 10000;\n" + + "\terroneous_salary NUMBER;\n" + + "BEGIN\n" + + "\tBEGIN\n" + + "\t\tIF current_salary > max_salary THEN\n" + + "\t\t\tRAISE salary_too_high;\n" + + "\t\tEND IF;\n" + + "\tEXCEPTION\n" + + "\t\tWHEN salary_too_high THEN\n" + + "\t\t\terroneous_salary := current_salary;\n" + + "\t\t\tDBMS_OUTPUT.PUT_LINE('Salary ' || erroneous_salary || ' is out of range.');\n" + + "\t\t\tDBMS_OUTPUT.PUT_LINE('Maximum salary is ' || max_salary || '.');\n" + + "\t\t\tRAISE;\n" + + "\tEND;\n" + + "EXCEPTION\n" + + "\tWHEN salary_too_high THEN\n" + + "\t\tcurrent_salary := max_salary;\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Revising salary from ' || erroneous_salary || ' to ' || current_salary || '.');\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tsalary_too_high EXCEPTION;\n" + + "\tcurrent_salary NUMBER := 20000;\n" + + "\tmax_salary NUMBER := 10000;\n" + + "\terroneous_salary NUMBER;\n" + + "begin\n" + + "\tbegin\n" + + "\t\tif current_salary > max_salary then\n" + + "\t\t\traise salary_too_high;\n" + + "\t\tend if;\n" + + "\texception\n" + + "\t\twhen salary_too_high then\n" + + "\t\t\terroneous_salary := current_salary;\n" + + "\t\t\tDBMS_OUTPUT.PUT_LINE('Salary ' || erroneous_salary || ' is out of range.');\n" + + "\t\t\tDBMS_OUTPUT.PUT_LINE('Maximum salary is ' || max_salary || '.');\n" + + "\t\t\traise;\n" + + "\tend;\n" + + "exception\n" + + "\twhen salary_too_high then\n" + + "\t\tcurrent_salary := max_salary;\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Revising salary from ' || erroneous_salary || ' to ' || current_salary || '.');\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_4.java index da351f34c2..21eb6bca22 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_4.java @@ -24,29 +24,28 @@ import java.util.List; public class Oracle_pl_exception_4 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE OR REPLACE PROCEDURE p AUTHID DEFINER AS\n" + - "BEGIN\n" + - "\n" + - " DECLARE\n" + - " past_due EXCEPTION;\n" + - " due_date DATE := trunc(SYSDATE) - 1;\n" + - " todays_date DATE := trunc(SYSDATE);\n" + - " BEGIN\n" + - " IF due_date < todays_date THEN\n" + - " RAISE past_due;\n" + - " END IF;\n" + - " END;\n" + - "\n" + - "EXCEPTION\n" + - " WHEN OTHERS THEN\n" + - " ROLLBACK;\n" + - " RAISE;\n" + - "END;"; // + "BEGIN\n" + + "\n" + + " DECLARE\n" + + " past_due EXCEPTION;\n" + + " due_date DATE := trunc(SYSDATE) - 1;\n" + + " todays_date DATE := trunc(SYSDATE);\n" + + " BEGIN\n" + + " IF due_date < todays_date THEN\n" + + " RAISE past_due;\n" + + " END IF;\n" + + " END;\n" + + "\n" + + "EXCEPTION\n" + + " WHEN OTHERS THEN\n" + + " ROLLBACK;\n" + + " RAISE;\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -70,48 +69,48 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("CREATE OR REPLACE PROCEDURE p AUTHID DEFINER\n" + - "AS\n" + - "BEGIN\n" + - "\tDECLARE\n" + - "\t\tpast_due EXCEPTION;\n" + - "\t\tdue_date DATE := trunc(SYSDATE) - 1;\n" + - "\t\ttodays_date DATE := trunc(SYSDATE);\n" + - "\tBEGIN\n" + - "\t\tIF due_date < todays_date THEN\n" + - "\t\t\tRAISE past_due;\n" + - "\t\tEND IF;\n" + - "\tEND;\n" + - "EXCEPTION\n" + - "\tWHEN OTHERS THEN\n" + - "\t\tROLLBACK;\n" + - "\t\tRAISE;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("create or replace procedure p authid DEFINER\n" + - "as\n" + - "begin\n" + - "\tdeclare\n" + - "\t\tpast_due EXCEPTION;\n" + - "\t\tdue_date DATE := trunc(sysdate) - 1;\n" + - "\t\ttodays_date DATE := trunc(sysdate);\n" + - "\tbegin\n" + - "\t\tif due_date < todays_date then\n" + - "\t\t\traise past_due;\n" + - "\t\tend if;\n" + - "\tend;\n" + - "exception\n" + - "\twhen OTHERS then\n" + - "\t\trollback;\n" + - "\t\traise;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("CREATE OR REPLACE PROCEDURE p AUTHID DEFINER\n" + + "AS\n" + + "BEGIN\n" + + "\tDECLARE\n" + + "\t\tpast_due EXCEPTION;\n" + + "\t\tdue_date DATE := trunc(SYSDATE) - 1;\n" + + "\t\ttodays_date DATE := trunc(SYSDATE);\n" + + "\tBEGIN\n" + + "\t\tIF due_date < todays_date THEN\n" + + "\t\t\tRAISE past_due;\n" + + "\t\tEND IF;\n" + + "\tEND;\n" + + "EXCEPTION\n" + + "\tWHEN OTHERS THEN\n" + + "\t\tROLLBACK;\n" + + "\t\tRAISE;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("create or replace procedure p authid DEFINER\n" + + "as\n" + + "begin\n" + + "\tdeclare\n" + + "\t\tpast_due EXCEPTION;\n" + + "\t\tdue_date DATE := trunc(sysdate) - 1;\n" + + "\t\ttodays_date DATE := trunc(sysdate);\n" + + "\tbegin\n" + + "\t\tif due_date < todays_date then\n" + + "\t\t\traise past_due;\n" + + "\t\tend if;\n" + + "\tend;\n" + + "exception\n" + + "\twhen OTHERS then\n" + + "\t\trollback;\n" + + "\t\traise;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_5.java index a2981f9f55..69623e153a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_5.java @@ -24,24 +24,23 @@ import java.util.List; public class Oracle_pl_exception_5 extends OracleTest { - public void test_0() throws Exception { String sql = "BEGIN\n" + - "\n" + - " DECLARE\n" + - " past_due EXCEPTION;\n" + - " due_date DATE := trunc(SYSDATE) - 1;\n" + - " todays_date DATE := trunc(SYSDATE);\n" + - " BEGIN\n" + - " IF due_date < todays_date THEN\n" + - " RAISE past_due;\n" + - " END IF;\n" + - " END;\n" + - "\n" + - "END;"; // + "\n" + + " DECLARE\n" + + " past_due EXCEPTION;\n" + + " due_date DATE := trunc(SYSDATE) - 1;\n" + + " todays_date DATE := trunc(SYSDATE);\n" + + " BEGIN\n" + + " IF due_date < todays_date THEN\n" + + " RAISE past_due;\n" + + " END IF;\n" + + " END;\n" + + "\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -65,36 +64,36 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("BEGIN\n" + - "\tDECLARE\n" + - "\t\tpast_due EXCEPTION;\n" + - "\t\tdue_date DATE := trunc(SYSDATE) - 1;\n" + - "\t\ttodays_date DATE := trunc(SYSDATE);\n" + - "\tBEGIN\n" + - "\t\tIF due_date < todays_date THEN\n" + - "\t\t\tRAISE past_due;\n" + - "\t\tEND IF;\n" + - "\tEND;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("begin\n" + - "\tdeclare\n" + - "\t\tpast_due EXCEPTION;\n" + - "\t\tdue_date DATE := trunc(sysdate) - 1;\n" + - "\t\ttodays_date DATE := trunc(sysdate);\n" + - "\tbegin\n" + - "\t\tif due_date < todays_date then\n" + - "\t\t\traise past_due;\n" + - "\t\tend if;\n" + - "\tend;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("BEGIN\n" + + "\tDECLARE\n" + + "\t\tpast_due EXCEPTION;\n" + + "\t\tdue_date DATE := trunc(SYSDATE) - 1;\n" + + "\t\ttodays_date DATE := trunc(SYSDATE);\n" + + "\tBEGIN\n" + + "\t\tIF due_date < todays_date THEN\n" + + "\t\t\tRAISE past_due;\n" + + "\t\tEND IF;\n" + + "\tEND;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("begin\n" + + "\tdeclare\n" + + "\t\tpast_due EXCEPTION;\n" + + "\t\tdue_date DATE := trunc(sysdate) - 1;\n" + + "\t\ttodays_date DATE := trunc(sysdate);\n" + + "\tbegin\n" + + "\t\tif due_date < todays_date then\n" + + "\t\t\traise past_due;\n" + + "\t\tend if;\n" + + "\tend;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_6.java index 9b774f5c95..d44bae3655 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_6.java @@ -24,19 +24,18 @@ import java.util.List; public class Oracle_pl_exception_6 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + - " credit_limit CONSTANT NUMBER(3) := 5000; -- Maximum value is 999\n" + - "BEGIN\n" + - " NULL;\n" + - "EXCEPTION\n" + - " WHEN VALUE_ERROR THEN\n" + - " DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + - "END;"; // + " credit_limit CONSTANT NUMBER(3) := 5000; -- Maximum value is 999\n" + + "BEGIN\n" + + " NULL;\n" + + "EXCEPTION\n" + + " WHEN VALUE_ERROR THEN\n" + + " DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -60,28 +59,28 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("DECLARE\n" + - "\tcredit_limit CONSTANT NUMBER(3) := 5000;\n" + - "BEGIN\n" + - "\tNULL;\n" + - "EXCEPTION\n" + - "\tWHEN VALUE_ERROR THEN DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\tcredit_limit constant NUMBER(3) := 5000;\n" + - "begin\n" + - "\tnull;\n" + - "exception\n" + - "\twhen VALUE_ERROR then DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("DECLARE\n" + + "\tcredit_limit CONSTANT NUMBER(3) := 5000;\n" + + "BEGIN\n" + + "\tNULL;\n" + + "EXCEPTION\n" + + "\tWHEN VALUE_ERROR THEN DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tcredit_limit constant NUMBER(3) := 5000;\n" + + "begin\n" + + "\tnull;\n" + + "exception\n" + + "\twhen VALUE_ERROR then DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_7.java index e6fa398647..eded0b4ee3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_7.java @@ -24,23 +24,22 @@ import java.util.List; public class Oracle_pl_exception_7 extends OracleTest { - public void test_0() throws Exception { String sql = "BEGIN\n" + - " \n" + - " DECLARE\n" + - " credit_limit CONSTANT NUMBER(3) := 5000;\n" + - " BEGIN\n" + - " NULL;\n" + - " END;\n" + - " \n" + - "EXCEPTION\n" + - " WHEN VALUE_ERROR THEN\n" + - " DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + - "END;"; // + " \n" + + " DECLARE\n" + + " credit_limit CONSTANT NUMBER(3) := 5000;\n" + + " BEGIN\n" + + " NULL;\n" + + " END;\n" + + " \n" + + "EXCEPTION\n" + + " WHEN VALUE_ERROR THEN\n" + + " DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -64,32 +63,32 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("BEGIN\n" + - "\tDECLARE\n" + - "\t\tcredit_limit CONSTANT NUMBER(3) := 5000;\n" + - "\tBEGIN\n" + - "\t\tNULL;\n" + - "\tEND;\n" + - "EXCEPTION\n" + - "\tWHEN VALUE_ERROR THEN DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("begin\n" + - "\tdeclare\n" + - "\t\tcredit_limit constant NUMBER(3) := 5000;\n" + - "\tbegin\n" + - "\t\tnull;\n" + - "\tend;\n" + - "exception\n" + - "\twhen VALUE_ERROR then DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("BEGIN\n" + + "\tDECLARE\n" + + "\t\tcredit_limit CONSTANT NUMBER(3) := 5000;\n" + + "\tBEGIN\n" + + "\t\tNULL;\n" + + "\tEND;\n" + + "EXCEPTION\n" + + "\tWHEN VALUE_ERROR THEN DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("begin\n" + + "\tdeclare\n" + + "\t\tcredit_limit constant NUMBER(3) := 5000;\n" + + "\tbegin\n" + + "\t\tnull;\n" + + "\tend;\n" + + "exception\n" + + "\twhen VALUE_ERROR then DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_8.java index b64405997e..c1b33510b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_8.java @@ -24,58 +24,57 @@ import java.util.List; public class Oracle_pl_exception_8 extends OracleTest { - public void test_0() throws Exception { String sql = "DROP TABLE results;\n" + - "CREATE TABLE results (\n" + - " res_name VARCHAR(20),\n" + - " res_answer VARCHAR2(3)\n" + - ");\n" + - " \n" + - "CREATE UNIQUE INDEX res_name_ix ON results (res_name);\n" + - "INSERT INTO results (res_name, res_answer) VALUES ('SMYTHE', 'YES');\n" + - "INSERT INTO results (res_name, res_answer) VALUES ('JONES', 'NO');\n" + - " \n" + - "DECLARE\n" + - " name VARCHAR2(20) := 'SMYTHE';\n" + - " answer VARCHAR2(3) := 'NO';\n" + - " suffix NUMBER := 1;\n" + - "BEGIN\n" + - " FOR i IN 1..5 LOOP -- Try transaction at most 5 times.\n" + - " \n" + - " DBMS_OUTPUT.PUT('Try #' || i);\n" + - " \n" + - " BEGIN -- sub-block begins\n" + - " \n" + - " SAVEPOINT start_transaction;\n" + - " \n" + - " -- transaction begins\n" + - " \n" + - " DELETE FROM results WHERE res_answer = 'NO';\n" + - " \n" + - " INSERT INTO results (res_name, res_answer) VALUES (name, answer);\n" + - " \n" + - " -- Nonunique name raises DUP_VAL_ON_INDEX.\n" + - " \n" + - " -- If transaction succeeded:\n" + - " \n" + - " COMMIT;\n" + - " DBMS_OUTPUT.PUT_LINE(' succeeded.');\n" + - " EXIT;\n" + - " \n" + - " EXCEPTION\n" + - " WHEN DUP_VAL_ON_INDEX THEN\n" + - " DBMS_OUTPUT.PUT_LINE(' failed; trying again.');\n" + - " ROLLBACK TO start_transaction; -- Undo changes.\n" + - " suffix := suffix + 1; -- Try to fix problem.\n" + - " name := name || TO_CHAR(suffix);\n" + - " END; -- sub-block ends\n" + - " \n" + - " END LOOP;\n" + - "END;"; // + "CREATE TABLE results (\n" + + " res_name VARCHAR(20),\n" + + " res_answer VARCHAR2(3)\n" + + ");\n" + + " \n" + + "CREATE UNIQUE INDEX res_name_ix ON results (res_name);\n" + + "INSERT INTO results (res_name, res_answer) VALUES ('SMYTHE', 'YES');\n" + + "INSERT INTO results (res_name, res_answer) VALUES ('JONES', 'NO');\n" + + " \n" + + "DECLARE\n" + + " name VARCHAR2(20) := 'SMYTHE';\n" + + " answer VARCHAR2(3) := 'NO';\n" + + " suffix NUMBER := 1;\n" + + "BEGIN\n" + + " FOR i IN 1..5 LOOP -- Try transaction at most 5 times.\n" + + " \n" + + " DBMS_OUTPUT.PUT('Try #' || i);\n" + + " \n" + + " BEGIN -- sub-block begins\n" + + " \n" + + " SAVEPOINT start_transaction;\n" + + " \n" + + " -- transaction begins\n" + + " \n" + + " DELETE FROM results WHERE res_answer = 'NO';\n" + + " \n" + + " INSERT INTO results (res_name, res_answer) VALUES (name, answer);\n" + + " \n" + + " -- Nonunique name raises DUP_VAL_ON_INDEX.\n" + + " \n" + + " -- If transaction succeeded:\n" + + " \n" + + " COMMIT;\n" + + " DBMS_OUTPUT.PUT_LINE(' succeeded.');\n" + + " EXIT;\n" + + " \n" + + " EXCEPTION\n" + + " WHEN DUP_VAL_ON_INDEX THEN\n" + + " DBMS_OUTPUT.PUT_LINE(' failed; trying again.');\n" + + " ROLLBACK TO start_transaction; -- Undo changes.\n" + + " suffix := suffix + 1; -- Try to fix problem.\n" + + " name := name || TO_CHAR(suffix);\n" + + " END; -- sub-block ends\n" + + " \n" + + " END LOOP;\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(6, statementList.size()); + assertEquals(6, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -99,86 +98,86 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("DROP TABLE results;\n" + - "CREATE TABLE results (\n" + - "\tres_name VARCHAR(20),\n" + - "\tres_answer VARCHAR2(3)\n" + - ");\n" + - "CREATE UNIQUE INDEX res_name_ix ON results(res_name);\n" + - "INSERT INTO results (res_name, res_answer)\n" + - "VALUES ('SMYTHE', 'YES');\n" + - "INSERT INTO results (res_name, res_answer)\n" + - "VALUES ('JONES', 'NO');\n" + - "DECLARE\n" + - "\tname VARCHAR2(20) := 'SMYTHE';\n" + - "\tanswer VARCHAR2(3) := 'NO';\n" + - "\tsuffix NUMBER := 1;\n" + - "BEGIN\n" + - "\tFOR i IN 1..5\n" + - "\tLOOP\n" + - "\t\tDBMS_OUTPUT.PUT('Try #' || i);\n" + - "\t\tBEGIN\n" + - "\t\t\tSAVEPOINT TO start_transaction;\n" + - "\t\t\tDELETE FROM results\n" + - "\t\t\tWHERE res_answer = 'NO';\n" + - "\t\t\tINSERT INTO results (res_name, res_answer)\n" + - "\t\t\tVALUES (name, answer);\n" + - "\t\t\tCOMMIT;\n" + - "\t\t\tDBMS_OUTPUT.PUT_LINE(' succeeded.');\n" + - "\t\t\tEXIT;\n" + - "\t\tEXCEPTION\n" + - "\t\t\tWHEN DUP_VAL_ON_INDEX THEN\n" + - "\t\t\t\tDBMS_OUTPUT.PUT_LINE(' failed; trying again.');\n" + - "\t\t\t\tROLLBACK TO start_transaction;\n" + - "\t\t\t\tsuffix := suffix + 1;\n" + - "\t\t\t\tname := name || TO_CHAR(suffix);\n" + - "\t\tEND;\n" + - "\tEND LOOP;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("drop table results;\n" + - "create table results (\n" + - "\tres_name VARCHAR(20),\n" + - "\tres_answer VARCHAR2(3)\n" + - ");\n" + - "create UNIQUE index res_name_ix on results(res_name);\n" + - "insert into results (res_name, res_answer)\n" + - "values ('SMYTHE', 'YES');\n" + - "insert into results (res_name, res_answer)\n" + - "values ('JONES', 'NO');\n" + - "declare\n" + - "\tname VARCHAR2(20) := 'SMYTHE';\n" + - "\tanswer VARCHAR2(3) := 'NO';\n" + - "\tsuffix NUMBER := 1;\n" + - "begin\n" + - "\tfor i in 1..5\n" + - "\tloop\n" + - "\t\tDBMS_OUTPUT.PUT('Try #' || i);\n" + - "\t\tbegin\n" + - "\t\t\tsavepoint to start_transaction;\n" + - "\t\t\tdelete from results\n" + - "\t\t\twhere res_answer = 'NO';\n" + - "\t\t\tinsert into results (res_name, res_answer)\n" + - "\t\t\tvalues (name, answer);\n" + - "\t\t\tcommit;\n" + - "\t\t\tDBMS_OUTPUT.PUT_LINE(' succeeded.');\n" + - "\t\t\texit;\n" + - "\t\texception\n" + - "\t\t\twhen DUP_VAL_ON_INDEX then\n" + - "\t\t\t\tDBMS_OUTPUT.PUT_LINE(' failed; trying again.');\n" + - "\t\t\t\trollback to start_transaction;\n" + - "\t\t\t\tsuffix := suffix + 1;\n" + - "\t\t\t\tname := name || TO_CHAR(suffix);\n" + - "\t\tend;\n" + - "\tend loop;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("DROP TABLE results;\n" + + "CREATE TABLE results (\n" + + "\tres_name VARCHAR(20),\n" + + "\tres_answer VARCHAR2(3)\n" + + ");\n" + + "CREATE UNIQUE INDEX res_name_ix ON results(res_name);\n" + + "INSERT INTO results (res_name, res_answer)\n" + + "VALUES ('SMYTHE', 'YES');\n" + + "INSERT INTO results (res_name, res_answer)\n" + + "VALUES ('JONES', 'NO');\n" + + "DECLARE\n" + + "\tname VARCHAR2(20) := 'SMYTHE';\n" + + "\tanswer VARCHAR2(3) := 'NO';\n" + + "\tsuffix NUMBER := 1;\n" + + "BEGIN\n" + + "\tFOR i IN 1..5\n" + + "\tLOOP\n" + + "\t\tDBMS_OUTPUT.PUT('Try #' || i);\n" + + "\t\tBEGIN\n" + + "\t\t\tSAVEPOINT TO start_transaction;\n" + + "\t\t\tDELETE FROM results\n" + + "\t\t\tWHERE res_answer = 'NO';\n" + + "\t\t\tINSERT INTO results (res_name, res_answer)\n" + + "\t\t\tVALUES (name, answer);\n" + + "\t\t\tCOMMIT;\n" + + "\t\t\tDBMS_OUTPUT.PUT_LINE(' succeeded.');\n" + + "\t\t\tEXIT;\n" + + "\t\tEXCEPTION\n" + + "\t\t\tWHEN DUP_VAL_ON_INDEX THEN\n" + + "\t\t\t\tDBMS_OUTPUT.PUT_LINE(' failed; trying again.');\n" + + "\t\t\t\tROLLBACK TO start_transaction;\n" + + "\t\t\t\tsuffix := suffix + 1;\n" + + "\t\t\t\tname := name || TO_CHAR(suffix);\n" + + "\t\tEND;\n" + + "\tEND LOOP;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("drop table results;\n" + + "create table results (\n" + + "\tres_name VARCHAR(20),\n" + + "\tres_answer VARCHAR2(3)\n" + + ");\n" + + "create UNIQUE index res_name_ix on results(res_name);\n" + + "insert into results (res_name, res_answer)\n" + + "values ('SMYTHE', 'YES');\n" + + "insert into results (res_name, res_answer)\n" + + "values ('JONES', 'NO');\n" + + "declare\n" + + "\tname VARCHAR2(20) := 'SMYTHE';\n" + + "\tanswer VARCHAR2(3) := 'NO';\n" + + "\tsuffix NUMBER := 1;\n" + + "begin\n" + + "\tfor i in 1..5\n" + + "\tloop\n" + + "\t\tDBMS_OUTPUT.PUT('Try #' || i);\n" + + "\t\tbegin\n" + + "\t\t\tsavepoint to start_transaction;\n" + + "\t\t\tdelete from results\n" + + "\t\t\twhere res_answer = 'NO';\n" + + "\t\t\tinsert into results (res_name, res_answer)\n" + + "\t\t\tvalues (name, answer);\n" + + "\t\t\tcommit;\n" + + "\t\t\tDBMS_OUTPUT.PUT_LINE(' succeeded.');\n" + + "\t\t\texit;\n" + + "\t\texception\n" + + "\t\t\twhen DUP_VAL_ON_INDEX then\n" + + "\t\t\t\tDBMS_OUTPUT.PUT_LINE(' failed; trying again.');\n" + + "\t\t\t\trollback to start_transaction;\n" + + "\t\t\t\tsuffix := suffix + 1;\n" + + "\t\t\t\tname := name || TO_CHAR(suffix);\n" + + "\t\tend;\n" + + "\tend loop;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_0.java index 5aaa790039..d398f91221 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_0.java @@ -24,24 +24,23 @@ import java.util.List; public class Oracle_pl_exit_0 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + - " x NUMBER := 0;\n" + - "BEGIN\n" + - " LOOP\n" + - " DBMS_OUTPUT.PUT_LINE ('Inside loop: x = ' || TO_CHAR(x));\n" + - " x := x + 1;\n" + - " IF x > 3 THEN\n" + - " EXIT;\n" + - " END IF;\n" + - " END LOOP;\n" + - " -- After EXIT, control resumes here\n" + - " DBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + - "END;"; // + " x NUMBER := 0;\n" + + "BEGIN\n" + + " LOOP\n" + + " DBMS_OUTPUT.PUT_LINE ('Inside loop: x = ' || TO_CHAR(x));\n" + + " x := x + 1;\n" + + " IF x > 3 THEN\n" + + " EXIT;\n" + + " END IF;\n" + + " END LOOP;\n" + + " -- After EXIT, control resumes here\n" + + " DBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -67,37 +66,37 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("DECLARE\n" + - "\tx NUMBER := 0;\n" + - "BEGIN\n" + - "\tLOOP\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + - "\t\tx := x + 1;\n" + - "\t\tIF x > 3 THEN\n" + - "\t\t\tEXIT;\n" + - "\t\tEND IF;\n" + - "\tEND LOOP;\n" + - "\tDBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\tx NUMBER := 0;\n" + - "begin\n" + - "\tloop\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + - "\t\tx := x + 1;\n" + - "\t\tif x > 3 then\n" + - "\t\t\texit;\n" + - "\t\tend if;\n" + - "\tend loop;\n" + - "\tDBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("DECLARE\n" + + "\tx NUMBER := 0;\n" + + "BEGIN\n" + + "\tLOOP\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + "\t\tx := x + 1;\n" + + "\t\tIF x > 3 THEN\n" + + "\t\t\tEXIT;\n" + + "\t\tEND IF;\n" + + "\tEND LOOP;\n" + + "\tDBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tx NUMBER := 0;\n" + + "begin\n" + + "\tloop\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + "\t\tx := x + 1;\n" + + "\t\tif x > 3 then\n" + + "\t\t\texit;\n" + + "\t\tend if;\n" + + "\tend loop;\n" + + "\tDBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_1.java index 466078cf75..d63c020e1e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_1.java @@ -24,22 +24,21 @@ import java.util.List; public class Oracle_pl_exit_1 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + - " x NUMBER := 0;\n" + - "BEGIN\n" + - " LOOP\n" + - " DBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + - " x := x + 1; -- prevents infinite loop\n" + - " EXIT WHEN x > 3;\n" + - " END LOOP;\n" + - " -- After EXIT statement, control resumes here\n" + - " DBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + - "END;"; // + " x NUMBER := 0;\n" + + "BEGIN\n" + + " LOOP\n" + + " DBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + " x := x + 1; -- prevents infinite loop\n" + + " EXIT WHEN x > 3;\n" + + " END LOOP;\n" + + " -- After EXIT statement, control resumes here\n" + + " DBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -65,33 +64,33 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("DECLARE\n" + - "\tx NUMBER := 0;\n" + - "BEGIN\n" + - "\tLOOP\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + - "\t\tx := x + 1;\n" + - "\t\tEXIT WHEN x > 3;\n" + - "\tEND LOOP;\n" + - "\tDBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\tx NUMBER := 0;\n" + - "begin\n" + - "\tloop\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + - "\t\tx := x + 1;\n" + - "\t\texit when x > 3;\n" + - "\tend loop;\n" + - "\tDBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("DECLARE\n" + + "\tx NUMBER := 0;\n" + + "BEGIN\n" + + "\tLOOP\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + "\t\tx := x + 1;\n" + + "\t\tEXIT WHEN x > 3;\n" + + "\tEND LOOP;\n" + + "\tDBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tx NUMBER := 0;\n" + + "begin\n" + + "\tloop\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + "\t\tx := x + 1;\n" + + "\t\texit when x > 3;\n" + + "\tend loop;\n" + + "\tDBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_external_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_external_0.java index 31e7b3dfab..505ac70982 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_external_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_external_0.java @@ -24,16 +24,15 @@ import java.util.List; public class Oracle_pl_external_0 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE OR REPLACE PROCEDURE raise_salary (\n" + - " empid NUMBER,\n" + - " pct NUMBER\n" + - ") AS\n" + - " LANGUAGE JAVA NAME 'Adjuster.raiseSalary (int, float)'; -- call specification"; // + " empid NUMBER,\n" + + " pct NUMBER\n" + + ") AS\n" + + " LANGUAGE JAVA NAME 'Adjuster.raiseSalary (int, float)'; -- call specification"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -59,23 +58,23 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("CREATE OR REPLACE PROCEDURE raise_salary (\n" + - "\tempid NUMBER, \n" + - "\tpct NUMBER\n" + - ")\n" + - "LANGUAGE JAVA NAME 'Adjuster.raiseSalary (int, float)';", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("create or replace procedure raise_salary (\n" + - "\tempid NUMBER, \n" + - "\tpct NUMBER\n" + - ")\n" + - "language java name 'Adjuster.raiseSalary (int, float)';", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("CREATE OR REPLACE PROCEDURE raise_salary (\n" + + "\tempid NUMBER, \n" + + "\tpct NUMBER\n" + + ")\n" + + "LANGUAGE JAVA NAME 'Adjuster.raiseSalary (int, float)';", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("create or replace procedure raise_salary (\n" + + "\tempid NUMBER, \n" + + "\tpct NUMBER\n" + + ")\n" + + "language java name 'Adjuster.raiseSalary (int, float)';", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_0.java index b4e8329a07..3d9060ccda 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_0.java @@ -24,24 +24,23 @@ import java.util.List; public class Oracle_pl_for_0 extends OracleTest { - public void test_0() throws Exception { String sql = "PROCEDURE display_multiple_years (\n" + - " start_year_in IN PLS_INTEGER\n" + - " ,end_year_in IN PLS_INTEGER\n" + - ")\n" + - "IS\n" + - "BEGIN\n" + - " FOR l_current_year \n" + - " IN start_year_in .. end_year_in\n" + - " LOOP\n" + - " display_total_sales \n" + - " (l_current_year);\n" + - " END LOOP;\n" + - "END display_multiple_years;"; // + " start_year_in IN PLS_INTEGER\n" + + " ,end_year_in IN PLS_INTEGER\n" + + ")\n" + + "IS\n" + + "BEGIN\n" + + " FOR l_current_year \n" + + " IN start_year_in .. end_year_in\n" + + " LOOP\n" + + " display_total_sales \n" + + " (l_current_year);\n" + + " END LOOP;\n" + + "END display_multiple_years;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -67,35 +66,35 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("PROCEDURE display_multiple_years (\n" + - "\tstart_year_in IN PLS_INTEGER, \n" + - "\tend_year_in IN PLS_INTEGER\n" + - ")\n" + - "IS\n" + - "BEGIN\n" + - "\tFOR l_current_year IN start_year_in..end_year_in\n" + - "\tLOOP\n" + - "\t\tdisplay_total_sales(l_current_year);\n" + - "\tEND LOOP;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("procedure display_multiple_years (\n" + - "\tstart_year_in in PLS_INTEGER, \n" + - "\tend_year_in in PLS_INTEGER\n" + - ")\n" + - "IS\n" + - "begin\n" + - "\tfor l_current_year in start_year_in..end_year_in\n" + - "\tloop\n" + - "\t\tdisplay_total_sales(l_current_year);\n" + - "\tend loop;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("PROCEDURE display_multiple_years (\n" + + "\tstart_year_in IN PLS_INTEGER, \n" + + "\tend_year_in IN PLS_INTEGER\n" + + ")\n" + + "IS\n" + + "BEGIN\n" + + "\tFOR l_current_year IN start_year_in..end_year_in\n" + + "\tLOOP\n" + + "\t\tdisplay_total_sales(l_current_year);\n" + + "\tEND LOOP;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("procedure display_multiple_years (\n" + + "\tstart_year_in in PLS_INTEGER, \n" + + "\tend_year_in in PLS_INTEGER\n" + + ")\n" + + "IS\n" + + "begin\n" + + "\tfor l_current_year in start_year_in..end_year_in\n" + + "\tloop\n" + + "\t\tdisplay_total_sales(l_current_year);\n" + + "\tend loop;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_1.java index 06f51d8997..49cc269924 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_1.java @@ -24,40 +24,39 @@ import java.util.List; public class Oracle_pl_for_1 extends OracleTest { + public void test_0() throws Exception { + String sql = "DECLARE\n" + + " TYPE empcurtyp IS REF CURSOR;\n" + + " TYPE namelist IS TABLE OF employees.last_name%TYPE;\n" + + " TYPE sallist IS TABLE OF employees.salary%TYPE;\n" + + " emp_cv empcurtyp;\n" + + " names namelist;\n" + + " sals sallist;\n" + + "BEGIN\n" + + " OPEN emp_cv FOR\n" + + " SELECT last_name, salary FROM employees\n" + + " WHERE job_id = 'SA_REP'\n" + + " ORDER BY salary DESC;\n" + + "\n" + + " FETCH emp_cv BULK COLLECT INTO names, sals;\n" + + " CLOSE emp_cv;\n" + + " -- loop through the names and sals collections\n" + + " FOR i IN names.FIRST .. names.LAST\n" + + " LOOP\n" + + " DBMS_OUTPUT.PUT_LINE\n" + + " ('Name = ' || names(i) || ', salary = ' || sals(i));\n" + + " END LOOP;\n" + + "END;"; // - public void test_0() throws Exception { - String sql = "DECLARE\n" + - " TYPE empcurtyp IS REF CURSOR;\n" + - " TYPE namelist IS TABLE OF employees.last_name%TYPE;\n" + - " TYPE sallist IS TABLE OF employees.salary%TYPE;\n" + - " emp_cv empcurtyp;\n" + - " names namelist;\n" + - " sals sallist;\n" + - "BEGIN\n" + - " OPEN emp_cv FOR\n" + - " SELECT last_name, salary FROM employees\n" + - " WHERE job_id = 'SA_REP'\n" + - " ORDER BY salary DESC;\n" + - "\n" + - " FETCH emp_cv BULK COLLECT INTO names, sals;\n" + - " CLOSE emp_cv;\n" + - " -- loop through the names and sals collections\n" + - " FOR i IN names.FIRST .. names.LAST\n" + - " LOOP\n" + - " DBMS_OUTPUT.PUT_LINE\n" + - " ('Name = ' || names(i) || ', salary = ' || sals(i));\n" + - " END LOOP;\n" + - "END;"; // + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); + SQLStatement stmt = statementList.get(0); - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + assertEquals(1, statementList.size()); - assertEquals(1, statementList.size()); - - SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); - for (SQLStatement statement : statementList) { - statement.accept(visitor); - } + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); + for (SQLStatement statement : statementList) { + statement.accept(visitor); + } // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); @@ -65,7 +64,7 @@ public void test_0() throws Exception { // System.out.println("relationships : " + visitor.getRelationships()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals(0, visitor.getTables().size()); + assertEquals(0, visitor.getTables().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("emp_name"))); @@ -74,56 +73,56 @@ public void test_0() throws Exception { // Assert.assertEquals(3, visitor.getConditions().size()); // Assert.assertEquals(1, visitor.getRelationships().size()); - // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - System.out.println(output); - assertEquals("DECLARE\n" + - "\tTYPE empcurtyp IS REF CURSOR;\n" + - "\tTYPE employees.last_name IS TABLE OF employees.last_name%TYPE;\n" + - "\tTYPE employees.salary IS TABLE OF employees.salary%TYPE;\n" + - "\temp_cv empcurtyp;\n" + - "\tnames namelist;\n" + - "\tsals sallist;\n" + - "BEGIN\n" + - "\tOPEN emp_cv FOR \n" + - "\t\tSELECT last_name, salary\n" + - "\t\tFROM employees\n" + - "\t\tWHERE job_id = 'SA_REP'\n" + - "\t\tORDER BY salary DESC;\n" + - "\tFETCH emp_cv BULK COLLECT INTO names, sals;\n" + - "\tCLOSE emp_cv;\n" + - "\tFOR i IN names.FIRST..names.LAST\n" + - "\tLOOP\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Name = ' || names(i) || ', salary = ' || sals(i));\n" + - "\tEND LOOP;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\ttype empcurtyp is REF CURSOR;\n" + - "\ttype employees.last_name is TABLE OF employees.last_name%TYPE;\n" + - "\ttype employees.salary is TABLE OF employees.salary%TYPE;\n" + - "\temp_cv empcurtyp;\n" + - "\tnames namelist;\n" + - "\tsals sallist;\n" + - "begin\n" + - "\topen emp_cv for \n" + - "\t\tselect last_name, salary\n" + - "\t\tfrom employees\n" + - "\t\twhere job_id = 'SA_REP'\n" + - "\t\torder by salary desc;\n" + - "\tfetch emp_cv bulk collect into names, sals;\n" + - "\tclose emp_cv;\n" + - "\tfor i in names.FIRST..names.LAST\n" + - "\tloop\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Name = ' || names(i) || ', salary = ' || sals(i));\n" + - "\tend loop;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + System.out.println(output); + assertEquals("DECLARE\n" + + "\tTYPE empcurtyp IS REF CURSOR;\n" + + "\tTYPE employees.last_name IS TABLE OF employees.last_name%TYPE;\n" + + "\tTYPE employees.salary IS TABLE OF employees.salary%TYPE;\n" + + "\temp_cv empcurtyp;\n" + + "\tnames namelist;\n" + + "\tsals sallist;\n" + + "BEGIN\n" + + "\tOPEN emp_cv FOR \n" + + "\t\tSELECT last_name, salary\n" + + "\t\tFROM employees\n" + + "\t\tWHERE job_id = 'SA_REP'\n" + + "\t\tORDER BY salary DESC;\n" + + "\tFETCH emp_cv BULK COLLECT INTO names, sals;\n" + + "\tCLOSE emp_cv;\n" + + "\tFOR i IN names.FIRST..names.LAST\n" + + "\tLOOP\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Name = ' || names(i) || ', salary = ' || sals(i));\n" + + "\tEND LOOP;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\ttype empcurtyp is REF CURSOR;\n" + + "\ttype employees.last_name is TABLE OF employees.last_name%TYPE;\n" + + "\ttype employees.salary is TABLE OF employees.salary%TYPE;\n" + + "\temp_cv empcurtyp;\n" + + "\tnames namelist;\n" + + "\tsals sallist;\n" + + "begin\n" + + "\topen emp_cv for \n" + + "\t\tselect last_name, salary\n" + + "\t\tfrom employees\n" + + "\t\twhere job_id = 'SA_REP'\n" + + "\t\torder by salary desc;\n" + + "\tfetch emp_cv bulk collect into names, sals;\n" + + "\tclose emp_cv;\n" + + "\tfor i in names.FIRST..names.LAST\n" + + "\tloop\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Name = ' || names(i) || ', salary = ' || sals(i));\n" + + "\tend loop;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_2.java index 89a5061e68..2cfbe245e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_2.java @@ -24,26 +24,24 @@ import java.util.List; public class Oracle_pl_for_2 extends OracleTest { - public void test_0() throws Exception { String sql = "DROP TABLE employees_temp;\n" + - "CREATE TABLE employees_temp AS SELECT * FROM employees;\n" + - "\n" + - "DECLARE\n" + - " TYPE NumList IS VARRAY(20) OF NUMBER;\n" + - " depts NumList := NumList(10, 30, 70); -- department numbers\n" + - "BEGIN\n" + - " FOR i IN depts.FIRST..depts.LAST LOOP\n" + - " DELETE FROM employees_temp\n" + - " WHERE department_id = depts(i);\n" + - " END LOOP;\n" + - "END;"; // + "CREATE TABLE employees_temp AS SELECT * FROM employees;\n" + + "\n" + + "DECLARE\n" + + " TYPE NumList IS VARRAY(20) OF NUMBER;\n" + + " depts NumList := NumList(10, 30, 70); -- department numbers\n" + + "BEGIN\n" + + " FOR i IN depts.FIRST..depts.LAST LOOP\n" + + " DELETE FROM employees_temp\n" + + " WHERE department_id = depts(i);\n" + + " END LOOP;\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(3, statementList.size()); - - SQLStatement stmt = statementList.get(0); + assertEquals(3, statementList.size()); + SQLStatement stmt = statementList.get(0); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); @@ -68,44 +66,44 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("DROP TABLE employees_temp;\n" + - "CREATE TABLE employees_temp\n" + - "AS\n" + - "SELECT *\n" + - "FROM employees;\n" + - "DECLARE\n" + - "\tTYPE NumList IS VARRAY(20) OF NUMBER;\n" + - "\tdepts NumList := NumList(10, 30, 70);\n" + - "BEGIN\n" + - "\tFOR i IN depts.FIRST..depts.LAST\n" + - "\tLOOP\n" + - "\t\tDELETE FROM employees_temp\n" + - "\t\tWHERE department_id = depts(i);\n" + - "\tEND LOOP;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("drop table employees_temp;\n" + - "create table employees_temp\n" + - "as\n" + - "select *\n" + - "from employees;\n" + - "declare\n" + - "\ttype NumList is VARRAY(20) OF NUMBER;\n" + - "\tdepts NumList := NumList(10, 30, 70);\n" + - "begin\n" + - "\tfor i in depts.FIRST..depts.LAST\n" + - "\tloop\n" + - "\t\tdelete from employees_temp\n" + - "\t\twhere department_id = depts(i);\n" + - "\tend loop;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("DROP TABLE employees_temp;\n" + + "CREATE TABLE employees_temp\n" + + "AS\n" + + "SELECT *\n" + + "FROM employees;\n" + + "DECLARE\n" + + "\tTYPE NumList IS VARRAY(20) OF NUMBER;\n" + + "\tdepts NumList := NumList(10, 30, 70);\n" + + "BEGIN\n" + + "\tFOR i IN depts.FIRST..depts.LAST\n" + + "\tLOOP\n" + + "\t\tDELETE FROM employees_temp\n" + + "\t\tWHERE department_id = depts(i);\n" + + "\tEND LOOP;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("drop table employees_temp;\n" + + "create table employees_temp\n" + + "as\n" + + "select *\n" + + "from employees;\n" + + "declare\n" + + "\ttype NumList is VARRAY(20) OF NUMBER;\n" + + "\tdepts NumList := NumList(10, 30, 70);\n" + + "begin\n" + + "\tfor i in depts.FIRST..depts.LAST\n" + + "\tloop\n" + + "\t\tdelete from employees_temp\n" + + "\t\twhere department_id = depts(i);\n" + + "\tend loop;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_3.java index 5ada83aad6..d6fb3433c4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_3.java @@ -24,24 +24,23 @@ import java.util.List; public class Oracle_pl_for_3 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + - " v_employees employees%ROWTYPE;\n" + - " CURSOR c1 is SELECT * FROM employees;\n" + - "BEGIN\n" + - " OPEN c1;\n" + - " -- Fetch entire row into v_employees record:\n" + - " FOR i IN 1..10 LOOP\n" + - " FETCH c1 INTO v_employees;\n" + - " EXIT WHEN c1%NOTFOUND;\n" + - " -- Process data here\n" + - " END LOOP;\n" + - " CLOSE c1;\n" + - "END;"; // + " v_employees employees%ROWTYPE;\n" + + " CURSOR c1 is SELECT * FROM employees;\n" + + "BEGIN\n" + + " OPEN c1;\n" + + " -- Fetch entire row into v_employees record:\n" + + " FOR i IN 1..10 LOOP\n" + + " FETCH c1 INTO v_employees;\n" + + " EXIT WHEN c1%NOTFOUND;\n" + + " -- Process data here\n" + + " END LOOP;\n" + + " CLOSE c1;\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -65,42 +64,42 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("DECLARE\n" + - "\tv_employees employees%ROWTYPE;\n" + - "\tCURSOR c1 IS\n" + - "\t\tSELECT *\n" + - "\t\tFROM employees;\n" + - "BEGIN\n" + - "\tOPEN c1;\n" + - "\tFOR i IN 1..10\n" + - "\tLOOP\n" + - "\t\tFETCH c1 INTO v_employees;\n" + - "\t\tEXIT WHEN c1%NOTFOUND;\n" + - "\tEND LOOP;\n" + - "\tCLOSE c1;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\tv_employees employees%ROWTYPE;\n" + - "\tcursor c1 is\n" + - "\t\tselect *\n" + - "\t\tfrom employees;\n" + - "begin\n" + - "\topen c1;\n" + - "\tfor i in 1..10\n" + - "\tloop\n" + - "\t\tfetch c1 into v_employees;\n" + - "\t\texit when c1%NOTFOUND;\n" + - "\tend loop;\n" + - "\tclose c1;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("DECLARE\n" + + "\tv_employees employees%ROWTYPE;\n" + + "\tCURSOR c1 IS\n" + + "\t\tSELECT *\n" + + "\t\tFROM employees;\n" + + "BEGIN\n" + + "\tOPEN c1;\n" + + "\tFOR i IN 1..10\n" + + "\tLOOP\n" + + "\t\tFETCH c1 INTO v_employees;\n" + + "\t\tEXIT WHEN c1%NOTFOUND;\n" + + "\tEND LOOP;\n" + + "\tCLOSE c1;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tv_employees employees%ROWTYPE;\n" + + "\tcursor c1 is\n" + + "\t\tselect *\n" + + "\t\tfrom employees;\n" + + "begin\n" + + "\topen c1;\n" + + "\tfor i in 1..10\n" + + "\tloop\n" + + "\t\tfetch c1 into v_employees;\n" + + "\t\texit when c1%NOTFOUND;\n" + + "\tend loop;\n" + + "\tclose c1;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_4.java index d8cc9377c7..6b0c88ceee 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_4.java @@ -24,30 +24,29 @@ import java.util.List; public class Oracle_pl_for_4 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + - " v_employees employees%ROWTYPE;\n" + - " CURSOR c1 is SELECT * FROM employees;\n" + - "BEGIN\n" + - " OPEN c1;\n" + - " \n" + - " -- Fetch entire row into v_employees record:\n" + - " <>\n" + - " FOR i IN 1..10 LOOP\n" + - " -- Process data here\n" + - " FOR j IN 1..10 LOOP\n" + - " FETCH c1 INTO v_employees;\n" + - " CONTINUE outer_loop WHEN c1%NOTFOUND;\n" + - " -- Process data here\n" + - " END LOOP;\n" + - " END LOOP outer_loop;\n" + - " \n" + - " CLOSE c1;\n" + - "END;"; // + " v_employees employees%ROWTYPE;\n" + + " CURSOR c1 is SELECT * FROM employees;\n" + + "BEGIN\n" + + " OPEN c1;\n" + + " \n" + + " -- Fetch entire row into v_employees record:\n" + + " <>\n" + + " FOR i IN 1..10 LOOP\n" + + " -- Process data here\n" + + " FOR j IN 1..10 LOOP\n" + + " FETCH c1 INTO v_employees;\n" + + " CONTINUE outer_loop WHEN c1%NOTFOUND;\n" + + " -- Process data here\n" + + " END LOOP;\n" + + " END LOOP outer_loop;\n" + + " \n" + + " CLOSE c1;\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { @@ -71,50 +70,50 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("DECLARE\n" + - "\tv_employees employees%ROWTYPE;\n" + - "\tCURSOR c1 IS\n" + - "\t\tSELECT *\n" + - "\t\tFROM employees;\n" + - "BEGIN\n" + - "\tOPEN c1;\n" + - "\t<>\n" + - "\tFOR i IN 1..10\n" + - "\tLOOP\n" + - "\t\tFOR j IN 1..10\n" + - "\t\tLOOP\n" + - "\t\t\tFETCH c1 INTO v_employees;\n" + - "\t\t\tCONTINUE outer_loop WHEN c1%NOTFOUND;\n" + - "\t\tEND LOOP;\n" + - "\tEND LOOP outer_loop;\n" + - "\tCLOSE c1;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\tv_employees employees%ROWTYPE;\n" + - "\tcursor c1 is\n" + - "\t\tselect *\n" + - "\t\tfrom employees;\n" + - "begin\n" + - "\topen c1;\n" + - "\t<>\n" + - "\tfor i in 1..10\n" + - "\tloop\n" + - "\t\tfor j in 1..10\n" + - "\t\tloop\n" + - "\t\t\tfetch c1 into v_employees;\n" + - "\t\t\tcontinue outer_loop when c1%NOTFOUND;\n" + - "\t\tend loop;\n" + - "\tend loop outer_loop;\n" + - "\tclose c1;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("DECLARE\n" + + "\tv_employees employees%ROWTYPE;\n" + + "\tCURSOR c1 IS\n" + + "\t\tSELECT *\n" + + "\t\tFROM employees;\n" + + "BEGIN\n" + + "\tOPEN c1;\n" + + "\t<>\n" + + "\tFOR i IN 1..10\n" + + "\tLOOP\n" + + "\t\tFOR j IN 1..10\n" + + "\t\tLOOP\n" + + "\t\t\tFETCH c1 INTO v_employees;\n" + + "\t\t\tCONTINUE outer_loop WHEN c1%NOTFOUND;\n" + + "\t\tEND LOOP;\n" + + "\tEND LOOP outer_loop;\n" + + "\tCLOSE c1;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tv_employees employees%ROWTYPE;\n" + + "\tcursor c1 is\n" + + "\t\tselect *\n" + + "\t\tfrom employees;\n" + + "begin\n" + + "\topen c1;\n" + + "\t<>\n" + + "\tfor i in 1..10\n" + + "\tloop\n" + + "\t\tfor j in 1..10\n" + + "\t\tloop\n" + + "\t\t\tfetch c1 into v_employees;\n" + + "\t\t\tcontinue outer_loop when c1%NOTFOUND;\n" + + "\t\tend loop;\n" + + "\tend loop outer_loop;\n" + + "\tclose c1;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_forall_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_forall_0.java index b1f7fb3023..bb2eb701ab 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_forall_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_forall_0.java @@ -24,22 +24,21 @@ import java.util.List; public class Oracle_pl_forall_0 extends OracleTest { - public void test_0() throws Exception { String sql = "DROP TABLE employees_temp;\n" + - "CREATE TABLE employees_temp AS SELECT * FROM employees;\n" + - "\n" + - "DECLARE\n" + - " TYPE NumList IS VARRAY(20) OF NUMBER;\n" + - " depts NumList := NumList(10, 30, 70); -- department numbers\n" + - "BEGIN\n" + - " FORALL i IN depts.FIRST..depts.LAST\n" + - " DELETE FROM employees_temp\n" + - " WHERE department_id = depts(i);\n" + - "END;"; // + "CREATE TABLE employees_temp AS SELECT * FROM employees;\n" + + "\n" + + "DECLARE\n" + + " TYPE NumList IS VARRAY(20) OF NUMBER;\n" + + " depts NumList := NumList(10, 30, 70); -- department numbers\n" + + "BEGIN\n" + + " FORALL i IN depts.FIRST..depts.LAST\n" + + " DELETE FROM employees_temp\n" + + " WHERE department_id = depts(i);\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(3, statementList.size()); + assertEquals(3, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { statement.accept(visitor); @@ -62,40 +61,40 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("DROP TABLE employees_temp;\n" + - "CREATE TABLE employees_temp\n" + - "AS\n" + - "SELECT *\n" + - "FROM employees;\n" + - "DECLARE\n" + - "\tTYPE NumList IS VARRAY(20) OF NUMBER;\n" + - "\tdepts NumList := NumList(10, 30, 70);\n" + - "BEGIN\n" + - "\tFORALL i IN depts.FIRST..depts.LAST\n" + - "\t\tDELETE FROM employees_temp\n" + - "\t\tWHERE department_id = depts(i);\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("drop table employees_temp;\n" + - "create table employees_temp\n" + - "as\n" + - "select *\n" + - "from employees;\n" + - "declare\n" + - "\ttype NumList is VARRAY(20) OF NUMBER;\n" + - "\tdepts NumList := NumList(10, 30, 70);\n" + - "begin\n" + - "\tforall i in depts.FIRST..depts.LAST\n" + - "\t\tdelete from employees_temp\n" + - "\t\twhere department_id = depts(i);\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("DROP TABLE employees_temp;\n" + + "CREATE TABLE employees_temp\n" + + "AS\n" + + "SELECT *\n" + + "FROM employees;\n" + + "DECLARE\n" + + "\tTYPE NumList IS VARRAY(20) OF NUMBER;\n" + + "\tdepts NumList := NumList(10, 30, 70);\n" + + "BEGIN\n" + + "\tFORALL i IN depts.FIRST..depts.LAST\n" + + "\t\tDELETE FROM employees_temp\n" + + "\t\tWHERE department_id = depts(i);\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("drop table employees_temp;\n" + + "create table employees_temp\n" + + "as\n" + + "select *\n" + + "from employees;\n" + + "declare\n" + + "\ttype NumList is VARRAY(20) OF NUMBER;\n" + + "\tdepts NumList := NumList(10, 30, 70);\n" + + "begin\n" + + "\tforall i in depts.FIRST..depts.LAST\n" + + "\t\tdelete from employees_temp\n" + + "\t\twhere department_id = depts(i);\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_0.java index 4026f72bab..2de3e74711 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_0.java @@ -24,15 +24,14 @@ import java.util.List; public class Oracle_pl_if_0 extends OracleTest { - public void test_0() throws Exception { String sql = "IF l_salary > 40000\n" + - "THEN\n" + - " give_bonus (l_employee_id,500);\n" + - "END IF;"; // + "THEN\n" + + " give_bonus (l_employee_id,500);\n" + + "END IF;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -58,19 +57,19 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("IF l_salary > 40000 THEN\n" + - "\tgive_bonus(l_employee_id, 500);\n" + - "END IF;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("if l_salary > 40000 then\n" + - "\tgive_bonus(l_employee_id, 500);\n" + - "end if;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("IF l_salary > 40000 THEN\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "END IF;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("if l_salary > 40000 then\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "end if;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_1.java index 5e4f94ab3a..fa1d1cb9c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_1.java @@ -24,16 +24,15 @@ import java.util.List; public class Oracle_pl_if_1 extends OracleTest { - public void test_0() throws Exception { String sql = "IF l_salary > 40000 OR l_salary \n" + - "IS NULL\n" + - "THEN\n" + - " give_bonus (l_employee_id,500);\n" + - "END IF;"; // + "IS NULL\n" + + "THEN\n" + + " give_bonus (l_employee_id,500);\n" + + "END IF;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -59,23 +58,23 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("IF l_salary > 40000\n" + - "\tOR l_salary IS NULL\n" + - "THEN\n" + - "\tgive_bonus(l_employee_id, 500);\n" + - "END IF;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("if l_salary > 40000\n" + - "\tor l_salary is null\n" + - "then\n" + - "\tgive_bonus(l_employee_id, 500);\n" + - "end if;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("IF l_salary > 40000\n" + + "\tOR l_salary IS NULL\n" + + "THEN\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "END IF;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("if l_salary > 40000\n" + + "\tor l_salary is null\n" + + "then\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "end if;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_2.java index e52df4f119..868d543970 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_2.java @@ -24,17 +24,16 @@ import java.util.List; public class Oracle_pl_if_2 extends OracleTest { - public void test_0() throws Exception { String sql = "IF l_salary <= 40000\n" + - "THEN\n" + - " give_bonus (l_employee_id, 0);\n" + - "ELSE\n" + - " give_bonus (l_employee_id, 500);\n" + - "END IF;"; // + "THEN\n" + + " give_bonus (l_employee_id, 0);\n" + + "ELSE\n" + + " give_bonus (l_employee_id, 500);\n" + + "END IF;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -60,23 +59,23 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("IF l_salary <= 40000 THEN\n" + - "\tgive_bonus(l_employee_id, 0);\n" + - "ELSE\n" + - "\tgive_bonus(l_employee_id, 500);\n" + - "END IF;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("if l_salary <= 40000 then\n" + - "\tgive_bonus(l_employee_id, 0);\n" + - "else\n" + - "\tgive_bonus(l_employee_id, 500);\n" + - "end if;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("IF l_salary <= 40000 THEN\n" + + "\tgive_bonus(l_employee_id, 0);\n" + + "ELSE\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "END IF;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("if l_salary <= 40000 then\n" + + "\tgive_bonus(l_employee_id, 0);\n" + + "else\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "end if;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_3.java index cde9c8e277..6d28de0ad1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_3.java @@ -24,20 +24,19 @@ import java.util.List; public class Oracle_pl_if_3 extends OracleTest { - public void test_0() throws Exception { String sql = "IF l_salary BETWEEN 10000 AND 20000\n" + - "THEN\n" + - " give_bonus(l_employee_id, 1000);\n" + - "ELSIF l_salary > 20000\n" + - "THEN\n" + - " give_bonus(l_employee_id, 500);\n" + - "ELSE\n" + - " give_bonus(l_employee_id, 0);\n" + - "END IF;"; // + "THEN\n" + + " give_bonus(l_employee_id, 1000);\n" + + "ELSIF l_salary > 20000\n" + + "THEN\n" + + " give_bonus(l_employee_id, 500);\n" + + "ELSE\n" + + " give_bonus(l_employee_id, 0);\n" + + "END IF;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -63,27 +62,27 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("IF l_salary BETWEEN 10000 AND 20000 THEN\n" + - "\tgive_bonus(l_employee_id, 1000);\n" + - "ELSE IF l_salary > 20000 THEN\n" + - "\tgive_bonus(l_employee_id, 500);\n" + - "ELSE\n" + - "\tgive_bonus(l_employee_id, 0);\n" + - "END IF;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("if l_salary between 10000 and 20000 then\n" + - "\tgive_bonus(l_employee_id, 1000);\n" + - "else if l_salary > 20000 then\n" + - "\tgive_bonus(l_employee_id, 500);\n" + - "else\n" + - "\tgive_bonus(l_employee_id, 0);\n" + - "end if;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("IF l_salary BETWEEN 10000 AND 20000 THEN\n" + + "\tgive_bonus(l_employee_id, 1000);\n" + + "ELSE IF l_salary > 20000 THEN\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "ELSE\n" + + "\tgive_bonus(l_employee_id, 0);\n" + + "END IF;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("if l_salary between 10000 and 20000 then\n" + + "\tgive_bonus(l_employee_id, 1000);\n" + + "else if l_salary > 20000 then\n" + + "\tgive_bonus(l_employee_id, 500);\n" + + "else\n" + + "\tgive_bonus(l_employee_id, 0);\n" + + "end if;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_0.java index 27b07371a7..dd240d8564 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_0.java @@ -24,24 +24,23 @@ import java.util.List; public class Oracle_pl_loop_0 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + - " x NUMBER := 0;\n" + - "BEGIN\n" + - " LOOP\n" + - " DBMS_OUTPUT.PUT_LINE ('Inside loop: x = ' || TO_CHAR(x));\n" + - " x := x + 1;\n" + - " IF x > 3 THEN\n" + - " EXIT;\n" + - " END IF;\n" + - " END LOOP;\n" + - " -- After EXIT, control resumes here\n" + - " DBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + - "END;"; // + " x NUMBER := 0;\n" + + "BEGIN\n" + + " LOOP\n" + + " DBMS_OUTPUT.PUT_LINE ('Inside loop: x = ' || TO_CHAR(x));\n" + + " x := x + 1;\n" + + " IF x > 3 THEN\n" + + " EXIT;\n" + + " END IF;\n" + + " END LOOP;\n" + + " -- After EXIT, control resumes here\n" + + " DBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { statement.accept(visitor); @@ -64,38 +63,38 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("DECLARE\n" + - "\tx NUMBER := 0;\n" + - "BEGIN\n" + - "\tLOOP\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + - "\t\tx := x + 1;\n" + - "\t\tIF x > 3 THEN\n" + - "\t\t\tEXIT;\n" + - "\t\tEND IF;\n" + - "\tEND LOOP;\n" + - "\tDBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\tx NUMBER := 0;\n" + - "begin\n" + - "\tloop\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + - "\t\tx := x + 1;\n" + - "\t\tif x > 3 then\n" + - "\t\t\texit;\n" + - "\t\tend if;\n" + - "\tend loop;\n" + - "\tDBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("DECLARE\n" + + "\tx NUMBER := 0;\n" + + "BEGIN\n" + + "\tLOOP\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + "\t\tx := x + 1;\n" + + "\t\tIF x > 3 THEN\n" + + "\t\t\tEXIT;\n" + + "\t\tEND IF;\n" + + "\tEND LOOP;\n" + + "\tDBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tx NUMBER := 0;\n" + + "begin\n" + + "\tloop\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + "\t\tx := x + 1;\n" + + "\t\tif x > 3 then\n" + + "\t\t\texit;\n" + + "\t\tend if;\n" + + "\tend loop;\n" + + "\tDBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_1.java index 57aecbfe94..b9e48f0216 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_loop_1.java @@ -24,22 +24,21 @@ import java.util.List; public class Oracle_pl_loop_1 extends OracleTest { - public void test_0() throws Exception { String sql = "DECLARE\n" + - " x NUMBER := 0;\n" + - "BEGIN\n" + - " LOOP\n" + - " DBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + - " x := x + 1; -- prevents infinite loop\n" + - " EXIT WHEN x > 3;\n" + - " END LOOP;\n" + - " -- After EXIT statement, control resumes here\n" + - " DBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + - "END;"; // + " x NUMBER := 0;\n" + + "BEGIN\n" + + " LOOP\n" + + " DBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + " x := x + 1; -- prevents infinite loop\n" + + " EXIT WHEN x > 3;\n" + + " END LOOP;\n" + + " -- After EXIT statement, control resumes here\n" + + " DBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - assertEquals(1, statementList.size()); + assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { statement.accept(visitor); @@ -62,34 +61,34 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); - System.out.println(output); - assertEquals("DECLARE\n" + - "\tx NUMBER := 0;\n" + - "BEGIN\n" + - "\tLOOP\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + - "\t\tx := x + 1;\n" + - "\t\tEXIT WHEN x > 3;\n" + - "\tEND LOOP;\n" + - "\tDBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + - "END;", // - output); - } - { - String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\tx NUMBER := 0;\n" + - "begin\n" + - "\tloop\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + - "\t\tx := x + 1;\n" + - "\t\texit when x > 3;\n" + - "\tend loop;\n" + - "\tDBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE); + System.out.println(output); + assertEquals("DECLARE\n" + + "\tx NUMBER := 0;\n" + + "BEGIN\n" + + "\tLOOP\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + "\t\tx := x + 1;\n" + + "\t\tEXIT WHEN x > 3;\n" + + "\tEND LOOP;\n" + + "\tDBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + + "END;", // + output); + } + { + String output = SQLUtils.toSQLString(statementList, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tx NUMBER := 0;\n" + + "begin\n" + + "\tloop\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('Inside loop: x = ' || TO_CHAR(x));\n" + + "\t\tx := x + 1;\n" + + "\t\texit when x > 3;\n" + + "\tend loop;\n" + + "\tDBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_0.java index 4e52254fa4..53b014bbc5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_0.java @@ -24,58 +24,57 @@ import java.util.List; public class Oracle_pl_open_for_0 extends OracleTest { + public void test_0() throws Exception { + String sql = "DECLARE\n" + + " sal employees.salary%TYPE;\n" + + " sal_multiple employees.salary%TYPE;\n" + + " factor INTEGER := 2;\n" + + " \n" + + " cv SYS_REFCURSOR;\n" + + " \n" + + "BEGIN\n" + + " DBMS_OUTPUT.PUT_LINE('factor = ' || factor);\n" + + " \n" + + " OPEN cv FOR\n" + + " SELECT salary, salary*factor\n" + + " FROM employees\n" + + " WHERE job_id LIKE 'AD_%'; -- PL/SQL evaluates factor\n" + + " \n" + + " LOOP\n" + + " FETCH cv INTO sal, sal_multiple;\n" + + " EXIT WHEN cv%NOTFOUND;\n" + + " DBMS_OUTPUT.PUT_LINE('sal = ' || sal);\n" + + " DBMS_OUTPUT.PUT_LINE('sal_multiple = ' || sal_multiple);\n" + + " END LOOP;\n" + + " \n" + + " factor := factor + 1;\n" + + " \n" + + " DBMS_OUTPUT.PUT_LINE('factor = ' || factor);\n" + + " \n" + + " OPEN cv FOR\n" + + " SELECT salary, salary*factor\n" + + " FROM employees\n" + + " WHERE job_id LIKE 'AD_%'; -- PL/SQL evaluates factor\n" + + " \n" + + " LOOP\n" + + " FETCH cv INTO sal, sal_multiple;\n" + + " EXIT WHEN cv%NOTFOUND;\n" + + " DBMS_OUTPUT.PUT_LINE('sal = ' || sal);\n" + + " DBMS_OUTPUT.PUT_LINE('sal_multiple = ' || sal_multiple);\n" + + " END LOOP;\n" + + " \n" + + " CLOSE cv;\n" + + "END;"; // - public void test_0() throws Exception { - String sql = "DECLARE\n" + - " sal employees.salary%TYPE;\n" + - " sal_multiple employees.salary%TYPE;\n" + - " factor INTEGER := 2;\n" + - " \n" + - " cv SYS_REFCURSOR;\n" + - " \n" + - "BEGIN\n" + - " DBMS_OUTPUT.PUT_LINE('factor = ' || factor);\n" + - " \n" + - " OPEN cv FOR\n" + - " SELECT salary, salary*factor\n" + - " FROM employees\n" + - " WHERE job_id LIKE 'AD_%'; -- PL/SQL evaluates factor\n" + - " \n" + - " LOOP\n" + - " FETCH cv INTO sal, sal_multiple;\n" + - " EXIT WHEN cv%NOTFOUND;\n" + - " DBMS_OUTPUT.PUT_LINE('sal = ' || sal);\n" + - " DBMS_OUTPUT.PUT_LINE('sal_multiple = ' || sal_multiple);\n" + - " END LOOP;\n" + - " \n" + - " factor := factor + 1;\n" + - " \n" + - " DBMS_OUTPUT.PUT_LINE('factor = ' || factor);\n" + - " \n" + - " OPEN cv FOR\n" + - " SELECT salary, salary*factor\n" + - " FROM employees\n" + - " WHERE job_id LIKE 'AD_%'; -- PL/SQL evaluates factor\n" + - " \n" + - " LOOP\n" + - " FETCH cv INTO sal, sal_multiple;\n" + - " EXIT WHEN cv%NOTFOUND;\n" + - " DBMS_OUTPUT.PUT_LINE('sal = ' || sal);\n" + - " DBMS_OUTPUT.PUT_LINE('sal_multiple = ' || sal_multiple);\n" + - " END LOOP;\n" + - " \n" + - " CLOSE cv;\n" + - "END;"; // + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); + SQLStatement stmt = statementList.get(0); - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + assertEquals(1, statementList.size()); - assertEquals(1, statementList.size()); - - SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); - for (SQLStatement statement : statementList) { - statement.accept(visitor); - } + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); + for (SQLStatement statement : statementList) { + statement.accept(visitor); + } // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); @@ -83,7 +82,7 @@ public void test_0() throws Exception { // System.out.println("relationships : " + visitor.getRelationships()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals(0, visitor.getTables().size()); + assertEquals(0, visitor.getTables().size()); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("emp_name"))); @@ -92,77 +91,77 @@ public void test_0() throws Exception { // Assert.assertEquals(3, visitor.getConditions().size()); // Assert.assertEquals(1, visitor.getRelationships().size()); - // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("DECLARE\n" + - "\tsal employees.salary%TYPE;\n" + - "\tsal_multiple employees.salary%TYPE;\n" + - "\tfactor INTEGER := 2;\n" + - "\tcv SYS_REFCURSOR;\n" + - "BEGIN\n" + - "\tDBMS_OUTPUT.PUT_LINE('factor = ' || factor);\n" + - "\tOPEN cv FOR \n" + - "\t\tSELECT salary, salary * factor\n" + - "\t\tFROM employees\n" + - "\t\tWHERE job_id LIKE 'AD_%';\n" + - "\tLOOP\n" + - "\t\tFETCH cv INTO sal, sal_multiple;\n" + - "\t\tEXIT WHEN cv%NOTFOUND;\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('sal = ' || sal);\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('sal_multiple = ' || sal_multiple);\n" + - "\tEND LOOP;\n" + - "\tfactor := factor + 1;\n" + - "\tDBMS_OUTPUT.PUT_LINE('factor = ' || factor);\n" + - "\tOPEN cv FOR \n" + - "\t\tSELECT salary, salary * factor\n" + - "\t\tFROM employees\n" + - "\t\tWHERE job_id LIKE 'AD_%';\n" + - "\tLOOP\n" + - "\t\tFETCH cv INTO sal, sal_multiple;\n" + - "\t\tEXIT WHEN cv%NOTFOUND;\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('sal = ' || sal);\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('sal_multiple = ' || sal_multiple);\n" + - "\tEND LOOP;\n" + - "\tCLOSE cv;\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("declare\n" + - "\tsal employees.salary%TYPE;\n" + - "\tsal_multiple employees.salary%TYPE;\n" + - "\tfactor INTEGER := 2;\n" + - "\tcv SYS_REFCURSOR;\n" + - "begin\n" + - "\tDBMS_OUTPUT.PUT_LINE('factor = ' || factor);\n" + - "\topen cv for \n" + - "\t\tselect salary, salary * factor\n" + - "\t\tfrom employees\n" + - "\t\twhere job_id like 'AD_%';\n" + - "\tloop\n" + - "\t\tfetch cv into sal, sal_multiple;\n" + - "\t\texit when cv%NOTFOUND;\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('sal = ' || sal);\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('sal_multiple = ' || sal_multiple);\n" + - "\tend loop;\n" + - "\tfactor := factor + 1;\n" + - "\tDBMS_OUTPUT.PUT_LINE('factor = ' || factor);\n" + - "\topen cv for \n" + - "\t\tselect salary, salary * factor\n" + - "\t\tfrom employees\n" + - "\t\twhere job_id like 'AD_%';\n" + - "\tloop\n" + - "\t\tfetch cv into sal, sal_multiple;\n" + - "\t\texit when cv%NOTFOUND;\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('sal = ' || sal);\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('sal_multiple = ' || sal_multiple);\n" + - "\tend loop;\n" + - "\tclose cv;\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("DECLARE\n" + + "\tsal employees.salary%TYPE;\n" + + "\tsal_multiple employees.salary%TYPE;\n" + + "\tfactor INTEGER := 2;\n" + + "\tcv SYS_REFCURSOR;\n" + + "BEGIN\n" + + "\tDBMS_OUTPUT.PUT_LINE('factor = ' || factor);\n" + + "\tOPEN cv FOR \n" + + "\t\tSELECT salary, salary * factor\n" + + "\t\tFROM employees\n" + + "\t\tWHERE job_id LIKE 'AD_%';\n" + + "\tLOOP\n" + + "\t\tFETCH cv INTO sal, sal_multiple;\n" + + "\t\tEXIT WHEN cv%NOTFOUND;\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('sal = ' || sal);\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('sal_multiple = ' || sal_multiple);\n" + + "\tEND LOOP;\n" + + "\tfactor := factor + 1;\n" + + "\tDBMS_OUTPUT.PUT_LINE('factor = ' || factor);\n" + + "\tOPEN cv FOR \n" + + "\t\tSELECT salary, salary * factor\n" + + "\t\tFROM employees\n" + + "\t\tWHERE job_id LIKE 'AD_%';\n" + + "\tLOOP\n" + + "\t\tFETCH cv INTO sal, sal_multiple;\n" + + "\t\tEXIT WHEN cv%NOTFOUND;\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('sal = ' || sal);\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('sal_multiple = ' || sal_multiple);\n" + + "\tEND LOOP;\n" + + "\tCLOSE cv;\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("declare\n" + + "\tsal employees.salary%TYPE;\n" + + "\tsal_multiple employees.salary%TYPE;\n" + + "\tfactor INTEGER := 2;\n" + + "\tcv SYS_REFCURSOR;\n" + + "begin\n" + + "\tDBMS_OUTPUT.PUT_LINE('factor = ' || factor);\n" + + "\topen cv for \n" + + "\t\tselect salary, salary * factor\n" + + "\t\tfrom employees\n" + + "\t\twhere job_id like 'AD_%';\n" + + "\tloop\n" + + "\t\tfetch cv into sal, sal_multiple;\n" + + "\t\texit when cv%NOTFOUND;\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('sal = ' || sal);\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('sal_multiple = ' || sal_multiple);\n" + + "\tend loop;\n" + + "\tfactor := factor + 1;\n" + + "\tDBMS_OUTPUT.PUT_LINE('factor = ' || factor);\n" + + "\topen cv for \n" + + "\t\tselect salary, salary * factor\n" + + "\t\tfrom employees\n" + + "\t\twhere job_id like 'AD_%';\n" + + "\tloop\n" + + "\t\tfetch cv into sal, sal_multiple;\n" + + "\t\texit when cv%NOTFOUND;\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('sal = ' || sal);\n" + + "\t\tDBMS_OUTPUT.PUT_LINE('sal_multiple = ' || sal_multiple);\n" + + "\tend loop;\n" + + "\tclose cv;\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_param_inout_0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_param_inout_0.java index cc2a0133ac..052983464c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_param_inout_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_param_inout_0.java @@ -24,18 +24,17 @@ import java.util.List; public class Oracle_pl_param_inout_0 extends OracleTest { - public void test_0() throws Exception { String sql = "CREATE OR REPLACE PROCEDURE reassign (\n" + - " p IN OUT NOCOPY hr.person_typ,\n" + - " new_job VARCHAR2\n" + - ") AS\n" + - "BEGIN\n" + - " p.change_job(new_job); -- runs with privileges of OE\n" + - "END;"; // + " p IN OUT NOCOPY hr.person_typ,\n" + + " new_job VARCHAR2\n" + + ") AS\n" + + "BEGIN\n" + + " p.change_job(new_job); -- runs with privileges of OE\n" + + "END;"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -61,29 +60,29 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("CREATE OR REPLACE PROCEDURE reassign (\n" + - "\tp IN OUT NOCOPY hr.person_typ, \n" + - "\tnew_job VARCHAR2\n" + - ")\n" + - "IS\n" + - "BEGIN\n" + - "\tp.change_job(new_job);\n" + - "END;", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("create or replace procedure reassign (\n" + - "\tp in out nocopy hr.person_typ, \n" + - "\tnew_job VARCHAR2\n" + - ")\n" + - "is\n" + - "begin\n" + - "\tp.change_job(new_job);\n" + - "end;", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("CREATE OR REPLACE PROCEDURE reassign (\n" + + "\tp IN OUT NOCOPY hr.person_typ, \n" + + "\tnew_job VARCHAR2\n" + + ")\n" + + "IS\n" + + "BEGIN\n" + + "\tp.change_job(new_job);\n" + + "END;", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("create or replace procedure reassign (\n" + + "\tp in out nocopy hr.person_typ, \n" + + "\tnew_job VARCHAR2\n" + + ")\n" + + "is\n" + + "begin\n" + + "\tp.change_job(new_job);\n" + + "end;", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/oracle_pl_open_1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/oracle_pl_open_1.java index f00bb2cbd9..f5ffbbbf2b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/oracle_pl_open_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/oracle_pl_open_1.java @@ -24,12 +24,11 @@ import java.util.List; public class oracle_pl_open_1 extends OracleTest { - public void test_0() throws Exception { String sql = "OPEN cur_user(lv_batchid);"; // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLStatement stmt = statementList.get(0); + SQLStatement stmt = statementList.get(0); assertEquals(1, statementList.size()); @@ -55,15 +54,15 @@ public void test_0() throws Exception { // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); - { - String output = SQLUtils.toOracleString(stmt); - assertEquals("OPEN cur_user(lv_batchid);", // - output); - } - { - String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("open cur_user(lv_batchid);", // - output); - } - } + { + String output = SQLUtils.toOracleString(stmt); + assertEquals("OPEN cur_user(lv_batchid);", // + output); + } + { + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("open cur_user(lv_batchid);", // + output); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectGroupingTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectGroupingTest.java index 875997d38d..071d3347fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectGroupingTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectGroupingTest.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleSelectGroupingTest extends TestCase { - public void test_select() throws Exception { String sql = "SELECT COUNT(*) FROM employees e, departments d WHERE d.department_id = e.department_id GROUP BY ROLLUP (department_name, job_id);"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectParserTest.java index b0ea9fbd64..afb602d968 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectParserTest.java @@ -23,7 +23,6 @@ import java.util.List; public class OracleSelectParserTest extends TestCase { - public void test_select() throws Exception { String sql = "SELECT last_name, department_id FROM employees WHERE department_id = (SELECT department_id FROM employees WHERE last_name = 'Lorentz') ORDER BY last_name, department_id;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest1.java index 8abc60395f..3a57cc29b9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest1.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleSelectTest1 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT employees_seq.currval FROM DUAL; "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest10.java index d4419d4229..b815b4e0cd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest10.java @@ -26,24 +26,23 @@ import java.util.List; public class OracleSelectTest10 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT * FROM pivot_table" + // - " UNPIVOT INCLUDE NULLS " + // - " (yearly_total FOR order_mode IN (store AS 'direct', internet AS 'online'))" + // - " ORDER BY year, order_mode;"; // + " UNPIVOT INCLUDE NULLS " + // + " (yearly_total FOR order_mode IN (store AS 'direct', internet AS 'online'))" + // + " ORDER BY year, order_mode;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + String result = SQLUtils.toOracleString(stmt); String result_lcase = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("SELECT *\n" + "FROM pivot_table\n" + "UNPIVOT INCLUDE NULLS (yearly_total FOR order_mode IN (store AS \"direct\", internet AS \"online\"))\n" + "ORDER BY year, order_mode;", result); - + Assert.assertEquals("select *\n" + "from pivot_table\n" + "unpivot include nulls (yearly_total for order_mode in (store as \"direct\", internet as \"online\"))\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest100_var.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest100_var.java index 1b40029cbb..82ee94c5af 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest100_var.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest100_var.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest100_var extends OracleTest { - public void test_0() throws Exception { String sql = // "select * from zj_sb_zzs_fb3_mx where fphm=:\"SYS_B_0\" and sssq_q=date:\"SYS_B_1\"\n"; @@ -70,5 +69,5 @@ public void test_0() throws Exception { assertEquals(0, visitor.getOrderByColumns().size()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest101.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest101.java index 4afaf8aa19..594d3f6f57 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest101.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest101.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest101 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT e.area_name 区域,\n" + @@ -150,5 +149,5 @@ public void test_0() throws Exception { assertEquals(1, visitor.getOrderByColumns().size()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest102_interval.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest102_interval.java index b2e77b399f..6bc92da04c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest102_interval.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest102_interval.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest102_interval extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT id, bill_batch_no, partner_id, currency, original_amount\n" + @@ -87,5 +86,5 @@ public void test_0() throws Exception { assertEquals(1, visitor.getOrderByColumns().size()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest103.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest103.java index 6c1ec44583..f699930b7c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest103.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest103.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest103 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT *\n" + @@ -153,5 +152,5 @@ public void test_0() throws Exception { assertEquals(0, visitor.getOrderByColumns().size()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest104.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest104.java index 14d663788b..f23c01c32a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest104.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest104.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest104 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT\n" + @@ -93,5 +92,5 @@ public void test_0() throws Exception { assertEquals(0, visitor.getOrderByColumns().size()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest105.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest105.java index 6d4d5cc230..d53e97caf1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest105.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest105.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest105 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT gz, UTL_RAW.CAST_TO_RAW(gzname) AS gzname, dept\n" + @@ -73,5 +72,5 @@ public void test_0() throws Exception { assertEquals(0, visitor.getOrderByColumns().size()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest106.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest106.java index fb7486dc38..0426f2c4e5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest106.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest106.java @@ -29,7 +29,6 @@ import java.util.List; public class OracleSelectTest106 extends OracleTest { - public void test_0() throws Exception { String sql = // "select * from a join b on a.id = b.aid where a.cid = 1"; @@ -42,7 +41,7 @@ public void test_0() throws Exception { System.out.println(stmt.toString()); assertEquals(1, statementList.size()); - + SchemaRepository repository = new SchemaRepository(DbType.oracle); repository.resolve(stmt); @@ -81,5 +80,5 @@ public void test_0() throws Exception { } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest107.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest107.java index 26b931d2df..1441561803 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest107.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest107.java @@ -123,5 +123,5 @@ public void test_0() throws Exception { // } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest108.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest108.java index 936e359193..9c60e9de01 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest108.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest108.java @@ -28,17 +28,16 @@ import java.util.List; public class OracleSelectTest108 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT\n" + " OBJID,\n" + " NAME,\n" + " OWNER,\n" + " OWNERID,\n" + " TABLESPACE,\n" - + " TSNO,\n" + " FILENO,\n" + " BLOCKNO,\n" + " AUDIT$,\n" + " COMMENT$,\n" + " CLUSTERFLAG,\n" - + " PCTFREE$,\n" + " PCTUSED$,\n" + " INITRANS,\n" + " MAXTRANS,\n" + " DEGREE,\n" - + " INSTANCES,\n" + " CACHE,\n" + " PROPERTY,\n" + " DEFLOG,\n" + " TSDEFLOG,\n" + " ROID,\n" - + " ROWCNT,\n" + " BLKCNT,\n" + " AVGRLEN,\n" + " TFLAGS,\n" + " TRIGFLAG,\n" + " OBJSTATUS,\n" - + " XDBOOL\n" + "FROM SYS.EXU10TABU T$\n" + "WHERE NOT EXISTS(SELECT NAME\n" - + " FROM SYS.EXU8NXPU N$\n" - + " WHERE N$.NAME = T$.NAME AND N$.TYPE = 2)\n" + "ORDER BY T$.XDBOOL DESC, T$.NAME"; + + " TSNO,\n" + " FILENO,\n" + " BLOCKNO,\n" + " AUDIT$,\n" + " COMMENT$,\n" + " CLUSTERFLAG,\n" + + " PCTFREE$,\n" + " PCTUSED$,\n" + " INITRANS,\n" + " MAXTRANS,\n" + " DEGREE,\n" + + " INSTANCES,\n" + " CACHE,\n" + " PROPERTY,\n" + " DEFLOG,\n" + " TSDEFLOG,\n" + " ROID,\n" + + " ROWCNT,\n" + " BLKCNT,\n" + " AVGRLEN,\n" + " TFLAGS,\n" + " TRIGFLAG,\n" + " OBJSTATUS,\n" + + " XDBOOL\n" + "FROM SYS.EXU10TABU T$\n" + "WHERE NOT EXISTS(SELECT NAME\n" + + " FROM SYS.EXU8NXPU N$\n" + + " WHERE N$.NAME = T$.NAME AND N$.TYPE = 2)\n" + "ORDER BY T$.XDBOOL DESC, T$.NAME"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -57,13 +56,13 @@ public void test_0() throws Exception { String text = SQLUtils.toOracleString(stmt); assertEquals("SELECT OBJID, NAME, OWNER, OWNERID, TABLESPACE\n" - + "\t, TSNO, FILENO, BLOCKNO, AUDIT$, COMMENT$\n" - + "\t, CLUSTERFLAG, PCTFREE$, PCTUSED$, INITRANS, MAXTRANS\n" - + "\t, DEGREE, INSTANCES, CACHE, PROPERTY, DEFLOG\n" - + "\t, TSDEFLOG, ROID, ROWCNT, BLKCNT, AVGRLEN\n" + "\t, TFLAGS, TRIGFLAG, OBJSTATUS, XDBOOL\n" - + "FROM SYS.EXU10TABU T$\n" + "WHERE NOT EXISTS (\n" + "\tSELECT NAME\n" - + "\tFROM SYS.EXU8NXPU N$\n" + "\tWHERE N$.NAME = T$.NAME\n" + "\t\tAND N$.TYPE = 2\n" + ")\n" - + "ORDER BY T$.XDBOOL DESC, T$.NAME", text); + + "\t, TSNO, FILENO, BLOCKNO, AUDIT$, COMMENT$\n" + + "\t, CLUSTERFLAG, PCTFREE$, PCTUSED$, INITRANS, MAXTRANS\n" + + "\t, DEGREE, INSTANCES, CACHE, PROPERTY, DEFLOG\n" + + "\t, TSDEFLOG, ROID, ROWCNT, BLKCNT, AVGRLEN\n" + "\t, TFLAGS, TRIGFLAG, OBJSTATUS, XDBOOL\n" + + "FROM SYS.EXU10TABU T$\n" + "WHERE NOT EXISTS (\n" + "\tSELECT NAME\n" + + "\tFROM SYS.EXU8NXPU N$\n" + "\tWHERE N$.NAME = T$.NAME\n" + "\t\tAND N$.TYPE = 2\n" + ")\n" + + "ORDER BY T$.XDBOOL DESC, T$.NAME", text); } System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest109.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest109.java index a866bfa0d8..cca4ea07ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest109.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest109.java @@ -28,7 +28,6 @@ import java.util.List; public class OracleSelectTest109 extends OracleTest { - public void test_0() throws Exception { String sql = "/* No SQL_REDO for temporary tables */"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest11.java index f4b0a625f1..761d0f283a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest11.java @@ -25,27 +25,26 @@ import java.util.List; public class OracleSelectTest11 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT ID, GMT_CREATE, GMT_MODIFIED, COMPANY_ID, MEMBER_ID" + // - " , MEMBER_SEQ, FILE_NAME, DISPLAY_NAME, DISPLAY_NAME_UTF8, FILE_SIZE" + // - " , STATUS, WIDTH, HEIGHT, REFERENCE_COUNT, HASH_CODE" + // - " , GROUP_ID" + // - " FROM (SELECT *" + // - " FROM (SELECT row_.*, rownum AS rownum_" + // - " FROM (SELECT rowid AS rid" + // - " FROM IMAGE_REPOSITORY" + // - " WHERE COMPANY_ID = :1 AND STATUS = 'enable' " + // - " AND MEMBER_SEQ = :2 AND GMT_MODIFIED >= to_date(:3, 'yyyy-mm-dd hh24:mi:ss') " + // - " AND GMT_MODIFIED < to_date(:4, 'yyyy-mm-dd hh24:mi:ss')" + // - " ORDER BY \"FILE_SIZE\" DESC, \"ID\" DESC" + // // - " ) row_" + // - " WHERE rownum <= :5" + // - " )" + // - " WHERE rownum_ >= :6" + // - " ) a, IMAGE_REPOSITORY b " + // - " WHERE a.rid = b.rowid;"; // - + " , MEMBER_SEQ, FILE_NAME, DISPLAY_NAME, DISPLAY_NAME_UTF8, FILE_SIZE" + // + " , STATUS, WIDTH, HEIGHT, REFERENCE_COUNT, HASH_CODE" + // + " , GROUP_ID" + // + " FROM (SELECT *" + // + " FROM (SELECT row_.*, rownum AS rownum_" + // + " FROM (SELECT rowid AS rid" + // + " FROM IMAGE_REPOSITORY" + // + " WHERE COMPANY_ID = :1 AND STATUS = 'enable' " + // + " AND MEMBER_SEQ = :2 AND GMT_MODIFIED >= to_date(:3, 'yyyy-mm-dd hh24:mi:ss') " + // + " AND GMT_MODIFIED < to_date(:4, 'yyyy-mm-dd hh24:mi:ss')" + // + " ORDER BY \"FILE_SIZE\" DESC, \"ID\" DESC" + // // + " ) row_" + // + " WHERE rownum <= :5" + // + " )" + // + " WHERE rownum_ >= :6" + // + " ) a, IMAGE_REPOSITORY b " + // + " WHERE a.rid = b.rowid;"; // + // sql = "select ID, GMT_CREATE, GMT_MODIFIED, COMPANY_ID, MEMBER_ID, MEMBER_SEQ, FILE_NAME, DISPLAY_NAME, DISPLAY_NAME_UTF8, FILE_SIZE, STATUS, WIDTH, HEIGHT, REFERENCE_COUNT, HASH_CODE, GROUP_ID from ( select * from (select row_.*, rownum rownum_ from ( select rowid rid from IMAGE_REPOSITORY where COMPANY_ID = :1 and STATUS = 'enable' and MEMBER_SEQ = :2 and GMT_MODIFIED >= to_date(:3 , 'yyyy-mm-dd hh24:mi:ss') and GMT_MODIFIED < to_date(:4 , 'yyyy-mm-dd hh24:mi:ss') order by \"FILE_SIZE\" desc , \"ID\" desc )row_ where rownum <= :5 ) where rownum_ >= :6 ) a , IMAGE_REPOSITORY b where a.rid = b.rowid "; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest110.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest110.java index 537e4bbb0d..adac2336fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest110.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest110.java @@ -26,26 +26,25 @@ import java.util.List; public class OracleSelectTest110 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT\n" + " Home_City,\n" + " bank_type,\n" + " differ_flag,\n" + " adjust_flag,\n" - + " out_user_id,\n" + " out_msisdn,\n" + " out_account_id,\n" + " out_month,\n" - + " to_char(out_action_date, 'yyyymmdd'),\n" + " to_char(out_action_time, 'yyyymmddhh24miss'),\n" - + " out_payment_amount,\n" + " out_cnltyp,\n" + " out_bank_id,\n" + " out_discount,\n" - + " out_real_payed,\n" + " out_BusiTransID,\n" + " out_PayTransID,\n" + " out_OrderNo,\n" - + " out_ProductNo,\n" + " out_Order_Payment,\n" + " out_OrderCnt,\n" + " out_Commision,\n" - + " out_RebateFee,\n" + " out_ProdDiscount,\n" + " out_CreditCardFee,\n" + " out_ServiceFee,\n" - + " out_ActivityNo,\n" + " out_ProductShelfNo,\n" + " OUT_PayOrganID,\n" - + " OUT_CorrelationID,\n" + " in_user_id,\n" + " in_msisdn,\n" + " in_account_id,\n" - + " in_month,\n" + " to_char(in_action_date, 'yyyymmdd'),\n" - + " to_char(in_action_time, 'yyyymmddhh24miss'),\n" + " in_payment_amount,\n" - + " in_discount,\n" + " in_real_payed,\n" + " in_BusiTransID,\n" + " in_PayTransID,\n" - + " in_OrderNo,\n" + " in_ProductNo,\n" + " in_Order_Payment,\n" + " in_OrderCnt,\n" - + " in_Commision,\n" + " in_RebateFee,\n" + " in_ProdDiscount,\n" + " in_CreditCardFee,\n" - + " in_ServiceFee,\n" + " in_ActivityNo,\n" + " in_ProductShelfNo,\n" + " IN_PayOrganID,\n" - + " IN_CorrelationID\n" - + "INTO :b0, :b1, :b2:b3, :b4:b5, :b6:b7, :b8:b9, :b10:b11, :b12:b13, :b14:b15, :b16:b17, :b18:b19, :b20:b21, :b22:b23, :b24:b25, :b26:b27, :b28:b29, :b30:b31, :b32:b33, :b34:b35, :b36:b37, :b38:b39, :b40:b41, :b42:b43, :b44:b45, :b46:b47, :b48:b49, :b50:b51, :b52:b53, :b54:b55, :b56:b57, :b58:b59, :b60:b61, :b62:b63, :b64:b65, :b66:b67, :b68:b69, :b70:b71, :b72:b73, :b74:b75, :b76:b77, :b78:b79, :b80:b81, :b82:b83, :b84:b85, :b86:b87, :b88:b89, :b90:b91, :b92:b93, :b94:b95, :b96:b97, :b98:b99, :b100:b101, :b102:b103, :b104:b105\n" - + "FROM b2b_payment_ReconDetail\n" + "WHERE (Recon_seq_id = :b106 AND transaction_id = :b107)"; + + " out_user_id,\n" + " out_msisdn,\n" + " out_account_id,\n" + " out_month,\n" + + " to_char(out_action_date, 'yyyymmdd'),\n" + " to_char(out_action_time, 'yyyymmddhh24miss'),\n" + + " out_payment_amount,\n" + " out_cnltyp,\n" + " out_bank_id,\n" + " out_discount,\n" + + " out_real_payed,\n" + " out_BusiTransID,\n" + " out_PayTransID,\n" + " out_OrderNo,\n" + + " out_ProductNo,\n" + " out_Order_Payment,\n" + " out_OrderCnt,\n" + " out_Commision,\n" + + " out_RebateFee,\n" + " out_ProdDiscount,\n" + " out_CreditCardFee,\n" + " out_ServiceFee,\n" + + " out_ActivityNo,\n" + " out_ProductShelfNo,\n" + " OUT_PayOrganID,\n" + + " OUT_CorrelationID,\n" + " in_user_id,\n" + " in_msisdn,\n" + " in_account_id,\n" + + " in_month,\n" + " to_char(in_action_date, 'yyyymmdd'),\n" + + " to_char(in_action_time, 'yyyymmddhh24miss'),\n" + " in_payment_amount,\n" + + " in_discount,\n" + " in_real_payed,\n" + " in_BusiTransID,\n" + " in_PayTransID,\n" + + " in_OrderNo,\n" + " in_ProductNo,\n" + " in_Order_Payment,\n" + " in_OrderCnt,\n" + + " in_Commision,\n" + " in_RebateFee,\n" + " in_ProdDiscount,\n" + " in_CreditCardFee,\n" + + " in_ServiceFee,\n" + " in_ActivityNo,\n" + " in_ProductShelfNo,\n" + " IN_PayOrganID,\n" + + " IN_CorrelationID\n" + + "INTO :b0, :b1, :b2:b3, :b4:b5, :b6:b7, :b8:b9, :b10:b11, :b12:b13, :b14:b15, :b16:b17, :b18:b19, :b20:b21, :b22:b23, :b24:b25, :b26:b27, :b28:b29, :b30:b31, :b32:b33, :b34:b35, :b36:b37, :b38:b39, :b40:b41, :b42:b43, :b44:b45, :b46:b47, :b48:b49, :b50:b51, :b52:b53, :b54:b55, :b56:b57, :b58:b59, :b60:b61, :b62:b63, :b64:b65, :b66:b67, :b68:b69, :b70:b71, :b72:b73, :b74:b75, :b76:b77, :b78:b79, :b80:b81, :b82:b83, :b84:b85, :b86:b87, :b88:b89, :b90:b91, :b92:b93, :b94:b95, :b96:b97, :b98:b99, :b100:b101, :b102:b103, :b104:b105\n" + + "FROM b2b_payment_ReconDetail\n" + "WHERE (Recon_seq_id = :b106 AND transaction_id = :b107)"; OracleStatementParser parser = new OracleStatementParser(sql, SQLParserFeature.KeepComments); List statementList = parser.parseStatementList(); @@ -61,21 +60,21 @@ public void test_0() throws Exception { String text = SQLUtils.toOracleString(stmt); assertEquals("SELECT Home_City, bank_type, differ_flag, adjust_flag, out_user_id\n" - + "\t, out_msisdn, out_account_id, out_month\n" + "\t, to_char(out_action_date, 'yyyymmdd')\n" - + "\t, to_char(out_action_time, 'yyyymmddhh24miss'), out_payment_amount\n" - + "\t, out_cnltyp, out_bank_id, out_discount, out_real_payed, out_BusiTransID\n" - + "\t, out_PayTransID, out_OrderNo, out_ProductNo, out_Order_Payment, out_OrderCnt\n" - + "\t, out_Commision, out_RebateFee, out_ProdDiscount, out_CreditCardFee, out_ServiceFee\n" - + "\t, out_ActivityNo, out_ProductShelfNo, OUT_PayOrganID, OUT_CorrelationID, in_user_id\n" - + "\t, in_msisdn, in_account_id, in_month\n" + "\t, to_char(in_action_date, 'yyyymmdd')\n" - + "\t, to_char(in_action_time, 'yyyymmddhh24miss'), in_payment_amount\n" - + "\t, in_discount, in_real_payed, in_BusiTransID, in_PayTransID, in_OrderNo\n" - + "\t, in_ProductNo, in_Order_Payment, in_OrderCnt, in_Commision, in_RebateFee\n" - + "\t, in_ProdDiscount, in_CreditCardFee, in_ServiceFee, in_ActivityNo, in_ProductShelfNo\n" - + "\t, IN_PayOrganID, IN_CorrelationID\n" - + "INTO (:b0, :b1, :b2:b3, :b4:b5, :b6:b7, :b8:b9, :b10:b11, :b12:b13, :b14:b15, :b16:b17, :b18:b19, :b20:b21, :b22:b23, :b24:b25, :b26:b27, :b28:b29, :b30:b31, :b32:b33, :b34:b35, :b36:b37, :b38:b39, :b40:b41, :b42:b43, :b44:b45, :b46:b47, :b48:b49, :b50:b51, :b52:b53, :b54:b55, :b56:b57, :b58:b59, :b60:b61, :b62:b63, :b64:b65, :b66:b67, :b68:b69, :b70:b71, :b72:b73, :b74:b75, :b76:b77, :b78:b79, :b80:b81, :b82:b83, :b84:b85, :b86:b87, :b88:b89, :b90:b91, :b92:b93, :b94:b95, :b96:b97, :b98:b99, :b100:b101, :b102:b103, :b104:b105)\n" - + "FROM b2b_payment_ReconDetail\n" + "WHERE Recon_seq_id = :b106\n" - + "\tAND transaction_id = :b107", text); + + "\t, out_msisdn, out_account_id, out_month\n" + "\t, to_char(out_action_date, 'yyyymmdd')\n" + + "\t, to_char(out_action_time, 'yyyymmddhh24miss'), out_payment_amount\n" + + "\t, out_cnltyp, out_bank_id, out_discount, out_real_payed, out_BusiTransID\n" + + "\t, out_PayTransID, out_OrderNo, out_ProductNo, out_Order_Payment, out_OrderCnt\n" + + "\t, out_Commision, out_RebateFee, out_ProdDiscount, out_CreditCardFee, out_ServiceFee\n" + + "\t, out_ActivityNo, out_ProductShelfNo, OUT_PayOrganID, OUT_CorrelationID, in_user_id\n" + + "\t, in_msisdn, in_account_id, in_month\n" + "\t, to_char(in_action_date, 'yyyymmdd')\n" + + "\t, to_char(in_action_time, 'yyyymmddhh24miss'), in_payment_amount\n" + + "\t, in_discount, in_real_payed, in_BusiTransID, in_PayTransID, in_OrderNo\n" + + "\t, in_ProductNo, in_Order_Payment, in_OrderCnt, in_Commision, in_RebateFee\n" + + "\t, in_ProdDiscount, in_CreditCardFee, in_ServiceFee, in_ActivityNo, in_ProductShelfNo\n" + + "\t, IN_PayOrganID, IN_CorrelationID\n" + + "INTO (:b0, :b1, :b2:b3, :b4:b5, :b6:b7, :b8:b9, :b10:b11, :b12:b13, :b14:b15, :b16:b17, :b18:b19, :b20:b21, :b22:b23, :b24:b25, :b26:b27, :b28:b29, :b30:b31, :b32:b33, :b34:b35, :b36:b37, :b38:b39, :b40:b41, :b42:b43, :b44:b45, :b46:b47, :b48:b49, :b50:b51, :b52:b53, :b54:b55, :b56:b57, :b58:b59, :b60:b61, :b62:b63, :b64:b65, :b66:b67, :b68:b69, :b70:b71, :b72:b73, :b74:b75, :b76:b77, :b78:b79, :b80:b81, :b82:b83, :b84:b85, :b86:b87, :b88:b89, :b90:b91, :b92:b93, :b94:b95, :b96:b97, :b98:b99, :b100:b101, :b102:b103, :b104:b105)\n" + + "FROM b2b_payment_ReconDetail\n" + "WHERE Recon_seq_id = :b106\n" + + "\tAND transaction_id = :b107", text); } System.out.println("Tables : " + visitor.getTables()); @@ -91,9 +90,10 @@ public void test_0() throws Exception { assertEquals(0, visitor.getOrderByColumns().size()); } + public void test_1() throws Exception { String sql = "select max(Request_Seq) into :b0:b1 from TrustBill where " - + "(((Acct_Home_City=:b2 and (Acct_Home_County=:b3 or :b3=0)) and Accounting_Period=:b5) and Trust_Method=:b6)"; + + "(((Acct_Home_City=:b2 and (Acct_Home_County=:b3 or :b3=0)) and Accounting_Period=:b5) and Trust_Method=:b6)"; OracleStatementParser parser = new OracleStatementParser(sql, SQLParserFeature.KeepComments); List statementList = parser.parseStatementList(); @@ -110,8 +110,8 @@ public void test_1() throws Exception { String text = SQLUtils.toOracleString(stmt); assertEquals("SELECT max(Request_Seq)\n" + "INTO :b0:b1\n" + "FROM TrustBill\n" - + "WHERE Acct_Home_City = :b2\n" + "\tAND (Acct_Home_County = :b3\n" + "\t\tOR :b3 = 0)\n" - + "\tAND Accounting_Period = :b5\n" + "\tAND Trust_Method = :b6", text); + + "WHERE Acct_Home_City = :b2\n" + "\tAND (Acct_Home_County = :b3\n" + "\t\tOR :b3 = 0)\n" + + "\tAND Accounting_Period = :b5\n" + "\tAND Trust_Method = :b6", text); } System.out.println("Tables : " + visitor.getTables()); @@ -127,19 +127,20 @@ public void test_1() throws Exception { assertEquals(0, visitor.getOrderByColumns().size()); } + public void test_2() throws Exception { String sql = "SELECT\n" + " Debtbill_item_id,\n" + " Home_City,\n" + " WriteOff_Status,\n" + " User_ID,\n" - + " Msisdn,\n" + " Home_County,\n" + " Brand_ID,\n" + " User_Type,\n" + " DebtBill_ID,\n" - + " TO_CHAR(Gen_Time, 'yyyymmddhh24miss'),\n" + " Bill_Type,\n" - + " TO_CHAR(Debting_Date, 'yyyymmdd'),\n" + " Sum_BillItem,\n" + " Detail_BillItem,\n" - + " TO_CHAR(Lagging_Start_Date, 'yyyymmdd'),\n" + " Amount_Debt,\n" + " Amount_Discount,\n" - + " Amount_WriteOff,\n" + " Lagging_Debt,\n" + " Lagging_WriteOff,\n" + " WriteOff_Type,\n" - + " TO_CHAR(WriteOff_Time, 'yyyymmddhh24miss'),\n" + " Acct_Home_City,\n" + " ACCOUNT_ID,\n" - + " SUBTOTAL_DETAILBILL_ID,\n" + " NVL(ACCT_HOME_COUNTY, (-1)),\n" - + " TO_CHAR(NVL(BILLCYCLE_INURE_DATE, TO_DATE(TO_CHAR(GEN_TIME, 'yyyymm'), 'yyyymm')), 'yyyymmdd'),\n" - + " NVL(BILLCYCLE_MONTH, (-1)),\n" + " NVL(Detailbill_Flag, 0)\n" - + "INTO :b0, :b1, :b2, :b3, :b4, :b5, :b6, :b7, :b8, :b9, :b10, :b11, :b12, :b13, :b14, :b15, :b16, :b17, :b18, :b19, :b20:b21, :b22:b23, :b24:b25, :b26:b27, :b28:b29, :b30, :b31, :b32, :b33\n" - + "FROM DebtBill_Item\n" + "WHERE ROWID = :b34"; + + " Msisdn,\n" + " Home_County,\n" + " Brand_ID,\n" + " User_Type,\n" + " DebtBill_ID,\n" + + " TO_CHAR(Gen_Time, 'yyyymmddhh24miss'),\n" + " Bill_Type,\n" + + " TO_CHAR(Debting_Date, 'yyyymmdd'),\n" + " Sum_BillItem,\n" + " Detail_BillItem,\n" + + " TO_CHAR(Lagging_Start_Date, 'yyyymmdd'),\n" + " Amount_Debt,\n" + " Amount_Discount,\n" + + " Amount_WriteOff,\n" + " Lagging_Debt,\n" + " Lagging_WriteOff,\n" + " WriteOff_Type,\n" + + " TO_CHAR(WriteOff_Time, 'yyyymmddhh24miss'),\n" + " Acct_Home_City,\n" + " ACCOUNT_ID,\n" + + " SUBTOTAL_DETAILBILL_ID,\n" + " NVL(ACCT_HOME_COUNTY, (-1)),\n" + + " TO_CHAR(NVL(BILLCYCLE_INURE_DATE, TO_DATE(TO_CHAR(GEN_TIME, 'yyyymm'), 'yyyymm')), 'yyyymmdd'),\n" + + " NVL(BILLCYCLE_MONTH, (-1)),\n" + " NVL(Detailbill_Flag, 0)\n" + + "INTO :b0, :b1, :b2, :b3, :b4, :b5, :b6, :b7, :b8, :b9, :b10, :b11, :b12, :b13, :b14, :b15, :b16, :b17, :b18, :b19, :b20:b21, :b22:b23, :b24:b25, :b26:b27, :b28:b29, :b30, :b31, :b32, :b33\n" + + "FROM DebtBill_Item\n" + "WHERE ROWID = :b34"; OracleStatementParser parser = new OracleStatementParser(sql, SQLParserFeature.KeepComments); List statementList = parser.parseStatementList(); @@ -156,17 +157,17 @@ public void test_2() throws Exception { String text = SQLUtils.toOracleString(stmt); assertEquals("SELECT Debtbill_item_id, Home_City, WriteOff_Status, User_ID, Msisdn\n" - + "\t, Home_County, Brand_ID, User_Type, DebtBill_ID\n" - + "\t, TO_CHAR(Gen_Time, 'yyyymmddhh24miss'), Bill_Type\n" - + "\t, TO_CHAR(Debting_Date, 'yyyymmdd'), Sum_BillItem\n" - + "\t, Detail_BillItem, TO_CHAR(Lagging_Start_Date, 'yyyymmdd'), Amount_Debt\n" - + "\t, Amount_Discount, Amount_WriteOff, Lagging_Debt, Lagging_WriteOff, WriteOff_Type\n" - + "\t, TO_CHAR(WriteOff_Time, 'yyyymmddhh24miss'), Acct_Home_City\n" - + "\t, ACCOUNT_ID, SUBTOTAL_DETAILBILL_ID, NVL(ACCT_HOME_COUNTY, -1)\n" - + "\t, TO_CHAR(NVL(BILLCYCLE_INURE_DATE, TO_DATE(TO_CHAR(GEN_TIME, 'yyyymm'), 'yyyymm')), 'yyyymmdd')\n" - + "\t, NVL(BILLCYCLE_MONTH, -1)\n" + "\t, NVL(Detailbill_Flag, 0)\n" - + "INTO (:b0, :b1, :b2, :b3, :b4, :b5, :b6, :b7, :b8, :b9, :b10, :b11, :b12, :b13, :b14, :b15, :b16, :b17, :b18, :b19, :b20:b21, :b22:b23, :b24:b25, :b26:b27, :b28:b29, :b30, :b31, :b32, :b33)\n" - + "FROM DebtBill_Item\n" + "WHERE ROWID = :b34", text); + + "\t, Home_County, Brand_ID, User_Type, DebtBill_ID\n" + + "\t, TO_CHAR(Gen_Time, 'yyyymmddhh24miss'), Bill_Type\n" + + "\t, TO_CHAR(Debting_Date, 'yyyymmdd'), Sum_BillItem\n" + + "\t, Detail_BillItem, TO_CHAR(Lagging_Start_Date, 'yyyymmdd'), Amount_Debt\n" + + "\t, Amount_Discount, Amount_WriteOff, Lagging_Debt, Lagging_WriteOff, WriteOff_Type\n" + + "\t, TO_CHAR(WriteOff_Time, 'yyyymmddhh24miss'), Acct_Home_City\n" + + "\t, ACCOUNT_ID, SUBTOTAL_DETAILBILL_ID, NVL(ACCT_HOME_COUNTY, -1)\n" + + "\t, TO_CHAR(NVL(BILLCYCLE_INURE_DATE, TO_DATE(TO_CHAR(GEN_TIME, 'yyyymm'), 'yyyymm')), 'yyyymmdd')\n" + + "\t, NVL(BILLCYCLE_MONTH, -1)\n" + "\t, NVL(Detailbill_Flag, 0)\n" + + "INTO (:b0, :b1, :b2, :b3, :b4, :b5, :b6, :b7, :b8, :b9, :b10, :b11, :b12, :b13, :b14, :b15, :b16, :b17, :b18, :b19, :b20:b21, :b22:b23, :b24:b25, :b26:b27, :b28:b29, :b30, :b31, :b32, :b33)\n" + + "FROM DebtBill_Item\n" + "WHERE ROWID = :b34", text); } System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest111.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest111.java index ae09ddd811..8706e37f98 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest111.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest111.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest111 extends OracleTest { - public void test_0() throws Exception { String sql = "select EFFECTIVE_START_DATE, EFFECTIVE_END_DATE, ASSIGNMENT_NUMBER, CONTRACT, substr(EMPLOYMENT_CATEGORY, 1, 200) EMPLOYMENT_CATEGORY, substr(GRADE, 1, 200) GRADE, INTERNAL_ADDRESS, substr(JOB, 1, 200) JOB, LAST_UPDATED_BY, LAST_UPDATE_DATE, LOCATION, MANAGER, NORMAL_END_TIME, NORMAL_HOURS, NORMAL_START_TIME, substr(ORGANIZATION, 1, 200) ORGANIZATION, PAYROLL, substr(PEOPLE_GROUP, 1, 200) PEOPLE_GROUP, substr(POSITION, 1, 200) POSITION, PRIMARY, PROBATION_END_DATE, PROBATION_PERIOD, substr(PROBATION_UNITS, 1, 200) PROBATION_UNITS, substr(REASON, 1, 200) REASON, substr(RECRUITER, 1, 200) RECRUITER, RECRUITMENT_ACTIVITY, SALARY_BASIS, SPECIAL_CEILING_POINT, substr(STATUS, 1, 200) STATUS, substr(STATUTORY_INFORMATION, 1, 200) STATUTORY_INFORMATION, substr(SUPERVISOR, 1, 200) SUPERVISOR, TITLE, VACANCY, substr(WORKING_HOURS_FREQUENCY, 1, 200) WORKING_HOURS_FREQUENCY from PER_ALL_ASSIGNMENTS_D where ASSIGNMENT_ID = 26587 order by effective_start_date desc"; @@ -44,23 +43,23 @@ public void test_0() throws Exception { String text = SQLUtils.toOracleString(stmt); assertEquals("SELECT EFFECTIVE_START_DATE, EFFECTIVE_END_DATE, ASSIGNMENT_NUMBER, CONTRACT\n" - + "\t, substr(EMPLOYMENT_CATEGORY, 1, 200) AS EMPLOYMENT_CATEGORY\n" - + "\t, substr(GRADE, 1, 200) AS GRADE\n" + "\t, INTERNAL_ADDRESS, substr(JOB, 1, 200) AS JOB\n" - + "\t, LAST_UPDATED_BY, LAST_UPDATE_DATE, LOCATION, MANAGER, NORMAL_END_TIME\n" - + "\t, NORMAL_HOURS, NORMAL_START_TIME\n" - + "\t, substr(ORGANIZATION, 1, 200) AS ORGANIZATION\n" - + "\t, PAYROLL, substr(PEOPLE_GROUP, 1, 200) AS PEOPLE_GROUP\n" - + "\t, substr(POSITION, 1, 200) AS POSITION\n" - + "\t, PRIMARY, PROBATION_END_DATE, PROBATION_PERIOD\n" - + "\t, substr(PROBATION_UNITS, 1, 200) AS PROBATION_UNITS\n" - + "\t, substr(REASON, 1, 200) AS REASON\n" + "\t, substr(RECRUITER, 1, 200) AS RECRUITER\n" - + "\t, RECRUITMENT_ACTIVITY, SALARY_BASIS, SPECIAL_CEILING_POINT\n" - + "\t, substr(STATUS, 1, 200) AS STATUS\n" - + "\t, substr(STATUTORY_INFORMATION, 1, 200) AS STATUTORY_INFORMATION\n" - + "\t, substr(SUPERVISOR, 1, 200) AS SUPERVISOR\n" + "\t, TITLE, VACANCY\n" - + "\t, substr(WORKING_HOURS_FREQUENCY, 1, 200) AS WORKING_HOURS_FREQUENCY\n" - + "FROM PER_ALL_ASSIGNMENTS_D\n" + "WHERE ASSIGNMENT_ID = 26587\n" - + "ORDER BY effective_start_date DESC", text); + + "\t, substr(EMPLOYMENT_CATEGORY, 1, 200) AS EMPLOYMENT_CATEGORY\n" + + "\t, substr(GRADE, 1, 200) AS GRADE\n" + "\t, INTERNAL_ADDRESS, substr(JOB, 1, 200) AS JOB\n" + + "\t, LAST_UPDATED_BY, LAST_UPDATE_DATE, LOCATION, MANAGER, NORMAL_END_TIME\n" + + "\t, NORMAL_HOURS, NORMAL_START_TIME\n" + + "\t, substr(ORGANIZATION, 1, 200) AS ORGANIZATION\n" + + "\t, PAYROLL, substr(PEOPLE_GROUP, 1, 200) AS PEOPLE_GROUP\n" + + "\t, substr(POSITION, 1, 200) AS POSITION\n" + + "\t, PRIMARY, PROBATION_END_DATE, PROBATION_PERIOD\n" + + "\t, substr(PROBATION_UNITS, 1, 200) AS PROBATION_UNITS\n" + + "\t, substr(REASON, 1, 200) AS REASON\n" + "\t, substr(RECRUITER, 1, 200) AS RECRUITER\n" + + "\t, RECRUITMENT_ACTIVITY, SALARY_BASIS, SPECIAL_CEILING_POINT\n" + + "\t, substr(STATUS, 1, 200) AS STATUS\n" + + "\t, substr(STATUTORY_INFORMATION, 1, 200) AS STATUTORY_INFORMATION\n" + + "\t, substr(SUPERVISOR, 1, 200) AS SUPERVISOR\n" + "\t, TITLE, VACANCY\n" + + "\t, substr(WORKING_HOURS_FREQUENCY, 1, 200) AS WORKING_HOURS_FREQUENCY\n" + + "FROM PER_ALL_ASSIGNMENTS_D\n" + "WHERE ASSIGNMENT_ID = 26587\n" + + "ORDER BY effective_start_date DESC", text); } System.out.println("Tables : " + visitor.getTables()); @@ -76,10 +75,11 @@ public void test_0() throws Exception { assertEquals(1, visitor.getOrderByColumns().size()); } + public void test_1() throws Exception { String sql = "SELECT instance_id\n" + "FROM JTF_FM_SERVICE_MONITOR\n" + "WHERE server_id = 5000\n" - + " AND health = 'A'\n" + " AND primary = 'Y'\n" - + " AND last_update_date >= (sysdate - (1 / 288))"; + + " AND health = 'A'\n" + " AND primary = 'Y'\n" + + " AND last_update_date >= (sysdate - (1 / 288))"; OracleStatementParser parser = new OracleStatementParser(sql, SQLParserFeature.KeepComments); List statementList = parser.parseStatementList(); @@ -95,11 +95,11 @@ public void test_1() throws Exception { String text = SQLUtils.toOracleString(stmt); assertEquals("SELECT instance_id\n" - + "FROM JTF_FM_SERVICE_MONITOR\n" - + "WHERE server_id = 5000\n" - + "\tAND health = 'A'\n" - + "\tAND primary = 'Y'\n" - + "\tAND last_update_date >= SYSDATE - 1 / 288", text); + + "FROM JTF_FM_SERVICE_MONITOR\n" + + "WHERE server_id = 5000\n" + + "\tAND health = 'A'\n" + + "\tAND primary = 'Y'\n" + + "\tAND last_update_date >= SYSDATE - 1 / 288", text); } System.out.println("Tables : " + visitor.getTables()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest112.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest112.java index bf2df5a335..5e982c7686 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest112.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest112.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest112 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT userid, idcardmult, organid FROM v_all_dyinfo WHERE (iscontact = :1 OR iscontact IS NULL) AND delflag = :2 AND zjhm = :3 AND dyzt NOT (?)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest113.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest113.java index c6799497fd..6b53dbe743 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest113.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest113.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest113 extends OracleTest { - public void test_0() throws Exception { String sql = "select zs,ybl,zs-ybl-wxbl wbl,wxbl,xzcs,xscs,dw dwid,pkg_unit.getDwmcById(dw)dwmc from ( select count(1)zs, count(case when l.tbbz = '1' then 1 end)ybl,count(case when l.tbbz = '3' then 1 end)wxbl,count(case when s.a_ajfl='10' and nvl(l.blsj,sysdate)-l.lrsj>1 and l.lrsj>to_date('20150713','yyyymmdd') and l.tbbz!='3' then 1end)xscs, count(case when s.a_ajfl='20' and nvl(l.blsj,sysdate)-l.lrsj>3 and l.lrsj>to_date('20150713','yyyymmdd') and l.tbbz!='3' then 1end)xzcs, substr(sys_dwdm, 0, 8)||'0000' dw from case_m_detail l,case_s_process s where l.a_ajbh=s.a_ajbh and l.sys_dwdm is not null and l.scbz = '0' and l.lrsj >= to_date('2018-01-17','yyyy-mm-dd') and l.lrsj <= to_date('2018-01-24 23:59','yyyy-mm-dd hh24:mi') and l.sys_dwdm like '331126%' group by substr(sys_dwdm, 0, 8)||'0000' ) order by dw"; @@ -94,5 +93,5 @@ public void test_0() throws Exception { assertEquals(1, visitor.getOrderByColumns().size()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest114.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest114.java index b89ee0acf8..d8e52087b9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest114.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest114.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest114 extends OracleTest { - public void test_0() throws Exception { String sql = "select ID AS A, \n" + " 'a' AS,\n" + @@ -65,5 +64,5 @@ public void test_0() throws Exception { assertEquals(0, visitor.getOrderByColumns().size()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest115.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest115.java index c64c3edbf9..e758413ab1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest115.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest115.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest115 extends OracleTest { - public void test_0() throws Exception { String sql = "select * from ( select row_.*, rownum rownum_ from ( select HYKY as HYKY,WHCD as WHCD,ZASD as ZASD,TX as TX,XZFS as XZFS,SSGAJGMC as SSGAJGMC,XZDX as XZDX,HJDDZQH as HJDDZQH,XX as XX,MZ as MZ,TSTX as TSTX,SJJZDDZQH as SJJZDDZQH,HDDQ as HDDQ,ZY as ZY,XZCS as XZCS,BMCH as BMCH,CSD as CSD,ZAGJ as ZAGJ,XB as XB,XZWP as XZWP,CSRQ as CSRQ,SSGAJGJGDM as SSGAJGJGDM,AJLB as AJLB,TBTSBJ as TBTSBJ,LX as LX,XP as XP, '' as from QQFW_ZYK.GZDX where (XM='忘轻春') ) row_ where rownum <= 5)"; @@ -73,5 +72,5 @@ public void test_0() throws Exception { assertEquals(0, visitor.getOrderByColumns().size()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest12.java index b6ec99ce14..6f8dbb09cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest12.java @@ -24,14 +24,13 @@ import java.util.List; public class OracleSelectTest12 extends OracleTest { - public void test_0() throws Exception { String sql = "select /*+ use_nl(b c) ordered */ count(*) " + // - " from (" + // - " select distinct parent_id parentId from BUSINESS_ORDER a1 " + // - " where SELLER_SEQ in ( ?) " + // - " and not (order_from = 'safepay' and status in ('buyer_create', 'closed')) " + // - " ) b, business_order c where ID = b.parentId"; // + " from (" + // + " select distinct parent_id parentId from BUSINESS_ORDER a1 " + // + " where SELLER_SEQ in ( ?) " + // + " and not (order_from = 'safepay' and status in ('buyer_create', 'closed')) " + // + " ) b, business_order c where ID = b.parentId"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest13.java index fa6e428c51..cb59ec4c15 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest13.java @@ -25,11 +25,10 @@ import java.util.List; public class OracleSelectTest13 extends OracleTest { - public void test_0() throws Exception { String sql = "select id, table_id, event_type, pk_data, transaction_id, ignore_node_cluster_id, gmt_create " - + " from retl_data_search" - + " where id>=50001 and id<52001 and GMT_CREATE between sysdate-2 and sysdate order by id"; // + + " from retl_data_search" + + " where id>=50001 and id<52001 and GMT_CREATE between sysdate-2 and sysdate order by id"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest14.java index d0961a25d4..91f7c9d679 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest14.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleSelectTest14 extends OracleTest { - public void test_0() throws Exception { String sql = "select /* EXEC_FROM_DBMS_XPLAN */ case when upper(sql_text) like '%DBMS_XPLAN%' then 0 else 1 end case, SQL_ID, child_number" - + " from v$sql where SQL_ID ='90jx354zd6jx5' and child_number =0"; // + + " from v$sql where SQL_ID ='90jx354zd6jx5' and child_number =0"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest15.java index 735a23a115..f80962ea1d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest15.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest15 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT CURRENT_TIMESTAMP(6) AT TIME ZONE 'PST' FROM \"DUAL\" \"A1\""; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest16.java index 0c7293d201..3803c6ff5a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest16.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest16 extends OracleTest { - public void test_0() throws Exception { String sql = "select privilege#,level from sysauth$ connect by grantee#=prior privilege# and privilege#>0 start with grantee#=:1 and privilege#>0"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest17.java index a06d2cee96..c9297f6b3d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest17.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest17 extends OracleTest { - public void test_0() throws Exception { String sql = "select /* EXEC_FROM_DBMS_XPLAN */ 1, prev_sql_id, prev_child_number from v$session where sid=userenv('sid') and username is not null and prev_hash_value <> 0 "; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest18.java index 08d15e4d33..4de65421d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest18.java @@ -25,22 +25,21 @@ import java.util.List; public class OracleSelectTest18 extends OracleTest { - public void test_0() throws Exception { String sql = // - "begin " + // - " select min(snap_id), max(snap_id), " + // - " to_char(max(begin_interval_time + 16/24), 'yyyy-mm-dd hh24:mi:ss')," + // - " to_char(max(end_interval_time + 16/24), 'yyyy-mm-dd hh24:mi:ss') " + // - " into :bid, :eid, :bst, :est " + // - " from (select snap_id, begin_interval_time, end_interval_time" + // - " from v$instance a,dba_hist_snapshot b" + // - " where a.INSTANCE_NUMBER=b.INSTANCE_NUMBER and begin_interval_time >= sysdate - 150/1440" + // - " order by snap_id desc" + // - " )" + // - " where rownum < 3; " + // - " select 'awr_'||:bid||'_'||:eid||'.html' into :awr from dual; " + // - "end;"; // + "begin " + // + " select min(snap_id), max(snap_id), " + // + " to_char(max(begin_interval_time + 16/24), 'yyyy-mm-dd hh24:mi:ss')," + // + " to_char(max(end_interval_time + 16/24), 'yyyy-mm-dd hh24:mi:ss') " + // + " into :bid, :eid, :bst, :est " + // + " from (select snap_id, begin_interval_time, end_interval_time" + // + " from v$instance a,dba_hist_snapshot b" + // + " where a.INSTANCE_NUMBER=b.INSTANCE_NUMBER and begin_interval_time >= sysdate - 150/1440" + // + " order by snap_id desc" + // + " )" + // + " where rownum < 3; " + // + " select 'awr_'||:bid||'_'||:eid||'.html' into :awr from dual; " + // + "end;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest19.java index 3b60c38947..8e5cd70a6f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest19.java @@ -25,20 +25,19 @@ import java.util.List; public class OracleSelectTest19 extends OracleTest { - public void test_0() throws Exception { String sql = // - "SELECT ddf.file_name file_name, vdf.status status, ddf.tablespace_name tablespace_name" + // - ", '', ddf.autoextensible autoextensible" + // - " , ddf.increment_by increment_by, ddf.maxbytes max_file_size, vdf.create_bytes " + // - "FROM sys.dba_data_files ddf, v$datafile vdf /*+ all_rows use_concat */ " + // - "WHERE (ddf.file_name = vdf.name) " + // - "UNION ALL " + // - "SELECT dtf.file_name file_name, vtf.status status, dtf.tablespace_name tablespace_name" + // - " , '', dtf.autoextensible autoextensible, dtf.increment_by increment_by" + // - " , dtf.maxbytes max_file_size, vtf.create_bytes " + // - "FROM sys.dba_temp_files dtf, v$tempfile vtf " + // - "WHERE (dtf.file_id = vtf.file#) "; // + "SELECT ddf.file_name file_name, vdf.status status, ddf.tablespace_name tablespace_name" + // + ", '', ddf.autoextensible autoextensible" + // + " , ddf.increment_by increment_by, ddf.maxbytes max_file_size, vdf.create_bytes " + // + "FROM sys.dba_data_files ddf, v$datafile vdf /*+ all_rows use_concat */ " + // + "WHERE (ddf.file_name = vdf.name) " + // + "UNION ALL " + // + "SELECT dtf.file_name file_name, vtf.status status, dtf.tablespace_name tablespace_name" + // + " , '', dtf.autoextensible autoextensible, dtf.increment_by increment_by" + // + " , dtf.maxbytes max_file_size, vtf.create_bytes " + // + "FROM sys.dba_temp_files dtf, v$tempfile vtf " + // + "WHERE (dtf.file_id = vtf.file#) "; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -62,8 +61,8 @@ public void test_0() throws Exception { Assert.assertEquals(17, visitor.getColumns().size()); - Assert.assertTrue(visitor.containsColumn("sys.dba_data_files", "file_name")); - Assert.assertTrue(visitor.containsColumn("v$datafile", "status")); - Assert.assertTrue(visitor.containsColumn("sys.dba_data_files", "tablespace_name")); + Assert.assertTrue(visitor.containsColumn("sys.dba_data_files", "file_name")); + Assert.assertTrue(visitor.containsColumn("v$datafile", "status")); + Assert.assertTrue(visitor.containsColumn("sys.dba_data_files", "tablespace_name")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest2.java index 6d470a7fde..15078bcf5a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest2.java @@ -26,21 +26,20 @@ import java.util.List; public class OracleSelectTest2 extends OracleTest { - public void test_0() throws Exception { String sql = "WITH " + // - " dept_costs AS (" + // - " SELECT d.department_name, SUM(d.salary) dept_total" + // - " FROM employees e, departments d" + // - " WHERE e.department_id = d.department_id" + // - " GROUP BY d.department_name)," + // - " avg_cost AS (" + // - " SELECT SUM(dept_total)/COUNT(*) avg" + // - " FROM dept_costs)" + // - "SELECT * FROM dept_costs" + // - " WHERE dept_total >" + // - " (SELECT avg FROM avg_cost)" + // - " ORDER BY department_name;"; + " dept_costs AS (" + // + " SELECT d.department_name, SUM(d.salary) dept_total" + // + " FROM employees e, departments d" + // + " WHERE e.department_id = d.department_id" + // + " GROUP BY d.department_name)," + // + " avg_cost AS (" + // + " SELECT SUM(dept_total)/COUNT(*) avg" + // + " FROM dept_costs)" + // + "SELECT * FROM dept_costs" + // + " WHERE dept_total >" + // + " (SELECT avg FROM avg_cost)" + // + " ORDER BY department_name;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -48,10 +47,10 @@ public void test_0() throws Exception { print(statementList); Assert.assertEquals(1, statementList.size()); - + String result = SQLUtils.toOracleString(stmt); String result_lcase = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - + Assert.assertEquals(result.toLowerCase(), result_lcase); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -63,7 +62,7 @@ public void test_0() throws Exception { System.out.println("relationships : " + visitor.getRelationships()); Assert.assertEquals(2, visitor.getTables().size()); - + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("departments"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest20.java index 8d95319a24..da14790826 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest20.java @@ -24,14 +24,13 @@ import java.util.List; public class OracleSelectTest20 extends OracleTest { - public void test_0() throws Exception { String sql = // - "BEGIN" + // - " sys.dbms_stats.gather_table_stats(" + // - " ownname => 'ESCROW',tabname => 'HT_TASK_TRADE_HISTORY',estimate_percent=>0.5, cascade => TRUE" + // - " ,method_opt=>'FOR ALL COLUMNS SIZE 1',no_invalidate => false); " + // - "END; "; // + "BEGIN" + // + " sys.dbms_stats.gather_table_stats(" + // + " ownname => 'ESCROW',tabname => 'HT_TASK_TRADE_HISTORY',estimate_percent=>0.5, cascade => TRUE" + // + " ,method_opt=>'FOR ALL COLUMNS SIZE 1',no_invalidate => false); " + // + "END; "; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest21.java index ab78bcd597..e44cf7a619 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest21.java @@ -26,25 +26,24 @@ import java.util.List; public class OracleSelectTest21 extends OracleTest { - public void test_0() throws Exception { String sql = // - "SELECT EVENT, WAITS, TIME, DECODE(WAITS, NULL, TO_NUMBER(NULL), 0, TO_NUMBER(NULL), TIME/WAITS*1000) AVGWT" + // - " , PCTWTT, WAIT_CLASS " + "FROM (SELECT EVENT, WAITS, TIME, PCTWTT, WAIT_CLASS " + // - " FROM (" + // - " SELECT E.EVENT_NAME EVENT, E.TOTAL_WAITS - NVL(B.TOTAL_WAITS,0) WAITS" + // - " , (E.TIME_WAITED_MICRO - NVL(B.TIME_WAITED_MICRO,0)) / 1000000 TIME" + // - " , 100 * (E.TIME_WAITED_MICRO - NVL(B.TIME_WAITED_MICRO,0)) / :B1 PCTWTT" + // - " , E.WAIT_CLASS WAIT_CLASS " + // - " FROM DBA_HIST_SYSTEM_EVENT B, DBA_HIST_SYSTEM_EVENT E " + // - " WHERE B.SNAP_ID(+) = :B5 AND E.SNAP_ID = :B4 AND B.DBID(+) = :B3 AND E.DBID = :B3 " + // - " AND B.INSTANCE_NUMBER(+) = :B2 AND E.INSTANCE_NUMBER = :B2 AND B.EVENT_ID(+) = E.EVENT_ID " + // - " AND E.TOTAL_WAITS > NVL(B.TOTAL_WAITS,0) AND E.WAIT_CLASS != 'Idle' " + // - " UNION ALL " + // - " SELECT 'CPU time' EVENT, TO_NUMBER(NULL) WAITS" + // - " , :B6 /1000000 TIME, 100 * :B6 / :B1 PCTWTT, NULL WAIT_CLASS FROM DUAL WHERE :B6 > 0" + // - ") ORDER BY TIME DESC, WAITS DESC) " + // - "WHERE ROWNUM <= :B7 "; // + "SELECT EVENT, WAITS, TIME, DECODE(WAITS, NULL, TO_NUMBER(NULL), 0, TO_NUMBER(NULL), TIME/WAITS*1000) AVGWT" + // + " , PCTWTT, WAIT_CLASS " + "FROM (SELECT EVENT, WAITS, TIME, PCTWTT, WAIT_CLASS " + // + " FROM (" + // + " SELECT E.EVENT_NAME EVENT, E.TOTAL_WAITS - NVL(B.TOTAL_WAITS,0) WAITS" + // + " , (E.TIME_WAITED_MICRO - NVL(B.TIME_WAITED_MICRO,0)) / 1000000 TIME" + // + " , 100 * (E.TIME_WAITED_MICRO - NVL(B.TIME_WAITED_MICRO,0)) / :B1 PCTWTT" + // + " , E.WAIT_CLASS WAIT_CLASS " + // + " FROM DBA_HIST_SYSTEM_EVENT B, DBA_HIST_SYSTEM_EVENT E " + // + " WHERE B.SNAP_ID(+) = :B5 AND E.SNAP_ID = :B4 AND B.DBID(+) = :B3 AND E.DBID = :B3 " + // + " AND B.INSTANCE_NUMBER(+) = :B2 AND E.INSTANCE_NUMBER = :B2 AND B.EVENT_ID(+) = E.EVENT_ID " + // + " AND E.TOTAL_WAITS > NVL(B.TOTAL_WAITS,0) AND E.WAIT_CLASS != 'Idle' " + // + " UNION ALL " + // + " SELECT 'CPU time' EVENT, TO_NUMBER(NULL) WAITS" + // + " , :B6 /1000000 TIME, 100 * :B6 / :B1 PCTWTT, NULL WAIT_CLASS FROM DUAL WHERE :B6 > 0" + // + ") ORDER BY TIME DESC, WAITS DESC) " + // + "WHERE ROWNUM <= :B7 "; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -74,7 +73,7 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getColumns().contains(new Column("DBA_HIST_SYSTEM_EVENT", "DBID"))); Assert.assertTrue(visitor.getColumns().contains(new Column("DBA_HIST_SYSTEM_EVENT", "WAIT_CLASS"))); Assert.assertTrue(visitor.getColumns().contains(new Column("DBA_HIST_SYSTEM_EVENT", "EVENT_ID"))); - + Assert.assertEquals(8, visitor.getColumns().size()); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "*"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest22.java index 60aa8001f2..7e56c4327e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest22.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleSelectTest22 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select /*+ no_parallel(t) no_parallel_index(t) dbms_stats cursor_sharing_exact use_weak_name_resl dynamic_sampling(0) no_monitoring */ count(*),sum(sys_op_opnsize(\"ID\")),substrb(dump(min(\"ID\"),16,0,32),1,120),substrb(dump(max(\"ID\"),16,0,32),1,120),count(distinct \"GMT_MODIFIED\"),substrb(dump(min(\"GMT_MODIFIED\"),16,0,32),1,120),substrb(dump(max(\"GMT_MODIFIED\"),16,0,32),1,120),count(distinct \"GMT_CREATE\"),substrb(dump(min(\"GMT_CREATE\"),16,0,32),1,120),substrb(dump(max(\"GMT_CREATE\"),16,0,32),1,120),count(\"TRADE_ID\"),count(distinct \"TRADE_ID\"),sum(sys_op_opnsize(\"TRADE_ID\")),substrb(dump(min(\"TRADE_ID\"),16,0,32),1,120),substrb(dump(max(\"TRADE_ID\"),16,0,32),1,120),count(\"STATUS\"),count(distinct \"STATUS\"),sum(sys_op_opnsize(\"STATUS\")),substrb(dump(min(substrb(\"STATUS\",1,32)),16,0,32),1,120),substrb(dump(max(substrb(\"STATUS\",1,32)),16,0,32),1,120),count(\"OWNER\"),count(distinct \"OWNER\"),sum(sys_op_opnsize(\"OWNER\")),substrb(dump(min(substrb(\"OWNER\",1,32)),16,0,32),1,120),substrb(dump(max(substrb(\"OWNER\",1,32)),16,0,32),1,120),count(\"GMT_FETCH_TASK\"),count(distinct \"GMT_FETCH_TASK\"),substrb(dump(min(\"GMT_FETCH_TASK\"),16,0,32),1,120),substrb(dump(max(\"GMT_FETCH_TASK\"),16,0,32),1,120),count(\"GMT_FINISH_TASK\"),count(distinct \"GMT_FINISH_TASK\"),substrb(dump(min(\"GMT_FINISH_TASK\"),16,0,32),1,120),substrb(dump(max(\"GMT_FINISH_TASK\"),16,0,32),1,120),count(\"VERSION\"),count(distinct \"VERSION\"),sum(sys_op_opnsize(\"VERSION\")),substrb(dump(min(\"VERSION\"),16,0,32),1,120),substrb(dump(max(\"VERSION\"),16,0,32),1,120),count(\"RECORD_TYPE\"),count(distinct \"RECORD_TYPE\"),sum(sys_op_opnsize(\"RECORD_TYPE\")),substrb(dump(min(substrb(\"RECORD_TYPE\",1,32)),16,0,32),1,120),substrb(dump(max(substrb(\"RECORD_TYPE\",1,32)),16,0,32),1,120),count(\"TASK_FLOW_LEVEL\"),count(distinct \"TASK_FLOW_LEVEL\"),sum(sys_op_opnsize(\"TASK_FLOW_LEVEL\")),substrb(dump(min(\"TASK_FLOW_LEVEL\"),16,0,32),1,120),substrb(dump(max(\"TASK_FLOW_LEVEL\"),16,0,32),1,120),count(\"DEAL_TYPE\"),count(distinct \"DEAL_TYPE\"),sum(sys_op_opnsize(\"DEAL_TYPE\")),substrb(dump(min(\"DEAL_TYPE\"),16,0,32),1,120),substrb(dump(max(\"DEAL_TYPE\"),16,0,32),1,120),count(\"END_REASON\"),count(distinct \"END_REASON\"),sum(sys_op_opnsize(\"END_REASON\")),substrb(dump(min(\"END_REASON\"),16,0,32),1,120),substrb(dump(max(\"END_REASON\"),16,0,32),1,120),count(\"TRANSIT_TIME\"),count(distinct \"TRANSIT_TIME\"),sum(sys_op_opnsize(\"TRANSIT_TIME\")),substrb(dump(min(\"TRANSIT_TIME\"),16,0,32),1,120),substrb(dump(max(\"TRANSIT_TIME\"),16,0,32),1,120) from \"ESCROW\".\"HT_TASK_TRADE_HISTORY\" sample ( .5000000000) t "; // + "select /*+ no_parallel(t) no_parallel_index(t) dbms_stats cursor_sharing_exact use_weak_name_resl dynamic_sampling(0) no_monitoring */ count(*),sum(sys_op_opnsize(\"ID\")),substrb(dump(min(\"ID\"),16,0,32),1,120),substrb(dump(max(\"ID\"),16,0,32),1,120),count(distinct \"GMT_MODIFIED\"),substrb(dump(min(\"GMT_MODIFIED\"),16,0,32),1,120),substrb(dump(max(\"GMT_MODIFIED\"),16,0,32),1,120),count(distinct \"GMT_CREATE\"),substrb(dump(min(\"GMT_CREATE\"),16,0,32),1,120),substrb(dump(max(\"GMT_CREATE\"),16,0,32),1,120),count(\"TRADE_ID\"),count(distinct \"TRADE_ID\"),sum(sys_op_opnsize(\"TRADE_ID\")),substrb(dump(min(\"TRADE_ID\"),16,0,32),1,120),substrb(dump(max(\"TRADE_ID\"),16,0,32),1,120),count(\"STATUS\"),count(distinct \"STATUS\"),sum(sys_op_opnsize(\"STATUS\")),substrb(dump(min(substrb(\"STATUS\",1,32)),16,0,32),1,120),substrb(dump(max(substrb(\"STATUS\",1,32)),16,0,32),1,120),count(\"OWNER\"),count(distinct \"OWNER\"),sum(sys_op_opnsize(\"OWNER\")),substrb(dump(min(substrb(\"OWNER\",1,32)),16,0,32),1,120),substrb(dump(max(substrb(\"OWNER\",1,32)),16,0,32),1,120),count(\"GMT_FETCH_TASK\"),count(distinct \"GMT_FETCH_TASK\"),substrb(dump(min(\"GMT_FETCH_TASK\"),16,0,32),1,120),substrb(dump(max(\"GMT_FETCH_TASK\"),16,0,32),1,120),count(\"GMT_FINISH_TASK\"),count(distinct \"GMT_FINISH_TASK\"),substrb(dump(min(\"GMT_FINISH_TASK\"),16,0,32),1,120),substrb(dump(max(\"GMT_FINISH_TASK\"),16,0,32),1,120),count(\"VERSION\"),count(distinct \"VERSION\"),sum(sys_op_opnsize(\"VERSION\")),substrb(dump(min(\"VERSION\"),16,0,32),1,120),substrb(dump(max(\"VERSION\"),16,0,32),1,120),count(\"RECORD_TYPE\"),count(distinct \"RECORD_TYPE\"),sum(sys_op_opnsize(\"RECORD_TYPE\")),substrb(dump(min(substrb(\"RECORD_TYPE\",1,32)),16,0,32),1,120),substrb(dump(max(substrb(\"RECORD_TYPE\",1,32)),16,0,32),1,120),count(\"TASK_FLOW_LEVEL\"),count(distinct \"TASK_FLOW_LEVEL\"),sum(sys_op_opnsize(\"TASK_FLOW_LEVEL\")),substrb(dump(min(\"TASK_FLOW_LEVEL\"),16,0,32),1,120),substrb(dump(max(\"TASK_FLOW_LEVEL\"),16,0,32),1,120),count(\"DEAL_TYPE\"),count(distinct \"DEAL_TYPE\"),sum(sys_op_opnsize(\"DEAL_TYPE\")),substrb(dump(min(\"DEAL_TYPE\"),16,0,32),1,120),substrb(dump(max(\"DEAL_TYPE\"),16,0,32),1,120),count(\"END_REASON\"),count(distinct \"END_REASON\"),sum(sys_op_opnsize(\"END_REASON\")),substrb(dump(min(\"END_REASON\"),16,0,32),1,120),substrb(dump(max(\"END_REASON\"),16,0,32),1,120),count(\"TRANSIT_TIME\"),count(distinct \"TRANSIT_TIME\"),sum(sys_op_opnsize(\"TRANSIT_TIME\")),substrb(dump(min(\"TRANSIT_TIME\"),16,0,32),1,120),substrb(dump(max(\"TRANSIT_TIME\"),16,0,32),1,120) from \"ESCROW\".\"HT_TASK_TRADE_HISTORY\" sample ( .5000000000) t "; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,6 +51,6 @@ public void test_0() throws Exception { Assert.assertEquals(15, visitor.getColumns().size()); - Assert.assertTrue(visitor.containsColumn("ESCROW.HT_TASK_TRADE_HISTORY", "*")); + Assert.assertTrue(visitor.containsColumn("ESCROW.HT_TASK_TRADE_HISTORY", "*")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest23.java index 1b5976423f..fdbaaf0ceb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest23.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleSelectTest23 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select (select decode(count(*),1,'YES','NO') FROM sys.obj$ o, sys.user$ u WHERE u.name = 'PERFSTAT' AND o.owner# = u.user# AND o.name = 'STATSPACK' AND o.type# = 11 AND o.status = 1) is_installed , (select nvl(INTERVAL,'') from dba_jobs where what like 'statspack.snap%' and SCHEMA_USER='PERFSTAT' and rownum =1) freq from dual"; // + "select (select decode(count(*),1,'YES','NO') FROM sys.obj$ o, sys.user$ u WHERE u.name = 'PERFSTAT' AND o.owner# = u.user# AND o.name = 'STATSPACK' AND o.type# = 11 AND o.status = 1) is_installed , (select nvl(INTERVAL,'') from dba_jobs where what like 'statspack.snap%' and SCHEMA_USER='PERFSTAT' and rownum =1) freq from dual"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -54,7 +53,7 @@ public void test_0() throws Exception { Assert.assertEquals(9, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys.user$", "name"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("sys.user$", "name"))); // 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/select/OracleSelectTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest24.java index 2dca3921ad..9a5456558e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest24.java @@ -26,15 +26,14 @@ import java.util.List; public class OracleSelectTest24 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select /*+ no_parallel_index(t, \"HT_TASK_TRADE_HIS_GOR_IND \") dbms_stats cursor_sharing_exact use_weak_name_resl dynamic_sampling(0) no_monitoring no_expand index_ffs(t, \"HT_TASK_TRADE_HIS_GOR_IND \") */ count(*) as nrw,count(distinct sys_op_lbid(196675,'L',t.rowid)) as nlb,count(distinct hextoraw(sys_op_descend( \"GMT_MODIFIED \")||sys_op_descend( \"OWNER \")||sys_op_descend( \"RECORD_TYPE \"))) as ndk,sys_op_countchg(substrb(t.rowid,1,15),1) as clf from \"ESCROW\". \"HT_TASK_TRADE_HISTORY\" sample block ( 34.6426417370,1) t where \"GMT_MODIFIED \" is not null or \"OWNER \" is not null or \"RECORD_TYPE \" is not null"; // + "select /*+ no_parallel_index(t, \"HT_TASK_TRADE_HIS_GOR_IND \") dbms_stats cursor_sharing_exact use_weak_name_resl dynamic_sampling(0) no_monitoring no_expand index_ffs(t, \"HT_TASK_TRADE_HIS_GOR_IND \") */ count(*) as nrw,count(distinct sys_op_lbid(196675,'L',t.rowid)) as nlb,count(distinct hextoraw(sys_op_descend( \"GMT_MODIFIED \")||sys_op_descend( \"OWNER \")||sys_op_descend( \"RECORD_TYPE \"))) as ndk,sys_op_countchg(substrb(t.rowid,1,15),1) as clf from \"ESCROW\". \"HT_TASK_TRADE_HISTORY\" sample block ( 34.6426417370,1) t where \"GMT_MODIFIED \" is not null or \"OWNER \" is not null or \"RECORD_TYPE \" is not null"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + String output = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); System.out.println(output); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest25.java index 5e080fffe2..70d3124cf4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest25.java @@ -24,10 +24,9 @@ import java.util.List; public class OracleSelectTest25 extends OracleTest { - public void test_0() throws Exception { String sql = // - "SELECT NULL FROM DUAL FOR UPDATE NOWAIT"; // + "SELECT NULL FROM DUAL FOR UPDATE NOWAIT"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest26.java index 427aafae89..f8de114c32 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest26.java @@ -25,17 +25,16 @@ import java.util.List; public class OracleSelectTest26 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select * from ( select rownum rnm, z.* from (select " + - " o.id,o.gmt_create as \"gm_create\",o.country as \"country\",o.status as \"status\"," + - " o.logistics_company as \"company\",o.type as \"type\",o.freight/100 as \"feight\"," + - " d.gmt_create as \"gm_create_1\",d.logistics_company as \"company_1\",d.package_num as \" \",d.declare_amount as \" \"," + - " i.gmt_stockin as \" \",i.package_amount as \" \",i.weight as \" \"," + - " u.gmt_create as \" \",u.logistics_company as \" \",u.package_amount as \" \"" + - " from wl_wh_order o left join wl_domestic_send d on d.wh_order_id=o.id left join wl_wh_in i on i.wh_order_id=o.id left join wl_wh_out u on u.out_order_id=o.id" + - " where o.id=100120667) z where rownum < :1 ) where rnm >= :2 "; + "select * from ( select rownum rnm, z.* from (select " + + " o.id,o.gmt_create as \"gm_create\",o.country as \"country\",o.status as \"status\"," + + " o.logistics_company as \"company\",o.type as \"type\",o.freight/100 as \"feight\"," + + " d.gmt_create as \"gm_create_1\",d.logistics_company as \"company_1\",d.package_num as \" \",d.declare_amount as \" \"," + + " i.gmt_stockin as \" \",i.package_amount as \" \",i.weight as \" \"," + + " u.gmt_create as \" \",u.logistics_company as \" \",u.package_amount as \" \"" + + " from wl_wh_order o left join wl_domestic_send d on d.wh_order_id=o.id left join wl_wh_in i on i.wh_order_id=o.id left join wl_wh_out u on u.out_order_id=o.id" + + " where o.id=100120667) z where rownum < :1 ) where rnm >= :2 "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest27.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest27.java index e05eb5296b..570f260976 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest27.java @@ -25,12 +25,11 @@ import java.util.List; public class OracleSelectTest27 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select object_id tab_id_noprint , -9999999 col_id_noprint " + // - ", 'table '||lower(owner)||' '||object_id||' '||lower(object_name)||' '||y.tid from dba_objects x" + // - ", search.retl_table_config_search y where object_type='TABLE' and x.owner=upper(case when instr(y.TSCHEMA,'|',1,1)>0 then substr(y.TSCHEMA,1,instr(y.TSCHEMA,'|',1,1)-1) else y.TSCHEMA end) and x.object_name=upper(y.TNAME) and ( owner not in ('SYS','SYSTEM','OUTLN','PUBLIC','WMSYS') or ( owner in ('SYS') and object_name in ('TAB$','OBJ$','COL$','CCOL$','CDEF$') ) ) union all select g.object_id as tab_id_noprint, g.column_id as tab_id_noprint , 'column '||g.column_id||' '||g.data_type||' '||g.data_length ||' '||decode(h.column_name,null ,0 ,1)||' '||lower(g.column_name) from ( select a.object_id ,a.owner, a.object_name as table_name, b.name as column_name ,b.segcol# as column_id, b.type# as data_type, b.segcollength as data_length from dba_objects a ,sys.col$ b ,search.retl_table_config_search g where a.object_id=b.obj# and a.object_type='TABLE' and a.owner=upper(case when instr(g.TSCHEMA,'|',1,1)>0 then substr(g.TSCHEMA,1,instr(g.TSCHEMA,'|',1,1)-1) else g.TSCHEMA end) and a.object_name=upper(g.TNAME) and b.segcol#!=0 and ( owner not in ('SYS','SYSTEM','OUTLN','PUBLIC','WMSYS') or ( owner in ('SYS') and a.object_name in ('TAB$','OBJ$','COL$','CCOL$','CDEF$') ) ) ) g, ( select upper(case when instr(TSCHEMA,'|',1,1)>0 then substr(TSCHEMA,1,instr(TSCHEMA,'|',1,1)-1) else TSCHEMA end) as owner, upper(a.tname) as table_name, upper(b.COLUMN_VALUE) as column_name from search.retl_table_config_search a, table(cast(erosazm.str2varlist(a.pks) as erosazm.vartabletype)) b ) h where g.owner=h.owner(+) and g.table_name=h.table_name(+) and g.column_name=h.column_name(+) order by tab_id_noprint,col_id_noprint"; + "select object_id tab_id_noprint , -9999999 col_id_noprint " + // + ", 'table '||lower(owner)||' '||object_id||' '||lower(object_name)||' '||y.tid from dba_objects x" + // + ", search.retl_table_config_search y where object_type='TABLE' and x.owner=upper(case when instr(y.TSCHEMA,'|',1,1)>0 then substr(y.TSCHEMA,1,instr(y.TSCHEMA,'|',1,1)-1) else y.TSCHEMA end) and x.object_name=upper(y.TNAME) and ( owner not in ('SYS','SYSTEM','OUTLN','PUBLIC','WMSYS') or ( owner in ('SYS') and object_name in ('TAB$','OBJ$','COL$','CCOL$','CDEF$') ) ) union all select g.object_id as tab_id_noprint, g.column_id as tab_id_noprint , 'column '||g.column_id||' '||g.data_type||' '||g.data_length ||' '||decode(h.column_name,null ,0 ,1)||' '||lower(g.column_name) from ( select a.object_id ,a.owner, a.object_name as table_name, b.name as column_name ,b.segcol# as column_id, b.type# as data_type, b.segcollength as data_length from dba_objects a ,sys.col$ b ,search.retl_table_config_search g where a.object_id=b.obj# and a.object_type='TABLE' and a.owner=upper(case when instr(g.TSCHEMA,'|',1,1)>0 then substr(g.TSCHEMA,1,instr(g.TSCHEMA,'|',1,1)-1) else g.TSCHEMA end) and a.object_name=upper(g.TNAME) and b.segcol#!=0 and ( owner not in ('SYS','SYSTEM','OUTLN','PUBLIC','WMSYS') or ( owner in ('SYS') and a.object_name in ('TAB$','OBJ$','COL$','CCOL$','CDEF$') ) ) ) g, ( select upper(case when instr(TSCHEMA,'|',1,1)>0 then substr(TSCHEMA,1,instr(TSCHEMA,'|',1,1)-1) else TSCHEMA end) as owner, upper(a.tname) as table_name, upper(b.COLUMN_VALUE) as column_name from search.retl_table_config_search a, table(cast(erosazm.str2varlist(a.pks) as erosazm.vartabletype)) b ) h where g.owner=h.owner(+) and g.table_name=h.table_name(+) and g.column_name=h.column_name(+) order by tab_id_noprint,col_id_noprint"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -57,8 +56,8 @@ public void test_0() throws Exception { Assert.assertEquals(17, visitor.getColumns().size()); - Assert.assertTrue(visitor.containsColumn("search.retl_table_config_search", "tid")); - Assert.assertTrue(visitor.containsColumn("dba_objects", "owner")); - Assert.assertTrue(visitor.containsColumn("search.retl_table_config_search", "TSCHEMA")); + Assert.assertTrue(visitor.containsColumn("search.retl_table_config_search", "tid")); + Assert.assertTrue(visitor.containsColumn("dba_objects", "owner")); + Assert.assertTrue(visitor.containsColumn("search.retl_table_config_search", "TSCHEMA")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest28.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest28.java index 7901c07cff..8814b24207 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest28.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleSelectTest28 extends OracleTest { - public void test_0() throws Exception { String sql = // - "SELECT /*+ ORDERED USE_NL ( \"A1 \") USE_NL ( \"A2 \") USE_NL ( \"A3 \") */ \"A3 \". \"AP_PAY_TIME \", \"A2 \". \"ORDER_ID \", \"A3 \". \"AP_PAY_AMT \", \"A1 \". \"COUNTRY \" FROM \"ESCROW\". \"TRADE_PAY\" \"A3 \", \"ESCROW\". \"ESCROW_TRADE\" \"A2 \", \"ESCROW\". \"BUSINESS_ORDER\" \"A1 \" WHERE \"A3 \". \"TRADE_ID \"= \"A2 \". \"ID \" AND \"A1 \". \"ID \"(+)=TO_NUMBER( \"A2 \". \"OUT_ORDER_ID \") AND \"A2 \". \"ORDER_FROM \"='wholesale_order' AND \"A3 \". \"AP_PAY_TIME \">=:1-.003819444444444444444444444444444444444444 AND \"A3 \". \"AP_PAY_TIME \">=TRUNC(:2)"; + "SELECT /*+ ORDERED USE_NL ( \"A1 \") USE_NL ( \"A2 \") USE_NL ( \"A3 \") */ \"A3 \". \"AP_PAY_TIME \", \"A2 \". \"ORDER_ID \", \"A3 \". \"AP_PAY_AMT \", \"A1 \". \"COUNTRY \" FROM \"ESCROW\". \"TRADE_PAY\" \"A3 \", \"ESCROW\". \"ESCROW_TRADE\" \"A2 \", \"ESCROW\". \"BUSINESS_ORDER\" \"A1 \" WHERE \"A3 \". \"TRADE_ID \"= \"A2 \". \"ID \" AND \"A1 \". \"ID \"(+)=TO_NUMBER( \"A2 \". \"OUT_ORDER_ID \") AND \"A2 \". \"ORDER_FROM \"='wholesale_order' AND \"A3 \". \"AP_PAY_TIME \">=:1-.003819444444444444444444444444444444444444 AND \"A3 \". \"AP_PAY_TIME \">=TRUNC(:2)"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest29.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest29.java index 17350464ab..c91a29b6ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest29.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleSelectTest29 extends OracleTest { - public void test_0() throws Exception { String sql = // - "(select id,super_category_id_1 from category where super_category_id_1 is not null and super_category_id_1 != '-1') union (select id,super_category_id_2 from category where super_category_id_2 is not null and super_category_id_2 != '-1') union (select id,super_category_id_3 from category where super_category_id_3 is not null and super_category_id_3 != '-1') union (select id,super_category_id_4 from category where super_category_id_4 is not null and super_category_id_4 != '-1') union (select id,super_category_id_5 from category where super_category_id_5 is not null and super_category_id_5 != '-1')"; + "(select id,super_category_id_1 from category where super_category_id_1 is not null and super_category_id_1 != '-1') union (select id,super_category_id_2 from category where super_category_id_2 is not null and super_category_id_2 != '-1') union (select id,super_category_id_3 from category where super_category_id_3 is not null and super_category_id_3 != '-1') union (select id,super_category_id_4 from category where super_category_id_4 is not null and super_category_id_4 != '-1') union (select id,super_category_id_5 from category where super_category_id_5 is not null and super_category_id_5 != '-1')"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest3.java index 696d987442..27da4194ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest3.java @@ -25,14 +25,13 @@ import java.util.List; public class OracleSelectTest3 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT department_id, last_name, salary " + // - " FROM employees x " + // - " WHERE salary > (SELECT AVG(salary) " + // - " FROM employees " + // - " WHERE x.department_id = department_id) " + // - " ORDER BY department_id; "; + " FROM employees x " + // + " WHERE salary > (SELECT AVG(salary) " + // + " FROM employees " + // + " WHERE x.department_id = department_id) " + // + " ORDER BY department_id; "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest30.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest30.java index 991f1d0d42..869f443adb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest30.java @@ -25,21 +25,20 @@ import java.util.List; public class OracleSelectTest30 extends OracleTest { - public void test_0() throws Exception { String sql = // - "SELECT " - + // - "/* OPT_DYN_SAMP */ " - + // - "/*+ ALL_ROWS IGNORE_WHERE_CLAUSE NO_PARALLEL(SAMPLESUB) opt_param('parallel_execution_enabled', 'false') NO_PARALLEL_INDEX(SAMPLESUB) NO_SQL_TUNE */ " // - + "NVL(SUM(C1),:\"SYS_B_0\"), NVL(SUM(C2),:\"SYS_B_1\") " - + // - "FROM (SELECT " - + // - " /*+ NO_PARALLEL(\"IPAY_ACCOUNT_FUND_RCD\") FULL(\"IPAY_ACCOUNT_FUND_RCD\") NO_PARALLEL_INDEX(\"IPAY_ACCOUNT_FUND_RCD\") */ " - + // - ":\"SYS_B_2\" AS C1, :\"SYS_B_3\" AS C2 FROM \"ESCROW\".\"IPAY_ACCOUNT_FUND_RCD\" SAMPLE BLOCK (:\"SYS_B_4\" , :\"SYS_B_5\") SEED (:\"SYS_B_6\") \"IPAY_ACCOUNT_FUND_RCD\") SAMPLESUB"; + "SELECT " + + // + "/* OPT_DYN_SAMP */ " + + // + "/*+ ALL_ROWS IGNORE_WHERE_CLAUSE NO_PARALLEL(SAMPLESUB) opt_param('parallel_execution_enabled', 'false') NO_PARALLEL_INDEX(SAMPLESUB) NO_SQL_TUNE */ " // + + "NVL(SUM(C1),:\"SYS_B_0\"), NVL(SUM(C2),:\"SYS_B_1\") " + + // + "FROM (SELECT " + + // + " /*+ NO_PARALLEL(\"IPAY_ACCOUNT_FUND_RCD\") FULL(\"IPAY_ACCOUNT_FUND_RCD\") NO_PARALLEL_INDEX(\"IPAY_ACCOUNT_FUND_RCD\") */ " + + // + ":\"SYS_B_2\" AS C1, :\"SYS_B_3\" AS C2 FROM \"ESCROW\".\"IPAY_ACCOUNT_FUND_RCD\" SAMPLE BLOCK (:\"SYS_B_4\" , :\"SYS_B_5\") SEED (:\"SYS_B_6\") \"IPAY_ACCOUNT_FUND_RCD\") SAMPLESUB"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest31.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest31.java index 5b8ed131cd..0ca87b69ad 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest31.java @@ -25,15 +25,14 @@ import java.util.List; public class OracleSelectTest31 extends OracleTest { - public void test_0() throws Exception { String sql = // - "SELECT e1.last_name FROM employees e1" + // - " WHERE f(" + // - " CURSOR(SELECT e2.hire_date FROM employees e2" + // - " WHERE e1.employee_id = e2.manager_id)," + // - " e1.hire_date) = 1" + // - " ORDER BY last_name;"; // + "SELECT e1.last_name FROM employees e1" + // + " WHERE f(" + // + " CURSOR(SELECT e2.hire_date FROM employees e2" + // + " WHERE e1.employee_id = e2.manager_id)," + // + " e1.hire_date) = 1" + // + " ORDER BY last_name;"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -58,11 +57,11 @@ public void test_0() throws Exception { Assert.assertEquals(4, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "last_name"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "hire_date"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "manager_id"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); - - Assert.assertTrue(visitor.getOrderByColumns().contains(new TableStat.Column("employees", "last_name"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "last_name"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "hire_date"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "manager_id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); + + Assert.assertTrue(visitor.getOrderByColumns().contains(new TableStat.Column("employees", "last_name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest32.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest32.java index 582c0bd073..1364b1382f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest32.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleSelectTest32 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select * from ESCROW_LOGISTICS t -- where received_status <>'not_received ' and received_status <>'received' "; // + "select * from ESCROW_LOGISTICS t -- where received_status <>'not_received ' and received_status <>'received' "; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,8 +51,8 @@ public void test_0() throws Exception { Assert.assertEquals(1, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("ESCROW_LOGISTICS", "*"))); - + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("ESCROW_LOGISTICS", "*"))); + // Assert.assertTrue(visitor.getOrderByColumns().contains(new TableStat.Column("employees", "last_name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest33.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest33.java index 16e5a4608a..922a661855 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest33.java @@ -25,12 +25,11 @@ import java.util.List; public class OracleSelectTest33 extends OracleTest { - public void test_0() throws Exception { String sql = // - "SELECT /*+ Q1647000 NO_EXPAND ROWID(A1) */ " + // - "A1.\"PRODUCT_ID\",A1.\"SUMMARY\",A1.\"DESCRIPTION\",A1.\"DESCRIPTION2\" " + // - "FROM \"ALIBABA1949\".\"WS_PRODUCT_DETAIL\" A1"; // + "SELECT /*+ Q1647000 NO_EXPAND ROWID(A1) */ " + // + "A1.\"PRODUCT_ID\",A1.\"SUMMARY\",A1.\"DESCRIPTION\",A1.\"DESCRIPTION2\" " + // + "FROM \"ALIBABA1949\".\"WS_PRODUCT_DETAIL\" A1"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,7 +54,7 @@ public void test_0() throws Exception { Assert.assertEquals(4, visitor.getColumns().size()); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("ESCROW_LOGISTICS", "*"))); - + // Assert.assertTrue(visitor.getOrderByColumns().contains(new TableStat.Column("employees", "last_name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest34.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest34.java index d92cdc6850..9d13ae7746 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest34.java @@ -25,23 +25,22 @@ import java.util.List; public class OracleSelectTest34 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select t.logistics_no, t.event_date, t.country, t.province" + // - " , t.city,t.address, t.area_code,t.received_status " + // - "from wl_tracking t " + // - "where t.logistics_no in ( " + // - " select el.logistics_no " + // - " from escrow_logistics el" + // - " where rownum <= 20" + // - " and el.gmt_send between to_date ('2011-9-1', 'yyyy-mm-dd') " + // - " and to_date ('2011-11-30 23:59:59','yyyy-mm-dd hh24:mi:ss')" + // - " and el.received_status = 'received'" + // - " and el.goods_direction = 'send_goods'" + // - " and el.country = 'US'" + // - " and el.logistics_company in ('Hongkong Post Air Mail','Hongkong Post Air Parcel','China Post Air Mail','China Post Air Parcel')" + - " and el.recv_status_desc is null) and t.event_date is not null order by t.logistics_no, t.event_date"; // + "select t.logistics_no, t.event_date, t.country, t.province" + // + " , t.city,t.address, t.area_code,t.received_status " + // + "from wl_tracking t " + // + "where t.logistics_no in ( " + // + " select el.logistics_no " + // + " from escrow_logistics el" + // + " where rownum <= 20" + // + " and el.gmt_send between to_date ('2011-9-1', 'yyyy-mm-dd') " + // + " and to_date ('2011-11-30 23:59:59','yyyy-mm-dd hh24:mi:ss')" + // + " and el.received_status = 'received'" + // + " and el.goods_direction = 'send_goods'" + // + " and el.country = 'US'" + // + " and el.logistics_company in ('Hongkong Post Air Mail','Hongkong Post Air Parcel','China Post Air Mail','China Post Air Parcel')" + + " and el.recv_status_desc is null) and t.event_date is not null order by t.logistics_no, t.event_date"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,7 +51,7 @@ public void test_0() throws Exception { OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statemen.accept(visitor); - + System.out.println("Tables : " + visitor.getTables()); System.out.println("fields : " + visitor.getColumns()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest35.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest35.java index db06740674..32b0e30c8d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest35.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest35.java @@ -25,15 +25,14 @@ import java.util.List; public class OracleSelectTest35 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select typefuncti0_.id as id104_, typefuncti0_.function_id as function2_104_, " + // - "typefuncti0_.in_container as in3_104_, typefuncti0_.inherited as inherited104_," + // - "typefuncti0_.overriding as overriding104_, typefuncti0_.sn as sn104_, " + // - "typefuncti0_.type_id as type7_104_ from com_function_ontype typefuncti0_ cross " + // - " join com_function function1_ where typefuncti0_.function_id=function1_.id " + // - "and (typefuncti0_.type_id in (? , ? , ? , ?)) and function1_.code=?"; // + "select typefuncti0_.id as id104_, typefuncti0_.function_id as function2_104_, " + // + "typefuncti0_.in_container as in3_104_, typefuncti0_.inherited as inherited104_," + // + "typefuncti0_.overriding as overriding104_, typefuncti0_.sn as sn104_, " + // + "typefuncti0_.type_id as type7_104_ from com_function_ontype typefuncti0_ cross " + // + " join com_function function1_ where typefuncti0_.function_id=function1_.id " + // + "and (typefuncti0_.type_id in (? , ? , ? , ?)) and function1_.code=?"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest36.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest36.java index 5441b9f128..fc9424d800 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest36.java @@ -31,16 +31,15 @@ import java.util.List; public class OracleSelectTest36 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select ID,name from fastsql_test where (name>=? or name is null) and card_id=? or name is null) and card_id statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); print(statementList); - + String result = SQLUtils.toOracleString(stmt); String result_lcase = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("SELECT ID, name" @@ -48,25 +47,25 @@ public void test_0() throws Exception { + "\nWHERE (name >= ?" + "\n\t\tOR name IS NULL)" + "\n\tAND card_id < ?", result); - + Assert.assertEquals("select ID, name" + "\nfrom fastsql_test" + "\nwhere (name >= ?" + "\n\t\tor name is null)" + "\n\tand card_id < ?", result_lcase); - + { SQLSelect select = ((SQLSelectStatement) stmt).getSelect(); SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) select.getQuery(); SQLBinaryOpExpr where = (SQLBinaryOpExpr) queryBlock.getWhere(); Assert.assertEquals(SQLBinaryOperator.BooleanAnd, where.getOperator()); - + SQLBinaryOpExpr left = (SQLBinaryOpExpr) where.getLeft(); Assert.assertEquals(SQLBinaryOperator.BooleanOr, left.getOperator()); - + SQLBinaryOpExpr nameGTEQ = (SQLBinaryOpExpr) left.getLeft(); Assert.assertEquals(SQLBinaryOperator.GreaterThanOrEqual, nameGTEQ.getOperator()); - + SQLBinaryOpExpr nameIS = (SQLBinaryOpExpr) left.getRight(); Assert.assertEquals(SQLBinaryOperator.Is, nameIS.getOperator()); } @@ -88,9 +87,9 @@ public void test_0() throws Exception { Assert.assertEquals(3, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("fastsql_test", "ID"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("fastsql_test", "name"))); - Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("fastsql_test", "card_id"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("fastsql_test", "ID"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("fastsql_test", "name"))); + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("fastsql_test", "card_id"))); // Assert.assertTrue(visitor.getOrderByColumns().contains(new TableStat.Column("employees", "last_name"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest37.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest37.java index 005c77ea2e..456fd8594c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest37.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest37.java @@ -26,19 +26,18 @@ import java.util.List; public class OracleSelectTest37 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select resource_value,count(resource_value) nums,http_method " - + "from ( " - + " select * from audit_url_log " - + " where project_id = ? and to_char(begin_time,'yyyy-MM-dd') > = ? and to_char(begin_time,'yyyy-MM-dd') < = ? ) " - + " group by resource_value,http_method having count(resource_value) > = ?"; // + "select resource_value,count(resource_value) nums,http_method " + + "from ( " + + " select * from audit_url_log " + + " where project_id = ? and to_char(begin_time,'yyyy-MM-dd') > = ? and to_char(begin_time,'yyyy-MM-dd') < = ? ) " + + " group by resource_value,http_method having count(resource_value) > = ?"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + Assert.assertEquals("SELECT resource_value, count(resource_value) AS nums, http_method" + "\nFROM (" + "\n\tSELECT *" @@ -60,7 +59,7 @@ public void test_0() throws Exception { + "\n)" + "\ngroup by resource_value, http_method" + "\nhaving count(resource_value) >= ?", SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); - + Assert.assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest38.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest38.java index 564649dd01..716ead2389 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest38.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest38.java @@ -26,26 +26,25 @@ import java.util.List; public class OracleSelectTest38 extends OracleTest { - public void test_0() throws Exception { String sql = // "select * from " + "(with vw_kreis_statics_t as" - + " (select substr(xzqh,1,6) xzqh,swrslx,sum(swrs_count) acd_totle from" - + " (select xzqh,sglx,case when (swrs7 < 3) then '1'" - + " when (swrs7 < 5) then '2' when (swrs7 <= 9) then '3' else '4' end swrslx,1 swrs_count" - + " from acduser.vw_acd_info where sglx='1' " + " " - + " and sgfssj >= ?" + " " + " " - + " )" + " group by substr(xzqh,1,6),swrslx)" + "" - + " select e.\"XZQH\",e.\"LESS3\",e.\"F3TO5\",e.\"F5TO9\",e.\"MORE9\",kreis_code, kreis_name,px1,py1,px2,py2 from" - + " ( select" + " xzqh," + " nvl(max(decode(swrslx,'1',acd_totle)),0) less3," - + " nvl(max(decode(swrslx,'2',acd_totle)),0) f3to5," - + " nvl(max(decode(swrslx,'3',acd_totle)),0) f5to9," - + " nvl(max(decode(swrslx,'4',acd_totle)),0) more9" - + " from( select * from acduser.vw_kreis_statics_t) group by xzqh " + " ) e" + "" - + " left join" + " acduser.vw_sc_kreis_code_lv2 f on e.xzqh = f.short_kreis_code) " - + " where kreis_code in" + "(select * from " - + " (select tbek_code from acduser.vw_kreis_code start with tbek_code = ? connect by prior tbek_pk=tbek_parent ) " - + "where tbek_code != ?)"; // + + " (select substr(xzqh,1,6) xzqh,swrslx,sum(swrs_count) acd_totle from" + + " (select xzqh,sglx,case when (swrs7 < 3) then '1'" + + " when (swrs7 < 5) then '2' when (swrs7 <= 9) then '3' else '4' end swrslx,1 swrs_count" + + " from acduser.vw_acd_info where sglx='1' " + " " + + " and sgfssj >= ?" + " " + " " + + " )" + " group by substr(xzqh,1,6),swrslx)" + "" + + " select e.\"XZQH\",e.\"LESS3\",e.\"F3TO5\",e.\"F5TO9\",e.\"MORE9\",kreis_code, kreis_name,px1,py1,px2,py2 from" + + " ( select" + " xzqh," + " nvl(max(decode(swrslx,'1',acd_totle)),0) less3," + + " nvl(max(decode(swrslx,'2',acd_totle)),0) f3to5," + + " nvl(max(decode(swrslx,'3',acd_totle)),0) f5to9," + + " nvl(max(decode(swrslx,'4',acd_totle)),0) more9" + + " from( select * from acduser.vw_kreis_statics_t) group by xzqh " + " ) e" + "" + + " left join" + " acduser.vw_sc_kreis_code_lv2 f on e.xzqh = f.short_kreis_code) " + + " where kreis_code in" + "(select * from " + + " (select tbek_code from acduser.vw_kreis_code start with tbek_code = ? connect by prior tbek_pk=tbek_parent ) " + + "where tbek_code != ?)"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest39.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest39.java index 8d5d2b3f42..9df857c050 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest39.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest39.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleSelectTest39 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select * from ge_rms_company start with comCode ='11' connect by nocycle prior comCode=UPPERCOMCODE"; // + "select * from ge_rms_company start with comCode ='11' connect by nocycle prior comCode=UPPERCOMCODE"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest4.java index 34c08536b5..4331649ed6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest4.java @@ -25,13 +25,12 @@ import java.util.List; public class OracleSelectTest4 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT LPAD(' ',2*(LEVEL-1)) || last_name org_chart, " + // - "employee_id, manager_id, job_id " + // - " FROM employees" + // - " START WITH job_id = 'AD_PRES' " + // - " CONNECT BY PRIOR employee_id = manager_id AND LEVEL <= 2;"; + "employee_id, manager_id, job_id " + // + " FROM employees" + // + " START WITH job_id = 'AD_PRES' " + // + " CONNECT BY PRIOR employee_id = manager_id AND LEVEL <= 2;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest40.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest40.java index 0457cd0e08..34d3159955 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest40.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest40.java @@ -24,29 +24,28 @@ import java.util.List; public class OracleSelectTest40 extends OracleTest { - public void test_0() throws Exception { String sql = // - "WITH a AS (" + // - " SELECT to_char(csl.create_time,'yyyyMMdd') create_time, cwl.client_key ck, csl.src_id src_id " + // - " FROM t0 csl, t1 cwl " + // - " WHERE 1 =1 AND csl.src_id = cwl.src_id AND csl.curr_url = cwl.curr_url " + // - " AND to_char(csl.create_time,'yyyyMMdd') BETWEEN ? " + // - " AND ? AND cwl.day = to_char(csl.create_time,'yyyyMMdd') " + // - " GROUP BY cwl.client_key, csl.src_id, csl.create_time ORDER BY csl.src_id )" + // - ", b AS (" + // - " SELECT itn.buyerpaytime, itn.esc_orderid, itn.oldck, " + // - " MAX(con.PAYED_AMOUNT) gmv, MAX(con.buyer_onlyid) buyer " + // - " FROM t01 itn, t02 don, t03 con " + // - " WHERE don.esc_orderid = itn.esc_orderid " + // - " AND con.esc_orderid = itn.esc_orderid " + // - " AND don.order_status IN (4,5,6,7,8) AND itn.buyerpaytime BETWEEN ? AND ? " + // - " GROUP BY itn.esc_orderid, itn.oldck, itn.buyerpaytime ) " + // - "SELECT MAX(cos.location) AS position , a.src_id AS srcid , " + // - " COUNT(DISTINCT b.esc_orderid) AS orders , SUM(b.gmv) AS uvGmv, " + // - " COUNT(DISTINCT buyer) AS buyers FROM a, b, cp_operate_statistics cos " + // - "WHERE a.ck = b.oldck(+) AND to_char(cos.day,'yyyyMMdd') = a.create_time " + // - " AND a.create_time = b.buyerpaytime AND a.src_id = cos.src_id GROUP BY a.src_id ORDER BY a.src_id"; // + "WITH a AS (" + // + " SELECT to_char(csl.create_time,'yyyyMMdd') create_time, cwl.client_key ck, csl.src_id src_id " + // + " FROM t0 csl, t1 cwl " + // + " WHERE 1 =1 AND csl.src_id = cwl.src_id AND csl.curr_url = cwl.curr_url " + // + " AND to_char(csl.create_time,'yyyyMMdd') BETWEEN ? " + // + " AND ? AND cwl.day = to_char(csl.create_time,'yyyyMMdd') " + // + " GROUP BY cwl.client_key, csl.src_id, csl.create_time ORDER BY csl.src_id )" + // + ", b AS (" + // + " SELECT itn.buyerpaytime, itn.esc_orderid, itn.oldck, " + // + " MAX(con.PAYED_AMOUNT) gmv, MAX(con.buyer_onlyid) buyer " + // + " FROM t01 itn, t02 don, t03 con " + // + " WHERE don.esc_orderid = itn.esc_orderid " + // + " AND con.esc_orderid = itn.esc_orderid " + // + " AND don.order_status IN (4,5,6,7,8) AND itn.buyerpaytime BETWEEN ? AND ? " + // + " GROUP BY itn.esc_orderid, itn.oldck, itn.buyerpaytime ) " + // + "SELECT MAX(cos.location) AS position , a.src_id AS srcid , " + // + " COUNT(DISTINCT b.esc_orderid) AS orders , SUM(b.gmv) AS uvGmv, " + // + " COUNT(DISTINCT buyer) AS buyers FROM a, b, cp_operate_statistics cos " + // + "WHERE a.ck = b.oldck(+) AND to_char(cos.day,'yyyyMMdd') = a.create_time " + // + " AND a.create_time = b.buyerpaytime AND a.src_id = cos.src_id GROUP BY a.src_id ORDER BY a.src_id"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,7 +54,7 @@ public void test_0() throws Exception { System.out.println(stmt); Assert.assertEquals(1, statementList.size()); - + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest41.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest41.java index 2ef8176218..343acb7bfc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest41.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest41.java @@ -24,33 +24,32 @@ import java.util.List; public class OracleSelectTest41 extends OracleTest { - public void test_0() throws Exception { String sql = // - "WITH RESULTVIEW AS" + // - " (" + // - " SELECT" + // - " AA.USERID," + // - " DECODE(AA.USERTYPE," + // - " '1'," + // - " (SELECT ORG_TABLE.ORGNAME" + // - " FROM ORG_TABLE" + // - " WHERE ORG_TABLE.ORGID = AA.BELONGORG)," + // - " '2'," + // - " (SELECT CUST_TABLE.CUSTOMERNAME" + // - " FROM CUST_TABLE" + // - " WHERE CUST_TABLE.CUSTOMERID = AA.BELONGORG)) ORGNAME" + // - " FROM AA" + // - " LEFT JOIN AAPWD" + // - " ON AA.USERID = AAPWD.USERID" + // - " WHERE AA.BELONGORG IN" + // - " (1,2,3)" + // - " ORDER BY AA.USERID DESC" + // - " )" + // - "SELECT *" + // - " FROM (SELECT RESULTVIEW.*, ROWNUM AS RESULTNUMS FROM RESULTVIEW)" + // - " WHERE RESULTNUMS > 1" + // - " AND RESULTNUMS <= 10"; // + "WITH RESULTVIEW AS" + // + " (" + // + " SELECT" + // + " AA.USERID," + // + " DECODE(AA.USERTYPE," + // + " '1'," + // + " (SELECT ORG_TABLE.ORGNAME" + // + " FROM ORG_TABLE" + // + " WHERE ORG_TABLE.ORGID = AA.BELONGORG)," + // + " '2'," + // + " (SELECT CUST_TABLE.CUSTOMERNAME" + // + " FROM CUST_TABLE" + // + " WHERE CUST_TABLE.CUSTOMERID = AA.BELONGORG)) ORGNAME" + // + " FROM AA" + // + " LEFT JOIN AAPWD" + // + " ON AA.USERID = AAPWD.USERID" + // + " WHERE AA.BELONGORG IN" + // + " (1,2,3)" + // + " ORDER BY AA.USERID DESC" + // + " )" + // + "SELECT *" + // + " FROM (SELECT RESULTVIEW.*, ROWNUM AS RESULTNUMS FROM RESULTVIEW)" + // + " WHERE RESULTNUMS > 1" + // + " AND RESULTNUMS <= 10"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -72,7 +71,7 @@ public void test_0() throws Exception { Assert.assertEquals(8, visitor.getColumns().size()); - assertTrue(visitor.containsColumn("AA", "USERID")); + assertTrue(visitor.containsColumn("AA", "USERID")); // Assert.assertTrue(visitor.getOrderByColumns().contains(new TableStat.Column("employees", "last_name"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest42.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest42.java index 9827e31c23..5371fbb858 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest42.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest42.java @@ -25,12 +25,11 @@ import java.util.List; public class OracleSelectTest42 extends OracleTest { - public void test_0() throws Exception { String sql = // - "SELECT ALL * FROM t_department " + // - "WHERE name IN ('0000','4444') " + // - "ORDER BY name ASC"; // + "SELECT ALL * FROM t_department " + // + "WHERE name IN ('0000','4444') " + // + "ORDER BY name ASC"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String text = TestUtils.outputOracle(stmt); Assert.assertEquals("SELECT ALL *" + // - "\nFROM t_department" + // - "\nWHERE name IN ('0000', '4444')" + // - "\nORDER BY name ASC", text); + "\nFROM t_department" + // + "\nWHERE name IN ('0000', '4444')" + // + "\nORDER BY name ASC", text); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest43.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest43.java index 4d1916bd22..912cf0057d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest43.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest43.java @@ -24,12 +24,11 @@ import java.util.List; public class OracleSelectTest43 extends OracleTest { - public void test_0() throws Exception { String sql = // - "SELECT * FROM table(t_department) " + // - "WHERE name IN ('0000','4444') " + // - "ORDER BY name ASC"; // + "SELECT * FROM table(t_department) " + // + "WHERE name IN ('0000','4444') " + // + "ORDER BY name ASC"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest44.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest44.java index ef29ccf4e3..adb9cd7f07 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest44.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest44.java @@ -25,12 +25,11 @@ import java.util.List; public class OracleSelectTest44 extends OracleTest { - public void test_0() throws Exception { String sql = // - "SELECT UNIQUE * FROM ONLY (t_department) " + // - "WHERE name IN ('0000','4444') " + // - "ORDER BY name ASC"; // + "SELECT UNIQUE * FROM ONLY (t_department) " + // + "WHERE name IN ('0000','4444') " + // + "ORDER BY name ASC"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -55,9 +54,9 @@ public void test_0() throws Exception { String text = TestUtils.outputOracle(stmt); Assert.assertEquals("SELECT UNIQUE *" + // - "\nFROM ONLY (t_department)" + // - "\nWHERE name IN ('0000', '4444')" + // - "\nORDER BY name ASC", text); + "\nFROM ONLY (t_department)" + // + "\nWHERE name IN ('0000', '4444')" + // + "\nORDER BY name ASC", text); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest45.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest45.java index 543ca57f56..8e818f92cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest45.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest45.java @@ -25,18 +25,17 @@ import java.util.List; public class OracleSelectTest45 extends OracleTest { - public void test_0() throws Exception { String sql = // - "SELECT T1.BC_ID AS BCID，SUM(PRODUCT_NUM) AS COUNT " // - + "　　FROM MT_PRODUCT_ORDER T1 ,MT_ORDER T2 " // - + "　　WHERE T1.MT_ORDER_ID= T2.MT_ORDER_ID " // - + "AND T2.PUBLISH_TIME>= ? " // - + "AND T1.STATES = '0' AND T2.STATES = '0' " // - + "AND REFUND_STATE = '0' " // - + "AND PRODUCT_ORDER_STATE >= 300 " // - + "AND BC_ID in (?) " // - + "GROUP BY BC_ID"; // + "SELECT T1.BC_ID AS BCID，SUM(PRODUCT_NUM) AS COUNT " // + + "　　FROM MT_PRODUCT_ORDER T1 ,MT_ORDER T2 " // + + "　　WHERE T1.MT_ORDER_ID= T2.MT_ORDER_ID " // + + "AND T2.PUBLISH_TIME>= ? " // + + "AND T1.STATES = '0' AND T2.STATES = '0' " // + + "AND REFUND_STATE = '0' " // + + "AND PRODUCT_ORDER_STATE >= 300 " // + + "AND BC_ID in (?) " // + + "GROUP BY BC_ID"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest46.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest46.java index 8c10e6d459..ee0ca22eba 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest46.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest46.java @@ -25,15 +25,14 @@ import java.util.List; public class OracleSelectTest46 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select *" // - + " FROM MT_PRODUCT_ORDER T1,MT_ORDER T2 WHERE " // - + " T1.MT_ORDER_ID = T2.MT_ORDER_ID" // - + " and SELLER_SSOID = 1" // - + " AND T1.MT_ORDER_ID = '1'" // - + " AND T1.MT_BATCH_ORDER_ID IN '1'"; // + "select *" // + + " FROM MT_PRODUCT_ORDER T1,MT_ORDER T2 WHERE " // + + " T1.MT_ORDER_ID = T2.MT_ORDER_ID" // + + " and SELLER_SSOID = 1" // + + " AND T1.MT_ORDER_ID = '1'" // + + " AND T1.MT_BATCH_ORDER_ID IN '1'"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -58,11 +57,11 @@ public void test_0() throws Exception { String text = TestUtils.outputOracle(stmt); Assert.assertEquals("SELECT *" // - + "\nFROM MT_PRODUCT_ORDER T1, MT_ORDER T2" // - + "\nWHERE T1.MT_ORDER_ID = T2.MT_ORDER_ID" // - + "\n\tAND SELLER_SSOID = 1" // - + "\n\tAND T1.MT_ORDER_ID = '1'" // - + "\n\tAND T1.MT_BATCH_ORDER_ID IN ('1')", text); + + "\nFROM MT_PRODUCT_ORDER T1, MT_ORDER T2" // + + "\nWHERE T1.MT_ORDER_ID = T2.MT_ORDER_ID" // + + "\n\tAND SELLER_SSOID = 1" // + + "\n\tAND T1.MT_ORDER_ID = '1'" // + + "\n\tAND T1.MT_BATCH_ORDER_ID IN ('1')", text); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest47.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest47.java index 1fcc3c7397..8d6ea2f596 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest47.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest47.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleSelectTest47 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select * from abc where model=?"; // + "select * from abc where model=?"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,8 +52,8 @@ public void test_0() throws Exception { String text = TestUtils.outputOracle(stmt); Assert.assertEquals("SELECT *" // - + "\nFROM abc" // - + "\nWHERE model = ?", text); + + "\nFROM abc" // + + "\nWHERE model = ?", text); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest48.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest48.java index fd348c4fde..87c50ba94e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest48.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest48.java @@ -25,14 +25,13 @@ import java.util.List; public class OracleSelectTest48 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select sequence_name from all_sequences " // - + "union select synonym_name" // - + " from all_synonyms us, all_sequences asq" // - + " where asq.sequence_name = us.table_name" // - + " and asq.sequence_owner = us.table_owner"; // + "select sequence_name from all_sequences " // + + "union select synonym_name" // + + " from all_synonyms us, all_sequences asq" // + + " where asq.sequence_name = us.table_name" // + + " and asq.sequence_owner = us.table_owner"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -57,12 +56,12 @@ public void test_0() throws Exception { String text = TestUtils.outputOracle(stmt); Assert.assertEquals("SELECT sequence_name" // - + "\nFROM all_sequences" // - + "\nUNION" // - + "\nSELECT synonym_name" // - + "\nFROM all_synonyms us, all_sequences asq" // - + "\nWHERE asq.sequence_name = us.table_name" // - + "\n\tAND asq.sequence_owner = us.table_owner", text); + + "\nFROM all_sequences" // + + "\nUNION" // + + "\nSELECT synonym_name" // + + "\nFROM all_synonyms us, all_sequences asq" // + + "\nWHERE asq.sequence_name = us.table_name" // + + "\n\tAND asq.sequence_owner = us.table_owner", text); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest49.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest49.java index 34ba74be25..02994902a0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest49.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest49.java @@ -25,11 +25,10 @@ import java.util.List; public class OracleSelectTest49 extends OracleTest { - public void test_0() throws Exception { String sql = // - "select * from tab1 t " // - + " order by replace(to_char(t.SORTNUM), '0', '9') "; // + "select * from tab1 t " // + + " order by replace(to_char(t.SORTNUM), '0', '9') "; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -54,8 +53,8 @@ public void test_0() throws Exception { String text = TestUtils.outputOracle(stmt); Assert.assertEquals("SELECT *" // - + "\nFROM tab1 t" // - + "\nORDER BY replace(to_char(t.SORTNUM), '0', '9')", text); + + "\nFROM tab1 t" // + + "\nORDER BY replace(to_char(t.SORTNUM), '0', '9')", text); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest5.java index 7ce93800d3..afd0bcf256 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest5.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleSelectTest5 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT t1.department_id, t2.* FROM hr_info t1, TABLE(t1.people) t2" + // - " WHERE t2.department_id = t1.department_id;"; + " WHERE t2.department_id = t1.department_id;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest50.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest50.java index aa75e948b2..0e3839f747 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest50.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest50.java @@ -25,10 +25,9 @@ import java.util.List; public class OracleSelectTest50 extends OracleTest { - public void test_0() throws Exception { String sql = // - "SELECT * from ( SELECT ID,MATTER,CODE,NAME,ADDRESS,AREA,PROPOSER,PROPOSER_CONTACTOR,PROPOSER_PHONE,REG_TIME,ASSIGN_TIME,DEPART,HANDLER,HANDLER_PHONE,STATUS,FINISH_DATE,FINISH_TYPE,DEPART_CODE,SYSTEM_CODE,rownum num FROM gxpt_items WHERE rownum<=20 order by REG_TIME desc ) WHERE num>0"; // + "SELECT * from ( SELECT ID,MATTER,CODE,NAME,ADDRESS,AREA,PROPOSER,PROPOSER_CONTACTOR,PROPOSER_PHONE,REG_TIME,ASSIGN_TIME,DEPART,HANDLER,HANDLER_PHONE,STATUS,FINISH_DATE,FINISH_TYPE,DEPART_CODE,SYSTEM_CODE,rownum num FROM gxpt_items WHERE rownum<=20 order by REG_TIME desc ) WHERE num>0"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,16 +52,16 @@ public void test_0() throws Exception { String text = TestUtils.outputOracle(stmt); Assert.assertEquals("SELECT *"// - + "\nFROM (" // - + "\n\tSELECT ID, MATTER, CODE, NAME, ADDRESS"// - + "\n\t\t, AREA, PROPOSER, PROPOSER_CONTACTOR, PROPOSER_PHONE, REG_TIME"// - + "\n\t\t, ASSIGN_TIME, DEPART, HANDLER, HANDLER_PHONE, STATUS"// - + "\n\t\t, FINISH_DATE, FINISH_TYPE, DEPART_CODE, SYSTEM_CODE, rownum AS num"// - + "\n\tFROM gxpt_items"// - + "\n\tWHERE rownum <= 20"// - + "\n\tORDER BY REG_TIME DESC"// - + "\n)"// - + "\nWHERE num > 0", text); + + "\nFROM (" // + + "\n\tSELECT ID, MATTER, CODE, NAME, ADDRESS"// + + "\n\t\t, AREA, PROPOSER, PROPOSER_CONTACTOR, PROPOSER_PHONE, REG_TIME"// + + "\n\t\t, ASSIGN_TIME, DEPART, HANDLER, HANDLER_PHONE, STATUS"// + + "\n\t\t, FINISH_DATE, FINISH_TYPE, DEPART_CODE, SYSTEM_CODE, rownum AS num"// + + "\n\tFROM gxpt_items"// + + "\n\tWHERE rownum <= 20"// + + "\n\tORDER BY REG_TIME DESC"// + + "\n)"// + + "\nWHERE num > 0", text); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest51.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest51.java index 9322f77329..367061c444 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest51.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest51.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest51 extends OracleTest { - public void test_0() throws Exception { String sql = // "select TRIM(TRAILING 'M' FROM RTRIM(' testM')) from dual;"; // @@ -54,14 +53,14 @@ public void test_0() throws Exception { String text = SQLUtils.toOracleString(stmt); Assert.assertEquals("SELECT TRIM(TRAILING 'M' FROM RTRIM(' testM'))" // - + "\nFROM dual;", text); + + "\nFROM dual;", text); } - + { String text = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - + Assert.assertEquals("select TRIM(TRAILING 'M' from RTRIM(' testM'))" // - + "\nfrom dual;", text); + + "\nfrom dual;", text); } // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest52.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest52.java index bf6f7fc596..2c2693737c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest52.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest52.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest52 extends OracleTest { - public void test_0() throws Exception { String sql = // "select 1 interval from dual"; // @@ -54,14 +53,14 @@ public void test_0() throws Exception { String text = SQLUtils.toOracleString(stmt); Assert.assertEquals("SELECT 1 AS INTERVAL" // - + "\nFROM dual", text); + + "\nFROM dual", text); } - + { String text = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - + Assert.assertEquals("select 1 as INTERVAL" // - + "\nfrom dual", text); + + "\nfrom dual", text); } // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest53.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest53.java index 4bec448d09..81c67bd221 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest53.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest53.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest53 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT MIN(t.deptno) KEEP(DENSE_RANK FIRST ORDER BY t.sal) a FROM emp t"; // @@ -54,14 +53,14 @@ public void test_0() throws Exception { String text = SQLUtils.toOracleString(stmt); Assert.assertEquals("SELECT MIN(t.deptno) KEEP (DENSE_RANK FIRST ORDER BY t.sal) AS a" // - + "\nFROM emp t", text); + + "\nFROM emp t", text); } { String text = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select min(t.deptno) keep (dense_rank first order by t.sal) as a" // - + "\nfrom emp t", text); + + "\nfrom emp t", text); } // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest54.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest54.java index e27834999f..e4ec213fea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest54.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest54.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest54 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT orderseq.currval FROM emp t"; // @@ -54,14 +53,14 @@ public void test_0() throws Exception { String text = SQLUtils.toOracleString(stmt); Assert.assertEquals("SELECT orderseq.CURRVAL" // - + "\nFROM emp t", text); + + "\nFROM emp t", text); } { String text = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select orderseq.currval" // - + "\nfrom emp t", text); + + "\nfrom emp t", text); } // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest55.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest55.java index 122c9e815a..6836965452 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest55.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest55.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest55 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT orderseq.NEXTVAL FROM emp t"; // @@ -54,14 +53,14 @@ public void test_0() throws Exception { String text = SQLUtils.toOracleString(stmt); Assert.assertEquals("SELECT orderseq.NEXTVAL" // - + "\nFROM emp t", text); + + "\nFROM emp t", text); } { String text = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select orderseq.nextval" // - + "\nfrom emp t", text); + + "\nfrom emp t", text); } // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest56.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest56.java index e1f3f33917..deb7961802 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest56.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest56.java @@ -25,33 +25,32 @@ import java.util.List; public class OracleSelectTest56 extends OracleTest { - public void test_0() throws Exception { String sql = // "select " - + "\nAA.ID," - + "\nAA.CODE," - + "\nAA.TYPE," - + "\nAA.STATUS," - + "\nAA.EMPLOYEENAME," - + "\nAA.CREATORNAME," - + "\nAA.OPERATIONTYPE," - + "\nAA.CREATEDATE," - + "\nAA.REMARK," - + "\nW.NAME," - + "\nDD.DESC" - + "\nfrom " - + "\na AA," - + "\nw W," - + "\nd DD" - + "\nwhere " - + "\nAA.employeeNo IN (" - + "\nSELECT employeeno FROM employeeauditor ea WHERE auditorno = 1 GROUP BY employeeno" - + "\nUNION ALL" - + "\nSELECT 1 FROM dual " - + "\n) and" - + "\nAA.WNO = W.WNO(+) and" - + "\nAA.DEPTNO = DD.DEPTNO(+)"; // + + "\nAA.ID," + + "\nAA.CODE," + + "\nAA.TYPE," + + "\nAA.STATUS," + + "\nAA.EMPLOYEENAME," + + "\nAA.CREATORNAME," + + "\nAA.OPERATIONTYPE," + + "\nAA.CREATEDATE," + + "\nAA.REMARK," + + "\nW.NAME," + + "\nDD.DESC" + + "\nfrom " + + "\na AA," + + "\nw W," + + "\nd DD" + + "\nwhere " + + "\nAA.employeeNo IN (" + + "\nSELECT employeeno FROM employeeauditor ea WHERE auditorno = 1 GROUP BY employeeno" + + "\nUNION ALL" + + "\nSELECT 1 FROM dual " + + "\n) and" + + "\nAA.WNO = W.WNO(+) and" + + "\nAA.DEPTNO = DD.DEPTNO(+)"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest57.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest57.java index c2e2aa77a8..33115cbae8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest57.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest57.java @@ -25,13 +25,12 @@ import java.util.List; public class OracleSelectTest57 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT TRIM(BOTH FROM EUCD) AS \"value\",NTLANG1 AS \"text\" " // - + " FROM T_HT_WREM_ENUMLANG_D" - + " WHERE TYPE=?" - + " ORDER BY \"value\" ASC"; // + + " FROM T_HT_WREM_ENUMLANG_D" + + " WHERE TYPE=?" + + " ORDER BY \"value\" ASC"; // OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest58.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest58.java index a6f35eba8f..c9ab749d35 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest58.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest58.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest58 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT * FROM T FETCH FIRST 10 ROWS ONLY"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest59.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest59.java index 1aedd62f9b..38e77f81b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest59.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest59.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest59 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT * FROM atable ORDER BY acolumn DESC OFFSET 0 ROWS FETCH FIRST 10 ROWS ONLY"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest6.java index 042cc63f4c..284b3b2b53 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest6.java @@ -25,14 +25,13 @@ import java.util.List; public class OracleSelectTest6 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT * FROM departments " + // - " WHERE EXISTS " + // - " (SELECT * FROM employees " + // - " WHERE departments.department_id = employees.department_id " + // - " AND employees.salary > 2500)" + // - " ORDER BY department_name; "; + " WHERE EXISTS " + // + " (SELECT * FROM employees " + // + " WHERE departments.department_id = employees.department_id " + // + " AND employees.salary > 2500)" + // + " ORDER BY department_name; "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest60.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest60.java index 339fc8d22a..c3c126be03 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest60.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest60.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest60 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT ?||'ABC' FROM DUAL"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest61.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest61.java index bd4dbdbe89..82999dc452 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest61.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest61.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest61 extends OracleTest { - public void test_0() throws Exception { String sql = // "Select column_expression from sys.ALL_IND_EXPRESSIONS where column_position =: cp"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java index 3523746741..8baffbadad 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest62 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT channel_desc, calendar_month_desc, co.country_id,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest63_with_recursive.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest63_with_recursive.java index e6625a3e73..b2f27f60ed 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest63_with_recursive.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest63_with_recursive.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest63_with_recursive extends OracleTest { - public void test_0() throws Exception { String sql = // "WITH t1(id, parent_id) AS (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest64_with_recursive.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest64_with_recursive.java index 421998c30c..8cc8260120 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest64_with_recursive.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest64_with_recursive.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest64_with_recursive extends OracleTest { - public void test_0() throws Exception { String sql = // "WITH t1(id, parent_id, lvl) AS (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest65_error.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest65_error.java index d46945a99c..e5e88cba64 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest65_error.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest65_error.java @@ -21,7 +21,6 @@ import com.alibaba.druid.util.JdbcConstants; public class OracleSelectTest65_error extends OracleTest { - public void test_0() throws Exception { String sql = // "select 1 from hhh as select 1"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest66_not_eq.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest66_not_eq.java index 90cc7b6299..6f641eb8d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest66_not_eq.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest66_not_eq.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest66_not_eq extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT *\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest67.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest67.java index efc1a284a1..8d9358b713 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest67.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest67.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest67 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT NVL(B.KYSLRQ, A.HZDJRQ) HZDJRQ FROM DJ_NSRXX A" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest68.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest68.java index 8fc56df1ce..efce805640 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest68.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest68.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest68 extends OracleTest { - public void test_0() throws Exception { String sql = // "INSERT INTO SB_ZZS_LDSK_2016 SELECT DJXH, :B1 , NVL(SUM(CASE WHEN ZZSLX = '2' AND LDLX = '1' THEN LDSE END), 0) SQLDSE_BQ, NVL(SUM(CASE WHEN ZZSLX = '1' AND LDLX = '1' THEN LDSE END), 0) SQLDSE_LJ, NVL(SUM(CASE WHEN LDLX = '2' THEN LDSE END), 0) SQLDSE_JZ, 0, 0, 0,SYSDATE FROM (SELECT ZZSLX, LDLX, DJXH, SUM(BCLDBHS) LDSE FROM (SELECT ZZSLX, LDLX, DJXH, SUM(T.BCLDBHS) BCLDBHS FROM HX_SB.SB_ZZS_LDSKLSZ@JSCX T WHERE T.SKSSQZ < ADD_MONTHS(:B1 ,-1)+1 AND DJXH IN (SELECT NSRDZDAH FROM DJ_NSRXX_JS_GZSB) AND T.CZLX_DM IN ('10', '66', '68', '53', '56', '61', '64') GROUP BY ZZSLX, LDLX, DJXH UNION ALL SELECT ZZSLX, LDLX, DJXH, -SUM(T.BCLDBHS) BCLDBHS FROM HX_SB.SB_ZZS_LDSKLSZ@JSCX T WHERE T.SKSSQZ = ADD_MONTHS(:B1 ,-1) AND DJXH IN (SELECT NSRDZDAH FROM DJ_NSRXX_JS_GZSB) AND T.CZLX_DM IN ('53', '56', '61', '64') GROUP BY ZZSLX, LDLX, DJXH) GROUP BY ZZSLX, LDLX, DJXH) A GROUP BY DJXH"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest69.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest69.java index fd69e400fa..e6aa2d87e9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest69.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest69.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest69 extends OracleTest { - public void test_0() throws Exception { String sql = // "CREATE TABLE \"SC01\".\"TB01\" \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest7.java index 87f2d962a8..ceb0aca32f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest7.java @@ -25,13 +25,12 @@ import java.util.List; public class OracleSelectTest7 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT * FROM employees " + // - " WHERE department_id NOT IN " + // - " (SELECT department_id FROM departments " + // - " WHERE location_id = 1700)" + // - " ORDER BY last_name;"; + " WHERE department_id NOT IN " + // + " (SELECT department_id FROM departments " + // + " WHERE location_id = 1700)" + // + " ORDER BY last_name;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -61,7 +60,7 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("departments", "location_id"))); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "*"))); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "department_id"))); - + Assert.assertTrue(visitor.getOrderByColumns().contains(new TableStat.Column("employees", "last_name"))); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest70.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest70.java index 6af3530733..efd6445a43 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest70.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest70.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest70 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT CAST(a.nsrdzdah AS char)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest71.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest71.java index fa89d7996a..d2cd312b19 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest71.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest71.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest71 extends OracleTest { - public void test_0() throws Exception { String sql = // "select * from (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest72.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest72.java index 1ae7856878..83002a6d5d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest72.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest72.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest72 extends OracleTest { - public void test_0() throws Exception { String sql = // "Select A,B,C,sum(E) from test group by rollup(A,B,C)"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest73.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest73.java index 5a36bb7e96..08cea57b37 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest73.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest73.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest73 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT fact_1_id,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest74_translate.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest74_translate.java index 59e90f2a92..8ace4f297d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest74_translate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest74_translate.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest74_translate extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT TRANSLATE(SUBSTR(TRIM(T.BZ)||\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest75_comment.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest75_comment.java index caea7141f7..6d070f635b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest75_comment.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest75_comment.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest75_comment extends OracleTest { - public void test_0() throws Exception { String sql = // "--CMS???'?o??\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest76_brace.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest76_brace.java index 085672e2cd..1784ba0658 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest76_brace.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest76_brace.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest76_brace extends OracleTest { - public void test_0() throws Exception { String sql = // "((SELECT *\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest77.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest77.java index cc668241b9..92fdfe25ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest77.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest77.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest77 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest78.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest78.java index e39b39f041..0521862a41 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest78.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest78.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest78 extends OracleTest { - public void test_0() throws Exception { String sql = // "WITH resulttable AS (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest79.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest79.java index 5ad04fb04a..971d314be6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest79.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest79.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest79 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT * FROM `tasks` where projectId=?"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest8.java index 13f413d6e5..d84f6c16de 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest8.java @@ -25,12 +25,11 @@ import java.util.List; public class OracleSelectTest8 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT d.department_id, e.last_name" + // - " FROM departments d, employees e" + // - " WHERE d.department_id = e.department_id(+)" + // - " ORDER BY d.department_id, e.last_name;"; + " FROM departments d, employees e" + // + " WHERE d.department_id = e.department_id(+)" + // + " ORDER BY d.department_id, e.last_name;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest80.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest80.java index 43690c2faa..8e06e0e651 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest80.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest80.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest80 extends OracleTest { - public void test_0() throws Exception { String sql = // "select (o.STORE - o.LAST_STORE) STORE from t_order o;"; // @@ -60,8 +59,8 @@ public void test_0() throws Exception { assertEquals(0, visitor.getOrderByColumns().size()); - Assert.assertTrue(visitor.containsColumn("t_order", "STORE")); - Assert.assertTrue(visitor.containsColumn("t_order", "LAST_STORE")); + Assert.assertTrue(visitor.containsColumn("t_order", "STORE")); + Assert.assertTrue(visitor.containsColumn("t_order", "LAST_STORE")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest81_join_brace.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest81_join_brace.java index a29f772237..3c6b97af70 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest81_join_brace.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest81_join_brace.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest81_join_brace extends OracleTest { - public void test_0() throws Exception { String sql = // "select * \n" + @@ -52,7 +51,6 @@ public void test_0() throws Exception { print(statementList); - Assert.assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -89,8 +87,8 @@ public void test_0() throws Exception { assertEquals(0, visitor.getOrderByColumns().size()); - Assert.assertTrue(visitor.containsColumn("tcp_cpr.con_config", "contract_config_id")); - Assert.assertTrue(visitor.containsColumn("tcp_cpr.con_osg3a_headers", "parent_id")); + Assert.assertTrue(visitor.containsColumn("tcp_cpr.con_config", "contract_config_id")); + Assert.assertTrue(visitor.containsColumn("tcp_cpr.con_osg3a_headers", "parent_id")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest82_wmsysconcat.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest82_wmsysconcat.java index 8404d5ed34..65af4d9e59 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest82_wmsysconcat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest82_wmsysconcat.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest82_wmsysconcat extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT supReg.regId,supReg.Title,supReg.Docnum,supReg.Itemtype,\n" + @@ -48,7 +47,6 @@ public void test_0() throws Exception { print(statementList); - Assert.assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -88,8 +86,8 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.containsTable("sup_task")); Assert.assertTrue(visitor.containsTable("sys_org")); - Assert.assertTrue(visitor.containsColumn("sup_task", "orgid")); - Assert.assertTrue(visitor.containsColumn("sup_task", "orgid")); + Assert.assertTrue(visitor.containsColumn("sup_task", "orgid")); + Assert.assertTrue(visitor.containsColumn("sup_task", "orgid")); // } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest83_number_negative.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest83_number_negative.java index 1dc4d2e66d..0f06a1b7bb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest83_number_negative.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest83_number_negative.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest83_number_negative extends OracleTest { - public void test_0() throws Exception { String sql = // "select -3.5,4.7 from dual"; // @@ -38,7 +37,6 @@ public void test_0() throws Exception { print(statementList); - Assert.assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest84_as.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest84_as.java index 7291264950..a7f9057a54 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest84_as.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest84_as.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest84_as extends OracleTest { - public void test_0() throws Exception { String sql = // "select a as, b, c from t"; // @@ -38,7 +37,6 @@ public void test_0() throws Exception { print(statementList); - Assert.assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest85_in.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest85_in.java index 8efcc70655..be3bb9963b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest85_in.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest85_in.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest85_in extends OracleTest { - public void test_0() throws Exception { String sql = // "select * from t where id not in 3"; // @@ -38,7 +37,6 @@ public void test_0() throws Exception { print(statementList); - Assert.assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_comment.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_comment.java index 9e20a8b767..72311e477b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_comment.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_comment.java @@ -27,7 +27,6 @@ import java.util.List; public class OracleSelectTest86_comment extends OracleTest { - public void test_0() throws Exception { String sql = // "/*sqlId=9f0szhacj63ag*/SELECT /*+rule*/ SYS_XMLGEN(VALUE(KU$), XMLFORMAT.createFormat2('TABLE_T', '7')), KU$.OBJ_NUM FROM SYS.KU$_HTABLE_VIEW KU$ WHERE NOT (BITAND (KU$.PROPERTY,8192)=8192) AND NOT BITAND(KU$.SCHEMA_OBJ.FLAGS,128)!=0 AND KU$.SCHEMA_OBJ.NAME=:NAME1 AND KU$.SCHEMA_OBJ.OWNER_NAME=:SCHEMA2"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_wmsys_wmconat.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_wmsys_wmconat.java index 7648cc6f21..a69caa0b94 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_wmsys_wmconat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_wmsys_wmconat.java @@ -29,7 +29,6 @@ import java.util.List; public class OracleSelectTest86_wmsys_wmconat extends OracleTest { - public void test_0() throws Exception { String sql = // "select WMSYS.WM_CONCAT(name) from emp"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest87_bindvar.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest87_bindvar.java index f9032c6083..b8b09bd80e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest87_bindvar.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest87_bindvar.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest87_bindvar extends OracleTest { - public void test_0() throws Exception { String sql = // "select *\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest88_bindvar.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest88_bindvar.java index 3098a6a0b6..9f92c06717 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest88_bindvar.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest88_bindvar.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest88_bindvar extends OracleTest { - public void test_0() throws Exception { String sql = // "select *\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest89_condition.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest89_condition.java index 57c586ef40..f00264a6c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest89_condition.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest89_condition.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest89_condition extends OracleTest { - public void test_0() throws Exception { String sql = // "select * from v.e\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest9.java index 495a5a26f3..5ade594ec2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest9.java @@ -25,15 +25,14 @@ import java.util.List; public class OracleSelectTest9 extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT e.employee_id, e.salary, e.commission_pct" + // - " FROM employees e JOIN departments d" + // - " USING (department_id)" + // - " WHERE job_id = 'SA_REP'" + // - " AND location_id = 2500" + // - " ORDER BY e.employee_id" + // - " FOR UPDATE OF e.salary;"; + " FROM employees e JOIN departments d" + // + " USING (department_id)" + // + " WHERE job_id = 'SA_REP'" + // + " AND location_id = 2500" + // + " ORDER BY e.employee_id" + // + " FOR UPDATE OF e.salary;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest90_isof.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest90_isof.java index d48c1181ca..90efce59ba 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest90_isof.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest90_isof.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest90_isof extends OracleTest { - public void test_0() throws Exception { String sql = // "select * from persons p\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest91.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest91.java index e473e7d7b5..60353133c8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest91.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest91.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest91 extends OracleTest { - public void test_0() throws Exception { String sql = // "select *\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest92_lexer.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest92_lexer.java index 9b933596c6..c9e3b8025a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest92_lexer.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest92_lexer.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest92_lexer extends OracleTest { - public void test_0() throws Exception { String sql = // "select * from dual where 1 < > 2 and 1 ! = 2 and 1 ^ /*aaa */ = 2"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest93_model.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest93_model.java index f6d845f1c7..c302b6de93 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest93_model.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest93_model.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest93_model extends OracleTest { - public void test_0() throws Exception { String sql = // "select country,prod,year,s\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest94.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest94.java index 58eb021cfa..9fba88cb17 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest94.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest94.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest94 extends OracleTest { - public void test_0() throws Exception { String sql = // "select * from (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java index 2f8617293d..3264850d8d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest95_pivot extends OracleTest { - public void test_0() throws Exception { String sql = // " select *\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java index 7fea1aa187..8c4155e9ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest96_pivot extends OracleTest { - public void test_0() throws Exception { String sql = // " select *\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest97_wmsys_wmconat.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest97_wmsys_wmconat.java index 84ed0484be..a82e4754e8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest97_wmsys_wmconat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest97_wmsys_wmconat.java @@ -29,7 +29,6 @@ import java.util.List; public class OracleSelectTest97_wmsys_wmconat extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT NVL(TO_CHAR(WMSYS.WM_CONCAT(NVL(O.CHILD_ITEM_CODE, O.ITEM_CODE))), ?)\n" + @@ -100,7 +99,7 @@ public void test_1() throws Exception { SQLMethodInvokeExpr nvl = (SQLMethodInvokeExpr) queryBlock.getSelectList() .get(0).getExpr(); - SQLMethodInvokeExpr toChar =(SQLMethodInvokeExpr) nvl.getArguments().get(0); + SQLMethodInvokeExpr toChar = (SQLMethodInvokeExpr) nvl.getArguments().get(0); assertTrue(toChar.getArguments().get(0) instanceof SQLAggregateExpr); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest98.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest98.java index 16827ff2a6..87e2b1dce3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest98.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest98.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest98 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT manager_id, last_name, hire_date, \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest99.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest99.java index e79c7102e7..00c825bfbf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest99.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest99.java @@ -26,7 +26,6 @@ import java.util.List; public class OracleSelectTest99 extends OracleTest { - public void test_0() throws Exception { String sql = // "SELECT last_name, hire_date, salary, SUM(salary) \n" + @@ -72,5 +71,5 @@ public void test_0() throws Exception { assertEquals(1, visitor.getOrderByColumns().size()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_connect_by_root.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_connect_by_root.java index 669d2f3993..72a42ac912 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_connect_by_root.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_connect_by_root.java @@ -24,7 +24,6 @@ import java.util.List; public class OracleSelectTest_connect_by_root extends OracleTest { - public void test_0() throws Exception { String sql = "select id, category_name, parent_id, root_id, (select category_name from mtn_contact_category where id = root_id) root_category_name from (select id, category_name, connect_by_root id root_id, parent_id, level lev from mtn_contact_category connect by prior id = parent_id) where lev = 3 "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_hierarchical_CONNECT_BY_ISCYCLE.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_hierarchical_CONNECT_BY_ISCYCLE.java index 0d0dcaa5a9..06940e7849 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_hierarchical_CONNECT_BY_ISCYCLE.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_hierarchical_CONNECT_BY_ISCYCLE.java @@ -25,7 +25,6 @@ import java.util.List; public class OracleSelectTest_hierarchical_CONNECT_BY_ISCYCLE extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT last_name \"Employee\", CONNECT_BY_ISCYCLE \"Cycle\",\n" + " LEVEL, SYS_CONNECT_BY_PATH(last_name, '/') \"Path\"\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_limit_join_with_order_by.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_limit_join_with_order_by.java index c4361641b3..0776c957fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_limit_join_with_order_by.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_limit_join_with_order_by.java @@ -10,19 +10,17 @@ import java.util.List; public class OracleSelectTest_limit_join_with_order_by extends OracleTest { - /** * 当sql有order by语句时， 分页结果sql中， join语句丢失on的条件 */ - public void testLimitJoinWithOrderBy(){ - + public void testLimitJoinWithOrderBy() { String sql = "select * from A a " + " left join B b on a.id = b.id " + " where a.id = 10 order by create_time desc"; List statementList = SQLUtils.parseStatements(sql, DbType.oracle); - SQLSelectStatement select = ((SQLSelectStatement)statementList.get(0)); + SQLSelectStatement select = ((SQLSelectStatement) statementList.get(0)); PagerUtils.limit(select.getSelect(), DbType.oracle, 0, 200, true); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSysdateTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSysdateTest.java index caff9c618e..067d921222 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSysdateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSysdateTest.java @@ -34,6 +34,6 @@ public void test_0() throws Exception { StringBuffer buf = new StringBuffer(); SQLASTOutputVisitor v = new SQLASTOutputVisitor(buf); sysdate.accept(v); - assertEquals("SYSDATE", buf.toString()); + assertEquals("SYSDATE", buf.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest.java index b25b6ff0e6..4d0d01dc02 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest.java @@ -7,30 +7,29 @@ import com.alibaba.druid.sql.SQLUtils; public class OracleToMySql_PageTest extends TestCase { - public void test_page() throws Exception { String sql = "SELECT XX.*, ROWNUM AS RN" + // - "\nFROM (SELECT *" + // - "\n\tFROM t" + // - "\n\tORDER BY id" + // - "\n\t) XX" + // - "\nWHERE ROWNUM <= 10"; + "\nFROM (SELECT *" + // + "\n\tFROM t" + // + "\n\tORDER BY id" + // + "\n\t) XX" + // + "\nWHERE ROWNUM <= 10"; String mysqlSql = SQLUtils.translateOracleToMySql(sql); Assert.assertEquals("SELECT *"// - + "\nFROM t"// - + "\nORDER BY id"// - + "\nLIMIT 10", mysqlSql); + + "\nFROM t"// + + "\nORDER BY id"// + + "\nLIMIT 10", mysqlSql); System.out.println(mysqlSql); } - - + + public void test_page1() throws Exception { String sql = "select * from t_xiaoxi where rowid in(select rid from (select rownum rn,rid from(select rowid rid,cid from t_xiaoxi order by cid desc) where rownum<10000) where rn>9980) order by cid desc;"; //sql = "SELECT rid FROM ( SELECT rownum AS rn, rid FROM ( SELECT rowid AS rid, cid FROM t_xiaoxi ORDER BY cid DESC ) WHERE rownum < 10000 ) WHERE rn > 9980"; String mysqlSql = SQLUtils.translateOracleToMySql(sql); - + System.out.println(mysqlSql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest1.java index 1d211e4dc1..4db3406327 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest1.java @@ -7,23 +7,22 @@ import com.alibaba.druid.sql.SQLUtils; public class OracleToMySql_PageTest1 extends TestCase { - public void test_page() throws Exception { String sql = "SELECT *" + // - "\nFROM (SELECT XX.*, ROWNUM AS RN" + // - "\n\tFROM (SELECT *" + // - "\n\t\tFROM t" + // - "\n\t\tORDER BY id" + // - "\n\t\t) XX" + // - "\n\tWHERE ROWNUM <= 20" + // - "\n\t) XXX" + // - "\nWHERE RN > 10"; + "\nFROM (SELECT XX.*, ROWNUM AS RN" + // + "\n\tFROM (SELECT *" + // + "\n\t\tFROM t" + // + "\n\t\tORDER BY id" + // + "\n\t\t) XX" + // + "\n\tWHERE ROWNUM <= 20" + // + "\n\t) XXX" + // + "\nWHERE RN > 10"; String mysqlSql = SQLUtils.translateOracleToMySql(sql); Assert.assertEquals("SELECT *"// - + "\nFROM t"// - + "\nORDER BY id"// - + "\nLIMIT 10, 10", mysqlSql); + + "\nFROM t"// + + "\nORDER BY id"// + + "\nLIMIT 10, 10", mysqlSql); System.out.println(mysqlSql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest2.java index e6c2817c12..f06c5a4e19 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest2.java @@ -7,20 +7,19 @@ import com.alibaba.druid.sql.SQLUtils; public class OracleToMySql_PageTest2 extends TestCase { - public void test_page() throws Exception { String sql = "SELECT XX.*, ROWNUM AS RN" + // - "\nFROM (SELECT *" + // - "\n\tFROM t" + // - "\n\tORDER BY id" + // - "\n\t) XX" + // - "\nWHERE ROWNUM < 10"; + "\nFROM (SELECT *" + // + "\n\tFROM t" + // + "\n\tORDER BY id" + // + "\n\t) XX" + // + "\nWHERE ROWNUM < 10"; String mysqlSql = SQLUtils.translateOracleToMySql(sql); Assert.assertEquals("SELECT *"// - + "\nFROM t"// - + "\nORDER BY id"// - + "\nLIMIT 9", mysqlSql); + + "\nFROM t"// + + "\nORDER BY id"// + + "\nLIMIT 9", mysqlSql); System.out.println(mysqlSql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/ExportParameterDotNumberTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/ExportParameterDotNumberTest.java index a17f33a13a..67ad5ebd3d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/ExportParameterDotNumberTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/ExportParameterDotNumberTest.java @@ -17,31 +17,31 @@ import junit.framework.TestCase; public class ExportParameterDotNumberTest extends TestCase { - /** - * Logger for this class - */ - private static final Logger LOG = LoggerFactory.getLogger(ExportParameterDotNumberTest.class); - - DbType dbType = JdbcConstants.MYSQL; - - public void test_exportParameter() throws Exception { - String[] sqls = { "INSERT INTO test_tab1 (name) VALUES ( 2.0 )", - "INSERT INTO test_tab1 (name) VALUES ( 2 )", - }; - for(String sql : sqls){ - final StringBuilder out = new StringBuilder(); - final ExportParameterVisitor visitor = new OracleExportParameterVisitor(out); - SQLStatementParser parser = new OracleStatementParser(sql); - final SQLStatement parseStatement = parser.parseStatement(); - parseStatement.accept(visitor); - final List plist = visitor.getParameters(); - LOG.info("from_sql:{}",sql); - sql = out.toString(); - - LOG.info("to_sql:{} ==> plist:{}",sql,plist); - - Assert.assertTrue(plist.size()>0); - } - } + /** + * Logger for this class + */ + private static final Logger LOG = LoggerFactory.getLogger(ExportParameterDotNumberTest.class); + + DbType dbType = JdbcConstants.MYSQL; + + public void test_exportParameter() throws Exception { + String[] sqls = {"INSERT INTO test_tab1 (name) VALUES ( 2.0 )", + "INSERT INTO test_tab1 (name) VALUES ( 2 )", + }; + for (String sql : sqls) { + final StringBuilder out = new StringBuilder(); + final ExportParameterVisitor visitor = new OracleExportParameterVisitor(out); + SQLStatementParser parser = new OracleStatementParser(sql); + final SQLStatement parseStatement = parser.parseStatement(); + parseStatement.accept(visitor); + final List plist = visitor.getParameters(); + LOG.info("from_sql:{}", sql); + sql = out.toString(); + + LOG.info("to_sql:{} ==> plist:{}", sql, plist); + + Assert.assertTrue(plist.size() > 0); + } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleASTVisitorAdapterTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleASTVisitorAdapterTest.java index e86f40df8d..3d6048bc3f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleASTVisitorAdapterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleASTVisitorAdapterTest.java @@ -20,7 +20,6 @@ import junit.framework.TestCase; public class OracleASTVisitorAdapterTest extends TestCase { - public void test_adapter() throws Exception { OracleASTVisitorAdapter adapter = new OracleASTVisitorAdapter(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java index b6553deb99..c25eba9379 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleOutputVisitorTest_Aggregate extends TestCase { - public void test_0() throws Exception { String sql = "SELECT MAX(salary) from emp where F1 = Date '2011-10-01'"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_PrettyFormat.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_PrettyFormat.java index 38663b4822..97a0a8110b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_PrettyFormat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_PrettyFormat.java @@ -14,7 +14,6 @@ import com.alibaba.druid.util.JdbcUtils; /** - * * User: carvin * Date: 12-11-13 * Time: 下午7:16 @@ -29,7 +28,7 @@ public void testConnectByParserAndPrettyFormatOutput() { StringBuilder out = new StringBuilder(); // PrettyFormat use default : true SQLASTOutputVisitor visitor = new OracleOutputVisitor(out); - for(SQLStatement statement : stmtList) { + for (SQLStatement statement : stmtList) { statement.accept(visitor); } @@ -40,7 +39,7 @@ public void testConnectByParserAndPrettyFormatOutput() { visitor = new OracleOutputVisitor(out); // setPrettyFormat : false visitor.setPrettyFormat(false); - for(SQLStatement statement : stmtList) { + for (SQLStatement statement : stmtList) { statement.accept(visitor); } expectResult = "SELECT * FROM ge_rms_company START WITH comcode = '00' CONNECT BY NOCYCLE PRIOR comcode = uppercomcode"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java index 7062006eee..a1970bc221 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleOutputVisitorTest_dblink extends TestCase { - public void test_0() throws Exception { String sql = "SELECT salary from master@emp"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java index 5fc822c14e..d6721b7b26 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleOutputVisitorTest_delete extends TestCase { - public void test_0() throws Exception { String sql = "DELETE FROM employee where id = 3"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java index 777e698469..e744256bfd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleOutputVisitorTest_forupdate extends TestCase { - public void test_0() throws Exception { String sql = "SELECT salary from employee for update"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java index daa2b03201..51efae470d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleOutputVisitorTest_orderBy extends TestCase { - public void test_0() throws Exception { String sql = "SELECT salary from employee order by name"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java index b00650ca71..abf60b1678 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleOutputVisitorTest_selectJoin extends TestCase { - public void test_0() throws Exception { String sql = "SELECT e.salary from employee e join department d where e.depId = d.id"; @@ -53,7 +52,7 @@ public void test_0() throws Exception { OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); stmt.accept(outputVisitor); Assert.assertEquals("SELECT e.salary\nFROM employee e\n\tJOIN department d\nWHERE e.depId = d.id", - buf.toString()); + buf.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleParameterizedOutputVisitorTest_01.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleParameterizedOutputVisitorTest_01.java index 97c46fbf59..afa56cfe2b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleParameterizedOutputVisitorTest_01.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleParameterizedOutputVisitorTest_01.java @@ -1,5 +1,6 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; + import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.util.JdbcConstants; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java index 8cc83f1482..68ea186caa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java @@ -34,10 +34,9 @@ import com.alibaba.druid.util.JdbcUtils; public class OracleResourceTest extends OracleTest { - public void test_0_9() throws Exception { for (int i = 0; i <= 9; ++i) { // 57 - exec_test("bvt/parser/oracle-" + i + ".txt"); + exec_test("bvt/parser/oracle-" + i + ".txt"); System.out.println(); } } @@ -94,11 +93,11 @@ public void test_61() throws Exception { } public void test_62() throws Exception { - exec_test("bvt/parser/oracle-62.txt"); + exec_test("bvt/parser/oracle-62.txt"); } public void test_63() throws Exception { - exec_test("bvt/parser/oracle-63.txt"); + exec_test("bvt/parser/oracle-63.txt"); } public void exec_test(String resource) throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java index eb178ceefc..f77fe4f870 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest1 extends TestCase { - public void test_0() throws Exception { String sql = "select a.name, b.name FROM users a, usergroups b on a.groupId = b.id"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java index bce3102710..3782a6e5f2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest2 extends TestCase { - public void test_0() throws Exception { String sql = "select id, name FROM users"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java index edfb305bd3..fa9c6e6425 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest3 extends TestCase { - public void test_0() throws Exception { String sql = "insert into users2 (id2, name2) select id, name FROM users where loginCount > 1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java index d8d092d2c7..9d168f027e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest4 extends TestCase { - public void test_0() throws Exception { String sql = "insert into users (id, name) values(?, ?)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest5.java index cd848a4d74..07ce868cfb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest5.java @@ -27,9 +27,8 @@ import junit.framework.TestCase; public class OracleSchemaStatVisitorTest5 extends TestCase { - public void test_0() throws Exception { - String sql = "SELECT B.OBJ_ID AS BDZID,B.BDZMC,count(A.*) " + String sql = "SELECT B.OBJ_ID AS BDZID,B.BDZMC,count(A.*) " + "FROM (" + " SELECT BDZ " + " FROM (" @@ -68,7 +67,7 @@ public void test_0() throws Exception { System.out.println("relationShip : " + visitor.getRelationships()); System.out.println("where : " + visitor.getConditions()); System.out.println("groupBy : " + visitor.getGroupByColumns()); - + for (Condition condition : visitor.getConditions()) { String table = condition.getColumn().getTable(); Assert.assertTrue("table not exists : " + table, visitor.containsTable(table)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest6.java index 24a8797043..5b7b5bbee6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest6.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest6 extends TestCase { - public void test_0() throws Exception { String sql = "SELECT 'SYS_B_0',COUNT('$SYS_B_1') AS DEVICECOUNT " + "FROM (" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest7.java index 5162e31e4a..de8dedbde4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest7.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest7 extends TestCase { - public void test_0() throws Exception { String sql = "SELECT 'SYS_B_0',COUNT('$SYS_B_1') AS DEVICECOUNT " + "FROM (SELECT A.OID,A.SSJG,A.OID FROM T_TX_ZLSB_ZLDYHGQ A WHERE (A.VERSIONID IS NULL OR A.VERSIONID='$SYS_B_2') UNION ALL SELECT B.OID,B.SSJG,B.OID " diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest8_merge_into.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest8_merge_into.java index c1057551c3..a52e5634da 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest8_merge_into.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest8_merge_into.java @@ -25,7 +25,7 @@ import java.util.List; public class OracleSchemaStatVisitorTest8_merge_into extends TestCase { - private final static DbType dbType = JdbcConstants.ORACLE; + private static final DbType dbType = JdbcConstants.ORACLE; public void test_0() throws Exception { String sql = "MERGE INTO (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java index f3bb004c2c..be6a773390 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest_Delete extends TestCase { - public void test_0() throws Exception { String sql = "delete from users where id = ? or name = ?"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java index c03e17d3d9..f7297240ec 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest_Subquery extends TestCase { - public void test_0() throws Exception { String sql = "SELECT id, name FROM (select id, name from users where ROWNUM < 10) a"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java index b66ed48fdf..c8cb24af9d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest_Subquery2 extends TestCase { - public void test_0() throws Exception { String sql = "SELECT a.id, a.name, b.name groupName FROM (select id, name, groupId from users WHERE ROWNUM < 10) a inner join groups b on a.groupId = b.id"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java index 0b65706d77..6c5a44e762 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat.Column; public class OracleSchemaStatVisitorTest_Update extends TestCase { - public void test_0() throws Exception { String sql = "update users set loginCount = loginCount + 1 where id = ?"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/polardbx/PolarDBXTest.java b/src/test/java/com/alibaba/druid/bvt/sql/polardbx/PolarDBXTest.java index eb791d8dba..26abac34fd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/polardbx/PolarDBXTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/polardbx/PolarDBXTest.java @@ -31,7 +31,7 @@ public void test_polardb_x_2() throws Throwable { + ") ENGINE = InnoDB single"; repository.console(sql2); // repository.setDefaultSchema("test2"); - SchemaObject table =repository.findTable("test2"); + SchemaObject table = repository.findTable("test2"); Assert.assertTrue(table != null); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java index 114d2943ef..096c8449fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class DropTableTest extends PGTest { - public void test_0() throws Exception { String sql = "DROP TABLE films, distributors;"; @@ -45,12 +44,12 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("distributors"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("films")).getDropCount() == 1); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("distributors")).getDropCount() == 1); Assert.assertTrue(visitor.getColumns().isEmpty()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGASTVisitorAdapterTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGASTVisitorAdapterTest.java index 74182f381a..89cddbb334 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGASTVisitorAdapterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGASTVisitorAdapterTest.java @@ -9,7 +9,6 @@ import junit.framework.TestCase; public class PGASTVisitorAdapterTest extends TestCase { - public void test_adapter() throws Exception { PGASTVisitorAdapter adapter = new PGASTVisitorAdapter(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest.java index cddc5d1e87..025b78b21d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGAlterTableTest extends PGTest { - public void test_0() throws Exception { String sql = "ALTER TABLE dependencies ALTER COLUMN id TYPE bigint"; @@ -44,11 +43,11 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("dependencies"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("dependencies")).getAlterCount() == 1); Assert.assertTrue(visitor.getColumns().size() == 1); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest1.java index 57addc84a3..85bdd80f79 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest1.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGAlterTableTest1 extends PGTest { - public void test_0() throws Exception { String sql = "ALTER TABLE \"measure_data\" ALTER \"measure_id\" DROP NOT NULL"; @@ -44,11 +43,11 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("measure_data"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("measure_data")).getAlterCount() == 1); Assert.assertTrue(visitor.getColumns().size() == 1); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest2.java index afcf109afa..b4172af384 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGAlterTableTest2 extends PGTest { - public void test_0() throws Exception { String sql = "ALTER TABLE \"reviews\" DROP \"review_type\""; @@ -44,11 +43,11 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("reviews"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("reviews")).getAlterCount() == 1); Assert.assertTrue(visitor.getColumns().size() == 1); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest3.java index 6b3fafed43..85df238edb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest3.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGAlterTableTest3 extends PGTest { - public void test_0() throws Exception { String sql = "ALTER TABLE issues "// + "ADD COLUMN issue_creation_date_ms BIGINT NULL, "// @@ -50,11 +49,11 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("issues"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("issues")).getAlterCount() == 1); Assert.assertEquals(visitor.getColumns().size(), 6); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommentTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommentTest.java index c3e26be4a1..7bc4bef92d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommentTest.java @@ -27,38 +27,37 @@ import com.alibaba.druid.stat.TableStat; public class PGCommentTest extends PGTest { - - public void test_0() { - String sql = "/*multiline comment test" - + ".\r\n multiline comment test select * from a;"; + public void test_0() { + String sql = "/*multiline comment test" + + ".\r\n multiline comment test select * from a;"; + + PGSQLStatementParser parser; + try { + parser = new PGSQLStatementParser(sql); + parser.parseStatementList(); + } catch (Exception e) { + assertTrue(e instanceof ParserException); + } + } - PGSQLStatementParser parser; - try { - parser = new PGSQLStatementParser(sql); - parser.parseStatementList(); - } catch (Exception e) { - assertTrue(e instanceof ParserException); - } - } - - public void test_1() { - String sql = "select a.id,--single line comment test a.name from a;"; + public void test_1() { + String sql = "select a.id,--single line comment test a.name from a;"; - PGSQLStatementParser parser; - try { - parser = new PGSQLStatementParser(sql); - parser.parseStatementList(); - } catch (Exception e) { - assertTrue(e instanceof ParserException); - } - } + PGSQLStatementParser parser; + try { + parser = new PGSQLStatementParser(sql); + parser.parseStatementList(); + } catch (Exception e) { + assertTrue(e instanceof ParserException); + } + } public void test_2() throws Exception { String sql = "/*multiline comment test" - + ".\r\n multiline comment test*" - + "/select --single line comment test\r\na.id," - + "/*multiline comment test*/" - + "a.name from a;"; + + ".\r\n multiline comment test*" + + "/select --single line comment test\r\na.id," + + "/*multiline comment test*/" + + "a.name from a;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateIndexTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateIndexTest_0.java index d4d7e74fd3..d0bcd82756 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateIndexTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateIndexTest_0.java @@ -25,7 +25,6 @@ import java.util.List; public class PGCreateIndexTest_0 extends PGTest { - public void test_0() throws Exception { String sql = "CREATE UNIQUE INDEX \"test_idx\" ON \"public\".\"city\" USING btree (\"name\");"; @@ -49,7 +48,7 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().get(new TableStat.Name("public.city")).getCreateIndexCount() == 1); - assertEquals(1, visitor.getColumns().size() ); + assertEquals(1, visitor.getColumns().size()); } public void test_1() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateSequenceTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateSequenceTest0.java index 5ee593de14..932328373a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateSequenceTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateSequenceTest0.java @@ -25,7 +25,6 @@ import java.util.List; public class PGCreateSequenceTest0 extends PGTest { - public void test_0() throws Exception { String sql = "\n" + "create sequence SEQ_CONTRACT_OPER_ID \n" + @@ -38,9 +37,9 @@ public void test_0() throws Exception { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + assertEquals("CREATE SEQUENCE SEQ_CONTRACT_OPER_ID START WITH 1 INCREMENT BY 1 NO MAXVALUE NO CYCLE CACHE 10;", SQLUtils.toPGString(stmt)); - + assertEquals("create sequence SEQ_CONTRACT_OPER_ID start with 1 increment by 1 no maxvalue no cycle cache 10;", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_0.java index 343339ff3e..51d9018357 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_0.java @@ -26,12 +26,11 @@ import com.alibaba.druid.stat.TableStat; public class PGCreateTableTest_0 extends PGTest { - public void test_0() throws Exception { String sql = "CREATE TABLE my_first_table (" + // - " first_column text," + // - " second_column integer" + // - ");"; + " first_column text," + // + " second_column integer" + // + ");"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); @@ -47,11 +46,11 @@ public void test_0() throws Exception { // System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("my_first_table"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("my_first_table")).getCreateCount() == 1); Assert.assertTrue(visitor.getColumns().size() == 2); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_1.java index 4e1a683b01..ee22fbf2cb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_1.java @@ -26,13 +26,12 @@ import com.alibaba.druid.stat.TableStat; public class PGCreateTableTest_1 extends PGTest { - public void test_0() throws Exception { String sql = "CREATE TABLE products (" + // - " product_no integer," + // - " name text," + // - " price numeric" + // - ");"; + " product_no integer," + // + " name text," + // + " price numeric" + // + ");"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_10.java index d0dd5430f5..2f5332b4f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_10.java @@ -25,7 +25,6 @@ import java.util.List; public class PGCreateTableTest_10 extends PGTest { - public void test_0() throws Exception { String sql = "CREATE TABLE KTV.ALI_KTV_LEADS_AREA_FIX_TBD (\n" + "\tID VARCHAR(200) NOT NULL,\n" + @@ -36,13 +35,13 @@ public void test_0() throws Exception { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + assertEquals("CREATE TABLE KTV.ALI_KTV_LEADS_AREA_FIX_TBD (\n" + "\tID VARCHAR(200) NOT NULL,\n" + "\tTYPE VARCHAR(200),\n" + "\tCONSTRAINT idx_ALI_KTV_LEADS_AREA_FIX_TBD_PK0 PRIMARY KEY (ID)\n" + ")", SQLUtils.toPGString(stmt)); - + assertEquals("create table KTV.ALI_KTV_LEADS_AREA_FIX_TBD (\n" + "\tID VARCHAR(200) not null,\n" + "\tTYPE VARCHAR(200),\n" + @@ -61,7 +60,7 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().get(new TableStat.Name("KTV.ALI_KTV_LEADS_AREA_FIX_TBD")).getCreateCount() == 1); - assertEquals(3, visitor.getColumns().size() ); + assertEquals(3, visitor.getColumns().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_11.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_11.java index 6746e8ec0c..02d13ec58e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_11.java @@ -25,7 +25,6 @@ import java.util.List; public class PGCreateTableTest_11 extends PGTest { - public void test_0() throws Exception { String sql = "CREATE TABLE KTV.KTV_FUNCTION_ROLE_20151211 (\n" + "\tURL VARCHAR(150),\n" + @@ -37,14 +36,14 @@ public void test_0() throws Exception { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + assertEquals("CREATE TABLE KTV.KTV_FUNCTION_ROLE_20151211 (\n" + "\tURL VARCHAR(150),\n" + "\tFUNCTION VARCHAR(1002),\n" + "\tROLE VARCHAR(100),\n" + "\t\"COUNT\" VARCHAR(102)\n" + ")", SQLUtils.toPGString(stmt)); - + assertEquals("create table KTV.KTV_FUNCTION_ROLE_20151211 (\n" + "\tURL VARCHAR(150),\n" + "\tFUNCTION VARCHAR(1002),\n" + @@ -64,7 +63,7 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().get(new TableStat.Name("KTV.KTV_FUNCTION_ROLE_20151211")).getCreateCount() == 1); - assertEquals(4, visitor.getColumns().size() ); + assertEquals(4, visitor.getColumns().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_12.java index 8e835a86ec..3470be0cac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_12.java @@ -25,7 +25,6 @@ import java.util.List; public class PGCreateTableTest_12 extends PGTest { - public void test_0() throws Exception { String sql = "CREATE TABLE \"public\".\"city\" (\n" + " \"id\" varchar(6) COLLATE \"default\" NOT NULL,\n" + @@ -37,13 +36,13 @@ public void test_0() throws Exception { PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + assertEquals("CREATE TABLE \"public\".\"city\" (\n" + "\t\"id\" varchar(6) NOT NULL,\n" + "\t\"name\" varchar(32) NOT NULL\n" + ")\n" + "WITH (OIDS = false);", SQLUtils.toPGString(stmt)); - + assertEquals("create table \"public\".\"city\" (\n" + "\t\"id\" varchar(6) not null,\n" + "\t\"name\" varchar(32) not null\n" + @@ -62,7 +61,7 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().get(new TableStat.Name("public.city")).getCreateCount() == 1); - assertEquals(2, visitor.getColumns().size() ); + assertEquals(2, visitor.getColumns().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_13.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_13.java index 5c5761a3c0..9e08187bc2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_13.java @@ -25,7 +25,6 @@ import java.util.List; public class PGCreateTableTest_13 extends PGTest { - public void test_0() throws Exception { String sql = "CREATE index fact_pageview_sum_p_day_id_idx ON fact_pageview_sum USING btree (p_day_id);"; @@ -49,7 +48,7 @@ public void test_0() throws Exception { // assertTrue(visitor.getTables().get(new TableStat.Name("fact_pageview_sum")).getCreateCount() == 1); - assertEquals(1, visitor.getColumns().size() ); + assertEquals(1, visitor.getColumns().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_2.java index 321e36fcc8..364d6de66c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_2.java @@ -26,13 +26,12 @@ import com.alibaba.druid.stat.TableStat; public class PGCreateTableTest_2 extends PGTest { - public void test_0() throws Exception { String sql = "CREATE TABLE products (" + // - " product_no integer," + // - " name text," + // - " price numeric DEFAULT 9.99" + // - ");"; + " product_no integer," + // + " name text," + // + " price numeric DEFAULT 9.99" + // + ");"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_3.java index 82224495b1..7005a48d7a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_3.java @@ -26,13 +26,12 @@ import com.alibaba.druid.stat.TableStat; public class PGCreateTableTest_3 extends PGTest { - public void test_0() throws Exception { String sql = "CREATE TABLE products (" + // - " product_no integer," + // - " name text," + // - " price numeric DEFAULT nextval('products_product_no_seq')" + // - ");"; + " product_no integer," + // + " name text," + // + " price numeric DEFAULT nextval('products_product_no_seq')" + // + ");"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_4.java index cd44b2ccce..69ea19baf8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_4.java @@ -27,13 +27,12 @@ import com.alibaba.druid.stat.TableStat; public class PGCreateTableTest_4 extends PGTest { - public void test_0() throws Exception { String sql = "CREATE TABLE products (" + // - " product_no integer," + // - " name text," + // - " price numeric CHECK (price > 0)" + // - ");"; + " product_no integer," + // + " name text," + // + " price numeric CHECK (price > 0)" + // + ");"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); @@ -45,7 +44,7 @@ public void test_0() throws Exception { + "\n\tprice numeric" + "\n\t\tCHECK (price > 0)" + "\n);", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("create table products (" + "\n\tproduct_no integer," + "\n\tname text," diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_5.java index 11fa9353b7..9199be985d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_5.java @@ -27,20 +27,19 @@ import com.alibaba.druid.stat.TableStat; public class PGCreateTableTest_5 extends PGTest { - public void test_0() throws Exception { String sql = "CREATE TABLE products (" + // - " state char(2)" + // - ") INHERITS (cities);"; + " state char(2)" + // + ") INHERITS (cities);"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + Assert.assertEquals("CREATE TABLE products (" + "\n\tstate char(2)" + "\n) INHERITS (cities);", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("create table products (" + "\n\tstate char(2)" + "\n) inherits (cities);", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_6.java index d742f52c7a..cdbc74d1e8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_6.java @@ -26,19 +26,18 @@ import java.util.List; public class PGCreateTableTest_6 extends PGTest { - public void test_0() throws Exception { String sql = "create table xxx as select * from xxx"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + assertEquals("CREATE TABLE xxx\n" + "AS\n" + "SELECT *\n" + "FROM xxx", SQLUtils.toPGString(stmt)); - + assertEquals("create table xxx\n" + "as\n" + "select *\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_7.java index bf8c8465d8..70c8c23f99 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_7.java @@ -25,14 +25,13 @@ import java.util.List; public class PGCreateTableTest_7 extends PGTest { - public void test_0() throws Exception { String sql = "create table test_site_data_select_111 AS select * from postman_trace_info_one where lng>0 and lat>0 and site_id='17814' ;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + assertEquals("CREATE TABLE test_site_data_select_111\n" + "AS\n" + "SELECT *\n" + @@ -40,7 +39,7 @@ public void test_0() throws Exception { "WHERE lng > 0\n" + "\tAND lat > 0\n" + "\tAND site_id = '17814';", SQLUtils.toPGString(stmt)); - + assertEquals("create table test_site_data_select_111\n" + "as\n" + "select *\n" + @@ -61,7 +60,7 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().get(new TableStat.Name("test_site_data_select_111")).getCreateCount() == 1); - assertEquals(4, visitor.getColumns().size() ); + assertEquals(4, visitor.getColumns().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_8.java index 6cf310f445..6975dec1f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_8.java @@ -25,14 +25,13 @@ import java.util.List; public class PGCreateTableTest_8 extends PGTest { - public void test_0() throws Exception { String sql = "create table if not exists test_site_data_select_111 AS select * from postman_trace_info_one where lng>0 and lat>0 and site_id='17814' ;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + assertEquals("CREATE TABLE IF NOT EXISTS test_site_data_select_111\n" + "AS\n" + "SELECT *\n" + @@ -40,7 +39,7 @@ public void test_0() throws Exception { "WHERE lng > 0\n" + "\tAND lat > 0\n" + "\tAND site_id = '17814';", SQLUtils.toPGString(stmt)); - + assertEquals("create table if not exists test_site_data_select_111\n" + "as\n" + "select *\n" + @@ -61,7 +60,7 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().get(new TableStat.Name("test_site_data_select_111")).getCreateCount() == 1); - assertEquals(4, visitor.getColumns().size() ); + assertEquals(4, visitor.getColumns().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_9.java index 07fcb5e2c3..aa9a9cb167 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCreateTableTest_9.java @@ -25,19 +25,18 @@ import java.util.List; public class PGCreateTableTest_9 extends PGTest { - public void test_0() throws Exception { String sql = "create table test(id bigint, TYPE varchar(20))"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - + assertEquals("CREATE TABLE test (\n" + "\tid bigint,\n" + "\tTYPE varchar(20)\n" + ")", SQLUtils.toPGString(stmt)); - + assertEquals("create table test (\n" + "\tid bigint,\n" + "\tTYPE varchar(20)\n" + @@ -55,7 +54,7 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().get(new TableStat.Name("test")).getCreateCount() == 1); - assertEquals(2, visitor.getColumns().size() ); + assertEquals(2, visitor.getColumns().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java index 0b12e5e376..b75061b914 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.stat.TableStat; public class PGDeleteTest extends PGTest { - public void test_0() throws Exception { String sql = "DELETE FROM films USING producers WHERE producer_id = producers.id AND producers.name = 'foo';"; @@ -58,16 +57,16 @@ public void test_0() throws Exception { } public void test_1() { - String sql = "delete from test01 as a where a.id = 2"; - PGSQLStatementParser parser = new PGSQLStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "delete from test01 as a where a.id = 2"; + PGSQLStatementParser parser = new PGSQLStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); - assertTrue(statementList.size() == 1); - assertTrue(statemen instanceof PGDeleteStatement); - PGDeleteStatement delete = (PGDeleteStatement) statemen; - assertTrue(delete.getAlias().equalsIgnoreCase("a")); - assertTrue(delete.getTableName().getSimpleName().equals("test01")); - } - + assertTrue(statementList.size() == 1); + assertTrue(statemen instanceof PGDeleteStatement); + PGDeleteStatement delete = (PGDeleteStatement) statemen; + assertTrue(delete.getAlias().equalsIgnoreCase("a")); + assertTrue(delete.getTableName().getSimpleName().equals("test01")); + } + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest10.java index 40b3247ca7..0e4344956a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest10.java @@ -24,7 +24,6 @@ import java.util.List; public class PGDeleteTest10 extends PGTest { - public void test_0() throws Exception { String sql = "delete from account a using (values (1), (7)) as tmp(id) WHERE a.id = tmp.id"; @@ -47,7 +46,7 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().containsKey(new TableStat.Name("account"))); - assertEquals(1, visitor.getColumns().size() ); + assertEquals(1, visitor.getColumns().size()); assertTrue(visitor.containsColumn("account", "id")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java index a153334715..1577be277c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGDeleteTest2 extends PGTest { - public void test_0() throws Exception { String sql = "DELETE FROM tasks WHERE CURRENT OF c_tasks;"; @@ -49,5 +48,5 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getColumns().isEmpty()); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java index 68a33c56f5..7f276c05ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGDeleteTest3 extends PGTest { - public void test_0() throws Exception { String sql = "DELETE FROM tasks WHERE status = 'DONE' RETURNING *;"; @@ -49,5 +48,5 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getColumns().size() == 1); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java index c5e0bb9550..246b95ed68 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGDeleteTest4 extends PGTest { - public void test_0() throws Exception { String sql = "DELETE FROM films WHERE producer_id IN (SELECT id FROM producers WHERE name = 'foo');"; @@ -48,11 +47,11 @@ public void test_0() throws Exception { // System.out.println("coditions : " + visitor.getConditions()); Assert.assertTrue(visitor.getColumns().size() == 3); - + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "producer_id"))); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("producers", "id"))); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("producers", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java index 76076308c3..00902c8d49 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGDeleteTest5 extends PGTest { - public void test_0() throws Exception { String sql = "DELETE FROM films USING producers WHERE producer_id = producers.id AND producers.name = 'foo';"; @@ -50,11 +49,11 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("producers"))); Assert.assertTrue(visitor.getColumns().size() == 3); - + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "producer_id"))); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("producers", "id"))); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("producers", "name"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest6.java index ee41a60805..7399f51478 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest6.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGDeleteTest6 extends PGTest { - public void test_0() throws Exception { String sql = "WITH moved_rows AS (" + " DELETE FROM products" @@ -57,9 +56,9 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products_log"))); Assert.assertTrue(visitor.getColumns().size() == 1); - + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("products", "date"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest7.java index 7ba959e25c..1c9f55038d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest7.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGDeleteTest7 extends PGTest { - public void test_0() throws Exception { String sql = "WITH t AS (" + " DELETE FROM foo" @@ -51,9 +50,9 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("bar"))); Assert.assertTrue(visitor.getColumns().isEmpty()); - + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("products", "date"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest8.java index 0c887bec67..33ed83b8b2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest8.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGDeleteTest8 extends PGTest { - public void test_0() throws Exception { String sql = "WITH RECURSIVE included_parts(sub_part, part) AS (" + " SELECT sub_part, part FROM parts WHERE part = 'our_product'" @@ -55,11 +54,11 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().containsKey(new TableStat.Name("parts"))); - assertEquals(2, visitor.getColumns().size() ); - + assertEquals(2, visitor.getColumns().size()); + assertTrue(visitor.containsColumn("parts", "sub_part")); assertTrue(visitor.containsColumn("parts", "sub_part")); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest9.java index 5b3961e33e..f659132451 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest9.java @@ -24,7 +24,6 @@ import java.util.List; public class PGDeleteTest9 extends PGTest { - public void test_0() throws Exception { String sql = "DELETE FROM ecc_cpr.ccg_gts_Boardlw i\n" + "WHERE i.contract_header_id = ?"; @@ -47,10 +46,10 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().containsKey(new TableStat.Name("ecc_cpr.ccg_gts_Boardlw"))); - assertEquals(1, visitor.getColumns().size() ); - + assertEquals(1, visitor.getColumns().size()); + assertTrue(visitor.containsColumn("ecc_cpr.ccg_gts_Boardlw", "contract_header_id")); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest.java index 76fc2223ab..1f5662af73 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest.java @@ -22,7 +22,7 @@ public void test_pg() throws Exception { List parameters = new ArrayList(); PGExportParameterVisitor visitor = new PGExportParameterVisitor(parameters); stmt.accept(visitor); - + Assert.assertEquals(1, parameters.size()); Assert.assertEquals(1, parameters.get(0)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest1.java index 1bb100cf1a..9dab570b30 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest1.java @@ -20,9 +20,9 @@ public void test_pg() throws Exception { PGExportParameterVisitor visitor = new PGExportParameterVisitor(); stmt.accept(visitor); - + List parameters = visitor.getParameters(); - + Assert.assertEquals(1, parameters.size()); Assert.assertEquals(1, parameters.get(0)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFormatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFormatTest.java index 239fd77201..a9871cdf31 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFormatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFormatTest.java @@ -22,14 +22,13 @@ import com.alibaba.druid.util.JdbcUtils; public class PGFormatTest extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE foo (fooid int, foosubid int, fooname text);"; String formatedSql = SQLUtils.format(sql, JdbcUtils.POSTGRESQL); Assert.assertEquals("CREATE TABLE foo (" + // - "\n\tfooid int," + // - "\n\tfoosubid int," + // - "\n\tfooname text" + // - "\n);", formatedSql); + "\n\tfooid int," + // + "\n\tfoosubid int," + // + "\n\tfooname text" + // + "\n);", formatedSql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java index 4b6202cb2c..fc72099b42 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java @@ -27,7 +27,6 @@ import com.alibaba.druid.stat.TableStat; public class PGInsertTest0 extends PGTest { - public void test_0() throws Exception { String sql = "INSERT INTO films VALUES ('UA502', 'Bananas', 105, '1971-07-13', 'Comedy', '82 minutes');"; @@ -48,19 +47,19 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); Assert.assertEquals(0, visitor.getColumns().size()); - + // Assert.assertTrue(visitor.getFields().contains(new TableStat.Column("films", "producer_id"))); } public void test_1() { - String sql = "insert into test01 DEFAULT VALUES"; - PGSQLStatementParser parser = new PGSQLStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "insert into test01 DEFAULT VALUES"; + PGSQLStatementParser parser = new PGSQLStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); - assertTrue(statemen instanceof PGInsertStatement); - PGInsertStatement insert = (PGInsertStatement) statemen; - assertTrue(insert.getTableName().getSimpleName() - .equalsIgnoreCase("test01")); - } + assertTrue(statemen instanceof PGInsertStatement); + PGInsertStatement insert = (PGInsertStatement) statemen; + assertTrue(insert.getTableName().getSimpleName() + .equalsIgnoreCase("test01")); + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java index 51aec08ed1..b3ff829122 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGInsertTest1 extends PGTest { - public void test_0() throws Exception { String sql = "INSERT INTO films (code, title, did, date_prod, kind) VALUES ('T_601', 'Yojimbo', 106, '1961-06-16', 'Drama');"; @@ -47,7 +46,7 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); Assert.assertEquals(5, visitor.getColumns().size()); - + Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "kind"))); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "code"))); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "date_prod"))); @@ -55,5 +54,5 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "did"))); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest10.java index 6945b2b235..a8759eb20b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest10.java @@ -24,7 +24,6 @@ import java.util.List; public class PGInsertTest10 extends PGTest { - public void test_0() throws Exception { String sql = "INSERT INTO test VALUES (B'101', B'00');"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest11.java index 1e07bb508f..ce06be379f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest11.java @@ -24,7 +24,6 @@ import java.util.List; public class PGInsertTest11 extends PGTest { - public void test_0() throws Exception { String sql = "INSERT INTO test VALUES (B'10'::bit(3), B'101');"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest12_issue_2192.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest12_issue_2192.java index 3501ed530f..2bc74ebabb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest12_issue_2192.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest12_issue_2192.java @@ -24,7 +24,6 @@ import java.util.List; public class PGInsertTest12_issue_2192 extends PGTest { - public void test_0() throws Exception { String sql = "insert into test1 as xx (tid,tid1,tvalue)\n" + "values (1,1,1),(2,2,2)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest13.java index 061d91e711..fdf87cbe1f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest13.java @@ -24,7 +24,6 @@ import java.util.List; public class PGInsertTest13 extends PGTest { - public void test_0() throws Exception { String sql = "INSERT INTO profile_group_execution(\n" + " \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest14.java index a4c19c619a..fe5458c855 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest14.java @@ -23,7 +23,6 @@ import java.util.List; public class PGInsertTest14 extends PGTest { - public void test_0() throws Exception { String sql = "insert into wf_task_geom\n" + " (task_id,geom_in_gds,polygon,lseg)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java index 92e5de508b..5adfcbe9cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java @@ -26,11 +26,10 @@ import com.alibaba.druid.stat.TableStat; public class PGInsertTest2 extends PGTest { - public void test_0() throws Exception { String sql = "INSERT INTO films (code, title, did, date_prod, kind) VALUES" - + " ('B6717', 'Tampopo', 110, '1985-02-10', 'Comedy'), " - + "('HG120', 'The Dinner Game', 140, DEFAULT, 'Comedy');"; + + " ('B6717', 'Tampopo', 110, '1985-02-10', 'Comedy'), " + + "('HG120', 'The Dinner Game', 140, DEFAULT, 'Comedy');"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java index 059485f6b1..c81e86e6c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGInsertTest3 extends PGTest { - public void test_0() throws Exception { String sql = "INSERT INTO films SELECT * FROM tmp_films WHERE date_prod < '2004-05-07';"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java index c8787c5a3c..90308eb90d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGInsertTest4 extends PGTest { - public void test_0() throws Exception { String sql = "INSERT INTO distributors (did, dname) VALUES (DEFAULT, 'XYZ Widgets') RETURNING did;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java index 8047600b11..9401fb75eb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java @@ -26,14 +26,13 @@ import com.alibaba.druid.stat.TableStat; public class PGInsertTest5 extends PGTest { - public void test_0() throws Exception { String sql = "WITH upd AS (" + // - " UPDATE employees SET sales_count = sales_count + 1 WHERE id =" + // - " (SELECT sales_person FROM accounts WHERE name = 'Acme Corporation')" + // - " RETURNING *" + // - ")" + // - "INSERT INTO employees_log SELECT *, current_timestamp FROM upd;"; + " UPDATE employees SET sales_count = sales_count + 1 WHERE id =" + // + " (SELECT sales_person FROM accounts WHERE name = 'Acme Corporation')" + // + " RETURNING *" + // + ")" + // + "INSERT INTO employees_log SELECT *, current_timestamp FROM upd;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest6_multi.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest6_multi.java index 0eac2ce29d..4b08afcac4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest6_multi.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest6_multi.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class PGInsertTest6_multi extends PGTest { - public void test_0() throws Exception { String sql = "INSERT INTO products (product_no, name, price) VALUES" + "\n (1, 'Cheese', 9.99)," diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest7.java index 93d6a1d6d4..8caa44307c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest7.java @@ -25,7 +25,6 @@ import java.util.List; public class PGInsertTest7 extends PGTest { - public void test_0() throws Exception { String sql = "insert into test(k,v) values (1,2) ON CONFLICT (k) DO UPDATE SET v = EXCLUDED.v; "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest8.java index 74cf493887..1baab26d9b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest8.java @@ -25,7 +25,6 @@ import java.util.List; public class PGInsertTest8 extends PGTest { - public void test_0() throws Exception { String sql = "INSERT INTO distributors (did, dname) VALUES (9, 'Antwerp Design')\n" + " ON CONFLICT ON CONSTRAINT distributors_pkey DO NOTHING;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest9.java index c2b737c9fa..69120f6616 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest9.java @@ -25,7 +25,6 @@ import java.util.List; public class PGInsertTest9 extends PGTest { - public void test_0() throws Exception { String sql = "INSERT INTO distributors (did, dname) VALUES (10, 'Conrad International')\n" + " ON CONFLICT (did) WHERE is_active DO NOTHING;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGMergeIntoTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGMergeIntoTest0.java index 99066aab5f..479deec6ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGMergeIntoTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGMergeIntoTest0.java @@ -24,7 +24,6 @@ import java.util.List; public class PGMergeIntoTest0 extends PGTest { - public void test_0() throws Exception { String sql = "MERGE INTO CustomerAccount CA \n" + "USING (Select CustomerId, TransactionValue From RecentTransactions) AS T \n" + @@ -64,5 +63,5 @@ public void test_0() throws Exception { // assertTrue(visitor.containsColumn("student", "grade")); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest.java index 71c2a8d638..e04c023ac6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcUtils; public class PGSetTest extends PGTest { - protected void setUp() throws Exception { super.setUp(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest2.java index f383d2dd6e..0931aff194 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSetTest2.java @@ -26,7 +26,6 @@ import java.util.List; public class PGSetTest2 extends PGTest { - protected void setUp() throws Exception { super.setUp(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest.java index 89dcf11cdb..2a8798968f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.wall.spi.PGWallProvider; public class PGShowTest extends PGTest { - public void test_0() throws Exception { String sql = "SHOW max_identifier_length"; @@ -43,18 +42,18 @@ public void test_0() throws Exception { // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); - + { WallProvider provider = new PGWallProvider(); Assert.assertTrue(provider.checkValid(sql)); } // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("reviews"))); - + //Assert.assertTrue(visitor.getTables().get(new TableStat.Name("reviews")).getAlterCount() == 1); //Assert.assertTrue(visitor.getColumns().size() == 1); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGUpdateTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGUpdateTest0.java index adb4919ee6..13f38bd824 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGUpdateTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGUpdateTest0.java @@ -24,7 +24,6 @@ import java.util.List; public class PGUpdateTest0 extends PGTest { - public void test_0() throws Exception { String sql = "update student a set grade = tmp.grade from (values (1, 'A')) as tmp(id, grade) where a.id = tmp.id"; @@ -48,11 +47,11 @@ public void test_0() throws Exception { assertTrue(visitor.getTables().containsKey(new TableStat.Name("student"))); - assertEquals(2, visitor.getColumns().size() ); - + assertEquals(2, visitor.getColumns().size()); + assertTrue(visitor.containsColumn("student", "id")); assertTrue(visitor.containsColumn("student", "grade")); } - + } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java index 00f31bd63c..6d275191c1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcUtils; public class PostgresqlResourceTest extends PGTest { - public void test_0() throws Exception { // 13 exec_test("bvt/parser/postgresql-0.txt"); @@ -131,7 +130,7 @@ public void exec_test(String resource) throws Exception { } void mergValidate(String sql, String expect) { - PGSQLStatementParser parser = new PGSQLStatementParser(sql); + PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java index f6fd86e3a2..6fbb38a687 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.stat.TableStat; public class TruncateTest extends PGTest { - public void test_0() throws Exception { String sql = "TRUNCATE bigtable, fattable;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitStringTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitStringTest.java index b84653a557..f816fd82df 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitStringTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitStringTest.java @@ -9,7 +9,6 @@ import com.alibaba.druid.util.JdbcConstants; public class BitStringTest extends PGTest { - public void test_timestamp() throws Exception { String sql = "B'101'"; PGExprParser parser = new PGExprParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitsTest.java index 4eddbccf4e..0de7915f1f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitsTest.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; public class BitsTest extends PGTest { - public void test_timestamp() throws Exception { String sql = "44::bit(10)"; PGExprParser parser = new PGExprParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BooleanTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BooleanTest.java index d7224c572d..ea7cf08767 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BooleanTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BooleanTest.java @@ -32,7 +32,7 @@ public void test_0() throws Exception { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test1"))); Assert.assertEquals(0, visitor.getColumns().size()); - + // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "kind"))); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "code"))); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "date_prod"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/TimestampTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/TimestampTest.java index b7b7f087ea..2a2021ded7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/TimestampTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/TimestampTest.java @@ -12,7 +12,7 @@ public void test_timestamp() throws Exception { SQLTimestampExpr expr = (SQLTimestampExpr) parser.expr(); System.out.println(expr.toString()); } - + public void test_timestamp_with_timezone() throws Exception { String sql = "TIMESTAMP WITH TIME ZONE '2004-10-19 10:23:54+02'"; PGExprParser parser = new PGExprParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddCheck0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddCheck0.java index f2440c63c1..aa83a37ae4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddCheck0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddCheck0.java @@ -12,7 +12,7 @@ public class PGAlterTableAddCheck0 extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products ADD CHECK (name <> '');"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -29,7 +29,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddColumnTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddColumnTest0.java index 856d6d0e82..1541ae5af9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddColumnTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddColumnTest0.java @@ -12,7 +12,7 @@ public class PGAlterTableAddColumnTest0 extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products ADD COLUMN description text;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -30,7 +30,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddColumnTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddColumnTest1.java index 8014d2ba3a..955b13cf55 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddColumnTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddColumnTest1.java @@ -12,7 +12,7 @@ public class PGAlterTableAddColumnTest1 extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products ADD COLUMN description text CHECK (description <> '');"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -31,7 +31,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddColumnTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddColumnTest2.java index 2277b468ce..a3385e78ae 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddColumnTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddColumnTest2.java @@ -11,7 +11,7 @@ public class PGAlterTableAddColumnTest2 extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE t_user ADD column aaa VARCHAR(10)"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -29,7 +29,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_user"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("t_user")).getAlterCount() == 1); Assert.assertTrue(visitor.getColumns().size() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddFk0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddFk0.java index 931dbf36e0..382ec296c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddFk0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddFk0.java @@ -12,7 +12,7 @@ public class PGAlterTableAddFk0 extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products ADD FOREIGN KEY (product_group_id) REFERENCES product_groups;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -29,7 +29,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddUnique0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddUnique0.java index dfa1e8fd44..c65b50a437 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddUnique0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAddUnique0.java @@ -12,7 +12,7 @@ public class PGAlterTableAddUnique0 extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products ADD CONSTRAINT some_name UNIQUE (product_no);"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -29,7 +29,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAlterColumnTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAlterColumnTest0.java index aa5b1d7f9f..9947956cda 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAlterColumnTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableAlterColumnTest0.java @@ -11,7 +11,7 @@ public class PGAlterTableAlterColumnTest0 extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE organizations ALTER COLUMN guarded TYPE BOOLEAN, ALTER COLUMN guarded DROP NOT NULL"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -30,7 +30,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("organizations"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("organizations")).getAlterCount() == 1); Assert.assertTrue(visitor.getColumns().size() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropColumnTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropColumnTest0.java index eaff062070..5757f18221 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropColumnTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropColumnTest0.java @@ -12,7 +12,7 @@ public class PGAlterTableDropColumnTest0 extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products DROP COLUMN description;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -29,7 +29,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropColumnTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropColumnTest1.java index 31aa38c15a..02696166f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropColumnTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropColumnTest1.java @@ -12,7 +12,7 @@ public class PGAlterTableDropColumnTest1 extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products DROP COLUMN description CASCADE;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -29,7 +29,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropConstraint.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropConstraint.java index b79761f273..b75b63ffd9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropConstraint.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropConstraint.java @@ -12,7 +12,7 @@ public class PGAlterTableDropConstraint extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products DROP CONSTRAINT some_name;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -29,7 +29,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropDefault.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropDefault.java index 1b91080ec0..94a7b2ca0c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropDefault.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropDefault.java @@ -12,14 +12,14 @@ public class PGAlterTableDropDefault extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products ALTER COLUMN price DROP DEFAULT;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); print(statementList); - + Assert.assertEquals("ALTER TABLE products" + "\n\tALTER COLUMN price DROP DEFAULT;", stmt.toString()); @@ -32,7 +32,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropNotNull.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropNotNull.java index 922cb19c38..b4841c03bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropNotNull.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropNotNull.java @@ -12,14 +12,14 @@ public class PGAlterTableDropNotNull extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products ALTER COLUMN product_no DROP NOT NULL;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); print(statementList); - + Assert.assertEquals("ALTER TABLE products" + "\n\tALTER COLUMN product_no DROP NOT NULL;", stmt.toString()); @@ -32,7 +32,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableRenameTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableRenameTest.java index 7766dcd0d2..5d8dad2ceb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableRenameTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableRenameTest.java @@ -12,7 +12,7 @@ public class PGAlterTableRenameTest extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products RENAME TO items;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -29,7 +29,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableRenameTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableRenameTest1.java index dbdc65db34..15b2e344d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableRenameTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableRenameTest1.java @@ -12,7 +12,7 @@ public class PGAlterTableRenameTest1 extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products RENAME COLUMN product_no TO product_number;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -29,7 +29,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetDefault.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetDefault.java index c24daab705..7d6ce0d185 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetDefault.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetDefault.java @@ -12,14 +12,14 @@ public class PGAlterTableSetDefault extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products ALTER COLUMN price SET DEFAULT 7.77;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); print(statementList); - + Assert.assertEquals("ALTER TABLE products" + "\n\tALTER COLUMN price SET DEFAULT 7.77;", stmt.toString()); @@ -32,7 +32,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetNotNull.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetNotNull.java index c63689972d..8bf9cb3da9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetNotNull.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableSetNotNull.java @@ -12,14 +12,14 @@ public class PGAlterTableSetNotNull extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "ALTER TABLE products ALTER COLUMN product_no SET NOT NULL;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); print(statementList); - + Assert.assertEquals("ALTER TABLE products" + "\n\tALTER COLUMN product_no SET NOT NULL;", stmt.toString()); @@ -32,7 +32,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("products"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGDropTableIfExistsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGDropTableIfExistsTest.java index 6e80aabd97..fca259b32d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGDropTableIfExistsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGDropTableIfExistsTest.java @@ -12,7 +12,7 @@ public class PGDropTableIfExistsTest extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "DROP TABLE IF EXISTS t_report_1_19"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -29,7 +29,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_report_1_19"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("t_report_1_19")).getDropCount() == 1); Assert.assertTrue(visitor.getColumns().isEmpty()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGGrantTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGGrantTest0.java index 623aaa6427..5635993852 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGGrantTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGGrantTest0.java @@ -12,7 +12,7 @@ public class PGGrantTest0 extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "GRANT UPDATE ON accounts TO joe;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -29,7 +29,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("accounts"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("accounts")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("accounts")).getAlterCount() == 0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGRovokeTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGRovokeTest0.java index b9c7edf0e1..c17a048b49 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGRovokeTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGRovokeTest0.java @@ -12,7 +12,7 @@ public class PGRovokeTest0 extends PGTest { - public void test_0 () throws Exception { + public void test_0() throws Exception { String sql = "REVOKE ALL ON accounts FROM PUBLIC;"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); @@ -29,7 +29,7 @@ public void test_0 () throws Exception { System.out.println("fields : " + visitor.getColumns()); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("accounts"))); - + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("accounts")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("accounts")).getAlterCount() == 0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/AliasTest_Type.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/AliasTest_Type.java index de3dc529cc..d074b848d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/AliasTest_Type.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/AliasTest_Type.java @@ -1,4 +1,5 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; + import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; @@ -6,9 +7,11 @@ import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcUtils; import org.junit.Assert; + import java.util.List; + /** - *测试 TYPE作为别名 + * 测试 TYPE作为别名 */ public class AliasTest_Type extends PGTest { public void test_timestamp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/ArrayTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/ArrayTest.java index 715d6754c5..1b425ebbad 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/ArrayTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/ArrayTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.SQLUtils; @@ -15,7 +14,7 @@ public class ArrayTest extends PGTest { public void test_timestamp() throws Exception { String sql = "cast(xx as varchar(12)[])"; PGExprParser parser = new PGExprParser(sql); - SQLExpr expr =parser.expr(); + SQLExpr expr = parser.expr(); Assert.assertEquals("CAST(xx AS varchar(12)[])", SQLUtils.toPGString(expr)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/BoxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/BoxTest.java index 8a3f025851..d54afd7e45 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/BoxTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/BoxTest.java @@ -15,7 +15,7 @@ public void test_timestamp() throws Exception { String sql = "box '((0,0),(1,1))' + point '(2.0,0)'"; PGExprParser parser = new PGExprParser(sql); SQLBinaryOpExpr binaryExpr = (SQLBinaryOpExpr) parser.expr(); - + PGBoxExpr box = (PGBoxExpr) binaryExpr.getLeft(); PGPointExpr point = (PGPointExpr) binaryExpr.getRight(); Assert.assertEquals("BOX '((0,0),(1,1))' + POINT '(2.0,0)'", binaryExpr.toString()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CidrTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CidrTest.java index 40e785937f..cc600f6aa1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CidrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CidrTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - import org.junit.Assert; import com.alibaba.druid.sql.PGTest; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CircleTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CircleTest.java index 6b2c0ef00d..f9dc5382b2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CircleTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CircleTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - import org.junit.Assert; import com.alibaba.druid.sql.PGTest; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/InetTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/InetTest.java index 4538230b93..93710d61ee 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/InetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/InetTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - import org.junit.Assert; import com.alibaba.druid.sql.PGTest; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/LineSegmentsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/LineSegmentsTest.java index 69ebcb6e7c..16ce5196e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/LineSegmentsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/LineSegmentsTest.java @@ -12,7 +12,7 @@ public void test_timestamp() throws Exception { String sql = "lseg '((-1,0),(1,0))'"; PGExprParser parser = new PGExprParser(sql); PGLineSegmentsExpr expr = (PGLineSegmentsExpr) parser.expr(); - + Assert.assertEquals("lseg '((-1,0),(1,0))'", expr.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/MacAddrTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/MacAddrTest.java index ac4b47410f..7580b66fdf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/MacAddrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/MacAddrTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGMacAddrExpr; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest.java index f9b286b2ca..52e56c2b76 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - import org.junit.Assert; import com.alibaba.druid.sql.PGTest; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest2.java index 5948c440b5..d65dc46a55 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest2.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - import org.junit.Assert; import com.alibaba.druid.sql.PGTest; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectForUpdateTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectForUpdateTest.java index 82f95b1013..c6bb6c4662 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectForUpdateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectForUpdateTest.java @@ -24,7 +24,6 @@ import java.util.List; public class PGSelectForUpdateTest extends PGTest { - public void test_0() throws Exception { String sql = "select pkvalue from dbtpktable where tablename = 'taturvisit' for update"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectIntoTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectIntoTest.java index 3f78e444f2..6719eaf86e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectIntoTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectIntoTest.java @@ -27,9 +27,9 @@ import java.util.List; public class PGSelectIntoTest extends PGTest { - public void test_0() throws Exception { - String sql = "SELECT * INTO films_recent FROM films WHERE date_prod >= '2002-01-01';"; - + public void test_0() throws Exception { + String sql = "SELECT * INTO films_recent FROM films WHERE date_prod >= '2002-01-01';"; + PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -39,27 +39,27 @@ public void test_0() throws Exception { PGSchemaStatVisitor visitor = new PGSchemaStatVisitor(); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); - + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films_recent"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("films"))); - + Assert.assertTrue(visitor.getColumns().contains(new Column("films", "*"))); Assert.assertTrue(visitor.getColumns().contains(new Column("films", "date_prod"))); - + String result = SQLUtils.toPGString(stmt); - Assert.assertEquals(result,"SELECT *" // + Assert.assertEquals(result, "SELECT *" // + "\nINTO films_recent" // + "\nFROM films" // + "\nWHERE date_prod >= '2002-01-01';"); - + String result_lcase = SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - Assert.assertEquals(result_lcase,"select *" // + Assert.assertEquals(result_lcase, "select *" // + "\ninto films_recent" // + "\nfrom films" // + "\nwhere date_prod >= '2002-01-01';"); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest.java index bb5ed19046..3dd371edb5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest.java @@ -27,10 +27,9 @@ public class PGSelectTest extends PGTest { - protected void setUp() throws Exception { super.setUp(); - + System.out.println(); } @@ -55,79 +54,79 @@ public void test_0() throws Exception { Assert.assertEquals(0, visitor.getColumns().size()); - + String mergedSql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.POSTGRESQL); System.out.println(mergedSql); } - + public void test_1() throws Exception { String sql = "select memberId , offerIds from cnres.function_select_get_seller_hot_offer_list('\\'gzyyd168\\'') as a(memberId character varying(20),offerIds character varying(4000))"; - + PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); // print(statementList); - + Assert.assertEquals(1, statementList.size()); - + PGSchemaStatVisitor visitor = new PGSchemaStatVisitor(); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); - - + + Assert.assertEquals(0, visitor.getColumns().size()); - + String mergedSql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.POSTGRESQL); System.out.println(mergedSql); } - + public void test_2() throws Exception { String sql = " select offerId , offerIds from cnres.function_select_get_self_rel_offer_by_behavior (' 350740 ') as a(offerId numeric,offerIds character varying(4000)) "; - + PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); // print(statementList); - + Assert.assertEquals(1, statementList.size()); - + PGSchemaStatVisitor visitor = new PGSchemaStatVisitor(); stmt.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); - - + + Assert.assertEquals(0, visitor.getColumns().size()); - + String mergedSql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.POSTGRESQL); System.out.println(mergedSql); } - + public void test_3() throws Exception { String sql = " select memberId , offerIds from cnres.function_select_get_seller_hot_offer_list('\\'-1\\'') as a(memberId character varying(20),offerIds character varying(4000)) "; - + PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); print(statementList); - + Assert.assertEquals(1, statementList.size()); - + PGSchemaStatVisitor visitor = new PGSchemaStatVisitor(); statemen.accept(visitor); - + // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); - - + + Assert.assertEquals(0, visitor.getColumns().size()); - + String mergedSql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.POSTGRESQL); System.out.println(mergedSql); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest1.java index 281db1766f..99a81ff6ca 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest1.java @@ -27,7 +27,6 @@ import java.util.List; public class PGSelectTest1 extends PGTest { - public void test_0() throws Exception { String sql = "SELECT * FROM t1 CROSS JOIN t2;"; @@ -48,25 +47,25 @@ public void test_0() throws Exception { Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(2, visitor.getTables().size()); } - + public void test_1() throws Exception { - String sql = "(select * from a) union select * from b"; - PGSQLStatementParser parser = new PGSQLStatementParser(sql); - List statementList = parser.parseStatementList(); - SQLStatement statemen = statementList.get(0); + String sql = "(select * from a) union select * from b"; + PGSQLStatementParser parser = new PGSQLStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); // print(statementList); - Assert.assertEquals(1, statementList.size()); - assertTrue(statemen instanceof PGSelectStatement); - PGSelectStatement select = (PGSelectStatement) statemen; - assertTrue(select.getSelect().getQuery() instanceof SQLUnionQuery); - SQLUnionQuery unionQuery = (SQLUnionQuery) select.getSelect() - .getQuery(); - assertTrue(unionQuery.getLeft() instanceof SQLSelectQueryBlock); - assertTrue(unionQuery.getRight() instanceof SQLSelectQueryBlock); - SQLSelectQueryBlock leftQueryBlock = (SQLSelectQueryBlock) unionQuery - .getLeft(); - assertTrue(leftQueryBlock.isParenthesized()); + Assert.assertEquals(1, statementList.size()); + assertTrue(statemen instanceof PGSelectStatement); + PGSelectStatement select = (PGSelectStatement) statemen; + assertTrue(select.getSelect().getQuery() instanceof SQLUnionQuery); + SQLUnionQuery unionQuery = (SQLUnionQuery) select.getSelect() + .getQuery(); + assertTrue(unionQuery.getLeft() instanceof SQLSelectQueryBlock); + assertTrue(unionQuery.getRight() instanceof SQLSelectQueryBlock); + SQLSelectQueryBlock leftQueryBlock = (SQLSelectQueryBlock) unionQuery + .getLeft(); + assertTrue(leftQueryBlock.isParenthesized()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest10.java index 75a20f518f..afdd948b14 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest10.java @@ -24,7 +24,6 @@ import java.util.List; public class PGSelectTest10 extends PGTest { - public void test_0() throws Exception { String sql = "SELECT nextval('passport_id_seq'::regclass) as id"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest11.java index d5d6b9ffd2..6a4fbe789c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest11.java @@ -24,7 +24,6 @@ import java.util.List; public class PGSelectTest11 extends PGTest { - public void test_0() throws Exception { String sql = "select \"xxx\"::varchar as xx from xxx;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest12.java index 7b1091abea..688ef0861b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest12.java @@ -24,7 +24,6 @@ import java.util.List; public class PGSelectTest12 extends PGTest { - public void test_0() throws Exception { String sql = "WITH regional_sales AS (" + " SELECT region, SUM(amount) AS total_sales" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest13.java index fd4a40abbb..279b0e36b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest13.java @@ -24,7 +24,6 @@ import java.util.List; public class PGSelectTest13 extends PGTest { - public void test_0() throws Exception { String sql = "WITH RECURSIVE t(n) AS (" + " VALUES (1)" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest14.java index 39f9bccbc2..a13de8d510 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest14.java @@ -23,7 +23,6 @@ import java.util.List; public class PGSelectTest14 extends PGTest { - public void test_0() throws Exception { String sql = "WITH RECURSIVE included_parts(sub_part, part, quantity) AS (" + " SELECT sub_part, part, quantity FROM parts WHERE part = 'our_product'" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest15.java index 78a56c0f36..4d728fb8db 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest15.java @@ -24,7 +24,6 @@ import java.util.List; public class PGSelectTest15 extends PGTest { - public void test_0() throws Exception { String sql = "WITH RECURSIVE search_graph(id, link, data, depth) AS (" + " SELECT g.id, g.link, g.data, 1" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest16.java index 66dce1eeaa..514e8d2edf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest16.java @@ -24,7 +24,6 @@ import java.util.List; public class PGSelectTest16 extends PGTest { - public void test_0() throws Exception { String sql = "WITH RECURSIVE search_graph(id, link, data, depth, path, cycle) AS (" + " SELECT g.id, g.link, g.data, 1," @@ -57,7 +56,7 @@ public void test_0() throws Exception { assertEquals(3, visitor.getColumns().size()); assertEquals(1, visitor.getTables().size()); - + assertTrue(visitor.getColumns().contains(new TableStat.Column("graph", "id"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("graph", "link"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("graph", "data"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest17.java index 892fe43a73..f9482a3ee7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest17.java @@ -24,7 +24,6 @@ import java.util.List; public class PGSelectTest17 extends PGTest { - public void test_0() throws Exception { String sql = "WITH RECURSIVE search_graph(id, link, data, depth, path, cycle) AS (" + " SELECT g.id, g.link, g.data, 1," diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest18.java index 6ae0585644..bead459b19 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest18.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest18 extends PGTest { - public void test_0() throws Exception { String sql = "WITH RECURSIVE t(n) AS (" + " SELECT 1" @@ -61,7 +60,7 @@ public void test_0() throws Exception { "from t\n" + "limit 100;", result); } - + Assert.assertEquals(1, statementList.size()); PGSchemaStatVisitor visitor = new PGSchemaStatVisitor(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest19.java index 9b7ce28728..a591b53d5b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest19.java @@ -24,7 +24,6 @@ import java.util.List; public class PGSelectTest19 extends PGTest { - public void test_0() throws Exception { String sql = "WITH t AS (" + " UPDATE products SET price = price * 1.05" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest2.java index 164b041907..6ec2c18869 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest2.java @@ -24,7 +24,6 @@ import java.util.List; public class PGSelectTest2 extends PGTest { - public void test_0() throws Exception { String sql = "SELECT * FROM t1 NATURAL INNER JOIN t2;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest20.java index 8f38cc1809..62b1df75a4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest20.java @@ -24,7 +24,6 @@ import java.util.List; public class PGSelectTest20 extends PGTest { - public void test_0() throws Exception { String sql = "WITH t AS (" + " UPDATE products SET price = price * 1.05" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest21.java index 1805b4c5b1..6064796294 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest21.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest21 extends PGTest { - public void test_0() throws Exception { String sql = "SELECT DISTINCT(type) FROM dbmis2_databases"; @@ -48,20 +47,20 @@ public void test_0() throws Exception { Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(1, visitor.getTables().size()); } - + public void test_1() throws Exception { - String sql = "with a(a1,b1) as (select * from b) select * from a"; + String sql = "with a(a1,b1) as (select * from b) select * from a"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); // print(statementList); - + assertTrue(statemen instanceof PGSelectStatement); - assertEquals(1, ((PGSelectStatement)statemen).getSelect().getWithSubQuery().getEntries().size()); + assertEquals(1, ((PGSelectStatement) statemen).getSelect().getWithSubQuery().getEntries().size()); StringBuffer sb = new StringBuffer(); - String alias = ((PGSelectStatement)statemen).getSelect().getWithSubQuery().getEntries().get(0).getAlias(); + String alias = ((PGSelectStatement) statemen).getSelect().getWithSubQuery().getEntries().get(0).getAlias(); assertEquals("a", alias); - assertEquals(2, ((PGSelectStatement)statemen).getSelect().getWithSubQuery().getEntries().get(0).getColumns().size()); + assertEquals(2, ((PGSelectStatement) statemen).getSelect().getWithSubQuery().getEntries().get(0).getColumns().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest22.java index 312f07ff36..2002feb6ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest22.java @@ -24,7 +24,6 @@ import java.util.List; public class PGSelectTest22 extends PGTest { - public void test_0() throws Exception { String sql = "SELECT i.relname, d.indisunique, a.attname" + " FROM pg_class t, pg_class i, pg_index d, pg_attribute " diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest23.java index 33088067de..f9373a2e68 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest23.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest23 extends PGTest { - public void test_0() throws Exception { String sql = "select id, login_name, name, password, salt, roles, register_date from user WHERE ( name like ? ) limit ? offset ?"; @@ -39,7 +38,7 @@ public void test_0() throws Exception { + "\nFROM user" + "\nWHERE name LIKE ?" + "\nLIMIT ? OFFSET ?", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select id, login_name, name, password, salt" + "\n\t, roles, register_date" + "\nfrom user" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest24.java index 7f65ec9847..3693516cd0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest24.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest24 extends PGTest { - public void test_0() throws Exception { String sql = "select wm_concat(article_id) over() from t_nds_web_article"; @@ -35,7 +34,7 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT wm_concat(article_id) OVER ()" + "\nFROM t_nds_web_article", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select wm_concat(article_id) over ()" + "\nfrom t_nds_web_article", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest25.java index 0deba769db..eff93b15b2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest25.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest25 extends PGTest { - public void test_0() throws Exception { String sql = "select COALESCE((SELECT project_deduct_mandays from mytable_01 limit 1)) from t"; @@ -39,7 +38,7 @@ public void test_0() throws Exception { + "\n\t\tLIMIT 1" + "\n\t))" + "\nFROM t", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select COALESCE((" + "\n\t\tselect project_deduct_mandays" + "\n\t\tfrom mytable_01" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest26.java index e84e61c8e7..2e05e15b32 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest26.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest26 extends PGTest { - public void test_0() throws Exception { String sql = "select '[{\"a\":\"foo\"},{\"b\":\"bar\"},{\"c\":\"baz\"}]'::json->2 from dual"; @@ -35,7 +34,7 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT '[{\"a\":\"foo\"},{\"b\":\"bar\"},{\"c\":\"baz\"}]'::json -> 2" + "\nFROM dual", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select '[{\"a\":\"foo\"},{\"b\":\"bar\"},{\"c\":\"baz\"}]'::json -> 2" + "\nfrom dual", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest27.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest27.java index fa62346ea4..672fc4388b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest27.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest27 extends PGTest { - public void test_0() throws Exception { String sql = "select '[{\"a\":\"foo\"},{\"b\":\"bar\"},{\"c\":\"baz\"}]'::json->>2 from dual"; @@ -35,7 +34,7 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT '[{\"a\":\"foo\"},{\"b\":\"bar\"},{\"c\":\"baz\"}]'::json ->> 2" + "\nFROM dual", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select '[{\"a\":\"foo\"},{\"b\":\"bar\"},{\"c\":\"baz\"}]'::json ->> 2" + "\nfrom dual", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest28.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest28.java index 7846a0e1d9..e9f627682b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest28.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest28 extends PGTest { - public void test_0() throws Exception { String sql = "select '{\"a\": {\"b\":{\"c\": \"foo\"}}}'::json #> '{a,b}' from dual"; @@ -35,7 +34,7 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT '{\"a\": {\"b\":{\"c\": \"foo\"}}}'::json #> '{a,b}'" + "\nFROM dual", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select '{\"a\": {\"b\":{\"c\": \"foo\"}}}'::json #> '{a,b}'" + "\nfrom dual", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest29.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest29.java index d43e87cae4..a216842d4e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest29.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest29 extends PGTest { - public void test_0() throws Exception { String sql = "select '{\"a\": {\"b\":{\"c\": \"foo\"}}}'::json #>> '{a,b}' from dual"; @@ -35,7 +34,7 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT '{\"a\": {\"b\":{\"c\": \"foo\"}}}'::json #>> '{a,b}'" + "\nFROM dual", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select '{\"a\": {\"b\":{\"c\": \"foo\"}}}'::json #>> '{a,b}'" + "\nfrom dual", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest3.java index 8875d6e22b..980477e539 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest3.java @@ -24,13 +24,12 @@ import java.util.List; public class PGSelectTest3 extends PGTest { - public void test_0() throws Exception { String sql = "SELECT TITLE_ID,WEB_ID,MENU_TYPE_ID,MENU_ID,TITLE" + // - ",SOURCE,INFO,RECOMMEND_FLAG,CREATE_TIME,CREATE_IP,CREATE_ACCENDANT_ID" + // - ",LAST_UPD_TIME,LAST_UPD_IP,LAST_UPD_ACCENDANT_ID,'http://cmp2.test.com/cmps' AS STR_BASE_URL" + // - ",'html' AS STR_SUFFIX FROM WEB_DATA_TITLE_LIST" + // - " WHERE WEB_ID=? AND MENU_ID=? AND MENU_TYPE_ID=? ORDER BY RECOMMEND_FLAG DESC ,LAST_UPD_TIME DESC OFFSET ? LIMIT ?"; + ",SOURCE,INFO,RECOMMEND_FLAG,CREATE_TIME,CREATE_IP,CREATE_ACCENDANT_ID" + // + ",LAST_UPD_TIME,LAST_UPD_IP,LAST_UPD_ACCENDANT_ID,'http://cmp2.test.com/cmps' AS STR_BASE_URL" + // + ",'html' AS STR_SUFFIX FROM WEB_DATA_TITLE_LIST" + // + " WHERE WEB_ID=? AND MENU_ID=? AND MENU_TYPE_ID=? ORDER BY RECOMMEND_FLAG DESC ,LAST_UPD_TIME DESC OFFSET ? LIMIT ?"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest30.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest30.java index 2c20f9455d..5a4631a129 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest30.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest30 extends PGTest { - public void test_0() throws Exception { String sql = "SELECT 'a fat cat sat on a mat'::tsvector @@ 'cat & rat'::tsquery"; @@ -34,7 +33,7 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); Assert.assertEquals("SELECT 'a fat cat sat on a mat'::tsvector @@ 'cat & rat'::tsquery", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select 'a fat cat sat on a mat'::tsvector @@ 'cat & rat'::tsquery", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest31.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest31.java index f5a634fe59..30b8df1c0a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest31.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest31 extends PGTest { - public void test_0() throws Exception { String sql = "select * from dual where name ilike '%mi%'"; @@ -36,7 +35,7 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT *\n" + "FROM dual\n" + "WHERE name ILIKE '%mi%'", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select *\n" + "from dual\n" + "where name ilike '%mi%'", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest32.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest32.java index dce5713107..5d4b78d64a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest32.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest32 extends PGTest { - public void test_0() throws Exception { String sql = "select 'abc' SIMILAR TO '%(b|d)%'"; @@ -34,7 +33,7 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); Assert.assertEquals("SELECT 'abc' SIMILAR TO '%(b|d)%'", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select 'abc' similar to '%(b|d)%'", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest33.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest33.java index fc527d234a..833e2ae743 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest33.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest33 extends PGTest { - public void test_0() throws Exception { String sql = "select 'thomas' ~ '.*thomas.*'"; @@ -34,7 +33,7 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); Assert.assertEquals("SELECT 'thomas' ~ '.*thomas.*'", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select 'thomas' ~ '.*thomas.*'", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest34.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest34.java index 9068b564b7..6ac06b7ded 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest34.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest34 extends PGTest { - public void test_0() throws Exception { String sql = "select 'thomas' ~* '.*thomas.*'"; @@ -34,7 +33,7 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); Assert.assertEquals("SELECT 'thomas' ~* '.*thomas.*'", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select 'thomas' ~* '.*thomas.*'", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest35.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest35.java index fb94929c84..d9146b0246 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest35.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest35.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest35 extends PGTest { - public void test_0() throws Exception { String sql = "select 'thomas' !~ '.*thomas.*'"; @@ -34,7 +33,7 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); Assert.assertEquals("SELECT 'thomas' !~ '.*thomas.*'", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select 'thomas' !~ '.*thomas.*'", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest36.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest36.java index c421629c5b..b2e8906fe3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest36.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest36 extends PGTest { - public void test_0() throws Exception { String sql = "select 'thomas' !~* '.*thomas.*'"; @@ -34,7 +33,7 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); Assert.assertEquals("SELECT 'thomas' !~* '.*thomas.*'", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select 'thomas' !~* '.*thomas.*'", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest37.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest37.java index 74827f7c61..bba30c4a73 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest37.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest37.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest37 extends PGTest { - public void test_0() throws Exception { String sql = "select date '2001-09-28'"; @@ -34,7 +33,7 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); Assert.assertEquals("SELECT DATE '2001-09-28'", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select date '2001-09-28'", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest38.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest38.java index 15c386046f..26a67573ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest38.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest38.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest38 extends PGTest { - public void test_0() throws Exception { String sql = "select '{1,2,3}'::int[] && '{1,2,3}'::int[]"; @@ -34,7 +33,7 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); Assert.assertEquals("SELECT '{1,2,3}'::int[] && '{1,2,3}'::int[]", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select '{1,2,3}'::int[] && '{1,2,3}'::int[]", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest39.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest39.java index fb1e296f9e..1796576163 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest39.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest39.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest39 extends PGTest { - public void test_0() throws Exception { String sql = "select '{1,2,3}'::int[] @> '{1,2,3}'::int[]"; @@ -34,7 +33,7 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); Assert.assertEquals("SELECT '{1,2,3}'::int[] @> '{1,2,3}'::int[]", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select '{1,2,3}'::int[] @> '{1,2,3}'::int[]", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest4.java index f1a92d667b..de6e54f55e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest4.java @@ -24,13 +24,12 @@ import java.util.List; public class PGSelectTest4 extends PGTest { - public void test_0() throws Exception { String sql = "select offerId, offerIds " - + // - "from cnres.function_select_get_p4p_offer_by_sps('\\'1160160508\\',\\'1085432755\\',\\'971765217\\'') " - + // - " as a( offerId character varying(256), offerIds character varying(4000) )"; + + // + "from cnres.function_select_get_p4p_offer_by_sps('\\'1160160508\\',\\'1085432755\\',\\'971765217\\'') " + + // + " as a( offerId character varying(256), offerIds character varying(4000) )"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest40.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest40.java index 2b17cadc53..a9135b42b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest40.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest40.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest40 extends PGTest { - public void test_0() throws Exception { String sql = "select '{1,2,3}'::int[] <@ '{1,2,3}'::int[]"; @@ -34,7 +33,7 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); Assert.assertEquals("SELECT '{1,2,3}'::int[] <@ '{1,2,3}'::int[]", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select '{1,2,3}'::int[] <@ '{1,2,3}'::int[]", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest41.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest41.java index 6cd8595e88..a015302cee 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest41.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest41.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest41 extends PGTest { - public void test_0() throws Exception { String sql = "select polygon '((0,0),(1,1))' ~= polygon '((1,1),(0,0))'"; @@ -34,7 +33,7 @@ public void test_0() throws Exception { SQLStatement stmt = statementList.get(0); Assert.assertEquals("SELECT polygon '((0,0),(1,1))' ~= polygon '((1,1),(0,0))'", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select polygon '((0,0),(1,1))' ~= polygon '((1,1),(0,0))'", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest42.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest42.java index 6fa0102959..3ef80f1227 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest42.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest42.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest42 extends PGTest { - public void test_0() throws Exception { String sql = "UPDATE sys_account AS a SET online = 2 FROM auto_handler_online o WHERE a.id = o.account_id AND a.online != 2"; @@ -38,7 +37,7 @@ public void test_0() throws Exception { "FROM auto_handler_online o\n" + "WHERE a.id = o.account_id\n" + "\tAND a.online != 2", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("update sys_account a\n" + "set online = 2\n" + "from auto_handler_online o\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest43.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest43.java index 140b39cdff..90a5963dc0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest43.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest43.java @@ -25,7 +25,6 @@ import java.util.List; public class PGSelectTest43 extends PGTest { - public void test_0() throws Exception { String sql = "select task_id from mod_period_time where task_id in (SELECT task_id as b FROM mod_period_time order by task_id desc limit 1)"; @@ -41,7 +40,7 @@ public void test_0() throws Exception { "\tORDER BY task_id DESC\n" + "\tLIMIT 1\n" + ")", SQLUtils.toPGString(stmt)); - + assertEquals("select task_id\n" + "from mod_period_time\n" + "where task_id in (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest44.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest44.java index 4283323f21..4e7c1555fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest44.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest44.java @@ -37,7 +37,7 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT count(1)\n" + "FROM t_user\n" + "WHERE property ?? 'name'", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select count(1)\n" + "from t_user\n" + "where property ?? 'name'", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest45.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest45.java index 94a66711ae..c21441cdb3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest45.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest45.java @@ -37,7 +37,7 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT count(1)\n" + "FROM t_user\n" + "WHERE property ?| 'name'", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select count(1)\n" + "from t_user\n" + "where property ?| 'name'", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest46.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest46.java index 4e7ed9891c..c6f6956246 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest46.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest46.java @@ -37,7 +37,7 @@ public void test_0() throws Exception { Assert.assertEquals("SELECT count(1)\n" + "FROM t_user\n" + "WHERE property ?& 'name'", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select count(1)\n" + "from t_user\n" + "where property ?& 'name'", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest47.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest47.java index 4c04218d62..25b8a5afee 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest47.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest47.java @@ -66,7 +66,7 @@ public void test_0() throws Exception { "\tLEFT JOIN user_black_article_number n ON u.userid = n.userid\n" + "WHERE u.isactive = true\n" + "ORDER BY n.total_amount DESC NULLS LAST", SQLUtils.toPGString(stmt)); - + Assert.assertEquals("select u.userid, u.phonenumber, u.cdate, u.udate, u.wechatid\n" + "\t, u.wechatnickname, u.wechattime, b.ID, b.username as serviceStaffName, u.appid\n" + "\t, s.ID as servicegroupid, n.total_amount as blackNumber\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest48.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest48.java index eb9de18c98..da9d5a75b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest48.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest48.java @@ -39,7 +39,7 @@ public void test_0() throws Exception { assertEquals("SELECT \"result\" ->> 'PROD_TYPE_NAME', \"result\" ->> 'IMAGES'\n" + "FROM mobile_info_cnmo", SQLUtils.toPGString(stmt)); - + assertEquals("select \"result\" ->> 'PROD_TYPE_NAME', \"result\" ->> 'IMAGES'\n" + "from mobile_info_cnmo", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest49.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest49.java index 04f23dfb6f..9d1f5e3d13 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest49.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest49.java @@ -47,7 +47,7 @@ public void test_0() throws Exception { "SET gd_number = gd_number - gdnumber\n" + "FROM sel\n" + "WHERE gd_id = gdid;", SQLUtils.toPGString(stmt)); - + assertEquals("with sel as (\n" + "\t\tselect unnest(ARRAY[4275]) as gdid, unnest(ARRAY[1]) as gdnumber\n" + "\t)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest5.java index 493837c604..2541a5307d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest5.java @@ -24,18 +24,17 @@ import java.util.List; public class PGSelectTest5 extends PGTest { - public void test_0() throws Exception { String sql = " SELECT rs.* FROM ( " // - + "WITH RECURSIVE r AS( "// - + "SELECT * " // - + "FROM t_e_shopcatalog " // - + "WHERE parentcatalogid= (SELECT catalogid FROM t_e_shopcatalog where catalogname='学习分类' and parentcatalogid='0') " // - + "UNION ALL " // - + "SELECT t_e_shopcatalog.* " // - + "FROM t_e_shopcatalog, r " // - + "WHERE t_e_shopcatalog.parentcatalogid = r.catalogid )" - + "SELECT * FROM r )rs WHERE 1=1"; + + "WITH RECURSIVE r AS( "// + + "SELECT * " // + + "FROM t_e_shopcatalog " // + + "WHERE parentcatalogid= (SELECT catalogid FROM t_e_shopcatalog where catalogname='学习分类' and parentcatalogid='0') " // + + "UNION ALL " // + + "SELECT t_e_shopcatalog.* " // + + "FROM t_e_shopcatalog, r " // + + "WHERE t_e_shopcatalog.parentcatalogid = r.catalogid )" + + "SELECT * FROM r )rs WHERE 1=1"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest50.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest50.java index 77d4533764..ae8b24bdaf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest50.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest50.java @@ -57,7 +57,7 @@ public void test_0() throws Exception { "\t\tSELECT menu_id\n" + "\t\tFROM menuTemp\n" + "\t);", SQLUtils.toPGString(stmt)); - + assertEquals("delete from itsm_system_role_menu\n" + "where menu_id in (\n" + "\t\twith recursive menuTemp (menu_id, parent_id) as (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest51.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest51.java index 8af01b11a3..7cf090b6b9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest51.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest51.java @@ -82,7 +82,7 @@ public void test_0() throws Exception { "\t\tOR A.ZIPCODE LIKE ('%' || ? || '%'))\n" + ") TMP_PAGE\n" + "WHERE ROWNUM <= 10", SQLUtils.toPGString(stmt)); - + assertEquals("select TMP_PAGE.*, ROWNUM as ROW_ID\n" + "from (\n" + "\t(select M.*, A.*\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest52.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest52.java index 6f1791c705..98a34f0c7f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest52.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest52.java @@ -36,7 +36,7 @@ public void test_0() throws Exception { assertEquals("SELECT *\n" + "FROM t\n" + "WHERE gmt = #{time}::timestamp WITHOUT TIME ZONE", SQLUtils.toPGString(stmt)); - + assertEquals("select *\n" + "from t\n" + "where gmt = #{time}::timestamp without time zone", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest53.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest53.java index d84df7cfa6..48f64ce15d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest53.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest53.java @@ -36,7 +36,7 @@ public void test_0() throws Exception { assertEquals("SELECT *\n" + "FROM t\n" + "WHERE gmt = #{time}::timestamp WITH TIME ZONE", SQLUtils.toPGString(stmt)); - + assertEquals("select *\n" + "from t\n" + "where gmt = #{time}::timestamp with time zone", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest54.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest54.java index ee134354a0..92ebb4c0d9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest54.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest54.java @@ -39,7 +39,7 @@ public void test_0() throws Exception { "FROM public.v_poi\n" + "ORDER BY public.v_poi.geom <-> st_point(?, ?)\n" + "LIMIT 1", SQLUtils.toPGString(stmt)); - + assertEquals("select gid, kind, mapid, poi_id, telephone\n" + "\t, admincode, x, y, zipcode, name\n" + "\t, address, street, number, geom\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest55.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest55.java index a70a58dcf1..eb686c51f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest55.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest55.java @@ -54,7 +54,7 @@ public void test_0() throws Exception { "\t\t\t\tAND p.cp_code IS NULL))\n" + "WHERE b.cp_code = ?\n" + "\tOR b.cp_code IS NULL", SQLUtils.toPGString(stmt)); - + assertEquals("select b.*, st_astext(p.pos) as pos, st_astext(p.polygon) as polygon\n" + "from ts_biz b\n" + "\tjoin (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest56.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest56.java index 14c77b0fe4..29d1b4d1ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest56.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest56.java @@ -39,7 +39,7 @@ public void test_0() throws Exception { "\tAND cs.CreateDate >= to_date('2017-08-31 00:00:00', 'YYYY-MM-DD HH24:MI:SS')\n" + "\tAND cs.CreateDate <= to_date('2017-08-31 23:00:00', 'YYYY-MM-DD HH24:MI:SS')\n" + "GROUP BY to_char((CreateDate || ' ' || CAST(HourArgment AS VARCHAR) || ':00:00')::TIMESTAMP, 'YYYY-MM-DD HH24')", SQLUtils.toPGString(stmt)); - + assertEquals("select to_char((CreateDate || ' ' || cast(HourArgment as VARCHAR) || ':00:00')::TIMESTAMP, 'YYYY-MM-DD HH24') as \"intoTime \"\n" + "from analyzedata.StatTime cs\n" + "where 1 = 1\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest57.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest57.java index 9723ab96bb..c7503a4f9b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest57.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest57.java @@ -49,7 +49,7 @@ public void test_0() throws Exception { "\t, IFNULL(spare1, 0)\n" + "FROM clu$\n" + "WHERE obj# = '633'", SQLUtils.toPGString(stmt)); - + assertEquals("select ts#, file#, block#, cols\n" + "\t, IFNULL(size$, -1), pctfree$\n" + "\t, pctused$, initrans, maxtrans, hashkeys, func\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest58.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest58.java index 95c38a2d4a..93b094ca8f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest58.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest58.java @@ -58,7 +58,7 @@ public void test_0() throws Exception { " 3\n" + " }'\n" + "GROUP BY id", SQLUtils.toPGString(stmt)); - + assertEquals("select id, sum(uv[1]) as uv1, sum(uv[2]) as uv2\n" + "from xxxxx\n" + "where a in (?)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest6.java index f367d0cece..f90ebac2fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest6.java @@ -24,16 +24,15 @@ import java.util.List; public class PGSelectTest6 extends PGTest { - public void test_0() throws Exception { String sql = "select fromUserId, toMemberId, rank, tag " + // - "from cnres.function_get_re_cni_myali_acion_fct0(?) " + // - "as ("// - + "fromUserId character varying(128), " // - + "toMemberId character varying(128), " // - + "rank numeric, " // - + "tag character varying(128)" // - + ")"; + "from cnres.function_get_re_cni_myali_acion_fct0(?) " + // + "as ("// + + "fromUserId character varying(128), " // + + "toMemberId character varying(128), " // + + "rank numeric, " // + + "tag character varying(128)" // + + ")"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest60_array.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest60_array.java index bb6063520d..5ab8978d7a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest60_array.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest60_array.java @@ -36,7 +36,7 @@ public void test_0() throws Exception { assertEquals("SELECT COL1\n" + "FROM TABLE\n" + "WHERE NID = ANY(ARRAY[1, 2, 3])", SQLUtils.toPGString(stmt)); - + assertEquals("select COL1\n" + "from TABLE\n" + "where NID = ANY(ARRAY[1, 2, 3])", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest61_type_string.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest61_type_string.java index 9eec145866..679f5bfdf0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest61_type_string.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest61_type_string.java @@ -34,7 +34,7 @@ public void test_0() throws Exception { SQLStatement stmt = stmtList.get(0); assertEquals("SELECT int4(varbit(4) '1010');", SQLUtils.toPGString(stmt)); - + assertEquals("select int4(varbit(4) '1010');", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest62_json.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest62_json.java index b76f2257ed..cbf9029b05 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest62_json.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest62_json.java @@ -36,7 +36,7 @@ public void test_0() throws Exception { assertEquals("SELECT array_to_string(array(\n" + "\t\tSELECT jsonb_array_elements('[{\"aa\":\"123\",\"bb\":\"123\"},{\"aa\":\"12356\",\"bb\":\"12356\"}]') ->> 'aa'\n" + "\t), ',') AS aa", SQLUtils.toPGString(stmt)); - + assertEquals("select array_to_string(array(\n" + "\t\tselect jsonb_array_elements('[{\"aa\":\"123\",\"bb\":\"123\"},{\"aa\":\"12356\",\"bb\":\"12356\"}]') ->> 'aa'\n" + "\t), ',') as aa", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest63.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest63.java index e3ba941b37..54d2738c9e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest63.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest63.java @@ -36,7 +36,7 @@ public void test_0() throws Exception { assertEquals("SELECT *\n" + "FROM a\n" + "WHERE a.id IN (VALUES ((4096), (4097))", SQLUtils.toPGString(stmt)); - + assertEquals("select *\n" + "from a\n" + "where a.id in (values ((4096), (4097))", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest63_json.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest63_json.java index 8706b8f8a3..0c02858cc1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest63_json.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest63_json.java @@ -34,7 +34,7 @@ public void test_0() throws Exception { SQLStatement stmt = stmtList.get(0); assertEquals("SELECT '[1,2,3]'::jsonb ?| array['1']", SQLUtils.toPGString(stmt)); - + assertEquals("select '[1,2,3]'::jsonb ?| array['1']", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest64.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest64.java index ca1b287dc1..e1259fd8de 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest64.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest64.java @@ -40,7 +40,7 @@ public void test_0() throws Exception { "FROM public.newtable\n" + "WHERE EXTRACT (EPOCH FROM timestamptz(column1)) >= EXTRACT (EPOCH FROM TIMESTAMP WITH TIME ZONE '2017-09-10 00:00:00')\n" + "LIMIT 10 OFFSET 0", SQLUtils.toPGString(stmt)); - + assertEquals("select *\n" + "from public.newtable\n" + "where extract (EPOCH from timestamptz(column1)) >= extract (EPOCH from timestamp with time zone '2017-09-10 00:00:00')\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest66_castInterval.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest66_castInterval.java index a15c27affd..0fb129dfb7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest66_castInterval.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest66_castInterval.java @@ -41,7 +41,7 @@ public void test_0() throws Exception { "WHERE task_status = 101\n" + "\tAND del_flag = 0\n" + "\tAND now() - inner_qc_create_time > CAST(? AS interval)", SQLUtils.toPGString(stmt)); - + assertEquals("select m.task_id\n" + "from wf_task_main m\n" + "where task_status = 101\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest67_window.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest67_window.java index 540d872035..2bc041dbed 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest67_window.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest67_window.java @@ -39,7 +39,7 @@ public void test_0() throws Exception { assertEquals("SELECT sum(salary) OVER w, avg(salary) OVER w\n" + "FROM empsalary\n" + "WINDOW w AS (PARTITION BY depname ORDER BY salary DESC);", SQLUtils.toPGString(stmt)); - + assertEquals("select sum(salary) over w, avg(salary) over w\n" + "from empsalary\n" + "window w as (partition by depname order by salary desc);", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest68.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest68.java index 847482e041..db517954aa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest68.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest68.java @@ -61,7 +61,7 @@ public void test_0() throws Exception { "\t\t\t)\n" + "\t\t), ',') AS area_string)\n" + ") t", SQLUtils.toPGString(stmt)); - + assertEquals("select case \n" + "\t\twhen POSITION('市区' in (area_string)) > 0 then 1\n" + "\t\twhen POSITION('郊区' in (area_string)) > 0 then 2\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest69_interval.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest69_interval.java index f537283c8d..e0fed707b2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest69_interval.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest69_interval.java @@ -62,7 +62,7 @@ public void test_0() throws Exception { "WHERE j.job_status = 1\n" + "\tAND j.timeout_advice = 0\n" + "\tAND j.execute_begin <= NOW() - CAST(? AS interval) * 60", SQLUtils.toPGString(stmt)); - + assertEquals("select job_id, task_id, process_id, job_type, job_status\n" + "\t, execute_server, execute_result, execute_times, execute_begin, execute_end\n" + "\t, timeout_advice, create_time, update_time, opr_user, opr_time\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest7.java index 68b8372fd3..ed7671eec4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest7.java @@ -24,22 +24,21 @@ import java.util.List; public class PGSelectTest7 extends PGTest { - public void test_0() throws Exception { String sql = "select id, name, parameters, \"algModuleRule.id\", \"algModuleRule.name\"" + // - ", \"algModuleRule.assembleType\", \"algModuleRule.algmIds\", \"algModuleRule.subAlgmIds\"" + // - ", \"algModuleRule.algmRatio\", \"algModuleRule.algmMaxRatio\", \"algModuleRule.objectType\"" + // - ", \"cateRule.id\", \"cateRule.name\", \"cateRule.assembleType\", \"cateRule.algmIds\"" + // - ", \"cateRule.algmRatio\", \"cateRule.algmMaxRatio\", \"appObject.id\",\"appObject.name\"" + // - ", \"appObject.beanId\" " + // - "from cnres.function_select_irecom_scene()" + // - " as a( id text,name text,parameters text, \"algModuleRule.id\" text,\"algModuleRule.name\" text" + // - " , \"algModuleRule.assembleType\" text,\"algModuleRule.algmIds\" text" + // - " , \"algModuleRule.subAlgmIds\" text,\"algModuleRule.algmRatio\" text" + // - " , \"algModuleRule.algmMaxRatio\" text, \"algModuleRule.objectType\" text" + // - " , \"cateRule.id\" text, \"cateRule.name\" text, \"cateRule.assembleType\" text" + // - " , \"cateRule.algmIds\" text, \"cateRule.algmRatio\" text, \"cateRule.algmMaxRatio\" text" + // - " , \"appObject.id\" text,\"appObject.name\" text, \"appObject.beanId\" text)"; + ", \"algModuleRule.assembleType\", \"algModuleRule.algmIds\", \"algModuleRule.subAlgmIds\"" + // + ", \"algModuleRule.algmRatio\", \"algModuleRule.algmMaxRatio\", \"algModuleRule.objectType\"" + // + ", \"cateRule.id\", \"cateRule.name\", \"cateRule.assembleType\", \"cateRule.algmIds\"" + // + ", \"cateRule.algmRatio\", \"cateRule.algmMaxRatio\", \"appObject.id\",\"appObject.name\"" + // + ", \"appObject.beanId\" " + // + "from cnres.function_select_irecom_scene()" + // + " as a( id text,name text,parameters text, \"algModuleRule.id\" text,\"algModuleRule.name\" text" + // + " , \"algModuleRule.assembleType\" text,\"algModuleRule.algmIds\" text" + // + " , \"algModuleRule.subAlgmIds\" text,\"algModuleRule.algmRatio\" text" + // + " , \"algModuleRule.algmMaxRatio\" text, \"algModuleRule.objectType\" text" + // + " , \"cateRule.id\" text, \"cateRule.name\" text, \"cateRule.assembleType\" text" + // + " , \"cateRule.algmIds\" text, \"cateRule.algmRatio\" text, \"cateRule.algmMaxRatio\" text" + // + " , \"appObject.id\" text,\"appObject.name\" text, \"appObject.beanId\" text)"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest70_string_agg.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest70_string_agg.java index 79b3f5f8e5..10541c0df3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest70_string_agg.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest70_string_agg.java @@ -36,7 +36,7 @@ public void test_0() throws Exception { assertEquals("SELECT string_agg(a, ',' ORDER BY a)\n" + "FROM table;", SQLUtils.toPGString(stmt)); - + assertEquals("select string_agg(a, ',' order by a)\n" + "from table;", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest71_window.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest71_window.java index 88410351c1..20190d3157 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest71_window.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest71_window.java @@ -49,7 +49,7 @@ public void test_0() throws Exception { "\tAND a.nav > 0\n" + "\tAND a.swanav > 0\n" + "WINDOW w AS (ORDER BY a.stat_date DESC)", SQLUtils.toPGString(stmt)); - + assertEquals("select a.*\n" + "\t, (a.swanav - lead(a.swanav, 1, null::numeric) over w) / lead(a.swanav, 1, null::numeric) over w as roe_lag\n" + "from ffund.ffund_eval_prod_nv a\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest72.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest72.java index 100dac7d78..92ef13d575 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest72.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest72.java @@ -36,7 +36,7 @@ public void test_0() throws Exception { assertEquals("SELECT a.*, stddev_samp(a.idx_yield_day) OVER (ORDER BY a.action_date ROWS BETWEEN 60 PRECEDING AND CURRENT ROW) AS idx_volatility\n" + "FROM idx_a a", SQLUtils.toPGString(stmt)); - + assertEquals("select a.*, stddev_samp(a.idx_yield_day) over (order by a.action_date rows between 60 preceding and current row) as idx_volatility\n" + "from idx_a a", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest8.java index 289800eb49..abcefcc830 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest8.java @@ -24,13 +24,12 @@ import java.util.List; public class PGSelectTest8 extends PGTest { - public void test_0() throws Exception { String sql = "select id, name, beanId, \"algLable.id\", \"algLable.name\"" + // - ", \"algLable.schemaName\", \"algLable.tableName\", \"algLable.fieldName\"" + // - " from cnres.function_select_algmodule_rule() " + // - " as a( id text,name text,beanId text, \"algLable.id\" text,\"algLable.name\" text" + // - ", \"algLable.schemaName\" text,\"algLable.tableName\" text, \"algLable.fieldName\" text)"; + ", \"algLable.schemaName\", \"algLable.tableName\", \"algLable.fieldName\"" + // + " from cnres.function_select_algmodule_rule() " + // + " as a( id text,name text,beanId text, \"algLable.id\" text,\"algLable.name\" text" + // + ", \"algLable.schemaName\" text,\"algLable.tableName\" text, \"algLable.fieldName\" text)"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest81.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest81.java index 7d66dfd532..14df0034a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest81.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest81.java @@ -10,7 +10,7 @@ public class PGSelectTest81 extends TestCase { public void test_0() throws Exception { - String sql = "select field from table where field like 'aa''a';"; + String sql = "select field from table where field like 'aa''a';"; final List statements = SQLUtils.parseStatements(sql, JdbcConstants.POSTGRESQL); assertEquals(1, statements.size()); @@ -19,8 +19,8 @@ public void test_0() throws Exception { System.out.println(stmt); assertEquals("SELECT field\n" + - "FROM table\n" + - "WHERE field LIKE 'aa''a';" + "FROM table\n" + + "WHERE field LIKE 'aa''a';" , stmt.toString()); assertEquals("select field\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest82.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest82.java index 602fe0135c..5b50ac5e2f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest82.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest82.java @@ -10,7 +10,7 @@ public class PGSelectTest82 extends TestCase { public void test_0() throws Exception { - String sql = "select count(distinct h.user_id) \n" + + String sql = "select count(distinct h.user_id) \n" + " FROM dblink (\n" + "'dbname=dz_statistics host=127.0.0.1 user=xxx password= xxx ',\n" + "'select user_id from user_product_view_history where create_time > ''2019-10-04 00:00:00''')\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest83.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest83.java index 686b38e69d..bce7d1e36a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest83.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest83.java @@ -10,7 +10,7 @@ public class PGSelectTest83 extends TestCase { public void test_0() throws Exception { - String sql = "select PERCENTILE_CONT(0.5) WITHIN GROUP ( ORDER BY m asc ) from\n" + + String sql = "select PERCENTILE_CONT(0.5) WITHIN GROUP ( ORDER BY m asc ) from\n" + "(\n" + "select distinct extract(month from paidon) as m from core_order where paidon between '2019-1-01' and '2019-5-01' order by m asc\n" + ")a"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest84.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest84.java index 74a910bea5..fe8c0301b3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest84.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest84.java @@ -10,7 +10,7 @@ public class PGSelectTest84 extends TestCase { public void test_0() throws Exception { - String sql = "select u.id, (\n" + + String sql = "select u.id, (\n" + "\tWITH RECURSIVE users AS (\n" + "\t\tselect id from t_user limit 1\n" + "\t) select id from users\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest85.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest85.java index 9d382708db..15c39699ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest85.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest85.java @@ -10,7 +10,7 @@ public class PGSelectTest85 extends TestCase { public void test_0() throws Exception { - String sql = "select 1 from t_user u\n" + + String sql = "select 1 from t_user u\n" + "join (\n" + "\tWITH RECURSIVE users AS (\n" + "\t\tselect id from t_user limit 1\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest86.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest86.java index 8c516641e1..8479d43f64 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest86.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest86.java @@ -10,7 +10,7 @@ public class PGSelectTest86 extends TestCase { public void test_0() throws Exception { - String sql = "select * from xxx_point point inner join xxx_cc cc on point.id = cc.point_id"; + String sql = "select * from xxx_point point inner join xxx_cc cc on point.id = cc.point_id"; final List statements = SQLUtils.parseStatements(sql, JdbcConstants.POSTGRESQL); assertEquals(1, statements.size()); @@ -27,7 +27,7 @@ public void test_0() throws Exception { } public void test_1() throws Exception { - String sql = "select\n" + + String sql = "select\n" + " COUNT(1) res\n" + " from TB_EXPERIENCE exp\n" + " where exp.creatdate>DATE_SUB(CURDATE(), interval 1 MONTH)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest87.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest87.java index 7617ecb91a..5dbf7bc3ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest87.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest87.java @@ -9,7 +9,7 @@ public class PGSelectTest87 extends TestCase { public void test_0() throws Exception { - String sql = "select * from mc_job a inner join (mc_role b inner join mc_source c on b.id = c.id) as tem2 on tem2.user_id = a.id;"; + String sql = "select * from mc_job a inner join (mc_role b inner join mc_source c on b.id = c.id) as tem2 on tem2.user_id = a.id;"; final List statements = SQLUtils.parseStatements(sql, JdbcConstants.POSTGRESQL); assertEquals(1, statements.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest9.java index 8c8e1acffe..ec6ed29a03 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest9.java @@ -24,11 +24,10 @@ import java.util.List; public class PGSelectTest9 extends PGTest { - public void test_0() throws Exception { String sql = "SELECT res.restaurant_id, row_number() " + // - "over (order by ST_Distance(res.restaurant_point,GeomFromEWKT(?))*111.12 ) as row_id " + // - "FROM restaurant res where res.city_id = ? and res.is_delete =false and res.restaurant_id <1000000 limit 10"; + "over (order by ST_Distance(res.restaurant_point,GeomFromEWKT(?))*111.12 ) as row_id " + // + "FROM restaurant res where res.city_id = ? and res.is_delete =false and res.restaurant_id <1000000 limit 10"; PGSQLStatementParser parser = new PGSQLStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGUnionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGUnionTest.java index 9c2424db41..25b89fd465 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGUnionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGUnionTest.java @@ -5,9 +5,8 @@ import junit.framework.TestCase; import org.junit.Assert; -public class PGUnionTest extends TestCase { - - public void testUnion(){ +public class PGUnionTest extends TestCase { + public void testUnion() { String sql = "(select id,name from t1) union (select id,name from t2)"; String targetSql = "(SELECT id, name\n" + "FROM t1)\n" @@ -15,7 +14,7 @@ public void testUnion(){ + "(SELECT id, name\n" + "FROM t2)"; - PGSQLStatementParser pgparser=new PGSQLStatementParser(sql); + PGSQLStatementParser pgparser = new PGSQLStatementParser(sql); SQLStatement pgstatement = pgparser.parseStatement(); Assert.assertEquals(targetSql, pgstatement.toString()); System.out.println(pgstatement.toString()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest.java b/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest.java index 35371beb10..2a0c289595 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest.java @@ -15,9 +15,9 @@ public void test_for_issue() throws Exception { repository.console("create table t_group (id number(20, 0), name varchar2(20))"); assertEquals("SELECT a.uid, a.gid, a.uname\n" + - "FROM t_user a\n" + - "\tINNER JOIN t_group b\n" + - "WHERE a.uid = b.id" + "FROM t_user a\n" + + "\tINNER JOIN t_group b\n" + + "WHERE a.uid = b.id" , repository.resolve("select a.* from t_user a inner join t_group b where a.uid = id")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest_1_fk.java b/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest_1_fk.java index 677ed14c96..a26a5c479c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest_1_fk.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest_1_fk.java @@ -99,8 +99,7 @@ public void test_for_issue() throws Exception { ") PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING \n" + " STORAGE(INITIAL 65536 NEXT 1048576 MINEXTENTS 1 MAXEXTENTS 2147483645 \n" + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT) \n" + - " TABLESPACE \"ECC_CPR_TSP\";\n" - ; + " TABLESPACE \"ECC_CPR_TSP\";\n"; String sql_2 = "\nCREATE TABLE \"ECC_CPR\".\"ECC_CPR_HC_CON_PERSON\" (\n" + "\t\"LAST_UPDATE_DATE\" TIMESTAMP(6),\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/repository/OraclePKNameResolveTest.java b/src/test/java/com/alibaba/druid/bvt/sql/repository/OraclePKNameResolveTest.java index 203436dee5..48147cee14 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/repository/OraclePKNameResolveTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/repository/OraclePKNameResolveTest.java @@ -20,8 +20,7 @@ public void test_for_issue() throws Exception { String sql_2 = "create table b(\n" + " WORKITEMID VARCHAR(40) NOT NULL,\n" + "CONSTRAINT PRIMARY_WORKTASK PRIMARY KEY (WORKITEMID)\n" + - ")" - ; + ")"; repository.resolve(sql_1); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest.java index 4bb80f8c33..86e58b2374 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest.java @@ -21,12 +21,12 @@ public void test_schemaStat() throws Exception { DbType dbType = JdbcConstants.ODPS; SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); SQLStatement stmt = parser.parseStatementList().get(0); - + SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(dbType); stmt.accept(statVisitor); - + System.out.println(statVisitor.getColumns()); - + Assert.assertEquals(1, statVisitor.getColumns().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest10.java index cf5ee5b76a..49e2f1b7dc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest10.java @@ -14,7 +14,6 @@ import java.util.Set; public class SchemaStatTest10 extends TestCase { - public void test_schemaStat() throws Exception { String sql = "select a.id, b.name from table1 a inner join table2 b on a.id = b.id"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest11.java index ef412a4922..9e8f12b098 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest11.java @@ -13,7 +13,6 @@ import java.util.Set; public class SchemaStatTest11 extends TestCase { - public void test_schemaStat() throws Exception { String sql = "select a.id, b.name from (select * from table1) a inner join table2 b on a.id = b.id"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest12.java index 61e9804f78..1f1e1233b3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest12.java @@ -14,7 +14,6 @@ import java.util.Set; public class SchemaStatTest12 extends TestCase { - public void test_schemaStat() throws Exception { String sql = "select work_no , nick_name , name , ifnull(sum(investment_percentage ) / 100 , 0 ) as invest_percent " + "from ( " + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest13.java index d340906bc9..fdc67cd1d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest13.java @@ -14,7 +14,6 @@ import java.util.Set; public class SchemaStatTest13 extends TestCase { - public void test_schemaStat() throws Exception { String sql = "select a.id, b.name from (select t1.* from table1 t1 left join table3 t3 on cast(t1.id as bigint) = t3.id) a inner join table2 b on a.id = b.id"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest14.java index aa0380e84d..6cef55cf5a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest14.java @@ -13,7 +13,6 @@ import java.util.Set; public class SchemaStatTest14 extends TestCase { - public void test_schemaStat() throws Exception { String sql = "delete r from t_res r where id=1 "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest15.java index ba1a909abf..daecaaa142 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest15.java @@ -12,7 +12,6 @@ import junit.framework.TestCase; public class SchemaStatTest15 extends TestCase { - public void test_schemaStat() throws Exception { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); repository.acceptDDL("create table table1 (fid bigint, f1 varchar(100), f2 varchar(100))"); @@ -44,6 +43,7 @@ public void test_schemaStat() throws Exception { assertTrue(statVisitor.containsColumn("table1", "f2")); assertTrue(statVisitor.containsColumn("UNKNOWN", "f3")); } + public void test_schemaStat_2() throws Exception { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); repository.acceptDDL("create table table1 (fid bigint, f1 varchar(100), f2 varchar(100));"); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest16.java index 7a282606d6..0e4d33d7d3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest16.java @@ -10,7 +10,6 @@ import junit.framework.TestCase; public class SchemaStatTest16 extends TestCase { - public void test_schemaStat() throws Exception { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest17.java index c47d5e100b..21affc128c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest17.java @@ -10,7 +10,6 @@ import junit.framework.TestCase; public class SchemaStatTest17 extends TestCase { - public void test_schemaStat() throws Exception { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest18.java index 97201dd1ad..9e79fc341e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest18.java @@ -10,7 +10,6 @@ import junit.framework.TestCase; public class SchemaStatTest18 extends TestCase { - public void test_schemaStat() throws Exception { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest19.java index 79366d6af3..519f532ac4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest19.java @@ -10,7 +10,6 @@ import junit.framework.TestCase; public class SchemaStatTest19 extends TestCase { - public void test_schemaStat() throws Exception { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest2.java index 5ce70eb4d7..94c7804a0c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest2.java @@ -16,17 +16,17 @@ public void test_schemaStat() throws Exception { + " create_time_dd as 来电日期" + " from alisec_app.adl_tb_wing_rubbish_laidian_new_reason_realname_fdt " + " order by 来电日期 desc limit 30;"; - - + + DbType dbType = JdbcConstants.MYSQL; SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); SQLStatement stmt = parser.parseStatementList().get(0); - + SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(dbType); stmt.accept(statVisitor); - + System.out.println(statVisitor.getColumns()); - + Assert.assertEquals(1, statVisitor.getColumns().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest20_issue3993.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest20_issue3993.java index 5dffd437d3..befe6fc197 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest20_issue3993.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest20_issue3993.java @@ -10,7 +10,6 @@ import junit.framework.TestCase; public class SchemaStatTest20_issue3993 extends TestCase { - public void test_schemaStat() throws Exception { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest21_issue3980.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest21_issue3980.java index faadf4e7d0..e88f3dbffe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest21_issue3980.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest21_issue3980.java @@ -13,7 +13,6 @@ import junit.framework.TestCase; public class SchemaStatTest21_issue3980 extends TestCase { - public void test_schemaStat() throws Exception { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest22_yiran.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest22_yiran.java index 72f7be2df8..ae7610080a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest22_yiran.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest22_yiran.java @@ -15,7 +15,6 @@ import junit.framework.TestCase; public class SchemaStatTest22_yiran extends TestCase { - public void test_schemaStat() throws Exception { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); repository.console("CREATE TABLE DEPT (depno INT4, dname ENC_TEXT)"); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest3.java index f288b3555f..264ce86b63 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest3.java @@ -13,16 +13,16 @@ public class SchemaStatTest3 extends TestCase { public void test_schemaStat() throws Exception { String sql = "select count(*) from t"; - + DbType dbType = JdbcConstants.MYSQL; SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); SQLStatement stmt = parser.parseStatementList().get(0); - + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(dbType); stmt.accept(visitor); - + System.out.println(visitor.getColumns()); - + Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertTrue(visitor.containsColumn("t", "*")); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest4.java index cb5c70512f..580067fb32 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest4.java @@ -11,7 +11,6 @@ import java.util.List; public class SchemaStatTest4 extends TestCase { - public void test_schemaStat() throws Exception { String sql = "select name, age from t_user where id = 1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest5.java index 73b634a375..93363802ad 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest5.java @@ -11,7 +11,6 @@ import java.util.List; public class SchemaStatTest5 extends TestCase { - public void test_schemaStat() throws Exception { String sql = "create table t_org (fid int, name varchar(256))"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest6.java index dba55df0e3..20e9693cfd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest6.java @@ -12,19 +12,19 @@ public class SchemaStatTest6 extends TestCase { public void test_schemaStat() throws Exception { -String sql = "select count(1), name from tg_rpc_user where id < 5 group by name order by id desc"; + String sql = "select count(1), name from tg_rpc_user where id < 5 group by name order by id desc"; -DbType dbType = JdbcConstants.MYSQL; -SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); -SQLStatement stmt = parser.parseStatementList().get(0); + DbType dbType = JdbcConstants.MYSQL; + SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); + SQLStatement stmt = parser.parseStatementList().get(0); -SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(dbType); -stmt.accept(statVisitor); + SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(dbType); + stmt.accept(statVisitor); + + System.out.println(statVisitor.getColumns()); + System.out.println(statVisitor.getGroupByColumns()); // group by -System.out.println(statVisitor.getColumns()); -System.out.println(statVisitor.getGroupByColumns()); // group by - Assert.assertEquals(2, statVisitor.getColumns().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest7.java index c7bbb4a5c1..2cf89d63c0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest7.java @@ -11,7 +11,6 @@ import org.junit.Assert; public class SchemaStatTest7 extends TestCase { - public void test_schemaStat() throws Exception { String sql = "select t.a,t.b from t where cast(t.statdate as decimal) >=20160626"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest8.java index 2463fed5d8..3c3cf8b74d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest8.java @@ -11,7 +11,6 @@ import org.junit.Assert; public class SchemaStatTest8 extends TestCase { - public void test_schemaStat() throws Exception { String sql = "SELECT * FROM AQLQCAT " + "JOIN AQLQCATB " + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest9.java index e75df04b99..c6bc5eda9b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest9.java @@ -11,7 +11,6 @@ import org.junit.Assert; public class SchemaStatTest9 extends TestCase { - public void test_schemaStat() throws Exception { String sql = "select now() from t"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_0.java index 26c021469e..f613b0a1a9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_0.java @@ -30,7 +30,6 @@ import java.util.List; public class SQLite_SelectTest_0 extends MysqlTest { - public void test_0() throws Exception { String sql = "select first_name, last_name from mytable limit 3, 4"; @@ -47,7 +46,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_1.java index 501703ea12..e7ad792c7b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_1.java @@ -28,7 +28,6 @@ import java.util.List; public class SQLite_SelectTest_1 extends MysqlTest { - public void test_0() throws Exception { String sql = "SELECT xiaojie,event_cnt,country_code,area_code,carrier,country,province,city,type,subtype,displayname,slogan,logo,source,state,priority,is_change FROM ktv_xiaojie_20170921 WHERE day_modify > 20170921 AND priority >= 4499000 ORDER BY priority DESC LIMIT 500000"; @@ -45,7 +44,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(18, visitor.getColumns().size()); Assert.assertEquals(2, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_2.java index 8926c61726..bd570789fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_2.java @@ -28,7 +28,6 @@ import java.util.List; public class SQLite_SelectTest_2 extends MysqlTest { - public void test_0() throws Exception { String sql = "select * from mytable ORDER BY id DESC limit 0,10"; @@ -45,7 +44,7 @@ public void test_0() throws Exception { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(2, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/MSSQLServerExportParameterVisitorTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/MSSQLServerExportParameterVisitorTest.java index a89a145476..3313703f59 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/MSSQLServerExportParameterVisitorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/MSSQLServerExportParameterVisitorTest.java @@ -12,7 +12,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.MSSQLServerExportParameterVisitor; public class MSSQLServerExportParameterVisitorTest extends TestCase { - public void test_sqlserver() throws Exception { String sql = "select fname, count(*) from t where fid = 1 group by fname order by 1"; @@ -22,7 +21,7 @@ public void test_sqlserver() throws Exception { List parameters = new ArrayList(); MSSQLServerExportParameterVisitor visitor = new MSSQLServerExportParameterVisitor(parameters); stmt.accept(visitor); - + Assert.assertEquals(1, parameters.size()); Assert.assertEquals(1, parameters.get(0)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_0.java index 5e138d634f..0846dddde0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_0.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_0 extends TestCase { - public void test_alter_first() throws Exception { String sql = "alter table st_jklsxxb enable constraint FK_ST_xxx_REFERENCE_ST_xxx"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -44,7 +43,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE st_jklsxxb" + // - "\n\tENABLE CONSTRAINT FK_ST_xxx_REFERENCE_ST_xxx", output); + "\n\tENABLE CONSTRAINT FK_ST_xxx_REFERENCE_ST_xxx", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_1.java index 6c126f6b3e..df150f1d8e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_1.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_1 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE dependencies ALTER COLUMN id bigint"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -44,7 +43,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE dependencies" // - + "\n\tALTER COLUMN id bigint", output); + + "\n\tALTER COLUMN id bigint", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_10.java index 529ee78105..ad2748b7d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_10.java @@ -27,10 +27,9 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_10 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE dbo.doc_exc ADD column_b VARCHAR(20) NULL "// - + " CONSTRAINT exb_unique UNIQUE ;"; + + " CONSTRAINT exb_unique UNIQUE ;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_11.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_11.java index e6f707906f..1d16379eae 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_11.java @@ -27,10 +27,9 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_11 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE dbo.doc_exd WITH NOCHECK " // - + "ADD CONSTRAINT exd_check CHECK (column_a > 1) ;"; + + "ADD CONSTRAINT exd_check CHECK (column_a > 1) ;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); @@ -46,12 +45,12 @@ public void test_alter_first() throws Exception { { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); assertEquals("ALTER TABLE dbo.doc_exd" // - + "\n\tWITH NOCHECK ADD CONSTRAINT exd_check CHECK (column_a > 1);", output); + + "\n\tWITH NOCHECK ADD CONSTRAINT exd_check CHECK (column_a > 1);", output); } { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); assertEquals("alter table dbo.doc_exd" // - + "\n\twith nocheck add constraint exd_check check (column_a > 1);", output); + + "\n\twith nocheck add constraint exd_check check (column_a > 1);", output); } assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_12.java index 3cd176057e..e7ceeb71b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_12.java @@ -25,7 +25,6 @@ import org.junit.Assert; public class SQLServerAlterTableTest_12 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE kpiTarget ADD deleted tinyint DEFAULT 0"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_13_default.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_13_default.java index a52c856475..eb4c6a5688 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_13_default.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_13_default.java @@ -27,7 +27,6 @@ import java.util.List; public class SQLServerAlterTableTest_13_default extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE N_MerchantBase ADD CONSTRAINT DF_N_MerchantBase_UnUsedCouponMoney DEFAULT ((0)) FOR [UnUsedCouponMoney]"; List sqlStatements = SQLUtils.parseStatements(sql, DbType.sqlserver); @@ -52,7 +51,6 @@ public void test_alter_first() throws Exception { @Test public void test_alter_table_constraint_default() { - String sql = "ALTER TABLE N_MerchantBase ADD CONSTRAINT DF_N_MerchantBase_UnUsedCouponMoney DEFAULT 0 FOR UnUsedCouponMoney;"; List sqlStatements = SQLUtils.parseStatements(sql, com.alibaba.druid.DbType.sqlserver); @@ -63,7 +61,6 @@ public void test_alter_table_constraint_default() { @Test public void test_alter_table_add_default() { - String sql = "alter table GoingHomeMain add default(0) for MilesTotal with values;"; List sqlStatements = SQLUtils.parseStatements(sql, com.alibaba.druid.DbType.sqlserver); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_2.java index f05c7fab76..f48f1b0ff9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_2.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_2 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE dependencies ADD PRIMARY KEY(id)"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -44,7 +43,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE dependencies" // - + "\n\tADD PRIMARY KEY (id)", output); + + "\n\tADD PRIMARY KEY (id)", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_3.java index 9f06a1c397..776d7a1b1d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_3.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_3 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE extensions ADD [core] bit"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -44,7 +43,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE extensions" // - + "\n\tADD [core] bit", output); + + "\n\tADD [core] bit", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_4.java index 854ffd0f0e..c9ab233189 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_4.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_4 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE extensions DROP COLUMN [category]"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -44,7 +43,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE extensions" // - + "\n\tDROP COLUMN [category]", output); + + "\n\tDROP COLUMN [category]", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_5.java index 914794eb08..24491a6a80 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_5.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_5 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE project_measures DROP COLUMN diff_value_1, diff_value_2, diff_value_3"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -44,7 +43,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE project_measures" // - + "\n\tDROP COLUMN diff_value_1, diff_value_2, diff_value_3", output); + + "\n\tDROP COLUMN diff_value_1, diff_value_2, diff_value_3", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(3, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_6.java index 3a926d9c31..5f7f148a9d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_6.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_6 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE MyTable ALTER COLUMN NullCOl NVARCHAR(20) NOT NULL"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -44,7 +43,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE MyTable"// - + "\n\tALTER COLUMN NullCOl NVARCHAR(20) NOT NULL", output); + + "\n\tALTER COLUMN NullCOl NVARCHAR(20) NOT NULL", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_7.java index 5b1dd89015..88b2e7fdf4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_7.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_7 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE dbo.doc_exa ADD column_b VARCHAR(20) NULL ;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -44,7 +43,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE dbo.doc_exa"// - + "\n\tADD column_b VARCHAR(20) NULL;", output); + + "\n\tADD column_b VARCHAR(20) NULL;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_8.java index e6b3728097..6941c4dcc0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_8.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_8 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE dbo.doc_exb DROP COLUMN column_b ;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -44,7 +43,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE dbo.doc_exb"// - + "\n\tDROP COLUMN column_b;", output); + + "\n\tDROP COLUMN column_b;", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_9.java index 66f3aff432..6ee5693b97 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_9.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_9 extends TestCase { - public void test_alter_first() throws Exception { String sql = "ALTER TABLE dbo.doc_exy ALTER COLUMN column_a DECIMAL (5, 2) ;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -44,7 +43,7 @@ public void test_alter_first() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE dbo.doc_exy"// - + "\n\tALTER COLUMN column_a DECIMAL(5, 2);", output); + + "\n\tALTER COLUMN column_a DECIMAL(5, 2);", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_drop_constraint.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_drop_constraint.java index a043bb2a07..84f4cf50e8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_drop_constraint.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerAlterTableTest_drop_constraint.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerAlterTableTest_drop_constraint extends TestCase { - public void test_alter_constraint() throws Exception { String sql = "alter table SSHE.dbo.TUSER drop constraint UK_084c17821a8f47e8b31fbb126b6"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -44,7 +43,7 @@ public void test_alter_constraint() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("ALTER TABLE SSHE.dbo.TUSER" + // - "\n\tDROP CONSTRAINT UK_084c17821a8f47e8b31fbb126b6", output); + "\n\tDROP CONSTRAINT UK_084c17821a8f47e8b31fbb126b6", output); Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCommitTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCommitTest.java index 5772af8c2d..f56de9906a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCommitTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCommitTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcUtils; public class SQLServerCommitTest extends TestCase { - public void test_0() { String sql = "COMMIT WORK"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest.java index e68d0db8fe..3c9b1b8fc0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerCreateIndexTest extends TestCase { - public void test_0() throws Exception { String sql = "CREATE UNIQUE INDEX [unique_schema_migrations] ON [schema_migrations] ([version])"; @@ -40,9 +39,9 @@ public void test_0() throws Exception { SQLCreateIndexStatement stmt = (SQLCreateIndexStatement) statementList.get(0); Assert.assertEquals(1, statementList.size()); - + Assert.assertEquals("CREATE UNIQUE INDEX [unique_schema_migrations] ON [schema_migrations] ([version])", // - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_2.java index 35860cadf3..0c891b9823 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_2.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerCreateIndexTest_2 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE UNIQUE CLUSTERED INDEX Idx1 ON t1(c);"; @@ -40,9 +39,9 @@ public void test_0() throws Exception { SQLCreateIndexStatement stmt = (SQLCreateIndexStatement) statementList.get(0); Assert.assertEquals(1, statementList.size()); - + Assert.assertEquals("CREATE UNIQUE CLUSTERED INDEX Idx1 ON t1 (c);", // - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_3.java index 45143b232f..040ac0f9cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_3.java @@ -31,10 +31,9 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerCreateIndexTest_3 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE NONCLUSTERED INDEX IX_SalesPerson_SalesQuota_SalesYTD" // - + " ON Sales.SalesPerson (SalesQuota, SalesYTD);"; + + " ON Sales.SalesPerson (SalesQuota, SalesYTD);"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); List statementList = parser.parseStatementList(); @@ -43,8 +42,8 @@ public void test_0() throws Exception { Assert.assertEquals(1, statementList.size()); Assert.assertEquals("CREATE NONCLUSTERED INDEX IX_SalesPerson_SalesQuota_SalesYTD" // - + " ON Sales.SalesPerson (SalesQuota, SalesYTD);", // - SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + + " ON Sales.SalesPerson (SalesQuota, SalesYTD);", // + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_4.java index e0834967ec..78e33aaead 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateIndexTest_4.java @@ -30,7 +30,6 @@ import java.util.List; public class SQLServerCreateIndexTest_4 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_EVENT_DEF_UNIQ " + "ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_)"; @@ -42,7 +41,7 @@ public void test_0() throws Exception { assertEquals(1, statementList.size()); assertEquals("CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION (KEY_, VERSION_, TENANT_ID_)", // - SQLUtils.toSQLString(stmt, DbType.sqlserver)); + SQLUtils.toSQLString(stmt, DbType.sqlserver)); SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDeclareTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDeclareTest.java index e8c5c8b0ba..5815143feb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDeclareTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDeclareTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.util.JdbcUtils; public class SQLServerDeclareTest extends TestCase { - public void test_0() { String sql = "declare @is_updated bit"; @@ -32,7 +31,7 @@ public void test_0() { Assert.assertEquals("DECLARE @is_updated bit", text); } - + public void test_1() { String sql = "DECLARE @Group nvarchar(50), @Sales money=1;"; @@ -45,7 +44,7 @@ public void test_1() { Assert.assertEquals("DECLARE @Group nvarchar(50), @Sales money = 1;", text); } - + public void test_2() { String sql = "DECLARE @cursor CURSOR"; @@ -70,11 +69,11 @@ public void test_3() { String text = SQLUtils.toSQLString(stmtList, JdbcUtils.SQL_SERVER); String expected = "DECLARE @MyTableVar TABLE ("// - + "\n\tEmpID int NOT NULL,"// - + "\n\tOldVacationHours int,"// - + "\n\tNewVacationHours int,"// - + "\n\tModifiedDate datetime"// - + "\n);"; + + "\n\tEmpID int NOT NULL,"// + + "\n\tOldVacationHours int,"// + + "\n\tNewVacationHours int,"// + + "\n\tModifiedDate datetime"// + + "\n);"; Assert.assertEquals(expected, text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropIndex_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropIndex_Test.java index f53f6c33ed..530026154b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropIndex_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropIndex_Test.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerDropIndex_Test extends TestCase { - public void test_alter_first() throws Exception { String sql = "DROP INDEX async_measure_snapshots.async_m_s_snapshot_id"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropIndex_Test_2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropIndex_Test_2.java index c3ef26811f..8b3a243468 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropIndex_Test_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropIndex_Test_2.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerDropIndex_Test_2 extends TestCase { - public void test_alter_first() throws Exception { String sql = "DROP INDEX IX_ProductVendor_VendorID ON Purchasing.ProductVendor;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropTableTest.java index ee86373705..54106b95df 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerDropTableTest.java @@ -24,7 +24,6 @@ import junit.framework.TestCase; public class SQLServerDropTableTest extends TestCase { - public void test_alter_first() throws Exception { String sql = "DROP TABLE IF EXISTS test"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerExec_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerExec_Test.java index cc602429ba..c8c59c72f6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerExec_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerExec_Test.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerExec_Test extends TestCase { - public void test_0() throws Exception { String sql = "EXEC sp_rename 'rules.temp_plugin_config_key', 'plugin_config_key'"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -48,8 +47,8 @@ public void test_0() throws Exception { Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); } - - + + public void test_2() throws Exception { String sql = "EXEC @returnstatus = dbo.ufnGetSalesOrderStatusText @Status = 2"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -73,6 +72,7 @@ public void test_2() throws Exception { /** * add by zz to test execute sp with out type + * * @throws Exception */ public void test_3() throws Exception { @@ -91,7 +91,7 @@ public void test_3() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("EXEC sp_rename @P0 OUT", output); - + Assert.assertEquals(0, visitor.getTables().size()); Assert.assertEquals(0, visitor.getColumns().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerIfTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerIfTest.java index d2aed38c6d..53b94eddf4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerIfTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerIfTest.java @@ -16,19 +16,18 @@ import junit.framework.TestCase; public class SQLServerIfTest extends TestCase { - public void test() { String sql = "if @is_exists is null begin insert into Inventory_1 (co_id,sku_id,order_lock) values (@0,@1,@2) end else begin insert into Inventory_2 (co_id,sku_id,order_lock) values (@0,@1,@2) end "; String expect = "IF @is_exists IS NULL"// - + "\n\tBEGIN"// - + "\n\t\tINSERT INTO Inventory_1 (co_id, sku_id, order_lock)"// - + "\n\t\tVALUES (@0, @1, @2);"// - + "\n\tEND"// - + "\nELSE"// - + "\n\tBEGIN"// - + "\n\t\tINSERT INTO Inventory_2 (co_id, sku_id, order_lock)"// - + "\n\t\tVALUES (@0, @1, @2);"// - + "\n\tEND"; + + "\n\tBEGIN"// + + "\n\t\tINSERT INTO Inventory_1 (co_id, sku_id, order_lock)"// + + "\n\t\tVALUES (@0, @1, @2);"// + + "\n\tEND"// + + "\nELSE"// + + "\n\tBEGIN"// + + "\n\t\tINSERT INTO Inventory_2 (co_id, sku_id, order_lock)"// + + "\n\t\tVALUES (@0, @1, @2);"// + + "\n\tEND"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest.java index f7a26adf26..6cbd93b4ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest.java @@ -23,13 +23,12 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerInsertTest extends TestCase { - public void test_isEmpty() throws Exception { String sql = "INSERT INTO Cities (Location)" + // - "VALUES ( CONVERT(Point, '12.3:46.2') );"; + "VALUES ( CONVERT(Point, '12.3:46.2') );"; String expect = "INSERT INTO Cities (Location)" + // - "\nVALUES (CONVERT(Point, '12.3:46.2'));"; + "\nVALUES (CONVERT(Point, '12.3:46.2'));"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest1.java index 526250ecae..251e0d40a3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest1.java @@ -23,13 +23,12 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerInsertTest1 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "INSERT INTO Cities (Location)" + - "VALUES ( dbo.CreateNewPoint(x, y) );"; + "VALUES ( dbo.CreateNewPoint(x, y) );"; String expect = "INSERT INTO Cities (Location)" + // - "\nVALUES (dbo.CreateNewPoint(x, y));"; + "\nVALUES (dbo.CreateNewPoint(x, y));"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest10.java index f3e4660e0b..cfdc2d630f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest10.java @@ -25,7 +25,6 @@ import java.util.List; public class SQLServerInsertTest10 extends TestCase { - public void test_0() throws Exception { String sql = "INSERT INTO DataDB..TBL_TEST_7 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest2.java index 6f08c0ebcf..026b448146 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest2.java @@ -24,15 +24,14 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerInsertTest2 extends TestCase { - public void test_multi_values() throws Exception { String sql = "INSERT INTO test (name)" + // - "VALUES (N'a'), (N'b'), (N'c')"; + "VALUES (N'a'), (N'b'), (N'c')"; String expect = "INSERT INTO test (name)" + // - "\nVALUES (N'a')," + // - "\n(N'b')," + // - "\n(N'c')"; + "\nVALUES (N'a')," + // + "\n(N'b')," + // + "\n(N'c')"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest3.java index fb003a6437..88dd2fc1be 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest3.java @@ -23,13 +23,12 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerInsertTest3 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "INSERT INTO Production.UnitMeasure " + // - "VALUES (N'F2', N'Square Feet', GETDATE());;"; + "VALUES (N'F2', N'Square Feet', GETDATE());;"; String expect = "INSERT INTO Production.UnitMeasure" + // - "\nVALUES (N'F2', N'Square Feet', GETDATE());"; + "\nVALUES (N'F2', N'Square Feet', GETDATE());"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest4.java index 9127a9a0e1..d6667f2d36 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest4.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerInsertTest4 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "INSERT INTO dbo.AO_B9A0F0_APPLIED_TEMPLATE DEFAULT VALUES"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest5.java index 87e3f75253..1d7740a718 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest5.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor; public class SQLServerInsertTest5 extends TestCase { - public void test_parseCompleteValues_false() throws Exception { String sql = "insert into t(a,b) values ('a1','b1'),('a2','b2'),('a3','b3'),('a4','b4');"; @@ -49,9 +48,9 @@ public void test_parseCompleteValues_false() throws Exception { stmt.accept(visitor); String formatSql = "INSERT INTO t (a, b)"// - + "\nVALUES ('a1', 'b1'),"// - + "\n('a2', 'b2'),"// - + "\n('a3', 'b3')"; + + "\nVALUES ('a1', 'b1'),"// + + "\n('a2', 'b2'),"// + + "\n('a3', 'b3')"; Assert.assertEquals(formatSql, SQLUtils.toSQLServerString(insertStmt)); } @@ -74,10 +73,10 @@ public void test_parseCompleteValues_true() throws Exception { stmt.accept(visitor); String formatSql = "INSERT INTO t (a, b)"// - + "\nVALUES ('a1', 'b1'),"// - + "\n('a2', 'b2'),"// - + "\n('a3', 'b3'),"// - + "\n('a4', 'b4');"; + + "\nVALUES ('a1', 'b1'),"// + + "\n('a2', 'b2'),"// + + "\n('a3', 'b3'),"// + + "\n('a4', 'b4');"; Assert.assertEquals(formatSql, SQLUtils.toSQLServerString(insertStmt)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest6.java index 077fe70a4b..6784326d5e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest6.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor; public class SQLServerInsertTest6 extends TestCase { - public void test() throws Exception { String sql = "INSERT [dbo].[SurveyAnswer]([CustomerId], [QuestionId], [OptionId], [CreateTime], [LastUpdateTime]) VALUES (@0, @1, @2, @3, @4)"; @@ -49,7 +48,7 @@ public void test() throws Exception { stmt.accept(visitor); String formatSql = "INSERT INTO [dbo].[SurveyAnswer] ([CustomerId], [QuestionId], [OptionId], [CreateTime], [LastUpdateTime])"// - + "\nVALUES (@0, @1, @2, @3, @4)"; + + "\nVALUES (@0, @1, @2, @3, @4)"; Assert.assertEquals(formatSql, SQLUtils.toSQLServerString(insertStmt)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest7.java index 92ab7c6177..ff24dad2d8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest7.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor; public class SQLServerInsertTest7 extends TestCase { - public void test_0() throws Exception { String sql = "INSERT INTO MMS_SETTLEMENT_COM(handler,handleTime,MID,MERCHANTNAME,TOTALAMT,ACTUALAMT," + " paymentMoney,STATUS,SERIAL_NUM,REMARKS)" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest8.java index 69c187dd0b..fa142a437b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest8.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor; public class SQLServerInsertTest8 extends TestCase { - public void test_0() throws Exception { String sql = "INSERT Production.ScrapReason OUTPUT INSERTED.ScrapReasonID, INSERTED.Name, INSERTED.ModifiedDate INTO @MyTableVar VALUES (N'Operator error', GETDATE());"; @@ -49,9 +48,9 @@ public void test_0() throws Exception { stmt.accept(visitor); String formatSql = "INSERT INTO Production.ScrapReason"// - + "\nOUTPUT INSERTED.ScrapReasonID, INSERTED.Name, INSERTED.ModifiedDate"// - + "\n\tINTO @MyTableVar"// - + "\nVALUES (N'Operator error', GETDATE());"; + + "\nOUTPUT INSERTED.ScrapReasonID, INSERTED.Name, INSERTED.ModifiedDate"// + + "\n\tINTO @MyTableVar"// + + "\nVALUES (N'Operator error', GETDATE());"; Assert.assertEquals(formatSql, SQLUtils.toSQLServerString(insertStmt)); } @@ -74,12 +73,12 @@ public void test_1() throws Exception { stmt.accept(visitor); String formatSql = "INSERT TOP (5) INTO dbo.EmployeeSales"// - + "\nOUTPUT inserted.EmployeeID, inserted.FirstName, inserted.LastName, inserted.YearlySales"// - + "\nSELECT sp.BusinessEntityID, c.LastName, c.FirstName, sp.SalesYTD"// - + "\nFROM Sales.SalesPerson sp"// - + "\nINNER JOIN Person.Person c ON sp.BusinessEntityID = c.BusinessEntityID"// - + "\nWHERE sp.SalesYTD > 250000.00"// - + "\nORDER BY sp.SalesYTD DESC;"; + + "\nOUTPUT inserted.EmployeeID, inserted.FirstName, inserted.LastName, inserted.YearlySales"// + + "\nSELECT sp.BusinessEntityID, c.LastName, c.FirstName, sp.SalesYTD"// + + "\nFROM Sales.SalesPerson sp"// + + "\nINNER JOIN Person.Person c ON sp.BusinessEntityID = c.BusinessEntityID"// + + "\nWHERE sp.SalesYTD > 250000.00"// + + "\nORDER BY sp.SalesYTD DESC;"; Assert.assertEquals(formatSql, SQLUtils.toSQLServerString(insertStmt)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest9.java index 4f733e6592..0bbd94fb0d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest9.java @@ -26,7 +26,6 @@ import java.util.List; public class SQLServerInsertTest9 extends TestCase { - public void test_0() throws Exception { String sql = "insert into dashboard_role_res (res_id, role_id,res_type) values (?, ? ,?) , (?, ? ,?)"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerMerge_0.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerMerge_0.java index ba7ebb51b9..92fed0f679 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerMerge_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerMerge_0.java @@ -26,7 +26,6 @@ import java.util.List; public class SQLServerMerge_0 extends TestCase { - public void test_0() throws Exception { String sql = "MERGE INTO tb_device_category t1\n" + "USING ( select distinct device_category, factory_id from temp_device where device_category is not null\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest.java index 1d9f1b3a28..b4b8b22c47 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest.java @@ -26,17 +26,16 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerOutputVisitor; public class SQLServerParameterizedOutputVisitorTest extends TestCase { - public void test_simple() throws Exception { String sql = "select GEN_VAL " + // - "from ID_GENERATOR with (updlock, rowlock) " + // - "where GEN_NAME = 'T_USERS' AND FID = 3 AND FSTATE IN (1, 2, 3)"; // + "from ID_GENERATOR with (updlock, rowlock) " + // + "where GEN_NAME = 'T_USERS' AND FID = 3 AND FSTATE IN (1, 2, 3)"; // String expect = "SELECT GEN_VAL" + // - "\nFROM ID_GENERATOR WITH (updlock, rowlock)" + // - "\nWHERE GEN_NAME = ?" + - "\n\tAND FID = ?" + - "\n\tAND FSTATE IN (?)"; + "\nFROM ID_GENERATOR WITH (updlock, rowlock)" + // + "\nWHERE GEN_NAME = ?" + + "\n\tAND FID = ?" + + "\n\tAND FSTATE IN (?)"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -45,7 +44,7 @@ public void test_simple() throws Exception { Assert.assertEquals(expect, text); } - + public static String outputSqlServer(List stmtList) { StringBuilder out = new StringBuilder(); SQLServerOutputVisitor visitor = new SQLServerOutputVisitor(out, true); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_1.java index 4189910d3d..b8da355db6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_1.java @@ -23,7 +23,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerParameterizedOutputVisitorTest_1 extends TestCase { - public void test_0() throws Exception { String sql = "SELECT TOP 10 ID FROM dbo.jiraissue WHERE PROJECT IN (?) ORDER BY UPDATED DESC"; Assert.assertSame(ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.SQL_SERVER), sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_2.java index d9348cf296..ea2673a34d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_2.java @@ -21,7 +21,6 @@ import org.junit.Assert; public class SQLServerParameterizedOutputVisitorTest_2 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE dbo.AO_B9A0F0_APPLIED_TEMPLATE ( ID INTEGER IDENTITY(1,1) NOT NULL, PROJECT_ID BIGINT CONSTRAINT df_AO_B9A0F0_APPLIED_TEMPLATE_PROJECT_ID DEFAULT 0, PROJECT_TEMPLATE_MODULE_KEY VARCHAR(255), PROJECT_TEMPLATE_WEB_ITEM_KEY VARCHAR(255), CONSTRAINT pk_AO_B9A0F0_APPLIED_TEMPLATE_ID PRIMARY KEY(ID) )"; assertEquals("CREATE TABLE dbo.AO_B9A0F0_APPLIED_TEMPLATE (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRollbackTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRollbackTest.java index b004a4b650..0411efc788 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRollbackTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRollbackTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcUtils; public class SQLServerRollbackTest extends TestCase { - public void test_0() { String sql = "ROLLBACK WORK"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest.java index f387131e2d..0db9c85aa0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class SQLServerRowNumberTest extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT c.FirstName, c.LastName" + // " ,ROW_NUMBER() OVER(ORDER BY SalesYTD DESC) AS 'Row Number'" + // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest2.java index a0a6de6c43..7194c8291a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest2.java @@ -24,16 +24,15 @@ import junit.framework.TestCase; public class SQLServerRowNumberTest2 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT * FROM (" - + // - " SELECT ROW_NUMBER() OVER (ORDER BY FAlertDate Desc, FAlertLevel, FAlertType) AS RowNumber, *" - + // - " from monitor_business" + // - " where FRemoveAlert = ?" + // - " ) AS temp_table" + // - " WHERE RowNumber BETWEEN ? AND ?"; + + // + " SELECT ROW_NUMBER() OVER (ORDER BY FAlertDate Desc, FAlertLevel, FAlertType) AS RowNumber, *" + + // + " from monitor_business" + // + " where FRemoveAlert = ?" + // + " ) AS temp_table" + // + " WHERE RowNumber BETWEEN ? AND ?"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); @@ -54,16 +53,16 @@ public void test_isEmpty() throws Exception { ") temp_table\n" + "where RowNumber between ? and ?", SQLUtils.toSQLServerString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - + public void test_isEmpty_2() throws Exception { String sql = "SELECT * FROM (" - + // - " SELECT ROW_NUMBER() OVER (ORDER BY FAlertDate Desc, FAlertLevel, FAlertType) AS RowNumber, *" - + // - " from monitor_business" + // - " where FRemoveAlert = ?" + // - " ) AS temp_table" + // - " WHERE RowNumber NOT BETWEEN ? AND ?"; + + // + " SELECT ROW_NUMBER() OVER (ORDER BY FAlertDate Desc, FAlertLevel, FAlertType) AS RowNumber, *" + + // + " from monitor_business" + // + " where FRemoveAlert = ?" + // + " ) AS temp_table" + // + " WHERE RowNumber NOT BETWEEN ? AND ?"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSetTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSetTest.java index 1a8beaecbb..220a82e3ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSetTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.util.JdbcUtils; public class SQLServerSetTest extends TestCase { - public void test_0() { String sql = "SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerStartTransactionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerStartTransactionTest.java index c96a4702cf..480dd0d539 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerStartTransactionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerStartTransactionTest.java @@ -23,7 +23,6 @@ import org.junit.Assert; public class SQLServerStartTransactionTest extends TestCase { - public void test_stmt() throws Exception { String sql = "BEGIN TRAN T1;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest.java index e6fed0c24a..e8516c7d3a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest.java @@ -24,7 +24,6 @@ import junit.framework.TestCase; public class SQLServerTopTest extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT TOP 10 * FROM T"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest2.java index b4fae26580..d0fda95348 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest2.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerTopTest2 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT TOP ? * FROM T"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest.java index 7a7b690afc..7ccbba2c3d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest.java @@ -24,22 +24,20 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerUpdateTest extends TestCase { - public void test_isEmpty() throws Exception { String sql = "update reg_student_charge_item " + // - "set FAmountReceived = b.amount " + // - "from reg_student_charge_item a" + // - " ,(" + // - " select a.FId, " + // - " case when sum(b.FChargeAmount) is null then 0 " + // - " else sum(b.FChargeAmount)" + // - " end as amount " + // - " from reg_student_charge_item a " + // - " left join reg_student_charge_daybook b on a.FId = b.FChargeItemId" + // - " where a.FId=? group by a.FId" + // - " ) b " + // - "where a.FId = b.FId and a.FId = ?"; - + "set FAmountReceived = b.amount " + // + "from reg_student_charge_item a" + // + " ,(" + // + " select a.FId, " + // + " case when sum(b.FChargeAmount) is null then 0 " + // + " else sum(b.FChargeAmount)" + // + " end as amount " + // + " from reg_student_charge_item a " + // + " left join reg_student_charge_daybook b on a.FId = b.FChargeItemId" + // + " where a.FId=? group by a.FId" + // + " ) b " + // + "where a.FId = b.FId and a.FId = ?"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest1.java index b46cb7bca3..d812174a81 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest1.java @@ -24,18 +24,17 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerUpdateTest1 extends TestCase { - public void test_update() throws Exception { String sql = "UPDATE dbo.Table2 " + // - "SET dbo.Table2.ColB = dbo.Table2.ColB + dbo.Table1.ColB " + // - "FROM dbo.Table2 " + // - " INNER JOIN dbo.Table1 " + // - " ON (dbo.Table2.ColA = dbo.Table1.ColA);"; + "SET dbo.Table2.ColB = dbo.Table2.ColB + dbo.Table1.ColB " + // + "FROM dbo.Table2 " + // + " INNER JOIN dbo.Table1 " + // + " ON (dbo.Table2.ColA = dbo.Table1.ColA);"; String expect = "UPDATE dbo.Table2" + // - "\nSET dbo.Table2.ColB = dbo.Table2.ColB + dbo.Table1.ColB" + // - "\nFROM dbo.Table2" + // - "\n\tINNER JOIN dbo.Table1 ON dbo.Table2.ColA = dbo.Table1.ColA;"; + "\nSET dbo.Table2.ColB = dbo.Table2.ColB + dbo.Table1.ColB" + // + "\nFROM dbo.Table2" + // + "\n\tINNER JOIN dbo.Table1 ON dbo.Table2.ColA = dbo.Table1.ColA;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest2.java index 421fa9e47d..c1d682c5cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest2.java @@ -24,15 +24,14 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerUpdateTest2 extends TestCase { - public void test_update() throws Exception { String sql = "UPDATE Cities " + // - "SET Location = CONVERT(Point, '12.3:46.2') " + // - "WHERE Name = 'Anchorage';"; + "SET Location = CONVERT(Point, '12.3:46.2') " + // + "WHERE Name = 'Anchorage';"; String expect = "UPDATE Cities" + // - "\nSET Location = CONVERT(Point, '12.3:46.2')" + // - "\nWHERE Name = 'Anchorage';"; + "\nSET Location = CONVERT(Point, '12.3:46.2')" + // + "\nWHERE Name = 'Anchorage';"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest3.java index 0fc6b39573..c017e9c1e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest3.java @@ -24,31 +24,30 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerUpdateTest3 extends TestCase { - public void test_update() throws Exception { String sql = "UPDATE Sales.SalesPerson " + // - "SET SalesYTD = SalesYTD + " + // - " (SELECT SUM(so.SubTotal) " + // - " FROM Sales.SalesOrderHeader AS so" + // - " WHERE so.OrderDate = (SELECT MAX(OrderDate)" + // - " FROM Sales.SalesOrderHeader AS so2" + // - " WHERE so2.SalesPersonID = " + // - " so.SalesPersonID)" + // - " AND Sales.SalesPerson.SalesPersonID = so.SalesPersonID" + // - " GROUP BY so.SalesPersonID);"; + "SET SalesYTD = SalesYTD + " + // + " (SELECT SUM(so.SubTotal) " + // + " FROM Sales.SalesOrderHeader AS so" + // + " WHERE so.OrderDate = (SELECT MAX(OrderDate)" + // + " FROM Sales.SalesOrderHeader AS so2" + // + " WHERE so2.SalesPersonID = " + // + " so.SalesPersonID)" + // + " AND Sales.SalesPerson.SalesPersonID = so.SalesPersonID" + // + " GROUP BY so.SalesPersonID);"; String expect = "UPDATE Sales.SalesPerson" + - "\nSET SalesYTD = SalesYTD + (" + - "\n\tSELECT SUM(so.SubTotal)" + - "\n\tFROM Sales.SalesOrderHeader so" + - "\n\tWHERE so.OrderDate = (" + - "\n\t\t\tSELECT MAX(OrderDate)" + - "\n\t\t\tFROM Sales.SalesOrderHeader so2" + - "\n\t\t\tWHERE so2.SalesPersonID = so.SalesPersonID" + - "\n\t\t)" + - "\n\t\tAND Sales.SalesPerson.SalesPersonID = so.SalesPersonID" + - "\n\tGROUP BY so.SalesPersonID" + - "\n);"; + "\nSET SalesYTD = SalesYTD + (" + + "\n\tSELECT SUM(so.SubTotal)" + + "\n\tFROM Sales.SalesOrderHeader so" + + "\n\tWHERE so.OrderDate = (" + + "\n\t\t\tSELECT MAX(OrderDate)" + + "\n\t\t\tFROM Sales.SalesOrderHeader so2" + + "\n\t\t\tWHERE so2.SalesPersonID = so.SalesPersonID" + + "\n\t\t)" + + "\n\t\tAND Sales.SalesPerson.SalesPersonID = so.SalesPersonID" + + "\n\tGROUP BY so.SalesPersonID" + + "\n);"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest4.java index 83484995c9..9599981e6c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest4.java @@ -24,13 +24,12 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerUpdateTest4 extends TestCase { - public void test_update() throws Exception { String sql = "UPDATE TOP (10) HumanResources.Employee " + - "SET VacationHours = VacationHours * 1.25 ;"; + "SET VacationHours = VacationHours * 1.25 ;"; String expect = "UPDATE TOP (10) HumanResources.Employee" + - "\nSET VacationHours = VacationHours * 1.25;"; + "\nSET VacationHours = VacationHours * 1.25;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest5.java index 8968496cfe..af3fbf8e7f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest5.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerUpdateTest5 extends TestCase { - public void test_update() throws Exception { String sql = "UPDATE TOP (10) HumanResources.Employee SET VacationHours = VacationHours * 1.25, ModifiedDate = GETDATE() OUTPUT inserted.BusinessEntityID, deleted.VacationHours, inserted.VacationHours, inserted.ModifiedDate INTO @MyTableVar;"; @@ -32,7 +31,7 @@ public void test_update() throws Exception { + "\nSET VacationHours = VacationHours * 1.25, ModifiedDate = GETDATE()" + "\nOUTPUT inserted.BusinessEntityID, deleted.VacationHours, inserted.VacationHours, inserted.ModifiedDate" + "\n\tINTO @MyTableVar;"; - + SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest6.java index 5e47cf8c6e..49a1e1e94e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest6.java @@ -20,7 +20,6 @@ import junit.framework.TestCase; public class SQLServerUpdateTest6 extends TestCase { - public void test_update() throws Exception { String sql = "update clients set name =N'小明',age =1"; @@ -28,7 +27,7 @@ public void test_update() throws Exception { + "\nSET VacationHours = VacationHours * 1.25, ModifiedDate = GETDATE()" + "\nOUTPUT inserted.BusinessEntityID, deleted.VacationHours, inserted.VacationHours, inserted.ModifiedDate" + "\n\tINTO @MyTableVar;"; - + SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerWaitForTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerWaitForTest.java index aa25c7e64f..c240ac49d3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerWaitForTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerWaitForTest.java @@ -27,7 +27,6 @@ import com.alibaba.druid.util.JdbcUtils; public class SQLServerWaitForTest extends TestCase { - public void test_0() { String sql = "WAITFOR TIME '22:20';"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SqlServerResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SqlServerResourceTest.java index 87fea75ee0..83aa7831d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SqlServerResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SqlServerResourceTest.java @@ -33,7 +33,6 @@ import java.util.List; public class SqlServerResourceTest extends TestCase { - public void test_0() throws Exception { exec_test("bvt/parser/sqlserver-0.txt"); } @@ -53,12 +52,12 @@ public void exec_test(String resource) throws Exception { String[] items = input.split("---------------------------"); String sql = items[0].trim(); String expect = null; - + if (items.length > 1) { expect = items[1].trim(); expect = expect.replaceAll("\\r\\n", "\n"); } - + SQLStatementParser parser = new SQLServerStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -83,7 +82,6 @@ public void exec_test(String resource) throws Exception { } void mergValidate(String sql, String expect) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest.java index 14c56a7653..303c2f33f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest.java @@ -28,12 +28,11 @@ import com.alibaba.druid.stat.TableStat.Column; public class SQLServerCreateTableTest extends TestCase { - public void test_0() throws Exception { String sql = "CREATE VIEW [Current Product List] AS\n" + // - "SELECT ProductID,ProductName\n" + // - "FROM Products\n" + // - "WHERE Discontinued=No"; + "SELECT ProductID,ProductName\n" + // + "FROM Products\n" + // + "WHERE Discontinued=No"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_1.java index 551f5eafd3..0ffe6a38b5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_1.java @@ -29,20 +29,19 @@ import com.alibaba.druid.stat.TableStat.Column; public class SQLServerCreateTableTest_1 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE [projects] ("// - + "[id] int NOT NULL IDENTITY(1, 1) PRIMARY KEY, "// - + "[name] NVARCHAR(256), [description] NVARCHAR(2000), "// - + "[enabled] bit DEFAULT 1 NOT NULL, "// - + "[scope] NVARCHAR(3), "// - + "[qualifier] NVARCHAR(3), "// - + "[kee] NVARCHAR(400), "// - + "[root_id] int, " // - + "[profile_id] int, " // - + "[language] NVARCHAR(5), "// - + "[copy_resource_id] int, "// - + "[long_name] NVARCHAR(256)) "; + + "[id] int NOT NULL IDENTITY(1, 1) PRIMARY KEY, "// + + "[name] NVARCHAR(256), [description] NVARCHAR(2000), "// + + "[enabled] bit DEFAULT 1 NOT NULL, "// + + "[scope] NVARCHAR(3), "// + + "[qualifier] NVARCHAR(3), "// + + "[kee] NVARCHAR(400), "// + + "[root_id] int, " // + + "[profile_id] int, " // + + "[language] NVARCHAR(5), "// + + "[copy_resource_id] int, "// + + "[long_name] NVARCHAR(256)) "; SQLServerStatementParser parser = new SQLServerStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_2.java index 254a6636b8..e2de353aa6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_2.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerCreateTableTest_2 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE #Test (C1 nvarchar(10), C2 nvarchar(50), C3 datetime);"; @@ -43,10 +42,10 @@ public void test_0() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("CREATE TABLE #Test (" // - + "\n\tC1 nvarchar(10),"// - + "\n\tC2 nvarchar(50),"// - + "\n\tC3 datetime"// - + "\n);", output); + + "\n\tC1 nvarchar(10),"// + + "\n\tC2 nvarchar(50),"// + + "\n\tC3 datetime"// + + "\n);", output); SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_3.java index 0296631ef3..90342c9971 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_3.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerCreateTableTest_3 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE dbo.cwd_directory (" // + "ID NUMERIC NOT NULL, directory_name NVARCHAR(255), "// @@ -61,22 +60,22 @@ public void test_0() throws Exception { + "\n\tdirectory_position NUMERIC,"// + "\n\tCONSTRAINT PK_cwd_directory PRIMARY KEY (ID)"// + "\n)", SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER)); - - + + Assert.assertEquals("create table dbo.cwd_directory (" // - + "\n\tID NUMERIC not null,"// - + "\n\tdirectory_name NVARCHAR(255),"// - + "\n\tlower_directory_name NVARCHAR(255),"// - + "\n\tcreated_date DATETIME,"// - + "\n\tupdated_date DATETIME,"// - + "\n\tactive int,"// - + "\n\tdescription NVARCHAR(255),"// - + "\n\timpl_class NVARCHAR(255),"// - + "\n\tlower_impl_class NVARCHAR(255),"// - + "\n\tdirectory_type NVARCHAR(60),"// - + "\n\tdirectory_position NUMERIC,"// - + "\n\tconstraint PK_cwd_directory primary key (ID)"// - + "\n)", SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + "\n\tID NUMERIC not null,"// + + "\n\tdirectory_name NVARCHAR(255),"// + + "\n\tlower_directory_name NVARCHAR(255),"// + + "\n\tcreated_date DATETIME,"// + + "\n\tupdated_date DATETIME,"// + + "\n\tactive int,"// + + "\n\tdescription NVARCHAR(255),"// + + "\n\timpl_class NVARCHAR(255),"// + + "\n\tlower_impl_class NVARCHAR(255),"// + + "\n\tdirectory_type NVARCHAR(60),"// + + "\n\tdirectory_position NUMERIC,"// + + "\n\tconstraint PK_cwd_directory primary key (ID)"// + + "\n)", SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_4.java index ce4b257424..14a0103a13 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_4.java @@ -31,13 +31,12 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerCreateTableTest_4 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE dbo.customfieldoption (" // - + "ID NUMERIC NOT NULL, CUSTOMFIELD NUMERIC, CUSTOMFIELDCONFIG NUMERIC, "// - + "PARENTOPTIONID NUMERIC, SEQUENCE NUMERIC, customvalue NVARCHAR(255), "// - + "optiontype NVARCHAR(60), disabled NVARCHAR(60), "// - + "CONSTRAINT PK_customfieldoption PRIMARY KEY (ID))"; + + "ID NUMERIC NOT NULL, CUSTOMFIELD NUMERIC, CUSTOMFIELDCONFIG NUMERIC, "// + + "PARENTOPTIONID NUMERIC, SEQUENCE NUMERIC, customvalue NVARCHAR(255), "// + + "optiontype NVARCHAR(60), disabled NVARCHAR(60), "// + + "CONSTRAINT PK_customfieldoption PRIMARY KEY (ID))"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); List statementList = parser.parseStatementList(); @@ -47,16 +46,16 @@ public void test_0() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("CREATE TABLE dbo.customfieldoption (" // - + "\n\tID NUMERIC NOT NULL,"// - + "\n\tCUSTOMFIELD NUMERIC,"// - + "\n\tCUSTOMFIELDCONFIG NUMERIC,"// - + "\n\tPARENTOPTIONID NUMERIC,"// - + "\n\tSEQUENCE NUMERIC,"// - + "\n\tcustomvalue NVARCHAR(255),"// - + "\n\toptiontype NVARCHAR(60),"// - + "\n\tdisabled NVARCHAR(60),"// - + "\n\tCONSTRAINT PK_customfieldoption PRIMARY KEY (ID)"// - + "\n)", output); + + "\n\tID NUMERIC NOT NULL,"// + + "\n\tCUSTOMFIELD NUMERIC,"// + + "\n\tCUSTOMFIELDCONFIG NUMERIC,"// + + "\n\tPARENTOPTIONID NUMERIC,"// + + "\n\tSEQUENCE NUMERIC,"// + + "\n\tcustomvalue NVARCHAR(255),"// + + "\n\toptiontype NVARCHAR(60),"// + + "\n\tdisabled NVARCHAR(60),"// + + "\n\tCONSTRAINT PK_customfieldoption PRIMARY KEY (ID)"// + + "\n)", output); SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_5.java index 019a2350df..542a5928b5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_5.java @@ -31,15 +31,14 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerCreateTableTest_5 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE dbo.AO_563AEE_ACTOR_ENTITY (" // - + " FULL_NAME VARCHAR(255),"// - + " ID INTEGER IDENTITY(1,1) NOT NULL,"// - + " PROFILE_PAGE_URI VARCHAR(767),"// - + " PROFILE_PICTURE_URI VARCHAR(767),"// - + " USERNAME VARCHAR(255),"// - + ")"; + + " FULL_NAME VARCHAR(255),"// + + " ID INTEGER IDENTITY(1,1) NOT NULL,"// + + " PROFILE_PAGE_URI VARCHAR(767),"// + + " PROFILE_PICTURE_URI VARCHAR(767),"// + + " USERNAME VARCHAR(255),"// + + ")"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); List statementList = parser.parseStatementList(); @@ -49,12 +48,12 @@ public void test_0() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("CREATE TABLE dbo.AO_563AEE_ACTOR_ENTITY (" // - + "\n\tFULL_NAME VARCHAR(255),"// - + "\n\tID INTEGER DEFAULT NULL IDENTITY (1, 1),"// - + "\n\tPROFILE_PAGE_URI VARCHAR(767),"// - + "\n\tPROFILE_PICTURE_URI VARCHAR(767),"// - + "\n\tUSERNAME VARCHAR(255)"// - + "\n)", output); + + "\n\tFULL_NAME VARCHAR(255),"// + + "\n\tID INTEGER DEFAULT NULL IDENTITY (1, 1),"// + + "\n\tPROFILE_PAGE_URI VARCHAR(767),"// + + "\n\tPROFILE_PICTURE_URI VARCHAR(767),"// + + "\n\tUSERNAME VARCHAR(255)"// + + "\n)", output); SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_6.java index ff812e2daa..d48ff9ea76 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_6.java @@ -31,24 +31,23 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerCreateTableTest_6 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE dbo.AO_E8B6CC_ISSUE_MAPPING_V2 (" // - + " AUTHOR VARCHAR(255),"// - + " BRANCH VARCHAR(255),"// - + " \"DATE\" DATETIME,"// - + " FILES_DATA NTEXT,"// - + " ID INTEGER IDENTITY(1,1) NOT NULL,"// - + " ISSUE_ID VARCHAR(255),"// - + " MESSAGE NTEXT,"// - + " NODE VARCHAR(255),"// - + " PARENTS_DATA VARCHAR(255),"// - + " RAW_AUTHOR VARCHAR(255),"// - + " RAW_NODE VARCHAR(255),"// - + " REPOSITORY_ID INTEGER CONSTRAINT df_AO_E8B6CC_ISSUE_MAPPING_V2_REPOSITORY_ID DEFAULT 0,"// - + " VERSION INTEGER,"// - + "CONSTRAINT pk_AO_E8B6CC_ISSUE_MAPPING_V2_ID PRIMARY KEY(ID)"// - + ")"; + + " AUTHOR VARCHAR(255),"// + + " BRANCH VARCHAR(255),"// + + " \"DATE\" DATETIME,"// + + " FILES_DATA NTEXT,"// + + " ID INTEGER IDENTITY(1,1) NOT NULL,"// + + " ISSUE_ID VARCHAR(255),"// + + " MESSAGE NTEXT,"// + + " NODE VARCHAR(255),"// + + " PARENTS_DATA VARCHAR(255),"// + + " RAW_AUTHOR VARCHAR(255),"// + + " RAW_NODE VARCHAR(255),"// + + " REPOSITORY_ID INTEGER CONSTRAINT df_AO_E8B6CC_ISSUE_MAPPING_V2_REPOSITORY_ID DEFAULT 0,"// + + " VERSION INTEGER,"// + + "CONSTRAINT pk_AO_E8B6CC_ISSUE_MAPPING_V2_ID PRIMARY KEY(ID)"// + + ")"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); List statementList = parser.parseStatementList(); @@ -58,21 +57,21 @@ public void test_0() throws Exception { String output = SQLUtils.toSQLString(stmt, JdbcConstants.SQL_SERVER); Assert.assertEquals("CREATE TABLE dbo.AO_E8B6CC_ISSUE_MAPPING_V2 (" // - + "\n\tAUTHOR VARCHAR(255),"// - + "\n\tBRANCH VARCHAR(255),"// - + "\n\t\"DATE\" DATETIME,"// - + "\n\tFILES_DATA NTEXT,"// - + "\n\tID INTEGER DEFAULT NULL IDENTITY (1, 1),"// - + "\n\tISSUE_ID VARCHAR(255),"// - + "\n\tMESSAGE NTEXT,"// - + "\n\tNODE VARCHAR(255),"// - + "\n\tPARENTS_DATA VARCHAR(255),"// - + "\n\tRAW_AUTHOR VARCHAR(255),"// - + "\n\tRAW_NODE VARCHAR(255),"// - + "\n\tREPOSITORY_ID INTEGER DEFAULT 0,"// - + "\n\tVERSION INTEGER,"// - + "\n\tCONSTRAINT pk_AO_E8B6CC_ISSUE_MAPPING_V2_ID PRIMARY KEY (ID)"// - + "\n)", output); + + "\n\tAUTHOR VARCHAR(255),"// + + "\n\tBRANCH VARCHAR(255),"// + + "\n\t\"DATE\" DATETIME,"// + + "\n\tFILES_DATA NTEXT,"// + + "\n\tID INTEGER DEFAULT NULL IDENTITY (1, 1),"// + + "\n\tISSUE_ID VARCHAR(255),"// + + "\n\tMESSAGE NTEXT,"// + + "\n\tNODE VARCHAR(255),"// + + "\n\tPARENTS_DATA VARCHAR(255),"// + + "\n\tRAW_AUTHOR VARCHAR(255),"// + + "\n\tRAW_NODE VARCHAR(255),"// + + "\n\tREPOSITORY_ID INTEGER DEFAULT 0,"// + + "\n\tVERSION INTEGER,"// + + "\n\tCONSTRAINT pk_AO_E8B6CC_ISSUE_MAPPING_V2_ID PRIMARY KEY (ID)"// + + "\n)", output); SQLServerSchemaStatVisitor visitor = new SQLServerSchemaStatVisitor(); stmt.accept(visitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_7.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_7.java index f3945a4079..1d5b3ed35c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_7.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerCreateTableTest_7 extends TestCase { - public void test_0() throws Exception { String sql = "create table leave_jpa (" + " id bigint identity not null, " diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_8.java index db17bb1e66..65d851353c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_8.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcConstants; public class SQLServerCreateTableTest_8 extends TestCase { - public void test_0() throws Exception { String sql = "create table ACT_RU_VARIABLE (" + " ID_ nvarchar(64) not null," diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_9.java index b8e9583104..d8e1231f24 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/createtable/SQLServerCreateTableTest_9.java @@ -29,7 +29,6 @@ import java.util.List; public class SQLServerCreateTableTest_9 extends TestCase { - public void test_0() throws Exception { String sql = "CREATE TABLE [dbo].[users2](\n" + "\t[id] [bigint] IDENTITY(1,1) NOT NULL,\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest.java index f39b65b662..bc48d0f530 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest extends TestCase { - public void test_isEmpty() throws Exception { String sql = "USE AdventureWorks2008R2;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest1.java index 37e69bff97..cf3b332200 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest1.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest1 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "USE AdventureWorks2008R2;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest10.java index 892fc26c93..138fde27d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest10.java @@ -24,25 +24,24 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest10 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT c.FirstName, c.LastName, e.Title, a.AddressLine1, a.City" + // - " , sp.Name AS [State/Province], a.PostalCode" + // - " INTO dbo.EmployeeAddresses" + // - " FROM Person.Contact AS c" + // - " JOIN HumanResources.Employee AS e ON e.ContactID = c.ContactID" + // - " JOIN HumanResources.EmployeeAddress AS ea ON ea.EmployeeID = e.EmployeeID" + // - " JOIN Person.Address AS a on a.AddressID = ea.AddressID" + // - " JOIN Person.StateProvince as sp ON sp.StateProvinceID = a.StateProvinceID;"; + " , sp.Name AS [State/Province], a.PostalCode" + // + " INTO dbo.EmployeeAddresses" + // + " FROM Person.Contact AS c" + // + " JOIN HumanResources.Employee AS e ON e.ContactID = c.ContactID" + // + " JOIN HumanResources.EmployeeAddress AS ea ON ea.EmployeeID = e.EmployeeID" + // + " JOIN Person.Address AS a on a.AddressID = ea.AddressID" + // + " JOIN Person.StateProvince as sp ON sp.StateProvinceID = a.StateProvinceID;"; String expect = "SELECT c.FirstName, c.LastName, e.Title, a.AddressLine1, a.City" + // - "\n\t, sp.Name AS [State/Province], a.PostalCode" + // - "\nINTO dbo.EmployeeAddresses" + // - "\nFROM Person.Contact c" + // - "\n\tJOIN HumanResources.Employee e ON e.ContactID = c.ContactID" + // - "\n\tJOIN HumanResources.EmployeeAddress ea ON ea.EmployeeID = e.EmployeeID" + // - "\n\tJOIN Person.Address a ON a.AddressID = ea.AddressID" + // - "\n\tJOIN Person.StateProvince sp ON sp.StateProvinceID = a.StateProvinceID;"; + "\n\t, sp.Name AS [State/Province], a.PostalCode" + // + "\nINTO dbo.EmployeeAddresses" + // + "\nFROM Person.Contact c" + // + "\n\tJOIN HumanResources.Employee e ON e.ContactID = c.ContactID" + // + "\n\tJOIN HumanResources.EmployeeAddress ea ON ea.EmployeeID = e.EmployeeID" + // + "\n\tJOIN Person.Address a ON a.AddressID = ea.AddressID" + // + "\n\tJOIN Person.StateProvince sp ON sp.StateProvinceID = a.StateProvinceID;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest11.java index 574f38c552..e64a726d29 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest11.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest11 extends TestCase { - public void test_simple() throws Exception { String sql = "SELECT 1"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest12.java index 30146c2aaa..9e891ba190 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest12.java @@ -24,14 +24,13 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest12 extends TestCase { - public void test_simple() throws Exception { String sql = "SELECT Row, Name " + // - "FROM(" + // - "SELECT ROW_NUMBER() OVER (ORDER BY ProductID) AS Row, Name " + // - "FROM Product " + // - ") AS ProductsWithRowNumbers " + // - "WHERE Row >= 6 AND Row <= 10"; + "FROM(" + // + "SELECT ROW_NUMBER() OVER (ORDER BY ProductID) AS Row, Name " + // + "FROM Product " + // + ") AS ProductsWithRowNumbers " + // + "WHERE Row >= 6 AND Row <= 10"; String expect = "SELECT Row, Name\n" + "FROM (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest13.java index ecde1005e4..8b12855072 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest13.java @@ -22,74 +22,73 @@ import org.junit.Assert; public class SQLServerSelectTest13 extends TestCase { + public void test_simple() throws Exception { + String sql = "SELECT" + // + " a.* " + // + "FROM" + // + " (" + // + " SELECT" + // + " row_number () over (ORDER BY a.time_add DESC) ROW," + // + " a.detail_no AS detailNo," + // + " a.ba_id AS baId," + // + " a.ba_name AS baName," + // + " a.tran_no AS tranNo," + // + " a.tran_name AS tranName, " + // + " a.tran_type AS tranType, " + // + " a.balance_type AS balanceType, " + // + " a.detail_income AS detailIncome, " + // + " a.detail_payout AS detailPayout, " + // + " a.before_balance AS beforeBalance, " + // + " a.after_balance AS afterBalance, " + // + " a.time_add AS timeAdd, " + // + " a.user_add AS userAdd, " + // + " a.remark AS remark, " + // + " ( " + // + " SELECT " + // + " top 1 t.param_name " + // + " FROM " + // + " config.sys_params t " + // + " WHERE " + // + " t.param_type = ? " + // + " AND t.param_value = a.tran_type " + // + " ) AS tranTypeName " + // + " FROM " + // + " bussiness.account_detail a " + // + " WHERE " + // + " 1 = 1 " + // + " AND a.time_add >= ? " + // + " AND a.time_add <= ? " + // + " ) a " + // + "WHERE " + // + " a. ROW NOT BETWEEN (?+ 1) " + // + "AND (?+?)"; // - public void test_simple() throws Exception { - String sql = "SELECT" + // - " a.* " + // - "FROM" + // - " (" + // - " SELECT" + // - " row_number () over (ORDER BY a.time_add DESC) ROW," + // - " a.detail_no AS detailNo," + // - " a.ba_id AS baId," + // - " a.ba_name AS baName," + // - " a.tran_no AS tranNo," + // - " a.tran_name AS tranName, " + // - " a.tran_type AS tranType, " + // - " a.balance_type AS balanceType, " + // - " a.detail_income AS detailIncome, " + // - " a.detail_payout AS detailPayout, " + // - " a.before_balance AS beforeBalance, " + // - " a.after_balance AS afterBalance, " + // - " a.time_add AS timeAdd, " + // - " a.user_add AS userAdd, " + // - " a.remark AS remark, " + // - " ( " + // - " SELECT " + // - " top 1 t.param_name " + // - " FROM " + // - " config.sys_params t " + // - " WHERE " + // - " t.param_type = ? " + // - " AND t.param_value = a.tran_type " + // - " ) AS tranTypeName " + // - " FROM " + // - " bussiness.account_detail a " + // - " WHERE " + // - " 1 = 1 " + // - " AND a.time_add >= ? " + // - " AND a.time_add <= ? " + // - " ) a " + // - "WHERE " + // - " a. ROW NOT BETWEEN (?+ 1) " + // - "AND (?+?)"; // + String expect = "SELECT a.*\n" + + "FROM (\n" + + "\tSELECT row_number() OVER (ORDER BY a.time_add DESC) AS ROW, a.detail_no AS detailNo, a.ba_id AS baId, a.ba_name AS baName\n" + + "\t\t, a.tran_no AS tranNo, a.tran_name AS tranName, a.tran_type AS tranType, a.balance_type AS balanceType, a.detail_income AS detailIncome\n" + + "\t\t, a.detail_payout AS detailPayout, a.before_balance AS beforeBalance, a.after_balance AS afterBalance, a.time_add AS timeAdd, a.user_add AS userAdd\n" + + "\t\t, a.remark AS remark\n" + + "\t\t, (\n" + + "\t\t\tSELECT TOP 1 t.param_name\n" + + "\t\t\tFROM config.sys_params t\n" + + "\t\t\tWHERE t.param_type = ?\n" + + "\t\t\t\tAND t.param_value = a.tran_type\n" + + "\t\t) AS tranTypeName\n" + + "\tFROM bussiness.account_detail a\n" + + "\tWHERE 1 = 1\n" + + "\t\tAND a.time_add >= ?\n" + + "\t\tAND a.time_add <= ?\n" + + ") a\n" + + "WHERE a.ROW NOT BETWEEN (? + 1) AND (? + ?)"; - String expect = "SELECT a.*\n" + - "FROM (\n" + - "\tSELECT row_number() OVER (ORDER BY a.time_add DESC) AS ROW, a.detail_no AS detailNo, a.ba_id AS baId, a.ba_name AS baName\n" + - "\t\t, a.tran_no AS tranNo, a.tran_name AS tranName, a.tran_type AS tranType, a.balance_type AS balanceType, a.detail_income AS detailIncome\n" + - "\t\t, a.detail_payout AS detailPayout, a.before_balance AS beforeBalance, a.after_balance AS afterBalance, a.time_add AS timeAdd, a.user_add AS userAdd\n" + - "\t\t, a.remark AS remark\n" + - "\t\t, (\n" + - "\t\t\tSELECT TOP 1 t.param_name\n" + - "\t\t\tFROM config.sys_params t\n" + - "\t\t\tWHERE t.param_type = ?\n" + - "\t\t\t\tAND t.param_value = a.tran_type\n" + - "\t\t) AS tranTypeName\n" + - "\tFROM bussiness.account_detail a\n" + - "\tWHERE 1 = 1\n" + - "\t\tAND a.time_add >= ?\n" + - "\t\tAND a.time_add <= ?\n" + - ") a\n" + - "WHERE a.ROW NOT BETWEEN (? + 1) AND (? + ?)"; + SQLServerStatementParser parser = new SQLServerStatementParser(sql); + SQLStatement stmt = parser.parseStatementList().get(0); - SQLServerStatementParser parser = new SQLServerStatementParser(sql); - SQLStatement stmt = parser.parseStatementList().get(0); + String text = TestUtils.outputSqlServer(stmt); - String text = TestUtils.outputSqlServer(stmt); - - assertEquals(expect, text); + assertEquals(expect, text); // System.out.println(text); - } + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest14.java index 108d86fe7d..fc2b45a9d5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest14.java @@ -21,7 +21,6 @@ import junit.framework.TestCase; public class SQLServerSelectTest14 extends TestCase { - public void test_simple() throws Exception { String sql = "SELECT " + // " a.* " + // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest15.java index b3f06d98ea..4cafd3a77d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest15.java @@ -24,12 +24,11 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest15 extends TestCase { - public void test_simple() throws Exception { String sql = "SELECT TOP 50 PERCENT * FROM Persons"; // String expect = "SELECT TOP 50 PERCENT *\n" + // - "FROM Persons"; + "FROM Persons"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest16.java index b9ef311b7e..cbf288fa90 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest16.java @@ -24,15 +24,14 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest16 extends TestCase { - public void test_simple() throws Exception { String sql = "select GEN_VAL " + // - "from ID_GENERATOR with (updlock, rowlock) " + // - "where GEN_NAME = 'T_USERS'"; // + "from ID_GENERATOR with (updlock, rowlock) " + // + "where GEN_NAME = 'T_USERS'"; // String expect = "SELECT GEN_VAL" + // - "\nFROM ID_GENERATOR WITH (updlock, rowlock)" + // - "\nWHERE GEN_NAME = 'T_USERS'"; + "\nFROM ID_GENERATOR WITH (updlock, rowlock)" + // + "\nWHERE GEN_NAME = 'T_USERS'"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest17.java index 5587f6cc73..0cb1c68dea 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest17.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest17 extends TestCase { - public void test_simple() throws Exception { String sql = "SELECT CIM_ASSET_TYPE.ID" + "\nFROM CIM_ASSET_TYPE" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest18.java index f64d10cb4b..f1178835a0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest18.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest18.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest18 extends TestCase { - public void test_simple() throws Exception { String sql = "SELECT T0.[Address], T0.[Address] "// + "FROM [dbo].[CRD1] T0 " // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest19.java index 943dbaebfb..98516e2334 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest19.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest19 extends TestCase { - public void test_simple() throws Exception { String sql = "SELECT p.BusinessEntityID, FirstName, LastName, PhoneNumber AS Phone" + "\nFROM Person.Person AS p" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest2.java index 23ff73e8c8..17462604c7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest2.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest2 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT TOP 1 name FROM (SELECT TOP 9 name FROM master..syslogins ORDER BY name ASC) sq ORDER BY name DESC "; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest20.java index ac00ad9ea0..3488e1b569 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest20.java @@ -24,14 +24,13 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest20 extends TestCase { - public void test_simple() throws Exception { String sql = "SELECT First_Name + ' ' + Last Name FROM Employees ORDER BY First_Name OFFSET 10 ROWS;"; // String expect = "SELECT First_Name + ' ' + Last AS Name" // - + "\nFROM Employees" // - + "\nORDER BY First_Name" // - + "\nOFFSET 10 ROWS;"; + + "\nFROM Employees" // + + "\nORDER BY First_Name" // + + "\nOFFSET 10 ROWS;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest21.java index 33ea7e9649..13d22cecb5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest21.java @@ -24,7 +24,6 @@ import junit.framework.TestCase; public class SQLServerSelectTest21 extends TestCase { - public void test_simple() throws Exception { String sql = "SELECT First_Name + ' ' + Last Name FROM Employees ORDER BY First_Name OFFSET 10 ROWS FETCH NEXT 5 ROWS ONLY;"; // @@ -35,17 +34,17 @@ public void test_simple() throws Exception { String text = SQLUtils.toSQLServerString(stmt); Assert.assertEquals("SELECT First_Name + ' ' + Last AS Name" // - + "\nFROM Employees" // - + "\nORDER BY First_Name" // - + "\nOFFSET 10 ROWS FETCH NEXT 5 ROWS ONLY;", text); + + "\nFROM Employees" // + + "\nORDER BY First_Name" // + + "\nOFFSET 10 ROWS FETCH NEXT 5 ROWS ONLY;", text); } { String text = SQLUtils.toSQLServerString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); Assert.assertEquals("select First_Name + ' ' + Last as Name" // - + "\nfrom Employees" // - + "\norder by First_Name" // - + "\noffset 10 rows fetch next 5 rows only;", text); + + "\nfrom Employees" // + + "\norder by First_Name" // + + "\noffset 10 rows fetch next 5 rows only;", text); } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest22.java index ea75bd2b61..2cc7ea7afa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest22.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class SQLServerSelectTest22 extends TestCase { - public void test_simple() throws Exception { String sql = "DELETE T FROM abc T"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest23.java index 1764f7b8e2..fec7470871 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest23.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class SQLServerSelectTest23 extends TestCase { - public void test_simple() throws Exception { String sql = // "SELECT * FROM T FETCH FIRST 10 ROWS ONLY"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest24.java index 6268c925cf..1c938c9385 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest24.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class SQLServerSelectTest24 extends TestCase { - public void test_simple() throws Exception { String sql = // "SELECT TOP 100 *\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest25.java index 85c012157f..cb6bfb7163 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest25.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class SQLServerSelectTest25 extends TestCase { - public void test_simple() throws Exception { String sql = // "SELECT A.value FROM A oost LEFT JOIN B oo WITH (NOLOCK) ON oost.order_id = oo.id"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest26.java index b7e76328e7..e9c54e19a9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest26.java @@ -26,7 +26,6 @@ import java.util.List; public class SQLServerSelectTest26 extends TestCase { - public void test_simple() throws Exception { String sql = // "-- ----------------------------\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest27.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest27.java index 1049149b06..1975dd36c7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest27.java @@ -24,7 +24,6 @@ import java.util.List; public class SQLServerSelectTest27 extends TestCase { - public void test_simple() throws Exception { String sql = // "set identity_insert tb_coupon OFF"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest28.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest28.java index 4300588173..294a23e4c8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest28.java @@ -24,7 +24,6 @@ import java.util.List; public class SQLServerSelectTest28 extends TestCase { - public void test_simple() throws Exception { String sql = // "select next value for orderId"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest29.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest29.java index 146450e0fb..ba2ce3ccd9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest29.java @@ -23,7 +23,6 @@ import java.util.List; public class SQLServerSelectTest29 extends TestCase { - public void test_simple() throws Exception { String sql = // "WITH A AS (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest3.java index 907b62ea10..6d45420fa2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest3.java @@ -23,12 +23,11 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest3 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT name + ‘-’ + master.sys.fn_varbintohexstr(password_hash) from master.sys.sql_logins"; String expect = "SELECT name + ‘ - ’ + master.sys.fn_varbintohexstr(password_hash)\n" + // - "FROM master.sys.sql_logins"; + "FROM master.sys.sql_logins"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest30.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest30.java index 4835c72bba..2e8d8bee88 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest30.java @@ -23,7 +23,6 @@ import java.util.List; public class SQLServerSelectTest30 extends TestCase { - public void test_simple() throws Exception { String sql = // "SELECT First_Name + ' ' + Last_Name FROM Employees ORDER BY First_Name OFFSET 10 ROWS FETCH NEXT 5 ROWS ONLY;"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest31.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest31.java index 1f984cc006..a571b54334 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest31.java @@ -23,7 +23,6 @@ import java.util.List; public class SQLServerSelectTest31 extends TestCase { - public void test_simple() throws Exception { String sql = // "select top 1 (CAST(OriganID AS VARCHAR(20)) + ',' + MobilePhoneUrl) FROM T"; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest32_with_hint.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest32_with_hint.java index 2d015f6bf2..1006b5a3cc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest32_with_hint.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest32_with_hint.java @@ -23,7 +23,6 @@ import java.util.List; public class SQLServerSelectTest32_with_hint extends TestCase { - public void test_simple() throws Exception { String sql = // "SELECT * FROM dbo.Customers AS c \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest32_with_lock.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest32_with_lock.java index 64c22b3426..f1ae76cf2c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest32_with_lock.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest32_with_lock.java @@ -23,7 +23,6 @@ import java.util.List; public class SQLServerSelectTest32_with_lock extends TestCase { - public void test_simple() throws Exception { String sql = // "select count(*) from t1 WITH(NOLOCK) "; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest33_with_readpast.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest33_with_readpast.java index 9f20288f91..29abe8994d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest33_with_readpast.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest33_with_readpast.java @@ -23,7 +23,6 @@ import java.util.List; public class SQLServerSelectTest33_with_readpast extends TestCase { - public void test_simple() throws Exception { String sql = // "select count(*) from t1 WITH(READPAST) "; // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest34_gtltspace.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest34_gtltspace.java index 3e08b86d65..c14c658973 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest34_gtltspace.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest34_gtltspace.java @@ -23,7 +23,6 @@ import java.util.List; public class SQLServerSelectTest34_gtltspace extends TestCase { - public void test_simple() throws Exception { String sql = // "select count(1) From wms.pack_box_material a,wms.pack_box b where a.pb_id=b.pb_id\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest4.java index 19783aee3a..2e1cd6ec51 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest4.java @@ -23,12 +23,11 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest4 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT name, password_hash FROM master.sys.sql_logins"; String expect = "SELECT name, password_hash\n" + // - "FROM master.sys.sql_logins"; + "FROM master.sys.sql_logins"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest5.java index d38a8c1db2..2a6143f583 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest5.java @@ -23,12 +23,11 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest5 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT name, password_hash FROM [master].[sys].sql_logins"; String expect = "SELECT name, password_hash\n" + // - "FROM [master].[sys].sql_logins"; + "FROM [master].[sys].sql_logins"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest6.java index e90205c246..5d532306c7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest6.java @@ -24,18 +24,17 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest6 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "WITH DirReps(ManagerID, DirectReports) AS " + // - "(" + // - " SELECT ManagerID, COUNT(*) " + // - " FROM HumanResources.Employee AS e" + // - " WHERE ManagerID IS NOT NULL" + // - " GROUP BY ManagerID" + // - ")" + // - "SELECT ManagerID, DirectReports " + // - "FROM DirReps " + // - "ORDER BY ManagerID;"; + "(" + // + " SELECT ManagerID, COUNT(*) " + // + " FROM HumanResources.Employee AS e" + // + " WHERE ManagerID IS NOT NULL" + // + " GROUP BY ManagerID" + // + ")" + // + "SELECT ManagerID, DirectReports " + // + "FROM DirReps " + // + "ORDER BY ManagerID;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); @@ -43,14 +42,14 @@ public void test_isEmpty() throws Exception { String text = TestUtils.outputSqlServer(stmt); assertEquals("WITH DirReps (ManagerID, DirectReports) AS (\n" + - "\t\tSELECT ManagerID, COUNT(*)\n" + - "\t\tFROM HumanResources.Employee e\n" + - "\t\tWHERE ManagerID IS NOT NULL\n" + - "\t\tGROUP BY ManagerID\n" + - "\t)\n" + - "SELECT ManagerID, DirectReports\n" + - "FROM DirReps\n" + - "ORDER BY ManagerID;", text); + "\t\tSELECT ManagerID, COUNT(*)\n" + + "\t\tFROM HumanResources.Employee e\n" + + "\t\tWHERE ManagerID IS NOT NULL\n" + + "\t\tGROUP BY ManagerID\n" + + "\t)\n" + + "SELECT ManagerID, DirectReports\n" + + "FROM DirReps\n" + + "ORDER BY ManagerID;", text); // System.out.println(text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest7.java index ff4e7f6c43..7c102bfa69 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest7.java @@ -24,43 +24,42 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest7 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "with menu_view as(" + - "\n select t.*,1 level from sec_portal_menu t where t.parent_id = ?" + - "\n union all" + - "\n select t.*,level + 1 from sec_portal_menu t , menu_view x where t.parent_id = x.menu_id" + - "\n )" + - "\n select t.menu_id \"id\"," + - "\n t.menu_name \"name\"," + - "\n t.parent_id \"pId\"," + - "\n case t.level when 1 then 'true' else 'false' end \"open\"," + - "\n t.link_type \"linkType\"" + - "\n from menu_view t" + - "\n where 1=1" + - "\n and t.deleted = 0" + - "\n --菜单权限控制" + - "\n AND t.link_type in ('simple','link')" + - "\n AND (" + - "\n EXISTS (" + - "\n select p.entity_code from sec_role_auth p where p.entity_code = t.menu_id" + - "\n and p.entity_type = 'menu'" + - "\n and p.role_id in (" + - "\n select r.role_code from sec_role_member rm ,sec_role r where rm.entity_type = 'user'" + - "\n and entity_code = ? --用户ID" + - "\n and r.role_id = rm.role_id" + - "\n and r.enabled = 1" + - "\n and r.deleted = 0" + - "\n )" + - "\n )" + - "\n or '1'= ? --超级管理员账户id" + - "\n or t.need_control = 0" + - "\n )" + - "\n AND (" + - "\n t.enabled = 1 or '1'= ? --超级管理员账户id" + - "\n or t.need_control = 0" + - "\n )" + - "\n order by t.sort_order"; + "\n select t.*,1 level from sec_portal_menu t where t.parent_id = ?" + + "\n union all" + + "\n select t.*,level + 1 from sec_portal_menu t , menu_view x where t.parent_id = x.menu_id" + + "\n )" + + "\n select t.menu_id \"id\"," + + "\n t.menu_name \"name\"," + + "\n t.parent_id \"pId\"," + + "\n case t.level when 1 then 'true' else 'false' end \"open\"," + + "\n t.link_type \"linkType\"" + + "\n from menu_view t" + + "\n where 1=1" + + "\n and t.deleted = 0" + + "\n --菜单权限控制" + + "\n AND t.link_type in ('simple','link')" + + "\n AND (" + + "\n EXISTS (" + + "\n select p.entity_code from sec_role_auth p where p.entity_code = t.menu_id" + + "\n and p.entity_type = 'menu'" + + "\n and p.role_id in (" + + "\n select r.role_code from sec_role_member rm ,sec_role r where rm.entity_type = 'user'" + + "\n and entity_code = ? --用户ID" + + "\n and r.role_id = rm.role_id" + + "\n and r.enabled = 1" + + "\n and r.deleted = 0" + + "\n )" + + "\n )" + + "\n or '1'= ? --超级管理员账户id" + + "\n or t.need_control = 0" + + "\n )" + + "\n AND (" + + "\n t.enabled = 1 or '1'= ? --超级管理员账户id" + + "\n or t.need_control = 0" + + "\n )" + + "\n order by t.sort_order"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); @@ -69,44 +68,44 @@ public void test_isEmpty() throws Exception { String text = TestUtils.outputSqlServer(stmt); assertEquals("WITH menu_view AS (\n" + - "\t\tSELECT t.*, 1 AS level\n" + - "\t\tFROM sec_portal_menu t\n" + - "\t\tWHERE t.parent_id = ?\n" + - "\t\tUNION ALL\n" + - "\t\tSELECT t.*, level + 1\n" + - "\t\tFROM sec_portal_menu t, menu_view x\n" + - "\t\tWHERE t.parent_id = x.menu_id\n" + - "\t)\n" + - "SELECT t.menu_id AS \"id\", t.menu_name AS \"name\", t.parent_id AS \"pId\"\n" + - "\t, CASE t.level\n" + - "\t\tWHEN 1 THEN 'true'\n" + - "\t\tELSE 'false'\n" + - "\tEND AS \"open\", t.link_type AS \"linkType\"\n" + - "FROM menu_view t\n" + - "WHERE 1 = 1\n" + - "\tAND t.deleted = 0\n" + - "\tAND t.link_type IN ('simple', 'link')\n" + - "\tAND (EXISTS (\n" + - "\t\t\tSELECT p.entity_code\n" + - "\t\t\tFROM sec_role_auth p\n" + - "\t\t\tWHERE p.entity_code = t.menu_id\n" + - "\t\t\t\tAND p.entity_type = 'menu'\n" + - "\t\t\t\tAND p.role_id IN (\n" + - "\t\t\t\t\tSELECT r.role_code\n" + - "\t\t\t\t\tFROM sec_role_member rm, sec_role r\n" + - "\t\t\t\t\tWHERE rm.entity_type = 'user'\n" + - "\t\t\t\t\t\tAND entity_code = ?\n" + - "\t\t\t\t\t\tAND r.role_id = rm.role_id\n" + - "\t\t\t\t\t\tAND r.enabled = 1\n" + - "\t\t\t\t\t\tAND r.deleted = 0\n" + - "\t\t\t\t)\n" + - "\t\t)\n" + - "\t\tOR '1' = ?\n" + - "\t\tOR t.need_control = 0)\n" + - "\tAND (t.enabled = 1\n" + - "\t\tOR '1' = ?\n" + - "\t\tOR t.need_control = 0)\n" + - "ORDER BY t.sort_order", text); + "\t\tSELECT t.*, 1 AS level\n" + + "\t\tFROM sec_portal_menu t\n" + + "\t\tWHERE t.parent_id = ?\n" + + "\t\tUNION ALL\n" + + "\t\tSELECT t.*, level + 1\n" + + "\t\tFROM sec_portal_menu t, menu_view x\n" + + "\t\tWHERE t.parent_id = x.menu_id\n" + + "\t)\n" + + "SELECT t.menu_id AS \"id\", t.menu_name AS \"name\", t.parent_id AS \"pId\"\n" + + "\t, CASE t.level\n" + + "\t\tWHEN 1 THEN 'true'\n" + + "\t\tELSE 'false'\n" + + "\tEND AS \"open\", t.link_type AS \"linkType\"\n" + + "FROM menu_view t\n" + + "WHERE 1 = 1\n" + + "\tAND t.deleted = 0\n" + + "\tAND t.link_type IN ('simple', 'link')\n" + + "\tAND (EXISTS (\n" + + "\t\t\tSELECT p.entity_code\n" + + "\t\t\tFROM sec_role_auth p\n" + + "\t\t\tWHERE p.entity_code = t.menu_id\n" + + "\t\t\t\tAND p.entity_type = 'menu'\n" + + "\t\t\t\tAND p.role_id IN (\n" + + "\t\t\t\t\tSELECT r.role_code\n" + + "\t\t\t\t\tFROM sec_role_member rm, sec_role r\n" + + "\t\t\t\t\tWHERE rm.entity_type = 'user'\n" + + "\t\t\t\t\t\tAND entity_code = ?\n" + + "\t\t\t\t\t\tAND r.role_id = rm.role_id\n" + + "\t\t\t\t\t\tAND r.enabled = 1\n" + + "\t\t\t\t\t\tAND r.deleted = 0\n" + + "\t\t\t\t)\n" + + "\t\t)\n" + + "\t\tOR '1' = ?\n" + + "\t\tOR t.need_control = 0)\n" + + "\tAND (t.enabled = 1\n" + + "\t\tOR '1' = ?\n" + + "\t\tOR t.need_control = 0)\n" + + "ORDER BY t.sort_order", text); // System.out.println(text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest8.java index fbb1faaffd..b430f09217 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest8.java @@ -24,12 +24,11 @@ import com.alibaba.druid.sql.test.TestUtils; public class SQLServerSelectTest8 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT Location.Distance (@p)" + " FROM Cities;"; String expect = "SELECT Location.Distance(@p)" + // - "\nFROM Cities;"; + "\nFROM Cities;"; SQLServerStatementParser parser = new SQLServerStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest9.java index 68f20478fe..d0bef9d73e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest9.java @@ -22,7 +22,6 @@ import org.junit.Assert; public class SQLServerSelectTest9 extends TestCase { - public void test_isEmpty() throws Exception { String sql = "SELECT AVG(UnitPrice) AS 'Average Price' " + // "FROM Sales.SalesOrderDetail;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest_cross_apply.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest_cross_apply.java index 83178ec9e1..8610ddf04d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest_cross_apply.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest_cross_apply.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcUtils; public class SQLServerSelectTest_cross_apply extends TestCase { - public void test_0() throws Exception { String sql = "SELECT DeptID, DeptName, DeptMgrID, EmpID, EmpLastName, EmpSalary FROM Departments d CROSS APPLY dbo.GetReports(d.DeptMgrID)"; @@ -66,9 +65,9 @@ public void test_0() throws Exception { Assert.assertEquals(0, visitor.getOrderByColumns().size()); String expected = "SELECT DeptID, DeptName, DeptMgrID, EmpID, EmpLastName"// - + "\n\t, EmpSalary"// - + "\nFROM Departments d" // - + "\n\tCROSS APPLY dbo.GetReports(d.DeptMgrID)"; + + "\n\t, EmpSalary"// + + "\nFROM Departments d" // + + "\n\tCROSS APPLY dbo.GetReports(d.DeptMgrID)"; Assert.assertEquals(expected, fomatSQL); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest_outer_apply.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest_outer_apply.java index ea6a4a9855..f2119c4143 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest_outer_apply.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest_outer_apply.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcUtils; public class SQLServerSelectTest_outer_apply extends TestCase { - public void test_0() throws Exception { String sql = "SELECT DeptID, DeptName, DeptMgrID, EmpID, EmpLastName, EmpSalary FROM Departments d OUTER APPLY dbo.GetReports(d.DeptMgrID)"; @@ -66,9 +65,9 @@ public void test_0() throws Exception { Assert.assertEquals(0, visitor.getOrderByColumns().size()); String expected = "SELECT DeptID, DeptName, DeptMgrID, EmpID, EmpLastName"// - + "\n\t, EmpSalary"// - + "\nFROM Departments d" // - + "\n\tOUTER APPLY dbo.GetReports(d.DeptMgrID)"; + + "\n\t, EmpSalary"// + + "\nFROM Departments d" // + + "\n\tOUTER APPLY dbo.GetReports(d.DeptMgrID)"; Assert.assertEquals(expected, fomatSQL); } diff --git a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java index ae9494a240..2d82c3604e 100644 --- a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java @@ -48,12 +48,11 @@ import com.alibaba.druid.util.JdbcUtils; public class DruidStatServiceTest extends TestCase { - private DruidDataSource dataSource; @Override protected void setUp() throws Exception { - DruidStatService.getInstance().setResetEnable(true); + DruidStatService.getInstance().setResetEnable(true); // DruidStatService is singleton, reset all for other testcase. DruidStatService.getInstance().service("/reset-all.json"); // clear web app. @@ -112,8 +111,8 @@ public void test_statService_getSqlById() throws Exception { conn.close(); String result = DruidStatService.getInstance().service("/sql-" - + dataSource.getSqlStatMap().values().iterator().next().getId() - + ".json"); + + dataSource.getSqlStatMap().values().iterator().next().getId() + + ".json"); Map resultMap = (Map) JSONUtils.parse(result); Map sqlStat = (Map) resultMap.get("Content"); @@ -132,7 +131,7 @@ public void test_statService_getDataSourceList() throws Exception { { DruidStatService.getInstance().service("/reset-all.json"); } - + String sql = "select 1"; Connection conn = dataSource.getConnection(); @@ -183,7 +182,7 @@ public void test_statService_getDataSourceIdList() throws Exception { /** * Test basic.json request - * + * * @throws Exception */ public void test_statService_getBasic() throws Exception { @@ -392,7 +391,7 @@ public void test_statService_getWebSession() throws Exception { public void test_statService_getSpring() throws Exception { ApplicationContext context = new ClassPathXmlApplicationContext( - "classpath:com/alibaba/druid/stat/spring-config-stat.xml"); + "classpath:com/alibaba/druid/stat/spring-config-stat.xml"); UserService userService = (UserService) context.getBean("userService"); userService.save(); String result = DruidStatService.getInstance().service("/spring.json"); @@ -415,7 +414,7 @@ public void test_statService_getSpring() throws Exception { public void test_statService_getSpringDetail() throws Exception { ApplicationContext context = new ClassPathXmlApplicationContext( - "classpath:com/alibaba/druid/stat/spring-config-stat.xml"); + "classpath:com/alibaba/druid/stat/spring-config-stat.xml"); UserService userService = (UserService) context.getBean("userService"); userService.save(); String result = DruidStatService.getInstance().service("/spring-detail.json?class=com.alibaba.druid.stat.spring.UserService&method=save()"); @@ -431,7 +430,6 @@ public void test_statService_getSpringDetail() throws Exception { } public void test_statService_getResetAll() throws Exception { - // data source mock String sql = "select 1"; Connection conn = dataSource.getConnection(); @@ -474,7 +472,7 @@ public void test_statService_getResetAll() throws Exception { // spring mock ApplicationContext context = new ClassPathXmlApplicationContext( - "classpath:com/alibaba/druid/stat/spring-config-stat.xml"); + "classpath:com/alibaba/druid/stat/spring-config-stat.xml"); UserService userService = (UserService) context.getBean("userService"); userService.save(); String resultSpring = DruidStatService.getInstance().service("/spring.json"); diff --git a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java index 01c55bff03..7cb3e6e74e 100644 --- a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java @@ -37,7 +37,6 @@ * Multiple data source test case. */ public class DruidStatServiceTest2 extends TestCase { - private DruidDataSource dataSource; private DruidDataSource dataSource2; @@ -161,7 +160,7 @@ public void test_statService_getDataSourceList() throws Exception { //assertThat((Integer) dataSourceStat.get("PoolingCount"), equalTo(0)); //assertThat((Integer) dataSourceStat.get("ActiveCount"), equalTo(0)); } - + public void test_getWallStatMap() throws Exception { DruidStatService.getInstance().getWallStatMap(Collections.emptyMap()); } diff --git a/src/test/java/com/alibaba/druid/bvt/stat/JdbcTraceManagerTest.java b/src/test/java/com/alibaba/druid/bvt/stat/JdbcTraceManagerTest.java index fc9d05b24f..63373b3ffe 100644 --- a/src/test/java/com/alibaba/druid/bvt/stat/JdbcTraceManagerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/stat/JdbcTraceManagerTest.java @@ -6,7 +6,6 @@ @SuppressWarnings("deprecation") public class JdbcTraceManagerTest extends TestCase { - public void test_instance() throws Exception { JdbcTraceManager.getInstance(); } diff --git a/src/test/java/com/alibaba/druid/bvt/support/hibernate/DruidConnectionProviderTest.java b/src/test/java/com/alibaba/druid/bvt/support/hibernate/DruidConnectionProviderTest.java index bccfc3d0b4..273cc390c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/hibernate/DruidConnectionProviderTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/hibernate/DruidConnectionProviderTest.java @@ -13,24 +13,24 @@ public class DruidConnectionProviderTest extends TestCase { private DruidConnectionProvider provider; - + protected void setUp() throws Exception { provider = new DruidConnectionProvider(); - + Map properties = new HashMap(); properties.put("url", "jdbc:mock:xxx"); - + provider.configure(properties); } - + protected void tearDown() throws Exception { provider.stop(); } - + public void test_hibernate() throws Exception { Connection conn = provider.getConnection(); Assert.assertFalse(conn.isClosed()); - + provider.closeConnection(conn); Assert.assertTrue(conn.isClosed()); } diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/StatViewSerlvetTest_allow.java b/src/test/java/com/alibaba/druid/bvt/support/http/StatViewSerlvetTest_allow.java index adff4b57dc..100bbceac7 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/StatViewSerlvetTest_allow.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/StatViewSerlvetTest_allow.java @@ -24,7 +24,6 @@ import com.alibaba.druid.support.http.StatViewServlet; public class StatViewSerlvetTest_allow extends TestCase { - public void test_allow() throws Exception { MockServletConfig servletConfig = new MockServletConfig(); servletConfig.addInitParameter(StatViewServlet.PARAM_NAME_ALLOW, "128.242.127.2"); @@ -79,10 +78,10 @@ public void test_allow_3() throws Exception { request.setRemoteAddr("128.242.127." + i); Assert.assertTrue(servlet.isPermittedRequest(request)); } - + Assert.assertFalse(servlet.isPermittedRequest("128.242.128.1")); } - + public void test_allow_4() throws Exception { MockServletConfig servletConfig = new MockServletConfig(); servletConfig.addInitParameter(StatViewServlet.PARAM_NAME_ALLOW, "128.242.127.2/24"); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java b/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java index afae1e6cc0..60a243f164 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java @@ -24,7 +24,6 @@ import com.alibaba.druid.support.http.StatViewServlet; public class StatViewServletTest_resetEnable extends TestCase { - protected void setUp() throws Exception { DruidStatService.getInstance().setResetEnable(true); } diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test.java index 2f16fc33cb..4c1973e31f 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test.java @@ -21,7 +21,6 @@ import com.alibaba.druid.support.http.stat.WebAppStat; public class UserAgentAndroid_4_0_3_Test extends TestCase { - public void test_mac_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Linux; U; Android 4.0.3; ko-kr; LG-L160L Build/IML74K) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30"); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test_2.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test_2.java index e2ea07c3f6..6d770597b3 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test_2.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test_2.java @@ -21,7 +21,6 @@ import com.alibaba.druid.support.http.stat.WebAppStat; public class UserAgentAndroid_4_0_3_Test_2 extends TestCase { - public void test_mac_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Linux; U; Android 4.0.3; de-ch; HTC Sensation Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30"); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_4_Test.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_4_Test.java index a44850d189..76b79e5542 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_4_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_4_Test.java @@ -21,7 +21,6 @@ import com.alibaba.druid.support.http.stat.WebAppStat; public class UserAgentAndroid_4_0_4_Test extends TestCase { - public void test_mac_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19"); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_1_Test.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_1_Test.java index 9d03db19f9..4098ea92f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_1_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_1_Test.java @@ -21,7 +21,6 @@ import com.alibaba.druid.support.http.stat.WebAppStat; public class UserAgentAndroid_4_1_Test extends TestCase { - public void test_mac_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Linux; Android 4.1.1; Galaxy Nexus Build/JRO03C) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19"); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_2_Test_2.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_2_Test_2.java index fb10b6d7de..4905af3824 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_2_Test_2.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_2_Test_2.java @@ -21,7 +21,6 @@ import com.alibaba.druid.support.http.stat.WebAppStat; public class UserAgentAndroid_4_2_Test_2 extends TestCase { - public void test_mac_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Linux; U; Android 4.2; en-us; Nexus 10 Build/JVP15I) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30"); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_3_Test_2.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_3_Test_2.java index 05064b5a0e..3b27ec1a01 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_3_Test_2.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_3_Test_2.java @@ -21,7 +21,6 @@ import com.alibaba.druid.support.http.stat.WebAppStat; public class UserAgentAndroid_4_3_Test_2 extends TestCase { - public void test_mac_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Linux; U; Android 4.3; en-us; Nexus 10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1468.0 Safari/537.36"); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentBotStat.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentBotStat.java index f7957952d3..c9a812a87a 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentBotStat.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentBotStat.java @@ -22,7 +22,6 @@ import com.alibaba.druid.support.http.stat.WebAppStat; public class UserAgentBotStat extends TestCase { - public void test_youdao() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; YoudaoBot/1.0; http://www.youdao.com/help/webmaster/spider/; )"); @@ -78,11 +77,11 @@ public void test_sogou() throws Exception { Assert.assertEquals(1, stat.getBotCount()); Assert.assertEquals(1, stat.getBotSogouCount()); } - + public void test_yahoo() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; Yahoo! Slurp; http://help.yahoo.com/help/us/ysearch/slurp)"); - + Assert.assertEquals(1, stat.getBotCount()); Assert.assertEquals(1, stat.getBotYahooCount()); } @@ -114,151 +113,151 @@ public void test_unkownBot3() throws Exception { Assert.assertEquals(1, stat.getBotCount()); } - + public void test_unkownBot4() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("\"Mozilla/5.0"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_unkownBot5() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) Speedy Spider (http://www.entireweb.com/about/search_tech/speedy_spider/)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_unkownBot6() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_unkownBot7() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Crawl/0.01 libcrawl/0.3"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_unkownBot8() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("SkimBot/1.0 (www.skimlinks.com )"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_huawei() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("HuaweiSymantecSpider/1.0+DSE-support@huaweisymantec.com+(compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR ; http://www.huaweisymantec.com/en/IRL/spider)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_Yeti() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Yeti/1.0 (NHN Corp.; http://help.naver.com/robots/)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_KaloogaBot() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; KaloogaBot; http://kalooga.com/crawler)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_YandexBot() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; YandexBot/3.0; +http://yandex.com/bots)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_Ezooms() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; Ezooms/1.0; ezooms.bot@gmail.com)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_Exabot() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; Exabot/3.0; +http://www.exabot.com/go/robot)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_mahonie() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("mahonie, neofonie search:robot/search:robot/0.0.1 (This is the MIA Bot - crawling for mia research project. If you feel unhappy and do not want to be visited by our crawler send an email to spider@neofonie.de; http://spider.neofonie.de; spider@neofonie.de)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_AhrefsBot() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; AhrefsBot/3.0; +http://ahrefs.com/robot/)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_Crawler() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; SISTRIX Crawler; http://crawler.sistrix.net/)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_yodao() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; YodaoBot/1.0; http://www.yodao.com/help/webmaster/spider/; )"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_BeetleBot() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; BeetleBot; )"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_findlinks() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("findlinks/2.1.5 (+http://wortschatz.uni-leipzig.de/findlinks/)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_Updownerbot() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Updownerbot (+http://www.updowner.com/bot)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_archiveOrgBot() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; archive.org_bot +http://www.archive.org/details/archive.org_bot)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_aiHitBot() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; aiHitBot/1.1; +http://www.aihit.com/)"); - + Assert.assertEquals(1, stat.getBotCount()); } - + public void test_DoCoMo() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("DoCoMo/2.0 P900i(c100;TB;W24H11) (compatible; ichiro/mobile goo; +http://search.goo.ne.jp/option/use/sub4/sub4-1/)"); - + Assert.assertEquals(1, stat.getBotCount()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentMacTest.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentMacTest.java index fe3110fe62..ccda1dc740 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentMacTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentMacTest.java @@ -22,7 +22,6 @@ public class UserAgentMacTest extends TestCase { - public void test_mac_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6"); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentTest.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentTest.java index a61309a83c..d446c1564a 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentTest.java @@ -21,7 +21,6 @@ import com.alibaba.druid.support.http.stat.WebAppStat; public class UserAgentTest extends TestCase { - public void test_agent_ie10() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)"); @@ -442,7 +441,7 @@ public void test_firefox_5() throws Exception { Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); } - + public void test_firefox_6() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.16) Gecko/20110319 Firefox/3.6.16"); @@ -456,12 +455,12 @@ public void test_firefox_6() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(1, stat.getOSMacOSXCount()); @@ -530,7 +529,7 @@ public void test_android_15() throws Exception { Assert.assertEquals(1, stat.getOSAndroidCount()); Assert.assertEquals(1, stat.getOSAndroid15Count()); } - + public void test_android_16() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Linux; U; Android 1.6; en-gb; Dell Streak Build/Donut AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/ 525.20.1"); @@ -544,12 +543,12 @@ public void test_android_16() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(1, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(1, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -590,7 +589,7 @@ public void test_android_21() throws Exception { Assert.assertEquals(1, stat.getOSAndroidCount()); Assert.assertEquals(1, stat.getOSAndroid21Count()); } - + public void test_android_23() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Linux; U; Android 2.3.3; zh-cn; HTC Incredible S Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"); @@ -604,12 +603,12 @@ public void test_android_23() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(1, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(1, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -620,7 +619,7 @@ public void test_android_23() throws Exception { Assert.assertEquals(1, stat.getOSAndroidCount()); Assert.assertEquals(1, stat.getOSAndroid23Count()); } - + public void test_android_4() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Linux; U; Android 4.0.4; zh-cn; Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30"); @@ -634,12 +633,12 @@ public void test_android_4() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(1, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(1, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -680,7 +679,7 @@ public void test_safari() throws Exception { Assert.assertEquals(0, stat.getOSAndroidCount()); Assert.assertEquals(0, stat.getOSAndroid21Count()); } - + public void test_iphone() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7 (compatible; Googlebot-Mobile/2.1; +http://www.google.com/bot.html)"); @@ -694,12 +693,12 @@ public void test_iphone() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(1, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(1, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(1, stat.getOSMacOSXCount()); @@ -710,7 +709,7 @@ public void test_iphone() throws Exception { Assert.assertEquals(0, stat.getOSAndroidCount()); Assert.assertEquals(0, stat.getOSAndroid21Count()); } - + public void test_ipad() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (iPad; CPU OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A405 Safari/7534.48.3"); @@ -724,12 +723,12 @@ public void test_ipad() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(1, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(1, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(1, stat.getOSMacOSXCount()); @@ -740,7 +739,7 @@ public void test_ipad() throws Exception { Assert.assertEquals(0, stat.getOSAndroidCount()); Assert.assertEquals(0, stat.getOSAndroid21Count()); } - + public void test_opera() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Opera/9.00 (Windows NT 4.0; U; en)"); @@ -754,12 +753,12 @@ public void test_opera() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(1, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -770,7 +769,7 @@ public void test_opera() throws Exception { Assert.assertEquals(0, stat.getOSAndroidCount()); Assert.assertEquals(0, stat.getOSAndroid21Count()); } - + public void test_opera_1() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Opera/9.80 (Macintosh; Intel Mac OS X; U; en) Presto/2.2.15 Version/10.00"); @@ -784,12 +783,12 @@ public void test_opera_1() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(1, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(1, stat.getOSMacOSXCount()); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8ChromeTest.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8ChromeTest.java index de5fcc8eb5..0fc36d4f31 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8ChromeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8ChromeTest.java @@ -22,7 +22,6 @@ public class UserAgentWin8ChromeTest extends TestCase { - public void test_mac_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36"); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest.java index 9bf3632cf5..1d1d427761 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest.java @@ -22,7 +22,6 @@ public class UserAgentWin8IETest extends TestCase { - public void test_mac_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; WOW64; Trident/6.0)"); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest_2.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest_2.java index fa9143c6c3..fe7f170882 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest_2.java @@ -22,7 +22,6 @@ public class UserAgentWin8IETest_2 extends TestCase { - public void test_mac_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); stat.computeUserAgent("Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)"); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWindows.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWindows.java index 097837bdd6..fb79ef0a70 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWindows.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWindows.java @@ -21,7 +21,6 @@ import com.alibaba.druid.support.http.stat.WebAppStat; public class UserAgentWindows extends TestCase { - public void test_windows98() throws Exception { WebAppStat stat = new WebAppStat(""); @@ -50,10 +49,10 @@ public void test_windows98() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(1, stat.getOSWindows98Count()); } - + public void test_windows98_1() throws Exception { WebAppStat stat = new WebAppStat(""); @@ -82,13 +81,13 @@ public void test_windows98_1() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(1, stat.getOSWindows98Count()); } - + public void test_windowsXP() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 6.0; Windows XP)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -101,12 +100,12 @@ public void test_windowsXP() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -114,14 +113,14 @@ public void test_windowsXP() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindowsXPCount()); } - + public void test_windowsXP_1() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 6.1; Windows XP)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -134,12 +133,12 @@ public void test_windowsXP_1() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -147,14 +146,14 @@ public void test_windowsXP_1() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindowsXPCount()); } - + public void test_windowsXP_IE6() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("User-Agent: Mozilla/5.0 (compatible; MSIE 6.0;Windows XP)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -167,12 +166,12 @@ public void test_windowsXP_IE6() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -180,14 +179,14 @@ public void test_windowsXP_IE6() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindowsXPCount()); } - + public void test_windowsXP_IE6_1() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -200,12 +199,12 @@ public void test_windowsXP_IE6_1() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -213,14 +212,14 @@ public void test_windowsXP_IE6_1() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindowsXPCount()); } public void test_windowsXP_IE7() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; User-agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; http://bsalsa.com) ; User-agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; http://bsalsa.com) (none))"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -233,12 +232,12 @@ public void test_windowsXP_IE7() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -246,14 +245,14 @@ public void test_windowsXP_IE7() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindowsXPCount()); } - + public void test_windowsXP_IE8() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -266,12 +265,12 @@ public void test_windowsXP_IE8() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -279,14 +278,14 @@ public void test_windowsXP_IE8() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindowsXPCount()); } - + public void test_windowsXP_IE9() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 9.0; Windows NT 5.1; WOW64; Trident/4.0)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -299,12 +298,12 @@ public void test_windowsXP_IE9() throws Exception { Assert.assertEquals(1, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -312,14 +311,14 @@ public void test_windowsXP_IE9() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindowsXPCount()); } - + public void test_windowsXP_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.0.8) Gecko/2009032609 Firefox/3.0.8"); Assert.assertEquals(0, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -332,12 +331,12 @@ public void test_windowsXP_firefox() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -345,14 +344,14 @@ public void test_windowsXP_firefox() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindowsXPCount()); } - + public void test_windows2000_IE5() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 5.01; Windows NT 5.0)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -365,12 +364,12 @@ public void test_windows2000_IE5() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -378,14 +377,14 @@ public void test_windows2000_IE5() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindows2000Count()); } - + public void test_windows2000_IE6() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; .NET CLR 2.0.50727)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -398,12 +397,12 @@ public void test_windows2000_IE6() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -411,14 +410,14 @@ public void test_windows2000_IE6() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindows2000Count()); } - + public void test_windows2000_IE7() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.0)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -431,12 +430,12 @@ public void test_windows2000_IE7() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -444,14 +443,14 @@ public void test_windows2000_IE7() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindows2000Count()); } - + public void test_windows2000_IE8() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.0; Trident/4.0; 360SE)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -464,12 +463,12 @@ public void test_windows2000_IE8() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -477,14 +476,14 @@ public void test_windows2000_IE8() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindows2000Count()); } - + public void test_windows2000_IE9() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 9.0; Windows NT 5.0; Trident/5.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; 360SE)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -497,12 +496,12 @@ public void test_windows2000_IE9() throws Exception { Assert.assertEquals(1, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -510,14 +509,14 @@ public void test_windows2000_IE9() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindows2000Count()); } - + public void test_windows2000_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/5.0 (Windows; U; Windows NT 5.0; zh-CN; rv:1.9.0.8) Gecko/2009032609 Firefox/3.0.8 (.NET CLR 3.5.30729)"); Assert.assertEquals(0, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -530,12 +529,12 @@ public void test_windows2000_firefox() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -543,14 +542,14 @@ public void test_windows2000_firefox() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindows2000Count()); } - + public void test_windows2000_firefox11() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/5.0 (Windows NT 5.0; rv:11.0) Gecko/20100101 Firefox/11.0"); Assert.assertEquals(0, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -563,12 +562,12 @@ public void test_windows2000_firefox11() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -576,14 +575,14 @@ public void test_windows2000_firefox11() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindows2000Count()); } - + public void test_windows2000_chrome() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US) AppleWebKit/525.19 (KHTML, like Gecko) Chrome/1.0.154.53 Safari/525.19"); Assert.assertEquals(0, stat.getBrowserIECount()); Assert.assertEquals(1, stat.getBrowserChromeCount()); @@ -596,12 +595,12 @@ public void test_windows2000_chrome() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -609,14 +608,14 @@ public void test_windows2000_chrome() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindows2000Count()); } - + public void test_windowsVista() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022; .NET4.0C; .NET4.0E)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -629,12 +628,12 @@ public void test_windowsVista() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -642,14 +641,14 @@ public void test_windowsVista() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindowsVistaCount()); } - + public void test_windows7() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Trident/5.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; InfoPath.3; SE 2.X MetaSr 1.0)"); Assert.assertEquals(1, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -662,12 +661,12 @@ public void test_windows7() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -675,14 +674,14 @@ public void test_windows7() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindows7Count()); } - + public void test_windows7_firefox() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/5.0 (Windows NT 6.1; rv:11.0) Gecko/20100101 Firefox/11.0"); Assert.assertEquals(0, stat.getBrowserIECount()); Assert.assertEquals(0, stat.getBrowserChromeCount()); @@ -695,12 +694,12 @@ public void test_windows7_firefox() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -708,14 +707,14 @@ public void test_windows7_firefox() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindows7Count()); } - + public void test_windows7_chrome() throws Exception { WebAppStat stat = new WebAppStat(""); - + stat.computeUserAgent("Mozilla/5.0 (Windows NT 6.1) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.162 Safari/535.19"); Assert.assertEquals(0, stat.getBrowserIECount()); Assert.assertEquals(1, stat.getBrowserChromeCount()); @@ -728,12 +727,12 @@ public void test_windows7_chrome() throws Exception { Assert.assertEquals(0, stat.getBrowserIE9Count()); Assert.assertEquals(0, stat.getBrowserOperaCount()); Assert.assertEquals(0, stat.getBrowserSafariCount()); - + Assert.assertEquals(0, stat.getDeviceAndroidCount()); Assert.assertEquals(0, stat.getDeviceIpadCount()); Assert.assertEquals(0, stat.getDeviceIphoneCount()); Assert.assertEquals(0, stat.getDeviceWindowsPhoneCount()); - + Assert.assertEquals(0, stat.getOSLinuxCount()); Assert.assertEquals(0, stat.getOSLinuxUbuntuCount()); Assert.assertEquals(0, stat.getOSMacOSXCount()); @@ -741,7 +740,7 @@ public void test_windows7_chrome() throws Exception { Assert.assertEquals(0, stat.getOSSymbianCount()); Assert.assertEquals(0, stat.getOSFreeBSDCount()); Assert.assertEquals(0, stat.getOSOpenBSDCount()); - + Assert.assertEquals(0, stat.getOSWindows98Count()); Assert.assertEquals(1, stat.getOSWindows7Count()); } diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest.java b/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest.java index 502a65dd97..1b9ca3b0cd 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest.java @@ -32,7 +32,6 @@ import com.alibaba.druid.support.http.stat.WebAppStatManager; public class WebStatFilterTest extends TestCase { - public void test_sessionStatDisable() throws Exception { MockServletContext servletContext = new MockServletContext(); @@ -44,7 +43,7 @@ public void test_sessionStatDisable() throws Exception { Assert.assertNull(filter.getWebAppStat()); filter.init(filterConfig); - + WebAppStat appStat = filter.getWebAppStat(); Assert.assertFalse(filter.isSessionStatEnable()); @@ -62,10 +61,10 @@ public void test_sessionStatDisable() throws Exception { Assert.assertEquals(0, appStat.getSessionStatDataList().size()); filter.destroy(); - + Assert.assertFalse(WebAppStatManager.getInstance().getWebAppStatSet().contains(appStat)); Assert.assertFalse(StatFilterContext.getInstance().getListeners().contains(filter.getStatFilterContextListener())); - + Map statData = appStat.getStatData(); Assert.assertEquals(1L, statData.get("RequestCount")); } diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest2.java b/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest2.java index 794927afa0..ad9d641b4e 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest2.java @@ -29,7 +29,6 @@ import com.alibaba.druid.support.http.stat.WebAppStat; public class WebStatFilterTest2 extends TestCase { - public void test_lru() throws Exception { MockServletContext servletContext = new MockServletContext(); @@ -54,49 +53,52 @@ public void test_lru() throws Exception { // 第一个session请求2次 { Assert.assertNull(appStat.getSessionStat(session_0.getId())); - + MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); MockFilterChain chain = new MockFilterChain() { - public void doFilter(javax.servlet.ServletRequest request, javax.servlet.ServletResponse response) { ((MockHttpServletRequest) request).setSession(session_0); - }; + } + + ; }; filter.doFilter(request, response, chain); Assert.assertEquals(1, appStat.getSessionStatDataList().size()); Assert.assertEquals(1, appStat.getSessionStat(session_0.getId()).getRequestCount()); - + Assert.assertTrue(appStat.getSessionStat(session_0.getId()).getLastAccessTimeMillis() > 0); } { MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); MockFilterChain chain = new MockFilterChain() { - public void doFilter(javax.servlet.ServletRequest request, javax.servlet.ServletResponse response) { ((MockHttpServletRequest) request).setSession(session_0); - }; + } + + ; }; - + filter.doFilter(request, response, chain); - + Assert.assertEquals(1, appStat.getSessionStatDataList().size()); Assert.assertEquals(2, appStat.getSessionStat(session_0.getId()).getRequestCount()); } - - + + // 第2个sesion请求1次 { MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); MockFilterChain chain = new MockFilterChain() { - public void doFilter(javax.servlet.ServletRequest request, javax.servlet.ServletResponse response) { ((MockHttpServletRequest) request).setSession(session_1); - }; + } + + ; }; filter.doFilter(request, response, chain); @@ -105,59 +107,62 @@ public void doFilter(javax.servlet.ServletRequest request, javax.servlet.Servlet Assert.assertEquals(2, appStat.getSessionStat(session_0.getId()).getRequestCount()); Assert.assertEquals(1, appStat.getSessionStat(session_1.getId()).getRequestCount()); } - + // 第3个sesion请求1次 { MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); MockFilterChain chain = new MockFilterChain() { - public void doFilter(javax.servlet.ServletRequest request, javax.servlet.ServletResponse response) { ((MockHttpServletRequest) request).setSession(session_2); - }; + } + + ; }; - + filter.doFilter(request, response, chain); - + Assert.assertEquals(3, appStat.getSessionStatDataList().size()); Assert.assertEquals(2, appStat.getSessionStat(session_0.getId()).getRequestCount()); Assert.assertEquals(1, appStat.getSessionStat(session_1.getId()).getRequestCount()); Assert.assertEquals(1, appStat.getSessionStat(session_2.getId()).getRequestCount()); } - + // 第4个sesion请求1次 { MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); MockFilterChain chain = new MockFilterChain() { - public void doFilter(javax.servlet.ServletRequest request, javax.servlet.ServletResponse response) { ((MockHttpServletRequest) request).setSession(session_3); - }; + } + + ; }; - + filter.doFilter(request, response, chain); - + Assert.assertEquals(3, appStat.getSessionStatDataList().size()); Assert.assertNull(appStat.getSessionStat(session_0.getId())); Assert.assertEquals(1, appStat.getSessionStat(session_1.getId()).getRequestCount()); Assert.assertEquals(1, appStat.getSessionStat(session_2.getId()).getRequestCount()); Assert.assertEquals(1, appStat.getSessionStat(session_3.getId()).getRequestCount()); } - + // 第5个sesion请求1次 { MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletResponse response = new MockHttpServletResponse(); MockFilterChain chain = new MockFilterChain() { - public void doFilter(javax.servlet.ServletRequest request, javax.servlet.ServletResponse response) { ((MockHttpServletRequest) request).setSession(session_4); - }; + } + + ; }; - + filter.doFilter(request, response, chain); - + Assert.assertEquals(3, appStat.getSessionStatDataList().size()); Assert.assertNull(appStat.getSessionStat(session_0.getId())); Assert.assertNull(appStat.getSessionStat(session_1.getId())); diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest3_WebURIStatNull.java b/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest3_WebURIStatNull.java index 5788e9d3e7..19f927decb 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest3_WebURIStatNull.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest3_WebURIStatNull.java @@ -33,7 +33,6 @@ import com.alibaba.druid.support.http.stat.WebURIStat; public class WebStatFilterTest3_WebURIStatNull extends TestCase { - public void test_sessionStatDisable() throws Exception { MockServletContext servletContext = new MockServletContext(); @@ -52,7 +51,7 @@ public WebURIStat getURIStat(String uri, boolean create) { Assert.assertNotNull(filter.getWebAppStat()); filter.init(filterConfig); - + Assert.assertSame(appStat, filter.getWebAppStat()); Assert.assertFalse(filter.isSessionStatEnable()); @@ -70,10 +69,10 @@ public WebURIStat getURIStat(String uri, boolean create) { Assert.assertEquals(0, appStat.getSessionStatDataList().size()); filter.destroy(); - + Assert.assertFalse(WebAppStatManager.getInstance().getWebAppStatSet().contains(appStat)); Assert.assertFalse(StatFilterContext.getInstance().getListeners().contains(filter.getStatFilterContextListener())); - + Map statData = appStat.getStatData(); Assert.assertEquals(1L, statData.get("RequestCount")); } diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/util/IPRangeTest.java b/src/test/java/com/alibaba/druid/bvt/support/http/util/IPRangeTest.java index f441c7b92e..0d6ea9abb6 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/util/IPRangeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/util/IPRangeTest.java @@ -21,7 +21,6 @@ import com.alibaba.druid.support.http.util.IPRange; public class IPRangeTest extends TestCase { - public void test_ipRange_0() throws Exception { IPRange rang = new IPRange("128.242.127.0/24"); @@ -31,7 +30,7 @@ public void test_ipRange_0() throws Exception { assertTrue(rang.isIPAddressInRange(new IPAddress("128.242.127.2"))); assertFalse(rang.isIPAddressInRange(new IPAddress("128.242.126.2"))); - + rang.toString(); } @@ -69,16 +68,16 @@ public void test_ipRange_4() throws Exception { assertTrue(rang.isIPAddressInRange(new IPAddress("2.16.200.0"))); } - + public void test_ipRange_5() throws Exception { IPRange rang = new IPRange("1.1.1.1"); assertTrue(rang.isIPAddressInRange(new IPAddress("1.1.1.1"))); } - + public void test_ipRange_6() throws Exception { IPRange rang = new IPRange("128.242.127.3"); - + assertTrue(rang.isIPAddressInRange(new IPAddress("128.242.127.3"))); assertFalse(rang.isIPAddressInRange(new IPAddress("128.242.127.4"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest.java b/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest.java index bff4baa370..f11a867f4b 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.support.json.JSONParser; public class JSONParserTest extends TestCase { - public void test_parse() throws Exception { JSONParser parser = new JSONParser("{ \"id\":33,\"name\":\"jobs\",\"values\":[1,2,3,4], \"f1\":true, \"f2\":false,\"f3\":-234,\"f4\":3.5}"); Map map = (Map) parser.parse(); diff --git a/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java b/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java index 09989593e8..ff97c66d4c 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java @@ -12,7 +12,7 @@ public class JSONParserTest2 extends TestCase { public void test_parse() throws Exception { String text = Utils.readFromResource("bvt/sql.json"); - Map result = (Map)JSONUtils.parse(text); + Map result = (Map) JSONUtils.parse(text); List> sqlList = (List>) result.get("Content"); Assert.assertEquals(82, sqlList.size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest3.java b/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest3.java index 94783957b2..8480010afa 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest3.java @@ -11,7 +11,7 @@ public class JSONParserTest3 extends TestCase { public void test_parse() throws Exception { String text = Utils.readFromResource("bvt/sonar-sql.json"); - Map result = (Map)JSONUtils.parse(text); + Map result = (Map) JSONUtils.parse(text); LinkedHashMap wallStats = (LinkedHashMap) result.get("Content"); System.out.println(wallStats.get("blackList")); } diff --git a/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest4.java b/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest4.java index 20a4108a5f..ca91fb3c90 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest4.java @@ -4,9 +4,8 @@ import junit.framework.TestCase; public class JSONParserTest4 extends TestCase { - public void test_parse() throws Exception { - String text ="{\"\\u0006\":\"123\"}"; + String text = "{\"\\u0006\":\"123\"}"; System.out.println(JSONUtils.parse(text)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/support/logging/JakartaCommonsLoggingImplTest.java b/src/test/java/com/alibaba/druid/bvt/support/logging/JakartaCommonsLoggingImplTest.java index add1133cad..1f2110eeb0 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/logging/JakartaCommonsLoggingImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/logging/JakartaCommonsLoggingImplTest.java @@ -8,10 +8,9 @@ import com.alibaba.druid.support.logging.JakartaCommonsLoggingImpl; public class JakartaCommonsLoggingImplTest extends TestCase { - public void test_0() throws Exception { JakartaCommonsLoggingImpl impl = new JakartaCommonsLoggingImpl(DruidDataSource.class.getName()); - + impl.isDebugEnabled(); impl.isInfoEnabled(); impl.isWarnEnabled(); diff --git a/src/test/java/com/alibaba/druid/bvt/support/logging/Jdk14LoggingImplTest.java b/src/test/java/com/alibaba/druid/bvt/support/logging/Jdk14LoggingImplTest.java index f383b86e99..aef1ff0d12 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/logging/Jdk14LoggingImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/logging/Jdk14LoggingImplTest.java @@ -8,10 +8,9 @@ import com.alibaba.druid.support.logging.Jdk14LoggingImpl; public class Jdk14LoggingImplTest extends TestCase { - public void test_0() throws Exception { Jdk14LoggingImpl impl = new Jdk14LoggingImpl(DruidDataSource.class.getName()); - + impl.isDebugEnabled(); impl.isInfoEnabled(); impl.isWarnEnabled(); diff --git a/src/test/java/com/alibaba/druid/bvt/support/logging/Log4jImplTest.java b/src/test/java/com/alibaba/druid/bvt/support/logging/Log4jImplTest.java index e9ee13c584..e2a1a2802e 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/logging/Log4jImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/logging/Log4jImplTest.java @@ -8,10 +8,9 @@ import com.alibaba.druid.support.logging.Log4jImpl; public class Log4jImplTest extends TestCase { - public void test_0() throws Exception { Log4jImpl impl = new Log4jImpl(DruidDataSource.class.getName()); - + impl.isDebugEnabled(); impl.isInfoEnabled(); impl.isWarnEnabled(); diff --git a/src/test/java/com/alibaba/druid/bvt/support/logging/NoLoggingImplTest.java b/src/test/java/com/alibaba/druid/bvt/support/logging/NoLoggingImplTest.java index 4e8ed0e957..079526442c 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/logging/NoLoggingImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/logging/NoLoggingImplTest.java @@ -8,10 +8,9 @@ import com.alibaba.druid.support.logging.NoLoggingImpl; public class NoLoggingImplTest extends TestCase { - public void test_0() throws Exception { NoLoggingImpl impl = new NoLoggingImpl(DruidDataSource.class.getName()); - + impl.isDebugEnabled(); impl.isInfoEnabled(); impl.isWarnEnabled(); diff --git a/src/test/java/com/alibaba/druid/bvt/support/logging/SLF4JImplTest.java b/src/test/java/com/alibaba/druid/bvt/support/logging/SLF4JImplTest.java index 6a95464cf3..10778abbee 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/logging/SLF4JImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/logging/SLF4JImplTest.java @@ -8,10 +8,9 @@ import com.alibaba.druid.support.logging.SLF4JImpl; public class SLF4JImplTest extends TestCase { - public void test_0() throws Exception { SLF4JImpl impl = new SLF4JImpl(DruidDataSource.class.getName()); - + impl.isDebugEnabled(); impl.isInfoEnabled(); impl.isWarnEnabled(); diff --git a/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest.java b/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest.java index 8338662459..f4f7416c84 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest.java @@ -8,7 +8,7 @@ public class ExportConditionsTest extends TestCase { ExportConditions udf = new ExportConditions(); - + public void test_export_conditions() throws Exception { String result = udf.evaluate("select * from t where id = 3 and name = 'chensheng'"); Assert.assertEquals("[[\"t\",\"id\",\"=\",3],[\"t\",\"name\",\"=\",\"chensheng\"]]", result); diff --git a/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest2.java b/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest2.java index d06f2d2df8..78c785f7de 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest2.java @@ -8,7 +8,7 @@ public class ExportConditionsTest2 extends TestCase { ExportConditions udf = new ExportConditions(); - + public void test_export_conditions() throws Exception { String result = udf.evaluate("select * from t where proof_account is not null"); Assert.assertEquals("[[\"t\",\"proof_account\",\"IS NOT\",null]]", result); diff --git a/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest3.java b/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest3.java index 33b689543a..d34fc1675e 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest3.java @@ -8,7 +8,7 @@ public class ExportConditionsTest3 extends TestCase { ExportConditions udf = new ExportConditions(); - + public void test_export_conditions() throws Exception { String result = udf.evaluate("select * from t where trim(name) = 'abc'"); Assert.assertEquals("[[\"t\",\"name\",\"=\",\"abc\"]]", result); diff --git a/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest4.java b/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest4.java index d25d107847..689e63cbff 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest4.java @@ -8,7 +8,7 @@ public class ExportConditionsTest4 extends TestCase { ExportConditions udf = new ExportConditions(); - + public void test_export_conditions() throws Exception { String result = udf.evaluate("select * from t where trim(name) <> 'abc'"); Assert.assertEquals("[[\"t\",\"name\",\"<>\",\"abc\"]]", result); diff --git a/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest5.java b/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest5.java index b8f2506f54..0048c0e304 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest5.java @@ -8,7 +8,7 @@ public class ExportConditionsTest5 extends TestCase { ExportConditions udf = new ExportConditions(); - + public void test_export_conditions() throws Exception { String result = udf.evaluate("select * from t where name = 'a1' or name = 'a2'"); Assert.assertEquals("[[\"t\",\"name\",\"=\",[\"a1\",\"a2\"]]]", result); diff --git a/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest6.java b/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest6.java index bcd907947d..f77bf44cc4 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest6.java @@ -8,7 +8,7 @@ public class ExportConditionsTest6 extends TestCase { ExportConditions udf = new ExportConditions(); - + public void test_export_conditions() throws Exception { String result = udf.evaluate("select * from t where name = 'a1'", "odps", true); Assert.assertEquals("[[\"t\",\"name\",\"=\",[\"a1\"]]]", result); diff --git a/src/test/java/com/alibaba/druid/bvt/support/profile/ProfilerTest.java b/src/test/java/com/alibaba/druid/bvt/support/profile/ProfilerTest.java index 2833586c79..a410dc2d7b 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/profile/ProfilerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/profile/ProfilerTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.support.profile.Profiler; public class ProfilerTest extends TestCase { - public void test_profile() throws Exception { for (int i = 0; i < 10; ++i) { req(); @@ -28,15 +27,15 @@ private void req() { { ProfileEntryReqStat stat = Profiler.getStatsMap().get(new ProfileEntryKey("/", "com.xxx.a(int)", - Profiler.PROFILE_TYPE_SPRING)); + Profiler.PROFILE_TYPE_SPRING)); Assert.assertEquals(100, stat.getExecuteCount()); Assert.assertEquals(100, stat.getExecuteTimeNanos()); } { ProfileEntryReqStat stat = Profiler.getStatsMap().get(new ProfileEntryKey("com.xxx.a(int)", - "com.xxx.b(int)", - Profiler.PROFILE_TYPE_SPRING)); + "com.xxx.b(int)", + Profiler.PROFILE_TYPE_SPRING)); Assert.assertEquals(1000 * 100, stat.getExecuteCount()); Assert.assertEquals(1000 * 100, stat.getExecuteTimeNanos()); } diff --git a/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobCreatorTest.java b/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobCreatorTest.java index a04ddc76fd..70bc4d6214 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobCreatorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobCreatorTest.java @@ -11,7 +11,6 @@ import com.alibaba.druid.support.spring.DruidLobCreator; public class DruidLobCreatorTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobHandlerTest.java b/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobHandlerTest.java index 2556f27f64..aa83f2b946 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobHandlerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobHandlerTest.java @@ -11,11 +11,10 @@ import com.alibaba.druid.support.spring.DruidLobHandler; public class DruidLobHandlerTest extends TestCase { - public void test_0() throws Exception { DruidLobHandler handler = new DruidLobHandler(); List rows = new ArrayList(); - rows.add(new Object[] { null, new MockBlob(), new MockClob() }); + rows.add(new Object[]{null, new MockBlob(), new MockClob()}); MockResultSet rs = new MockResultSet(null, rows); rs.next(); @@ -23,26 +22,26 @@ public void test_0() throws Exception { handler.getBlobAsBinaryStream(rs, "1"); handler.getBlobAsBytes(rs, 1); handler.getBlobAsBytes(rs, "1"); - + handler.getBlobAsBinaryStream(rs, 2); handler.getBlobAsBinaryStream(rs, "2"); handler.getBlobAsBytes(rs, 2); handler.getBlobAsBytes(rs, "2"); - + handler.getClobAsAsciiStream(rs, 1); handler.getClobAsAsciiStream(rs, "1"); handler.getClobAsCharacterStream(rs, 1); handler.getClobAsCharacterStream(rs, "1"); handler.getClobAsString(rs, 1); handler.getClobAsString(rs, "1"); - + handler.getClobAsAsciiStream(rs, 3); handler.getClobAsAsciiStream(rs, "3"); handler.getClobAsCharacterStream(rs, 3); handler.getClobAsCharacterStream(rs, "3"); handler.getClobAsString(rs, 3); handler.getClobAsString(rs, "3"); - + handler.getLobCreator(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/utils/DaemonThreadFactoryTest.java b/src/test/java/com/alibaba/druid/bvt/utils/DaemonThreadFactoryTest.java index 4a450e4b96..9bc1b5470a 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/DaemonThreadFactoryTest.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/DaemonThreadFactoryTest.java @@ -7,11 +7,10 @@ import com.alibaba.druid.util.DaemonThreadFactory; -public class DaemonThreadFactoryTest extends TestCase { - public void test_0 () throws Exception { +public class DaemonThreadFactoryTest extends TestCase { + public void test_0() throws Exception { Runnable task = new Runnable() { public void run() { - } }; DaemonThreadFactory factory = new DaemonThreadFactory("test"); diff --git a/src/test/java/com/alibaba/druid/bvt/utils/DruidWebUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/utils/DruidWebUtilsTest.java index 000649c28c..c22eb4e59d 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/DruidWebUtilsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/DruidWebUtilsTest.java @@ -8,12 +8,10 @@ import com.alibaba.druid.util.DruidWebUtils; public class DruidWebUtilsTest extends TestCase { - public void test_getContextPath_2_5() throws Exception { new DruidWebUtils(); // MockServletContext context = new MockServletContext() { - public int getMajorVersion() { return 2; } diff --git a/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java b/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java index bf11d18cf4..d17a00b6a3 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java @@ -6,40 +6,39 @@ import com.alibaba.druid.util.Histogram; public class HistogramTest extends TestCase { - public void test_histo() throws Exception { Histogram histo = Histogram.makeHistogram(4); - + Assert.assertEquals(4, histo.getRanges().length); histo.record(0); - + histo.record(1); histo.record(2); - + histo.record(11); histo.record(12); histo.record(13); - + histo.record(101); histo.record(102); histo.record(103); histo.record(104); - + histo.record(1001); histo.record(1002); histo.record(1003); histo.record(1004); histo.record(1005); - + histo.record(10001); - + Assert.assertEquals(1, histo.get(0)); Assert.assertEquals(2, histo.get(1)); Assert.assertEquals(3, histo.get(2)); Assert.assertEquals(4, histo.get(3)); Assert.assertEquals(6, histo.get(4)); - + histo.toString(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/utils/JSONWriterTest.java b/src/test/java/com/alibaba/druid/bvt/utils/JSONWriterTest.java index bc917eac94..40109f3896 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/JSONWriterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/JSONWriterTest.java @@ -9,10 +9,9 @@ import com.alibaba.druid.support.json.JSONWriter; public class JSONWriterTest extends TestCase { - public void test_intArray() throws Exception { JSONWriter writer = new JSONWriter(); - writer.writeObject(new int[] { 1, 2, 3 }); + writer.writeObject(new int[]{1, 2, 3}); Assert.assertEquals("[1,2,3]", writer.toString()); } @@ -20,10 +19,9 @@ public void test_throwable() throws Exception { JSONWriter writer = new JSONWriter(); writer.writeObject(new Throwable() { public void printStackTrace(PrintWriter s) { - } }); Assert.assertEquals("{\"Class\":\"com.alibaba.druid.bvt.utils.JSONWriterTest$1\",\"Message\":null,\"StackTrace\":\"\"}", - writer.toString()); + writer.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java index 25c8f99c55..e98e2968ab 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java @@ -30,7 +30,6 @@ import com.alibaba.druid.util.JdbcUtils; public class JdbcUtilsTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -63,7 +62,7 @@ public void test_curd() throws Exception { List> list = JdbcUtils.executeQuery(dataSource, "select * from user"); Assert.assertEquals(1, list.size()); Map data = list.get(0); - + Assert.assertEquals(123, data.get("ID")); Assert.assertEquals("高傲的羊", data.get("NAME")); } @@ -71,7 +70,7 @@ public void test_curd() throws Exception { List> list = JdbcUtils.executeQuery(dataSource, "select id \"id\", name \"name\" from user"); Assert.assertEquals(1, list.size()); Map data = list.get(0); - + Assert.assertEquals(123, data.get("id")); Assert.assertEquals("高傲的羊", data.get("name")); } diff --git a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest1.java b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest1.java index a04c202887..5445b96dbf 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest1.java @@ -12,47 +12,49 @@ public class JdbcUtilsTest1 extends TestCase { public void test_jdbc() throws Exception { Assert.assertTrue(JdbcUtils.createDriver(MockDriver.class.getName()) instanceof MockDriver); } - + public void test_jdbc_1() throws Exception { class MyClassLoader extends ClassLoader { - - }; - + } + ; + MyClassLoader classLoader = new MyClassLoader(); Assert.assertTrue(JdbcUtils.createDriver(classLoader, MockDriver.class.getName()) instanceof MockDriver); } - + public void test_jdbc_2() throws Exception { class MyClassLoader extends ClassLoader { public Class loadClass(String name) throws ClassNotFoundException { return null; } - }; - + } + ; + MyClassLoader classLoader = new MyClassLoader(); - + ClassLoader contextLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(classLoader); - + Assert.assertTrue(JdbcUtils.createDriver(classLoader, MockDriver.class.getName()) instanceof MockDriver); - + Thread.currentThread().setContextClassLoader(contextLoader); } - + public void test_jdbc_3() throws Exception { class MyClassLoader extends ClassLoader { public Class loadClass(String name) throws ClassNotFoundException { return null; } - }; - + } + ; + MyClassLoader classLoader = new MyClassLoader(); - + ClassLoader contextLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(null); - + Assert.assertTrue(JdbcUtils.createDriver(classLoader, MockDriver.class.getName()) instanceof MockDriver); - + Thread.currentThread().setContextClassLoader(contextLoader); } } diff --git a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java index 700257e723..d2d88f3cd9 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java @@ -32,7 +32,7 @@ public void test_xugu_driver() throws Exception { public void test_kdb() throws Exception { assertEquals(JdbcConstants.KDB_DRIVER, JdbcUtils.getDriverClassName("jdbc:inspur:")); } - + public void test_tydb() throws Exception { assertEquals(JdbcConstants.TYDB_DRIVER, JdbcUtils.getDriverClassName("jdbc:dbcp:")); } diff --git a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest_for_odps.java b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest_for_odps.java index 31a75b33a1..adbf217a01 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest_for_odps.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest_for_odps.java @@ -11,6 +11,7 @@ public class JdbcUtilsTest_for_odps extends TestCase { public void test_odps() throws Exception { Assert.assertEquals(JdbcConstants.ODPS_DRIVER, JdbcUtils.getDriverClassName("jdbc:odps:")); } + public void test_odps_dbtype() throws Exception { Assert.assertEquals(JdbcConstants.ODPS, JdbcUtils.getDbTypeRaw("jdbc:odps:", null)); } diff --git a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java index 79c4a4c4b5..55de7bb4c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java @@ -11,7 +11,6 @@ import junit.framework.TestCase; public class JdbcUtils_driver extends TestCase { - public void test_null() throws Exception { Assert.assertNull(JdbcUtils.getDriverClassName(null)); } @@ -26,7 +25,7 @@ public void test_driver() throws Exception { Assert.assertEquals(0, driver.getMajorVersion()); Assert.assertEquals(1, driver.getMinorVersion()); - + Assert.assertEquals(JdbcConstants.ODPS, JdbcUtils.getDbTypeRaw(url, className)); } diff --git a/src/test/java/com/alibaba/druid/bvt/utils/LocalResultSetTest.java b/src/test/java/com/alibaba/druid/bvt/utils/LocalResultSetTest.java index cdac5d4986..165136f1d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/LocalResultSetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/LocalResultSetTest.java @@ -7,7 +7,6 @@ import com.alibaba.druid.util.jdbc.LocalResultSet; public class LocalResultSetTest extends TestCase { - public void test_0() throws Exception { LocalResultSet rs = new LocalResultSet(null); rs.getRows().add(new Object[1]); diff --git a/src/test/java/com/alibaba/druid/demo/sql/CreateTableSetSchemaDemo.java b/src/test/java/com/alibaba/druid/demo/sql/CreateTableSetSchemaDemo.java index 8e26ab0f3e..68eef30f09 100644 --- a/src/test/java/com/alibaba/druid/demo/sql/CreateTableSetSchemaDemo.java +++ b/src/test/java/com/alibaba/druid/demo/sql/CreateTableSetSchemaDemo.java @@ -17,21 +17,20 @@ import java.util.Set; public class CreateTableSetSchemaDemo extends TestCase { - public void test_schemaStat() throws Exception { -String sql = "create table t(fid varchar(20))"; + String sql = "create table t(fid varchar(20))"; -DbType dbType = DbType.oracle; -SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); -List stmtList = parser.parseStatementList(); + DbType dbType = DbType.oracle; + SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); + List stmtList = parser.parseStatementList(); -SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(dbType); -for (SQLStatement stmt : stmtList) { - SQLCreateTableStatement createTable = ((SQLCreateTableStatement) stmt); - createTable.setSchema("sc001"); -} + SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(dbType); + for (SQLStatement stmt : stmtList) { + SQLCreateTableStatement createTable = ((SQLCreateTableStatement) stmt); + createTable.setSchema("sc001"); + } -String sql2 = SQLUtils.toSQLString(stmtList, DbType.oracle); -System.out.println(sql2); + String sql2 = SQLUtils.toSQLString(stmtList, DbType.oracle); + System.out.println(sql2); } } diff --git a/src/test/java/com/alibaba/druid/demo/sql/ExportParameters.java b/src/test/java/com/alibaba/druid/demo/sql/ExportParameters.java index 274968b3e5..718647c548 100644 --- a/src/test/java/com/alibaba/druid/demo/sql/ExportParameters.java +++ b/src/test/java/com/alibaba/druid/demo/sql/ExportParameters.java @@ -14,18 +14,18 @@ public class ExportParameters extends TestCase { public void test_export_parameters() throws Exception { String sql = "select * from t where id = 3 and name = 'abc'"; - + List stmtList = SQLUtils.parseStatements(sql, DbType.mysql); - + StringBuilder out = new StringBuilder(); ExportParameterVisitor visitor = new MySqlExportParameterVisitor(out); for (SQLStatement stmt : stmtList) { stmt.accept(visitor); } - + String paramteredSql = out.toString(); System.out.println(paramteredSql); - + List paramters = visitor.getParameters(); // [3, "abc"] for (Object param : paramters) { System.out.println(param); diff --git a/src/test/java/com/alibaba/druid/demo/sql/MySqlVisitorDemo.java b/src/test/java/com/alibaba/druid/demo/sql/MySqlVisitorDemo.java index 45ccd1add3..2f12da99c2 100644 --- a/src/test/java/com/alibaba/druid/demo/sql/MySqlVisitorDemo.java +++ b/src/test/java/com/alibaba/druid/demo/sql/MySqlVisitorDemo.java @@ -31,6 +31,7 @@ public void test_for_demo() throws Exception { public static class ExportTableAliasVisitor extends MySqlASTVisitorAdapter { private Map aliasMap = new HashMap(); + public boolean visit(SQLExprTableSource x) { String alias = x.getAlias(); aliasMap.put(alias, x); diff --git a/src/test/java/com/alibaba/druid/demo/sql/OracleCompatibleTest.java b/src/test/java/com/alibaba/druid/demo/sql/OracleCompatibleTest.java index f84420105b..5c0b6c66f7 100644 --- a/src/test/java/com/alibaba/druid/demo/sql/OracleCompatibleTest.java +++ b/src/test/java/com/alibaba/druid/demo/sql/OracleCompatibleTest.java @@ -8,14 +8,13 @@ public class OracleCompatibleTest extends TestCase { public void test_compatibleTest() throws Exception { String sql = "select * from t where rownum < 10"; //oracle ppas OracleLexer lexer = new OracleLexer(sql); - for (;;) { + for (; ; ) { lexer.nextToken(); Token token = lexer.token(); if (token == Token.EOF) { break; } if (token == Token.IDENTIFIER) { - System.out.println(lexer.stringVal()); } else if (token == Token.LITERAL_CHARS || token == Token.LITERAL_INT diff --git a/src/test/java/com/alibaba/druid/demo/sql/OracleVisitorDemo.java b/src/test/java/com/alibaba/druid/demo/sql/OracleVisitorDemo.java index 32d60ddff4..5981bcacae 100644 --- a/src/test/java/com/alibaba/druid/demo/sql/OracleVisitorDemo.java +++ b/src/test/java/com/alibaba/druid/demo/sql/OracleVisitorDemo.java @@ -29,6 +29,7 @@ public void test_for_demo() throws Exception { public static class ExportTableAliasVisitor extends OracleASTVisitorAdapter { private Map aliasMap = new HashMap(); + public boolean visit(OracleSelectTableReference x) { String alias = x.getAlias(); aliasMap.put(alias, x); diff --git a/src/test/java/com/alibaba/druid/demo/sql/PGVisitorDemo.java b/src/test/java/com/alibaba/druid/demo/sql/PGVisitorDemo.java index 8722f7d840..49beeef1ea 100644 --- a/src/test/java/com/alibaba/druid/demo/sql/PGVisitorDemo.java +++ b/src/test/java/com/alibaba/druid/demo/sql/PGVisitorDemo.java @@ -30,6 +30,7 @@ public void test_for_demo() throws Exception { public static class ExportTableAliasVisitor extends PGASTVisitorAdapter { private Map aliasMap = new HashMap(); + public boolean visit(SQLExprTableSource x) { String alias = x.getAlias(); aliasMap.put(alias, x); diff --git a/src/test/java/com/alibaba/druid/demo/sql/SchemaStatTest_odps.java b/src/test/java/com/alibaba/druid/demo/sql/SchemaStatTest_odps.java index c4698e97b2..01345b73d3 100644 --- a/src/test/java/com/alibaba/druid/demo/sql/SchemaStatTest_odps.java +++ b/src/test/java/com/alibaba/druid/demo/sql/SchemaStatTest_odps.java @@ -18,7 +18,6 @@ import java.util.Set; public class SchemaStatTest_odps extends TestCase { - public void test_schemaStat() throws Exception { File file = new File("/Users/wenshao/Downloads/odps_sql_1.txt"); String sql = FileUtils.readFileToString(file); diff --git a/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java b/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java index e12b6cc933..e9eb6056f0 100644 --- a/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java +++ b/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java @@ -17,7 +17,6 @@ * @author Jonas Yang */ public class ConfigFileGenerator { - protected String filePath; @Before @@ -47,7 +46,7 @@ public void tearDown() { } File file = new File(this.filePath); - if(file.exists()) { + if (file.exists()) { file.delete(); } } diff --git a/src/test/java/com/alibaba/druid/kylin/KylinDriverSupportTest.java b/src/test/java/com/alibaba/druid/kylin/KylinDriverSupportTest.java index 460cce4d43..d6ceceae53 100644 --- a/src/test/java/com/alibaba/druid/kylin/KylinDriverSupportTest.java +++ b/src/test/java/com/alibaba/druid/kylin/KylinDriverSupportTest.java @@ -17,7 +17,6 @@ * @author yinheli */ public class KylinDriverSupportTest { - // test config private static final String URL = "jdbc:kylin://172.168.1.111:7070/jlkBigData"; private static final String USER_NAME = "ADMIN"; diff --git a/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java b/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java index 76afd0137f..964c020f42 100644 --- a/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java +++ b/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java @@ -26,11 +26,11 @@ public class MySqlBigTableTest extends TestCase { final int COUNT = 800; - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; + + private String jdbcUrl; + private String user; + private String password; + private String driverClass; private DruidDataSource dataSource; @@ -63,7 +63,6 @@ protected void tearDown() throws Exception { } public void test_0() throws Exception { - StringBuffer ddl = new StringBuffer(); ddl.append("INSERT INTO t_big ("); for (int i = 0; i < COUNT; ++i) { @@ -97,7 +96,6 @@ public void test_0() throws Exception { } private void dropTable() throws SQLException { - Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); diff --git a/src/test/java/com/alibaba/druid/mysql/MySqlConnectFailTest.java b/src/test/java/com/alibaba/druid/mysql/MySqlConnectFailTest.java index 19e7207dd0..11268e6516 100644 --- a/src/test/java/com/alibaba/druid/mysql/MySqlConnectFailTest.java +++ b/src/test/java/com/alibaba/druid/mysql/MySqlConnectFailTest.java @@ -19,6 +19,7 @@ protected void setUp() throws Exception { dataSource.setPassword("xxx"); dataSource.setCreateScheduler(Executors.newScheduledThreadPool(10)); } + public void test_0() throws Exception { Connection conn = dataSource.getConnection(); conn.close(); diff --git a/src/test/java/com/alibaba/druid/mysql/MySqlHexTest.java b/src/test/java/com/alibaba/druid/mysql/MySqlHexTest.java index b9706b7ad2..35b2ba3762 100644 --- a/src/test/java/com/alibaba/druid/mysql/MySqlHexTest.java +++ b/src/test/java/com/alibaba/druid/mysql/MySqlHexTest.java @@ -26,11 +26,11 @@ public class MySqlHexTest extends TestCase { final int COUNT = 800; - - private String jdbcUrl; - private String user; - private String password; - private String driverClass; + + private String jdbcUrl; + private String user; + private String password; + private String driverClass; private DruidDataSource dataSource; @@ -51,7 +51,6 @@ protected void setUp() throws Exception { public void test_0() throws Exception { - Connection conn = dataSource.getConnection(); String sql = "SELECT INSERT('Quadratic', 1, 4, 'What')"; diff --git a/src/test/java/com/alibaba/druid/mysql/MySqlInsertTest.java b/src/test/java/com/alibaba/druid/mysql/MySqlInsertTest.java index 27e6f8fbaf..d941dda1ff 100644 --- a/src/test/java/com/alibaba/druid/mysql/MySqlInsertTest.java +++ b/src/test/java/com/alibaba/druid/mysql/MySqlInsertTest.java @@ -6,10 +6,11 @@ import java.sql.Connection; import java.sql.Statement; -public class MySqlInsertTest extends DbTestCase { +public class MySqlInsertTest extends DbTestCase { public MySqlInsertTest() { super("pool_config/mysql_oracle_info.properties"); } + public void test_for_mysql() throws Exception { Connection conn = getConnection(); Statement stmt = conn.createStatement(); diff --git a/src/test/java/com/alibaba/druid/mysql/MysqlLimitTest.java b/src/test/java/com/alibaba/druid/mysql/MysqlLimitTest.java index 206805a27e..1b7702731d 100644 --- a/src/test/java/com/alibaba/druid/mysql/MysqlLimitTest.java +++ b/src/test/java/com/alibaba/druid/mysql/MysqlLimitTest.java @@ -11,10 +11,9 @@ * Created by tianzhen.wtz on 2016/6/7. * 类说明： */ -public class MysqlLimitTest extends TestCase{ +public class MysqlLimitTest extends TestCase { - - public void testLimit(){ + public void testLimit() { String sql = "select * from aaa limit 20exx"; SQLStatementParser statementParser = SQLParserUtils.createSQLStatementParser(sql, "mysql"); try { diff --git a/src/test/java/com/alibaba/druid/mysql/MysqlVarantRefTest.java b/src/test/java/com/alibaba/druid/mysql/MysqlVarantRefTest.java index 98b6176c99..955855e321 100644 --- a/src/test/java/com/alibaba/druid/mysql/MysqlVarantRefTest.java +++ b/src/test/java/com/alibaba/druid/mysql/MysqlVarantRefTest.java @@ -18,28 +18,27 @@ * Created by szf on 2017/11/16. */ public class MysqlVarantRefTest { - @Test - public void test(){ - String sql = "set session tx_variables = 1, session asdfsa = 2 "; + public void test() { + String sql = "set session tx_variables = 1, session asdfsa = 2 "; SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - SQLSetStatement result= (SQLSetStatement)stmtList.get(0); + SQLSetStatement result = (SQLSetStatement) stmtList.get(0); - SQLVariantRefExpr resultExpr = (SQLVariantRefExpr)result.getItems().get(0).getTarget(); - SQLVariantRefExpr resultExpr2 = (SQLVariantRefExpr)result.getItems().get(1).getTarget(); + SQLVariantRefExpr resultExpr = (SQLVariantRefExpr) result.getItems().get(0).getTarget(); + SQLVariantRefExpr resultExpr2 = (SQLVariantRefExpr) result.getItems().get(1).getTarget(); Assert.assertTrue(resultExpr.isSession()); Assert.assertTrue(resultExpr2.isSession()); } @Test - public void test22(){ - String sql = "set session tx_variables = 1, session asdfsa = 2 "; + public void test22() { + String sql = "set session tx_variables = 1, session asdfsa = 2 "; SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - SQLSetStatement result= (SQLSetStatement)stmtList.get(0); + SQLSetStatement result = (SQLSetStatement) stmtList.get(0); String text = SQLUtils.toSQLString(stmtList, DbType.mysql); Assert.assertEquals("SET @@session.tx_variables = 1, @@session.asdfsa = 2", text); @@ -48,83 +47,83 @@ public void test22(){ @Test - public void test11(){ - String sql = "set session TRANSACTION ISOLATION LEVEL SERIALIZABLE"; + public void test11() { + String sql = "set session TRANSACTION ISOLATION LEVEL SERIALIZABLE"; SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - MySqlSetTransactionStatement x = (MySqlSetTransactionStatement)stmtList.get(0); + MySqlSetTransactionStatement x = (MySqlSetTransactionStatement) stmtList.get(0); Assert.assertTrue(x.getSession()); } @Test - public void test12(){ - String sql = "set TRANSACTION ISOLATION LEVEL SERIALIZABLE"; + public void test12() { + String sql = "set TRANSACTION ISOLATION LEVEL SERIALIZABLE"; SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - MySqlSetTransactionStatement x = (MySqlSetTransactionStatement)stmtList.get(0); + MySqlSetTransactionStatement x = (MySqlSetTransactionStatement) stmtList.get(0); Assert.assertTrue(x.getSession() == null); } @Test - public void test2(){ - String sql = "set session tx_variables = 1, asdfsa = 2 "; + public void test2() { + String sql = "set session tx_variables = 1, asdfsa = 2 "; SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - SQLSetStatement result= (SQLSetStatement)stmtList.get(0); + SQLSetStatement result = (SQLSetStatement) stmtList.get(0); - SQLVariantRefExpr resultExpr = (SQLVariantRefExpr)result.getItems().get(0).getTarget(); - SQLVariantRefExpr resultExpr2 = (SQLVariantRefExpr)result.getItems().get(1).getTarget(); + SQLVariantRefExpr resultExpr = (SQLVariantRefExpr) result.getItems().get(0).getTarget(); + SQLVariantRefExpr resultExpr2 = (SQLVariantRefExpr) result.getItems().get(1).getTarget(); Assert.assertTrue(resultExpr.isSession()); Assert.assertTrue(!resultExpr2.isSession()); } @Test - public void test3(){ - String sql = "set tx_variables = 1, asdfsa = 2 "; + public void test3() { + String sql = "set tx_variables = 1, asdfsa = 2 "; SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - SQLSetStatement result= (SQLSetStatement)stmtList.get(0); + SQLSetStatement result = (SQLSetStatement) stmtList.get(0); - SQLVariantRefExpr resultExpr = (SQLVariantRefExpr)result.getItems().get(0).getTarget(); - SQLVariantRefExpr resultExpr2 = (SQLVariantRefExpr)result.getItems().get(1).getTarget(); + SQLVariantRefExpr resultExpr = (SQLVariantRefExpr) result.getItems().get(0).getTarget(); + SQLVariantRefExpr resultExpr2 = (SQLVariantRefExpr) result.getItems().get(1).getTarget(); Assert.assertTrue(!resultExpr.isSession()); Assert.assertTrue(!resultExpr2.isSession()); } @Test - public void test4(){ - String sql = "set tx_variables = 1,session asdfsa = 2 "; + public void test4() { + String sql = "set tx_variables = 1,session asdfsa = 2 "; SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - SQLSetStatement result= (SQLSetStatement)stmtList.get(0); + SQLSetStatement result = (SQLSetStatement) stmtList.get(0); - SQLVariantRefExpr resultExpr = (SQLVariantRefExpr)result.getItems().get(0).getTarget(); - SQLVariantRefExpr resultExpr2 = (SQLVariantRefExpr)result.getItems().get(1).getTarget(); + SQLVariantRefExpr resultExpr = (SQLVariantRefExpr) result.getItems().get(0).getTarget(); + SQLVariantRefExpr resultExpr2 = (SQLVariantRefExpr) result.getItems().get(1).getTarget(); Assert.assertTrue(!resultExpr.isSession()); Assert.assertTrue(resultExpr2.isSession()); } @Test - public void test5(){ - String sql = "set tx_variables = 1,session asdfsa = 2,session dfd = 3 "; + public void test5() { + String sql = "set tx_variables = 1,session asdfsa = 2,session dfd = 3 "; SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - SQLSetStatement result= (SQLSetStatement)stmtList.get(0); + SQLSetStatement result = (SQLSetStatement) stmtList.get(0); - SQLVariantRefExpr resultExpr = (SQLVariantRefExpr)result.getItems().get(0).getTarget(); - SQLVariantRefExpr resultExpr2 = (SQLVariantRefExpr)result.getItems().get(1).getTarget(); - SQLVariantRefExpr resultExpr3 = (SQLVariantRefExpr)result.getItems().get(2).getTarget(); + SQLVariantRefExpr resultExpr = (SQLVariantRefExpr) result.getItems().get(0).getTarget(); + SQLVariantRefExpr resultExpr2 = (SQLVariantRefExpr) result.getItems().get(1).getTarget(); + SQLVariantRefExpr resultExpr3 = (SQLVariantRefExpr) result.getItems().get(2).getTarget(); Assert.assertTrue(!resultExpr.isSession()); Assert.assertTrue(resultExpr2.isSession()); Assert.assertTrue(resultExpr3.isSession()); @@ -132,18 +131,18 @@ public void test5(){ @Test - public void test6(){ - String sql = "set tx_variables = 1,session asdfsa = 2,session dfd = 3, sdfsdf =3,session adfa =9 "; + public void test6() { + String sql = "set tx_variables = 1,session asdfsa = 2,session dfd = 3, sdfsdf =3,session adfa =9 "; SQLStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); - SQLSetStatement result= (SQLSetStatement)stmtList.get(0); + SQLSetStatement result = (SQLSetStatement) stmtList.get(0); - SQLVariantRefExpr resultExpr = (SQLVariantRefExpr)result.getItems().get(0).getTarget(); - SQLVariantRefExpr resultExpr2 = (SQLVariantRefExpr)result.getItems().get(1).getTarget(); - SQLVariantRefExpr resultExpr3 = (SQLVariantRefExpr)result.getItems().get(2).getTarget(); - SQLVariantRefExpr resultExpr4 = (SQLVariantRefExpr)result.getItems().get(3).getTarget(); - SQLVariantRefExpr resultExpr5 = (SQLVariantRefExpr)result.getItems().get(4).getTarget(); + SQLVariantRefExpr resultExpr = (SQLVariantRefExpr) result.getItems().get(0).getTarget(); + SQLVariantRefExpr resultExpr2 = (SQLVariantRefExpr) result.getItems().get(1).getTarget(); + SQLVariantRefExpr resultExpr3 = (SQLVariantRefExpr) result.getItems().get(2).getTarget(); + SQLVariantRefExpr resultExpr4 = (SQLVariantRefExpr) result.getItems().get(3).getTarget(); + SQLVariantRefExpr resultExpr5 = (SQLVariantRefExpr) result.getItems().get(4).getTarget(); Assert.assertTrue(!resultExpr.isSession()); Assert.assertTrue(resultExpr2.isSession()); Assert.assertTrue(resultExpr3.isSession()); diff --git a/src/test/java/com/alibaba/druid/mysql/QueryTimeoutTest.java b/src/test/java/com/alibaba/druid/mysql/QueryTimeoutTest.java index bda19d0dc3..d4c2d8240d 100644 --- a/src/test/java/com/alibaba/druid/mysql/QueryTimeoutTest.java +++ b/src/test/java/com/alibaba/druid/mysql/QueryTimeoutTest.java @@ -28,11 +28,11 @@ protected void setUp() throws Exception { dataSource.setValidationQuery("SELECT 1 FROM DUAL"); dataSource.setFilters("stat"); } - + public void test_queryTimeout() throws Exception { { Connection conn = dataSource.getConnection(); - + String sql = "SELECT * FROM ws_product WHERE HAVE_IMAGE = 'N' AND ROWNUM < 1000"; PreparedStatement stmt = conn.prepareStatement(sql); stmt.setQueryTimeout(1); @@ -43,7 +43,7 @@ public void test_queryTimeout() throws Exception { conn.close(); } Connection conn = dataSource.getConnection(); - + String sql = "SELECT 'x' FROM DUAL"; PreparedStatement stmt = conn.prepareStatement(sql); stmt.setQueryTimeout(1); diff --git a/src/test/java/com/alibaba/druid/not_support/sql/mysql/MySqlSelectTest_69_mysql8_windows_function.java b/src/test/java/com/alibaba/druid/not_support/sql/mysql/MySqlSelectTest_69_mysql8_windows_function.java index 165a8e7fa7..64c487adce 100644 --- a/src/test/java/com/alibaba/druid/not_support/sql/mysql/MySqlSelectTest_69_mysql8_windows_function.java +++ b/src/test/java/com/alibaba/druid/not_support/sql/mysql/MySqlSelectTest_69_mysql8_windows_function.java @@ -28,9 +28,8 @@ import java.util.List; public class MySqlSelectTest_69_mysql8_windows_function extends MysqlTest { - public static void test_0() throws Exception { - String sql = "SELECT\n" + + String sql = "SELECT\n" + " val,\n" + " ROW_NUMBER() OVER w AS 'row_number',\n" + " CUME_DIST() OVER w AS 'cume_dist',\n" + @@ -63,7 +62,7 @@ public static void test_0() throws Exception { "\t)\n" + "SELECT *\n" + "FROM ancestors;", // - output); + output); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); @@ -79,7 +78,7 @@ public static void test_0() throws Exception { "\t)\n" + "select *\n" + "from ancestors;", // - output); + output); } { diff --git a/src/test/java/com/alibaba/druid/not_support/sql/postgresql/PGSelectTest59_lateral.java b/src/test/java/com/alibaba/druid/not_support/sql/postgresql/PGSelectTest59_lateral.java index b58d63bb23..dcafd932a8 100644 --- a/src/test/java/com/alibaba/druid/not_support/sql/postgresql/PGSelectTest59_lateral.java +++ b/src/test/java/com/alibaba/druid/not_support/sql/postgresql/PGSelectTest59_lateral.java @@ -45,7 +45,7 @@ public void test_0() throws Exception { " 3\n" + " }'\n" + "GROUP BY id", SQLUtils.toPGString(stmt)); - + assertEquals("select id, sum(uv[1]) as uv1, sum(uv[2]) as uv2\n" + "from xxxxx\n" + "where a in (?)\n" + diff --git a/src/test/java/com/alibaba/druid/oracle/OracleKillSessionTest.java b/src/test/java/com/alibaba/druid/oracle/OracleKillSessionTest.java index 1849212b25..fcb0db7a77 100644 --- a/src/test/java/com/alibaba/druid/oracle/OracleKillSessionTest.java +++ b/src/test/java/com/alibaba/druid/oracle/OracleKillSessionTest.java @@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit; public class OracleKillSessionTest extends DbTestCase { - private final static Log LOG = LogFactory.getLog(OracleKillSessionTest.class); + private static final Log LOG = LogFactory.getLog(OracleKillSessionTest.class); private ScheduledExecutorService scheduler; @@ -56,9 +56,9 @@ public void runSql() throws Exception { rs = pstmt.executeQuery(); JdbcUtils.printResultSet(rs); } finally { - JdbcUtils.close(rs); - JdbcUtils.close(pstmt); - JdbcUtils.close(conn); + JdbcUtils.close(rs); + JdbcUtils.close(pstmt); + JdbcUtils.close(conn); } } diff --git a/src/test/java/com/alibaba/druid/oracle/Oracle_PSCacheTest.java b/src/test/java/com/alibaba/druid/oracle/Oracle_PSCacheTest.java index ca322b4399..78d4b3096b 100644 --- a/src/test/java/com/alibaba/druid/oracle/Oracle_PSCacheTest.java +++ b/src/test/java/com/alibaba/druid/oracle/Oracle_PSCacheTest.java @@ -34,9 +34,9 @@ public void test_oracle() throws Exception { } catch (SQLException ex) { ex.printStackTrace(); } finally { - JdbcUtils.close(rs); - JdbcUtils.close(pstmt); - JdbcUtils.close(conn); + JdbcUtils.close(rs); + JdbcUtils.close(pstmt); + JdbcUtils.close(conn); } Thread.sleep(3000); diff --git a/src/test/java/com/alibaba/druid/polardb/PolarDBDataSourceTest.java b/src/test/java/com/alibaba/druid/polardb/PolarDBDataSourceTest.java index ec104ade78..9047badd2f 100644 --- a/src/test/java/com/alibaba/druid/polardb/PolarDBDataSourceTest.java +++ b/src/test/java/com/alibaba/druid/polardb/PolarDBDataSourceTest.java @@ -15,7 +15,6 @@ import com.alibaba.druid.util.JdbcUtils; public class PolarDBDataSourceTest extends TestCase { - private String jdbcUrl; private DruidDataSource dataSource; @@ -42,8 +41,7 @@ public void testDataSource() throws SQLException { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELECT 1"); ResultSet rs = stmt.executeQuery(); - while(rs.next()) { - + while (rs.next()) { } JdbcUtils.close(rs); JdbcUtils.close(stmt); diff --git a/src/test/java/com/alibaba/druid/pool/Case0.java b/src/test/java/com/alibaba/druid/pool/Case0.java index 9b186ed974..2387d9bafa 100644 --- a/src/test/java/com/alibaba/druid/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/pool/Case0.java @@ -23,15 +23,14 @@ import com.alibaba.druid.util.JMXUtils; public class Case0 extends TestCase { - private String jdbcUrl; private String user; private String password; private String driverClass; - private int initialSize = 1; - private int minPoolSize = 1; - private int maxPoolSize = 2; - private int maxActive = 2; + private int initialSize = 1; + private int minPoolSize = 1; + private int maxPoolSize = 2; + private int maxActive = 2; protected void setUp() throws Exception { jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; @@ -67,7 +66,7 @@ public void test_singleThread() throws Exception { for (int i = 0; i < LOOP_COUNT; ++i) { Connection conn = dataSource.getConnection(); - + conn.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); Assert.assertEquals(initialSize, dataSource.getCreateCount()); diff --git a/src/test/java/com/alibaba/druid/pool/Case3.java b/src/test/java/com/alibaba/druid/pool/Case3.java index 500fadd658..51c67a2b5c 100644 --- a/src/test/java/com/alibaba/druid/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/pool/Case3.java @@ -23,7 +23,6 @@ import junit.framework.TestCase; public class Case3 extends TestCase { - public void test_1() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mysql://a.b.c.d:3306/druid2"); diff --git a/src/test/java/com/alibaba/druid/pool/CobarTest.java b/src/test/java/com/alibaba/druid/pool/CobarTest.java index c1196bf167..9f9341b435 100644 --- a/src/test/java/com/alibaba/druid/pool/CobarTest.java +++ b/src/test/java/com/alibaba/druid/pool/CobarTest.java @@ -29,14 +29,14 @@ public class CobarTest extends TestCase { private String password; private String driverClass; private DruidDataSource dataSource; - + protected void setUp() throws Exception { jdbcUrl = "jdbc:mysql://a.b.c.d:8066/pt_dragoon_masterdb_test?useUnicode=true&characterEncoding=UTF-8"; user = "pt_dragoon_test"; password = "pt_dragoon_test"; driverClass = "com.mysql.jdbc.Driver"; } - + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } @@ -51,9 +51,9 @@ public void test_0() throws Exception { dataSource.setExceptionSorter(MySqlExceptionSorter.class.getName()); Connection conn = dataSource.getConnection(); - + conn.close(); - + dataSource.close(); } } diff --git a/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java b/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java index 88a47fac78..503e77a766 100644 --- a/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java +++ b/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java @@ -23,14 +23,13 @@ import org.junit.Assert; public class ConcurrentTest extends TestCase { - private String jdbcUrl; private String user; private String password; private String driverClass; - private int minPoolSize = 50; - private int maxPoolSize = 100; - private int maxActive = 500; + private int minPoolSize = 50; + private int maxPoolSize = 100; + private int maxActive = 500; protected void setUp() throws Exception { // jdbcUrl = @@ -69,7 +68,6 @@ public void test_concurrent_2() throws Exception { for (int threadIndex = 0; threadIndex < THREAD_COUNT; ++threadIndex) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); diff --git a/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java b/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java index 0ac94fd9dc..5938f8fa48 100644 --- a/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java +++ b/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java @@ -23,14 +23,13 @@ import junit.framework.TestCase; public class ConcurrentTest2 extends TestCase { - private String jdbcUrl; private String user; private String password; private String driverClass; - private int minPoolSize = 1; - private int maxPoolSize = 8; - private int maxActive = 500; + private int minPoolSize = 1; + private int maxPoolSize = 8; + private int maxActive = 500; protected void setUp() throws Exception { // jdbcUrl = @@ -67,9 +66,8 @@ public void test_concurrent_2() throws Exception { final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(THREAD_COUNT); - + final CyclicBarrier barrier = new CyclicBarrier(5, new Runnable() { - @Override public void run() { dataSource.shrink(); @@ -78,7 +76,6 @@ public void run() { for (int threadIndex = 0; threadIndex < THREAD_COUNT; ++threadIndex) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); @@ -86,7 +83,7 @@ public void run() { for (int i = 0; i < LOOP_COUNT; ++i) { Connection conn = dataSource.getConnection(); conn.close(); - + barrier.await(10, TimeUnit.SECONDS); } } catch (Throwable e) { diff --git a/src/test/java/com/alibaba/druid/pool/DBCPTest.java b/src/test/java/com/alibaba/druid/pool/DBCPTest.java index 076459a05c..8efb3fac79 100644 --- a/src/test/java/com/alibaba/druid/pool/DBCPTest.java +++ b/src/test/java/com/alibaba/druid/pool/DBCPTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.mock.MockDriver; public class DBCPTest extends TestCase { - public void test_dbcp() throws Exception { BasicDataSource dataSource = new BasicDataSource(); dataSource.setDriverClassName(MockDriver.class.getName()); diff --git a/src/test/java/com/alibaba/druid/pool/DruidTest.java b/src/test/java/com/alibaba/druid/pool/DruidTest.java index befac5e10e..74422df773 100644 --- a/src/test/java/com/alibaba/druid/pool/DruidTest.java +++ b/src/test/java/com/alibaba/druid/pool/DruidTest.java @@ -24,15 +24,14 @@ import java.util.Date; public class DruidTest { - private static DruidDataSource DS; - public DruidTest(String connectURI){ + public DruidTest(String connectURI) { initDS(connectURI); } public DruidTest(String connectURI, String username, String pswd, String driverClass, int initialSize, - int maxActive, int maxIdle, int minIdle, int maxWait){ + int maxActive, int maxIdle, int minIdle, int maxWait) { initDS(connectURI, username, pswd, driverClass, initialSize, maxActive, minIdle, maxIdle, maxWait); } @@ -75,7 +74,6 @@ public static void initDS(String connectURI) { } public static void main(String[] args) throws IOException, SQLException { - DruidTest db = new DruidTest("jdbc:mysql://a.b.c.d:8066/amoeba"); Connection conn = null; Statement stmt = null; diff --git a/src/test/java/com/alibaba/druid/pool/ExeptionSorterTest.java b/src/test/java/com/alibaba/druid/pool/ExeptionSorterTest.java index 0b1dda8105..ad3c77ddf9 100644 --- a/src/test/java/com/alibaba/druid/pool/ExeptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/pool/ExeptionSorterTest.java @@ -25,13 +25,11 @@ public void test_dataSource() throws Exception { method.setAccessible(true); method.invoke(dataSource); - assertEquals(dataSource.getExceptionSorter().getClass(), MySqlExceptionSorter.class); + assertEquals(dataSource.getExceptionSorter().getClass(), MySqlExceptionSorter.class); } - public static class MyDriver extends Driver { - /** * Construct a new driver and register it with DriverManager * diff --git a/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java b/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java index 083e78efdd..e983eb14ee 100644 --- a/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java +++ b/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java @@ -22,7 +22,6 @@ import java.util.concurrent.CountDownLatch; public class MaxWaitTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -41,7 +40,6 @@ public void test_maxWait() throws Exception { final CountDownLatch latch = new CountDownLatch(10); for (int i = 0; i < 20; ++i) { Thread thread = new Thread() { - public void run() { try { for (int i = 0; i < 10; ++i) { diff --git a/src/test/java/com/alibaba/druid/pool/MemTest.java b/src/test/java/com/alibaba/druid/pool/MemTest.java index cc70aed9e5..bbaeb38e04 100644 --- a/src/test/java/com/alibaba/druid/pool/MemTest.java +++ b/src/test/java/com/alibaba/druid/pool/MemTest.java @@ -20,31 +20,30 @@ import java.util.concurrent.CopyOnWriteArraySet; public class MemTest { - - HashMap m = new HashMap(); - HashMap m1 = new HashMap(1); - ConcurrentHashMap cm = new ConcurrentHashMap(); - ConcurrentHashMap cm1 = new ConcurrentHashMap(1, 0.75f, 1); - ConcurrentSkipListMap csm = new ConcurrentSkipListMap(); - Hashtable ht = new Hashtable(); - Properties p = new Properties(); - TreeMap t = new TreeMap(); - LinkedHashMap l = new LinkedHashMap(); - - TreeSet ts = new TreeSet(); - HashSet hs = new HashSet(); - LinkedHashSet lhs = new LinkedHashSet(); - - ArrayList list = new ArrayList(); - ArrayList list1 = new ArrayList(1); - - CopyOnWriteArrayList cpl = new CopyOnWriteArrayList(); - CopyOnWriteArraySet cps = new CopyOnWriteArraySet(); - Vector v = new Vector(); - LinkedList ll = new LinkedList(); - Stack stack = new Stack(); - PriorityQueue pq = new PriorityQueue(); - ConcurrentLinkedQueue clq = new ConcurrentLinkedQueue(); + HashMap m = new HashMap(); + HashMap m1 = new HashMap(1); + ConcurrentHashMap cm = new ConcurrentHashMap(); + ConcurrentHashMap cm1 = new ConcurrentHashMap(1, 0.75f, 1); + ConcurrentSkipListMap csm = new ConcurrentSkipListMap(); + Hashtable ht = new Hashtable(); + Properties p = new Properties(); + TreeMap t = new TreeMap(); + LinkedHashMap l = new LinkedHashMap(); + + TreeSet ts = new TreeSet(); + HashSet hs = new HashSet(); + LinkedHashSet lhs = new LinkedHashSet(); + + ArrayList list = new ArrayList(); + ArrayList list1 = new ArrayList(1); + + CopyOnWriteArrayList cpl = new CopyOnWriteArrayList(); + CopyOnWriteArraySet cps = new CopyOnWriteArraySet(); + Vector v = new Vector(); + LinkedList ll = new LinkedList(); + Stack stack = new Stack(); + PriorityQueue pq = new PriorityQueue(); + ConcurrentLinkedQueue clq = new ConcurrentLinkedQueue(); public static void main(String[] args) throws Exception { MemTest o = new MemTest(); diff --git a/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java b/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java index 1609ea72cf..3fc903d25e 100644 --- a/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java +++ b/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java @@ -22,7 +22,6 @@ import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; public class MySqlValdConnectionTest extends TestCase { - private String jdbcUrl; private String user; private String password; diff --git a/src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java b/src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java index 6855c7fd8b..8839e2d7c0 100644 --- a/src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java +++ b/src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java @@ -28,11 +28,11 @@ protected void setUp() throws Exception { dataSource.setValidationQuery("SELECT 1 FROM DUAL"); dataSource.setFilters("stat"); } - + public void test_queryTimeout() throws Exception { { Connection conn = dataSource.getConnection(); - + String sql = "SELECT * FROM ws_product WHERE HAVE_IMAGE = 'N' AND ROWNUM < 1000"; PreparedStatement stmt = conn.prepareStatement(sql); stmt.setQueryTimeout(1); @@ -43,7 +43,7 @@ public void test_queryTimeout() throws Exception { conn.close(); } Connection conn = dataSource.getConnection(); - + String sql = "SELECT 'x' FROM DUAL"; PreparedStatement stmt = conn.prepareStatement(sql); stmt.setQueryTimeout(1); diff --git a/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java b/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java index e3ff1ce955..f62af213ab 100644 --- a/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java +++ b/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java @@ -24,10 +24,9 @@ import com.alibaba.druid.util.JdbcUtils; public class TestDruidOraclePreparedStatement extends TestCase { - - private String jdbcUrl; - private String user; - private String password; + private String jdbcUrl; + private String user; + private String password; private DruidDataSource dataSource; @@ -50,7 +49,6 @@ protected void tearDown() throws Exception { } public void test_0() throws Exception { - Class.forName(JdbcUtils.getDriverClassName(jdbcUrl)); // { @@ -88,7 +86,6 @@ public void test_0() throws Exception { stmt.setInt(1, 1); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); diff --git a/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java b/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java index c136671537..eba46b3ecf 100644 --- a/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java +++ b/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java @@ -24,8 +24,7 @@ import com.alibaba.druid.mock.MockDriver; public class TestIdle3_Concurrent_MaxActive extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -47,7 +46,6 @@ protected void setUp() throws Exception { } public void test_idle2() throws Exception { - // ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, // new ObjectName("com.alibaba:type=DataSource")); @@ -95,7 +93,6 @@ private void concurrent(final int threadCount) throws Exception { for (int i = 0; i < threadCount; ++i) { threads[i] = new Thread("thread-" + i) { - public void run() { try { startLatch.await(); diff --git a/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java b/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java index 517ed6d845..0805009c3e 100644 --- a/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java +++ b/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java @@ -29,8 +29,7 @@ import com.alibaba.druid.mock.MockDriver; public class TestIdle3_Concurrent_Starvation_Longtime extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -51,7 +50,7 @@ protected void setUp() throws Exception { dataSource.setFilters("stat"); ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, - new ObjectName("com.alibaba:type=DataSource")); + new ObjectName("com.alibaba:type=DataSource")); } protected void tearDown() throws Exception { @@ -59,7 +58,6 @@ protected void tearDown() throws Exception { } public void test_idle2() throws Exception { - // 第一次创建连接 { Assert.assertEquals(0, dataSource.getCreateCount()); @@ -104,7 +102,6 @@ private void concurrent(final int threadCount) throws Exception { final AtomicInteger pass = new AtomicInteger(); final CyclicBarrier closedBarrier = new CyclicBarrier(threadCount, new Runnable() { - public void run() { Assert.assertEquals(threadCount, dataSource.getPoolingCount()); dataSource.shrink(false); @@ -116,7 +113,6 @@ public void run() { } }); final CyclicBarrier closeBarrier = new CyclicBarrier(threadCount, new Runnable() { - public void run() { Assert.assertEquals(threadCount, dataSource.getActiveCount()); } @@ -124,12 +120,10 @@ public void run() { for (int i = 0; i < threadCount; ++i) { threads[i] = new Thread("thread-" + i) { - public void run() { try { startLatch.await(); for (int i = 0; i < 1000 * 1000 * 10; ++i) { - Connection conn = dataSource.getConnection(); closeBarrier.await(); diff --git a/src/test/java/com/alibaba/druid/pool/TestMockPerf.java b/src/test/java/com/alibaba/druid/pool/TestMockPerf.java index aaced28745..2c2d3a4867 100644 --- a/src/test/java/com/alibaba/druid/pool/TestMockPerf.java +++ b/src/test/java/com/alibaba/druid/pool/TestMockPerf.java @@ -22,7 +22,6 @@ import junit.framework.TestCase; public class TestMockPerf extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -54,9 +53,9 @@ public void run() { } }; thread.start(); - + } - + latch.await(); } diff --git a/src/test/java/com/alibaba/druid/pool/TestMySql.java b/src/test/java/com/alibaba/druid/pool/TestMySql.java index 5e26a74738..7cfe0b5529 100644 --- a/src/test/java/com/alibaba/druid/pool/TestMySql.java +++ b/src/test/java/com/alibaba/druid/pool/TestMySql.java @@ -5,7 +5,6 @@ import junit.framework.TestCase; public class TestMySql extends TestCase { - private DruidDataSource dataSource = new DruidDataSource(); protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/pool/TestMySqlPing.java b/src/test/java/com/alibaba/druid/pool/TestMySqlPing.java index f78edd6fd2..42c170a6d9 100644 --- a/src/test/java/com/alibaba/druid/pool/TestMySqlPing.java +++ b/src/test/java/com/alibaba/druid/pool/TestMySqlPing.java @@ -23,7 +23,6 @@ import java.sql.DriverManager; public class TestMySqlPing extends TestCase { - public void test_ping() throws Exception { String url = "jdbc:mysql://a.b.c.d:3308/dragoon_v25_masterdb"; String user = "dragoon_admin"; diff --git a/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java b/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java index 9ec2db5606..9e53b97e34 100644 --- a/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java +++ b/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java @@ -29,7 +29,6 @@ import com.alibaba.druid.util.OracleUtils; public class TestOraclePreparedStatement extends TestCase { - private String jdbcUrl; private String user; private String password; @@ -40,7 +39,7 @@ public void setUp() throws Exception { // jdbcUrl = "jdbc:oracle:thin:@b.c.d.e:1521:ocnauto"; // error url user = "alibaba"; password = "ccbuauto"; - + jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ointest3"; user = "alibaba"; password = "deYcR7facWSJtCuDpm2r"; @@ -63,7 +62,6 @@ public void createTable() throws Exception { } public void test_0() throws Exception { - Connection conn = DriverManager.getConnection(jdbcUrl, user, password); OracleConnection oracleConn = (OracleConnection) conn; @@ -89,32 +87,29 @@ public void test_0() throws Exception { PreparedStatement stmt = conn.prepareStatement(SQL); oracleStmt = (OraclePreparedStatement) stmt; oracleStmt.setRowPrefetch(10); - - { + { stmt.setInt(1, 327); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); //oracleStmt.clearDefines(); } - for (int i = 0; i < 10; ++i){ + for (int i = 0; i < 10; ++i) { OracleUtils.enterImplicitCache(oracleStmt); OracleUtils.exitImplicitCacheToActive(oracleStmt); stmt.setInt(1, 327); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } - + rs.close(); - + } - + oracleStmt.setRowPrefetch(1000); { stmt.setInt(1, 11); diff --git a/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java b/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java index 794debd6a5..e4f3d48635 100644 --- a/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java +++ b/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java @@ -27,7 +27,6 @@ import com.alibaba.druid.support.json.JSONUtils; public class TestOracle_DruidDataSource extends TestCase { - private String jdbcUrl; private String user; private String password; @@ -56,7 +55,6 @@ public void test_0() throws Exception { for (int i = 0; i < THREAD_COUNT; ++i) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); diff --git a/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java b/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java index 0475a8f546..f3fea1e2b1 100644 --- a/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java +++ b/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java @@ -27,11 +27,9 @@ import com.alibaba.druid.util.JdbcUtils; public class TestPoolStatement extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { - dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:oracle:thin:@a.b.c.d:1521:testconn"); dataSource.setInitialSize(1); @@ -83,7 +81,6 @@ private void exec() throws SQLException { stmt.setLong(1, new Random().nextInt(1000 * 100)); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - } rs.close(); stmt.close(); diff --git a/src/test/java/com/alibaba/druid/pool/TestRollBack.java b/src/test/java/com/alibaba/druid/pool/TestRollBack.java index cb8c03e491..8cbd07bbb1 100644 --- a/src/test/java/com/alibaba/druid/pool/TestRollBack.java +++ b/src/test/java/com/alibaba/druid/pool/TestRollBack.java @@ -26,11 +26,9 @@ import com.alibaba.druid.util.JdbcUtils; public class TestRollBack extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { - dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mysql://a.b.c.d/druid?useUnicode=true&characterEncoding=UTF-8"); dataSource.setUsername("dragoon_test"); diff --git a/src/test/java/com/alibaba/druid/pool/Test_C2.java b/src/test/java/com/alibaba/druid/pool/Test_C2.java index af00ca23a8..ec04ebf49c 100644 --- a/src/test/java/com/alibaba/druid/pool/Test_C2.java +++ b/src/test/java/com/alibaba/druid/pool/Test_C2.java @@ -23,14 +23,13 @@ import org.junit.Assert; public class Test_C2 extends TestCase { - private String jdbcUrl; private String user; private String password; private String driverClass; - private int minPoolSize = 50; - private int maxPoolSize = 100; - private int maxActive = 500; + private int minPoolSize = 50; + private int maxPoolSize = 100; + private int maxActive = 500; protected void setUp() throws Exception { // jdbcUrl = @@ -67,7 +66,6 @@ public void test_concurrent_2() throws Exception { for (int threadIndex = 0; threadIndex < THREAD_COUNT; ++threadIndex) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); diff --git a/src/test/java/com/alibaba/druid/pool/Test_kyline.java b/src/test/java/com/alibaba/druid/pool/Test_kyline.java index 982b3cff3e..466a214847 100644 --- a/src/test/java/com/alibaba/druid/pool/Test_kyline.java +++ b/src/test/java/com/alibaba/druid/pool/Test_kyline.java @@ -21,11 +21,10 @@ import junit.framework.TestCase; public class Test_kyline extends TestCase { - - private String url = "jdbc:mysql://a.b.c.d:8066/amoeba"; - private String user = "root"; + private String url = "jdbc:mysql://a.b.c.d:8066/amoeba"; + private String user = "root"; private String password = "12345"; - private String driver = "com.mysql.jdbc.Driver"; + private String driver = "com.mysql.jdbc.Driver"; public void test_0() throws Exception { DruidDataSource ds = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java b/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java index 842d98f1d1..494d2c822f 100644 --- a/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java +++ b/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java @@ -32,7 +32,6 @@ import com.mchange.v2.c3p0.impl.NewProxyConnection; public class TestLRU extends TestCase { - public void f_test_boneCP() throws Exception { BoneCPDataSource ds = new BoneCPDataSource(); ds.setJdbcUrl("jdbc:mock:test"); @@ -56,24 +55,24 @@ public void f_test_druid() throws Exception { System.out.println("--------------------------------------------"); } } - + public void f_test_dbcp() throws Exception { BasicDataSource ds = new BasicDataSource(); ds.setUrl("jdbc:mock:test"); ds.setMaxIdle(10); - + for (int i = 0; i < 10; ++i) { f(ds, 5); System.out.println("--------------------------------------------"); } } - + public void f_test_c3p0() throws Exception { ComboPooledDataSource ds = new ComboPooledDataSource(); ds.setJdbcUrl("jdbc:mock:test"); ds.setMaxPoolSize(10); ds.setMinPoolSize(0); - + for (int i = 0; i < 10; ++i) { f(ds, 5); System.out.println("--------------------------------------------"); @@ -102,12 +101,12 @@ public static MockConnection unwrap(Connection conn) throws Exception { } if (conn instanceof NewProxyConnection) { NewProxyConnection handle = (NewProxyConnection) conn; - + Field field = NewProxyConnection.class.getDeclaredField("inner"); field.setAccessible(true); return (MockConnection) field.get(handle); } - + return conn.unwrap(MockConnection.class); } diff --git a/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java b/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java index af75c2a6b7..4b5413d053 100644 --- a/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java +++ b/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java @@ -35,7 +35,6 @@ import com.mchange.v2.c3p0.impl.NewProxyPreparedStatement; public class TestPSCache extends TestCase { - public void test_boneCP() throws Exception { BoneCPDataSource ds = new BoneCPDataSource(); ds.setJdbcUrl("jdbc:mock:test"); @@ -98,7 +97,7 @@ public static void f(DataSource ds, int count) throws Exception { conn.close(); } - + public static MockPreparedStatement unwrap(PreparedStatement stmt) throws Exception { if (stmt instanceof NewProxyPreparedStatement) { Field field = NewProxyPreparedStatement.class.getDeclaredField("inner"); diff --git a/src/test/java/com/alibaba/druid/pool/dbcp/Test0.java b/src/test/java/com/alibaba/druid/pool/dbcp/Test0.java index c6d22bbdde..282375b4aa 100644 --- a/src/test/java/com/alibaba/druid/pool/dbcp/Test0.java +++ b/src/test/java/com/alibaba/druid/pool/dbcp/Test0.java @@ -24,7 +24,6 @@ import com.alibaba.druid.mock.MockDriver; public class Test0 extends TestCase { - public void test_idle() throws Exception { MockDriver driver = MockDriver.instance; diff --git a/src/test/java/com/alibaba/druid/pool/dbcp/TestIdleForKylin.java b/src/test/java/com/alibaba/druid/pool/dbcp/TestIdleForKylin.java index 92dcb2096f..729224e00f 100644 --- a/src/test/java/com/alibaba/druid/pool/dbcp/TestIdleForKylin.java +++ b/src/test/java/com/alibaba/druid/pool/dbcp/TestIdleForKylin.java @@ -26,7 +26,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class TestIdleForKylin extends TestCase { - public void test_idle() throws Exception { MockDriver driver = MockDriver.instance; diff --git a/src/test/java/com/alibaba/druid/pool/demo/Demo0.java b/src/test/java/com/alibaba/druid/pool/demo/Demo0.java index 0de2ca1da5..0409d881e5 100644 --- a/src/test/java/com/alibaba/druid/pool/demo/Demo0.java +++ b/src/test/java/com/alibaba/druid/pool/demo/Demo0.java @@ -23,15 +23,14 @@ import com.alibaba.druid.util.JMXUtils; public class Demo0 extends TestCase { - private String jdbcUrl; private String user; private String password; private String driverClass; - private int initialSize = 10; - private int minPoolSize = 1; - private int maxPoolSize = 2; - private int maxActive = 2; + private int initialSize = 10; + private int minPoolSize = 1; + private int maxPoolSize = 2; + private int maxActive = 2; protected void setUp() throws Exception { jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; diff --git a/src/test/java/com/alibaba/druid/pool/ha/CounterValidConnectionChecker.java b/src/test/java/com/alibaba/druid/pool/ha/CounterValidConnectionChecker.java index c40798ee8f..d9e341a457 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/CounterValidConnectionChecker.java +++ b/src/test/java/com/alibaba/druid/pool/ha/CounterValidConnectionChecker.java @@ -28,7 +28,6 @@ public boolean isValidConnection(Connection c, String query, int validationQuery @Override public void configFromProperties(Properties properties) { - } public int getCountValue(String url) { diff --git a/src/test/java/com/alibaba/druid/pool/ha/HighAvailableDataSourceTest.java b/src/test/java/com/alibaba/druid/pool/ha/HighAvailableDataSourceTest.java index dd99356c22..f382d522f4 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/HighAvailableDataSourceTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/HighAvailableDataSourceTest.java @@ -35,7 +35,7 @@ public void testRandomGet() throws Exception { haDataSource.setDataSourceMap(map); for (int i = 0; i < 100; i++) { - String name = ((MockConnection)haDataSource.getConnection()).getUrl(); + String name = ((MockConnection) haDataSource.getConnection()).getUrl(); if (name.equalsIgnoreCase("foo")) { count[0]++; } else if (name.equalsIgnoreCase("bar")) { diff --git a/src/test/java/com/alibaba/druid/pool/ha/MockDataSource.java b/src/test/java/com/alibaba/druid/pool/ha/MockDataSource.java index 70341b91a0..a13695c8bd 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/MockDataSource.java +++ b/src/test/java/com/alibaba/druid/pool/ha/MockDataSource.java @@ -38,12 +38,10 @@ public PrintWriter getLogWriter() throws SQLException { @Override public void setLogWriter(PrintWriter out) throws SQLException { - } @Override public void setLoginTimeout(int seconds) throws SQLException { - } @Override diff --git a/src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java b/src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java index 258134af04..c397b51624 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java @@ -9,7 +9,6 @@ import static org.junit.Assert.assertTrue; public class NodeEventTest { - @Test public void testGetEventListFromProperties_emptyProperties() { Properties p1 = new Properties(); diff --git a/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java b/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java index 70a8215bee..bc995c0358 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java @@ -45,13 +45,13 @@ public void testUpdate() { event.setNodeName("foo"); event.setType(NodeEventTypeEnum.DELETE); - updater.update(new FileNodeListener(), new NodeEvent[] { event }); + updater.update(new FileNodeListener(), new NodeEvent[]{event}); validateDeleteNode(); event = new NodeEvent(); event.setNodeName("foo"); event.setType(NodeEventTypeEnum.ADD); - updater.update(new FileNodeListener(), new NodeEvent[] { event }); + updater.update(new FileNodeListener(), new NodeEvent[]{event}); assertFalse(updater.getNodesToDel().contains("foo")); assertFalse(haDataSource.isInBlackList("foo")); } @@ -100,7 +100,7 @@ public void testUpdate_onlyOneLeftToRemove() { event.setNodeName("foo"); event.setType(NodeEventTypeEnum.DELETE); - updater.update(new FileNodeListener(), new NodeEvent[] { event }); + updater.update(new FileNodeListener(), new NodeEvent[]{event}); assertTrue(haDataSource.getDataSourceMap().containsKey("foo")); } diff --git a/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListenerTest.java b/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListenerTest.java index 3818d0b6ec..c16eace14a 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListenerTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListenerTest.java @@ -26,7 +26,7 @@ import static org.junit.Assert.fail; public class ZookeeperNodeListenerTest { - private final static Log LOG = LogFactory.getLog(ZookeeperNodeListenerTest.class); + private static final Log LOG = LogFactory.getLog(ZookeeperNodeListenerTest.class); private static TestingServer server; private final String PATH = "/ha-druid-datasource"; diff --git a/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeRegisterTest.java b/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeRegisterTest.java index 8a8c341e72..8f2c66fadf 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeRegisterTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeRegisterTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; public class ZookeeperNodeRegisterTest { - private final static Log LOG = LogFactory.getLog(ZookeeperNodeRegisterTest.class); + private static final Log LOG = LogFactory.getLog(ZookeeperNodeRegisterTest.class); private static TestingServer server; private final String PATH = "/ha-druid-datasource"; private ZookeeperNodeRegister register; diff --git a/src/test/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelectorTest.java b/src/test/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelectorTest.java index 6052ad4098..7910bd9ed7 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelectorTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelectorTest.java @@ -47,7 +47,7 @@ public void testOnlyOne() { dataSourceMap.remove("foo"); NamedDataSourceSelector selector = new NamedDataSourceSelector(dataSource); for (int i = 0; i < 50; i++) { - assertEquals("bar", ((MockDataSource)selector.get()).getName()); + assertEquals("bar", ((MockDataSource) selector.get()).getName()); } } @@ -57,9 +57,9 @@ public void testGetByName() throws Exception { assertNull(selector.get()); selector.setTarget("foo"); - assertEquals("foo", ((MockDataSource)selector.get()).getName()); + assertEquals("foo", ((MockDataSource) selector.get()).getName()); selector.resetDataSourceName(); selector.setDefaultName("bar"); - assertEquals("bar", ((MockDataSource)selector.get()).getName()); + assertEquals("bar", ((MockDataSource) selector.get()).getName()); } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorSingleDataSourceTest.java b/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorSingleDataSourceTest.java index a744dee75f..2b15133f0d 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorSingleDataSourceTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorSingleDataSourceTest.java @@ -14,7 +14,7 @@ import com.alibaba.druid.support.logging.LogFactory; public class RandomDataSourceSelectorSingleDataSourceTest { - private final static Log LOG = LogFactory + private static final Log LOG = LogFactory .getLog(RandomDataSourceSelectorSingleDataSourceTest.class); private HighAvailableDataSource highAvailableDataSource; diff --git a/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithFilterTest.java b/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithFilterTest.java index 8e15c3b9a9..9ff92577ab 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithFilterTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithFilterTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertTrue; public class RandomDataSourceSelectorWithFilterTest { - private final static Log LOG = LogFactory.getLog(RandomDataSourceSelectorWithFilterTest.class); + private static final Log LOG = LogFactory.getLog(RandomDataSourceSelectorWithFilterTest.class); private HighAvailableDataSource highAvailableDataSource; private CounterValidConnectionChecker checker; @@ -106,7 +106,7 @@ public void testForceValidation() throws Exception { private void createTable(Connection connection) { try { executeSQL(connection, "create table foo (bar varchar(1))"); - } catch(SQLException e) { + } catch (SQLException e) { try { executeSQL(connection, "drop table foo"); executeSQL(connection, "create table foo (bar varchar(1))"); diff --git a/src/test/java/com/alibaba/druid/pool/oceanbase/OBTest.java b/src/test/java/com/alibaba/druid/pool/oceanbase/OBTest.java index 1b4aa58dfa..24cf53ddb9 100644 --- a/src/test/java/com/alibaba/druid/pool/oceanbase/OBTest.java +++ b/src/test/java/com/alibaba/druid/pool/oceanbase/OBTest.java @@ -7,7 +7,6 @@ import com.alibaba.druid.pool.DruidDataSource; public class OBTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/pool/oracle/DruidDataSourceTest_oracle3.java b/src/test/java/com/alibaba/druid/pool/oracle/DruidDataSourceTest_oracle3.java index c8e383bb16..850fcad487 100644 --- a/src/test/java/com/alibaba/druid/pool/oracle/DruidDataSourceTest_oracle3.java +++ b/src/test/java/com/alibaba/druid/pool/oracle/DruidDataSourceTest_oracle3.java @@ -13,11 +13,10 @@ /** * 这个场景测试minIdle > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class DruidDataSourceTest_oracle3 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -50,7 +49,6 @@ public void test_error() throws Exception { Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("SELECT 1 FROM DUAL"); while (rs.next()) { - } rs.close(); stmt.close(); @@ -63,7 +61,6 @@ public void test_error() throws Exception { Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("SELECT 1 FROM DUAL"); while (rs.next()) { - } rs.close(); stmt.close(); @@ -76,7 +73,6 @@ public void test_error() throws Exception { Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("SELECT 1 FROM DUAL"); while (rs.next()) { - } rs.close(); stmt.close(); diff --git a/src/test/java/com/alibaba/druid/pool/oracle/QueryTimeoutTest.java b/src/test/java/com/alibaba/druid/pool/oracle/QueryTimeoutTest.java index 89d5f6c2cd..018c341dc0 100644 --- a/src/test/java/com/alibaba/druid/pool/oracle/QueryTimeoutTest.java +++ b/src/test/java/com/alibaba/druid/pool/oracle/QueryTimeoutTest.java @@ -12,7 +12,6 @@ import com.alibaba.druid.util.JdbcUtils; public class QueryTimeoutTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -34,7 +33,7 @@ protected void setUp() throws Exception { public void test_queryTimeout() throws Exception { try { final Connection conn = dataSource.getConnection(); - + String sql = "SELECT sleep(1)"; final CountDownLatch latch = new CountDownLatch(1); Thread thread = new Thread() { @@ -49,17 +48,17 @@ public void run() { } }; thread.start(); - + latch.await(); final PreparedStatement stmt = conn.prepareStatement(sql); // stmt.setQueryTimeout(1); - + final ResultSet rs = stmt.executeQuery(); JdbcUtils.printResultSet(rs); rs.close(); stmt.close(); conn.close(); - + } catch (Exception e) { // e.printStackTrace(); diff --git a/src/test/java/com/alibaba/druid/pool/postgres/PG_500_connection_Test.java b/src/test/java/com/alibaba/druid/pool/postgres/PG_500_connection_Test.java index 686ac9ead3..ec16c742fb 100644 --- a/src/test/java/com/alibaba/druid/pool/postgres/PG_500_connection_Test.java +++ b/src/test/java/com/alibaba/druid/pool/postgres/PG_500_connection_Test.java @@ -18,11 +18,10 @@ /** * 这个场景测试minIdle > maxActive - * + * * @author wenshao [szujobs@hotmail.com] */ public class PG_500_connection_Test extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -53,7 +52,6 @@ public void test_conect_500() throws Exception { int taskCount = 1000 * 100; final CountDownLatch endLatch = new CountDownLatch(taskCount); Runnable task = new Runnable() { - @Override public void run() { Connection conn = null; @@ -64,7 +62,6 @@ public void run() { stmt = conn.createStatement(); rs = stmt.executeQuery("SELECT 1"); while (rs.next()) { - } } catch (SQLException ex) { // skip @@ -76,7 +73,7 @@ public void run() { JdbcUtils.close(conn); } }; - + ExecutorService executor = Executors.newFixedThreadPool(100); for (int i = 0; i < taskCount; ++i) { executor.submit(task); diff --git a/src/test/java/com/alibaba/druid/pool/qa/MySqlTestSuit.java b/src/test/java/com/alibaba/druid/pool/qa/MySqlTestSuit.java index 051573f69e..3708f132cb 100644 --- a/src/test/java/com/alibaba/druid/pool/qa/MySqlTestSuit.java +++ b/src/test/java/com/alibaba/druid/pool/qa/MySqlTestSuit.java @@ -12,13 +12,12 @@ import com.alibaba.druid.util.JdbcUtils; public class MySqlTestSuit extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { //System.setProperty("druid.log.rs", "false"); //System.setProperty("druid.log.stmt", "false"); - + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mysql://192.168.122.26:3306/druid"); dataSource.setUsername("root"); @@ -34,7 +33,6 @@ protected void tearDown() throws Exception { } public void test_suit() throws Exception { - createTable(); { Connection conn = dataSource.getConnection(); @@ -54,7 +52,7 @@ public void test_suit() throws Exception { stmt.close(); conn.close(); } - + { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); diff --git a/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java b/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java index 6d7bfb5104..536228a7a3 100644 --- a/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java +++ b/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java @@ -46,85 +46,84 @@ import com.alibaba.druid.pool.DruidDataSource; public class DruidDataSourceUIManager extends JFrame { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 1L; + private DruidDataSource dataSource; - private DruidDataSource dataSource; + private SpringLayout layout = new SpringLayout(); - private SpringLayout layout = new SpringLayout(); + private JButton btnInitDataSource = new JButton("Init Pool"); + private JButton btnCloseDataSource = new JButton("Close Pool"); + private JButton btnConnect = new JButton("Get Connection"); + private JButton btnClose = new JButton("Close Connection"); - private JButton btnInitDataSource = new JButton("Init Pool"); - private JButton btnCloseDataSource = new JButton("Close Pool"); - private JButton btnConnect = new JButton("Get Connection"); - private JButton btnClose = new JButton("Close Connection"); + private JButton btnCase_0 = new JButton("Case 0"); - private JButton btnCase_0 = new JButton("Case 0"); + private JPanel mainPanel = new JPanel(); + private JScrollPane scrollPane = new JScrollPane(mainPanel); - private JPanel mainPanel = new JPanel(); - private JScrollPane scrollPane = new JScrollPane(mainPanel); + private JLabel lbUrl = new JLabel("URL : "); + private JTextField txtUrl = new JTextField( + "jdbc:oracle:thin:@a.b.c.d:1521:ocndb"); - private JLabel lbUrl = new JLabel("URL : "); - private JTextField txtUrl = new JTextField( - "jdbc:oracle:thin:@a.b.c.d:1521:ocndb"); + private JLabel lbDriverClass = new JLabel("DriverClassName : "); + private JTextField txtDriverClass = new JTextField(); - private JLabel lbDriverClass = new JLabel("DriverClassName : "); - private JTextField txtDriverClass = new JTextField(); + private JLabel lbUser = new JLabel("User : "); + private JTextField txtUser = new JTextField(); - private JLabel lbUser = new JLabel("User : "); - private JTextField txtUser = new JTextField(); + private JLabel lbPassword = new JLabel("Password : "); + private JTextField txtPassword = new JTextField(); - private JLabel lbPassword = new JLabel("Password : "); - private JTextField txtPassword = new JTextField(); + private JLabel lbConnectionProperties = new JLabel( + "Connection Properties : "); + private JTextField txtConnectionProperties = new JTextField(); - private JLabel lbConnectionProperties = new JLabel( - "Connection Properties : "); - private JTextField txtConnectionProperties = new JTextField(); + private JLabel lbInitialSize = new JLabel("InitialSize : "); + private JTextField txtInitialSize = new JTextField("1"); - private JLabel lbInitialSize = new JLabel("InitialSize : "); - private JTextField txtInitialSize = new JTextField("1"); + private JLabel lbMaxActive = new JLabel("MaxActive : "); + private JTextField txtMaxActive = new JTextField("14"); - private JLabel lbMaxActive = new JLabel("MaxActive : "); - private JTextField txtMaxActive = new JTextField("14"); + private JLabel lbMaxIdle = new JLabel("MaxIdle : "); + private JTextField txtMaxIdle = new JTextField("14"); - private JLabel lbMaxIdle = new JLabel("MaxIdle : "); - private JTextField txtMaxIdle = new JTextField("14"); + private JLabel lbMinIdle = new JLabel("MinIdle : "); + private JTextField txtMinIdle = new JTextField("1"); - private JLabel lbMinIdle = new JLabel("MinIdle : "); - private JTextField txtMinIdle = new JTextField("1"); + private JLabel lbMaxWait = new JLabel("MaxWait : "); + private JTextField txtMaxWait = new JTextField("-1"); - private JLabel lbMaxWait = new JLabel("MaxWait : "); - private JTextField txtMaxWait = new JTextField("-1"); + private JLabel lbMinEvictableIdleTimeMillis = new JLabel( + "MinEvictableIdleTimeMillis : "); + private JTextField txtMinEvictableIdleTimeMillis = new JTextField("1800000"); - private JLabel lbMinEvictableIdleTimeMillis = new JLabel( - "MinEvictableIdleTimeMillis : "); - private JTextField txtMinEvictableIdleTimeMillis = new JTextField("1800000"); + private DruidDataStatusPanel statusPanel = new DruidDataStatusPanel(); - private DruidDataStatusPanel statusPanel = new DruidDataStatusPanel(); + private JLabel lbValidationQuery = new JLabel("ValidationQuery : "); + private JTextField txtValidationQuery = new JTextField(""); - private JLabel lbValidationQuery = new JLabel("ValidationQuery : "); - private JTextField txtValidationQuery = new JTextField(""); + private JLabel lbTestWhileIdle = new JLabel("TestWhileIdle : "); + private JTextField txtTestWhileIdle = new JTextField("false"); - private JLabel lbTestWhileIdle = new JLabel("TestWhileIdle : "); - private JTextField txtTestWhileIdle = new JTextField("false"); + private JLabel lbTestOnBorrow = new JLabel("TestOnBorrow : "); + private JTextField txtTestOnBorrow = new JTextField("false"); - private JLabel lbTestOnBorrow = new JLabel("TestOnBorrow : "); - private JTextField txtTestOnBorrow = new JTextField("false"); + private JTextField txtGetStep = new JTextField("1"); + private JTextField txtReleaseStep = new JTextField("1"); - private JTextField txtGetStep = new JTextField("1"); - private JTextField txtReleaseStep = new JTextField("1"); + private AtomicInteger connectingCount = new AtomicInteger(); + private AtomicInteger connectCount = new AtomicInteger(); + private AtomicInteger closeCount = new AtomicInteger(); + private AtomicInteger executingCount = new AtomicInteger(); - private AtomicInteger connectingCount = new AtomicInteger(); - private AtomicInteger connectCount = new AtomicInteger(); - private AtomicInteger closeCount = new AtomicInteger(); - private AtomicInteger executingCount = new AtomicInteger(); + private Thread statusThread; - private Thread statusThread; + private final ConcurrentLinkedQueue activeConnections = new ConcurrentLinkedQueue(); - private final ConcurrentLinkedQueue activeConnections = new ConcurrentLinkedQueue(); + private ExecutorService executor; - private ExecutorService executor; - - public DruidDataSourceUIManager(){ + public DruidDataSourceUIManager() { this.setLayout(new BorderLayout()); Toolkit kit = Toolkit.getDefaultToolkit(); // 定义工具包 @@ -159,7 +158,7 @@ public DruidDataSourceUIManager(){ mainPanel.add(txtDriverClass); layout.putConstraint(SpringLayout.VERTICAL_CENTER, txtDriverClass, 0, SpringLayout.VERTICAL_CENTER, - lbDriverClass); + lbDriverClass); layout.putConstraint(SpringLayout.WEST, txtDriverClass, 0, SpringLayout.WEST, txtUrl); layout.putConstraint(SpringLayout.EAST, txtDriverClass, 0, SpringLayout.EAST, txtUrl); @@ -196,7 +195,7 @@ public DruidDataSourceUIManager(){ mainPanel.add(txtConnectionProperties); layout.putConstraint(SpringLayout.VERTICAL_CENTER, txtConnectionProperties, 0, SpringLayout.VERTICAL_CENTER, - lbConnectionProperties); + lbConnectionProperties); layout.putConstraint(SpringLayout.WEST, txtConnectionProperties, 0, SpringLayout.WEST, txtUrl); layout.putConstraint(SpringLayout.EAST, txtConnectionProperties, 0, SpringLayout.EAST, txtUrl); @@ -209,7 +208,7 @@ public DruidDataSourceUIManager(){ mainPanel.add(txtInitialSize); layout.putConstraint(SpringLayout.VERTICAL_CENTER, txtInitialSize, 0, SpringLayout.VERTICAL_CENTER, - lbInitialSize); + lbInitialSize); layout.putConstraint(SpringLayout.WEST, txtInitialSize, 0, SpringLayout.WEST, txtUrl); layout.putConstraint(SpringLayout.EAST, txtInitialSize, 0, SpringLayout.EAST, txtUrl); @@ -270,7 +269,7 @@ public DruidDataSourceUIManager(){ mainPanel.add(txtMinEvictableIdleTimeMillis); layout.putConstraint(SpringLayout.VERTICAL_CENTER, txtMinEvictableIdleTimeMillis, 0, - SpringLayout.VERTICAL_CENTER, lbMinEvictableIdleTimeMillis); + SpringLayout.VERTICAL_CENTER, lbMinEvictableIdleTimeMillis); layout.putConstraint(SpringLayout.WEST, txtMinEvictableIdleTimeMillis, 0, SpringLayout.WEST, txtUrl); layout.putConstraint(SpringLayout.EAST, txtMinEvictableIdleTimeMillis, 0, SpringLayout.EAST, txtUrl); @@ -278,13 +277,13 @@ public DruidDataSourceUIManager(){ mainPanel.add(lbValidationQuery); layout.putConstraint(SpringLayout.NORTH, lbValidationQuery, 10, SpringLayout.SOUTH, - lbMinEvictableIdleTimeMillis); + lbMinEvictableIdleTimeMillis); layout.putConstraint(SpringLayout.WEST, lbValidationQuery, 0, SpringLayout.WEST, lbUrl); layout.putConstraint(SpringLayout.EAST, lbValidationQuery, 0, SpringLayout.EAST, lbUrl); mainPanel.add(txtValidationQuery); layout.putConstraint(SpringLayout.VERTICAL_CENTER, txtValidationQuery, 0, SpringLayout.VERTICAL_CENTER, - lbValidationQuery); + lbValidationQuery); layout.putConstraint(SpringLayout.WEST, txtValidationQuery, 0, SpringLayout.WEST, txtUrl); layout.putConstraint(SpringLayout.EAST, txtValidationQuery, 0, SpringLayout.EAST, txtUrl); // //// @@ -296,7 +295,7 @@ public DruidDataSourceUIManager(){ mainPanel.add(txtTestWhileIdle); layout.putConstraint(SpringLayout.VERTICAL_CENTER, txtTestWhileIdle, 0, SpringLayout.VERTICAL_CENTER, - lbTestWhileIdle); + lbTestWhileIdle); layout.putConstraint(SpringLayout.WEST, txtTestWhileIdle, 0, SpringLayout.WEST, txtUrl); layout.putConstraint(SpringLayout.EAST, txtTestWhileIdle, 0, SpringLayout.EAST, txtUrl); @@ -307,7 +306,7 @@ public DruidDataSourceUIManager(){ mainPanel.add(txtTestOnBorrow); layout.putConstraint(SpringLayout.VERTICAL_CENTER, txtTestOnBorrow, 0, SpringLayout.VERTICAL_CENTER, - lbTestOnBorrow); + lbTestOnBorrow); layout.putConstraint(SpringLayout.WEST, txtTestOnBorrow, 0, SpringLayout.WEST, txtUrl); layout.putConstraint(SpringLayout.EAST, txtTestOnBorrow, 0, SpringLayout.EAST, txtUrl); @@ -317,7 +316,6 @@ public DruidDataSourceUIManager(){ layout.putConstraint(SpringLayout.NORTH, btnInitDataSource, 10, SpringLayout.SOUTH, lbTestOnBorrow); layout.putConstraint(SpringLayout.WEST, btnInitDataSource, 0, SpringLayout.WEST, lbUrl); btnInitDataSource.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { init_actionPerformed(e); @@ -326,10 +324,9 @@ public void actionPerformed(ActionEvent e) { mainPanel.add(btnCloseDataSource); layout.putConstraint(SpringLayout.VERTICAL_CENTER, btnCloseDataSource, 0, SpringLayout.VERTICAL_CENTER, - btnInitDataSource); + btnInitDataSource); layout.putConstraint(SpringLayout.WEST, btnCloseDataSource, 10, SpringLayout.EAST, btnInitDataSource); btnCloseDataSource.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { closeDataSource_actionPerformed(e); @@ -342,10 +339,9 @@ public void actionPerformed(ActionEvent e) { mainPanel.add(btnConnect); layout.putConstraint(SpringLayout.VERTICAL_CENTER, btnConnect, 0, SpringLayout.VERTICAL_CENTER, - btnInitDataSource); + btnInitDataSource); layout.putConstraint(SpringLayout.WEST, btnConnect, 10, SpringLayout.EAST, btnCloseDataSource); btnConnect.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { connect_actionPerformed(e); @@ -354,7 +350,7 @@ public void actionPerformed(ActionEvent e) { mainPanel.add(txtGetStep); layout.putConstraint(SpringLayout.VERTICAL_CENTER, txtGetStep, 0, SpringLayout.VERTICAL_CENTER, - btnInitDataSource); + btnInitDataSource); layout.putConstraint(SpringLayout.WEST, txtGetStep, 10, SpringLayout.EAST, btnConnect); layout.putConstraint(SpringLayout.EAST, txtGetStep, 40, SpringLayout.WEST, txtGetStep); @@ -364,7 +360,6 @@ public void actionPerformed(ActionEvent e) { layout.putConstraint(SpringLayout.VERTICAL_CENTER, btnClose, 0, SpringLayout.VERTICAL_CENTER, btnInitDataSource); layout.putConstraint(SpringLayout.WEST, btnClose, 10, SpringLayout.EAST, txtGetStep); btnClose.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { int step = Integer.parseInt(txtReleaseStep.getText().trim()); @@ -386,7 +381,7 @@ public void actionPerformed(ActionEvent e) { mainPanel.add(txtReleaseStep); layout.putConstraint(SpringLayout.VERTICAL_CENTER, txtReleaseStep, 0, SpringLayout.VERTICAL_CENTER, - btnInitDataSource); + btnInitDataSource); layout.putConstraint(SpringLayout.WEST, txtReleaseStep, 10, SpringLayout.EAST, btnClose); layout.putConstraint(SpringLayout.EAST, txtReleaseStep, 40, SpringLayout.WEST, txtReleaseStep); @@ -394,7 +389,6 @@ public void actionPerformed(ActionEvent e) { layout.putConstraint(SpringLayout.VERTICAL_CENTER, btnCase_0, 0, SpringLayout.VERTICAL_CENTER, txtReleaseStep); layout.putConstraint(SpringLayout.WEST, btnCase_0, 10, SpringLayout.EAST, txtReleaseStep); btnCase_0.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { try { @@ -422,7 +416,6 @@ public void connect_actionPerformed(ActionEvent e) { int step = Integer.parseInt(txtGetStep.getText().trim()); for (int i = 0; i < step; ++i) { final Runnable task = new Runnable() { - public void run() { try { connectingCount.incrementAndGet(); @@ -467,7 +460,7 @@ public void closeDataSource_actionPerformed(ActionEvent e) { try { ManagementFactory.getPlatformMBeanServer().unregisterMBean(new ObjectName( - "com.alibaba.druid:type=DruidDataSource")); + "com.alibaba.druid:type=DruidDataSource")); } catch (Exception e1) { e1.printStackTrace(); } @@ -514,8 +507,8 @@ public void init_actionPerformed(ActionEvent e) { dataSource.setNumTestsPerEvictionRun(20); ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, - new ObjectName( - "com.alibaba.druid:type=DruidDataSource")); + new ObjectName( + "com.alibaba.druid:type=DruidDataSource")); try { Connection conn = dataSource.getConnection(); @@ -550,9 +543,8 @@ public void init_actionPerformed(ActionEvent e) { btnCase_0.setEnabled(true); statusThread = new Thread("Watch Status") { - public void run() { - for (;;) { + for (; ; ) { statusPanel.set("CreateCount", dataSource.getCreateCount()); statusPanel.set("CreateErrorCount", dataSource.getCreateErrorCount()); statusPanel.set("CreateTimespanMillis", dataSource.getCreateTimespanMillis()); @@ -585,7 +577,6 @@ public void run() { public void case_0() throws Exception { Runnable task = new Runnable() { - public void run() { final int threadCount = 20; final int LOOP_COUNT = 1000 * 1; @@ -594,7 +585,6 @@ public void run() { final CountDownLatch endLatch = new CountDownLatch(threadCount); for (int i = 0; i < threadCount; ++i) { Thread thread = new Thread() { - public void run() { try { startLatch.await(); @@ -637,7 +627,7 @@ public void run() { long fullGC = TestUtil.getFullGC() - startFullGC; System.out.println("thread " + threadCount + " druid millis : " - + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); + + NumberFormat.getInstance().format(millis) + ", YGC " + ygc + " FGC " + fullGC); } }; @@ -646,7 +636,6 @@ public void run() { public static void main(String[] args) { EventQueue.invokeLater(new Runnable() { - public void run() { DruidDataSourceUIManager manager = new DruidDataSourceUIManager(); diff --git a/src/test/java/com/alibaba/druid/pool/ui/DruidDataStatusPanel.java b/src/test/java/com/alibaba/druid/pool/ui/DruidDataStatusPanel.java index 53d78af587..22fe7d2817 100644 --- a/src/test/java/com/alibaba/druid/pool/ui/DruidDataStatusPanel.java +++ b/src/test/java/com/alibaba/druid/pool/ui/DruidDataStatusPanel.java @@ -24,21 +24,19 @@ import javax.swing.JTextField; public class DruidDataStatusPanel extends JPanel { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 1L; + private final Map fields = new HashMap(); - private final Map fields = new HashMap(); - - private final String[] fieldNames = new String[] { // - "CreateCount", "CreateErrorCount", "CreateTimespanMillis", + private final String[] fieldNames = new String[]{ // + "CreateCount", "CreateErrorCount", "CreateTimespanMillis", "CreateTimespanNano", "DestroyCount", // "ConnectCount", "ConnectErrorCount", "CloseCount", "RecycleCount", "ActiveCount", // "PoolingCount", "IdleCheckCount", "UI_GettingCount", "UI_GetCount", "UI_ReleaseCount" // , "UI_ExecutingCount" // - }; - - public DruidDataStatusPanel(){ + }; + public DruidDataStatusPanel() { this.setLayout(new GridLayout(6, 6)); for (String fieldName : fieldNames) { diff --git a/src/test/java/com/alibaba/druid/postgresql/PGLimitTest.java b/src/test/java/com/alibaba/druid/postgresql/PGLimitTest.java index d70f5f12d8..13ba6dc64c 100644 --- a/src/test/java/com/alibaba/druid/postgresql/PGLimitTest.java +++ b/src/test/java/com/alibaba/druid/postgresql/PGLimitTest.java @@ -4,25 +4,22 @@ import com.alibaba.druid.util.JdbcConstants; /** - * * @author lizongbo - * */ public class PGLimitTest { + /** + * @param args + */ + public static void main(String[] args) { + DbType dbType = JdbcConstants.POSTGRESQL;// "postgresql"; + // dbType = "mysql"; + String sql = " select * from brandinfo where 1=1 and brandid > 100 order by brandid asc"; + String sqlLimit = com.alibaba.druid.sql.PagerUtils.limit(sql, dbType, + 2499, 100); + System.out.println("sqlLimit == " + sqlLimit); + String sqlCount = com.alibaba.druid.sql.PagerUtils.count(sql, dbType); + System.out.println("sqlCount == " + sqlCount); - /** - * @param args - */ - public static void main(String[] args) { - DbType dbType = JdbcConstants.POSTGRESQL;// "postgresql"; - // dbType = "mysql"; - String sql = " select * from brandinfo where 1=1 and brandid > 100 order by brandid asc"; - String sqlLimit = com.alibaba.druid.sql.PagerUtils.limit(sql, dbType, - 2499, 100); - System.out.println("sqlLimit == " + sqlLimit); - String sqlCount = com.alibaba.druid.sql.PagerUtils.count(sql, dbType); - System.out.println("sqlCount == " + sqlCount); - - } + } } diff --git a/src/test/java/com/alibaba/druid/postgresql/PGUpsertTest.java b/src/test/java/com/alibaba/druid/postgresql/PGUpsertTest.java index a09db92d0e..b3cf5ea4a4 100644 --- a/src/test/java/com/alibaba/druid/postgresql/PGUpsertTest.java +++ b/src/test/java/com/alibaba/druid/postgresql/PGUpsertTest.java @@ -5,16 +5,15 @@ import junit.framework.TestCase; import org.junit.Assert; -public class PGUpsertTest extends TestCase { - - public void testUpsert(){ - String sql = "insert into \"test_dup\" values(1,'2',-100) on conflict(id) do update set \"count\" = test_dup.\"count\" + 1;"; - String targetSql = "INSERT INTO \"test_dup\"\n" - + "VALUES (1, '2', -100)\n" - + "ON CONFLICT (id) DO UPDATE SET \"count\" = test_dup.\"count\" + 1"; - PGSQLStatementParser parser=new PGSQLStatementParser(sql); - SQLStatement statement = parser.parseStatement(); - Assert.assertEquals(targetSql, statement.toString()); - } +public class PGUpsertTest extends TestCase { + public void testUpsert() { + String sql = "insert into \"test_dup\" values(1,'2',-100) on conflict(id) do update set \"count\" = test_dup.\"count\" + 1;"; + String targetSql = "INSERT INTO \"test_dup\"\n" + + "VALUES (1, '2', -100)\n" + + "ON CONFLICT (id) DO UPDATE SET \"count\" = test_dup.\"count\" + 1"; + PGSQLStatementParser parser = new PGSQLStatementParser(sql); + SQLStatement statement = parser.parseStatement(); + Assert.assertEquals(targetSql, statement.toString()); + } } diff --git a/src/test/java/com/alibaba/druid/postgresql/PG_getCreateTableScriptTest.java b/src/test/java/com/alibaba/druid/postgresql/PG_getCreateTableScriptTest.java index 7e14da15ce..1a968ab407 100644 --- a/src/test/java/com/alibaba/druid/postgresql/PG_getCreateTableScriptTest.java +++ b/src/test/java/com/alibaba/druid/postgresql/PG_getCreateTableScriptTest.java @@ -31,7 +31,8 @@ public void test_oracle() throws Exception { //String createTableScript = JdbcUtils.getCreateTableScript(conn, JdbcConstants.ORACLE); //System.out.println(createTableScript); - Statement stmt = conn.createStatement();; + Statement stmt = conn.createStatement(); + ; ResultSet rs = stmt.executeQuery("SELECT * FROM pg_catalog.pg_tables " + "where schemaname not in ('pg_catalog', 'information_schema', 'sys')"); JdbcUtils.printResultSet(rs); diff --git a/src/test/java/com/alibaba/druid/proxy/TestOracle.java b/src/test/java/com/alibaba/druid/proxy/TestOracle.java index 8708952c0e..3bed5e6e4c 100644 --- a/src/test/java/com/alibaba/druid/proxy/TestOracle.java +++ b/src/test/java/com/alibaba/druid/proxy/TestOracle.java @@ -28,7 +28,6 @@ import com.alibaba.druid.support.json.JSONUtils; public class TestOracle extends TestCase { - private String jdbcUrl; private String user; private String password; diff --git a/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java b/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java index 1bf7962ac5..f4c4623bd1 100644 --- a/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java +++ b/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java @@ -24,7 +24,6 @@ import com.alibaba.druid.stat.JdbcStatManager; public class Demo1 extends TestCase { - public void test_0() throws Exception { JdbcStatManager.getInstance().reset(); // 重置计数器 diff --git a/src/test/java/com/alibaba/druid/pvt/filter/wall/WallPerformanceTest_1.java b/src/test/java/com/alibaba/druid/pvt/filter/wall/WallPerformanceTest_1.java index 02b5faf9cc..e193c6d69a 100644 --- a/src/test/java/com/alibaba/druid/pvt/filter/wall/WallPerformanceTest_1.java +++ b/src/test/java/com/alibaba/druid/pvt/filter/wall/WallPerformanceTest_1.java @@ -25,7 +25,6 @@ * @author yako 2014年10月21日 下午5:07:37 */ public class WallPerformanceTest_1 extends TestCase { - private int times = 3; @Override @@ -139,7 +138,7 @@ public void test_13() throws Exception { System.out.println("--13--use time：" + this.evaluate(sql, "mssql", 1000l)); } } - + public void test_14() throws Exception { String sql = "SELECT COUNT(*) FROM `jfz_futures_department` `t` WHERE (((((t.state=1) AND (t.city='2005')) AND (t.mode_weekend=1)) AND (t.service_stock=1)) AND (t.software_program=1)) AND (1=0 OR (t.lat BETWEEN 31.201582181818 AND 31.237945818182 AND t.lng BETWEEN 121.43558877778 AND 121.48003322222) OR (t.lat BETWEEN 31.389604181818 AND 31.425967818182 AND t.lng BETWEEN 121.33426577778 AND 121.37871022222) OR (t.lat BETWEEN 31.376165181818 AND 31.412528818182 AND t.lng BETWEEN 121.34206277778 AND 121.38650722222) OR (t.lat BETWEEN 31.351904181818 AND 31.388267818182 AND t.lng BETWEEN 121.34012277778 AND 121.38456722222) OR (t.lat BETWEEN 31.345213181818 AND 31.381576818182 AND t.lng BETWEEN 121.34662677778 AND 121.39107122222) OR (t.lat BETWEEN 31.332292181818 AND 31.368655818182 AND t.lng BETWEEN 121.35711877778 AND 121.40156322222) OR (t.lat BETWEEN 31.307896181818 AND 31.344259818182 AND t.lng BETWEEN 121.37307277778 AND 121.41751722222) OR (t.lat BETWEEN 31.309006181818 AND 31.345369818182 AND t.lng BETWEEN 121.38302577778 AND 121.42747022222) OR (t.lat BETWEEN 31.303238181818 AND 31.339601818182 AND t.lng BETWEEN 121.39258377778 AND 121.43702822222) OR (t.lat BETWEEN 31.291669181818 AND 31.328032818182 AND t.lng BETWEEN 121.39793777778 AND 121.44238222222) OR (t.lat BETWEEN 31.281487181818 AND 31.317850818182 AND t.lng BETWEEN 121.40074077778 AND 121.44518522222) OR (t.lat BETWEEN 31.272909181818 AND 31.309272818182 AND t.lng BETWEEN 121.40584277778 AND 121.45028722222) OR (t.lat BETWEEN 31.261892181818 AND 31.298255818182 AND t.lng BETWEEN 121.40727977778 AND 121.45172422222) OR (t.lat BETWEEN 31.251923181818 AND 31.288286818182 AND t.lng BETWEEN 121.40681277778 AND 121.45125722222) OR (t.lat BETWEEN 31.244268181818 AND 31.280631818182 AND t.lng BETWEEN 121.40616577778 AND 121.45061022222) OR (t.lat BETWEEN 31.234541181818 AND 31.270904818182 AND t.lng BETWEEN 121.41410277778 AND 121.45854722222) OR (t.lat BETWEEN 31.227938181818 AND 31.264301818182 AND t.lng BETWEEN 121.42255077778 AND 121.46699522222) OR (t.lat BETWEEN 31.222164181818 AND 31.258527818182 AND t.lng BETWEEN 121.42657577778 AND 121.47102022222) OR (t.lat BETWEEN 31.210987181818 AND 31.247350818182 AND t.lng BETWEEN 121.43297177778 AND 121.47741622222) OR (t.lat BETWEEN 31.187516181818 AND 31.223879818182 AND t.lng BETWEEN 121.43404977778 AND 121.47849422222) OR (t.lat BETWEEN 31.179300181818 AND 31.215663818182 AND t.lng BETWEEN 121.43872077778 AND 121.48316522222) OR (t.lat BETWEEN 31.173029181818 AND 31.209392818182 AND t.lng BETWEEN 121.44116377778 AND 121.48560822222) OR (t.lat BETWEEN 31.159652181818 AND 31.196015818182 AND t.lng BETWEEN 121.45787277778 AND 121.50231722222) OR (t.lat BETWEEN 31.162062181818 AND 31.198425818182 AND t.lng BETWEEN 121.47034077778 AND 121.51478522222) OR (t.lat BETWEEN 31.165769181818 AND 31.202132818182 AND t.lng BETWEEN 121.47896477778 AND 121.52340922222) OR (t.lat BETWEEN 31.169507181818 AND 31.205870818182 AND t.lng BETWEEN 121.48510877778 AND 121.52955322222) OR (t.lat BETWEEN 31.172936181818 AND 31.209299818182 AND t.lng BETWEEN 121.49423577778 AND 121.53868022222) OR (t.lat BETWEEN 31.175130181818 AND 31.211493818182 AND t.lng BETWEEN 121.50947077778 AND 121.55391522222) OR (t.lat BETWEEN 31.175346181818 AND 31.211709818182 AND t.lng BETWEEN 121.52427477778 AND 121.56871922222) OR (t.lat BETWEEN 31.181153181818 AND 31.217516818182 AND t.lng BETWEEN 121.53430077778 AND 121.57874522222) OR (t.lat BETWEEN 31.191099181818 AND 31.227462818182 AND t.lng BETWEEN 121.54166677778 AND 121.58611122222) OR (t.lat BETWEEN 31.199345181818 AND 31.235708818182 AND t.lng BETWEEN 121.54698477778 AND 121.59142922222))"; for (int i = 0; i < times; i++) { diff --git a/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest.java b/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest.java index 419cc39a77..1578203187 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest.java @@ -14,12 +14,11 @@ import com.alibaba.druid.pool.DruidDataSource; public class AsyncCloseTest extends TestCase { - protected DruidDataSource dataSource; - private ExecutorService connExecutor; - private ExecutorService closeExecutor; + private ExecutorService connExecutor; + private ExecutorService closeExecutor; - final AtomicInteger errorCount = new AtomicInteger(); + final AtomicInteger errorCount = new AtomicInteger(); protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -32,7 +31,7 @@ protected void setUp() throws Exception { closeExecutor = Executors.newFixedThreadPool(100); } - + protected void tearDown() throws Exception { dataSource.close(); } @@ -45,11 +44,10 @@ public void test_0() throws Exception { } class CloseTask implements Runnable { - - private Connection conn; + private Connection conn; private CountDownLatch latch; - public CloseTask(Connection conn, CountDownLatch latch){ + public CloseTask(Connection conn, CountDownLatch latch) { this.conn = conn; this.latch = latch; } @@ -76,7 +74,6 @@ protected void loop() throws InterruptedException { final CountDownLatch closeLatch = new CountDownLatch(COUNT * 2); Runnable connTask = new Runnable() { - @Override public void run() { try { diff --git a/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest1.java b/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest1.java index ecc5e26b63..68524040aa 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest1.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest1.java @@ -20,17 +20,16 @@ import junit.framework.TestCase; public class AsyncCloseTest1 extends TestCase { - protected DruidDataSource dataSource; - private ExecutorService connExecutor; - private ExecutorService closeExecutor; + private ExecutorService connExecutor; + private ExecutorService closeExecutor; + + final AtomicInteger errorCount = new AtomicInteger(); - final AtomicInteger errorCount = new AtomicInteger(); - - private Logger log4jLog; - private Level log4jOldLevel; + private Logger log4jLog; + private Level log4jOldLevel; - private NoLoggingImpl noLoggingImpl; + private NoLoggingImpl noLoggingImpl; protected void setUp() throws Exception { Field logField = DruidDataSource.class.getDeclaredField("LOG"); @@ -41,10 +40,10 @@ protected void setUp() throws Exception { this.log4jOldLevel = this.log4jLog.getLevel(); this.log4jLog.setLevel(Level.FATAL); } else if (dataSourceLog instanceof NoLoggingImpl) { - noLoggingImpl = (NoLoggingImpl) dataSourceLog; + noLoggingImpl = (NoLoggingImpl) dataSourceLog; noLoggingImpl.setErrorEnabled(false); } - + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:"); // dataSource.setAsyncCloseConnectionEnable(true); @@ -55,7 +54,7 @@ protected void setUp() throws Exception { closeExecutor = Executors.newFixedThreadPool(128); } - + protected void tearDown() throws Exception { dataSource.close(); if (log4jLog != null) { @@ -73,11 +72,10 @@ public void test_0() throws Exception { } class CloseTask implements Runnable { - - private Connection conn; + private Connection conn; private CountDownLatch latch; - public CloseTask(Connection conn, CountDownLatch latch){ + public CloseTask(Connection conn, CountDownLatch latch) { this.conn = conn; this.latch = latch; } @@ -104,7 +102,6 @@ protected void loop() throws InterruptedException { final CountDownLatch closeLatch = new CountDownLatch(COUNT * 2); Runnable connTask = new Runnable() { - @Override public void run() { try { diff --git a/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest2.java b/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest2.java index 9fd4df0b36..326fcde814 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest2.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest2.java @@ -25,17 +25,16 @@ import junit.framework.TestCase; public class AsyncCloseTest2 extends TestCase { - protected DruidDataSource dataSource; - private ExecutorService connExecutor; - private ExecutorService closeExecutor; + private ExecutorService connExecutor; + private ExecutorService closeExecutor; - final AtomicInteger errorCount = new AtomicInteger(); + final AtomicInteger errorCount = new AtomicInteger(); - private Logger log4jLog; - private Level log4jOldLevel; + private Logger log4jLog; + private Level log4jOldLevel; - private NoLoggingImpl noLoggingImpl; + private NoLoggingImpl noLoggingImpl; protected void setUp() throws Exception { Field logField = DruidDataSource.class.getDeclaredField("LOG"); @@ -46,11 +45,11 @@ protected void setUp() throws Exception { this.log4jOldLevel = this.log4jLog.getLevel(); this.log4jLog.setLevel(Level.FATAL); } else if (dataSourceLog instanceof NoLoggingImpl) { - noLoggingImpl = (NoLoggingImpl) dataSourceLog; + noLoggingImpl = (NoLoggingImpl) dataSourceLog; noLoggingImpl.setErrorEnabled(false); } - - + + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:"); dataSource.setAsyncCloseConnectionEnable(true); @@ -58,10 +57,9 @@ protected void setUp() throws Exception { dataSource.setMaxActive(16); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql) - throws SQLException { + throws SQLException { throw new SQLException(); } }); @@ -73,7 +71,7 @@ public boolean statement_execute(FilterChain chain, StatementProxy statement, St closeExecutor = Executors.newFixedThreadPool(128); } - + protected void tearDown() throws Exception { dataSource.close(); if (log4jLog != null) { @@ -91,7 +89,6 @@ public void test_0() throws Exception { } public static class MyExceptionSorter extends MockExceptionSorter { - @Override public boolean isExceptionFatal(SQLException e) { return true; @@ -99,11 +96,10 @@ public boolean isExceptionFatal(SQLException e) { } class CloseTask implements Runnable { - - private Connection conn; + private Connection conn; private CountDownLatch latch; - public CloseTask(Connection conn, CountDownLatch latch){ + public CloseTask(Connection conn, CountDownLatch latch) { this.conn = conn; this.latch = latch; } @@ -130,7 +126,6 @@ protected void loop() throws InterruptedException { final CountDownLatch closeLatch = new CountDownLatch(COUNT * 2); Runnable connTask = new Runnable() { - @Override public void run() { try { diff --git a/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest3.java b/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest3.java index bad0c6c0f6..956bfc4811 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest3.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest3.java @@ -27,19 +27,18 @@ import junit.framework.TestCase; public class AsyncCloseTest3 extends TestCase { - protected DruidDataSource dataSource; - private ExecutorService connExecutor; - private ExecutorService closeExecutor; + private ExecutorService connExecutor; + private ExecutorService closeExecutor; - final AtomicInteger errorCount = new AtomicInteger(); + final AtomicInteger errorCount = new AtomicInteger(); - private Logger log4jLog; - private Level log4jOldLevel; + private Logger log4jLog; + private Level log4jOldLevel; - private NoLoggingImpl noLoggingImpl; + private NoLoggingImpl noLoggingImpl; - long xmx; + long xmx; protected void setUp() throws Exception { xmx = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax() / (1000 * 1000); // m; @@ -54,7 +53,7 @@ protected void setUp() throws Exception { this.log4jOldLevel = this.log4jLog.getLevel(); this.log4jLog.setLevel(Level.FATAL); } else if (dataSourceLog instanceof NoLoggingImpl) { - noLoggingImpl = (NoLoggingImpl) dataSourceLog; + noLoggingImpl = (NoLoggingImpl) dataSourceLog; noLoggingImpl.setErrorEnabled(false); } @@ -66,7 +65,6 @@ protected void setUp() throws Exception { dataSource.setMaxActive(16); dataSource.getProxyFilters().add(new FilterAdapter() { - @Override public boolean statement_execute(FilterChain chain, StatementProxy statement, String sql) throws SQLException { @@ -99,7 +97,6 @@ public void test_0() throws Exception { } public static class MyExceptionSorter extends MockExceptionSorter { - @Override public boolean isExceptionFatal(SQLException e) { return true; @@ -107,11 +104,10 @@ public boolean isExceptionFatal(SQLException e) { } class CloseTask implements Runnable { - - private Connection conn; + private Connection conn; private CountDownLatch latch; - public CloseTask(Connection conn, CountDownLatch latch){ + public CloseTask(Connection conn, CountDownLatch latch) { this.conn = conn; this.latch = latch; } @@ -152,7 +148,6 @@ protected void loop() throws InterruptedException { final CountDownLatch execLatch = new CountDownLatch(COUNT); Runnable connTask = new Runnable() { - @Override public void run() { try { diff --git a/src/test/java/com/alibaba/druid/pvt/pool/DiscardTest.java b/src/test/java/com/alibaba/druid/pvt/pool/DiscardTest.java index 5fd8d9abb1..613fc404c4 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/DiscardTest.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/DiscardTest.java @@ -17,16 +17,14 @@ import com.alibaba.druid.util.JdbcUtils; public class DiscardTest extends TestCase { + private DruidDataSource dataSource; - private DruidDataSource dataSource; - - private MockDriver driver; + private MockDriver driver; private volatile boolean failed = false; protected void setUp() throws Exception { driver = new MockDriver() { - public ResultSet executeQuery(MockStatementBase stmt, String sql) throws SQLException { if (failed) { throw new SQLException("", "", 1040); @@ -78,7 +76,6 @@ public void test_db_fail() throws Exception { for (int i = 0; i < THREAD_COUNT; ++i) { threads[i] = new Thread() { - public void run() { try { exec(); @@ -103,7 +100,7 @@ public void run() { Assert.assertNotNull(error); } - + this.failed = false; endLatch.await(); diff --git a/src/test/java/com/alibaba/druid/pvt/pool/Large10ConcurrentTest.java b/src/test/java/com/alibaba/druid/pvt/pool/Large10ConcurrentTest.java index 3b1db859e4..2305f72207 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/Large10ConcurrentTest.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/Large10ConcurrentTest.java @@ -19,15 +19,14 @@ import junit.framework.TestCase; public class Large10ConcurrentTest extends TestCase { - - private DruidDataSource[] dataSources; + private DruidDataSource[] dataSources; private ScheduledExecutorService scheduler; - private ExecutorService executor; + private ExecutorService executor; protected void setUp() throws Exception { long xmx = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax() / (1000 * 1000); // m - + final int dataSourceCount; if (xmx <= 256) { @@ -41,9 +40,9 @@ protected void setUp() throws Exception { } else { dataSourceCount = 1024 * 16; } - + dataSources = new DruidDataSource[dataSourceCount]; - + executor = Executors.newFixedThreadPool(100); scheduler = Executors.newScheduledThreadPool(10); for (int i = 0; i < dataSources.length; ++i) { @@ -79,7 +78,6 @@ public void test_large() throws Exception { final DataSource dataSource = dataSources[i]; final int index = i * 8 + j; Runnable task = new Runnable() { - public void run() { try { connections[index] = dataSource.getConnection(); @@ -95,11 +93,11 @@ public void run() { } } connLatch.await(); - + for (int i = 0; i < dataSources.length; ++i) { Assert.assertEquals(8, dataSources[i].getActiveCount()); } - + for (int i = 0; i < dataSources.length; ++i) { Assert.assertEquals(0, dataSources[i].getPoolingCount()); } diff --git a/src/test/java/com/alibaba/druid/pvt/pool/Large10KTest.java b/src/test/java/com/alibaba/druid/pvt/pool/Large10KTest.java index 9cc8a57153..74c7ada1b0 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/Large10KTest.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/Large10KTest.java @@ -11,14 +11,12 @@ import com.alibaba.druid.util.JdbcUtils; public class Large10KTest extends TestCase { - - private DruidDataSource[] dataSources; + private DruidDataSource[] dataSources; private ScheduledExecutorService scheduler; - + protected void setUp() throws Exception { - long xmx = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax() / (1000 * 1000); // m - + final int dataSourceCount; if (xmx <= 256) { @@ -32,9 +30,9 @@ protected void setUp() throws Exception { } else { dataSourceCount = 1024 * 16; } - + dataSources = new DruidDataSource[dataSourceCount]; - + scheduler = Executors.newScheduledThreadPool(10); for (int i = 0; i < dataSources.length; ++i) { DruidDataSource dataSource = new DruidDataSource(); @@ -43,7 +41,7 @@ protected void setUp() throws Exception { dataSource.setDestroyScheduler(scheduler); dataSource.setTestOnBorrow(false); dataSource.setTestWhileIdle(false); - + dataSources[i] = dataSource; } } @@ -54,7 +52,7 @@ protected void tearDown() throws Exception { } scheduler.shutdown(); } - + public void test_large() throws Exception { Connection[] connections = new Connection[dataSources.length * 8]; for (int i = 0; i < dataSources.length; ++i) { @@ -62,7 +60,7 @@ public void test_large() throws Exception { connections[i * 8 + j] = dataSources[i].getConnection(); } } - + for (int i = 0; i < dataSources.length; ++i) { for (int j = 0; j < 8; ++j) { connections[i * 8 + j].close(); diff --git a/src/test/java/com/alibaba/druid/pvt/pool/PSCacheTest5.java b/src/test/java/com/alibaba/druid/pvt/pool/PSCacheTest5.java index f33b83afe4..8d897f80bf 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/PSCacheTest5.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/PSCacheTest5.java @@ -12,7 +12,6 @@ import com.alibaba.druid.util.JdbcUtils; public class PSCacheTest5 extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -38,9 +37,9 @@ public void test_0() throws Exception { for (int i = 0; i < 1000; ++i) { Connection conn = dataSource.getConnection(); PreparedStatement ps = conn.prepareStatement("select 1"); - + Assert.assertSame(mockStmt, ps.unwrap(MockPreparedStatement.class)); - + ps.execute(); ps.close(); conn.close(); diff --git a/src/test/java/com/alibaba/druid/pvt/pool/TestAbondon.java b/src/test/java/com/alibaba/druid/pvt/pool/TestAbondon.java index 655323ffe4..5d161bc3a9 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/TestAbondon.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/TestAbondon.java @@ -23,7 +23,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestAbondon extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -48,12 +47,12 @@ public void test_0() throws Exception { DruidPooledConnection conn = dataSource.getConnection(); Assert.assertEquals(false, conn.isClosed()); Thread.sleep(10); - + for (int i = 0; i < 100; ++i) { if (conn.isAbandonded()) { break; } - Thread.sleep(10); + Thread.sleep(10); } Assert.assertEquals(true, conn.isAbandonded()); } diff --git a/src/test/java/com/alibaba/druid/pvt/pool/TestConcurrent.java b/src/test/java/com/alibaba/druid/pvt/pool/TestConcurrent.java index a65f02b9a2..fdda02e9df 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/TestConcurrent.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/TestConcurrent.java @@ -28,8 +28,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestConcurrent extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -163,7 +162,7 @@ public void test_0() throws Exception { /** * 并发执行10000次 - * + * * @param threadCount * @throws InterruptedException */ @@ -174,7 +173,6 @@ private void concurrent(final int threadCount) throws InterruptedException { Thread[] threads = new Thread[threadCount]; for (int i = 0; i < threadCount; ++i) { threads[i] = new Thread() { - public void run() { try { startLatch.await(); diff --git a/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent.java b/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent.java index a802f64eec..d5abdcce0a 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent.java @@ -28,7 +28,6 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle3_Concurrent extends TestCase { - protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); } @@ -95,14 +94,13 @@ public void test_idle2() throws Exception { } private void concurrent(final MockDriver driver, final DruidDataSource dataSource, final int count) - throws Exception { + throws Exception { final int LOOP_COUNT = 1000; Thread[] threads = new Thread[count]; final CyclicBarrier barrier = new CyclicBarrier(count); final CountDownLatch endLatch = new CountDownLatch(count); for (int i = 0; i < count; ++i) { threads[i] = new Thread("thread-" + i) { - public void run() { try { for (int i = 0; i < LOOP_COUNT; ++i) { diff --git a/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_MaxActive.java b/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_MaxActive.java index 749a68547b..e19972bad1 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_MaxActive.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_MaxActive.java @@ -27,8 +27,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle3_Concurrent_MaxActive extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -102,7 +101,6 @@ private void concurrent(final int threadCount) throws Exception { for (int i = 0; i < threadCount; ++i) { threads[i] = new Thread("thread-" + i) { - public void run() { try { startLatch.await(); diff --git a/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_Starvation.java b/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_Starvation.java index 4f41e33005..d6817cc54e 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_Starvation.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_Starvation.java @@ -30,8 +30,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle3_Concurrent_Starvation extends TestCase { - - private MockDriver driver; + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -61,7 +60,6 @@ protected void tearDown() throws Exception { } public void test_idle2() throws Exception { - // 第一次创建连接 { Assert.assertEquals(0, dataSource.getCreateCount()); @@ -105,7 +103,6 @@ private void concurrent(final int threadCount) throws Exception { final AtomicInteger pass = new AtomicInteger(); final CyclicBarrier closedBarrier = new CyclicBarrier(threadCount, new Runnable() { - public void run() { Assert.assertEquals(threadCount, dataSource.getPoolingCount()); dataSource.shrink(false); @@ -117,7 +114,6 @@ public void run() { } }); final CyclicBarrier closeBarrier = new CyclicBarrier(threadCount, new Runnable() { - public void run() { Assert.assertEquals(threadCount, dataSource.getActiveCount()); } @@ -125,12 +121,10 @@ public void run() { for (int i = 0; i < threadCount; ++i) { threads[i] = new Thread("thread-" + i) { - public void run() { try { startLatch.await(); for (int i = 0; i < 1000 * 1; ++i) { - Connection conn = dataSource.getConnection(); closeBarrier.await(); PreparedStatement stmt = conn.prepareStatement("SELECT 1"); diff --git a/src/test/java/com/alibaba/druid/pvt/support/monitor/MonitorDaoJdbcImplTest.java b/src/test/java/com/alibaba/druid/pvt/support/monitor/MonitorDaoJdbcImplTest.java index 8682551503..87c301f5e1 100644 --- a/src/test/java/com/alibaba/druid/pvt/support/monitor/MonitorDaoJdbcImplTest.java +++ b/src/test/java/com/alibaba/druid/pvt/support/monitor/MonitorDaoJdbcImplTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.wall.WallTableStatValue; public class MonitorDaoJdbcImplTest extends TestCase { - private DruidDataSource dataSource; @Override @@ -53,13 +52,13 @@ public void testBuildSql() throws Exception { MonitorClient client = new MonitorClient(); client.setDao(dao); - + client.checkInst(); client.collectSql(); { - List sqlList = client.loadSqlList(Collections. emptyMap()); + List sqlList = client.loadSqlList(Collections.emptyMap()); for (JdbcSqlStatValue sqlStatValue : sqlList) { System.out.println(sqlStatValue.getData()); } @@ -69,7 +68,7 @@ public void testBuildSql() throws Exception { client.collectSql(); { - List sqlList = client.loadSqlList(Collections. emptyMap()); + List sqlList = client.loadSqlList(Collections.emptyMap()); for (JdbcSqlStatValue sqlStatValue : sqlList) { System.out.println(sqlStatValue.getData()); } @@ -81,7 +80,7 @@ public String buildCreateSql(MonitorDaoJdbcImpl dao, BeanInfo beanInfo) { StringBuilder buf = new StringBuilder(); buf.append("CREATE TABLE ") // - .append(dao.getTableName(beanInfo)); + .append(dao.getTableName(beanInfo)); buf.append("( id bigint(20) NOT NULL AUTO_INCREMENT"); buf.append(", domain varchar(45) NOT NULL"); diff --git a/src/test/java/com/alibaba/druid/spring/ISequenceDao.java b/src/test/java/com/alibaba/druid/spring/ISequenceDao.java index 9de5dacee0..5933e6827e 100644 --- a/src/test/java/com/alibaba/druid/spring/ISequenceDao.java +++ b/src/test/java/com/alibaba/druid/spring/ISequenceDao.java @@ -16,7 +16,6 @@ package com.alibaba.druid.spring; public interface ISequenceDao { - boolean compareAndSet(String name, int value, int expect); int getValue(String name); diff --git a/src/test/java/com/alibaba/druid/spring/MBeanServerFactoryBean.java b/src/test/java/com/alibaba/druid/spring/MBeanServerFactoryBean.java index 321fbd841e..801b1a16ff 100644 --- a/src/test/java/com/alibaba/druid/spring/MBeanServerFactoryBean.java +++ b/src/test/java/com/alibaba/druid/spring/MBeanServerFactoryBean.java @@ -22,7 +22,6 @@ import org.springframework.beans.factory.FactoryBean; public class MBeanServerFactoryBean implements FactoryBean { - public MBeanServer getObject() throws Exception { return ManagementFactory.getPlatformMBeanServer(); } diff --git a/src/test/java/com/alibaba/druid/spring/SequenceDao.java b/src/test/java/com/alibaba/druid/spring/SequenceDao.java index be001060fe..a09eab896c 100644 --- a/src/test/java/com/alibaba/druid/spring/SequenceDao.java +++ b/src/test/java/com/alibaba/druid/spring/SequenceDao.java @@ -21,9 +21,7 @@ import org.springframework.orm.ibatis.support.SqlMapClientDaoSupport; public class SequenceDao extends SqlMapClientDaoSupport implements ISequenceDao { - public boolean compareAndSet(String name, int value, int expect) { - Map parameters = new HashMap(); parameters.put("name", name); parameters.put("value", value); diff --git a/src/test/java/com/alibaba/druid/spring/SequenceService.java b/src/test/java/com/alibaba/druid/spring/SequenceService.java index 6bdadb8266..af66509c83 100644 --- a/src/test/java/com/alibaba/druid/spring/SequenceService.java +++ b/src/test/java/com/alibaba/druid/spring/SequenceService.java @@ -23,12 +23,12 @@ import org.springframework.transaction.annotation.Transactional; public class SequenceService implements SequenceServiceMBean, ISequenceService { - private Lock lock = new ReentrantLock(); + private Lock lock = new ReentrantLock(); - private ISequenceDao dao; - private String name = "druid-spring-test"; + private ISequenceDao dao; + private String name = "druid-spring-test"; - private String seed; + private String seed; private AtomicInteger increment = new AtomicInteger(); diff --git a/src/test/java/com/alibaba/druid/spring/SequenceServiceMBean.java b/src/test/java/com/alibaba/druid/spring/SequenceServiceMBean.java index 36dcd3de80..758dedf9b2 100644 --- a/src/test/java/com/alibaba/druid/spring/SequenceServiceMBean.java +++ b/src/test/java/com/alibaba/druid/spring/SequenceServiceMBean.java @@ -17,5 +17,4 @@ public interface SequenceServiceMBean { - } diff --git a/src/test/java/com/alibaba/druid/spring/User.java b/src/test/java/com/alibaba/druid/spring/User.java index 16b1bf5d45..4ff71089a9 100644 --- a/src/test/java/com/alibaba/druid/spring/User.java +++ b/src/test/java/com/alibaba/druid/spring/User.java @@ -16,15 +16,13 @@ package com.alibaba.druid.spring; public class User { - - private long id; + private long id; private String name; - public User(){ - + public User() { } - public User(long id, String name){ + public User(long id, String name) { this.id = id; this.name = name; } diff --git a/src/test/java/com/alibaba/druid/spring/UserDao.java b/src/test/java/com/alibaba/druid/spring/UserDao.java index df6e905d6a..0126e02fd2 100644 --- a/src/test/java/com/alibaba/druid/spring/UserDao.java +++ b/src/test/java/com/alibaba/druid/spring/UserDao.java @@ -18,7 +18,6 @@ import org.springframework.orm.ibatis.support.SqlMapClientDaoSupport; public class UserDao extends SqlMapClientDaoSupport implements IUserDao { - public void addUser(User user) { getSqlMapClientTemplate().insert("User.insert", user); } diff --git a/src/test/java/com/alibaba/druid/spring/UserService.java b/src/test/java/com/alibaba/druid/spring/UserService.java index c3f7e4bbbf..c4109fc70a 100644 --- a/src/test/java/com/alibaba/druid/spring/UserService.java +++ b/src/test/java/com/alibaba/druid/spring/UserService.java @@ -19,8 +19,7 @@ import org.springframework.transaction.annotation.Transactional; public class UserService implements IUserService { - - private IUserDao dao; + private IUserDao dao; private ISequenceService sequenceService; @Transactional(propagation = Propagation.REQUIRED) diff --git a/src/test/java/com/alibaba/druid/sql/DB2Test.java b/src/test/java/com/alibaba/druid/sql/DB2Test.java index ce5056f0f3..360a4ef662 100644 --- a/src/test/java/com/alibaba/druid/sql/DB2Test.java +++ b/src/test/java/com/alibaba/druid/sql/DB2Test.java @@ -23,23 +23,23 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2OutputVisitor; public class DB2Test extends TestCase { - protected String output(List stmtList) { - StringBuilder out = new StringBuilder(); - DB2OutputVisitor visitor = new DB2OutputVisitor(out); + protected String output(List stmtList) { + StringBuilder out = new StringBuilder(); + DB2OutputVisitor visitor = new DB2OutputVisitor(out); - for (SQLStatement stmt : stmtList) { - stmt.accept(visitor); - } + for (SQLStatement stmt : stmtList) { + stmt.accept(visitor); + } - return out.toString(); - } - - protected void print(List stmtList) { - String text = output(stmtList); - String outputProperty = System.getProperty("druid.output"); - if ("false".equals(outputProperty)) { - return; - } + return out.toString(); + } + + protected void print(List stmtList) { + String text = output(stmtList); + String outputProperty = System.getProperty("druid.output"); + if ("false".equals(outputProperty)) { + return; + } // System.out.println(text); - } + } } diff --git a/src/test/java/com/alibaba/druid/sql/KeywordsMySqlTest.java b/src/test/java/com/alibaba/druid/sql/KeywordsMySqlTest.java index 91831351f0..96b9eee63d 100644 --- a/src/test/java/com/alibaba/druid/sql/KeywordsMySqlTest.java +++ b/src/test/java/com/alibaba/druid/sql/KeywordsMySqlTest.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.parser.Keywords; public class KeywordsMySqlTest extends TestCase { - public void test_sort() throws Exception { List list = new ArrayList(Keywords.DEFAULT_KEYWORDS.getKeywords().keySet()); diff --git a/src/test/java/com/alibaba/druid/sql/KeywordsTest.java b/src/test/java/com/alibaba/druid/sql/KeywordsTest.java index 5dfc01c6e2..f294aa8a85 100644 --- a/src/test/java/com/alibaba/druid/sql/KeywordsTest.java +++ b/src/test/java/com/alibaba/druid/sql/KeywordsTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.parser.Keywords; public class KeywordsTest extends TestCase { - public void test_sort() throws Exception { List list = new ArrayList(SQLServerLexer.DEFAULT_SQL_SERVER_KEYWORDS.getKeywords().keySet()); diff --git a/src/test/java/com/alibaba/druid/sql/MysqlTest.java b/src/test/java/com/alibaba/druid/sql/MysqlTest.java index b285059d3d..9d57c8c787 100644 --- a/src/test/java/com/alibaba/druid/sql/MysqlTest.java +++ b/src/test/java/com/alibaba/druid/sql/MysqlTest.java @@ -24,39 +24,39 @@ import java.util.List; public class MysqlTest extends TestCase { - protected String output(List stmtList) { - StringBuilder out = new StringBuilder(); - MySqlOutputVisitor visitor = new MySqlOutputVisitor(out); - - for (SQLStatement stmt : stmtList) { - stmt.accept(visitor); - } - - return out.toString(); - } - - protected void print(List stmtList) { - String text = output(stmtList); - String outputProperty = System.getProperty("druid.output"); - if ("false".equals(outputProperty)) { - return; - } - System.out.println(text); - } - - - protected void parseTrue(String sql, String except) { - SQLStatement statement = SQLUtils.parseSingleMysqlStatement(sql); - Assert.assertEquals(except, SQLUtils.toMySqlString(statement)); - } - - protected SQLStatement parse(String sql) { - return SQLUtils.parseSingleMysqlStatement(sql); - } - - protected List parseList(String sql) { - MySqlStatementParser parser = new MySqlStatementParser(sql); - return parser.parseStatementList(); - } + protected String output(List stmtList) { + StringBuilder out = new StringBuilder(); + MySqlOutputVisitor visitor = new MySqlOutputVisitor(out); + + for (SQLStatement stmt : stmtList) { + stmt.accept(visitor); + } + + return out.toString(); + } + + protected void print(List stmtList) { + String text = output(stmtList); + String outputProperty = System.getProperty("druid.output"); + if ("false".equals(outputProperty)) { + return; + } + System.out.println(text); + } + + + protected void parseTrue(String sql, String except) { + SQLStatement statement = SQLUtils.parseSingleMysqlStatement(sql); + Assert.assertEquals(except, SQLUtils.toMySqlString(statement)); + } + + protected SQLStatement parse(String sql) { + return SQLUtils.parseSingleMysqlStatement(sql); + } + + protected List parseList(String sql) { + MySqlStatementParser parser = new MySqlStatementParser(sql); + return parser.parseStatementList(); + } } diff --git a/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java b/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java index 98ee868f1e..f315372bcb 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java @@ -26,10 +26,9 @@ import com.alibaba.druid.util.JdbcUtils; public class OnlineOracleTest3 extends TestCase { - - private String jdbcUrl; - private String user; - private String password; + private String jdbcUrl; + private String user; + private String password; private DruidDataSource dataSource; public void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java index 93a50974b1..7362c4de64 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java @@ -33,9 +33,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleParameterizedOutputVisitor; public class OnlineSQLTest extends TestCase { - - private String url = "jdbc:mysql://a.b.c.d/dragoon_v25monitordb_online"; - private String user = "dragoon"; + private String url = "jdbc:mysql://a.b.c.d/dragoon_v25monitordb_online"; + private String user = "dragoon"; private String password = "dragoon"; public void test_list_sql() throws Exception { @@ -125,7 +124,7 @@ void validate(int id, String sql) throws Exception { boolean sqlFlag = false; String lowerSql = sql.toLowerCase(); if (lowerSql.startsWith("insert") || lowerSql.startsWith("select") || lowerSql.startsWith("upate") - || lowerSql.startsWith("delete") || lowerSql.startsWith("create") || lowerSql.startsWith("drop")) { + || lowerSql.startsWith("delete") || lowerSql.startsWith("create") || lowerSql.startsWith("drop")) { sqlFlag = true; } @@ -154,7 +153,7 @@ void validateOracle(int id, String sql) throws Exception { boolean sqlFlag = false; String lowerSql = sql.toLowerCase(); if (lowerSql.startsWith("insert") || lowerSql.startsWith("select") || lowerSql.startsWith("upate") - || lowerSql.startsWith("delete") || lowerSql.startsWith("create") || lowerSql.startsWith("drop")) { + || lowerSql.startsWith("delete") || lowerSql.startsWith("create") || lowerSql.startsWith("drop")) { sqlFlag = true; } diff --git a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java index 88b4595c09..708365e674 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java @@ -29,13 +29,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OnlineSQLTest2 extends TestCase { - - private String url = "jdbc:mysql://a.b.c.d/dragoon_v25_monitordb_test"; - private String user = "dragoon"; + private String url = "jdbc:mysql://a.b.c.d/dragoon_v25_monitordb_test"; + private String user = "dragoon"; private String password = "dragoon"; public void test_list_sql() throws Exception { - Connection conn = DriverManager.getConnection(url, user, password); int count = 0; @@ -53,7 +51,7 @@ public void test_list_sql() throws Exception { boolean sqlFlag = false; String lowerSql = value.toLowerCase(); if (lowerSql.startsWith("insert") || lowerSql.startsWith("select") || lowerSql.startsWith("upate") - || lowerSql.startsWith("delete") || lowerSql.startsWith("create") || lowerSql.startsWith("drop")) { + || lowerSql.startsWith("delete") || lowerSql.startsWith("create") || lowerSql.startsWith("drop")) { sqlFlag = true; } @@ -79,7 +77,7 @@ void mysqlStat(int id, String sql) throws Exception { boolean sqlFlag = false; String lowerSql = sql.toLowerCase(); if (lowerSql.startsWith("insert") || lowerSql.startsWith("select") || lowerSql.startsWith("upate") - || lowerSql.startsWith("delete") || lowerSql.startsWith("create") || lowerSql.startsWith("drop")) { + || lowerSql.startsWith("delete") || lowerSql.startsWith("create") || lowerSql.startsWith("drop")) { sqlFlag = true; } diff --git a/src/test/java/com/alibaba/druid/sql/OracleTest.java b/src/test/java/com/alibaba/druid/sql/OracleTest.java index a01d27c58b..7aa7c43c41 100644 --- a/src/test/java/com/alibaba/druid/sql/OracleTest.java +++ b/src/test/java/com/alibaba/druid/sql/OracleTest.java @@ -23,25 +23,25 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; public class OracleTest extends TestCase { - protected String output(List stmtList) { - StringBuilder out = new StringBuilder(); - OracleOutputVisitor visitor = new OracleOutputVisitor(out); - - for (SQLStatement stmt : stmtList) { - stmt.accept(visitor); - } - - return out.toString(); - } - - protected void print(List stmtList) { - String text = output(stmtList); - String outputProperty = System.getProperty("druid.output"); + protected String output(List stmtList) { + StringBuilder out = new StringBuilder(); + OracleOutputVisitor visitor = new OracleOutputVisitor(out); + + for (SQLStatement stmt : stmtList) { + stmt.accept(visitor); + } + + return out.toString(); + } + + protected void print(List stmtList) { + String text = output(stmtList); + String outputProperty = System.getProperty("druid.output"); if ("false".equals(outputProperty)) { return; } System.out.println(text); - } - - + } + + } diff --git a/src/test/java/com/alibaba/druid/sql/PGTest.java b/src/test/java/com/alibaba/druid/sql/PGTest.java index d715e5dba8..7c3c229053 100644 --- a/src/test/java/com/alibaba/druid/sql/PGTest.java +++ b/src/test/java/com/alibaba/druid/sql/PGTest.java @@ -25,25 +25,25 @@ import org.junit.Assert; public class PGTest extends TestCase { - protected String output(List stmtList) { - StringBuilder out = new StringBuilder(); - PGOutputVisitor visitor = new PGOutputVisitor(out); - - for (SQLStatement stmt : stmtList) { - stmt.accept(visitor); - } - - return out.toString(); - } - - protected void print(List stmtList) { - String text = output(stmtList); - String outputProperty = System.getProperty("druid.output"); - if ("false".equals(outputProperty)) { - return; - } - System.out.println(text); - } + protected String output(List stmtList) { + StringBuilder out = new StringBuilder(); + PGOutputVisitor visitor = new PGOutputVisitor(out); + + for (SQLStatement stmt : stmtList) { + stmt.accept(visitor); + } + + return out.toString(); + } + + protected void print(List stmtList) { + String text = output(stmtList); + String outputProperty = System.getProperty("druid.output"); + if ("false".equals(outputProperty)) { + return; + } + System.out.println(text); + } protected void testParseSql(String sql, String expectedSql, String expectedPattern, Class type) { PGSQLStatementParser parser = new PGSQLStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java b/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java index d47ceb6e4e..cab9bb2b01 100644 --- a/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java +++ b/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java @@ -29,12 +29,12 @@ public class SQLExprParserTest extends TestCase { public void test_binary() throws Exception { SQLExprParser exprParser = new SQLExprParser("AGE > 5"); SQLBinaryOpExpr binaryOpExpr = (SQLBinaryOpExpr) exprParser.expr(); - + Assert.assertEquals(SQLBinaryOperator.GreaterThan, binaryOpExpr.getOperator()); - + SQLIdentifierExpr left = (SQLIdentifierExpr) binaryOpExpr.getLeft(); SQLIntegerExpr right = (SQLIntegerExpr) binaryOpExpr.getRight(); - + Assert.assertEquals("AGE", left.getName()); Assert.assertEquals(5, right.getNumber().intValue()); } diff --git a/src/test/java/com/alibaba/druid/sql/TestMigrate.java b/src/test/java/com/alibaba/druid/sql/TestMigrate.java index f984e3f7b8..aec62322e7 100644 --- a/src/test/java/com/alibaba/druid/sql/TestMigrate.java +++ b/src/test/java/com/alibaba/druid/sql/TestMigrate.java @@ -33,10 +33,9 @@ import com.alibaba.druid.support.json.JSONUtils; public class TestMigrate extends OracleTest { - - private String jdbcUrl; - private String user; - private String password; + private String jdbcUrl; + private String user; + private String password; private DruidDataSource dataSource; public void setUp() throws Exception { @@ -134,10 +133,10 @@ public void test_migrate() throws Exception { clearResult(); String sql = "SELECT SNAP_DATE, DBNAME, SQL_ID, PIECE, SQL_TEXT" + // - " , COMMAND_TYPE, LAST_SNAP_DATE, DB_PK, SQL_PARSE_RESULT " + // - " FROM db_day_sqltext " + // - " WHERE snap_date = trunc(sysdate) " + // - " ORDER BY db_pk, sql_id, piece"; + " , COMMAND_TYPE, LAST_SNAP_DATE, DB_PK, SQL_PARSE_RESULT " + // + " FROM db_day_sqltext " + // + " WHERE snap_date = trunc(sysdate) " + // + " ORDER BY db_pk, sql_id, piece"; Statement stmt = conn.createStatement(); OracleStatement oracleStmt = stmt.unwrap(OracleStatement.class); @@ -233,9 +232,9 @@ public void insert(List list) throws Exception { } String sql = "INSERT INTO db_day_sql_fulltext " + // - "(SNAP_DATE, DBNAME, SQL_ID, PIECE, SQL_TEXT" + // - ", COMMAND_TYPE, LAST_SNAP_DATE, DB_PK, SQL_PARSE_RESULT)" + // - " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"; + "(SNAP_DATE, DBNAME, SQL_ID, PIECE, SQL_TEXT" + // + ", COMMAND_TYPE, LAST_SNAP_DATE, DB_PK, SQL_PARSE_RESULT)" + // + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"; Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement(sql); @@ -262,16 +261,15 @@ public void insert(List list) throws Exception { } public static class Record { - - private Date snapshotDate; - private String dbName; - private String sqlId; + private Date snapshotDate; + private String dbName; + private String sqlId; private StringBuffer sqlText = new StringBuffer(); - private Integer piece; - private Integer commandType; - private Date lastSnapshotDate; - private Long dbPk; - private String result; + private Integer piece; + private Integer commandType; + private Date lastSnapshotDate; + private Long dbPk; + private String result; public String getResult() { return result; diff --git a/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java b/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java index 5c20fcbdc9..5b3e9709da 100644 --- a/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java +++ b/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java @@ -25,10 +25,9 @@ import com.alibaba.druid.util.JdbcUtils; public class TestOnlineSQLTest3 extends TestCase { - - private String url = "jdbc:mysql://a.b.c.d/dragoon_v25_masterdb"; - private String user = "dragoon_test"; - private String password = "dragoon_test"; + private String url = "jdbc:mysql://a.b.c.d/dragoon_v25_masterdb"; + private String user = "dragoon_test"; + private String password = "dragoon_test"; protected Connection conn; @@ -47,13 +46,13 @@ public void tearDown() throws Exception { public void test_0() throws Exception { // ResultSet rs = conn.getMetaData().getTables(null, null, null, null); // JdbcUtils.printResultSet(rs); - + String sql = "select benchmark( 1, sha1( 'test' ) )"; Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery(sql); JdbcUtils.printResultSet(rs); - + stmt.close(); } } diff --git a/src/test/java/com/alibaba/druid/sql/TestTransform.java b/src/test/java/com/alibaba/druid/sql/TestTransform.java index a444975424..3e9b2c8445 100644 --- a/src/test/java/com/alibaba/druid/sql/TestTransform.java +++ b/src/test/java/com/alibaba/druid/sql/TestTransform.java @@ -35,10 +35,9 @@ import com.alibaba.druid.support.json.JSONUtils; public class TestTransform extends OracleTest { - - private String jdbcUrl; - private String user; - private String password; + private String jdbcUrl; + private String user; + private String password; private DruidDataSource dataSource; private ExecutorService executor = Executors.newFixedThreadPool(10); @@ -92,7 +91,6 @@ public void updateRecord(String sqlId, String result) throws Exception { } public void test_transform() throws Exception { - Connection conn = dataSource.getConnection(); int count = 0; @@ -109,10 +107,10 @@ public void test_transform() throws Exception { System.out.println("COUNT : " + count); String sql = "SELECT SNAP_DATE, DBNAME, SQL_ID, PIECE, SQL_TEXT" + // - " , COMMAND_TYPE, LAST_SNAP_DATE, DB_PK, SQL_PARSE_RESULT " + // - " FROM db_day_sql_fulltext " + // - " WHERE SQL_PARSE_RESULT IS NULL" + // - " ORDER BY sql_id, piece"; + " , COMMAND_TYPE, LAST_SNAP_DATE, DB_PK, SQL_PARSE_RESULT " + // + " FROM db_day_sql_fulltext " + // + " WHERE SQL_PARSE_RESULT IS NULL" + // + " ORDER BY sql_id, piece"; Statement stmt = conn.createStatement(); @@ -157,7 +155,6 @@ public void test_transform() throws Exception { public void schemaStat(final Record r) throws Exception { executor.submit(new Runnable() { - public void run() { try { schemaStatInternal(r); @@ -170,7 +167,7 @@ public void run() { public void schemaStatInternal(Record r) throws Exception { String sql = r.getSqlText(); - + sql = sql.replaceAll("5'HK'", "5''HK'"); sql = sql.replaceAll("5'TW'", "5''TW'"); sql = sql.replaceAll("5'CN'", "5''CN'"); @@ -232,10 +229,10 @@ public void f_test_migrate() throws Exception { clearResult(); String sql = "SELECT SNAP_DATE, DBNAME, SQL_ID, PIECE, SQL_TEXT" + // - " , COMMAND_TYPE, LAST_SNAP_DATE, DB_PK, SQL_PARSE_RESULT " + // - " FROM db_day_sqltext " + // - // " WHERE db_pk = 40 and snap_date = trunc(sysdate) " + // - " ORDER BY db_pk, sql_id, piece"; + " , COMMAND_TYPE, LAST_SNAP_DATE, DB_PK, SQL_PARSE_RESULT " + // + " FROM db_day_sqltext " + // + // " WHERE db_pk = 40 and snap_date = trunc(sysdate) " + // + " ORDER BY db_pk, sql_id, piece"; Statement stmt = conn.createStatement(); OracleStatement oracleStmt = stmt.unwrap(OracleStatement.class); @@ -284,11 +281,11 @@ public void f_test_migrate() throws Exception { r.setDbPk(rs.getLong(8)); } else { String part = rs.getString(5); - + if (part == null) { continue; } - + int commentIndex = part.indexOf("--"); if (commentIndex != -1) { part = part.substring(0, commentIndex); @@ -335,9 +332,9 @@ public void insert(List list) throws Exception { } String sql = "INSERT INTO db_day_sql_fulltext " + // - "(SNAP_DATE, DBNAME, SQL_ID, PIECE, SQL_TEXT" + // - ", COMMAND_TYPE, LAST_SNAP_DATE, DB_PK, SQL_PARSE_RESULT)" + // - " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"; + "(SNAP_DATE, DBNAME, SQL_ID, PIECE, SQL_TEXT" + // + ", COMMAND_TYPE, LAST_SNAP_DATE, DB_PK, SQL_PARSE_RESULT)" + // + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"; Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement(sql); @@ -364,16 +361,15 @@ public void insert(List list) throws Exception { } public static class Record { - - private Date snapshotDate; - private String dbName; - private String sqlId; + private Date snapshotDate; + private String dbName; + private String sqlId; private StringBuffer sqlText = new StringBuffer(); - private Integer piece; - private Integer commandType; - private Date lastSnapshotDate; - private Long dbPk; - private String result; + private Integer piece; + private Integer commandType; + private Date lastSnapshotDate; + private Long dbPk; + private String result; public String getResult() { return result; diff --git a/src/test/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitorTest.java b/src/test/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitorTest.java index 38c2c921cf..d4d8973868 100644 --- a/src/test/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitorTest.java +++ b/src/test/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitorTest.java @@ -12,7 +12,6 @@ import java.util.List; public class H2OutputVisitorTest { - @BeforeClass public static void loadDriver() { org.h2.Driver.load(); diff --git a/src/test/java/com/alibaba/druid/sql/mysql/demo/Demo0.java b/src/test/java/com/alibaba/druid/sql/mysql/demo/Demo0.java index 3e2a73b996..85ab10bb4c 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/demo/Demo0.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/demo/Demo0.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class Demo0 extends TestCase { - public void test_demo_0() throws Exception { String sql = "SELECT UUID();"; diff --git a/src/test/java/com/alibaba/druid/sql/odps/OdpsFileTest.java b/src/test/java/com/alibaba/druid/sql/odps/OdpsFileTest.java index 93ce3f52e2..5dd1d67308 100644 --- a/src/test/java/com/alibaba/druid/sql/odps/OdpsFileTest.java +++ b/src/test/java/com/alibaba/druid/sql/odps/OdpsFileTest.java @@ -34,7 +34,6 @@ import com.alibaba.druid.util.Utils; public class OdpsFileTest extends TestCase { - public void test_0() throws Exception { exec_test("bvt/parser/odps-0.sql"); } @@ -70,7 +69,6 @@ public void exec_test(String resource) throws Exception { } void mergValidate(String sql, String expect) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java index daabecdc69..53488f6ad5 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class Demo0 extends TestCase { - public void test_demo_0() throws Exception { String sql = "SELECT SYSDATE FROM DUAL"; diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo1.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo1.java index 297f6f4810..1ee9ad6a27 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo1.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo1.java @@ -34,7 +34,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class Demo1 extends TestCase { - public void test_0() throws Exception { String sql = "select * from user where uid = ? and uname = ?"; List parameters = new ArrayList(); @@ -50,10 +49,10 @@ public void test_0() throws Exception { first.accept(variantVisitor); SQLVariantRefExpr firstVar = variantVisitor.getVariantList().get(0); - + int varIndex = (Integer) firstVar.getAttribute("varIndex"); Integer param = (Integer) parameters.get(varIndex); - + String tableName; if (param.intValue() == 1) { tableName = "user_1"; @@ -63,14 +62,13 @@ public void test_0() throws Exception { MyOracleVisitor visitor = new MyOracleVisitor(tableName); first.accept(visitor); - + String realSql = SQLUtils.toOracleString(first); System.out.println(realSql); } private static class GetVariantVisitor extends OracleASTVisitorAdapter { - - private int varIndex = 0; + private int varIndex = 0; private List variantList = new ArrayList(); public boolean visit(SQLVariantRefExpr x) { @@ -109,26 +107,25 @@ public void setVariantList(List variantList) { } private static class MyOracleVisitor extends OracleASTVisitorAdapter { - private String tableName; - public MyOracleVisitor(String tableName){ + public MyOracleVisitor(String tableName) { this.tableName = tableName; } - + public boolean visit(OracleSelectTableReference x) { SQLExpr expr = x.getExpr(); if (expr instanceof SQLIdentifierExpr) { SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr; String tableName = identExpr.getName(); - + if (tableName.equals("user")) { x.setExpr(this.tableName); } } else if (expr instanceof SQLPropertyExpr) { SQLPropertyExpr proExpr = (SQLPropertyExpr) expr; String tableName = proExpr.getName(); - + if (tableName.equals("user")) { proExpr.setName(this.tableName); } @@ -142,14 +139,14 @@ public boolean visit(SQLExprTableSource x) { if (expr instanceof SQLIdentifierExpr) { SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr; String tableName = identExpr.getName(); - + if (tableName.equals("user")) { x.setExpr(this.tableName); } } else if (expr instanceof SQLPropertyExpr) { SQLPropertyExpr proExpr = (SQLPropertyExpr) expr; String tableName = proExpr.getName(); - + if (tableName.equals("user")) { proExpr.setName(this.tableName); } diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo2.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo2.java index ecc6fb0b0d..15086cbe2e 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo2.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo2.java @@ -34,7 +34,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class Demo2 extends TestCase { - public void test_0() throws Exception { String sql = "select * from user where uid = 2 and uname = ?"; List parameters = new ArrayList(); @@ -91,9 +90,8 @@ public void test_0() throws Exception { } private static class MyVisitor extends MySqlASTVisitorAdapter { - - private int varIndex = 0; - private List variantList = new ArrayList(); + private int varIndex = 0; + private List variantList = new ArrayList(); private List tableSourceList = new ArrayList(); public boolean visit(SQLVariantRefExpr x) { @@ -116,7 +114,7 @@ public boolean visit(SQLBinaryOpExpr x) { return true; } - + public boolean visit(SQLExprTableSource x) { tableSourceList.add(x); return true; diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo3.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo3.java index c805950cd1..3dc28d41b7 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo3.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo3.java @@ -38,7 +38,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class Demo3 extends TestCase { - public void test_0() throws Exception { String sql = "select * from user u where u.uid = 2 and uname = ?"; List parameters = new ArrayList(); @@ -131,13 +130,12 @@ private String convert(String sql, List parameters) { } private static class MyVisitor extends MySqlASTVisitorAdapter { - - private int varIndex = 0; - private List variantList = new ArrayList(); + private int varIndex = 0; + private List variantList = new ArrayList(); private List tableSourceList = new ArrayList(); - private Map tableAlias = new HashMap(); - private String defaultTableName; + private Map tableAlias = new HashMap(); + private String defaultTableName; public boolean visit(SQLVariantRefExpr x) { x.getAttributes().put("varIndex", varIndex++); diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_casewhen.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_casewhen.java index cec44bdc45..788eb374fb 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_casewhen.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_casewhen.java @@ -28,7 +28,6 @@ import java.util.List; public class Demo_casewhen extends TestCase { - public void test_demo_0() throws Exception { String sql = "select case when a = 20 then b else c end from emp"; diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest.java index a421e41201..fe91edfc6f 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest.java @@ -33,7 +33,6 @@ import java.util.List; public class OracleResourceTest extends OracleTest { - public void test_0() throws Exception { File file = new File("/Users/wenshao/Downloads/unknownSql(2).txt"); @@ -63,7 +62,6 @@ public void test_0() throws Exception { } void mergValidate(String sql, String expect) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest2.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest2.java index fc0bbdb412..f108b98be2 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest2.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest2.java @@ -28,7 +28,6 @@ import java.util.List; public class OracleResourceTest2 extends OracleTest { - public void test_0() throws Exception { File file = new File("/Users/wenshao/Downloads/ff.sql"); @@ -58,7 +57,6 @@ public void test_0() throws Exception { } void mergValidate(String sql, String expect) { - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java b/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java index ccd53087ae..161c5fe532 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java @@ -24,12 +24,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; public class CommentTest extends TestCase { - public void test_0() throws Exception { String sql = "SELECT /*mark for picman*/ * FROM WP_ALBUM WHERE MEMBER_ID = ? AND ID IN (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; Lexer lexer = new Lexer(sql); - for (;;) { + for (; ; ) { lexer.nextToken(); Token tok = lexer.token(); diff --git a/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java b/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java index da65fc8964..c1177f36f8 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java @@ -9,15 +9,14 @@ import junit.framework.TestCase; public class DeallocatePrepareTest extends TestCase { + public void test() { + String sql = "DEALLOCATE PREPARE stmt1"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + SQLStatement stmt = parser.parseStatement(); + Assert.assertEquals(MysqlDeallocatePrepareStatement.class, stmt.getClass()); + MysqlDeallocatePrepareStatement dpStmt = (MysqlDeallocatePrepareStatement) stmt; + Assert.assertEquals("stmt1", dpStmt.getStatementName().getSimpleName()); + Assert.assertEquals(sql, dpStmt.toString()); + } - public void test() { - String sql = "DEALLOCATE PREPARE stmt1"; - MySqlStatementParser parser = new MySqlStatementParser(sql); - SQLStatement stmt =parser.parseStatement(); - Assert.assertEquals(MysqlDeallocatePrepareStatement.class, stmt.getClass()); - MysqlDeallocatePrepareStatement dpStmt = (MysqlDeallocatePrepareStatement) stmt; - Assert.assertEquals("stmt1", dpStmt.getStatementName().getSimpleName()); - Assert.assertEquals(sql, dpStmt.toString()); - } - } diff --git a/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitorTestCase.java b/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitorTestCase.java index 88f9e24677..56553492cd 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitorTestCase.java +++ b/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitorTestCase.java @@ -28,22 +28,19 @@ import com.alibaba.druid.util.JdbcUtils; public class ExportAndParameterizedVisitorTestCase extends TestCase { - public void testParameterizedVisitor() { // final String sql = // "insert into tab01(a,b,c) values('a1','bXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX1',5)"; - Object[][] sqlAndExpectedCases = { { "insert into tab01(a,b,c) values('a1','b1',5)", 3, "a1" }, - { "select * from tab01 where a=1 and b='b1'", 2, 1 }, - { "update tab01 set d='d1' where a=1 and b='b1'", 3, "d1" }, - { "delete from tab01 where a=1 and b='b1'", 2, 1.0 } }; + Object[][] sqlAndExpectedCases = {{"insert into tab01(a,b,c) values('a1','b1',5)", 3, "a1"}, + {"select * from tab01 where a=1 and b='b1'", 2, 1}, + {"update tab01 set d='d1' where a=1 and b='b1'", 3, "d1"}, + {"delete from tab01 where a=1 and b='b1'", 2, 1.0}}; - String[] dbTypes = { "mysql", "oracle", "db2" ,DbType.postgresql.name(), DbType.jtds.name(), "not-found"}; - // String[] dbTypes = { JdbcUtils.JTDS}; + String[] dbTypes = {"mysql", "oracle", "db2", DbType.postgresql.name(), DbType.jtds.name(), "not-found"}; + // String[] dbTypes = { JdbcUtils.JTDS}; for (String dbType : dbTypes) { - - System.out.println("dbType:"+dbType); + System.out.println("dbType:" + dbType); for (Object[] arr : sqlAndExpectedCases) { - final String sql = (String) arr[0]; StringBuilder out = new StringBuilder(); diff --git a/src/test/java/com/alibaba/druid/sql/parser/LoadDataSQLParserTest.java b/src/test/java/com/alibaba/druid/sql/parser/LoadDataSQLParserTest.java index d3b8c9764b..1546dceb1d 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/LoadDataSQLParserTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/LoadDataSQLParserTest.java @@ -10,17 +10,16 @@ /** * Created by magicdoom on 2015/6/5. */ -public class LoadDataSQLParserTest extends TestCase -{ +public class LoadDataSQLParserTest extends TestCase { public void test_load_data() throws Exception { String sql = "load DATA local INFILE '/opt/test.txt' IGNORE INTO TABLE test CHARACTER SET 'utf8' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"' ESCAPED BY '\\\\' LINES TERMINATED BY '\r\n' (id,sid,asf) "; SQLStatementParser parser = new MySqlStatementParser(sql); MySqlLoadDataInFileStatement stmt = (MySqlLoadDataInFileStatement) parser.parseStatement(); // - Assert.assertEquals("utf8",stmt.getCharset()) ; - Assert.assertEquals(",",((SQLCharExpr)stmt.getColumnsTerminatedBy()).getText()) ; - Assert.assertEquals("\"",((SQLCharExpr)stmt.getColumnsEnclosedBy()).getText()) ; - Assert.assertEquals("\r\n",((SQLCharExpr)stmt.getLinesTerminatedBy()).getText()) ; - Assert.assertEquals("\\",((SQLCharExpr)stmt.getColumnsEscaped()).getText()) ; + Assert.assertEquals("utf8", stmt.getCharset()); + Assert.assertEquals(",", ((SQLCharExpr) stmt.getColumnsTerminatedBy()).getText()); + Assert.assertEquals("\"", ((SQLCharExpr) stmt.getColumnsEnclosedBy()).getText()); + Assert.assertEquals("\r\n", ((SQLCharExpr) stmt.getLinesTerminatedBy()).getText()); + Assert.assertEquals("\\", ((SQLCharExpr) stmt.getColumnsEscaped()).getText()); } } diff --git a/src/test/java/com/alibaba/druid/sql/parser/MySQLCharSetTest.java b/src/test/java/com/alibaba/druid/sql/parser/MySQLCharSetTest.java index 47550a78c1..22ceced43e 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/MySQLCharSetTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/MySQLCharSetTest.java @@ -11,10 +11,9 @@ * Created by tianzhen.wtz on 2015/10/31. * 类说明： */ -public class MySQLCharSetTest extends TestCase{ - - public void testCreateCharset(){ - String targetSql="CREATE TABLE `test_idb`.`acct_certificate` (\n" + +public class MySQLCharSetTest extends TestCase { + public void testCreateCharset() { + String targetSql = "CREATE TABLE `test_idb`.`acct_certificate` (\n" + " `id` bigint(20) NOT NULL auto_increment COMMENT '',\n" + " `nodeid` varchar(5) CHARSET `gbk` COLLATE `gbk_chinese_ci` NULL COMMENT '',\n" + " `certificatetype` char(1) CHARSET `gbk` COLLATE `gbk_chinese_ci` NULL COMMENT '',\n" + @@ -25,7 +24,7 @@ public void testCreateCharset(){ "\n" + ") engine= InnoDB DEFAULT CHARSET= `gbk` DEFAULT COLLATE `gbk_chinese_ci` comment= '' ;"; - String resultSql="CREATE TABLE `test_idb`.`acct_certificate` (\n" + + String resultSql = "CREATE TABLE `test_idb`.`acct_certificate` (\n" + "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '', \n" + "\t`nodeid` varchar(5) CHARSET `gbk` COLLATE `gbk_chinese_ci` NULL COMMENT '', \n" + "\t`certificatetype` char(1) CHARSET `gbk` COLLATE `gbk_chinese_ci` NULL COMMENT '', \n" + @@ -38,17 +37,17 @@ public void testCreateCharset(){ } - public void testAlterCharset(){ - String targetSql="ALTER TABLE acct_certificate MODIFY COLUMN `nodeid` varchar(5) CHARSET `gbk` COLLATE `gbk_chinese_ci` NULL COMMENT ''"; + public void testAlterCharset() { + String targetSql = "ALTER TABLE acct_certificate MODIFY COLUMN `nodeid` varchar(5) CHARSET `gbk` COLLATE `gbk_chinese_ci` NULL COMMENT ''"; - String resultSql="ALTER TABLE acct_certificate\n" + + String resultSql = "ALTER TABLE acct_certificate\n" + "\tMODIFY COLUMN `nodeid` varchar(5) CHARSET `gbk` COLLATE `gbk_chinese_ci` NULL COMMENT ''"; equal(targetSql, resultSql); } - private void equal(String targetSql,String resultSql){ - MySqlStatementParser parser=new MySqlStatementParser(targetSql); + private void equal(String targetSql, String resultSql) { + MySqlStatementParser parser = new MySqlStatementParser(targetSql); List sqlStatements = parser.parseStatementList(); System.out.println(sqlStatements.get(0).toString()); Assert.assertTrue(sqlStatements.get(0).toString().equals(resultSql)); diff --git a/src/test/java/com/alibaba/druid/sql/parser/PGIntervalSQLTest.java b/src/test/java/com/alibaba/druid/sql/parser/PGIntervalSQLTest.java index baf363edf0..cafc40474d 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/PGIntervalSQLTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/PGIntervalSQLTest.java @@ -9,26 +9,25 @@ * Created by tianzhen.wtz on 2014/12/26 0026 20:44. * 类说明： */ -public class PGIntervalSQLTest extends TestCase{ +public class PGIntervalSQLTest extends TestCase { + public void testIntervalSQL() { + String sql1 = "select timestamp '2001-09-28 01:00' + interval '23 hours'"; + String sql1Result = "SELECT TIMESTAMP '2001-09-28 01:00' + INTERVAL '23 hours'"; + equal(sql1, sql1Result); - public void testIntervalSQL(){ - String sql1="select timestamp '2001-09-28 01:00' + interval '23 hours'"; - String sql1Result="SELECT TIMESTAMP '2001-09-28 01:00' + INTERVAL '23 hours'"; - equal(sql1,sql1Result); + String sql2 = "select interval '1 day' - interval '1 hour'"; + String sql2Result = "SELECT INTERVAL '1 day' - INTERVAL '1 hour'"; + equal(sql2, sql2Result); - String sql2="select interval '1 day' - interval '1 hour'"; - String sql2Result="SELECT INTERVAL '1 day' - INTERVAL '1 hour'"; - equal(sql2,sql2Result); - - String sql3="select date_part('month', interval '2 years 3 months')"; - String sql3Result="SELECT date_part('month', INTERVAL '2 years 3 months')"; - equal(sql3,sql3Result); + String sql3 = "select date_part('month', interval '2 years 3 months')"; + String sql3Result = "SELECT date_part('month', INTERVAL '2 years 3 months')"; + equal(sql3, sql3Result); } - private void equal(String targetSql,String resultSql){ - PGSQLStatementParser parser=new PGSQLStatementParser(targetSql); + private void equal(String targetSql, String resultSql) { + PGSQLStatementParser parser = new PGSQLStatementParser(targetSql); PGSelectStatement statement = parser.parseSelect(); Assert.assertTrue(statement.toString().equals(resultSql)); diff --git a/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java b/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java index 6b3f88e982..35a66a182a 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java @@ -31,7 +31,6 @@ import com.alibaba.druid.util.JdbcUtils; public class PerfTest extends TestCase { - public void test_perf() throws Exception { for (int i = 0; i < 10; ++i) { // perf("SELECT * FROM my_table WHERE TRUNC(SYSDATE) = DATE '2002-10-03';"); diff --git a/src/test/java/com/alibaba/druid/sql/parser/SQLLexerTest2.java b/src/test/java/com/alibaba/druid/sql/parser/SQLLexerTest2.java index f3168dd013..4769a78d59 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/SQLLexerTest2.java +++ b/src/test/java/com/alibaba/druid/sql/parser/SQLLexerTest2.java @@ -23,11 +23,10 @@ import java.util.List; public class SQLLexerTest2 extends TestCase { - public void test_lexer() throws Exception { String sql = "SELECT * FROM T WHERE F1 = ? ORDER BY F2"; Lexer lexer = new Lexer(sql); - for (;;) { + for (; ; ) { lexer.nextToken(); Token tok = lexer.token(); @@ -38,7 +37,7 @@ public void test_lexer() throws Exception { } else { System.out.println(tok.name() + "\t\t\t" + tok.name); } - + if (tok == Token.WHERE) { System.out.println("where pos : " + lexer.pos()); } @@ -48,11 +47,11 @@ public void test_lexer() throws Exception { } } } - + public void test_lexer2() throws Exception { String sql = "SELECT substr('''a''bc',0,3) FROM dual"; Lexer lexer = new Lexer(sql); - for (;;) { + for (; ; ) { lexer.nextToken(); Token tok = lexer.token(); @@ -62,8 +61,7 @@ public void test_lexer2() throws Exception { System.out.println(tok.name() + "\t\t" + lexer.numberString()); } else if (tok == Token.LITERAL_CHARS) { System.out.println(tok.name() + "\t\t" + lexer.stringVal()); - } - else { + } else { System.out.println(tok.name() + "\t\t\t" + tok.name); } @@ -73,14 +71,14 @@ public void test_lexer2() throws Exception { } } - public void test_lexer_error_info(){ - String line1 ="SELECT *"; - String line2 ="FORM a"; - String sql = line1 + "\n"+line2; - MySqlStatementParser parser=new MySqlStatementParser(sql); + public void test_lexer_error_info() { + String line1 = "SELECT *"; + String line2 = "FORM a"; + String sql = line1 + "\n" + line2; + MySqlStatementParser parser = new MySqlStatementParser(sql); Exception exception = null; try { - parser.parseStatementList(); + parser.parseStatementList(); } catch (Exception e) { exception = e; } @@ -88,8 +86,7 @@ public void test_lexer_error_info(){ Assert.assertEquals("not supported.pos 13, line 2, column 2, token IDENTIFIER FORM", exception.getMessage()); - } - + } diff --git a/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java b/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java index b1d627b389..725f26c4ce 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; public class SQLMergeTest extends TestCase { - protected String sql; protected void setUp() throws Exception { @@ -66,7 +65,6 @@ void perf() { private String merge() { StringBuilder out = new StringBuilder(); OracleOutputVisitor visitor = new OracleOutputVisitor(out) { - public boolean visit(SQLInListExpr x) { x.getExpr().accept(this); @@ -94,7 +92,6 @@ private String merge2() { StringBuilder out = new StringBuilder(); MySqlOutputVisitor visitor = new MySqlOutputVisitor(out) { - public boolean visit(SQLInListExpr x) { x.getExpr().accept(this); diff --git a/src/test/java/com/alibaba/druid/sql/parser/SqlserverGroupByTest.java b/src/test/java/com/alibaba/druid/sql/parser/SqlserverGroupByTest.java index ac71656209..bcece580e0 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/SqlserverGroupByTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/SqlserverGroupByTest.java @@ -8,16 +8,14 @@ /** * Created by magicdoom on 2016/8/16. */ -public class SqlserverGroupByTest extends TestCase -{ +public class SqlserverGroupByTest extends TestCase { public void testGroupBy() throws Exception { String sql = "SELECT a.workflowid, COUNT(1) FROM workflow_base a GROUP BY a.workflowid"; SQLStatementParser parser = new SQLServerStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatement(); // try { stmt.toString(); - } catch (ClassCastException e) - { + } catch (ClassCastException e) { Assert.fail(e.getMessage()); } diff --git a/src/test/java/com/alibaba/druid/sql/performance/TestSelectPerformance.java b/src/test/java/com/alibaba/druid/sql/performance/TestSelectPerformance.java index b79351e678..78590ef9f3 100644 --- a/src/test/java/com/alibaba/druid/sql/performance/TestSelectPerformance.java +++ b/src/test/java/com/alibaba/druid/sql/performance/TestSelectPerformance.java @@ -25,9 +25,8 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; public class TestSelectPerformance extends TestCase { - private final int COUNT = 1000 * 1000; - private String sql = "SELECT distinct a.id \"id\", a.col \"col\", a.position \"position\", a.panel_id \"panelId\" FROM (select * from view_position_info) a LEFT JOIN db1.view_portal b ON a.panel_id = b.panel_id LEFT JOIN (select * from view_portal_panel) c ON a.panel_id = c.panel_id WHERE b.user_id = ? and ((b.is_grid='y' and c.param_name='is_hidden' and c.param_value='false') or b.is_grid != 'y') and b.user_id in (select user_id from table1 where id = 1) ORDER BY a.col ASC, a.position ASC"; + private String sql = "SELECT distinct a.id \"id\", a.col \"col\", a.position \"position\", a.panel_id \"panelId\" FROM (select * from view_position_info) a LEFT JOIN db1.view_portal b ON a.panel_id = b.panel_id LEFT JOIN (select * from view_portal_panel) c ON a.panel_id = c.panel_id WHERE b.user_id = ? and ((b.is_grid='y' and c.param_name='is_hidden' and c.param_value='false') or b.is_grid != 'y') and b.user_id in (select user_id from table1 where id = 1) ORDER BY a.col ASC, a.position ASC"; public void test_simple() throws Exception { for (int i = 0; i < 5; ++i) { @@ -38,8 +37,8 @@ public void test_simple() throws Exception { private void f() throws Exception { long start = System.currentTimeMillis(); for (int i = 0; i < COUNT; ++i) { - List statementList = new SQLStatementParser(sql).parseStatementList(); - + List statementList = new SQLStatementParser(sql).parseStatementList(); + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); statementList.get(0).accept(visitor); // stmtList.toString(); diff --git a/src/test/java/com/alibaba/druid/sql/test/TestUtils.java b/src/test/java/com/alibaba/druid/sql/test/TestUtils.java index cf87f7a3d5..71420323a9 100644 --- a/src/test/java/com/alibaba/druid/sql/test/TestUtils.java +++ b/src/test/java/com/alibaba/druid/sql/test/TestUtils.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; public class TestUtils { - public static String outputOracle(List stmtList) { StringBuilder out = new StringBuilder(); OracleOutputVisitor visitor = new OracleOutputVisitor(out); @@ -73,7 +72,7 @@ public static String output(List stmtList) { return out.toString(); } - + public static long getYoungGC() { try { // java.lang:type=GarbageCollector,name=G1 Young Generation @@ -95,7 +94,7 @@ public static long getYoungGC() { throw new RuntimeException("error"); } } - + public static long getYoungGCTime() { try { MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); diff --git a/src/test/java/com/alibaba/druid/stat/AtomicMemoryTest.java b/src/test/java/com/alibaba/druid/stat/AtomicMemoryTest.java index 99b9514caf..c15041853a 100644 --- a/src/test/java/com/alibaba/druid/stat/AtomicMemoryTest.java +++ b/src/test/java/com/alibaba/druid/stat/AtomicMemoryTest.java @@ -7,7 +7,6 @@ import junit.framework.TestCase; public class AtomicMemoryTest extends TestCase { - public void test_0() throws Exception { AtomicLong item = new AtomicLong(); gc(); diff --git a/src/test/java/com/alibaba/druid/stat/HashMapMemoryTest.java b/src/test/java/com/alibaba/druid/stat/HashMapMemoryTest.java index 8f12624717..3b0b0e2203 100644 --- a/src/test/java/com/alibaba/druid/stat/HashMapMemoryTest.java +++ b/src/test/java/com/alibaba/druid/stat/HashMapMemoryTest.java @@ -8,7 +8,6 @@ import junit.framework.TestCase; public class HashMapMemoryTest extends TestCase { - public void test_0() throws Exception { HashMap item = new HashMap(); gc(); diff --git a/src/test/java/com/alibaba/druid/stat/HistogramMemoryTest.java b/src/test/java/com/alibaba/druid/stat/HistogramMemoryTest.java index 4406215fa7..ea998b37aa 100644 --- a/src/test/java/com/alibaba/druid/stat/HistogramMemoryTest.java +++ b/src/test/java/com/alibaba/druid/stat/HistogramMemoryTest.java @@ -6,19 +6,18 @@ import junit.framework.TestCase; public class HistogramMemoryTest extends TestCase { - public void test_0() throws Exception { long memoryStart = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed(); - + final int COUNT = 1024 * 1; Object[] items = new Object[COUNT]; for (int i = 0; i < COUNT; ++i) { - items[i] = new JdbcSqlStat(""); + items[i] = new JdbcSqlStat(""); // items[i] = Histogram.makeHistogram(20); } - + long memoryEnd = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed(); - + System.out.println("memory used : " + NumberFormat.getInstance().format(memoryEnd - memoryStart)); } } diff --git a/src/test/java/com/alibaba/druid/stat/JdbcSqlStatTest1.java b/src/test/java/com/alibaba/druid/stat/JdbcSqlStatTest1.java index ce0978f7af..d4bffa378e 100644 --- a/src/test/java/com/alibaba/druid/stat/JdbcSqlStatTest1.java +++ b/src/test/java/com/alibaba/druid/stat/JdbcSqlStatTest1.java @@ -6,7 +6,6 @@ import junit.framework.TestCase; public class JdbcSqlStatTest1 extends TestCase { - private JdbcDataSourceStat dataSourceStat = new JdbcDataSourceStat("", ""); public void test_0() throws Exception { diff --git a/src/test/java/com/alibaba/druid/stat/MemoryTest.java b/src/test/java/com/alibaba/druid/stat/MemoryTest.java index bd758739da..bc8542ab95 100644 --- a/src/test/java/com/alibaba/druid/stat/MemoryTest.java +++ b/src/test/java/com/alibaba/druid/stat/MemoryTest.java @@ -6,7 +6,6 @@ import junit.framework.TestCase; public class MemoryTest extends TestCase { - public void test_0() throws Exception { A item = new A(); gc(); diff --git a/src/test/java/com/alibaba/druid/stat/PerfTest.java b/src/test/java/com/alibaba/druid/stat/PerfTest.java index 0810b858eb..c680ad3592 100644 --- a/src/test/java/com/alibaba/druid/stat/PerfTest.java +++ b/src/test/java/com/alibaba/druid/stat/PerfTest.java @@ -6,7 +6,6 @@ import junit.framework.TestCase; public class PerfTest extends TestCase { - public void test_0() throws Exception { for (int i = 0; i < 3; ++i) { long startMillis = System.currentTimeMillis(); @@ -31,8 +30,7 @@ private void b() { } public static class A { - - private volatile long value; + private volatile long value; static final AtomicLongFieldUpdater updater = AtomicLongFieldUpdater.newUpdater(A.class, "value"); @@ -46,7 +44,6 @@ public long getValue() { } public static class B { - private final AtomicLong value = new AtomicLong(); public long incrementAndGet() { diff --git a/src/test/java/com/alibaba/druid/stat/StatAnnotationTest.java b/src/test/java/com/alibaba/druid/stat/StatAnnotationTest.java index ef166d3482..a8b9f67b4a 100644 --- a/src/test/java/com/alibaba/druid/stat/StatAnnotationTest.java +++ b/src/test/java/com/alibaba/druid/stat/StatAnnotationTest.java @@ -17,26 +17,24 @@ import com.alibaba.druid.support.spring.stat.SpringStatManager; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "classpath:/com/alibaba/druid/stat/spring-config-stat-annotation.xml" }) +@ContextConfiguration(locations = {"classpath:/com/alibaba/druid/stat/spring-config-stat-annotation.xml"}) public class StatAnnotationTest extends TestCase { + @Resource + private UserService userService; + + @Test + public void test_0() throws InterruptedException { + userService.save(); + + List> result = SpringStatManager.getInstance().getMethodStatData(); + Assert.assertNotNull(result); + Assert.assertEquals(1, result.size()); + + Map statItem = result.get(0); + + Assert.assertEquals("com.alibaba.druid.stat.spring.UserService", statItem.get("Class")); + Assert.assertEquals("save()", statItem.get("Method")); + Assert.assertEquals(1L, statItem.get("ExecuteCount")); + } - @Resource - private UserService userService; - - @Test - public void test_0() throws InterruptedException{ - - userService.save(); - - List> result = SpringStatManager.getInstance().getMethodStatData(); - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); - - Map statItem = result.get(0); - - Assert.assertEquals("com.alibaba.druid.stat.spring.UserService", statItem.get("Class")); - Assert.assertEquals("save()", statItem.get("Method")); - Assert.assertEquals(1L, statItem.get("ExecuteCount")); - } - } diff --git a/src/test/java/com/alibaba/druid/stat/TestBeidou.java b/src/test/java/com/alibaba/druid/stat/TestBeidou.java index 020545cedf..de55da8624 100644 --- a/src/test/java/com/alibaba/druid/stat/TestBeidou.java +++ b/src/test/java/com/alibaba/druid/stat/TestBeidou.java @@ -22,7 +22,6 @@ import junit.framework.TestCase; public class TestBeidou extends TestCase { - public void test_0() throws Exception { String url = "jdbc:mysql://172.22.32.5/beidou?useUnicode=true&characterEncoding=UTF-8"; Class.forName("com.mysql.jdbc.Driver"); diff --git a/src/test/java/com/alibaba/druid/stat/TestOracle.java b/src/test/java/com/alibaba/druid/stat/TestOracle.java index 0d6014647a..7adb9ee0d2 100644 --- a/src/test/java/com/alibaba/druid/stat/TestOracle.java +++ b/src/test/java/com/alibaba/druid/stat/TestOracle.java @@ -22,7 +22,6 @@ import junit.framework.TestCase; public class TestOracle extends TestCase { - public void test_0() throws Exception { String url = "jdbc:oracle:thin:@a.b.c.d:1521:orcl"; Class.forName("oracle.jdbc.driver.OracleDriver"); diff --git a/src/test/java/com/alibaba/druid/stat/WebSessionStatTest.java b/src/test/java/com/alibaba/druid/stat/WebSessionStatTest.java index 43125d5af4..1b07aff6ad 100644 --- a/src/test/java/com/alibaba/druid/stat/WebSessionStatTest.java +++ b/src/test/java/com/alibaba/druid/stat/WebSessionStatTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.support.http.stat.WebSessionStat; public class WebSessionStatTest extends TestCase { - public void test_0() throws Exception { WebSessionStat item = new WebSessionStat("1b959a6db8489c4c7ef7bf0bd743ab52"); gc(); diff --git a/src/test/java/com/alibaba/druid/stat/WebURIStatMemoryTest.java b/src/test/java/com/alibaba/druid/stat/WebURIStatMemoryTest.java index 260d5d8401..5022eae4b9 100644 --- a/src/test/java/com/alibaba/druid/stat/WebURIStatMemoryTest.java +++ b/src/test/java/com/alibaba/druid/stat/WebURIStatMemoryTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.support.http.stat.WebURIStat; public class WebURIStatMemoryTest extends TestCase { - public void test_0() throws Exception { WebURIStat item = new WebURIStat(""); gc(); diff --git a/src/test/java/com/alibaba/druid/stat/spring/UserService.java b/src/test/java/com/alibaba/druid/stat/spring/UserService.java index aa9ab48f11..67a0a4e265 100644 --- a/src/test/java/com/alibaba/druid/stat/spring/UserService.java +++ b/src/test/java/com/alibaba/druid/stat/spring/UserService.java @@ -3,7 +3,6 @@ import com.alibaba.druid.support.spring.stat.annotation.Stat; public interface UserService { - - @Stat + @Stat public void save(); } diff --git a/src/test/java/com/alibaba/druid/stat/spring/UserServiceImpl.java b/src/test/java/com/alibaba/druid/stat/spring/UserServiceImpl.java index 361c9f40b0..62ad41ddb9 100644 --- a/src/test/java/com/alibaba/druid/stat/spring/UserServiceImpl.java +++ b/src/test/java/com/alibaba/druid/stat/spring/UserServiceImpl.java @@ -4,7 +4,6 @@ @Component("userService") public class UserServiceImpl implements UserService { - @Override public void save() { // do nothing diff --git a/src/test/java/com/alibaba/druid/test/AlibDriverTest.java b/src/test/java/com/alibaba/druid/test/AlibDriverTest.java index 43b0166645..b20a50a129 100644 --- a/src/test/java/com/alibaba/druid/test/AlibDriverTest.java +++ b/src/test/java/com/alibaba/druid/test/AlibDriverTest.java @@ -7,7 +7,6 @@ import java.sql.DriverManager; public class AlibDriverTest extends TestCase { - public void test_for_alib() throws Exception { String url = "jdbc:mysql://127.0.0.1:8507"; Connection conn = DriverManager.getConnection(url, "root", "root"); diff --git a/src/test/java/com/alibaba/druid/test/FNVTest.java b/src/test/java/com/alibaba/druid/test/FNVTest.java index 9a14ae69ab..b0d06b5422 100644 --- a/src/test/java/com/alibaba/druid/test/FNVTest.java +++ b/src/test/java/com/alibaba/druid/test/FNVTest.java @@ -27,7 +27,7 @@ public long fnv(String text) { return hash; } - public long fnv_64( String text) { + public long fnv_64(String text) { long hash = 0xcbf29ce484222325L; return fnv_64(hash, text); } diff --git a/src/test/java/com/alibaba/druid/test/NutzTransactionTest.java b/src/test/java/com/alibaba/druid/test/NutzTransactionTest.java index d3d215f443..24a46147f5 100644 --- a/src/test/java/com/alibaba/druid/test/NutzTransactionTest.java +++ b/src/test/java/com/alibaba/druid/test/NutzTransactionTest.java @@ -14,15 +14,14 @@ import com.alibaba.druid.pool.DruidDataSource; public class NutzTransactionTest extends TestCase { - private DataSource dataSource; protected void setUp() throws Exception { - DruidDataSource dataSource = new DruidDataSource(); - dataSource.setUrl("jdbc:jtds:sqlserver://192.168.1.105/petstore"); - dataSource.setUsername("sa"); - dataSource.setPassword("hello"); - dataSource.setFilters("log4j"); + DruidDataSource dataSource = new DruidDataSource(); + dataSource.setUrl("jdbc:jtds:sqlserver://192.168.1.105/petstore"); + dataSource.setUsername("sa"); + dataSource.setPassword("hello"); + dataSource.setFilters("log4j"); // BasicDataSource dataSource = new BasicDataSource(); // dataSource.setDriverClassName("net.sourceforge.jtds.jdbc.Driver"); @@ -44,7 +43,6 @@ public void test_trans() throws Exception { void doTran1(final Dao dao) { try { Trans.exec(new Atom() { - @Override public void run() { dao.insert("[test]", Chain.make("name", "1")); @@ -59,7 +57,6 @@ public void run() { void doTran2(final Dao dao) { try { Trans.exec(new Atom() { - @Override public void run() { dao.insert("[test]", Chain.make("name", "1")); diff --git a/src/test/java/com/alibaba/druid/test/OdpsSelectTest6.java b/src/test/java/com/alibaba/druid/test/OdpsSelectTest6.java index 2f15cdba67..019eb7e135 100644 --- a/src/test/java/com/alibaba/druid/test/OdpsSelectTest6.java +++ b/src/test/java/com/alibaba/druid/test/OdpsSelectTest6.java @@ -29,12 +29,11 @@ import junit.framework.TestCase; public class OdpsSelectTest6 extends TestCase { - public void test_distribute_by() throws Exception { File file = new File("/Users/wenshao/Downloads/datasafe_base_dev.udf_test.txt"); String sql = FileUtils.readFileToString(file, "UTF-8"); - - + + SQLStatementParser parser = new OdpsStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -43,11 +42,11 @@ public void test_distribute_by() throws Exception { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - + // Assert.assertEquals("SELECT *" // + "\nFROM t" // + "\nWHERE ds = '20160303'" // + "\n\tAND hour IN ('18')", SQLUtils.formatOdps(sql)); } - + } diff --git a/src/test/java/com/alibaba/druid/test/QuartzTest.java b/src/test/java/com/alibaba/druid/test/QuartzTest.java index c6398dc522..a194f2f846 100644 --- a/src/test/java/com/alibaba/druid/test/QuartzTest.java +++ b/src/test/java/com/alibaba/druid/test/QuartzTest.java @@ -10,11 +10,10 @@ import org.quartz.impl.StdSchedulerFactory; public class QuartzTest extends PoolTestCase { - StdSchedulerFactory factory; StdScheduler scheduler; Properties props; - + @Override protected void setUp() throws Exception { super.setUp(); @@ -26,7 +25,7 @@ protected void setUp() throws Exception { scheduler.getContext(); } - + protected void tearDown() throws Exception { scheduler.shutdown(); @@ -34,7 +33,7 @@ protected void tearDown() throws Exception { Thread.sleep(1000 * 1000); super.tearDown(); } - + public void testQuartz() throws Exception { scheduler.start(); } diff --git a/src/test/java/com/alibaba/druid/test/ThreadLocalCache.java b/src/test/java/com/alibaba/druid/test/ThreadLocalCache.java index 972ddc3503..12a648f079 100644 --- a/src/test/java/com/alibaba/druid/test/ThreadLocalCache.java +++ b/src/test/java/com/alibaba/druid/test/ThreadLocalCache.java @@ -3,7 +3,6 @@ import java.security.MessageDigest; public class ThreadLocalCache { - public static void main(String[] args) throws Exception { String str = "\t\n" + "If I see the codeof getInstance(), it doesn't seem to create new object, rather it calls Security to get the object Object[] objs = Security.getImpl I wrote test case below: MessageDigest messageDigest1 = MessageDigest.getInstance(\"SHA-1\"); MessageDigest messageDigest2 = MessageDigest.getInstance(\"SHA-1\"); // update and digest and saw that both the messageDigest objects are different, as well their inner objects/buffers are also different. So, I guess ThreadLocal should work. And yes, it is a web server with thread pool. I will use ThreadLocal. Thanks, – Anil Padia Jul 10 '13 at 8:58"; diff --git a/src/test/java/com/alibaba/druid/test/util/OracleMockConnection.java b/src/test/java/com/alibaba/druid/test/util/OracleMockConnection.java index 93ef2d7471..6c20ff272d 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleMockConnection.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleMockConnection.java @@ -57,14 +57,13 @@ import com.alibaba.druid.mock.MockDriver; public class OracleMockConnection extends MockConnection implements oracle.jdbc.OracleConnection { - private int defaultRowPrefetch = 10; - public OracleMockConnection(){ + public OracleMockConnection() { super(); } - public OracleMockConnection(MockDriver driver, String url, Properties connectProperties){ + public OracleMockConnection(MockDriver driver, String url, Properties connectProperties) { super(driver, url, connectProperties); String val = (String) connectProperties.get("defaultRowPrefetch"); @@ -105,17 +104,14 @@ public void clearAllApplicationContext(String arg0) throws SQLException { @Override public void addLogicalTransactionIdEventListener(LogicalTransactionIdEventListener logicalTransactionIdEventListener) throws SQLException { - } @Override public void addLogicalTransactionIdEventListener(LogicalTransactionIdEventListener logicalTransactionIdEventListener, Executor executor) throws SQLException { - } @Override public void removeLogicalTransactionIdEventListener(LogicalTransactionIdEventListener logicalTransactionIdEventListener) throws SQLException { - } @Override @@ -150,7 +146,6 @@ public boolean attachServerConnection() throws SQLException { @Override public void detachServerConnection(String s) throws SQLException { - } @Override @@ -165,12 +160,10 @@ public DRCPState getDRCPState() throws SQLException { @Override public void beginRequest() throws SQLException { - } @Override public void endRequest() throws SQLException { - } @Override @@ -180,7 +173,6 @@ public boolean setShardingKeyIfValid(OracleShardingKey oracleShardingKey, Oracle @Override public void setShardingKey(OracleShardingKey oracleShardingKey, OracleShardingKey oracleShardingKey1) throws SQLException { - } @Override @@ -190,7 +182,6 @@ public boolean setShardingKeyIfValid(OracleShardingKey oracleShardingKey, int i) @Override public void setShardingKey(OracleShardingKey oracleShardingKey) throws SQLException { - } @Override @@ -698,7 +689,7 @@ public void putDescriptor(String arg0, Object arg1) throws SQLException { } public void registerConnectionCacheCallback(OracleConnectionCacheCallback arg0, Object arg1, int arg2) - throws SQLException { + throws SQLException { // TODO Auto-generated method stub } @@ -863,7 +854,7 @@ public void shutdown(int arg0) throws SQLException { @Override public void commit(EnumSet arg0) throws SQLException { // TODO Auto-generated method stub - + } @Override @@ -881,7 +872,7 @@ public AQMessage dequeue(String arg0, AQDequeueOptions arg1, String arg2) throws @Override public void enqueue(String arg0, AQEnqueueOptions arg1, AQMessage arg2) throws SQLException { // TODO Auto-generated method stub - + } @Override @@ -892,7 +883,7 @@ public DatabaseChangeRegistration getDatabaseChangeRegistration(int arg0) throws @Override public AQNotificationRegistration[] registerAQNotification(String[] arg0, Properties[] arg1, Properties arg2) - throws SQLException { + throws SQLException { // TODO Auto-generated method stub return null; } @@ -906,29 +897,28 @@ public DatabaseChangeRegistration registerDatabaseChangeNotification(Properties @Override public void shutdown(DatabaseShutdownMode arg0) throws SQLException { // TODO Auto-generated method stub - + } @Override public void startup(DatabaseStartupMode arg0) throws SQLException { // TODO Auto-generated method stub - + } @Override public void startup(DatabaseStartupMode databaseStartupMode, String s) throws SQLException { - } @Override public void unregisterAQNotification(AQNotificationRegistration arg0) throws SQLException { // TODO Auto-generated method stub - + } @Override public void unregisterDatabaseChangeNotification(DatabaseChangeRegistration arg0) throws SQLException { // TODO Auto-generated method stub - + } } diff --git a/src/test/java/com/alibaba/druid/test/util/OracleMockConnectionJdbc3.java b/src/test/java/com/alibaba/druid/test/util/OracleMockConnectionJdbc3.java index 4bb883af82..4ad6037f2f 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleMockConnectionJdbc3.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleMockConnectionJdbc3.java @@ -7,11 +7,10 @@ public class OracleMockConnectionJdbc3 extends OracleMockConnection { - - public OracleMockConnectionJdbc3(MockDriver driver, String url, Properties connectProperties){ + public OracleMockConnectionJdbc3(MockDriver driver, String url, Properties connectProperties) { super(driver, url, connectProperties); } - + @Override public T unwrap(Class iface) throws SQLException { throw new UnsupportedOperationException(); diff --git a/src/test/java/com/alibaba/druid/test/util/OracleMockDriver.java b/src/test/java/com/alibaba/druid/test/util/OracleMockDriver.java index c6fa49f4a6..5ba131e2fd 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleMockDriver.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleMockDriver.java @@ -29,7 +29,7 @@ public class OracleMockDriver extends MockDriver { public Connection connect(String url, Properties info) throws SQLException { return new OracleMockConnection(this, url, info); } - + @Override public int getMajorVersion() { return 11; @@ -39,11 +39,11 @@ public int getMajorVersion() { public int getMinorVersion() { return 0; } - + public MockResultSet createMockResultSet(MockStatementBase stmt) { return new OracleMockResultSet(stmt); } - + public OracleMockPreparedStatement createMockPreparedStatement(MockConnection conn, String sql) { return new OracleMockPreparedStatement((OracleMockConnection) conn, sql); } diff --git a/src/test/java/com/alibaba/druid/test/util/OracleMockDriverJdbc3.java b/src/test/java/com/alibaba/druid/test/util/OracleMockDriverJdbc3.java index 0bfa230de9..333851e1fa 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleMockDriverJdbc3.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleMockDriverJdbc3.java @@ -29,7 +29,7 @@ public class OracleMockDriverJdbc3 extends MockDriver { public Connection connect(String url, Properties info) throws SQLException { return new OracleMockConnectionJdbc3(this, url, info); } - + @Override public int getMajorVersion() { return 10; @@ -39,11 +39,11 @@ public int getMajorVersion() { public int getMinorVersion() { return 0; } - + public MockResultSet createMockResultSet(MockStatementBase stmt) { return new OracleMockResultSetJdbc3(stmt); } - + public OracleMockPreparedStatement createMockPreparedStatement(MockConnection conn, String sql) { return new OracleMockPreparedStatementJdbc3((OracleMockConnection) conn, sql); } diff --git a/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatement.java b/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatement.java index 743d11b5fc..25d17cc992 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatement.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatement.java @@ -63,11 +63,10 @@ public class OracleMockPreparedStatement extends MockPreparedStatement implements oracle.jdbc.internal.OraclePreparedStatement { - private int executeBatch = 50; private int rowPrefetch; - public OracleMockPreparedStatement(OracleMockConnection conn, String sql){ + public OracleMockPreparedStatement(OracleMockConnection conn, String sql) { super(conn, sql); this.rowPrefetch = conn.getDefaultRowPrefetch(); } @@ -778,7 +777,6 @@ public long getChecksum() throws SQLException { @Override public void registerBindChecksumListener(BindChecksumListener bindChecksumListener) throws SQLException { - } @Override @@ -872,127 +870,127 @@ public void setInternalBytes(int arg0, byte[] arg1, int arg2) throws SQLExceptio @Override public void setAsciiStreamAtName(String arg0, InputStream arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setAsciiStreamAtName(String arg0, InputStream arg1, long arg2) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setBinaryStreamAtName(String arg0, InputStream arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setBinaryStreamAtName(String arg0, InputStream arg1, long arg2) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setBlobAtName(String arg0, InputStream arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setBlobAtName(String arg0, InputStream arg1, long arg2) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setCharacterStreamAtName(String arg0, Reader arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setCharacterStreamAtName(String arg0, Reader arg1, long arg2) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setClobAtName(String arg0, Reader arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setClobAtName(String arg0, Reader arg1, long arg2) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setDateAtName(String arg0, Date arg1, Calendar arg2) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setNCharacterStreamAtName(String arg0, Reader arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setNCharacterStreamAtName(String arg0, Reader arg1, long arg2) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setNClobAtName(String arg0, NClob arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setNClobAtName(String arg0, Reader arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setNClobAtName(String arg0, Reader arg1, long arg2) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setNStringAtName(String arg0, String arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setRowIdAtName(String arg0, RowId arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setSQLXMLAtName(String arg0, SQLXML arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setTimeAtName(String arg0, Time arg1, Calendar arg2) throws SQLException { // TODO Auto-generated method stub - + } @Override public void setDatabaseChangeRegistration(DatabaseChangeRegistration arg0) throws SQLException { // TODO Auto-generated method stub - + } @Override @@ -1004,7 +1002,7 @@ public SqlKind getSqlKind() throws SQLException { @Override public void setSnapshotSCN(long arg0) throws SQLException { // TODO Auto-generated method stub - + } @Override @@ -1019,7 +1017,6 @@ public byte[] getCompileKey() throws SQLException { @Override public void setACProxy(Object o) { - } @Override diff --git a/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatementJdbc3.java b/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatementJdbc3.java index feb9fae76b..fa7c245fd5 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatementJdbc3.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatementJdbc3.java @@ -4,8 +4,7 @@ public class OracleMockPreparedStatementJdbc3 extends OracleMockPreparedStatement { - - public OracleMockPreparedStatementJdbc3(OracleMockConnection conn, String sql){ + public OracleMockPreparedStatementJdbc3(OracleMockConnection conn, String sql) { super(conn, sql); } diff --git a/src/test/java/com/alibaba/druid/test/util/OracleMockResultSet.java b/src/test/java/com/alibaba/druid/test/util/OracleMockResultSet.java index 0d06709ef3..c284cebfe9 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleMockResultSet.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleMockResultSet.java @@ -33,8 +33,7 @@ public class OracleMockResultSet extends MockResultSet implements OracleResultSet { - - public OracleMockResultSet(Statement statement){ + public OracleMockResultSet(Statement statement) { super(statement); } @@ -315,193 +314,193 @@ public TIMESTAMPTZ getTIMESTAMPTZ(String arg0) throws SQLException { @Override public void updateARRAY(int arg0, ARRAY arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateARRAY(String arg0, ARRAY arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateBFILE(int arg0, BFILE arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateBFILE(String arg0, BFILE arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateBLOB(int arg0, BLOB arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateBLOB(String arg0, BLOB arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateBfile(int arg0, BFILE arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateBfile(String arg0, BFILE arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateCHAR(int arg0, CHAR arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateCHAR(String arg0, CHAR arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateCLOB(int arg0, CLOB arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateCLOB(String arg0, CLOB arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateCustomDatum(int arg0, CustomDatum arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateCustomDatum(String arg0, CustomDatum arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateDATE(int arg0, DATE arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateDATE(String arg0, DATE arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateINTERVALDS(int arg0, INTERVALDS arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateINTERVALYM(int arg0, INTERVALYM arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateNUMBER(int arg0, NUMBER arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateNUMBER(String arg0, NUMBER arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateORAData(int arg0, ORAData arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateORAData(String arg0, ORAData arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateOracleObject(int arg0, Datum arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateOracleObject(String arg0, Datum arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateRAW(int arg0, RAW arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateRAW(String arg0, RAW arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateREF(int arg0, REF arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateREF(String arg0, REF arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateROWID(int arg0, ROWID arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateROWID(String arg0, ROWID arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateSTRUCT(int arg0, STRUCT arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateSTRUCT(String arg0, STRUCT arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override @@ -522,19 +521,19 @@ public byte[] getRuntimeKey() throws SQLException { @Override public void updateTIMESTAMP(int arg0, TIMESTAMP arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateTIMESTAMPLTZ(int arg0, TIMESTAMPLTZ arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateTIMESTAMPTZ(int arg0, TIMESTAMPTZ arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override @@ -552,31 +551,31 @@ public AuthorizationIndicator getAuthorizationIndicator(String arg0) throws SQLE @Override public void updateINTERVALDS(String arg0, INTERVALDS arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateINTERVALYM(String arg0, INTERVALYM arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateTIMESTAMP(String arg0, TIMESTAMP arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateTIMESTAMPLTZ(String arg0, TIMESTAMPLTZ arg1) throws SQLException { // TODO Auto-generated method stub - + } @Override public void updateTIMESTAMPTZ(String arg0, TIMESTAMPTZ arg1) throws SQLException { // TODO Auto-generated method stub - + } } diff --git a/src/test/java/com/alibaba/druid/test/util/OracleMockResultSetJdbc3.java b/src/test/java/com/alibaba/druid/test/util/OracleMockResultSetJdbc3.java index a97164e921..ca8fc251ee 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleMockResultSetJdbc3.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleMockResultSetJdbc3.java @@ -5,8 +5,7 @@ public class OracleMockResultSetJdbc3 extends OracleMockResultSet { - - public OracleMockResultSetJdbc3(Statement statement){ + public OracleMockResultSetJdbc3(Statement statement) { super(statement); } diff --git a/src/test/java/com/alibaba/druid/test/util/OracleUtilsTest.java b/src/test/java/com/alibaba/druid/test/util/OracleUtilsTest.java index a69119c962..e527fdcf5d 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleUtilsTest.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleUtilsTest.java @@ -29,21 +29,20 @@ public class OracleUtilsTest extends TestCase { public void test_oracle() throws Exception { InvocationHandler handler = new InvocationHandler() { - @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if (method.getName().equals("pingDatabase")) { return 1; } - + return null; } - + }; - OracleConnection conn = (OracleConnection) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[] {OracleConnection.class}, handler); - + OracleConnection conn = (OracleConnection) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[]{OracleConnection.class}, handler); + Assert.assertNotNull(OracleUtils.unwrap(conn)); - + Assert.assertEquals(1, OracleUtils.pingDatabase(conn)); } } diff --git a/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java b/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java index e99a656bd4..046d9027cf 100644 --- a/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java +++ b/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java @@ -29,7 +29,6 @@ import org.junit.Test; public class MySqlResourceWallTest extends TestCase { - private String[] items; @@ -71,7 +70,6 @@ public void test_false() throws Exception { } - @Test public void test_lock_table() throws Exception { WallProvider provider = new MySqlWallProvider(); diff --git a/src/test/java/com/alibaba/druid/test/wall/ResourceTest.java b/src/test/java/com/alibaba/druid/test/wall/ResourceTest.java index 08dde7f39c..080521ad6a 100644 --- a/src/test/java/com/alibaba/druid/test/wall/ResourceTest.java +++ b/src/test/java/com/alibaba/druid/test/wall/ResourceTest.java @@ -12,7 +12,6 @@ import com.alibaba.druid.wall.spi.MySqlWallProvider; public class ResourceTest extends TestCase { - private String[] items; protected void setUp() throws Exception { @@ -29,7 +28,7 @@ public void test_xx() throws Exception { for (int i = 0; i < items.length; ++i) { String sql = items[i]; - + WallCheckResult result = provider.check(sql); if (result.getViolations().size() > 0) { Violation violation = result.getViolations().get(0); diff --git a/src/test/java/com/alibaba/druid/util/DropTables.java b/src/test/java/com/alibaba/druid/util/DropTables.java index aa0587c56f..c55b6952e3 100644 --- a/src/test/java/com/alibaba/druid/util/DropTables.java +++ b/src/test/java/com/alibaba/druid/util/DropTables.java @@ -6,5 +6,4 @@ * Created by wenshao on 16/07/2017. */ public class DropTables extends TestCase { - } diff --git a/src/test/java/com/alibaba/druid/util/JdbcUtilsTest.java b/src/test/java/com/alibaba/druid/util/JdbcUtilsTest.java index 71992f389e..e945d628f0 100644 --- a/src/test/java/com/alibaba/druid/util/JdbcUtilsTest.java +++ b/src/test/java/com/alibaba/druid/util/JdbcUtilsTest.java @@ -20,11 +20,10 @@ /** * test for support cobar driver - * + * * @author zhoujh */ public class JdbcUtilsTest extends TestCase { - /** * Test method for {@link com.alibaba.druid.util.JdbcUtils#getDbType(java.lang.String, java.lang.String)}. */ @@ -33,7 +32,7 @@ public void testGetDbType() { String dbType = JdbcUtils.getDbType(jdbcUrl, null); assertEquals("not support cobar driver, url like jdbc:cobar:...", DbType.mysql, dbType); } - + public void test_log4jdbc_mysql() { String jdbcUrl = "jdbc:log4jdbc:mysql://localhost:8066/test"; String dbType = JdbcUtils.getDbType(jdbcUrl, null); diff --git a/src/test/java/com/alibaba/druid/util/MapComparatorTest.java b/src/test/java/com/alibaba/druid/util/MapComparatorTest.java index f87d060e1e..402abfdb7a 100644 --- a/src/test/java/com/alibaba/druid/util/MapComparatorTest.java +++ b/src/test/java/com/alibaba/druid/util/MapComparatorTest.java @@ -23,7 +23,6 @@ import junit.framework.TestCase; public class MapComparatorTest extends TestCase { - private String orderByKey = "orderby"; public void test_comparator_date() throws Exception { @@ -54,21 +53,21 @@ private void test_comparator_array_0(boolean desc) throws Exception { Map map1 = new HashMap(); Map map2 = new HashMap(); - map1.put(orderByKey, new Date[] { new Date(now) }); - map2.put(orderByKey, new Date[] { new Date(now - 1) }); + map1.put(orderByKey, new Date[]{new Date(now)}); + map2.put(orderByKey, new Date[]{new Date(now - 1)}); Assert.assertEquals(!desc, comparator.compare(map1, map2) > 0); - map2.put(orderByKey, new Date[] { new Date(now) }); + map2.put(orderByKey, new Date[]{new Date(now)}); Assert.assertEquals(true, comparator.compare(map1, map2) == 0); - map2.put(orderByKey, new Date[] { new Date(now + 1) }); + map2.put(orderByKey, new Date[]{new Date(now + 1)}); Assert.assertEquals(!desc, comparator.compare(map1, map2) < 0); map2.put(orderByKey, null); Assert.assertEquals(!desc, comparator.compare(map1, map2) > 0); map1.put(orderByKey, null); - map2.put(orderByKey, new Date[] { new Date(now) }); + map2.put(orderByKey, new Date[]{new Date(now)}); Assert.assertEquals(!desc, comparator.compare(map1, map2) < 0); map1.put(orderByKey, null); diff --git a/src/test/java/com/alibaba/druid/util/ServletPathMathcherTest.java b/src/test/java/com/alibaba/druid/util/ServletPathMathcherTest.java index 9b902ba9d1..498f8591f5 100644 --- a/src/test/java/com/alibaba/druid/util/ServletPathMathcherTest.java +++ b/src/test/java/com/alibaba/druid/util/ServletPathMathcherTest.java @@ -22,7 +22,6 @@ public class ServletPathMathcherTest { - /** * PatternMatcher used in determining which paths to react to for a given request. */ @@ -30,8 +29,8 @@ public class ServletPathMathcherTest { @Test public void testStartsWithPattern() { - String[] bogusPatterns = { "/druid*", "/druid*/what*", "*/druid*" }; - String[] bogusSources = { "/druid", "/druid/index.html", "/druid*/what/xyu" }; + String[] bogusPatterns = {"/druid*", "/druid*/what*", "*/druid*"}; + String[] bogusSources = {"/druid", "/druid/index.html", "/druid*/what/xyu"}; boolean result = false; for (int i = 0; i < bogusSources.length; i++) { for (int j = 0; j < bogusPatterns.length; j++) { @@ -48,11 +47,11 @@ public void testStartsWithPattern() { result = false; } } - + @Test public void testEndsWithPattern() { - String[] bogusPatterns = { "*.html", "*.ico", "*.css" }; - String[] bogusSources = { "/index.html", "/favicon.ico", "/druid.css" }; + String[] bogusPatterns = {"*.html", "*.ico", "*.css"}; + String[] bogusSources = {"/index.html", "/favicon.ico", "/druid.css"}; boolean result = false; for (int i = 0; i < bogusSources.length; i++) { for (int j = 0; j < bogusPatterns.length; j++) { @@ -69,11 +68,11 @@ public void testEndsWithPattern() { result = false; } } - + @Test public void testEqualsPattern() { - String[] bogusPatterns = { "/index.html", "/favicon.ico", "/xyz" }; - String[] bogusSources = { "/index.html", "/favicon.ico", "/xyz" }; + String[] bogusPatterns = {"/index.html", "/favicon.ico", "/xyz"}; + String[] bogusSources = {"/index.html", "/favicon.ico", "/xyz"}; boolean result = false; for (int i = 0; i < bogusSources.length; i++) { for (int j = 0; j < bogusPatterns.length; j++) { @@ -90,11 +89,11 @@ public void testEqualsPattern() { result = false; } } - + @Test public void testPatternPriority() { - String[] bogusPatterns = { "*html*", "/favicon.ico*", "*html" }; - String[] bogusSources = { "*html/ok?", "/favicon.ico/ok?", "/index.html" }; + String[] bogusPatterns = {"*html*", "/favicon.ico*", "*html"}; + String[] bogusSources = {"*html/ok?", "/favicon.ico/ok?", "/index.html"}; boolean result = false; for (int i = 0; i < bogusSources.length; i++) { for (int j = 0; j < bogusPatterns.length; j++) { diff --git a/src/test/resources/DruidDriverConfig.xml b/src/test/resources/DruidDriverConfig.xml index d14c35f934..2b0cb54a6e 100644 --- a/src/test/resources/DruidDriverConfig.xml +++ b/src/test/resources/DruidDriverConfig.xml @@ -1,14 +1,14 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/test/resources/bvt/config/config-0.properties b/src/test/resources/bvt/config/config-0.properties index 56d080aaaa..a7eefae208 100644 --- a/src/test/resources/bvt/config/config-0.properties +++ b/src/test/resources/bvt/config/config-0.properties @@ -1,3 +1,3 @@ url=jdbc:mock:config-0 testOnBorrow=false -maxActive=10 \ No newline at end of file +maxActive=10 diff --git a/src/test/resources/bvt/config/config-1.properties b/src/test/resources/bvt/config/config-1.properties index 1d7457dc84..d795a9a125 100644 --- a/src/test/resources/bvt/config/config-1.properties +++ b/src/test/resources/bvt/config/config-1.properties @@ -1,4 +1,4 @@ url=jdbc:mock:config-1 testOnBorrow=false maxActive=11 -filters=stat,log4j \ No newline at end of file +filters=stat,log4j diff --git a/src/test/resources/bvt/config/config-2.properties b/src/test/resources/bvt/config/config-2.properties index 10540d6622..608b9c5ad5 100644 --- a/src/test/resources/bvt/config/config-2.properties +++ b/src/test/resources/bvt/config/config-2.properties @@ -1,4 +1,4 @@ url=jdbc:mock:config-2 testOnBorrow=false maxActive=12 -password=ns2B+nJLNaoXgGakWqqsP6tWu8ZN25D1FncyKCTB/hNup8LW0g/66iGyrkDBHf9tgPJ8QtLz+upQSyin2g4flg== \ No newline at end of file +password=ns2B+nJLNaoXgGakWqqsP6tWu8ZN25D1FncyKCTB/hNup8LW0g/66iGyrkDBHf9tgPJ8QtLz+upQSyin2g4flg== diff --git a/src/test/resources/bvt/config/config-3.properties b/src/test/resources/bvt/config/config-3.properties index ac3f6b23ce..10752ffdcb 100644 --- a/src/test/resources/bvt/config/config-3.properties +++ b/src/test/resources/bvt/config/config-3.properties @@ -2,4 +2,4 @@ config.decrypt=true url=jdbc:mock:config-3 testOnBorrow=false maxActive=13 -password=ns2B+nJLNaoXgGakWqqsP6tWu8ZN25D1FncyKCTB/hNup8LW0g/66iGyrkDBHf9tgPJ8QtLz+upQSyin2g4flg== \ No newline at end of file +password=ns2B+nJLNaoXgGakWqqsP6tWu8ZN25D1FncyKCTB/hNup8LW0g/66iGyrkDBHf9tgPJ8QtLz+upQSyin2g4flg== diff --git a/src/test/resources/bvt/config/config-4.properties b/src/test/resources/bvt/config/config-4.properties index 47186f99d1..3c2d58536a 100644 --- a/src/test/resources/bvt/config/config-4.properties +++ b/src/test/resources/bvt/config/config-4.properties @@ -2,4 +2,4 @@ config.decrypt=true url=jdbc:mock:config-4 testOnBorrow=false maxActive=14 -password=ns2B+nJLNaoXgGakWqqsP6tWu8ZN25D1FncyKCTB/hNup8LW0g/66iGyrkDBHf9tgPJ8QtLz+upQSyin2g4flg== \ No newline at end of file +password=ns2B+nJLNaoXgGakWqqsP6tWu8ZN25D1FncyKCTB/hNup8LW0g/66iGyrkDBHf9tgPJ8QtLz+upQSyin2g4flg== diff --git a/src/test/resources/bvt/parser/odps-0.sql b/src/test/resources/bvt/parser/odps-0.sql index 2d55cfaaf7..93c6b429de 100644 --- a/src/test/resources/bvt/parser/odps-0.sql +++ b/src/test/resources/bvt/parser/odps-0.sql @@ -1,24 +1,24 @@ -create table tt_xx ( - f1 string, -f2 string comment 'xxx', - f3 string comment 'xxx', - gmt_first datetime comment '首次时间', -gmt_last datetime comment '末次时间', - pv_cnt bigint comment 'PV数量', - pv_day_cnt bigint comment 'PV天数' -) -comment 'xx comment xxx' partitioned by (pt string comment '按天分区字段', seg string comment '时间跨度') +create table tt_xx +( + f1 string, + f2 string comment 'xxx', + f3 string comment 'xxx', + gmt_first datetime comment '首次时间', + gmt_last datetime comment '末次时间', + pv_cnt bigint comment 'PV数量', + pv_day_cnt bigint comment 'PV天数' +) comment 'xx comment xxx' partitioned by (pt string comment '按天分区字段', seg string comment '时间跨度') ; --------------------------- -create table tt_xx ( - f1 string, - f2 string comment 'xxx', - f3 string comment 'xxx', - gmt_first datetime comment '首次时间', - gmt_last datetime comment '末次时间', - pv_cnt bigint comment 'PV数量', - pv_day_cnt bigint comment 'PV天数' -) -comment 'xx comment xxx' +create table tt_xx +( + f1 string, + f2 string comment 'xxx', + f3 string comment 'xxx', + gmt_first datetime comment '首次时间', + gmt_last datetime comment '末次时间', + pv_cnt bigint comment 'PV数量', + pv_day_cnt bigint comment 'PV天数' +) comment 'xx comment xxx' partitioned by (pt string comment '按天分区字段', seg string comment '时间跨度') ; \ No newline at end of file diff --git a/src/test/resources/bvt/parser/odps-1.sql b/src/test/resources/bvt/parser/odps-1.sql index 982a2a69ef..57ad789fe1 100644 --- a/src/test/resources/bvt/parser/odps-1.sql +++ b/src/test/resources/bvt/parser/odps-1.sql @@ -3,75 +3,116 @@ FROM ( where pt = '${bizdate}' ) x -INSERT overwrite TABLE uxoe.ialeulxx PARTITION(pt=${bizdate-1}) - select case when length(iweet_d) > 2 then iweet_d else NULL end iweet_d - , case when length(user_nick) > 2 then user_nick else NULL end user_nick - , olx - , uoex - , brand - , cpu - , umsis - , iakxh - , resolution - , os - , os_version - , client_ip - , count(*) as count +INSERT overwrite TABLE uxoe.ialeulxx PARTITION(pt= +${bizdate-1} +) +select case when length(iweet_d) > 2 then iweet_d else NULL end iweet_d + , case when length(user_nick) > 2 then user_nick else NULL end user_nick + , olx + , uoex + , brand + , cpu + , umsis + , iakxh + , resolution + , os + , os_version + , client_ip + , count(*) as count , max(from_unixtime(cast(server_time as bigint)/1000)) last_time , min(from_unixtime(cast(server_time as bigint)/1000)) first_time - group by iweet_d, user_nick, olx, uoex, brand, cpu, umsis, iakxh, resolution, os, os_version, client_ip - -INSERT overwrite TABLE uxoe.adl_wdm_ip_device_sdt PARTITION (pt='${bizdate}', seg='d1') - select client_ip - , olx - , uoex - , brand - , cpu - , umsis - , iakxh - , reserve2 utdid - , min(from_unixtime(cast(server_time as bigint)/1000)) first_time - , max(from_unixtime(cast(server_time as bigint)/1000)) last_time - , count(*) - , count(distinct pt) - group by client_ip, olx, uoex, brand, cpu, umsis, iakxh, reserve2 - -INSERT overwrite TABLE uxoe.hxeh PARTITION(pt='${bizdate}') - select unique_id() as uuid - , regexp_extract(args, 'ongitude=(.*?)(,)') longitude - , regexp_extract(args, 'latitude=(.*?)(,)') latitude - , client_ip - , protocol_version - , olx - , uoex - , brand - , cpu - , umsis - , iakxh - , resolution - , carrier - , access - , access_subtype - , channel - , app_key - , app_version - , user_nick - , phone_number - , country - , language,os,os_version,sdk_type,sdk_version,reserve1,reserve2,reserve3,reserve4,reserve5 - , reserves,local_time - , from_unixtime(cast(server_time as bigint)/1000) server_time - , page - , event_id - , arg1 - , arg2 - , arg3 - , args - , day - , hour_id - , iweet_d - , oqlx - , cast(regexp_extract(args, 'wifi_num=(.*?)(,)') as bigint) wifi_num - WHERE length(args) > 5 - AND instr(args, 'gsm_') > 0 +group by iweet_d, user_nick, olx, uoex, brand, cpu, umsis, iakxh, resolution, os, os_version, client_ip + +INSERT +overwrite +TABLE +uxoe +. +adl_wdm_ip_device_sdt +PARTITION +( +pt += +'${bizdate}' +, +seg += +'d1' +) +select client_ip + , olx + , uoex + , brand + , cpu + , umsis + , iakxh + , reserve2 utdid + , min(from_unixtime(cast(server_time as bigint) / 1000)) first_time + , max(from_unixtime(cast(server_time as bigint) / 1000)) last_time + , count(*) + , count(distinct pt) group by client_ip, olx, uoex, brand, cpu, umsis, iakxh, reserve2 + +INSERT +overwrite +TABLE +uxoe +. +hxeh +PARTITION +( +pt += +'${bizdate}' +) +select unique_id() as uuid + , regexp_extract(args, 'ongitude=(.*?)(,)') longitude + , regexp_extract(args, 'latitude=(.*?)(,)') latitude + , client_ip + , protocol_version + , olx + , uoex + , brand + , cpu + , umsis + , iakxh + , resolution + , carrier + , access + , access_subtype + , channel + , app_key + , app_version + , user_nick + , phone_number + , country + , language + , os + , os_version + , sdk_type + , sdk_version + , reserve1 + , reserve2 + , reserve3 + , reserve4 + , reserve5 + , reserves + , local_time + , from_unixtime(cast (server_time as bigint)/1000) server_time + , page + , event_id + , arg1 + , arg2 + , arg3 + , args + , day + , hour_id + , iweet_d + , oqlx + , cast (regexp_extract(args + , 'wifi_num=(.*?)(,)') as bigint) wifi_num +WHERE length (args) + > 5 + AND instr(args + , 'gsm_') + > 0 --------------------------- diff --git a/src/test/resources/bvt/parser/odps-2.sql b/src/test/resources/bvt/parser/odps-2.sql index c970c05bd9..12529166d9 100644 --- a/src/test/resources/bvt/parser/odps-2.sql +++ b/src/test/resources/bvt/parser/odps-2.sql @@ -1,110 +1,112 @@ --@exclude_input=bqxef; --@exclude_output=avwaefrwagqbw; -INSERT overwrite TABLE avwaefrwagqbw partition (pt) +INSERT +overwrite TABLE avwaefrwagqbw partition (pt) SELECT a.zxbw - , a.xbax - , a.brand - , a.cpu - , a.xx_x3 - , a.nwxus - , a.xbax xbax_first - , a.xbax xbax_first - , b.xbax xbax_last - , b.xbax xbax_last - , first_time - , last_time - , (rn_lead - rn_lag) + 1 count + , a.xbax + , a.brand + , a.cpu + , a.xx_x3 + , a.nwxus + , a.xbax xbax_first + , a.xbax xbax_first + , b.xbax xbax_last + , b.xbax xbax_last + , first_time + , last_time + , (rn_lead - rn_lag) + 1 count , province(b.xbax, b.xbax) province , province_code(b.xbax, b.xbax) province_code , city(b.xbax, b.xbax) city , city_code(b.xbax, b.xbax) city_code , a.pt FROM ( - SELECT row_number() over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by rn_lead) rn - , zxbw - , xbax - , brand - , cpu - , xx_x3 - , nwxus - , xbax - , xbax - , server_time first_time - , pt - , rn_lead - FROM ( - SELECT row_number() over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by server_time, xbax, xbax) rn_lead - , zxbw - , xbax - , brand - , cpu - , xx_x3 - , nwxus - , xbax - , LEAD(xbax, 1, 0) over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by server_time, xbax, xbax) xbax_lead - , xbax - , LEAD(xbax, 1, 0) over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by server_time, xbax, xbax) xbax_lead - , server_time - , pt - FROM bqxef - where length(zxbw) >= 15 - AND xbax IS NOT NULL - AND xbax IS NOT NULL - AND abs(xbax) <= 180 - AND abs(xbax) <= 90 - AND xbax <> 0 - AND xbax <> 0 - AND pt >= ${bizdate} - ) x1 - WHERE round(xbax, 2) <> round(xbax_lead, 2) - OR round(xbax, 2) <> round(xbax_lead, 2) -) a inner join ( - SELECT row_number() over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by rn_lag) rn - , zxbw - , xbax - , brand - , cpu - , xx_x3 - , nwxus - , xbax - , xbax - , server_time last_time - , pt - , rn_lag - FROM ( - SELECT row_number() over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by server_time, xbax, xbax) rn_lag - , zxbw - , xbax - , brand - , cpu - , xx_x3 - , nwxus - , xbax - , LAG(xbax, 1, 0) over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by server_time, xbax, xbax) xbax_lag - , xbax - , LAG(xbax, 1, 0) over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by server_time, xbax, xbax) xbax_lag - , server_time - , pt - FROM bqxef - where length(zxbw) >= 15 - AND xbax IS NOT NULL - AND xbax IS NOT NULL - AND abs(xbax) <= 180 - AND abs(xbax) <= 90 - AND xbax <> 0 - AND xbax <> 0 - AND pt >= ${bizdate} - ) x2 - WHERE round(xbax, 2) <> round(xbax_lag, 2) - OR round(xbax, 2) <> round(xbax_lag, 2) -) b on a.pt = b.pt - AND a.zxbw = b.zxbw - AND a.xbax = b.xbax - AND a.brand = b.brand - AND a.cpu = b.cpu - AND a.xx_x3 = b.xx_x3 - AND a.nwxus = b.nwxus - AND a.rn = b.rn + SELECT row_number() over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by rn_lead) rn + , zxbw + , xbax + , brand + , cpu + , xx_x3 + , nwxus + , xbax + , xbax + , server_time first_time + , pt + , rn_lead + FROM ( + SELECT row_number() over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by server_time, xbax, xbax) rn_lead + , zxbw + , xbax + , brand + , cpu + , xx_x3 + , nwxus + , xbax + , LEAD(xbax, 1, 0) over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by server_time, xbax, xbax) xbax_lead + , xbax + , LEAD(xbax, 1, 0) over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by server_time, xbax, xbax) xbax_lead + , server_time + , pt + FROM bqxef + where length (zxbw) >= 15 + AND xbax IS NOT NULL + AND xbax IS NOT NULL + AND abs(xbax) <= 180 + AND abs(xbax) <= 90 + AND xbax <> 0 + AND xbax <> 0 + AND pt >= ${bizdate} + ) x1 + WHERE round(xbax, 2) <> round(xbax_lead, 2) + OR round(xbax, 2) <> round(xbax_lead, 2) + ) a inner join ( + SELECT row_number() over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by rn_lag) rn + , zxbw + , xbax + , brand + , cpu + , xx_x3 + , nwxus + , xbax + , xbax + , server_time last_time + , pt + , rn_lag + FROM ( + SELECT row_number() over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by server_time, xbax, xbax) rn_lag + , zxbw + , xbax + , brand + , cpu + , xx_x3 + , nwxus + , xbax + , LAG(xbax, 1, 0) over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by server_time, xbax, xbax) xbax_lag + , xbax + , LAG(xbax, 1, 0) over(partition by pt, zxbw, xbax, brand, cpu, xx_x3, nwxus order by server_time, xbax, xbax) xbax_lag + , server_time + , pt + FROM bqxef + where length (zxbw) >= 15 + AND xbax IS NOT NULL + AND xbax IS NOT NULL + AND abs(xbax) <= 180 + AND abs(xbax) <= 90 + AND xbax <> 0 + AND xbax <> 0 + AND pt >= ${bizdate} + ) x2 + WHERE round(xbax, 2) <> round(xbax_lag, 2) + OR round(xbax, 2) <> round(xbax_lag, 2) + ) b +on a.pt = b.pt + AND a.zxbw = b.zxbw + AND a.xbax = b.xbax + AND a.brand = b.brand + AND a.cpu = b.cpu + AND a.xx_x3 = b.xx_x3 + AND a.nwxus = b.nwxus + AND a.rn = b.rn ; --------------------------- diff --git a/src/test/resources/bvt/parser/odps-3.sql b/src/test/resources/bvt/parser/odps-3.sql index ebfcf7c029..31adcdf12b 100644 --- a/src/test/resources/bvt/parser/odps-3.sql +++ b/src/test/resources/bvt/parser/odps-3.sql @@ -1,61 +1,56 @@ select a.user_id - , a.user_nick - , a.xrwq - , a.exesag - , a.brand - , a.cpu - , a.xagawef - , a.qwgqwer - , b.os - , b.os_version - , b.resolution - , a.count - , a.day_count - , a.last_time - , a.first_time - , ip -from ( - select user_id - , max(user_nick) user_nick - , xrwq - , exesag - , brand - , cpu - , xagawef - , qwgqwer - , sum(count) count + , a.user_nick + , a.xrwq + , a.exesag + , a.brand + , a.cpu + , a.xagawef + , a.qwgqwer + , b.os + , b.os_version + , b.resolution + , a.count + , a.day_count + , a.last_time + , a.first_time + , ip +from (select user_id + , max(user_nick) user_nick + , xrwq + , exesag + , brand + , cpu + , xagawef + , qwgqwer + , sum(count) count , count(distinct pt) day_count , max(coalesce(last_time, to_date(pt, 'yyyymmdd'))) last_time , min(coalesce(first_time, to_date(pt, 'yyyymmdd'))) first_time - from x_dsls_yw3l - where xrwq <> 'xxx-xxxx--xxx' - group by user_id, xrwq, exesag, brand, cpu, xagawef, qwgqwer -) a inner join ( - select * - from ( - select user_id - , user_nick - , xrwq - , exesag - , brand - , cpu - , xagawef - , qwgqwer - , os - , os_version - , resolution - , ip - , row_number() over(partition by user_id, user_nick, xrwq, exesag, brand, cpu, xagawef, qwgqwer order by last_time desc) rn - from x_dsls_yw3l - where xrwq <> 'c1976429369bfe063ed8b3409db7c7e7d87196d9' - ) r1 - where rn = 1 -) b on a.user_id = b.user_id - AND a.xrwq = b.xrwq - AND a.exesag = b.exesag - AND a.brand = b.brand - AND a.cpu = b.cpu - AND a.xagawef = b.xagawef - AND a.qwgqwer = b.qwgqwer + from x_dsls_yw3l + where xrwq <> 'xxx-xxxx--xxx' + group by user_id, xrwq, exesag, brand, cpu, xagawef, qwgqwer) a + inner join (select * + from (select user_id + , user_nick + , xrwq + , exesag + , brand + , cpu + , xagawef + , qwgqwer + , os + , os_version + , resolution + , ip + , row_number() over(partition by user_id, user_nick, xrwq, exesag, brand, cpu, xagawef, qwgqwer order by last_time desc) rn + from x_dsls_yw3l + where xrwq <> 'c1976429369bfe063ed8b3409db7c7e7d87196d9') r1 + where rn = 1) b on a.user_id = b.user_id + AND a.xrwq = b.xrwq + AND a.exesag = b.exesag + AND a.brand = b.brand + AND a.cpu = b.cpu + AND a.xagawef = b.xagawef + AND a.qwgqwer = b.qwgqwer ; --------------------------- diff --git a/src/test/resources/bvt/parser/z321.sql b/src/test/resources/bvt/parser/z321.sql index 30ba9b52d9..c88eb85c06 100644 --- a/src/test/resources/bvt/parser/z321.sql +++ b/src/test/resources/bvt/parser/z321.sql @@ -1,106 +1,108 @@ -INSERT OVERWRITE TABLE wdm_device_gps_range_day PARTITION (pt) -SELECT a.imei, - a.imsi, - a.brand, - a.cpu, - a.device_id, - a.device_model, - a.longitude AS longitude_first, - a.latitude AS latitude_first, - b.longitude AS longitude_last, - b.latitude AS latitude_last, - first_time, - last_time, - rn_lead - rn_lag + 1 AS count, +INSERT +OVERWRITE TABLE wdm_device_gps_range_day PARTITION (pt) +SELECT a.imei, + a.imsi, + a.brand, + a.cpu, + a.device_id, + a.device_model, + a.longitude AS longitude_first, + a.latitude AS latitude_first, + b.longitude AS longitude_last, + b.latitude AS latitude_last, + first_time, + last_time, + rn_lead - rn_lag + 1 AS count, province(b.longitude, b.latitude) AS province, province_code(b.longitude, b.latitude) AS province_code, city(b.longitude, b.latitude) AS city, city_code(b.longitude, b.latitude) AS city_code, a.pt FROM ( - SELECT ROW_NUMBER() OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY rn_lead) AS rn, - imei, - imsi, - brand, - cpu, - device_id, - device_model, - longitude, - latitude, - server_time AS first_time, - pt, - rn_lead - FROM ( - SELECT ROW_NUMBER() OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY server_time, longitude, latitude) AS rn_lead, - imei, - imsi, - brand, - cpu, - device_id, - device_model, - longitude, - LEAD(longitude, 1, 0) OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY server_time, longitude, latitude) AS longitude_lead, - latitude, - LEAD(latitude, 1, 0) OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY server_time, longitude, latitude) AS latitude_lead, - server_time, - pt - FROM wdm_args - WHERE length(imei) >= 15 - AND longitude IS NOT NULL - AND latitude IS NOT NULL - AND abs(longitude) <= 180 - AND abs(latitude) <= 90 - AND longitude <> 0 - AND latitude <> 0 - AND pt >= ${bizdate} - ) x1 - WHERE round(longitude, 2) <> round(longitude_lead, 2) - OR round(latitude, 2) <> round(latitude_lead, 2) -) a -INNER JOIN ( - SELECT ROW_NUMBER() OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY rn_lag) AS rn, - imei, - imsi, - brand, - cpu, - device_id, - device_model, - longitude, - latitude, - server_time AS last_time, - pt, - rn_lag - FROM ( - SELECT ROW_NUMBER() OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY server_time, longitude, latitude) AS rn_lag, - imei, - imsi, - brand, - cpu, - device_id, - device_model, - longitude, - LAG(longitude, 1, 0) OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY server_time, longitude, latitude) AS longitude_lag, - latitude, - LAG(latitude, 1, 0) OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY server_time, longitude, latitude) AS latitude_lag, - server_time, - pt - FROM wdm_args - WHERE length(imei) >= 15 - AND longitude IS NOT NULL - AND latitude IS NOT NULL - AND abs(longitude) <= 180 - AND abs(latitude) <= 90 - AND longitude <> 0 - AND latitude <> 0 - AND pt >= ${bizdate} - ) x2 - WHERE round(longitude, 2) <> round(longitude_lag, 2) - OR round(latitude, 2) <> round(latitude_lag, 2) -) b ON a.pt = b.pt - AND a.imei = b.imei - AND a.imsi = b.imsi - AND a.brand = b.brand - AND a.cpu = b.cpu - AND a.device_id = b.device_id - AND a.device_model = b.device_model - AND a.rn = b.rn + SELECT ROW_NUMBER() OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY rn_lead) AS rn, + imei, + imsi, + brand, + cpu, + device_id, + device_model, + longitude, + latitude, + server_time AS first_time, + pt, + rn_lead + FROM ( + SELECT ROW_NUMBER() OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY server_time, longitude, latitude) AS rn_lead, + imei, + imsi, + brand, + cpu, + device_id, + device_model, + longitude, + LEAD(longitude, 1, 0) OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY server_time, longitude, latitude) AS longitude_lead, + latitude, + LEAD(latitude, 1, 0) OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY server_time, longitude, latitude) AS latitude_lead, + server_time, + pt + FROM wdm_args + WHERE length (imei) >= 15 + AND longitude IS NOT NULL + AND latitude IS NOT NULL + AND abs(longitude) <= 180 + AND abs(latitude) <= 90 + AND longitude <> 0 + AND latitude <> 0 + AND pt >= ${bizdate} + ) x1 + WHERE round(longitude, 2) <> round(longitude_lead, 2) + OR round(latitude, 2) <> round(latitude_lead, 2) + ) a + INNER JOIN ( + SELECT ROW_NUMBER() OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY rn_lag) AS rn, + imei, + imsi, + brand, + cpu, + device_id, + device_model, + longitude, + latitude, + server_time AS last_time, + pt, + rn_lag + FROM ( + SELECT ROW_NUMBER() OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY server_time, longitude, latitude) AS rn_lag, + imei, + imsi, + brand, + cpu, + device_id, + device_model, + longitude, + LAG(longitude, 1, 0) OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY server_time, longitude, latitude) AS longitude_lag, + latitude, + LAG(latitude, 1, 0) OVER (PARTITION BY pt, imei, imsi, brand, cpu, device_id, device_model ORDER BY server_time, longitude, latitude) AS latitude_lag, + server_time, + pt + FROM wdm_args + WHERE length (imei) >= 15 + AND longitude IS NOT NULL + AND latitude IS NOT NULL + AND abs(longitude) <= 180 + AND abs(latitude) <= 90 + AND longitude <> 0 + AND latitude <> 0 + AND pt >= ${bizdate} + ) x2 + WHERE round(longitude, 2) <> round(longitude_lag, 2) + OR round(latitude, 2) <> round(latitude_lag, 2) + ) b +ON a.pt = b.pt + AND a.imei = b.imei + AND a.imsi = b.imsi + AND a.brand = b.brand + AND a.cpu = b.cpu + AND a.device_id = b.device_id + AND a.device_model = b.device_model + AND a.rn = b.rn diff --git a/src/test/resources/bvt/quartz/quartz.properties b/src/test/resources/bvt/quartz/quartz.properties index 1bafba7fa9..669309785a 100644 --- a/src/test/resources/bvt/quartz/quartz.properties +++ b/src/test/resources/bvt/quartz/quartz.properties @@ -1,6 +1,6 @@ -org.quartz.scheduler.instanceName = DruidScheduler -org.quartz.threadPool.threadCount = 3 -org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore +org.quartz.scheduler.instanceName=DruidScheduler +org.quartz.threadPool.threadCount=3 +org.quartz.jobStore.class=org.quartz.simpl.RAMJobStore org.quartz.scheduler.skipUpdateCheck=true -org.quartz.dataSource.druid.connectionProvider.class = com.alibaba.druid.support.quartz.DruidQuartzConnectionProvider -org.quartz.dataSource.druid.url = jdbc:h2:mem:test_mem +org.quartz.dataSource.druid.connectionProvider.class=com.alibaba.druid.support.quartz.DruidQuartzConnectionProvider +org.quartz.dataSource.druid.url=jdbc:h2:mem:test_mem diff --git a/src/test/resources/com/alibaba/druid/jmx/spring_stat_export.xml b/src/test/resources/com/alibaba/druid/jmx/spring_stat_export.xml index 1fed66031a..44c3c63b83 100644 --- a/src/test/resources/com/alibaba/druid/jmx/spring_stat_export.xml +++ b/src/test/resources/com/alibaba/druid/jmx/spring_stat_export.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - + default-lazy-init="false"> + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/com/alibaba/druid/pool/dataSource.xml b/src/test/resources/com/alibaba/druid/pool/dataSource.xml index f08a3f1c27..fa83899452 100644 --- a/src/test/resources/com/alibaba/druid/pool/dataSource.xml +++ b/src/test/resources/com/alibaba/druid/pool/dataSource.xml @@ -1,63 +1,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + default-lazy-init="false"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/com/alibaba/druid/pool/ha/ha-datasource.properties b/src/test/resources/com/alibaba/druid/pool/ha/ha-datasource.properties index 50f01147db..572116ec34 100644 --- a/src/test/resources/com/alibaba/druid/pool/ha/ha-datasource.properties +++ b/src/test/resources/com/alibaba/druid/pool/ha/ha-datasource.properties @@ -1,2 +1,2 @@ foo.url=jdbc:derby:memory:foo;create=true -bar.url=jdbc:derby:memory:bar;create=true \ No newline at end of file +bar.url=jdbc:derby:memory:bar;create=true diff --git a/src/test/resources/com/alibaba/druid/pool/ibatis/Sequence.xml b/src/test/resources/com/alibaba/druid/pool/ibatis/Sequence.xml index d6cbd67eb8..ef21d77cee 100644 --- a/src/test/resources/com/alibaba/druid/pool/ibatis/Sequence.xml +++ b/src/test/resources/com/alibaba/druid/pool/ibatis/Sequence.xml @@ -1,24 +1,25 @@ + PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" + "http://ibatis.apache.org/dtd/sql-map-2.dtd"> - - - - - - UPDATE sequence_seed - SET value = #value# - WHERE name = #name# AND value = #expect# - + + + + + + UPDATE sequence_seed + SET value = #value# + WHERE name = #name# + AND value = #expect# + diff --git a/src/test/resources/com/alibaba/druid/pool/ibatis/User.xml b/src/test/resources/com/alibaba/druid/pool/ibatis/User.xml index 412bcd9c8a..91bfdb15ca 100644 --- a/src/test/resources/com/alibaba/druid/pool/ibatis/User.xml +++ b/src/test/resources/com/alibaba/druid/pool/ibatis/User.xml @@ -1,26 +1,31 @@ + PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" + "http://ibatis.apache.org/dtd/sql-map-2.dtd"> - + - - insert into t_User (id, name) - values (#id#, #name#) - + + insert into t_User (id, name) + values (#id#, #name#) + - - delete from t_User where id = - #id# - + + delete + from t_User + where id = + #id# + - - update t_User set name = - #name# where id = #id# - + + update t_User + set name = + #name# + where id = #id# + - + diff --git a/src/test/resources/com/alibaba/druid/pool/ibatis/ibatis-config-druid-test.xml b/src/test/resources/com/alibaba/druid/pool/ibatis/ibatis-config-druid-test.xml index dc30d76ec7..ded62e818a 100644 --- a/src/test/resources/com/alibaba/druid/pool/ibatis/ibatis-config-druid-test.xml +++ b/src/test/resources/com/alibaba/druid/pool/ibatis/ibatis-config-druid-test.xml @@ -1,9 +1,10 @@ - + - - + lazyLoadingEnabled="true" maxRequests="512" maxSessions="128" + maxTransactions="32" useStatementNamespaces="true"/> + + \ No newline at end of file diff --git a/src/test/resources/com/alibaba/druid/pool/ibatis/spring-config-ibatis-1.xml b/src/test/resources/com/alibaba/druid/pool/ibatis/spring-config-ibatis-1.xml index 93ede430ce..862fea7a95 100644 --- a/src/test/resources/com/alibaba/druid/pool/ibatis/spring-config-ibatis-1.xml +++ b/src/test/resources/com/alibaba/druid/pool/ibatis/spring-config-ibatis-1.xml @@ -1,44 +1,44 @@ + default-lazy-init="false"> - - - - master-sqlMapClient - - sequence-dao - - - + + + + master-sqlMapClient + + sequence-dao + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - + diff --git a/src/test/resources/com/alibaba/druid/pool/ibatis/spring-config-ibatis.xml b/src/test/resources/com/alibaba/druid/pool/ibatis/spring-config-ibatis.xml index cd295f98c0..a92a786a21 100644 --- a/src/test/resources/com/alibaba/druid/pool/ibatis/spring-config-ibatis.xml +++ b/src/test/resources/com/alibaba/druid/pool/ibatis/spring-config-ibatis.xml @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + default-lazy-init="false"> + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/com/alibaba/druid/pool/mybatis/spring-config-mybatis.xml b/src/test/resources/com/alibaba/druid/pool/mybatis/spring-config-mybatis.xml index bc802baddd..5ad9a2a03f 100644 --- a/src/test/resources/com/alibaba/druid/pool/mybatis/spring-config-mybatis.xml +++ b/src/test/resources/com/alibaba/druid/pool/mybatis/spring-config-mybatis.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - + default-lazy-init="false"> + + + + + + + + + + + diff --git a/src/test/resources/com/alibaba/druid/sql/oracle/bvt/source.sql b/src/test/resources/com/alibaba/druid/sql/oracle/bvt/source.sql index 3c4a31b9d2..1f1e9a32d4 100644 --- a/src/test/resources/com/alibaba/druid/sql/oracle/bvt/source.sql +++ b/src/test/resources/com/alibaba/druid/sql/oracle/bvt/source.sql @@ -1,124 +1,151 @@ SELECT CAST(manager_id AS VARCHAR2(2000)), department_name, SUM(salary) dept_total - FROM employees e, departments d - WHERE e.department_id = d.department_id - GROUP BY department_name; - - - SELECT employee_id, last_name, manager_id, 0 reportLevel, - CAST(manager_id AS VARCHAR2(2000)) - FROM employees - WHERE employee_id = 101 - UNION ALL - SELECT e.employee_id, e.last_name, e.manager_id, reportLevel+1, - CAST(mgr_list || ',' || manager_id AS VARCHAR2(2000)) - FROM reports_to_101 r, employees e - WHERE r.eid = e.manager_id; - - SELECT * - FROM employees - WHERE job_id = 'PU_CLERK' - ORDER BY salary DESC; - +FROM employees e, + departments d +WHERE e.department_id = d.department_id +GROUP BY department_name; + + +SELECT employee_id, + last_name, + manager_id, + 0 reportLevel, + CAST(manager_id AS VARCHAR2(2000)) +FROM employees +WHERE employee_id = 101 +UNION ALL +SELECT e.employee_id, + e.last_name, + e.manager_id, + reportLevel + 1, + CAST(mgr_list || ',' || manager_id AS VARCHAR2(2000)) +FROM reports_to_101 r, + employees e +WHERE r.eid = e.manager_id; + +SELECT * +FROM employees +WHERE job_id = 'PU_CLERK' +ORDER BY salary DESC; + +SELECT last_name, department_id, salary +FROM employees +ORDER BY department_id ASC, salary DESC, last_name; + SELECT last_name, department_id, salary - FROM employees - ORDER BY department_id ASC, salary DESC, last_name; - - SELECT last_name, department_id, salary - FROM employees - ORDER BY 2 ASC, 3 DESC, 1; - +FROM employees +ORDER BY 2 ASC, 3 DESC, 1; + SELECT e.employee_id, e.salary, e.commission_pct - FROM employees e, departments d - WHERE job_id = 'SA_REP' - AND e.department_id = d.department_id - AND location_id = 2500 - FOR UPDATE - ORDER BY e.employee_id; - -SELECT last_name, department_id FROM employees - WHERE department_id = - (SELECT department_id FROM employees - WHERE last_name = 'Lorentz') - ORDER BY last_name, department_id; - -UPDATE employees - SET salary = salary * 1.1 - WHERE employee_id IN (SELECT employee_id FROM job_history); - -SELECT e1.last_name||' works for '||e2.last_name - "Employees and Their Managers" - - FROM employees e1, employees e2 - WHERE e1.manager_id = e2.employee_id - AND e1.last_name LIKE 'R%' - ORDER BY e1.last_name; +FROM employees e, + departments d +WHERE job_id = 'SA_REP' + AND e.department_id = d.department_id + AND location_id = 2500 + FOR UPDATE ORDER BY e.employee_id; + +SELECT last_name, department_id +FROM employees +WHERE department_id = + (SELECT department_id + FROM employees + WHERE last_name = 'Lorentz') +ORDER BY last_name, department_id; + +UPDATE employees +SET salary = salary * 1.1 +WHERE employee_id IN (SELECT employee_id FROM job_history); + +SELECT e1.last_name || ' works for ' || e2.last_name + "Employees and Their Managers" + +FROM employees e1, + employees e2 +WHERE e1.manager_id = e2.employee_id + AND e1.last_name LIKE 'R%' +ORDER BY e1.last_name; SELECT d.department_id, e.last_name - FROM departments d LEFT OUTER JOIN employees e - ON d.department_id = e.department_id - ORDER BY d.department_id, e.last_name; - +FROM departments d + LEFT OUTER JOIN employees e + ON d.department_id = e.department_id +ORDER BY d.department_id, e.last_name; + SELECT d.department_id, e.last_name - FROM departments d, employees e - WHERE d.department_id = e.department_id(+) - ORDER BY d.department_id, e.last_name; +FROM departments d, + employees e +WHERE d.department_id = e.department_id(+) +ORDER BY d.department_id, e.last_name; SELECT d.department_id, e.last_name - FROM departments d RIGHT OUTER JOIN employees e - ON d.department_id = e.department_id - ORDER BY d.department_id, e.last_name; +FROM departments d + RIGHT OUTER JOIN employees e + ON d.department_id = e.department_id +ORDER BY d.department_id, e.last_name; -SELECT d.department_id as d_dept_id, e.department_id as e_dept_id, - e.last_name - FROM departments d FULL OUTER JOIN employees e - ON d.department_id = e.department_id - ORDER BY d.department_id, e.last_name; +SELECT d.department_id as d_dept_id, + e.department_id as e_dept_id, + e.last_name +FROM departments d + FULL OUTER JOIN employees e + ON d.department_id = e.department_id +ORDER BY d.department_id, e.last_name; SELECT department_id AS d_e_dept_id, e.last_name - FROM departments d FULL OUTER JOIN employees e - USING (department_id) - ORDER BY department_id, e.last_name; - -INSERT INTO inventory VALUES (TO_DATE('01/04/01', 'DD/MM/YY'), 'bottle', 10); -INSERT INTO inventory VALUES (TO_DATE('06/04/01', 'DD/MM/YY'), 'bottle', 10); -INSERT INTO inventory VALUES (TO_DATE('01/04/01', 'DD/MM/YY'), 'can', 10); -INSERT INTO inventory VALUES (TO_DATE('04/04/01', 'DD/MM/YY'), 'can', 10); - -SELECT times.time_id, product, quantity FROM inventory - RIGHT OUTER JOIN times ON (times.time_id = inventory.time_id) - WHERE times.time_id BETWEEN TO_DATE('01/04/01', 'DD/MM/YY') - AND TO_DATE('06/04/01', 'DD/MM/YY') - ORDER BY 2,1; - -SELECT * FROM employees - WHERE department_id NOT IN - (SELECT department_id FROM departments +FROM departments d + FULL OUTER JOIN employees e + USING (department_id) +ORDER BY department_id, e.last_name; + +INSERT INTO inventory +VALUES (TO_DATE('01/04/01', 'DD/MM/YY'), 'bottle', 10); +INSERT INTO inventory +VALUES (TO_DATE('06/04/01', 'DD/MM/YY'), 'bottle', 10); +INSERT INTO inventory +VALUES (TO_DATE('01/04/01', 'DD/MM/YY'), 'can', 10); +INSERT INTO inventory +VALUES (TO_DATE('04/04/01', 'DD/MM/YY'), 'can', 10); + +SELECT times.time_id, product, quantity +FROM inventory + RIGHT OUTER JOIN times ON (times.time_id = inventory.time_id) +WHERE times.time_id BETWEEN TO_DATE('01/04/01', 'DD/MM/YY') + AND TO_DATE('06/04/01', 'DD/MM/YY') +ORDER BY 2, 1; + +SELECT * +FROM employees +WHERE department_id NOT IN + (SELECT department_id + FROM departments WHERE location_id = 1700) - ORDER BY last_name; - -SELECT LPAD(' ',2*(LEVEL-1)) || last_name org_chart, - employee_id, manager_id, job_id - FROM employees - START WITH job_id = 'AD_VP' - CONNECT BY PRIOR employee_id = manager_id; - -SELECT LPAD(' ',2*(LEVEL-1)) || last_name org_chart, -employee_id, manager_id, job_id - FROM employees - START WITH job_id = 'AD_PRES' - CONNECT BY PRIOR employee_id = manager_id AND LEVEL <= 2; - -SELECT department_id, last_name, salary - FROM employees x - WHERE salary > (SELECT AVG(salary) - FROM employees - WHERE x.department_id = department_id) - ORDER BY department_id; - -SELECT SYSDATE FROM DUAL; - -SELECT employees_seq.nextval - FROM DUAL; -SELECT employees_seq.currval - FROM DUAL; +ORDER BY last_name; + +SELECT LPAD(' ', 2 * (LEVEL - 1)) || last_name org_chart, + employee_id, + manager_id, + job_id +FROM employees START WITH job_id = 'AD_VP' +CONNECT BY PRIOR employee_id = manager_id; + +SELECT LPAD(' ', 2 * (LEVEL - 1)) || last_name org_chart, + employee_id, + manager_id, + job_id +FROM employees START WITH job_id = 'AD_PRES' +CONNECT BY PRIOR employee_id = manager_id AND LEVEL <= 2; + +SELECT department_id, last_name, salary +FROM employees x +WHERE salary > (SELECT AVG(salary) + FROM employees + WHERE x.department_id = department_id) +ORDER BY department_id; + +SELECT SYSDATE +FROM DUAL; + +SELECT employees_seq.nextval +FROM DUAL; +SELECT employees_seq.currval +FROM DUAL; \ No newline at end of file diff --git a/src/test/resources/com/alibaba/druid/stat/spring-config-stat-annotation.xml b/src/test/resources/com/alibaba/druid/stat/spring-config-stat-annotation.xml index b6cd272344..20a8a787a0 100644 --- a/src/test/resources/com/alibaba/druid/stat/spring-config-stat-annotation.xml +++ b/src/test/resources/com/alibaba/druid/stat/spring-config-stat-annotation.xml @@ -1,18 +1,18 @@ + default-lazy-init="false"> - - - + + + diff --git a/src/test/resources/com/alibaba/druid/stat/spring-config-stat.xml b/src/test/resources/com/alibaba/druid/stat/spring-config-stat.xml index 952f7f6d89..32070de9ca 100644 --- a/src/test/resources/com/alibaba/druid/stat/spring-config-stat.xml +++ b/src/test/resources/com/alibaba/druid/stat/spring-config-stat.xml @@ -1,29 +1,29 @@ + default-lazy-init="false"> - + - - + + - - - - - - druid-stat-interceptor - - - + + + + + + druid-stat-interceptor + + + diff --git a/src/test/resources/commons-logging.properties b/src/test/resources/commons-logging.properties index e18f88f94e..46cf3a4c32 100644 --- a/src/test/resources/commons-logging.properties +++ b/src/test/resources/commons-logging.properties @@ -3,4 +3,4 @@ # use log4j org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger #org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JCategoryLog -#org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger \ No newline at end of file +#org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties index 89c8ff07bb..747f5744ba 100644 --- a/src/test/resources/log4j.properties +++ b/src/test/resources/log4j.properties @@ -5,7 +5,6 @@ log4j.appender.CONSOLE.Target=System.out log4j.appender.CONSOLE.Threshold=DEBUG log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout.ConversionPattern=%d [%-5p] %c{1}\:%x%L - %m%n - log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender log4j.appender.FILE.Append=true log4j.appender.FILE.DatePattern=yyyyMMdd-HH'.log4j' @@ -13,7 +12,6 @@ log4j.appender.FILE.File=logs/monitor.log log4j.appender.FILE.Threshold=INFO,DEBUG log4j.appender.FILE.layout=org.apache.log4j.PatternLayout log4j.appender.FILE.layout.ConversionPattern=%d [%-5p] %c\:%x%L - %m%n - log4j.category.com=DEBUG log4j.category.com.mchange=ERROR log4j.category.org.springframework=ERROR @@ -31,5 +29,4 @@ log4j.category.com.alibaba.druid.mock=ERROR log4j.category.org.apache.hadoop=WARN log4j.category.org.apache.zookeeper=ERROR log4j.category.druid.sql=DEBUG - log4j.rootLogger=TRACE,CONSOLE